From f9d1eaaf26a89b3f157cea1b40f06a489105a7e1 Mon Sep 17 00:00:00 2001
From: wurstsalat <mailtrash@posteo.de>
Date: Sat, 13 Apr 2024 08:47:19 +0200
Subject: [PATCH] [triggers] 1.5.0

Adapt to Gajim changes
---
 triggers/plugin-manifest.json |  4 ++--
 triggers/triggers.py          | 11 +++++------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/triggers/plugin-manifest.json b/triggers/plugin-manifest.json
index 9fd7b6c..86d4b1f 100644
--- a/triggers/plugin-manifest.json
+++ b/triggers/plugin-manifest.json
@@ -13,8 +13,8 @@
         "win32"
     ],
     "requirements": [
-        "gajim>=1.5.0"
+        "gajim>=1.9.0"
     ],
     "short_name": "triggers",
-    "version": "1.4.9"
+    "version": "1.5.0"
 }
\ No newline at end of file
diff --git a/triggers/triggers.py b/triggers/triggers.py
index b52e264..84789ee 100644
--- a/triggers/triggers.py
+++ b/triggers/triggers.py
@@ -33,7 +33,6 @@ from gajim.common import ged
 from gajim.common.const import PROPAGATE_EVENT
 from gajim.common.const import STOP_EVENT
 from gajim.common.events import Notification
-from gajim.common.events import GcMessageReceived
 from gajim.common.events import MessageReceived
 from gajim.common.events import PresenceReceived
 from gajim.common.helpers import play_sound_file
@@ -47,8 +46,7 @@ from triggers.util import RuleResult
 
 log = logging.getLogger('gajim.p.triggers')
 
-MessageEventsT = Union[GcMessageReceived, MessageReceived]
-ProcessableEventsT = Union[MessageEventsT, Notification, PresenceReceived]
+ProcessableEventsT = Union[MessageReceived, Notification, PresenceReceived]
 RuleT = dict[str, Any]
 
 
@@ -74,9 +72,10 @@ class Triggers(GajimPlugin):
         log.info('Result: %s', result)
         return self._excecute_notification_rules(result, event)
 
-    def _on_message_received(self, event: MessageEventsT) -> bool:
+    def _on_message_received(self, event: MessageReceived) -> bool:
         log.info('Process %s', event.name)
-        if not event.msgtxt:
+        message = event.message
+        if message.text is None:
             log.info('Discard event because it has no message text')
             return PROPAGATE_EVENT
 
@@ -134,7 +133,7 @@ class Triggers(GajimPlugin):
 
     @log_result
     def _check_rule_apply_msg_received(self,
-                                       event: MessageEventsT,
+                                       event: MessageReceived,
                                        rule: RuleT
                                        ) -> bool: