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

Commits: 4ecfd7c0 by lovetox at 2020-04-10T22:33:33+02:00 Presence: Change default for priority to 0

- - - - - 083d8520 by lovetox at 2020-04-10T23:19:53+02:00 Client: Add priority property

- - - - - 82a18e6f by lovetox at 2020-04-10T23:20:44+02:00 MUC: Don't add caps when sending unavailable presence

- - - - -

3 changed files:

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

Changes:

===================================== gajim/common/client.py ===================================== @@ -56,7 +56,7 @@ class Client(ConnectionHandlers): self._user = app.config.get_per('accounts', self._account, 'name') self.password = None

- self.priority = 0 + self._priority = 0 self.handlers_registered = False self._connect_machine_calls = 0 self.avatar_conversion = False @@ -102,6 +102,10 @@ class Client(ConnectionHandlers): def status_message(self): return self._status_message

+ @property + def priority(self): + return self._priority + @property def certificate(self): return self._client.peer_certificate[0] @@ -356,16 +360,14 @@ class Client(ConnectionHandlers): destroy_client=True) return

- priority = app.get_priority(self._account, show) + self._priority = app.get_priority(self._account, show)

self.get_module('Presence').send_presence( - priority=priority, + priority=self._priority, show=show, status=msg, idle_time=auto)

- self.priority = priority - self.get_module('MUC').update_presence(auto=auto)

app.nec.push_incoming_event( @@ -397,15 +399,13 @@ class Client(ConnectionHandlers): self._send_first_presence()

def _send_first_presence(self): - priority = app.get_priority(self._account, self._status) + self._priority = app.get_priority(self._account, self._status)

self.get_module('Presence').send_presence( - priority=priority, + priority=self._priority, show=self._status, status=self._status_message)

- self.priority = priority - self._set_client_available()

if not self.avatar_conversion:

===================================== gajim/common/config.py ===================================== @@ -287,8 +287,8 @@ class Config: 'savepass': [opt_bool, False], 'password': [opt_str, ''], 'resource': [opt_str, 'gajim.$rand', '', True], - 'priority': [opt_int, 5, '', True], - 'adjust_priority_with_status': [opt_bool, True, _('Priority will change automatically according to your status. Priorities are defined in 'autopriority_*' options.')], + 'priority': [opt_int, 0, '', True], + 'adjust_priority_with_status': [opt_bool, False, _('Priority will change automatically according to your status. Priorities are defined in 'autopriority_*' options.')], 'autopriority_online': [opt_int, 50], 'autopriority_chat': [opt_int, 50], 'autopriority_away': [opt_int, 40],

===================================== gajim/common/modules/muc.py ===================================== @@ -215,7 +215,8 @@ class MUC(BaseModule): self._con.get_module('Presence').send_presence( muc_data.occupant_jid, typ='unavailable', - status=reason) + status=reason, + caps=False) # We leave a group chat, disable bookmark autojoin self._con.get_module('Bookmarks').modify(room_jid, autojoin=False)

@@ -303,7 +304,6 @@ class MUC(BaseModule): muc_data.occupant_jid, show=self._con.status, status=self._con.status_message, - caps=True, idle_time=auto)

def change_nick(self, room_jid, new_nick):

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