Skip to content

Conversation

@fw-bot
Copy link
Contributor

@fw-bot fw-bot commented Jan 21, 2025

We update quote detection for gmail and outlook:

  • gmail has simple wrapper divs with explicit classes
  • outlook has a mix of div ids and simple pattern-based quoting (everything under "
    seems to be considered a quote)

Previously gmail just used blockquote, which still works but does not capture "On xx:xx:xx X X@gmail.com wrote:" headers, which are caught for outlook.

Previously outlook had a wrapper div around divRplyFwdMsg which would set data-o-mail-quote-container on it, and propagate to children. However it seems that outer div was either removed or is not always present, a heuristic is thus needed.

task-4381505

Forward-Port-Of: #192875

@robodoo
Copy link
Contributor

robodoo commented Jan 21, 2025

Pull request status dashboard

@fw-bot
Copy link
Contributor Author

fw-bot commented Jan 21, 2025

@reth-odoo @tde-banana-odoo cherrypicking of pull request #192875 failed.

stdout:

Auto-merging odoo/addons/base/tests/test_mail_examples.py
CONFLICT (content): Merge conflict in odoo/addons/base/tests/test_mail_examples.py
Auto-merging odoo/tools/mail.py

Either perform the forward-port manually (and push to this branch, proceeding as usual) or close this PR (maybe?).

In the former case, you may want to edit this PR message as well.

⚠️ after resolving this conflict, you will need to merge it via @robodoo.

More info at https://github.com/odoo/odoo/wiki/Mergebot#forward-port

@robodoo robodoo added forwardport This PR was created by @fw-bot conflict There was an error while creating this forward-port PR labels Jan 21, 2025
@C3POdoo C3POdoo added the RD research & development, internal work label Jan 21, 2025
We update quote detection for gmail and outlook:
- gmail has simple wrapper divs with explicit classes
- outlook has a mix of div ids and simple pattern-based quoting
(everything under "<hr><div id="divRplyFwdMsg"/> seems to be considered a quote)

Previously gmail just used blockquote, which still works but does not
capture "On xx:xx:xx X <X@gmail.com> wrote:" headers, which are caught
for outlook.

Previously outlook had a wrapper div around divRplyFwdMsg which would
set data-o-mail-quote-container on it, and propagate to children.
However it seems that outer div was either removed or is not always
present, a heuristic is thus needed.

task-4381505
Blank spaces following a quoted node should also be quoted.

This avoids having long trailing spaces below a signature
and having unquoted blank spaces between two quoted blocks

task-4381505
@reth-odoo reth-odoo force-pushed the 17.0-16.0-better-outlook-gmail-reply-quoting-reth-IUbT-fw branch from 2b0d609 to 277310c Compare January 22, 2025 07:08
@C3POdoo C3POdoo requested review from a team, HydrionBurst and xmo-odoo and removed request for a team January 22, 2025 07:11
@reth-odoo
Copy link
Contributor

"french spacing" commit conflict..
@robodoo r+

@tde-banana-odoo
Copy link
Contributor

Really worth conflicts !

@reth-odoo
Copy link
Contributor

Especially in test data :D

@robodoo
Copy link
Contributor

robodoo commented Jan 22, 2025

@reth-odoo @tde-banana-odoo staging failed: ci/runbot on a2724fbcd5347170d246867ff62543a824a5bf85 (view more at https://runbot.odoo.com/runbot/build/73757600)

@reth-odoo
Copy link
Contributor

@robodoo retry

robodoo pushed a commit that referenced this pull request Jan 22, 2025
We update quote detection for gmail and outlook:
- gmail has simple wrapper divs with explicit classes
- outlook has a mix of div ids and simple pattern-based quoting
(everything under "<hr><div id="divRplyFwdMsg"/> seems to be considered a quote)

Previously gmail just used blockquote, which still works but does not
capture "On xx:xx:xx X <X@gmail.com> wrote:" headers, which are caught
for outlook.

Previously outlook had a wrapper div around divRplyFwdMsg which would
set data-o-mail-quote-container on it, and propagate to children.
However it seems that outer div was either removed or is not always
present, a heuristic is thus needed.

task-4381505

Part-of: #194615
Signed-off-by: Thibault Delavallee (tde) <tde@openerp.com>
Signed-off-by: Renaud Thiry (reth) <reth@odoo.com>
robodoo pushed a commit that referenced this pull request Jan 22, 2025
Blank spaces following a quoted node should also be quoted.

This avoids having long trailing spaces below a signature
and having unquoted blank spaces between two quoted blocks

task-4381505

Part-of: #194615
Signed-off-by: Thibault Delavallee (tde) <tde@openerp.com>
Signed-off-by: Renaud Thiry (reth) <reth@odoo.com>
robodoo added a commit that referenced this pull request Jan 22, 2025
We update quote detection for gmail and outlook:
- gmail has simple wrapper divs with explicit classes
- outlook has a mix of div ids and simple pattern-based quoting (everything under "<hr><div id="divRplyFwdMsg"/> seems to be considered a quote)

Previously gmail just used blockquote, which still works but does not capture "On xx:xx:xx X <X@gmail.com> wrote:" headers, which are caught for outlook.

Previously outlook had a wrapper div around divRplyFwdMsg which would set data-o-mail-quote-container on it, and propagate to children. However it seems that outer div was either removed or is not always present, a heuristic is thus needed.

task-4381505

closes #194615

Forward-port-of: #192875
Signed-off-by: Thibault Delavallee (tde) <tde@openerp.com>
Signed-off-by: Renaud Thiry (reth) <reth@odoo.com>
@robodoo robodoo closed this Jan 22, 2025
robodoo added a commit that referenced this pull request Jan 23, 2025
We update quote detection for gmail and outlook:
- gmail has simple wrapper divs with explicit classes
- outlook has a mix of div ids and simple pattern-based quoting (everything under "<hr><div id="divRplyFwdMsg"/> seems to be considered a quote)

Previously gmail just used blockquote, which still works but does not capture "On xx:xx:xx X <X@gmail.com> wrote:" headers, which are caught for outlook.

Previously outlook had a wrapper div around divRplyFwdMsg which would set data-o-mail-quote-container on it, and propagate to children. However it seems that outer div was either removed or is not always present, a heuristic is thus needed.

task-4381505

closes #194689

Forward-port-of: #194615
Forward-port-of: #192875
Signed-off-by: Thibault Delavallee (tde) <tde@openerp.com>
Signed-off-by: Renaud Thiry (reth) <reth@odoo.com>
robodoo added a commit that referenced this pull request Jan 23, 2025
We update quote detection for gmail and outlook:
- gmail has simple wrapper divs with explicit classes
- outlook has a mix of div ids and simple pattern-based quoting (everything under "<hr><div id="divRplyFwdMsg"/> seems to be considered a quote)

Previously gmail just used blockquote, which still works but does not capture "On xx:xx:xx X <X@gmail.com> wrote:" headers, which are caught for outlook.

Previously outlook had a wrapper div around divRplyFwdMsg which would set data-o-mail-quote-container on it, and propagate to children. However it seems that outer div was either removed or is not always present, a heuristic is thus needed.

task-4381505

closes #194704

Forward-port-of: #194615
Forward-port-of: #192875
Signed-off-by: Thibault Delavallee (tde) <tde@openerp.com>
Signed-off-by: Renaud Thiry (reth) <reth@odoo.com>
robodoo added a commit that referenced this pull request Jan 23, 2025
We update quote detection for gmail and outlook:
- gmail has simple wrapper divs with explicit classes
- outlook has a mix of div ids and simple pattern-based quoting (everything under "<hr><div id="divRplyFwdMsg"/> seems to be considered a quote)

Previously gmail just used blockquote, which still works but does not capture "On xx:xx:xx X <X@gmail.com> wrote:" headers, which are caught for outlook.

Previously outlook had a wrapper div around divRplyFwdMsg which would set data-o-mail-quote-container on it, and propagate to children. However it seems that outer div was either removed or is not always present, a heuristic is thus needed.

task-4381505

closes #194722

Forward-port-of: #194615
Forward-port-of: #192875
Signed-off-by: Thibault Delavallee (tde) <tde@openerp.com>
Signed-off-by: Renaud Thiry (reth) <reth@odoo.com>
adhoc-cicd-bot pushed a commit to adhoc-cicd/odoo-odoo that referenced this pull request Jan 24, 2025
We update quote detection for gmail and outlook:
- gmail has simple wrapper divs with explicit classes
- outlook has a mix of div ids and simple pattern-based quoting
(everything under "<hr><div id="divRplyFwdMsg"/> seems to be considered a quote)

Previously gmail just used blockquote, which still works but does not
capture "On xx:xx:xx X <X@gmail.com> wrote:" headers, which are caught
for outlook.

Previously outlook had a wrapper div around divRplyFwdMsg which would
set data-o-mail-quote-container on it, and propagate to children.
However it seems that outer div was either removed or is not always
present, a heuristic is thus needed.

task-4381505

Part-of: odoo#194615
Signed-off-by: Thibault Delavallee (tde) <tde@openerp.com>
Signed-off-by: Renaud Thiry (reth) <reth@odoo.com>
adhoc-cicd-bot pushed a commit to adhoc-cicd/odoo-odoo that referenced this pull request Jan 24, 2025
Blank spaces following a quoted node should also be quoted.

This avoids having long trailing spaces below a signature
and having unquoted blank spaces between two quoted blocks

task-4381505

Part-of: odoo#194615
Signed-off-by: Thibault Delavallee (tde) <tde@openerp.com>
Signed-off-by: Renaud Thiry (reth) <reth@odoo.com>
adhoc-cicd-bot pushed a commit to adhoc-cicd/odoo-odoo that referenced this pull request Jan 25, 2025
We update quote detection for gmail and outlook:
- gmail has simple wrapper divs with explicit classes
- outlook has a mix of div ids and simple pattern-based quoting
(everything under "<hr><div id="divRplyFwdMsg"/> seems to be considered a quote)

Previously gmail just used blockquote, which still works but does not
capture "On xx:xx:xx X <X@gmail.com> wrote:" headers, which are caught
for outlook.

Previously outlook had a wrapper div around divRplyFwdMsg which would
set data-o-mail-quote-container on it, and propagate to children.
However it seems that outer div was either removed or is not always
present, a heuristic is thus needed.

task-4381505

Part-of: odoo#194615
Signed-off-by: Thibault Delavallee (tde) <tde@openerp.com>
Signed-off-by: Renaud Thiry (reth) <reth@odoo.com>
adhoc-cicd-bot pushed a commit to adhoc-cicd/odoo-odoo that referenced this pull request Jan 25, 2025
Blank spaces following a quoted node should also be quoted.

This avoids having long trailing spaces below a signature
and having unquoted blank spaces between two quoted blocks

task-4381505

Part-of: odoo#194615
Signed-off-by: Thibault Delavallee (tde) <tde@openerp.com>
Signed-off-by: Renaud Thiry (reth) <reth@odoo.com>
@fw-bot fw-bot deleted the 17.0-16.0-better-outlook-gmail-reply-quoting-reth-IUbT-fw branch February 5, 2025 12:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

conflict There was an error while creating this forward-port PR forwardport This PR was created by @fw-bot RD research & development, internal work

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants