[Git][gajim/gajim][mainwindow] 2 commits: Fix saving MUC avatar

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

Commits: 4dc80497 by lovetox at 2021-03-07T15:25:05+01:00 Fix saving MUC avatar

- - - - - 11876843 by lovetox at 2021-03-07T18:04:03+01:00 MUC refactor

Get rid of manager

- - - - -

11 changed files:

- gajim/common/client.py - gajim/common/modules/caps.py - gajim/common/modules/chat_markers.py - gajim/common/modules/contacts.py - gajim/common/modules/discovery.py - gajim/common/modules/muc.py - gajim/common/modules/presence.py - gajim/common/modules/vcard_avatars.py - gajim/groupchat_control.py - gajim/gui_interface.py - gajim/privatechat_control.py

Changes:

===================================== gajim/common/client.py ===================================== @@ -306,7 +306,7 @@ def _on_connection_failed(self, _client, _signal_name):

def _on_connected(self, _client, _signal_name): self._set_state(ClientState.CONNECTED) - self.get_module('MUC').get_manager().reset_state() + self.get_module('MUC').reset_state() self.get_module('Discovery').discover_server_info() self.get_module('Discovery').discover_account_info() self.get_module('Discovery').discover_server_items()

===================================== gajim/common/modules/caps.py ===================================== @@ -212,8 +212,7 @@ def preconditions_met(self): return False

if self._from_muc: - muc = client.get_module('MUC').get_manager().get( - self.entity.jid.bare) + muc = client.get_module('MUC').get_muc_data(self.entity.jid.bare)

if muc is None or not muc.state.is_joined: self.set_obsolete()

===================================== gajim/common/modules/chat_markers.py ===================================== @@ -45,8 +45,8 @@ def _process_chat_marker(self, _con, _stanza, properties): return

if properties.type.is_groupchat: - manager = self._con.get_module('MUC').get_manager() - muc_data = manager.get(properties.muc_jid) + muc_data = self._con.get_module('MUC').get_muc_data( + properties.muc_jid) if muc_data is None: return

===================================== gajim/common/modules/contacts.py ===================================== @@ -303,6 +303,11 @@ def __init__(self, logger, jid, account): def is_groupchat(self): return True

+ @property + def state(self): + muc_data = self._module('MUC').get_muc_data(self._jid) + return muc_data.state + def add_resource(self, resource): jid = self._jid.new_with(resource=resource) contact = GroupchatParticipant(self._log, jid, self._account) @@ -344,14 +349,18 @@ def update_avatar(self, *args): app.interface.avatar_storage.invalidate_cache(self._jid) self.notify('avatar-update')

+ @property + def is_joined(self): + muc_data = self._module('MUC').get_muc_data(self._jid) + return muc_data.state.is_joined + def set_not_joined(self): for contact in self._resources.values(): contact.update_presence(UNKNOWN_MUC_PRESENCE, notify=False)

def get_user_nicknames(self): client = app.get_client(self._account) - manager = client.get_module('MUC').get_manager() - return manager.get_joined_users(self._jid) + return client.get_module('MUC').get_joined_users(self._jid)

class GroupchatParticipant(CommonContact): @@ -363,7 +372,6 @@ def __init__(self, logger, jid, account): self._client = app.get_client(self._account)

self._presence = UNKNOWN_MUC_PRESENCE - self._muc_manager = self._client.get_module('MUC').get_manager()

@property def is_pm_contact(self):

===================================== gajim/common/modules/discovery.py ===================================== @@ -226,8 +226,7 @@ def disco_muc(self, if not app.interface.avatar_exists(avatar_sha): app.interface.save_avatar(avatar)

- app.storage.cache.set_muc_avatar_sha(result.info.jid, - avatar_sha) + app.storage.cache.set_muc(result.info.jid, 'avatar', avatar_sha) app.interface.avatar_storage.invalidate_cache(result.info.jid)

self._con.get_module('VCardAvatars').muc_disco_info_update(result.info)

===================================== gajim/common/modules/muc.py ===================================== @@ -35,10 +35,8 @@ from gajim.common.const import MUCJoinedState from gajim.common.helpers import AdditionalDataDict from gajim.common.helpers import get_default_muc_config -from gajim.common.helpers import to_user_string from gajim.common.helpers import event_filter from gajim.common.helpers import get_group_chat_nick -from gajim.common.helpers import Observable from gajim.common.structs import MUCData from gajim.common.structs import MUCPresenceData from gajim.common.nec import NetworkEvent @@ -114,11 +112,12 @@ def __init__(self, con): # ('signed-in', ged.GUI1, self._on_signed_in), ])

- self._manager = MUCManager(self._account, self._log) self._rejoin_muc = set() self._join_timeouts = {} self._rejoin_timeouts = {} self._muc_service_jid = None + self._joined_users = defaultdict(dict) + self._mucs = {}

@property def supported(self): @@ -128,9 +127,6 @@ def supported(self): def service_jid(self): return self._muc_service_jid

- def get_manager(self): - return self._manager - def pass_disco(self, info): for identity in info.identities: if identity.category != 'conference': @@ -142,6 +138,38 @@ def pass_disco(self, info): self._muc_service_jid = info.jid raise nbxmpp.NodeProcessed

+ def get_muc_data(self, room_jid): + return self._mucs.get(room_jid) + + def _get_mucs_with_state(self, states): + return [muc for muc in self._mucs.values() if muc.state in states] + + def _set_muc_state(self, room_jid, state): + try: + muc = self._mucs[room_jid] + except KeyError: + raise ValueError('set_muc_state() called ' + 'on unknown muc: %s' % room_jid) + + if muc.state == state: + return + + self._log.info('Set MUC state: %s %s', room_jid, state) + + muc.state = state + contact = self._get_contact(room_jid, groupchat=True) + contact.notify('state-changed') + + def reset_state(self): + for muc in self._mucs.values(): + self._joined_users.pop(muc.jid, None) + self._set_muc_state(muc.jid, MUCJoinedState.NOT_JOINED) + room = self._get_contact(muc.jid) + room.set_not_joined() + room.notify('room-left') + + self._joined_users.clear() + def _create_muc_data(self, room_jid, nick, password, config): if not nick: nick = get_group_chat_nick(self._account, room_jid) @@ -160,10 +188,11 @@ def join(self, jid, nick=None, password=None, config=None):

self._con.get_module('Contacts').add_contact(jid, groupchat=True)

- muc_data = self._manager.get(jid) + muc_data = self._mucs.get(jid) if muc_data is None: muc_data = self._create_muc_data(jid, nick, password, config) - self._manager.add(muc_data) + self._mucs[jid] = muc_data + self._push_muc_added_event(jid)

if not muc_data.state.is_not_joined: self._log.warning('Can’t join MUC %s, state: %s', @@ -183,8 +212,15 @@ def create(self, muc_data): if not app.account_is_available(self._account): return

- self._manager.add(muc_data) + self._mucs[muc_data.jid] = muc_data self._create(muc_data) + self._push_muc_added_event(muc_data.jid) + + def _push_muc_added_event(self, jid): + app.nec.push_incoming_event( + NetworkEvent('muc-added', + account=self._account, + jid=jid))

def _on_disco_result(self, task): try: @@ -196,7 +232,7 @@ def _on_disco_result(self, task): room.notify('room-join-failed', error) return

- muc_data = self._manager.get(result.info.jid) + muc_data = self._mucs.get(result.info.jid) if muc_data is None: self._log.warning('MUC Data not found, join aborted') return @@ -215,12 +251,12 @@ def _join(self, muc_data): muc_x.setTagData('password', muc_data.password)

self._log.info('Join MUC: %s', muc_data.jid) - self._manager.set_state(muc_data.jid, MUCJoinedState.JOINING) + self._set_muc_state(muc_data.jid, MUCJoinedState.JOINING) self._con.send_stanza(presence)

def _rejoin(self, room_jid): - muc_data = self._manager.get(room_jid) - if muc_data.state == MUCJoinedState.NOT_JOINED: + muc_data = self._mucs[room_jid] + if muc_data.state.is_not_joined: self._log.info('Rejoin %s', room_jid) self._join(muc_data) return True @@ -234,7 +270,7 @@ def _create(self, muc_data): presence.setTag(Namespace.MUC + ' x')

self._log.info('Create MUC: %s', muc_data.jid) - self._manager.set_state(muc_data.jid, MUCJoinedState.CREATING) + self._set_muc_state(muc_data.jid, MUCJoinedState.CREATING) self._con.send_stanza(presence)

def leave(self, room_jid, reason=None): @@ -242,11 +278,11 @@ def leave(self, room_jid, reason=None):

self._con.get_module('Bookmarks').modify(room_jid, autojoin=False)

- muc_data = self._manager.get(room_jid) + muc_data = self._mucs.get(room_jid) if muc_data is None: return

- if muc_data.state == MUCJoinedState.NOT_JOINED: + if muc_data.state.is_not_joined: return

self._remove_join_timeout(room_jid) @@ -258,7 +294,7 @@ def leave(self, room_jid, reason=None): status=reason, caps=False)

- self._manager.set_state(room_jid, MUCJoinedState.NOT_JOINED) + self._set_muc_state(room_jid, MUCJoinedState.NOT_JOINED) room = self._get_contact(room_jid) room.set_not_joined() room.notify('room-left') @@ -279,7 +315,7 @@ def _on_room_config(self, task):

self._log.info('Configure room: %s', result.jid)

- muc_data = self._manager.get(result.jid) + muc_data = self._mucs[result.jid] self._apply_config(result.form, muc_data.config) self.set_config(result.jid, result.form, @@ -333,7 +369,7 @@ def _on_disco_result_after_config(self, task): return

jid = result.info.jid - muc_data = self._manager.get(jid) + muc_data = self._mucs[jid] self._room_join_complete(muc_data)

self._log.info('Configuration finished: %s', jid) @@ -342,8 +378,8 @@ def _on_disco_result_after_config(self, task): room.notify('room-config-finished')

def update_presence(self): - mucs = self._manager.get_mucs_with_state([MUCJoinedState.JOINED, - MUCJoinedState.JOINING]) + mucs = self._get_mucs_with_state([MUCJoinedState.JOINED, + MUCJoinedState.JOINING])

status, message, idle = self._con.get_presence_state() for muc_data in mucs: @@ -362,7 +398,7 @@ def change_nick(self, room_jid, new_nick):

def _on_error_presence(self, _con, stanza, properties): room_jid = properties.jid.bare - muc_data = self._manager.get(room_jid) + muc_data = self._mucs.get(room_jid) if muc_data is None: return

@@ -383,25 +419,25 @@ def _on_error_presence(self, _con, stanza, properties):

elif properties.error.condition == 'not-authorized': self._remove_rejoin_timeout(room_jid) - self._manager.set_state(room_jid, MUCJoinedState.NOT_JOINED) + self._set_muc_state(room_jid, MUCJoinedState.NOT_JOINED) room.notify('room-password-required', properties)

else: - self._manager.set_state(room_jid, MUCJoinedState.NOT_JOINED) + self._set_muc_state(room_jid, MUCJoinedState.NOT_JOINED) if room_jid not in self._rejoin_muc: room.notify('room-join-failed', properties.error)

elif muc_data.state == MUCJoinedState.CREATING: - self._manager.set_state(room_jid, MUCJoinedState.NOT_JOINED) + self._set_muc_state(room_jid, MUCJoinedState.NOT_JOINED) room.notify('room-creation-failed', properties)

elif muc_data.state == MUCJoinedState.CAPTCHA_REQUEST: - self._manager.set_state(room_jid, MUCJoinedState.CAPTCHA_FAILED) - self._manager.set_state(room_jid, MUCJoinedState.NOT_JOINED) + self._set_muc_state(room_jid, MUCJoinedState.CAPTCHA_FAILED) + self._set_muc_state(room_jid, MUCJoinedState.NOT_JOINED) room.notify('room-captcha-error', properties.error)

elif muc_data.state == MUCJoinedState.CAPTCHA_FAILED: - self._manager.set_state(room_jid, MUCJoinedState.NOT_JOINED) + self._set_muc_state(room_jid, MUCJoinedState.NOT_JOINED)

else: room.notify('room-presence-error', properties) @@ -411,19 +447,19 @@ def _on_muc_user_presence(self, _con, stanza, properties): return

room_jid = str(properties.muc_jid) - if room_jid not in self._manager: + if room_jid not in self._mucs: self._log.warning('Presence from unknown MUC') self._log.warning(stanza) return

- muc_data = self._manager.get(room_jid) + muc_data = self._mucs[room_jid] occupant = self._get_contact(properties.jid, groupchat=True) room = self._get_contact(properties.jid.bare)

if properties.is_muc_destroyed: self._log.info('MUC destroyed: %s', room_jid) self._remove_join_timeout(room_jid) - self._manager.set_state(room_jid, MUCJoinedState.NOT_JOINED) + self._set_muc_state(room_jid, MUCJoinedState.NOT_JOINED) room.set_not_joined() room.notify('destroyed', properties) return @@ -444,16 +480,20 @@ def _on_muc_user_presence(self, _con, stanza, properties): new_occupant = room.add_resource(properties.muc_user.nick) new_occupant.set_presence(occupant.presence)

- presence = self._manager.process_presence(properties) + presence = self._process_user_presence(properties) occupant.update_presence(presence, properties)

+ # new_nick = properties.muc_user.nick + # nick = properties.muc_nickname + # presence_dict = self._joined_users[properties.jid.bare] + # presence_dict[new_nick] = presence_dict.pop(nick) # self._manager.change_nickname # TODO remove presence from manager

room.notify('user-nickname-changed', occupant, properties) return

- is_joined = self._manager.is_joined(properties.jid) + is_joined = self._is_user_joined(properties.jid) if not is_joined and properties.type.is_available: if properties.is_muc_self_presence: self._log.info('Self presence: %s', properties.jid) @@ -470,12 +510,12 @@ def _on_muc_user_presence(self, _con, stanza, properties):

self._start_join_timeout(room_jid)

- presence = self._manager.process_presence(properties) + presence = self._process_user_presence(properties) occupant.update_presence(presence, properties) return

if properties.is_muc_self_presence and properties.is_kicked: - self._manager.set_state(room_jid, MUCJoinedState.NOT_JOINED) + self._set_muc_state(room_jid, MUCJoinedState.NOT_JOINED) room.set_not_joined() room.notify('kicked', properties) status_codes = properties.muc_status_codes or [] @@ -488,9 +528,28 @@ def _on_muc_user_presence(self, _con, stanza, properties): # unavailable presence, because we left the MUC return

- presence = self._manager.process_presence(properties) + presence = self._process_user_presence(properties) occupant.update_presence(presence, properties)

+ def _process_user_presence(self, properties): + jid = properties.jid + muc_presence = MUCPresenceData.from_presence(properties) + if not muc_presence.available: + self._joined_users[jid.bare].pop(jid.resource) + else: + self._joined_users[jid.bare][jid.resource] = muc_presence + return muc_presence + + def _is_user_joined(self, jid): + try: + self._joined_users[jid.bare][jid.resource] + except KeyError: + return False + return True + + def get_joined_users(self, jid): + return list(self._joined_users[jid].keys()) + def _start_rejoin_timeout(self, room_jid): self._remove_rejoin_timeout(room_jid) self._rejoin_muc.add(room_jid) @@ -568,7 +627,7 @@ def _on_subject_change(self, _con, _stanza, properties):

room_jid = properties.jid.bare

- muc_data = self._manager.get(room_jid) + muc_data = self._mucs.get(room_jid) if muc_data is None: self._log.warning('No MUCData found for %s', room_jid) return @@ -593,7 +652,7 @@ def _fake_subject_change(self, room_jid):

def _room_join_complete(self, muc_data): self._remove_join_timeout(muc_data.jid) - self._manager.set_state(muc_data.jid, MUCJoinedState.JOINED) + self._set_muc_state(muc_data.jid, MUCJoinedState.JOINED) self._remove_rejoin_timeout(muc_data.jid)

# We successfully joined a MUC, set add bookmark with autojoin @@ -626,7 +685,7 @@ def _on_captcha_challenge(self, _con, _stanza, properties): self._log.warning('Ignore captcha challenge received from MAM') raise nbxmpp.NodeProcessed

- muc_data = self._manager.get(properties.jid) + muc_data = self._mucs.get(properties.jid) if muc_data is None: return

@@ -639,7 +698,7 @@ def _on_captcha_challenge(self, _con, _stanza, properties): store_bob_data(properties.captcha.bob_data) muc_data.captcha_id = properties.id

- self._manager.set_state(properties.jid, MUCJoinedState.CAPTCHA_REQUEST) + self._set_muc_state(properties.jid, MUCJoinedState.CAPTCHA_REQUEST) self._remove_rejoin_timeout(properties.jid)

room = self._get_contact(properties.jid.bare) @@ -648,7 +707,7 @@ def _on_captcha_challenge(self, _con, _stanza, properties): raise nbxmpp.NodeProcessed

def cancel_captcha(self, room_jid): - muc_data = self._manager.get(room_jid) + muc_data = self._mucs.get(room_jid) if muc_data is None: return

@@ -656,11 +715,11 @@ def cancel_captcha(self, room_jid): self._log.warning('No captcha message id available') return self._nbxmpp('MUC').cancel_captcha(room_jid, muc_data.captcha_id) - self._manager.set_state(room_jid, MUCJoinedState.CAPTCHA_FAILED) - self._manager.set_state(room_jid, MUCJoinedState.NOT_JOINED) + self._set_muc_state(room_jid, MUCJoinedState.CAPTCHA_FAILED) + self._set_muc_state(room_jid, MUCJoinedState.NOT_JOINED)

def send_captcha(self, room_jid, form_node): - self._manager.set_state(room_jid, MUCJoinedState.JOINING) + self._set_muc_state(room_jid, MUCJoinedState.JOINING) self._nbxmpp('MUC').send_captcha(room_jid, form_node, callback=self._on_captcha_result) @@ -669,10 +728,10 @@ def _on_captcha_result(self, task): try: task.finish() except StanzaError as error: - muc_data = self._manager.get(error.jid) + muc_data = self._mucs.get(error.jid) if muc_data is None: return - self._manager.set_state(error.jid, MUCJoinedState.CAPTCHA_FAILED) + self._set_muc_state(error.jid, MUCJoinedState.CAPTCHA_FAILED) room = self._get_contact(error.jid) room.notify('room-captcha-error', error)

@@ -744,7 +803,7 @@ def invite(self, room, jid, reason=None, continue_=False): if contact and contact.supports(Namespace.CONFERENCE): type_ = InviteType.DIRECT

- password = self._manager.get(room).password + password = self._mucs[room].password self._log.info('Invite %s to %s', jid, room) return self._nbxmpp('MUC').invite(room, jid, reason, password, continue_, type_) @@ -758,81 +817,5 @@ def _on_account_disconnected(self, _event): self._remove_join_timeout(room_jid)

-class MUCManager(Observable): - def __init__(self, account, logger): - Observable.__init__(self) - self._account = account - self._log = logger - self._mucs = {} - self._joined_users = defaultdict(dict) - - def process_presence(self, properties): - jid = properties.jid - muc_presence = MUCPresenceData.from_presence(properties) - if not muc_presence.available: - self._joined_users[jid.bare].pop(jid.resource) - else: - self._joined_users[jid.bare][jid.resource] = muc_presence - return muc_presence - - def change_nickname(self, properties): - new_nick = properties.muc_user.nick - nick = properties.muc_nickname - presence_dict = self._joined_users[properties.jid.bare] - presence_dict[new_nick] = presence_dict.pop(nick) - - def is_joined(self, jid): - try: - self._joined_users[jid.bare][jid.resource] - except KeyError: - return False - return True - - def get_joined_users(self, jid): - return list(self._joined_users[jid].keys()) - - def add(self, muc): - self._mucs[muc.jid] = muc - self.notify('muc-added', self._account, muc.jid) - - def remove(self, muc): - self._mucs.pop(muc.jid, None) - self._joined_users.pop(muc.jid, None) - - def get(self, room_jid): - return self._mucs.get(room_jid) - - def set_state(self, room_jid, state): - muc = self._mucs.get(room_jid) - if muc is not None: - if muc.state == state: - return - self._log.info('Set MUC state: %s %s', room_jid, state) - - muc.state = state - self.notify('state-changed', - state, - qualifiers=(self._account, room_jid)) - - def get_joined_mucs(self): - mucs = self._mucs.values() - return [muc.jid for muc in mucs if muc.state == MUCJoinedState.JOINED] - - def get_mucs_with_state(self, states): - return [muc for muc in self._mucs.values() if muc.state in states] - - def reset_state(self): - client = app.get_client(self._account) - for muc in self._mucs.values(): - self.set_state(muc.jid, MUCJoinedState.NOT_JOINED) - self._joined_users.pop(muc.jid, None) - room = client.get_module('Contacts').get_contact(muc.jid) - room.set_not_joined() - room.notify('room-left') - - def __contains__(self, room_jid): - return room_jid in self._mucs - - def get_instance(*args, **kwargs): return MUC(*args, **kwargs), 'MUC'

===================================== gajim/common/modules/presence.py ===================================== @@ -72,7 +72,7 @@ def _presence_received(self, _con, stanza, properties): # MUC occupant presences are already handled in MUC module return

- muc = self._con.get_module('MUC').get_manager().get(properties.jid) + muc = self._con.get_module('MUC').get_muc_data(properties.jid) if muc is not None: # Presence from the MUC itself, used for MUC avatar # handled in VCardAvatars module

===================================== gajim/common/modules/vcard_avatars.py ===================================== @@ -102,7 +102,7 @@ def _presence_received(self, _con, _stanza, properties):

else: jid = properties.jid.new_as_bare() - muc = self._con.get_module('MUC').get_manager().get(properties.jid) + muc = self._con.get_module('MUC').get_muc_data(properties.jid) self._process_update(jid, properties.avatar_state, properties.avatar_sha,

===================================== gajim/groupchat_control.py ===================================== @@ -201,12 +201,6 @@ def __init__(self, parent_win, jid, muc_data, acct): self.xml.stack.show_all() self.xml.stack.set_visible_child_name('groupchat')

- client = app.get_client(self.account) - manager = client.get_module('MUC').get_manager() - manager.connect('state-changed', - self._on_muc_state_changed, - qualifiers=(self.account, self.room_jid)) - self.update_ui() self.widget.show_all()

@@ -221,6 +215,7 @@ def __init__(self, parent_win, jid, muc_data, acct):

def _connect_contact_signals(self): self.contact.multi_connect({ + 'state-changed': self._on_muc_state_changed, 'avatar-update': self._on_avatar_update, 'user-joined': self._on_user_joined, 'user-left': self._on_user_left, @@ -244,7 +239,8 @@ def _connect_contact_signals(self): 'room-join-failed': self._on_room_join_failed, })

- def _on_muc_state_changed(self, _muc_manager, _signal_name, state): + def _on_muc_state_changed(self, _contact, _signal_name): + state = self.contact.state if state == MUCJoinedState.JOINED: self.roster.initial_draw()

@@ -273,8 +269,7 @@ def _on_muc_state_changed(self, _muc_manager, _signal_name, state): @property def _muc_data(self): client = app.get_client(self.account) - manager = client.get_module('MUC').get_manager() - return manager.get(self.room_jid) + return client.get_module('MUC').get_muc_data(self.room_jid)

@property def _nick_completion(self): @@ -1380,8 +1375,6 @@ def shutdown(self, reason=None): app.settings.disconnect_signals(self) self.contact.disconnect(self)

- client = app.get_client(self.account) - client.get_module('MUC').get_manager().disconnect(self) # PluginSystem: removing GUI extension points connected with # GrouphatControl instance object app.plugin_manager.remove_gui_extension_point(

===================================== gajim/gui_interface.py ===================================== @@ -1363,11 +1363,12 @@ def show_add_join_groupchat(self, account, jid, nickname=None):

app.window.add_group_chat(account, str(jid), select=True)

- def _on_muc_added(self, _muc_manger, _signal_name, account, jid): - if app.window.chat_exists(account, jid): + @staticmethod + def _on_muc_added(event): + if app.window.chat_exists(event.account, event.jid): return

- app.window.add_group_chat(account, str(jid)) + app.window.add_group_chat(event.account, str(event.jid))

def new_private_chat(self, gc_contact, account, session=None): conn = app.connections[account] @@ -1559,8 +1560,8 @@ def enable_account(self, account): app.plugin_manager.register_modules_for_account( app.connections[account])

- muc_manager = app.connections[account].get_module('MUC').get_manager() - muc_manager.connect('muc-added', self._on_muc_added) + app.ged.register_event_handler( + 'muc-added', ged.CORE, self._on_muc_added)

# update variables self.instances[account] = { @@ -2027,8 +2028,8 @@ def __init__(self): app.settings.get_account_setting(account, 'active')): client = Client(account) app.connections[account] = client - muc_manager = client.get_module('MUC').get_manager() - muc_manager.connect('muc-added', self._on_muc_added) + app.ged.register_event_handler( + 'muc-added', ged.CORE, self._on_muc_added)

self.instances = {}

===================================== gajim/privatechat_control.py ===================================== @@ -46,7 +46,6 @@ class PrivateChatControl(ChatControl): def __init__(self, parent_win, jid, account): client = app.get_client(account) self._room_contact = client.get_module('Contacts').get_contact(jid.bare) - self._manager = client.get_module('MUC').get_manager()

ChatControl.__init__(self, parent_win, jid, account, None)

@@ -73,7 +72,8 @@ def room_name(self): return self._room_contact.name

def get_our_nick(self): - muc_data = self._manager.get(self._room_contact.jid) + client = app.get_client(self.account) + muc_data = client.get_module('MUC').get_muc_data(self._room_contact.jid) return muc_data.nick

def _on_user_nickname_changed(self,

View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/71ce5b66e19326941d652db18f1227ae...