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

Commits: 7a8ccd0a by lovetox at 2020-04-09T23:34:30+02:00 MUC: Fix incorrect status message on presence

Fixes #10049

- - - - - ebfc5b3e by lovetox at 2020-04-09T23:34:30+02:00 Fix pylint error

- - - - -

3 changed files:

- gajim/common/client.py - gajim/common/modules/muc.py - gajim/roster_window.py

Changes:

===================================== gajim/common/client.py ===================================== @@ -280,7 +280,7 @@ class Client(ConnectionHandlers): def _on_connection_failed(self, _client, _signal_name): self._schedule_reconnect()

- def _on_connected(self, client, _signal_name): + def _on_connected(self, _client, _signal_name): self._set_state(ClientState.CONNECTED) self.get_module('Discovery').discover_server_info() self.get_module('Discovery').discover_account_info() @@ -428,6 +428,9 @@ class Client(ConnectionHandlers): idle_time=idle_time)

self.priority = priority + + self.get_module('MUC').update_presence() + app.nec.push_incoming_event( OurShowEvent(None, conn=self, show=show))

===================================== gajim/common/modules/muc.py ===================================== @@ -304,14 +304,8 @@ class MUC(BaseModule): self._send_presence(muc_data, auto)

def _send_presence(self, muc_data, auto): - if self._con.status == 'offline': - # FIXME: Check if this - return - message = self._con.status_message

- xmpp_show = helpers.get_xmpp_show(self._con.status) - idle_time = None if auto and app.is_installed('IDLE') and app.config.get('autoaway'): idle_sec = idle.Monitor.get_idle_sec() @@ -320,12 +314,13 @@ class MUC(BaseModule):

self._log.info('Send presence: %s, show: %s, ' 'message: %s, idle_time: %s', - muc_data.occupant_jid, xmpp_show, message, idle_time) + muc_data.occupant_jid, self._con.status, + message, idle_time)

self._con.get_module('Presence').send_presence( muc_data.occupant_jid, - show=xmpp_show, - status=self._con.status, + show=self._con.status, + status=self._con.status_message, caps=True, idle_time=idle_time)

===================================== gajim/roster_window.py ===================================== @@ -2113,7 +2113,6 @@ class RosterWindow: self.delete_pep(app.get_jid_from_account(account), account)

app.connections[account].change_status(status, txt, auto) - app.connections[account].get_module('MUC').update_presence(auto)

def chg_contact_status(self, contact, show, status, account): """

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