odoo-addon-mail-gateway 16.0.1.3.0__py3-none-any.whl → 17.0.1.0.1__py3-none-any.whl

odoo/addons/mail_gateway/i18n/mail_gateway.pot

@@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 16.0\n"
+"Project-Id-Version: Odoo Server 17.0\n"
 "Report-Msgid-Bugs-To: \n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -14,17 +14,27 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: mail_gateway
-#: model:ir.model.fields,field_description:mail_gateway.field_mail_compose_gateway_message__active_domain
+#: model:ir.model.fields,field_description:mail_gateway.field_mail_compose_gateway_message__res_domain
 msgid "Active domain"
 msgstr ""
 
+#. module: mail_gateway
+#: model:ir.model.fields,field_description:mail_gateway.field_mail_compose_gateway_message__email_add_signature
+msgid "Add signature"
+msgstr ""
+
 #. module: mail_gateway
 #: model:ir.model.fields,field_description:mail_gateway.field_mail_compose_gateway_message__partner_ids
 msgid "Additional Contacts"
 msgstr ""
 
 #. module: mail_gateway
-#: model:ir.model.fields,field_description:mail_gateway.field_mail_channel__anonymous_name
+#: model:ir.model.fields,field_description:mail_gateway.field_mail_compose_gateway_message__record_alias_domain_id
+msgid "Alias Domain"
+msgstr ""
+
+#. module: mail_gateway
+#: model:ir.model.fields,field_description:mail_gateway.field_discuss_channel__anonymous_name
 msgid "Anonymous Name"
 msgstr ""
 
@@ -50,11 +60,21 @@ msgid ""
 " did not match any partner."
 msgstr ""
 
+#. module: mail_gateway
+#: model:ir.model.fields,field_description:mail_gateway.field_mail_compose_gateway_message__composition_batch
+msgid "Batch composition"
+msgstr ""
+
 #. module: mail_gateway
 #: model:ir.model.fields,field_description:mail_gateway.field_mail_compose_gateway_message__partner_bcc_ids
 msgid "Bcc"
 msgstr ""
 
+#. module: mail_gateway
+#: model:ir.model.fields,field_description:mail_gateway.field_mail_compose_gateway_message__body_has_template_value
+msgid "Body content is the same as the template"
+msgstr ""
+
 #. module: mail_gateway
 #: model:ir.model.fields,field_description:mail_gateway.field_mail_compose_gateway_message__can_attach_attachment
 msgid "Can Attach Attachment"
@@ -83,17 +103,22 @@ msgid "Cc"
 msgstr ""
 
 #. module: mail_gateway
-#: model:ir.model.fields,field_description:mail_gateway.field_mail_channel__channel_type
+#: model:ir.model.fields,field_description:mail_gateway.field_discuss_channel__channel_type
 msgid "Channel Type"
 msgstr ""
 
 #. module: mail_gateway
-#: model:ir.model.fields,help:mail_gateway.field_mail_channel__channel_type
+#: model:ir.model.fields,help:mail_gateway.field_discuss_channel__channel_type
 msgid ""
 "Chat is private and unique between 2 persons. Group is private among invited"
 " persons. Channel can be freely joined (depending on its configuration)."
 msgstr ""
 
+#. module: mail_gateway
+#: model:ir.model.fields,field_description:mail_gateway.field_mail_compose_gateway_message__use_exclusion_list
+msgid "Check Exclusion List"
+msgstr ""
+
 #. module: mail_gateway
 #: model:ir.model.fields,field_description:mail_gateway.field_mail_mail__gateway_message_ids
 #: model:ir.model.fields,field_description:mail_gateway.field_mail_message__gateway_message_ids
@@ -101,7 +126,8 @@ msgid "Child gateway messages"
 msgstr ""
 
 #. module: mail_gateway
-#: model:ir.model.fields,field_description:mail_gateway.field_mail_channel__company_id
+#: model:ir.model.fields,field_description:mail_gateway.field_discuss_channel__company_id
+#: model:ir.model.fields,field_description:mail_gateway.field_mail_compose_gateway_message__record_company_id
 #: model:ir.model.fields,field_description:mail_gateway.field_mail_gateway__company_id
 #: model:ir.model.fields,field_description:mail_gateway.field_res_partner_gateway_channel__company_id
 msgid "Company"
@@ -132,6 +158,13 @@ msgstr ""
 msgid "Create new partner"
 msgstr ""
 
+#. module: mail_gateway
+#. odoo-javascript
+#: code:addons/mail_gateway/static/src/components/message/message_patch.esm.js:0
+#, python-format
+msgid "Create partner"
+msgstr ""
+
 #. module: mail_gateway
 #: model:ir.model.fields,field_description:mail_gateway.field_mail_compose_gateway_message__create_uid
 #: model:ir.model.fields,field_description:mail_gateway.field_mail_gateway__create_uid
@@ -158,12 +191,7 @@ msgid "Delete Emails"
 msgstr ""
 
 #. module: mail_gateway
-#: model:ir.model.fields,field_description:mail_gateway.field_mail_compose_gateway_message__auto_delete_message
-msgid "Delete Message Copy"
-msgstr ""
-
-#. module: mail_gateway
-#: model:ir.model,name:mail_gateway.model_mail_channel
+#: model:ir.model,name:mail_gateway.model_discuss_channel
 msgid "Discussion Channel"
 msgstr ""
 
@@ -178,15 +206,8 @@ msgid "Display Name"
 msgstr ""
 
 #. module: mail_gateway
-#: model:ir.model.fields,help:mail_gateway.field_mail_compose_gateway_message__auto_delete_message
-msgid ""
-"Do not keep a copy of the email in the document communication history (mass "
-"mailing only)"
-msgstr ""
-
-#. module: mail_gateway
-#: model:ir.model.fields,field_description:mail_gateway.field_mail_compose_gateway_message__email_add_signature
-msgid "Email Add Signature"
+#: model:ir.model.fields,field_description:mail_gateway.field_mail_compose_gateway_message__display_object_attachment_ids
+msgid "Display Object Attachment"
 msgstr ""
 
 #. module: mail_gateway
@@ -213,31 +234,32 @@ msgid ""
 "stored to ease the debugging of mailing issues."
 msgstr ""
 
-#. module: mail_gateway
-#. odoo-javascript
-#: code:addons/mail_gateway/static/src/models/discuss_sidebar_category.esm.js:0
-#, python-format
-msgid "Find a gateway channel..."
-msgstr ""
-
 #. module: mail_gateway
 #: model:ir.model.fields,field_description:mail_gateway.field_mail_compose_gateway_message__email_from
 msgid "From"
 msgstr ""
 
 #. module: mail_gateway
+#. odoo-javascript
+#: code:addons/mail_gateway/static/src/core/common/discuss_app_model_patch.esm.js:0
 #: model:ir.actions.act_window,name:mail_gateway.mail_gateway_act_window
-#: model:ir.model.fields,field_description:mail_gateway.field_mail_channel__gateway_id
+#: model:ir.model.fields,field_description:mail_gateway.field_discuss_channel__gateway_id
 #: model:ir.model.fields,field_description:mail_gateway.field_mail_guest__gateway_id
 #: model:ir.model.fields,field_description:mail_gateway.field_res_partner_gateway_channel__gateway_id
 #: model:ir.model.fields,field_description:mail_gateway.field_res_users__gateway_ids
-#: model:ir.model.fields.selection,name:mail_gateway.selection__mail_channel__channel_type__gateway
+#: model:ir.model.fields.selection,name:mail_gateway.selection__discuss_channel__channel_type__gateway
 #: model:ir.model.fields.selection,name:mail_gateway.selection__mail_notification__notification_type__gateway
 #: model:ir.module.category,name:mail_gateway.module_category_gateway
 #: model:ir.ui.menu,name:mail_gateway.mail_gateway_menu
+#, python-format
 msgid "Gateway"
 msgstr ""
 
+#. module: mail_gateway
+#: model:ir.model.fields,field_description:mail_gateway.field_res_users_settings__is_discuss_sidebar_category_gateway_open
+msgid "Gateway Category Open"
+msgstr ""
+
 #. module: mail_gateway
 #: model:ir.model.fields,field_description:mail_gateway.field_mail_mail__gateway_channel_ids
 #: model:ir.model.fields,field_description:mail_gateway.field_mail_message__gateway_channel_ids
@@ -255,7 +277,7 @@ msgid "Gateway Channel Data"
 msgstr ""
 
 #. module: mail_gateway
-#: model:ir.model.fields,field_description:mail_gateway.field_mail_channel__gateway_channel_token
+#: model:ir.model.fields,field_description:mail_gateway.field_discuss_channel__gateway_channel_token
 msgid "Gateway Channel Token"
 msgstr ""
 
@@ -265,7 +287,7 @@ msgid "Gateway Failure Reason"
 msgstr ""
 
 #. module: mail_gateway
-#: model:ir.model.fields,field_description:mail_gateway.field_mail_channel__gateway_message_ids
+#: model:ir.model.fields,field_description:mail_gateway.field_discuss_channel__gateway_message_ids
 #: model:ir.model.fields,field_description:mail_gateway.field_mail_notification__gateway_message_id
 msgid "Gateway Message"
 msgstr ""
@@ -310,13 +332,13 @@ msgstr ""
 #. module: mail_gateway
 #. odoo-javascript
 #: code:addons/mail_gateway/static/src/components/chatter/chatter.xml:0
-#: code:addons/mail_gateway/static/src/models/composer_view.esm.js:0
+#: code:addons/mail_gateway/static/src/components/composer/composer.esm.js:0
 #, python-format
 msgid "Gateway message"
 msgstr ""
 
 #. module: mail_gateway
-#: model:ir.model.fields,field_description:mail_gateway.field_mail_channel__gateway_token
+#: model:ir.model.fields,field_description:mail_gateway.field_discuss_channel__gateway_token
 msgid "Gateway related Token"
 msgstr ""
 
@@ -353,6 +375,14 @@ msgid ""
 "the Email Marketing app."
 msgstr ""
 
+#. module: mail_gateway
+#: model:ir.model.fields,help:mail_gateway.field_mail_compose_gateway_message__scheduled_date
+msgid ""
+"In comment mode: if set, postpone notifications sending. In mass mail mode: "
+"if sent, send emails after that date. This date is considered as being in "
+"UTC timezone."
+msgstr ""
+
 #. module: mail_gateway
 #: model_terms:ir.ui.view,arch_db:mail_gateway.mail_gateway_form_view
 msgid "Integrate Webhook"
@@ -374,7 +404,23 @@ msgid "Is Editor"
 msgstr ""
 
 #. module: mail_gateway
-#: model:ir.model.fields,help:mail_gateway.field_mail_channel__gateway_token
+#: model:ir.model.fields,field_description:mail_gateway.field_mail_compose_gateway_message__subtype_is_log
+msgid "Is a log"
+msgstr ""
+
+#. module: mail_gateway
+#: model:ir.model.fields,field_description:mail_gateway.field_mail_compose_gateway_message__auto_delete_keep_log
+msgid "Keep Message Copy"
+msgstr ""
+
+#. module: mail_gateway
+#: model:ir.model.fields,help:mail_gateway.field_mail_compose_gateway_message__auto_delete_keep_log
+msgid ""
+"Keep a copy of the email content if emails are removed (mass mailing only)"
+msgstr ""
+
+#. module: mail_gateway
+#: model:ir.model.fields,help:mail_gateway.field_discuss_channel__gateway_token
 #: model:ir.model.fields,help:mail_gateway.field_mail_gateway__token
 msgid "Key used for integration purposes"
 msgstr ""
@@ -396,16 +442,6 @@ msgstr ""
 msgid "Language"
 msgstr ""
 
-#. module: mail_gateway
-#: model:ir.model.fields,field_description:mail_gateway.field_mail_compose_gateway_message____last_update
-#: model:ir.model.fields,field_description:mail_gateway.field_mail_gateway____last_update
-#: model:ir.model.fields,field_description:mail_gateway.field_mail_guest_manage____last_update
-#: model:ir.model.fields,field_description:mail_gateway.field_mail_message_gateway_link____last_update
-#: model:ir.model.fields,field_description:mail_gateway.field_mail_message_gateway_send____last_update
-#: model:ir.model.fields,field_description:mail_gateway.field_res_partner_gateway_channel____last_update
-msgid "Last Modified on"
-msgstr ""
-
 #. module: mail_gateway
 #: model:ir.model.fields,field_description:mail_gateway.field_mail_compose_gateway_message__write_uid
 #: model:ir.model.fields,field_description:mail_gateway.field_mail_gateway__write_uid
@@ -433,7 +469,7 @@ msgstr ""
 
 #. module: mail_gateway
 #. odoo-javascript
-#: code:addons/mail_gateway/static/src/models/message_action_view.esm.js:0
+#: code:addons/mail_gateway/static/src/components/message/message_patch.esm.js:0
 #, python-format
 msgid "Link Message to thread"
 msgstr ""
@@ -445,16 +481,11 @@ msgstr ""
 
 #. module: mail_gateway
 #. odoo-javascript
-#: code:addons/mail_gateway/static/src/models/message_action_view.esm.js:0
+#: code:addons/mail_gateway/static/src/core/common/message_actions.esm.js:0
 #, python-format
 msgid "Link to thread"
 msgstr ""
 
-#. module: mail_gateway
-#: model:ir.model.fields,field_description:mail_gateway.field_mail_compose_gateway_message__is_log
-msgid "Log as Internal Note"
-msgstr ""
-
 #. module: mail_gateway
 #: model:ir.model.fields,field_description:mail_gateway.field_mail_compose_gateway_message__mail_activity_type_id
 msgid "Mail Activity Type"
@@ -494,7 +525,7 @@ msgstr ""
 
 #. module: mail_gateway
 #. odoo-javascript
-#: code:addons/mail_gateway/static/src/models/channel_member_view.esm.js:0
+#: code:addons/mail_gateway/static/src/components/message/message_patch.esm.js:0
 #, python-format
 msgid "Manage guest"
 msgstr ""
@@ -541,11 +572,6 @@ msgstr ""
 msgid "Message Notifications"
 msgstr ""
 
-#. module: mail_gateway
-#: model:ir.model.fields,field_description:mail_gateway.field_mail_compose_gateway_message__record_name
-msgid "Message Record Name"
-msgstr ""
-
 #. module: mail_gateway
 #: model:ir.model.fields,help:mail_gateway.field_mail_compose_gateway_message__message_type
 msgid ""
@@ -571,16 +597,6 @@ msgstr ""
 msgid "Notification Type"
 msgstr ""
 
-#. module: mail_gateway
-#: model:ir.model.fields,field_description:mail_gateway.field_mail_compose_gateway_message__notify
-msgid "Notify followers"
-msgstr ""
-
-#. module: mail_gateway
-#: model:ir.model.fields,help:mail_gateway.field_mail_compose_gateway_message__notify
-msgid "Notify followers of the document (mass post only)"
-msgstr ""
-
 #. module: mail_gateway
 #: model:ir.model.fields,field_description:mail_gateway.field_mail_compose_gateway_message__object_attachment_ids
 msgid "Object Attachments"
@@ -636,14 +652,19 @@ msgstr ""
 msgid "Pending"
 msgstr ""
 
+#. module: mail_gateway
+#: model:ir.model.fields,field_description:mail_gateway.field_mail_compose_gateway_message__record_name
+msgid "Record Name"
+msgstr ""
+
 #. module: mail_gateway
 #: model:ir.model.fields,field_description:mail_gateway.field_mail_message_gateway_link__resource_ref
 msgid "Record reference"
 msgstr ""
 
 #. module: mail_gateway
-#: model:ir.model.fields,field_description:mail_gateway.field_mail_compose_gateway_message__res_id
-msgid "Related Document ID"
+#: model:ir.model.fields,field_description:mail_gateway.field_mail_compose_gateway_message__res_ids
+msgid "Related Document IDs"
 msgstr ""
 
 #. module: mail_gateway
@@ -678,6 +699,23 @@ msgid ""
 "creation."
 msgstr ""
 
+#. module: mail_gateway
+#: model:ir.model.fields,field_description:mail_gateway.field_mail_compose_gateway_message__res_domain_user_id
+msgid "Responsible"
+msgstr ""
+
+#. module: mail_gateway
+#: model:ir.model.fields,field_description:mail_gateway.field_mail_compose_gateway_message__scheduled_date
+msgid "Scheduled Date"
+msgstr ""
+
+#. module: mail_gateway
+#. odoo-javascript
+#: code:addons/mail_gateway/static/src/core/common/discuss_app_model_patch.esm.js:0
+#, python-format
+msgid "Search Gateway Channel"
+msgstr ""
+
 #. module: mail_gateway
 #: model_terms:ir.ui.view,arch_db:mail_gateway.mail_message_gateway_send_form_view
 msgid "Send"
@@ -690,8 +728,27 @@ msgstr ""
 
 #. module: mail_gateway
 #. odoo-javascript
-#: code:addons/mail_gateway/static/src/models/message_action_view.esm.js:0
-#: code:addons/mail_gateway/static/src/models/message_action_view.esm.js:0
+#: code:addons/mail_gateway/static/src/components/composer/composer.esm.js:0
+#, python-format
+msgid "Send a message to a gateway..."
+msgstr ""
+
+#. module: mail_gateway
+#. odoo-javascript
+#: code:addons/mail_gateway/static/src/components/composer/composer.esm.js:0
+#, python-format
+msgid "Send gateway"
+msgstr ""
+
+#. module: mail_gateway
+#: model:ir.model.fields,field_description:mail_gateway.field_mail_compose_gateway_message__force_send
+msgid "Send mailing or notifications directly"
+msgstr ""
+
+#. module: mail_gateway
+#. odoo-javascript
+#: code:addons/mail_gateway/static/src/components/message/message_patch.esm.js:0
+#: code:addons/mail_gateway/static/src/core/common/message_actions.esm.js:0
 #, python-format
 msgid "Send with gateway"
 msgstr ""
@@ -711,6 +768,11 @@ msgstr ""
 msgid "Technical data used to get the gateway author"
 msgstr ""
 
+#. module: mail_gateway
+#: model:ir.model.fields,help:mail_gateway.field_res_users_settings__is_discuss_sidebar_category_gateway_open
+msgid "The gateway category in the sidebar will be open"
+msgstr ""
+
 #. module: mail_gateway
 #: model:ir.model.fields,help:mail_gateway.field_mail_compose_gateway_message__auto_delete
 msgid ""
@@ -719,9 +781,14 @@ msgid ""
 "storage space of your Odoo database."
 msgstr ""
 
+#. module: mail_gateway
+#: model:ir.model.fields,field_description:mail_gateway.field_mail_compose_gateway_message__model_is_thread
+msgid "Thread-Enabled"
+msgstr ""
+
 #. module: mail_gateway
 #. odoo-javascript
-#: code:addons/mail_gateway/static/src/components/composer/composer.xml:0
+#: code:addons/mail_gateway/static/src/components/chatter/chatter.xml:0
 #, python-format
 msgid "To:"
 msgstr ""
@@ -747,13 +814,13 @@ msgid "Update Webhook"
 msgstr ""
 
 #. module: mail_gateway
-#: model:ir.model.fields,field_description:mail_gateway.field_mail_compose_gateway_message__use_active_domain
-msgid "Use active domain"
+#: model:ir.model.fields,field_description:mail_gateway.field_mail_compose_gateway_message__template_id
+msgid "Use template"
 msgstr ""
 
 #. module: mail_gateway
-#: model:ir.model.fields,field_description:mail_gateway.field_mail_compose_gateway_message__template_id
-msgid "Use template"
+#: model:ir.model.fields,help:mail_gateway.field_mail_compose_gateway_message__res_domain_user_id
+msgid "Used as context used to evaluate composer domain"
 msgstr ""
 
 #. module: mail_gateway
@@ -762,6 +829,11 @@ msgstr ""
 msgid "User"
 msgstr ""
 
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_res_users_settings
+msgid "User Settings"
+msgstr ""
+
 #. module: mail_gateway
 #: model:ir.model.fields,help:mail_gateway.field_mail_gateway__webhook_user_id
 msgid "User that will create the messages"
@@ -808,13 +880,6 @@ msgstr ""
 msgid "Wizard Partner"
 msgstr ""
 
-#. module: mail_gateway
-#. odoo-javascript
-#: code:addons/mail_gateway/static/src/components/message/message.xml:0
-#, python-format
-msgid "document"
-msgstr ""
-
 #. module: mail_gateway
 #. odoo-javascript
 #: code:addons/mail_gateway/static/src/components/chatter/chatter.xml:0

odoo/addons/mail_gateway/models/__init__.py

@@ -1,10 +1,11 @@
+from . import ir_websocket
+from . import mail_gateway_abstract
 from . import mail_message
 from . import mail_notification
-from . import mail_channel
+from . import discuss_channel
 from . import mail_gateway
-from . import ir_websocket
 from . import res_partner
 from . import mail_guest
-from . import mail_gateway_abstract
 from . import res_users
+from . import res_users_settings
 from . import mail_thread

odoo/addons/mail_gateway/models/{mail_channel.py → discuss_channel.py}

@@ -7,7 +7,7 @@ from odoo import api, fields, models
 
 
 class MailChannel(models.Model):
-    _inherit = "mail.channel"
+    _inherit = "discuss.channel"
 
     gateway_channel_token = fields.Char()
     anonymous_name = fields.Char()  # Same field we will use on im_livechat
@@ -26,9 +26,16 @@ class MailChannel(models.Model):
         required=False,
     )
 
-    def channel_info(self):
-        result = super().channel_info()
-        for record, item in zip(self, result):
+    def _compute_is_chat(self):
+        res = super()._compute_is_chat()
+        for record in self:
+            if record.channel_type == "gateway":
+                record.is_chat = True
+        return res
+
+    def _channel_info(self):
+        result = super()._channel_info()
+        for record, item in zip(self, result, strict=True):
             item["gateway"] = {
                 "id": record.gateway_id.id,
                 "name": record.gateway_id.name,
@@ -70,10 +77,25 @@ class MailChannel(models.Model):
             ).send_gateway()
         return message
 
-    def _message_update_content_after_hook(self, message):
-        self.ensure_one()
+    def _message_update_content(
+        self,
+        message,
+        body,
+        attachment_ids=None,
+        partner_ids=None,
+        strict=True,
+        **kwargs,
+    ):
+        res = super()._message_update_content(
+            message=message,
+            body=body,
+            attachment_ids=attachment_ids,
+            partner_ids=partner_ids,
+            strict=strict,
+            **kwargs,
+        )
         if self.channel_type == "gateway" and message.gateway_notification_ids:
             self.env[
-                "mail.gateway.{}".format(self.gateway_id.gateway_type)
+                f"mail.gateway.{self.gateway_id.gateway_type}"
             ]._update_content_after_hook(self, message)
-        return super()._message_update_content_after_hook(message=message)
+        return res

odoo/addons/mail_gateway/models/ir_websocket.py

@@ -14,7 +14,7 @@ class IrWebsocket(models.AbstractModel):
         result = super()._build_bus_channel_list(channels)
         if req.session.uid:
             if req.env.user.has_group("mail_gateway.gateway_user"):
-                for channel in req.env["mail.channel"].search(
+                for channel in req.env["discuss.channel"].search(
                     [("channel_type", "=", "gateway")]
                 ):
                     result.append(channel)

odoo/addons/mail_gateway/models/mail_gateway.py

@@ -49,7 +49,7 @@ class MailGateway(models.Model):
 
     def _get_channel_id(self, chat_token):
         return (
-            self.env["mail.channel"]
+            self.env["discuss.channel"]
             .search(
                 [
                     ("gateway_channel_token", "=", str(chat_token)),
@@ -61,7 +61,7 @@ class MailGateway(models.Model):
         )
 
     def _get_webhook_url(self):
-        return "%s/gateway/%s/%s/update" % (
+        return "{}/gateway/{}/{}/update".format(
             self.webhook_url
             or self.env["ir.config_parameter"].get_param("web.base.url"),
             self.gateway_type,
@@ -91,7 +91,7 @@ class MailGateway(models.Model):
         self.set_webhook()
 
     def write(self, vals):
-        res = super(MailGateway, self).write(vals)
+        res = super().write(vals)
         if (
             "webhook_key" in vals
             or "integrated_webhook_state" in vals
@@ -103,7 +103,7 @@ class MailGateway(models.Model):
 
     @api.model_create_multi
     def create(self, mvals):
-        res = super(MailGateway, self).create(mvals)
+        res = super().create(mvals)
         self.clear_caches()
         return res
 

odoo/addons/mail_gateway/models/mail_gateway_abstract.py

@@ -33,10 +33,10 @@ class MailGatewayAbstract(models.AbstractModel):
     def _get_channel(self, gateway, token, update, force_create=False):
         chat_id = gateway._get_channel_id(token)
         if chat_id:
-            return gateway.env["mail.channel"].browse(chat_id)
+            return gateway.env["discuss.channel"].browse(chat_id)
         if not force_create and gateway.has_new_channel_security:
             return False
-        channel = gateway.env["mail.channel"].create(
+        channel = gateway.env["discuss.channel"].create(
             self._get_channel_vals(gateway, token, update)
         )
         channel._broadcast(channel.channel_member_ids.mapped("partner_id").ids)

odoo/addons/mail_gateway/models/mail_message.py

@@ -6,7 +6,6 @@ from odoo import api, fields, models
 
 
 class MailMessage(models.Model):
-
     _inherit = "mail.message"
 
     gateway_type = fields.Selection(
@@ -49,14 +48,18 @@ class MailMessage(models.Model):
     def _compute_gateway_channel_ids(self):
         for record in self:
             if self.env.user.has_group("mail_gateway.gateway_user"):
-                channels = record.notification_ids.res_partner_id.gateway_channel_ids.filtered(
-                    lambda r: (r.gateway_token, r.gateway_id.id)
+                partners = record.notification_ids.res_partner_id
+                channels = partners.gateway_channel_ids.filtered(
+                    lambda r, messages=record.gateway_message_ids: (
+                        r.gateway_token,
+                        r.gateway_id.id,
+                    )
                     not in [
                         (
                             notification.gateway_channel_id.gateway_channel_token,
                             notification.gateway_channel_id.gateway_id.id,
                         )
-                        for notification in record.gateway_message_ids.gateway_notification_ids
+                        for notification in messages.gateway_notification_ids
                     ]
                 )
             else:
@@ -77,16 +80,14 @@ class MailMessage(models.Model):
 
     def _get_message_format_fields(self):
         result = super()._get_message_format_fields()
-        result.append("gateway_type")
-        result.append("gateway_channel_data")
-        result.append("gateway_thread_data")
+        result += ["gateway_type", "gateway_channel_data", "gateway_thread_data"]
         return result
 
     def _send_to_gateway_thread(self, gateway_channel_id):
         chat_id = gateway_channel_id.gateway_id._get_channel_id(
             gateway_channel_id.gateway_token
         )
-        channel = self.env["mail.channel"].browse(chat_id)
+        channel = self.env["discuss.channel"].browse(chat_id)
         channel.message_post(**self._get_gateway_thread_message_vals())
         if not self.gateway_type:
             self.gateway_type = gateway_channel_id.gateway_id.gateway_type