Daniel Brötzmann pushed to branch archive_cache at gajim / gajim
Commits:
60dc9a54 by wurstsalat at 2022-08-29T22:30:13+02:00
Store event for correct contact
- - - - -
2 changed files:
- gajim/common/modules/contacts.py
- gajim/common/modules/muc.py
Changes:
=====================================
gajim/common/modules/contacts.py
=====================================
@@ -956,7 +956,7 @@ def update_presence(self,
nick=self.name,
status_codes=properties.muc_status_codes)
- app.storage.events.store(self, event)
+ app.storage.events.store(self.room, event)
self.notify('user-joined', event)
return
@@ -972,7 +972,7 @@ def update_presence(self,
reason=properties.muc_user.reason,
actor=properties.muc_user.actor)
- app.storage.events.store(self, event)
+ app.storage.events.store(self.room, event)
self.notify('user-left', event)
return
@@ -990,8 +990,8 @@ def update_presence(self,
self._presence = presence
for signal in signals:
+ properties = cast(PresenceProperties, args[0])
if signal == 'user-affiliation-changed':
- properties = cast(PresenceProperties, args[0])
event = events.MUCUserAffiliationChanged(
timestamp=time.time(),
is_self=properties.is_muc_self_presence,
@@ -1001,7 +1001,6 @@ def update_presence(self,
actor=properties.muc_user.actor)
if signal == 'user-role-changed':
- properties = cast(PresenceProperties, args[0])
event = events.MUCUserRoleChanged(
timestamp=time.time(),
is_self=properties.is_muc_self_presence,
@@ -1011,7 +1010,6 @@ def update_presence(self,
actor=properties.muc_user.actor)
if signal == 'user-status-show-changed':
- properties = cast(PresenceProperties, args[0])
event = events.MUCUserStatusShowChanged(
timestamp=time.time(),
is_self=properties.is_muc_self_presence,
@@ -1019,7 +1017,7 @@ def update_presence(self,
status=properties.status,
show_value=properties.show.value)
- app.storage.events.store(self, event)
+ app.storage.events.store(self.room, event)
self.notify(signal, event)
def update_avatar(self, *args: Any) -> None:
=====================================
gajim/common/modules/muc.py
=====================================
@@ -605,10 +605,10 @@ def _on_muc_user_presence(self,
occupant.update_presence(presence, properties)
event = events.MUCNicknameChanged(
+ timestamp=time.time(),
is_self=properties.is_muc_self_presence,
new_name=new_occupant.name,
- old_name=occupant.name,
- timestamp=time.time())
+ old_name=occupant.name)
assert isinstance(room, GroupchatContact)
app.storage.events.store(room, event)
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/commit/60dc9a54a28dffaf9de6db44ff5f83973715dfbf
--
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/commit/60dc9a54a28dffaf9de6db44ff5f83973715dfbf
You're receiving this email because of your account on dev.gajim.org.
_______________________________________________
Commits mailing list
Commits@gajim.org
https://lists.gajim.org/cgi-bin/listinfo/commits
