[triggers] 1.5.0

Adapt to Gajim changes
This commit is contained in:
wurstsalat
2024-04-13 08:47:19 +02:00
parent 750cfa4c90
commit f9d1eaaf26
2 changed files with 7 additions and 8 deletions

View File

@@ -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"
}

View File

@@ -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: