summaryrefslogtreecommitdiff
path: root/addons/mail_bot/models
diff options
context:
space:
mode:
authorXavierDo <xdo@odoo.com>2019-04-12 11:43:36 +0000
committerThibault Delavallée <tde@odoo.com>2019-05-29 13:32:26 +0000
commit6f43977a4e2837cc8a2b47f3cab086f334c20978 (patch)
tree400bc1f39cb25640808b514638693b3153732aad /addons/mail_bot/models
parentc9d173a3e7645eef388a927466d564889d304cb6 (diff)
[REF] mail: improve message_post and message_notify API
Message post should always be called on a record (ensure_one). That way we ensure posting a message is always done in a record's context with right values computed (reply_to, followers, ...) Message_notify can be called on record or on mail_thread and must have partner_ids. It is based on the recently modified user_notification mechanism and allow to notify a partner on a record or just to push him a message (aka, not linked to a record). Small performance improvement * browse recipients instead of search in _notify_email_recipients; * todo in future optimizations: mayybe be improve by searching on ids and is_blacklist immediately; Related to task 1943901 Linked to PR #32404
Diffstat (limited to 'addons/mail_bot/models')
-rw-r--r--addons/mail_bot/models/mail_bot.py2
-rw-r--r--addons/mail_bot/models/mail_thread.py4
2 files changed, 3 insertions, 3 deletions
diff --git a/addons/mail_bot/models/mail_bot.py b/addons/mail_bot/models/mail_bot.py
index 96a7a1988dc..2e0ab860255 100644
--- a/addons/mail_bot/models/mail_bot.py
+++ b/addons/mail_bot/models/mail_bot.py
@@ -214,7 +214,7 @@ class MailBot(models.AbstractModel):
def _is_bot_pinged(self, values):
odoobot_id = self.env['ir.model.data'].xmlid_to_res_id("base.partner_root")
- return (4, odoobot_id) in values.get('partner_ids', [])
+ return odoobot_id in values.get('partner_ids', [])
def _is_bot_in_private_channel(self, record):
odoobot_id = self.env['ir.model.data'].xmlid_to_res_id("base.partner_root")
diff --git a/addons/mail_bot/models/mail_thread.py b/addons/mail_bot/models/mail_thread.py
index 9a5e2e05a99..e1be43e7ca2 100644
--- a/addons/mail_bot/models/mail_thread.py
+++ b/addons/mail_bot/models/mail_thread.py
@@ -7,6 +7,6 @@ from odoo import models
class MailThread(models.AbstractModel):
_inherit = 'mail.thread'
- def _message_post_after_hook(self, message, msg_vals, model_description, mail_auto_delete):
+ def _message_post_after_hook(self, message, msg_vals):
self.env['mail.bot']._apply_logic(self, msg_vals)
- return super(MailThread, self)._message_post_after_hook(message, msg_vals, model_description, mail_auto_delete)
+ return super(MailThread, self)._message_post_after_hook(message, msg_vals)