[Git][gajim/gajim][mainwindow] Use consistent jid attribute

Philipp Hörist pushed to branch mainwindow at gajim / gajim

Commits: aa5895bd by lovetox at 2021-02-06T16:54:58+01:00 Use consistent jid attribute

- - - - -

10 changed files:

- gajim/common/modules/discovery.py - gajim/common/modules/message.py - gajim/common/modules/muc.py - gajim/groupchat_control.py - gajim/gtk/chat_list_stack.py - gajim/gtk/chat_stack.py - gajim/gtk/groupchat_roster.py - gajim/gtk/main.py - gajim/gui_interface.py - gajim/message_window.py

Changes:

===================================== gajim/common/modules/discovery.py ===================================== @@ -234,7 +234,7 @@ def disco_muc(self, app.nec.push_incoming_event(NetworkEvent( 'muc-disco-update', account=self._account, - room_jid=result.info.jid)) + jid=result.info.jid))

yield result

===================================== gajim/common/modules/message.py ===================================== @@ -160,11 +160,6 @@ def _message_received(self, _con, stanza, properties): parse_oob(properties, additional_data) parse_xhtml(properties, additional_data)

- app.nec.push_incoming_event(NetworkEvent('update-client-info', - account=self._account, - jid=jid, - resource=resource)) - if properties.is_encrypted: additional_data['encrypted'] = properties.encrypted.additional_data else:

===================================== gajim/common/modules/muc.py ===================================== @@ -190,7 +190,7 @@ def _on_disco_result(self, task): app.nec.push_incoming_event( NetworkEvent('muc-join-failed', account=self._account, - room_jid=error.jid.bare, + jid=error.jid.bare, error=error)) return

@@ -269,7 +269,7 @@ def _on_room_config(self, task): app.nec.push_incoming_event(NetworkEvent( 'muc-configuration-failed', account=self._account, - room_jid=error.jid, + jid=error.jid, error=error)) return

@@ -302,7 +302,7 @@ def _on_config_result(self, task): app.nec.push_incoming_event(NetworkEvent( 'muc-configuration-failed', account=self._account, - room_jid=error.jid, + jid=error.jid, error=error)) return

@@ -338,7 +338,7 @@ def _on_disco_result_after_config(self, task): app.nec.push_incoming_event(NetworkEvent( 'muc-configuration-finished', account=self._account, - room_jid=jid)) + jid=jid))

def update_presence(self): mucs = self._manager.get_mucs_with_state([MUCJoinedState.JOINED, @@ -382,7 +382,7 @@ def _on_error_presence(self, _con, _stanza, properties): app.nec.push_incoming_event( NetworkEvent('muc-join-failed', account=self._account, - room_jid=room_jid, + jid=room_jid, error=properties.error))

elif muc_data.state == MUCJoinedState.CREATING: @@ -390,14 +390,14 @@ def _on_error_presence(self, _con, _stanza, properties): app.nec.push_incoming_event( NetworkEvent('muc-creation-failed', account=self._account, - room_jid=room_jid, + jid=room_jid, error=properties.error))

elif muc_data.state == MUCJoinedState.CAPTCHA_REQUEST: app.nec.push_incoming_event( NetworkEvent('muc-captcha-error', account=self._account, - room_jid=room_jid, + jid=room_jid, error_text=to_user_string(properties.error))) self._manager.set_state(room_jid, MUCJoinedState.CAPTCHA_FAILED) self._manager.set_state(room_jid, MUCJoinedState.NOT_JOINED) @@ -572,7 +572,7 @@ def _raise_muc_event(self, event_name, properties): app.nec.push_incoming_event( NetworkEvent(event_name, account=self._account, - room_jid=properties.jid.bare, + jid=properties.jid.bare, properties=properties)) self._log_muc_event(event_name, properties)

@@ -654,7 +654,7 @@ def _handle_subject_change(self, room_jid, subject, nickname, timestamp): app.nec.push_incoming_event( NetworkEvent('muc-subject', account=self._account, - room_jid=room_jid, + jid=room_jid, subject=subject, nickname=nickname, user_timestamp=timestamp, @@ -666,7 +666,7 @@ def _handle_subject_change(self, room_jid, subject, nickname, timestamp): app.nec.push_incoming_event( NetworkEvent('muc-joined', account=self._account, - room_jid=muc_data.jid)) + jid=muc_data.jid))

def _room_join_complete(self, muc_data): self._remove_join_timeout(muc_data.jid) @@ -697,7 +697,7 @@ def _on_voice_request(self, _con, _stanza, properties): app.nec.push_incoming_event( NetworkEvent('muc-voice-request', account=self._account, - room_jid=str(properties.muc_jid), + jid=str(properties.muc_jid), voice_request=properties.voice_request)) raise nbxmpp.NodeProcessed

@@ -734,7 +734,7 @@ def _on_captcha_challenge(self, _con, _stanza, properties): app.nec.push_incoming_event( NetworkEvent('muc-captcha-challenge', account=self._account, - room_jid=properties.jid.bare, + jid=properties.jid.bare, form=properties.captcha.form)) raise nbxmpp.NodeProcessed

@@ -767,7 +767,7 @@ def _on_captcha_result(self, task): app.nec.push_incoming_event( NetworkEvent('muc-captcha-error', account=self._account, - room_jid=str(error.jid), + jid=str(error.jid), error_text=to_user_string(error)))

def _on_config_change(self, _con, _stanza, properties): @@ -780,7 +780,7 @@ def _on_config_change(self, _con, _stanza, properties): app.nec.push_incoming_event( NetworkEvent('muc-config-changed', account=self._account, - room_jid=room_jid, + jid=room_jid, status_codes=properties.muc_status_codes)) raise nbxmpp.NodeProcessed

===================================== gajim/groupchat_control.py ===================================== @@ -460,8 +460,6 @@ def _get_current_page(self): return self.xml.stack.get_visible_child_name()

def _on_muc_disco_update(self, _event): - if self.parent_win is None: - return self.update_actions() self.draw_banner_text()

@@ -765,10 +763,12 @@ def draw_banner_text(self): """ self.xml.banner_name_label.set_text(self.room_name)

- @event_filter(['jid=room_jid']) - def _on_update_room_avatar(self, event): + def _on_update_room_avatar(self, _event): self._update_avatar()

+ def _on_update_gc_avatar(self, event): + self.roster.process_avatar_update(event) + def _on_bookmarks_received(self, _event): self.draw_banner_text()

===================================== gajim/gtk/chat_list_stack.py ===================================== @@ -161,9 +161,5 @@ def process_event(self, event): if event.name not in HANDLED_EVENTS: return

- if hasattr(event, 'jid'): - jid = event.jid - else: - jid = event.room_jid - chat_list = self._find_chat(event.account, jid) + chat_list = self._find_chat(event.account, event.jid) chat_list.process_event(event)

===================================== gajim/gtk/chat_stack.py ===================================== @@ -89,9 +89,5 @@ def clear(self): self.set_visible_child_name('empty')

def process_event(self, event): - if hasattr(event, 'jid'): - jid = event.jid - else: - jid = event.room_jid - control = self.get_control(event.account, jid) + control = self.get_control(event.account, event.jid) control.process_event(event)

===================================== gajim/gtk/groupchat_roster.py ===================================== @@ -102,7 +102,6 @@ def __init__(self, account, room_jid, control):

self.register_events([ ('theme-update', ged.GUI2, self._on_theme_update), - ('update-gc-avatar', ged.GUI1, self._on_avatar_update), ])

@staticmethod @@ -458,8 +457,7 @@ def get_role(self, nick): def _on_theme_update(self, _event): self.redraw()

- @event_filter(['room_jid']) - def _on_avatar_update(self, event): + def process_avatar_update(self, event): self.draw_avatar(event.contact)

def clear(self):

===================================== gajim/gtk/main.py ===================================== @@ -72,7 +72,6 @@ def __init__(self): ('activity-received', ged.GUI1, self._on_event), ('tune-received', ged.GUI1, self._on_event), ('location-received', ged.GUI1, self._on_event), - ('update-client-info', ged.GUI1, self._on_event), ('chatstate-received', ged.GUI1, self._on_event), ('caps-update', ged.GUI1, self._on_event), ('message-sent', ged.OUT_POSTCORE, self._on_event), @@ -82,8 +81,9 @@ def __init__(self): ('receipt-received', ged.GUI1, self._on_event), ('displayed-received', ged.GUI1, self._on_event), ('message-error', ged.GUI1, self._on_event), - ('zeroconf-error', ged.GUI1, self._on_event), ('update-roster-avatar', ged.GUI1, self._on_event), + ('update-room-avatar', ged.GUI1, self._on_event), + ('update-gc-avatar', ged.GUI1, self._on_event), ('muc-creation-failed', ged.GUI1, self._on_event), ('muc-joined', ged.GUI1, self._on_event), ('muc-join-failed', ged.GUI1, self._on_event), @@ -106,8 +106,6 @@ def __init__(self): ('muc-disco-update', ged.GUI1, self._on_event), ('muc-configuration-finished', ged.GUI1, self._on_event), ('muc-configuration-failed', ged.GUI1, self._on_event), - ('update-room-avatar', ged.GUI1, self._on_event), - ('message-error', ged.GUI1, self._on_event), ])

self.show_all() @@ -299,22 +297,13 @@ def _on_edit_workspace_clicked(self, _button): workspace_id=self.get_active_workspace())

def _on_event(self, event): - if hasattr(event, 'jid'): - jid = event.jid - else: - jid = event.room_jid - if event.name == 'caps-update': #TODO return

- if event.name == 'update-client-info': - #TODO - return - - if not self.chat_exists(event.account, jid): + if not self.chat_exists(event.account, event.jid): if event.name == 'message-received': - self.add_chat(event.account, jid, 'contact') + self.add_chat(event.account, event.jid, 'contact') else: # No chat is open, dont handle any gui events return

===================================== gajim/gui_interface.py ===================================== @@ -1855,8 +1855,9 @@ def update_avatar(self, account=None, jid=None, NetworkEvent('update-roster-avatar', account=account, jid=jid)) else: app.nec.push_incoming_event(NetworkEvent('update-gc-avatar', + account=account, contact=contact, - room_jid=contact.room_jid)) + jid=contact.room_jid))

def save_avatar(self, data): return self.avatar_storage.save_avatar(data)

===================================== gajim/message_window.py ===================================== @@ -162,9 +162,9 @@ def __init__(self, acct, type_, parent_window=None, parent_paned=None): self.notebook.set_show_border(app.settings.get('tabs_border')) self.show_icon()

- self.register_events([ - ('muc-disco-update', ged.GUI1, self._on_muc_disco_update), - ]) + # self.register_events([ + # ('muc-disco-update', ged.GUI1, self._on_muc_disco_update), + # ])

def _add_actions(self): actions = [

View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/aa5895bdb33c289893d56bdd79cf438f4...