Philipp Hörist pushed to branch master at gajim / gajim
Commits:
298adcf0 by Philipp Hörist at 2019-08-02T09:55:24Z
Commands: Fix giving a reason when executing /leave
- - - - -
3 changed files:
- gajim/command_system/implementation/standard.py
- gajim/common/modules/muc.py
- gajim/groupchat_control.py
Changes:
=====================================
gajim/command_system/implementation/standard.py
=====================================
@@ -312,7 +312,7 @@ class StandardGroupChatCommands(CommandContainer):
@command('part', 'close', raw=True, empty=True)
@doc(_("Leave the group chat, optionally giving a reason, and close tab or
window"))
def leave(self, reason):
- self.leave()
+ self.leave(reason=reason)
@command(raw=True, empty=True)
@doc(_("""
=====================================
gajim/common/modules/muc.py
=====================================
@@ -163,14 +163,15 @@ class MUC(BaseModule):
self._set_muc_state(muc_data.jid, MUCJoinedState.JOINING)
self._con.connection.send(presence)
- def leave(self, room_jid):
+ def leave(self, room_jid, reason=None):
self._log.info('Leave MUC: %s', room_jid)
self._remove_join_timeout(room_jid)
self._set_muc_state(room_jid, MUCJoinedState.NOT_JOINED)
muc_data = self._get_muc_data(room_jid)
self._con.get_module('Presence').send_presence(
muc_data.occupant_jid,
- typ='unavailable')
+ typ='unavailable',
+ status=reason)
# We leave a group chat, disable bookmark autojoin
self._con.get_module('Bookmarks').set_autojoin(room_jid, False)
=====================================
gajim/groupchat_control.py
=====================================
@@ -1544,8 +1544,9 @@ class GroupchatControl(ChatControlBase):
self.update_actions()
- def leave(self):
- app.connections[self.account].get_module('MUC').leave(self.room_jid)
+ def leave(self, reason=None):
+ app.connections[self.account].get_module('MUC').leave(self.room_jid,
+ reason=reason)
self.got_disconnected()
self._close_control()
View it on GitLab:
https://dev.gajim.org/gajim/gajim/commit/298adcf072d69893949e51d32fc6bc16d41337be
--
View it on GitLab:
https://dev.gajim.org/gajim/gajim/commit/298adcf072d69893949e51d32fc6bc16d41337be
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
