Daniel Brötzmann pushed to branch archive_cache at gajim / gajim
Commits:
5203a52b by wurstsalat at 2022-08-29T22:03:31+02:00
Fix displaying nickname change
- - - - -
5 changed files:
- gajim/common/events.py
- gajim/common/modules/contacts.py
- gajim/common/modules/muc.py
- gajim/gtk/control.py
- gajim/gtk/groupchat_roster.py
Changes:
=====================================
gajim/common/events.py
=====================================
@@ -740,6 +740,7 @@ class MUCUserJoined(ApplicationEvent):
class MUCUserLeft(ApplicationEvent):
name: str = field(init=False, default='muc-user-left')
timestamp: float
+ is_self: bool
nick: str
status_codes: Optional[set[StatusCode]]
reason: Optional[str]
=====================================
gajim/common/modules/contacts.py
=====================================
@@ -966,6 +966,7 @@ def update_presence(self,
properties = cast(MessageProperties, args[0])
event = events.MUCUserLeft(
timestamp=time.time(),
+ is_self=properties.is_muc_self_presence,
nick=self.name,
status_codes=properties.muc_status_codes,
reason=properties.muc_user.reason,
=====================================
gajim/common/modules/muc.py
=====================================
@@ -605,7 +605,7 @@ def _on_muc_user_presence(self,
occupant.update_presence(presence, properties)
event = events.MUCNicknameChanged(
- is_self=properties.is_self_presence,
+ is_self=properties.is_muc_self_presence,
new_name=new_occupant.name,
old_name=occupant.name,
timestamp=time.time())
=====================================
gajim/gtk/control.py
=====================================
@@ -743,11 +743,11 @@ def add_message(self,
additional_data=additional_data)
def _on_user_nickname_changed(self,
- contact: types.GroupchatContact,
+ _contact: types.GroupchatContact,
_signal_name: str,
+ event: events.MUCNicknameChanged,
_old_contact: types.GroupchatParticipant,
- _new_contact: types.GroupchatParticipant,
- event: events.MUCNicknameChanged
+ _new_contact: types.GroupchatParticipant
) -> None:
self._process_muc_nickname_changed(event)
@@ -1081,6 +1081,9 @@ def _on_user_left(self,
self._process_muc_user_left(event)
def _process_muc_user_left(self, event: events.MUCUserLeft) -> None:
+ if event.is_self:
+ return
+
status_codes = event.status_codes or []
nick = event.nick
=====================================
gajim/gtk/groupchat_roster.py
=====================================
@@ -281,7 +281,7 @@ def _update_contact(self,
self._add_contact(user_contact)
def _on_user_nickname_changed(self,
- contact: types.GroupchatContact,
+ _contact: types.GroupchatContact,
_signal_name: str,
_event: MUCNicknameChanged,
old_contact: types.GroupchatParticipant,
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/commit/5203a52bc68fd28b12f7922acc8dbad1d549c1c6
--
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/commit/5203a52bc68fd28b12f7922acc8dbad1d549c1c6
You're receiving this email because of your account on dev.gajim.org.
_______________________________________________
Commits mailing list
[email protected]
https://lists.gajim.org/cgi-bin/listinfo/commits
