From 352d0ec1411969262119f75e15af1c2f12a8531b Mon Sep 17 00:00:00 2001 From: wurstsalat Date: Tue, 26 Oct 2021 22:07:55 +0200 Subject: [PATCH] [triggers] Adapt to Gajim changes --- triggers/gtk/config.py | 52 +--- triggers/gtk/config.ui | 629 +++++++++++++++-------------------------- triggers/triggers.py | 323 ++++++++++----------- 3 files changed, 372 insertions(+), 632 deletions(-) diff --git a/triggers/gtk/config.py b/triggers/gtk/config.py index d64f809..eafc702 100644 --- a/triggers/gtk/config.py +++ b/triggers/gtk/config.py @@ -28,24 +28,6 @@ from gajim.plugins.helpers import get_builder EVENTS = { 'message_received': [], - 'contact_connected': [ - 'use_systray_cb', - 'disable_systray_cb', - 'use_roster_cb', - 'disable_roster_cb' - ], - 'contact_disconnected': [ - 'use_systray_cb', - 'disable_systray_cb', - 'use_roster_cb', - 'disable_roster_cb' - ], - 'contact_status_change': [ - 'use_systray_cb', - 'disable_systray_cb', - 'use_roster_cb', - 'disable_roster_cb' - ] } RECIPIENT_TYPES = [ @@ -63,7 +45,7 @@ class ConfigDialog(Gtk.ApplicationWindow): self.set_show_menubar(False) self.set_title(_('Triggers Configuration')) self.set_transient_for(transient) - self.set_default_size(600, 700) + self.set_default_size(600, 800) self.set_type_hint(Gdk.WindowTypeHint.DIALOG) self.set_modal(True) self.set_destroy_with_parent(True) @@ -95,9 +77,7 @@ class ConfigDialog(Gtk.ApplicationWindow): 'recipient_type_combobox', 'recipient_list_entry', 'delete_button', 'online_cb', 'away_cb', 'xa_cb', 'dnd_cb', 'use_sound_cb', 'disable_sound_cb', 'use_popup_cb', - 'disable_popup_cb', 'use_auto_open_cb', - 'disable_auto_open_cb', 'use_systray_cb', - 'disable_systray_cb', 'use_roster_cb', 'disable_roster_cb', + 'disable_popup_cb', 'tab_opened_cb', 'not_tab_opened_cb', 'has_focus_cb', 'not_has_focus_cb', 'filechooser', 'sound_file_box', 'up_button', 'down_button', 'run_command_cb', @@ -233,7 +213,7 @@ class ConfigDialog(Gtk.ApplicationWindow): self._ui.filechooser.set_filename(value) # sound, popup, auto_open, systray, roster - for option in ('sound', 'popup', 'auto_open', 'systray', 'roster'): + for option in ('sound', 'popup'): value = self._config[self._active_num][option] if value == 'yes': self._ui.__dict__['use_' + option + '_cb'].set_active(True) @@ -322,11 +302,8 @@ class ConfigDialog(Gtk.ApplicationWindow): 'sound': '', 'sound_file': '', 'popup': '', - 'auto_open': '', 'run_command': False, 'command': '', - 'systray': '', - 'roster': '', 'one_shot': False, } iter_ = model.append((num, '')) @@ -397,9 +374,6 @@ class ConfigDialog(Gtk.ApplicationWindow): return event = list(EVENTS.keys())[active] self._config[self._active_num]['event'] = event - for widget in ('use_systray_cb', 'disable_systray_cb', 'use_roster_cb', - 'disable_roster_cb'): - self._ui.__dict__[widget].set_sensitive(True) for widget in EVENTS[event]: self._ui.__dict__[widget].set_sensitive(False) self._ui.__dict__[widget].set_state(False) @@ -555,14 +529,6 @@ class ConfigDialog(Gtk.ApplicationWindow): def _on_disable_popup_cb_toggled(self, widget): self._on_disable_it_toggled(widget, self._ui.use_popup_cb, 'popup') - def _on_use_auto_open_cb_toggled(self, widget): - self._on_use_it_toggled(widget, self._ui.disable_auto_open_cb, - 'auto_open') - - def _on_disable_auto_open_cb_toggled(self, widget): - self._on_disable_it_toggled(widget, self._ui.use_auto_open_cb, - 'auto_open') - def _on_run_command_cb_toggled(self, widget): self._config[self._active_num]['run_command'] = widget.get_active() if widget.get_active(): @@ -573,18 +539,6 @@ class ConfigDialog(Gtk.ApplicationWindow): def _on_command_entry_changed(self, widget): self._config[self._active_num]['command'] = widget.get_text() - def _on_use_systray_cb_toggled(self, widget): - self._on_use_it_toggled(widget, self._ui.disable_systray_cb, 'systray') - - def _on_disable_systray_cb_toggled(self, widget): - self._on_disable_it_toggled(widget, self._ui.use_systray_cb, 'systray') - - def _on_use_roster_cb_toggled(self, widget): - self._on_use_it_toggled(widget, self._ui.disable_roster_cb, 'roster') - - def _on_disable_roster_cb_toggled(self, widget): - self._on_disable_it_toggled(widget, self._ui.use_roster_cb, 'roster') - def _on_one_shot_cb_toggled(self, widget): self._config[self._active_num]['one_shot'] = widget.get_active() self._ui.command_entry.set_sensitive(widget.get_active()) diff --git a/triggers/gtk/config.ui b/triggers/gtk/config.ui index bf6f416..c9a1be8 100644 --- a/triggers/gtk/config.ui +++ b/triggers/gtk/config.ui @@ -1,7 +1,7 @@ - + - + @@ -44,42 +44,42 @@ True - False - 18 + False + 18 vertical 6 True - True - True - True + True + True + True True - False + False True - False + False vertical 6 True - False + False vertical - 100 + 100 True - True - in + True + in True - True - horizontal + True + horizontal @@ -96,18 +96,18 @@ True - False - False + False + False 1 True False - False - Up + False + Up Up - True - gtk-go-up + True + go-up-symbolic @@ -119,11 +119,11 @@ True False - False - Down + False + Down Down - True - gtk-go-down + True + go-down-symbolic @@ -134,11 +134,11 @@ True - False - New rule + False + New rule New rule - True - gtk-new + True + list-add-symbolic @@ -149,11 +149,11 @@ True - False - Delete rule + False + Delete rule Delete rule - True - gtk-delete + True + list-remove-symbolic @@ -181,23 +181,23 @@ True - False + False vertical 5 True - False + False center vertical 6 True - False - 6 + False + 6 Conditions - True + True - 0 - 0 + 0 + 0 - 200 + 200 True - False + False liststore2 @@ -247,30 +248,30 @@ - 1 - 0 + 1 + 0 True - False + False end Category - True + True - 0 - 1 + 0 + 1 True - False + False liststore1 @@ -281,28 +282,28 @@ - 1 - 1 + 1 + 1 - 300 + 300 True False - True - comma separated list + True + comma separated list - 1 - 2 + 1 + 2 True - False + False end List - 0 - 2 + 0 + 2 @@ -324,17 +325,17 @@ True - False + False center - 6 + 6 6 True - False + False start My status - True + True @@ -349,11 +350,11 @@ All statuses True - True - False + True + False start - True - True + True + True special_status_rb @@ -367,11 +368,11 @@ Certain status True - True - False + True + False start - True - True + True + True all_status_rb @@ -383,14 +384,14 @@ True - True + True start - 3 + 3 True True - False + False vertical 6 @@ -398,11 +399,11 @@ Online True False - True - False + True + False start - True - True + True + True @@ -416,11 +417,11 @@ Away True False - True - False + True + False start - True - True + True + True @@ -434,11 +435,11 @@ Not Available True False - True - False + True + False start - True - True + True + True @@ -452,11 +453,11 @@ Busy True False - True - False + True + False start - True - True + True + True @@ -470,7 +471,7 @@ True - False + False Status @@ -489,15 +490,16 @@ + True - False - 6 - 12 + False + 6 + 12 True - False + False end Chat Window - 0 - 0 + 0 + 0 True - False + False end Focus - 0 - 1 + 0 + 1 Opened True - True - False + True + False start - True - True + True + True - 1 - 0 + 1 + 0 Has focus True - True - False + True + False start - True + True - 1 - 1 + 1 + 1 Not opened True - True - False + True + False start - True - True + True + True - 2 - 0 + 2 + 0 Does not have focus True - True - False + True + False start - True + True - 2 - 1 + 2 + 1 @@ -603,17 +605,17 @@ True - False + False center vertical 6 True - False - 6 + False + 6 Actions - True + True - - - False - True - 0 - - - - - Not_ificate me with a popup - True - True - False - start - True - True - - - - False - True - 1 - - - - - _Disable existing notification - True - True - False - start - True - True - - - - False - True - 2 - - - - - False - True - 2 - - - - - True - False - vertical - 6 - - - True - False + False start Sounds - True + True + False True 3 - - - False - True - 1 - - - - - True - True - 6 True - False - center - vertical + False 6 - - Delete this rule once applied + + Launch command True - True - False - start - 6 - True - + True + False + True + True + False @@ -916,174 +856,47 @@ - + + 200 True - False - 6 - - - Launch command - True - True - False - True - True - - - - False - True - 0 - - - - - 200 - True - True - Command... - - - - False - True - 1 - - - - - False - False - 1 - - - - - True - False - 6 - 12 - - - True - False - start - Notification - - - - 0 - 0 - - - - - True - False - start - Contact List - - - - 1 - 0 - - - - - _Show event - True - True - False - start - True - True - - - - 1 - 1 - - - - - _Disable showing event - True - True - False - start - True - True - - - - 1 - 2 - - - - - _Show event - True - True - False - start - True - True - - - - 0 - 1 - - - - - _Disable showing event - True - True - False - start - True - True - - - - 0 - 2 - - + True + Command... + False True - 7 + 1 + + False + False + 4 + - - + + + Delete this rule once applied True - False - Advanced Actions - + True + False + start + True + + + False + True + 5 + False True - 2 + 1 diff --git a/triggers/triggers.py b/triggers/triggers.py index 844f422..aa85386 100644 --- a/triggers/triggers.py +++ b/triggers/triggers.py @@ -35,176 +35,39 @@ class Triggers(GajimPlugin): self.events_handlers = { 'notification': (ged.PREGUI, self._on_notification), - 'decrypted-message-received': (ged.PREGUI2, - self._on_message_received), - 'gc-message-received': (ged.PREGUI2, self._on_gc_message_received), + 'message-received': (ged.PREGUI2, self._on_message_received), + 'gc-message-received': (ged.PREGUI2, self._on_message_received), 'presence-received': (ged.PREGUI, self._on_presence_received), } - def _check_rule_recipients(self, obj, rule): - rule_recipients = [t.strip() for t in rule['recipients'].split(',')] - if rule['recipient_type'] == 'groupchat': - if obj.jid in rule_recipients: - return True - return False - if (rule['recipient_type'] == 'contact' and obj.jid not in - rule_recipients): - return False - contact = app.contacts.get_first_contact_from_jid( - obj.conn.name, obj.jid) - if not contact: # PM? - return False - contact_groups = contact.groups - group_found = False - for group in contact_groups: - if group in rule_recipients: - group_found = True - break - if rule['recipient_type'] == 'group' and not group_found: - return False + def _on_notification(self, event): + self._check_all(event, + self._check_rule_apply_notification, + self._apply_rule) - return True + def _on_message_received(self, event): + self._check_all(event, + self._check_rule_apply_msg_received, + self._apply_rule) - def _check_rule_status(self, obj, rule): - rule_statuses = rule['status'].split() - our_status = app.connections[obj.conn.name].status - if rule['status'] != 'all' and our_status not in rule_statuses: - return False - - return True - - def _check_rule_tab_opened(self, obj, rule): - if rule['tab_opened'] == 'both': - return True - tab_opened = False - if app.interface.msg_win_mgr.get_control(obj.jid, obj.conn.name): - tab_opened = True - if tab_opened and rule['tab_opened'] == 'no': - return False - elif not tab_opened and rule['tab_opened'] == 'yes': - return False - - return True - - def _check_rule_has_focus(self, obj, rule): - if rule['has_focus'] == 'both': - return True - if rule['tab_opened'] == 'no': - # Does not apply in this case - return True - ctrl = app.interface.msg_win_mgr.get_control(obj.jid, obj.conn.name) - if not ctrl: - # Does not apply in this case - return True - has_focus = ctrl.parent_win.window.has_focus() - if has_focus and rule['has_focus'] == 'no': - return False - elif not has_focus and rule['has_focus'] == 'yes': - return False - - return True - - def _check_rule_all(self, event, obj, rule): - # Check notification type - if rule['event'] != event: - return False - - # notification type is ok. Now check recipient - if not self._check_rule_recipients(obj, rule): - return False - - # recipient is ok. Now check our status - if not self._check_rule_status(obj, rule): - return False - - # our_status is ok. Now check opened chat window - if not self._check_rule_tab_opened(obj, rule): - return False - - # tab_opened is ok. Now check opened chat window - if not self._check_rule_has_focus(obj, rule): - return False - - # All is ok - return True - - def _check_rule_apply_notification(self, obj, rule): - # Check notification type - notif_type = '' - if obj.notif_type in ('msg', 'gc-msg'): - notif_type = 'message_received' - elif obj.notif_type == 'pres': - if obj.base_event.old_show < 2 and obj.base_event.new_show > 1: - notif_type = 'contact_connected' - elif obj.base_event.old_show > 1 and obj.base_event.new_show < 2: - notif_type = 'contact_disconnected' - else: - notif_type = 'contact_status_change' - - return self._check_rule_all(notif_type, obj, rule) - - def _check_rule_apply_msg_received(self, obj, rule): - return self._check_rule_all('message_received', obj, rule) - - def _check_rule_apply_connected(self, obj, rule): - return self._check_rule_all('contact_connected', obj, rule) - - def _check_rule_apply_disconnected(self, obj, rule): - return self._check_rule_all('contact_disconnected', obj, rule) - - def _check_rule_apply_status_changed(self, obj, rule): - return self._check_rule_all('contact_status_change', obj, rule) - - def _apply_rule_notification(self, obj, rule): - if rule['sound'] == 'no': - obj.do_sound = False - elif rule['sound'] == 'yes': - obj.do_sound = True - obj.sound_event = '' - obj.sound_file = rule['sound_file'] - - if rule['popup'] == 'no' or obj.control_focused: - obj.do_popup = False - elif rule['popup'] == 'yes': - obj.do_popup = True - - if rule['run_command']: - obj.do_command = True - obj.command = rule['command'] + def _on_presence_received(self, event): + if event.old_show < 2 and event.new_show > 1: + check_func = self._check_rule_apply_connected + elif event.old_show > 1 and event.new_show < 2: + check_func = self._check_rule_apply_disconnected else: - obj.do_command = False + check_func = self._check_rule_apply_status_changed + self._check_all(event, check_func, self._apply_rule) - if rule['systray'] == 'no': - obj.show_in_notification_area = False - elif rule['systray'] == 'yes': - obj.show_in_notification_area = True - - if rule['roster'] == 'no': - obj.show_in_roster = False - elif rule['roster'] == 'yes': - obj.show_in_roster = True - - def _apply_rule_message_received(self, obj, rule): - if rule['auto_open'] == 'no': - obj.popup = False - elif rule['auto_open'] == 'yes': - obj.popup = True - - def _apply_rule_presence_received(self, obj, rule): - if rule['auto_open'] == 'no': - obj.popup = False - elif rule['auto_open'] == 'yes': - obj.popup = True - - def _check_all(self, obj, check_func, apply_func): + def _check_all(self, event, check_func, apply_func): # check rules in order - rules_num = [int(i) for i in self.config.keys()] + rules_num = [int(item) for item in self.config.keys()] rules_num.sort() to_remove = [] for num in rules_num: rule = self.config[str(num)] - if check_func(obj, rule): - apply_func(obj, rule) + if check_func(event, rule): + apply_func(event, rule) if 'one_shot' in rule and rule['one_shot']: to_remove.append(num) # Should we stop after first valid rule ? @@ -223,23 +86,133 @@ class Triggers(GajimPlugin): else: num += 1 - def _on_notification(self, obj): - self._check_all(obj, self._check_rule_apply_notification, - self._apply_rule_notification) + def _check_rule_apply_msg_received(self, event, rule): + return self._check_rule_all('message_received', event, rule) - def _on_message_received(self, obj): - self._check_all(obj, self._check_rule_apply_msg_received, - self._apply_rule_message_received) + def _check_rule_apply_connected(self, event, rule): + return self._check_rule_all('contact_connected', event, rule) - def _on_gc_message_received(self, obj): - self._check_all(obj, self._check_rule_apply_msg_received, - self._apply_rule_message_received) + def _check_rule_apply_disconnected(self, event, rule): + return self._check_rule_all('contact_disconnected', event, rule) - def _on_presence_received(self, obj): - if obj.old_show < 2 and obj.new_show > 1: - check_func = self._check_rule_apply_connected - elif obj.old_show > 1 and obj.new_show < 2: - check_func = self._check_rule_apply_disconnected - else: - check_func = self._check_rule_apply_status_changed - self._check_all(obj, check_func, self._apply_rule_presence_received) + def _check_rule_apply_status_changed(self, event, rule): + return self._check_rule_all('contact_status_change', event, rule) + + def _check_rule_apply_notification(self, event, rule): + # Check notification type + notif_type = '' + if event.notif_type == 'incoming-message': + notif_type = 'message_received' + if event.notif_type == 'pres': + # TODO: + if (event.base_event.old_show < 2 and + event.base_event.new_show > 1): + notif_type = 'contact_connected' + elif (event.base_event.old_show > 1 and + event.base_event.new_show < 2): + notif_type = 'contact_disconnected' + else: + notif_type = 'contact_status_change' + + return self._check_rule_all(notif_type, event, rule) + + def _check_rule_all(self, notif_type, event, rule): + # Check notification type + if rule['event'] != notif_type: + return False + + # notification type is ok. Now check recipient + if not self._check_rule_recipients(event, rule): + return False + + # recipient is ok. Now check our status + if not self._check_rule_status(event, rule): + return False + + # our_status is ok. Now check opened chat window + if not self._check_rule_tab_opened(event, rule): + return False + + # tab_opened is ok. Now check opened chat window + if not self._check_rule_has_focus(event, rule): + return False + + # All is ok + return True + + def _check_rule_recipients(self, event, rule): + rule_recipients = [t.strip() for t in rule['recipients'].split(',')] + if rule['recipient_type'] == 'groupchat': + if event.jid in rule_recipients: + return True + return False + if (rule['recipient_type'] == 'contact' and event.jid not in + rule_recipients): + return False + client = app.get_client(event.account) + contact = client.get_module('Contacts').get_contact(event.jid) + + group_found = False + for group in contact.groups: + if group in rule_recipients: + group_found = True + break + if rule['recipient_type'] == 'group' and not group_found: + return False + + return True + + def _check_rule_status(self, event, rule): + rule_statuses = rule['status'].split() + our_status = app.connections[event.account].status + if rule['status'] != 'all' and our_status not in rule_statuses: + return False + + return True + + def _check_rule_tab_opened(self, event, rule): + if rule['tab_opened'] == 'both': + return True + tab_opened = False + if app.window.get_control(event.account, event.jid): + tab_opened = True + if tab_opened and rule['tab_opened'] == 'no': + return False + elif not tab_opened and rule['tab_opened'] == 'yes': + return False + + return True + + def _check_rule_has_focus(self, event, rule): + if rule['has_focus'] == 'both': + return True + if rule['tab_opened'] == 'no': + # Does not apply in this case + return True + ctrl = app.window.get_control(event.account, event.jid) + if not ctrl: + # Does not apply in this case + return True + has_focus = ctrl.has_focus() + if has_focus and rule['has_focus'] == 'no': + return False + elif not has_focus and rule['has_focus'] == 'yes': + return False + + return True + + def _apply_rule(self, event, rule): + if rule['sound'] == 'no': + event.sound = None + event.sound_file = None + elif rule['sound'] == 'yes': + event.sound = None + event.sound_file = rule['sound_file'] + + if rule['run_command']: + event.command = rule['command'] + + if rule['popup'] == 'no': + event.show_notification = False + elif rule['popup'] == 'yes': + event.show_notification = True