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

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,
@@ -79,11 +79,11 @@ class MailGateway(models.Model):
     def set_webhook(self):
         self.ensure_one()
         if self.can_set_webhook:
-            self.env["mail.gateway.%s" % self.gateway_type]._set_webhook(self)
+            self.env[f"mail.gateway.{self.gateway_type}"]._set_webhook(self)
 
     def remove_webhook(self):
         self.ensure_one()
-        self.env["mail.gateway.%s" % self.gateway_type]._remove_webhook(self)
+        self.env[f"mail.gateway.{self.gateway_type}"]._remove_webhook(self)
 
     def update_webhook(self):
         self.ensure_one()
@@ -91,20 +91,20 @@ 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
             or "webhook_secret" in vals
             or "webhook_user_id" in vals
         ):
-            self.clear_caches()
+            self.env.registry.clear_cache()
         return res
 
     @api.model_create_multi
     def create(self, mvals):
-        res = super(MailGateway, self).create(mvals)
-        self.clear_caches()
+        res = super().create(mvals)
+        self.env.registry.clear_cache()
         return res
 
     @api.model

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)
@@ -48,7 +48,7 @@ class MailGatewayAbstract(models.AbstractModel):
     def _get_channel_vals(self, gateway, token, update):
         author = self._get_author(gateway, update)
         members = [
-            Command.create({"partner_id": partner.id, "is_pinned": True})
+            Command.create({"partner_id": partner.id, "unpin_dt": False})
             for partner in gateway.member_ids.partner_id
         ]
         if author:

odoo/addons/mail_gateway/models/mail_guest.py

@@ -3,6 +3,8 @@
 
 from odoo import fields, models
 
+from odoo.addons.mail.tools.discuss import Store
+
 
 class MailGuest(models.Model):
     _inherit = "mail.guest"
@@ -10,9 +12,9 @@ class MailGuest(models.Model):
     gateway_id = fields.Many2one("mail.gateway")
     gateway_token = fields.Char()
 
-    def _guest_format(self, fields=None):
-        result = super()._guest_format(fields=fields)
+    def _to_store(self, store: Store, /, *, fields=None):
+        result = super()._to_store(store, fields=fields)
         if not fields or "gateway_id" in fields:
-            for guest in result:
-                result[guest]["gateway"] = {"id": guest.gateway_id.id}
+            for record in self:
+                store.add(record, {"gateway": {"id": record.gateway_id.id}})
         return result

odoo/addons/mail_gateway/models/mail_message.py

@@ -4,9 +4,10 @@
 
 from odoo import api, fields, models
 
+from odoo.addons.mail.tools.discuss import Store
 
-class MailMessage(models.Model):
 
+class MailMessage(models.Model):
     _inherit = "mail.message"
 
     gateway_type = fields.Selection(
@@ -49,14 +50,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:
@@ -75,18 +80,43 @@ class MailMessage(models.Model):
                     0
                 ].gateway_channel_id
 
-    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")
+    def _to_store(
+        self,
+        store: Store,
+        /,
+        *,
+        fields=None,
+        format_reply=True,
+        msg_vals=None,
+        for_current_user=False,
+        add_followers=False,
+        followers=None,
+    ):
+        result = super()._to_store(
+            store,
+            fields=fields,
+            format_reply=format_reply,
+            msg_vals=msg_vals,
+            for_current_user=for_current_user,
+            add_followers=add_followers,
+            followers=followers,
+        )
+        for record in self:
+            store.add(
+                record,
+                {
+                    "gateway_type": record.gateway_type,
+                    "gateway_channel_data": record.gateway_channel_data,
+                    "gateway_thread_data": record.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
@@ -99,17 +129,6 @@ class MailMessage(models.Model):
                 "gateway_type": gateway_channel_id.gateway_id.gateway_type,
             }
         )
-        self.env["bus.bus"]._sendone(
-            self.env.user.partner_id,
-            "mail.message/insert",
-            {
-                "id": self.id,
-                "gateway_type": self.gateway_type,
-                "notifications": self.sudo()
-                .notification_ids._filtered_for_web_client()
-                ._notification_format(),
-            },
-        )
         return {}
 
     def _get_gateway_thread_message_vals(self):

odoo/addons/mail_gateway/models/mail_notification.py

@@ -3,17 +3,19 @@
 
 from odoo import fields, models
 
+from odoo.addons.mail.tools.discuss import Store
+
 
 class MailNotification(models.Model):
     _inherit = "mail.notification"
 
-    gateway_channel_id = fields.Many2one("mail.channel")
+    gateway_channel_id = fields.Many2one("discuss.channel")
     notification_type = fields.Selection(
         selection_add=[("gateway", "Gateway")], ondelete={"gateway": "cascade"}
     )
     gateway_message_id = fields.Char(readonly=True)
     gateway_failure_reason = fields.Text(
-        readonly=1,
+        readonly=True,
         help="Failure reason. This is usually the exception thrown by the"
         " email server, stored to ease the debugging of mailing issues.",
     )
@@ -24,17 +26,22 @@ class MailNotification(models.Model):
     def _set_read_gateway(self):
         self.sudo().write({"is_read": True, "read_date": fields.Datetime.now()})
 
-    def _notification_format(self):
-        result = super()._notification_format()
-        for record, formatted_value in zip(self, result):
-            formatted_value["gateway_type"] = record.gateway_type
-            formatted_value["channel_name"] = record.gateway_channel_id.name
+    def _to_store(self, store: Store, /):
+        result = super()._to_store(store)
+        for record in self:
+            store.add(
+                record,
+                {
+                    "gateway_type": record.gateway_type,
+                    "channel_name": record.gateway_channel_id.name,
+                },
+            )
         return result
 
     def send_gateway(self, auto_commit=False, raise_exception=False, parse_mode="HTML"):
         for record in self:
             gateway = record.gateway_channel_id.gateway_id
-            self.env["mail.gateway.%s" % gateway.gateway_type]._send(
+            self.env[f"mail.gateway.{gateway.gateway_type}"]._send(
                 gateway,
                 record,
                 auto_commit=auto_commit,

odoo/addons/mail_gateway/models/mail_thread.py

@@ -2,10 +2,24 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 from odoo import models
 
+from odoo.addons.mail.tools.discuss import Store
+
 
 class MailThread(models.AbstractModel):
     _inherit = "mail.thread"
 
+    def _get_message_create_valid_field_names(self):
+        # Add gateway fields
+        field_names = super()._get_message_create_valid_field_names()
+        field_names.update(
+            {"gateway_type", "gateway_notifications", "gateway_message_id"}
+        )
+        return field_names
+
+    def _get_notify_valid_parameters(self):
+        notify_valid_parameters = super()._get_notify_valid_parameters()
+        return notify_valid_parameters | {"gateway_notifications"}
+
     def _notify_thread_by_email(self, message, recipients_data, **kwargs):
         partners_data = [r for r in recipients_data if r["notif"] == "gateway"]
         if partners_data:
@@ -56,30 +70,62 @@ class MailThread(models.AbstractModel):
             return result
         return super()._notify_get_recipients(message, msg_vals, **kwargs)
 
+    def _thread_to_store(self, store: Store, /, *, fields=None, request_list=None):
+        res = super()._thread_to_store(store, fields=fields, request_list=request_list)
+        for record in self:
+            followers = record.message_get_followers()
+            if "mail.followers" in followers:
+                store.add(
+                    record,
+                    {
+                        "gateway_followers": [
+                            f["partner"]
+                            for f in followers["mail.followers"]
+                            if f["partner"]["gateway_channels"]
+                        ]
+                    },
+                    as_thread=True,
+                )
+        return res
+
     def _check_can_update_message_content(self, messages):
         # We can delete the messages comming from a gateway on not channels
-        if self._name != "mail.channel":
+        if self._name != "discuss.channel":
             new_messages = messages.filtered(lambda r: not r.gateway_message_ids)
         else:
             new_messages = messages
         return super()._check_can_update_message_content(new_messages)
 
     def _message_update_content(
-        self, message, body, attachment_ids=None, strict=True, **kwargs
+        self,
+        message,
+        body,
+        attachment_ids=None,
+        partner_ids=None,
+        strict=True,
+        **kwargs,
     ):
         result = super()._message_update_content(
-            message, body, attachment_ids=attachment_ids, strict=strict, **kwargs
+            message=message,
+            body=body,
+            attachment_ids=attachment_ids,
+            partner_ids=partner_ids,
+            strict=strict,
+            **kwargs,
         )
         if body == "":
             # Unlink the message
-            for gateway_message in message.gateway_message_ids:
-                gateway_message.gateway_message_id = False
-                self.env["bus.bus"]._sendone(
-                    self.env.user.partner_id,
-                    "mail.message/insert",
+            for gateway_msg in message.gateway_message_ids:
+                gateway_msg.gateway_message_id = False
+                gateway_msg._bus_send_store(
+                    gateway_msg,
                     {
-                        "id": gateway_message.id,
-                        "gateway_thread_data": gateway_message.sudo().gateway_thread_data,
+                        "gateway_thread_data": gateway_msg.sudo().gateway_thread_data,
                     },
                 )
         return result
+
+    def _get_allowed_message_post_params(self):
+        result = super()._get_allowed_message_post_params()
+        result.add("gateway_notifications")
+        return result

odoo/addons/mail_gateway/models/res_partner.py

@@ -1,7 +1,7 @@
 # Copyright 2024 Dixmit
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
-from odoo import fields, models
+from odoo import api, fields, models
 
 
 class ResPartner(models.Model):
@@ -13,30 +13,16 @@ class ResPartner(models.Model):
         "res.partner.gateway.channel", inverse_name="partner_id"
     )
 
-    def mail_partner_format(self, fields=None):
-        """Override to add gateway info."""
-        partners_format = super().mail_partner_format(fields=fields)
-        if not fields:
-            fields = {"gateway_channel_ids": True}
-        for partner in self:
-            if "gateway_channel_ids" in fields:
-                partners_format.get(partner).update(
-                    {
-                        "gateway_channels": partner.gateway_channel_ids.mail_format(),
-                    }
-                )
-        return partners_format
-
     def _get_channels_as_member(self):
         channels = super()._get_channels_as_member()
         if self.env.user.has_group("mail_gateway.gateway_user"):
-            channels |= self.env["mail.channel"].search(
+            channels |= self.env["discuss.channel"].search(
                 [
                     ("channel_type", "=", "gateway"),
                     (
                         "channel_member_ids",
                         "in",
-                        self.env["mail.channel.member"]
+                        self.env["discuss.channel.member"]
                         .sudo()
                         ._search(
                             [
@@ -66,24 +52,16 @@ class ResPartnerGatewayChannel(models.Model):
         "res.company", related="gateway_id.company_id", store=True
     )
 
-    def name_get(self):
+    @api.depends_context("mail_gateway_partner_info")
+    def _compute_display_name(self):
         # Be able to tell to which partner belongs the gateway partner channel
         # e.g.: picking it from a selector
-        result = []
-        origin = super().name_get()
-        if not self.env.context.get("mail_gateway_partner_info", False):
-            return origin
-        origin_dict = dict(origin)
-        for record in self:
-            result.append(
-                (
-                    record.id,
-                    "{} ({})".format(
-                        record.partner_id.display_name, origin_dict[record.id]
-                    ),
-                )
+        if not self.env.context.get("mail_gateway_partner_info"):
+            return super()._compute_display_name()
+        for gateway_channel in self:
+            gateway_channel.display_name = (
+                f"{gateway_channel.partner_id.display_name} ({gateway_channel.name})"
             )
-        return result
 
     _sql_constraints = [
         (

odoo/addons/mail_gateway/models/res_users.py

@@ -5,12 +5,11 @@ from odoo import fields, models
 
 
 class ResUsers(models.Model):
-
     _inherit = "res.users"
 
     gateway_ids = fields.Many2many("mail.gateway")
 
-    def _init_messaging(self):
-        result = super()._init_messaging()
-        result["gateways"] = self.gateway_ids.gateway_info()
+    def _init_messaging(self, store):
+        result = super()._init_messaging(store)
+        store.add({"gateways": self.gateway_ids.gateway_info()})
         return result

odoo/addons/mail_gateway/models/res_users_settings.py

@@ -0,0 +1,12 @@
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+from odoo import fields, models
+
+
+class ResUsersSettings(models.Model):
+    _inherit = "res.users.settings"
+
+    is_discuss_sidebar_category_gateway_open = fields.Boolean(
+        string="Gateway Category Open",
+        default=True,
+        help="The gateway category in the sidebar will be open",
+    )

odoo/addons/mail_gateway/readme/CONTRIBUTORS.md

@@ -0,0 +1,5 @@
+- Enric Tobella
+- Olga Marco
+
+- [Tecnativa](https://tecnativa.com)
+  - Carlos Roca

odoo/addons/mail_gateway/readme/{CREDITS.rst → CREDITS.md}

@@ -1 +1,2 @@
-This work has been funded by AEOdoo (Asociación Española de Odoo - https://www.aeodoo.org)
+This work has been funded by AEOdoo (Asociación Española de Odoo -
+<https://www.aeodoo.org>)

odoo/addons/mail_gateway/readme/DESCRIPTION.md

@@ -0,0 +1,8 @@
+This module will allow you to integrate an external chat system in your
+Odoo system. It requires extra modules with the specific configuration
+of each chat system, like mail_gateway_telegram or
+mail_gateway_whatsapp.
+
+This way, a group of users can respond customers or any other set of
+partners within Odoo, but the messages will be sent through the external
+chat system.

odoo/addons/mail_gateway/readme/ROADMAP.md

@@ -0,0 +1 @@
+1. Make possible to schedule gateway messages.

odoo/addons/mail_gateway/readme/USAGE.md

@@ -0,0 +1,12 @@
+When external messages are received, they will be directly sent to the
+discuss menu. Answering to these messages will send the answer to the
+external contact. We can assign this messages to any record using the
+message actions. Also, we can assign the sender to a partner using the
+followers menu and selecting the partner.
+
+On a standard record associated to a partner with external chat, we can
+send messages to the external contact directly selecting the methods of
+the partner. To use this, we just need to use the
+
+It is recomended to enable chatter notification to all users that will
+receive messages from gateways.

odoo/addons/mail_gateway/security/ir.model.access.csv

@@ -3,8 +3,10 @@ access_res_partner_gateway_channel_portal,res.partner.gateway.channel.portal,mod
 access_res_partner_gateway_channel_user,res.partner.gateway.channel,model_res_partner_gateway_channel,base.group_user,1,0,0,0
 manage_res_partner_gateway_channel_user,res.partner.gateway.channel,model_res_partner_gateway_channel,gateway_user,1,1,1,1
 access_mail_message_gateway_send_user,mail.message.gateway.send,model_mail_message_gateway_send,base.group_user,1,1,1,0
-access_mail_gateway_all,mail.telegram.bot.all,model_mail_gateway,,1,0,0,0
-access_mail_guest_manage,mail.telegram.bot.all,model_mail_guest_manage,base.group_user,1,1,1,1
+access_mail_gateway_portal,mail.gateway.portal,model_mail_gateway,base.group_portal,1,0,0,0
+access_mail_gateway_public,mail.gateway.public,model_mail_gateway,base.group_public,1,0,0,0
+access_mail_gateway_user,mail.gateway.user,model_mail_gateway,base.group_user,1,0,0,0
+access_mail_guest_manage,mail.gateway.internal,model_mail_guest_manage,base.group_user,1,1,1,1
 access_mail_message_gateway_link,mail.message.link.all,model_mail_message_gateway_link,base.group_user,1,1,1,1
 access_mail_gateway_system,mail_gateway,model_mail_gateway,base.group_system,1,1,1,1
 access_mail_compose_gateway_message,access.mail.compose.gateway.message,model_mail_compose_gateway_message,base.group_user,1,1,1,0

odoo/addons/mail_gateway/security/security.xml

@@ -11,13 +11,13 @@
             eval="[(4, ref('base.user_root')), (4, ref('base.user_admin'))]"
         />
     </record>
-    <record id="mail_channel_gateway_rule" model="ir.rule">
-        <field name="name">Mail.channel: access gateway</field>
-        <field name="model_id" ref="mail.model_mail_channel" />
+    <record id="discuss_channel_gateway_rule" model="ir.rule">
+        <field name="name">discuss.channel: access gateway</field>
+        <field name="model_id" ref="mail.model_discuss_channel" />
         <field name="groups" eval="[(4, ref('mail_gateway.gateway_user'))]" />
         <field
             name="domain_force"
-        >[('channel_type', '=', 'gateway'), '|', ('company_id', '=', False), ('company_id', 'in', company_ids) ]</field>
+        >[('channel_type', '=', 'gateway'), ('company_id', 'in', company_ids + [False]) ]</field>
         <field name="perm_read" eval="True" />
         <field name="perm_create" eval="False" />
         <field name="perm_write" eval="True" />
@@ -28,7 +28,7 @@
         <field name="model_id" ref="mail_gateway.model_mail_gateway" />
         <field
             name="domain_force"
-        >['|', ('company_id', '=', False), ('company_id', 'in', company_ids) ]</field>
+        >[('company_id', 'in', company_ids + [False]) ]</field>
         <field name="perm_read" eval="True" />
         <field name="perm_create" eval="True" />
         <field name="perm_write" eval="True" />
@@ -39,17 +39,17 @@
         <field name="model_id" ref="mail_gateway.model_res_partner_gateway_channel" />
         <field
             name="domain_force"
-        >['|', ('company_id', '=', False), ('company_id', 'in', company_ids) ]</field>
+        >[('company_id', 'in', company_ids + [False]) ]</field>
         <field name="perm_read" eval="True" />
         <field name="perm_create" eval="True" />
         <field name="perm_write" eval="True" />
         <field name="perm_unlink" eval="True" />
     </record>
-    <record id="ir_rule_mail_channel_partner_group_user" model="ir.rule">
+    <record id="ir_rule_discuss_channel_partner_group_user" model="ir.rule">
         <field
             name="name"
-        >mail.channel.member: write its own entries on gateway channels members</field>
-        <field name="model_id" ref="mail.model_mail_channel_member" />
+        >discuss.channel.member: write its own entries on gateway channels members</field>
+        <field name="model_id" ref="mail.model_discuss_channel_member" />
         <field name="groups" eval="[(4, ref('mail_gateway.gateway_user'))]" />
         <field name="domain_force">[('channel_id.channel_type', '=', 'gateway')]</field>
         <field name="perm_read" eval="False" />
@@ -57,5 +57,4 @@
         <field name="perm_create" eval="False" />
         <field name="perm_unlink" eval="True" />
     </record>
-
 </odoo>