odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] mail: mail_thread: routing: check for exact message_id. 

WIP: will be improved, notably about what to do for partial match.

bzr revid: tde@openerp.com-20131128103921-q1a36otv9ptazehd
This commit is contained in:
Thibault Delavallée 2013-11-28 11:39:21 +01:00
parent 33b9bc1d06
commit 4f2e951cde
2 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/mail/mail_message.py
View File

@ -816,6 +816,10 @@ class mail_message(osv.Model):
return email_reply_to
# def baseN(num, b, numerals=string.digits + string.letters):
# return ((num == 0) and "0") or (baseN(num // b, b, numerals).lstrip("0") + numerals[num % b])
# message-id with db
def _get_message_id(self, cr, uid, values, context=None):
message_id = None
if not values.get('message_id') and values.get('reply_to'):

19
addons/mail/mail_thread.py
View File

@ -829,9 +829,26 @@ class mail_thread(osv.AbstractModel):
email_to = decode_header(message, 'To')
references = decode_header(message, 'References')
in_reply_to = decode_header(message, 'In-Reply-To')
thread_references = references or in_reply_to
# 1. message is a reply to an existing message (exact match of message_id)
msg_references = thread_references.split()
for msg_reference in msg_references:
mail_message_ids = self.pool['mail.message'].search(
cr, uid, [('message_id', '=', msg_reference)], context=context)
if mail_message_ids:
original_msg = self.pool['mail.message'].browse(cr, SUPERUSER_ID, mail_message_ids[0], context=context)
model, thread_id = original_msg.model, original_msg.res_id
_logger.info(
'Routing mail from %s to %s with Message-Id %s: direct reply to msg: model: %s, thread_id: %s, custom_values: %s, uid: %s',
email_from, email_to, message_id, model, thread_id, custom_values, uid)
route = self.message_route_verify(
cr, uid, message, message_dict,
(model, thread_id, custom_values, uid, None),
update_author=True, assert_model=True, create_fallback=True, context=context)
return route and [route] or []
# 1. Verify if this is a reply to an existing thread
thread_references = references or in_reply_to
ref_match = thread_references and tools.reference_re.search(thread_references)
if ref_match:
thread_id = int(ref_match.group(1))