Commits July 2019

commits@gajim.org

1 participants
52 discussions

[Git][gajim/python-nbxmpp][master] MUC: Add callback for send_captcha()
by Philipp Hörist 30 Jul '19

30 Jul '19

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: b7d1e581 by Philipp Hörist at 2019-07-30T19:36:50Z MUC: Add callback for send_captcha() - - - - - 1 changed file: - nbxmpp/modules/muc.py Changes: ===================================== nbxmpp/modules/muc.py ===================================== @@ -488,11 +488,12 @@ class MUC: muc_user.setTagData('password', password) return message + @call_on_response('_default_response') def send_captcha(self, room_jid, form_node): iq = Iq(typ='set', to=room_jid) captcha = iq.addChild(name='captcha', namespace=NS_CAPTCHA) captcha.addChild(node=form_node) - self._client.send(iq) + return iq @callback def _default_response(self, stanza): View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/b7d1e581951218731711385697… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/b7d1e581951218731711385697… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Simplify MUCData struct
by Philipp Hörist 28 Jul '19

28 Jul '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 6c2271ce by Philipp Hörist at 2019-07-28T10:48:52Z Simplify MUCData struct - - - - - 1 changed file: - gajim/common/structs.py Changes: ===================================== gajim/common/structs.py ===================================== @@ -28,10 +28,10 @@ CapsIdentity = namedtuple('CapsIdentity', 'category type name lang') class MUCData: def __init__(self, room_jid, nick, password, config=None): self._room_jid = JID(room_jid) - self._nick = nick - self._password = password self._config = config - self._state = MUCJoinedState.NOT_JOINED + self.nick = nick + self.password = password + self.state = MUCJoinedState.NOT_JOINED @property def jid(self): @@ -40,29 +40,9 @@ class MUCData: @property def occupant_jid(self): jid = self._room_jid.copy() - jid.setResource(self._nick) + jid.setResource(self.nick) return jid - @property - def nick(self): - return self._nick - - @nick.setter - def nick(self, value): - self._nick = value - - @property - def password(self): - return self._password - - @property - def state(self): - return self._state - - @state.setter - def state(self, value): - self._state = value - @property def config(self): return self._config View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/6c2271ce56bf7ea34a6dd8115125514f2c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/6c2271ce56bf7ea34a6dd8115125514f2c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Groupchat: Integrate error messages into GroupchatControl
by Philipp Hörist 27 Jul '19

27 Jul '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 0652f285 by Philipp Hörist at 2019-07-27T22:34:13Z Groupchat: Integrate error messages into GroupchatControl Fixes #9771 - - - - - 3 changed files: - gajim/common/modules/muc.py - gajim/data/gui/groupchat_control.ui - gajim/groupchat_control.py Changes: ===================================== gajim/common/modules/muc.py ===================================== @@ -75,9 +75,8 @@ class MUC(BaseModule): ns=nbxmpp.NS_MUC_USER, priority=49), StanzaHandler(name='presence', - callback=self._on_muc_presence, + callback=self._on_error_presence, typ='error', - ns=nbxmpp.NS_MUC, priority=49), StanzaHandler(name='message', callback=self._on_subject_change, @@ -309,16 +308,26 @@ class MUC(BaseModule): muc_x.setTag('history', {'since': date_string}) self._log.info('Threshold for %s: %s', room_jid, threshold) - def _on_muc_presence(self, _con, _stanza, properties): - muc_data = self._get_muc_data(properties.muc_jid) - if (properties.error.type == Error.CONFLICT and - muc_data.state == MUCJoinedState.JOINING): - muc_data.nick += '_' - self._log.info('Nickname conflict: %s change to %s', - muc_data.jid, muc_data.nick) - self._join(muc_data) + def _on_error_presence(self, _con, _stanza, properties): + room_jid = properties.jid.getBare() + muc_data = self._muc_data.get(room_jid) + if muc_data is None: return - self._raise_muc_event('muc-presence-error', properties) + + if muc_data.state == MUCJoinedState.JOINING: + if properties.error.type == Error.CONFLICT: + muc_data.nick += '_' + self._log.info('Nickname conflict: %s change to %s', + muc_data.jid, muc_data.nick) + self._join(muc_data) + elif properties.error.type == Error.NOT_AUTHORIZED: + self._raise_muc_event('muc-password-required', properties) + else: + self._raise_muc_event('muc-join-failed', properties) + self._set_muc_state(room_jid, MUCJoinedState.NOT_JOINED) + + else: + self._raise_muc_event('muc-presence-error', properties) def _on_muc_user_presence(self, _con, stanza, properties): if properties.type == PresenceType.ERROR: ===================================== gajim/data/gui/groupchat_control.ui ===================================== @@ -894,6 +894,93 @@ <property name="position">5</property> </packing> </child> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkGrid"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">center</property> + <property name="valign">center</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="row_spacing">12</property> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="homogeneous">True</property> + <child> + <object class="GtkButton" id="close_button"> + <property name="label" translatable="yes">_Close</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="receives_default">True</property> + <property name="halign">center</property> + <property name="valign">start</property> + <property name="use_underline">True</property> + <signal name="clicked" handler="_on_page_close_clicked" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="icon_name">dialog-error-symbolic</property> + <property name="icon_size">6</property> + <style> + <class name="error-color"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="error_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="justify">center</property> + <property name="wrap">True</property> + <property name="max_width_chars">40</property> + <style> + <class name="bold16"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + </object> + <packing> + <property name="name">error</property> + <property name="position">6</property> + </packing> + </child> </object> <packing> <property name="expand">True</property> ===================================== gajim/groupchat_control.py ===================================== @@ -38,7 +38,6 @@ from nbxmpp.protocol import validate_resourcepart from nbxmpp.const import StatusCode from nbxmpp.const import Affiliation from nbxmpp.const import Role -from nbxmpp.const import Error from nbxmpp.const import PresenceType from nbxmpp.util import is_error_result @@ -313,6 +312,7 @@ class GroupchatControl(ChatControlBase): self._event_handlers = [ ('muc-joined', ged.GUI1, self._on_joined), + ('muc-join-failed', ged.GUI1, self._on_muc_join_failed), ('muc-user-joined', ged.GUI1, self._on_user_joined), ('muc-user-left', ged.GUI1, self._on_user_left), ('muc-nickname-changed', ged.GUI1, self._on_nickname_changed), @@ -323,6 +323,7 @@ class GroupchatControl(ChatControlBase): ('muc-user-role-changed', ged.GUI1, self._on_role_changed), ('muc-destroyed', ged.GUI1, self._on_destroyed), ('muc-presence-error', ged.GUI1, self._on_presence_error), + ('muc-password-required', ged.GUI1, self._on_password_required), ('muc-config-changed', ged.GUI1, self._on_config_changed), ('muc-subject', ged.GUI1, self._on_subject), ('muc-captcha-challenge', ged.GUI1, self._on_captcha_challenge), @@ -1912,52 +1913,23 @@ class GroupchatControl(ChatControlBase): if self.is_connected and print_join_left: self.add_info_message(_('%s has joined the group chat') % nick) + @event_filter(['account', 'room_jid']) + def _on_password_required(self, _event): + self._show_page('password') + + @event_filter(['account', 'room_jid']) + def _on_muc_join_failed(self, event): + self.xml.error_label.set_text(event.properties.error.message) + self._show_page('error') + self.autorejoin = False + @event_filter(['account', 'room_jid']) def _on_presence_error(self, event): error_type = event.properties.error.type error_message = event.properties.error.message - if error_type == Error.NOT_AUTHORIZED: - self._show_page('password') - - elif error_type == Error.FORBIDDEN: - # we are banned - ErrorDialog( - _('Unable to join group chat'), - _('You are banned from group chat <b>%s</b>.') % self.room_jid) - - elif error_type == Error.REMOTE_SERVER_NOT_FOUND: - ErrorDialog( - _('Unable to join group chat'), - _('Remote server <b>%s</b> does not exist.') % self.room_jid) - - elif error_type == Error.ITEM_NOT_FOUND: - ErrorDialog( - _('Unable to join group chat'), - _('Group chat <b>%s</b> does not exist.') % self.room_jid) - - elif error_type == Error.NOT_ALLOWED: - ErrorDialog( - _('Unable to join group chat'), - _('Group chat creation is not permitted.')) - - elif error_type == Error.NOT_ACCEPTABLE: - ErrorDialog( - _('Unable to join group chat'), - _('You must use your registered ' - 'nickname in <b>%s</b>.') % self.room_jid) - - elif error_type == Error.REGISTRATION_REQUIRED: - ErrorDialog( - _('Unable to join group chat'), - _('You are not in the members ' - 'list in group chat %s.') % self.room_jid) - - else: - self.add_info_message( - 'Error %s: %s' % (error_type.value, error_message)) - - self.autorejoin = False + self.add_info_message( + 'Error %s: %s' % (error_type.value, error_message)) def add_contact_to_roster(self, nick): contact = app.contacts.get_gc_contact(self.account, @@ -2446,6 +2418,8 @@ class GroupchatControl(ChatControlBase): self._on_password_cancel_clicked() elif self._get_current_page() == 'captcha': self._on_captcha_cancel_clicked() + elif self._get_current_page() == 'error': + self._on_page_close_clicked() else: self._show_page('groupchat') return Gdk.EVENT_STOP @@ -2906,6 +2880,8 @@ class GroupchatControl(ChatControlBase): self.xml.password_set_button.grab_default() elif page_name == 'captcha': self.xml.captcha_set_button.grab_default() + elif page_name == 'error': + self.xml.close_button.grab_default() def _on_change_nick(self, _action, _param): if self._get_current_page() == 'nickname': @@ -3010,6 +2986,11 @@ class GroupchatControl(ChatControlBase): def _on_page_cancel_clicked(self, _button): self._show_page('groupchat') + def _on_page_close_clicked(self, _button=None): + self.force_non_minimizable = True + self.parent_win.remove_tab(self, self.parent_win.CLOSE_COMMAND) + self.force_non_minimizable = False + class SubjectPopover(Gtk.Popover): def __init__(self): View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/0652f28553e13415231329689b11d12720… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/0652f28553e13415231329689b11d12720… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] MUC: Add a dedicated muc-joined event
by Philipp Hörist 26 Jul '19

26 Jul '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 6f9c28ec by Philipp Hörist at 2019-07-26T09:24:51Z MUC: Add a dedicated muc-joined event - - - - - 2 changed files: - gajim/common/modules/muc.py - gajim/groupchat_control.py Changes: ===================================== gajim/common/modules/muc.py ===================================== @@ -544,6 +544,12 @@ class MUC(BaseModule): if muc_data.state == MUCJoinedState.JOINING: self._remove_join_timeout(room_jid) self._set_muc_state(room_jid, MUCJoinedState.JOINED) + + app.nec.push_incoming_event( + NetworkEvent('muc-joined', + account=self._account, + room_jid=room_jid)) + # We successfully joined a MUC, set autojoin bookmark self._con.get_module('Bookmarks').add_bookmark(None, muc_data.jid, ===================================== gajim/groupchat_control.py ===================================== @@ -312,6 +312,7 @@ class GroupchatControl(ChatControlBase): settings_menu.set_menu_model(self.control_menu) self._event_handlers = [ + ('muc-joined', ged.GUI1, self._on_joined), ('muc-user-joined', ged.GUI1, self._on_user_joined), ('muc-user-left', ged.GUI1, self._on_user_left), ('muc-nickname-changed', ged.GUI1, self._on_nickname_changed), @@ -1648,7 +1649,6 @@ class GroupchatControl(ChatControlBase): # We just joined the room self.add_info_message(_('You (%s) joined the group chat') % nick) self.add_contact_to_roster(nick) - self.got_connected() if StatusCode.NON_ANONYMOUS in status_codes: self.add_info_message( @@ -1896,6 +1896,10 @@ class GroupchatControl(ChatControlBase): self.remove_contact(nick) self.draw_all_roles() + @event_filter(['account', 'room_jid']) + def _on_joined(self, _event): + self.got_connected() + @event_filter(['account', 'room_jid']) def _on_user_joined(self, event): nick = event.properties.muc_nickname View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/6f9c28ec75bbfa29fcb15de5ade6d087a3… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/6f9c28ec75bbfa29fcb15de5ade6d087a3… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] MUC: Add timeout while joining
by Philipp Hörist 26 Jul '19

26 Jul '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 43eac9a5 by Philipp Hörist at 2019-07-26T08:38:57Z MUC: Add timeout while joining Some servers dont send empty subjects on join which they should to indicate that the join process is complete. This adds a timeout for receiving the subject and fakes it if the subject does not arrive within 10 seconds - - - - - 2 changed files: - gajim/common/modules/muc.py - gajim/groupchat_control.py Changes: ===================================== gajim/common/modules/muc.py ===================================== @@ -28,6 +28,8 @@ from nbxmpp.const import Error from nbxmpp.structs import StanzaHandler from nbxmpp.util import is_error_result +from gi.repository import GLib + from gajim.common import app from gajim.common import helpers from gajim.common.const import KindConstant @@ -105,6 +107,7 @@ class MUC(BaseModule): ] self._muc_data = {} + self._join_timeouts = {} def pass_disco(self, info): for identity in info.identities: @@ -162,6 +165,7 @@ class MUC(BaseModule): def leave(self, room_jid): 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( @@ -326,11 +330,14 @@ class MUC(BaseModule): self._log.warning(stanza) return + muc_data = self._get_muc_data(room_jid) + if properties.is_muc_destroyed: for contact in app.contacts.get_gc_contact_list( self._account, room_jid): contact.presence = PresenceType.UNAVAILABLE self._log.info('MUC destroyed: %s', room_jid) + self._remove_join_timeout(room_jid) self._set_muc_state(room_jid, MUCJoinedState.NOT_JOINED) self._raise_muc_event('muc-destroyed', properties) return @@ -346,7 +353,7 @@ class MUC(BaseModule): self._log.info('Nickname changed: %s to %s', properties.jid, properties.muc_user.nick) - self._get_muc_data(room_jid).nick = properties.muc_user.nick + muc_data.nick = properties.muc_user.nick self._raise_muc_event('muc-nickname-changed', properties) return @@ -355,6 +362,8 @@ class MUC(BaseModule): if properties.is_muc_self_presence: self._log.info('Self presence: %s', properties.jid) self._raise_muc_event('muc-self-presence', properties) + if muc_data.state == MUCJoinedState.JOINING: + self._start_join_timeout(room_jid) if properties.is_new_room: self.configure_room(room_jid) else: @@ -425,6 +434,20 @@ class MUC(BaseModule): properties.show) self._raise_muc_event('muc-user-status-show-changed', properties) + def _start_join_timeout(self, room_jid): + self._remove_join_timeout(room_jid) + self._log.info('Start join timeout for: %s', room_jid) + id_ = GLib.timeout_add_seconds( + 10, self._fake_subject_change, room_jid) + self._join_timeouts[room_jid] = id_ + + def _remove_join_timeout(self, room_jid): + id_ = self._join_timeouts.get(room_jid) + if id_ is not None: + self._log.info('Remove join timeout for: %s', room_jid) + GLib.source_remove(id_) + del self._join_timeouts[room_jid] + def _raise_muc_event(self, event_name, properties): app.nec.push_incoming_event( NetworkEvent(event_name, @@ -487,24 +510,40 @@ class MUC(BaseModule): if not properties.is_muc_subject: return - jid = str(properties.muc_jid) - contact = app.contacts.get_groupchat_contact(self._account, jid) + self._handle_subject_change(str(properties.muc_jid), + properties.subject, + properties.muc_nickname, + properties.user_timestamp) + + raise nbxmpp.NodeProcessed + + def _fake_subject_change(self, room_jid): + # This is for servers which dont send empty subjects as part of the + # event order on joining a MUC. For example jabber.ru + self._log.warning('Fake subject received for %s', room_jid) + del self._join_timeouts[room_jid] + self._handle_subject_change(room_jid, None, None, None) + + def _handle_subject_change(self, room_jid, subject, nickname, timestamp): + contact = app.contacts.get_groupchat_contact(self._account, room_jid) if contact is None: return - contact.status = properties.subject + contact.status = subject app.nec.push_incoming_event( NetworkEvent('muc-subject', account=self._account, - room_jid=jid, - subject=properties.subject, - nickname=properties.muc_nickname, - user_timestamp=properties.user_timestamp)) + room_jid=room_jid, + subject=subject, + nickname=nickname, + user_timestamp=timestamp, + is_fake=subject is None)) - muc_data = self._get_muc_data(jid) + muc_data = self._get_muc_data(room_jid) if muc_data.state == MUCJoinedState.JOINING: - self._set_muc_state(jid, MUCJoinedState.JOINED) + self._remove_join_timeout(room_jid) + self._set_muc_state(room_jid, MUCJoinedState.JOINED) # We successfully joined a MUC, set autojoin bookmark self._con.get_module('Bookmarks').add_bookmark(None, muc_data.jid, @@ -512,8 +551,6 @@ class MUC(BaseModule): muc_data.password, muc_data.nick) - raise nbxmpp.NodeProcessed - def _on_voice_request(self, _con, _stanza, properties): if not properties.is_voice_request: return @@ -606,6 +643,10 @@ class MUC(BaseModule): self._log.info('Inivte %s to %s', to, room) self._nbxmpp('MUC').invite(room, to, reason, password, continue_, type_) + def cleanup(self): + for room_jid in list(self._join_timeouts.keys()): + self._remove_join_timeout(room_jid) + def get_instance(*args, **kwargs): return MUC(*args, **kwargs), 'MUC' ===================================== gajim/groupchat_control.py ===================================== @@ -65,6 +65,7 @@ from gajim.common.i18n import _ from gajim.common import contacts from gajim.common.const import StyleAttr from gajim.common.const import Chatstate +from gajim.common.const import MUCJoinedState from gajim.chat_control_base import ChatControlBase @@ -114,7 +115,6 @@ class GroupchatControl(ChatControlBase): self.force_non_minimizable = False self.is_continued = is_continued self.is_anonymous = True - self.join_time = 0 # Controls the state of autorejoin. # None - autorejoin is neutral. @@ -1351,7 +1351,7 @@ class GroupchatControl(ChatControlBase): @event_filter(['account', 'room_jid']) def _on_subject(self, event): - if self.subject == event.subject: + if self.subject == event.subject or event.is_fake: # Probably a rejoin, we already showed that subject return self.set_subject(event.subject) @@ -1363,11 +1363,11 @@ class GroupchatControl(ChatControlBase): time.localtime(event.user_timestamp)) text = '%s - %s' % (text, date) - just_joined = self.join_time > time.time() - 10 - if app.config.get('show_subject_on_join') or not just_joined: + if (app.config.get('show_subject_on_join') or + self._muc_data.state != MUCJoinedState.JOINED): self.add_info_message(text) - if event.subject == '': + if not event.subject: self.subject_button.hide() else: self.subject_button.show() @@ -1474,7 +1474,6 @@ class GroupchatControl(ChatControlBase): self.model.clear() def got_connected(self): - self.join_time = time.time() # Make autorejoin stop. if self.autorejoin: GLib.source_remove(self.autorejoin) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/43eac9a517501bcdbc2c93e9bd3f3b2631… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/43eac9a517501bcdbc2c93e9bd3f3b2631… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] DataForms: Don't remove empty values
by Philipp Hörist 26 Jul '19

26 Jul '19

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: de372729 by Philipp Hörist at 2019-07-26T08:28:12Z DataForms: Don't remove empty values Old ejabberd servers dont accept missing value elements in text fields. This now does not delete the value element anymore if it's empty. - - - - - 1 changed file: - nbxmpp/modules/dataforms.py Changes: ===================================== nbxmpp/modules/dataforms.py ===================================== @@ -342,10 +342,8 @@ class StringField(DataField): @value.setter def value(self, value): - assert isinstance(value, str) - if value == '' and not self.required: - del self.value - return + if value is None: + value = '' self.setTagData('value', value) @value.deleter View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/de3727290a8c22c5a8aa165531… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/de3727290a8c22c5a8aa165531… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] NickCompletion: Simplify nickname change
by Philipp Hörist 23 Jul '19

23 Jul '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: f650f51a by Philipp Hörist at 2019-07-23T22:19:31Z NickCompletion: Simplify nickname change - - - - - 1 changed file: - gajim/groupchat_control.py Changes: ===================================== gajim/groupchat_control.py ===================================== @@ -1640,10 +1640,6 @@ class GroupchatControl(ChatControlBase): for role in (Role.VISITOR, Role.PARTICIPANT, Role.MODERATOR): self.draw_role(role) - def _change_nick(self, new_nick: str) -> None: - self.nick = new_nick - self._nick_completion.change_nick(new_nick) - @event_filter(['account', 'room_jid']) def _on_self_presence(self, event): nick = event.properties.muc_nickname @@ -1680,7 +1676,7 @@ class GroupchatControl(ChatControlBase): nick = event.properties.muc_nickname new_nick = event.properties.muc_user.nick if event.properties.is_muc_self_presence: - self._change_nick(new_nick) + self._nick_completion.change_nick(new_nick) message = _('You are now known as %s') % new_nick else: message = _('{nick} is now known ' View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/f650f51aa6ab71b778209897f1c2007bde… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/f650f51aa6ab71b778209897f1c2007bde… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: Refactor joining group chats
by Philipp Hörist 23 Jul '19

23 Jul '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 4b15436a by Philipp Hörist at 2019-07-23T22:01:40Z Refactor joining group chats - Separate join and create group chat - Simplify code - - - - - 33ee2e4c by Philipp Hörist at 2019-07-23T22:01:40Z Remove old JoinGroupchatWindow - - - - - 86d87495 by Philipp Hörist at 2019-07-23T22:01:40Z Remove obsolete bookmark code - - - - - 18 changed files: - gajim/app_actions.py - gajim/application.py - gajim/chat_control.py - gajim/command_system/implementation/standard.py - gajim/common/modules/bookmarks.py - gajim/common/modules/muc.py - gajim/dialogs.py - gajim/groupchat_control.py - gajim/gtk/dialogs.py - gajim/gtk/discovery.py - gajim/gtk/groupchat_creation.py - gajim/gtk/groupchat_join.py - − gajim/gtk/join_groupchat.py - gajim/gtk/start_chat.py - gajim/gui_interface.py - gajim/gui_menu_builder.py - gajim/remote_control.py - gajim/roster_window.py Changes: ===================================== gajim/app_actions.py ===================================== @@ -30,7 +30,6 @@ from gajim.gtk.history_sync import HistorySyncAssistant from gajim.gtk.server_info import ServerInfoDialog from gajim.gtk.mam_preferences import MamPreferences from gajim.gtk.preferences import Preferences -from gajim.gtk.join_groupchat import JoinGroupchatWindow from gajim.gtk.groupchat_creation import CreateGroupchatWindow from gajim.gtk.start_chat import StartChatDialog from gajim.gtk.add_contact import AddNewContactWindow @@ -115,17 +114,6 @@ def on_profile(action, param): interface.edit_own_details(param.get_string()) -def on_activate_bookmark(action, param): - dict_ = param.unpack() - account, jid, nick, password = \ - dict_['account'], dict_['jid'], None, None - if 'nick' in dict_: - nick = dict_['nick'] - if 'password' in dict_: - password = dict_['password'] - interface.join_gc_room(account, jid, nick, password) - - def on_send_server_message(action, param): account = param.get_string() server = app.config.get_per('accounts', account, 'hostname') @@ -146,23 +134,6 @@ def on_service_disco(action, param): except GajimGeneralException: pass - -def on_join_gc(_action, param): - account, jid = None, None - if param is None: - if not app.get_connected_accounts(): - return - else: - account, jid = param.get_strv() - if not jid: - jid = None - window = app.get_app_window(JoinGroupchatWindow) - if window is None: - JoinGroupchatWindow(account, jid) - else: - window.present() - - def on_create_gc(_action, param): window = app.get_app_window(CreateGroupchatWindow) if window is None: ===================================== gajim/application.py ===================================== @@ -415,7 +415,6 @@ class GajimApplication(Gtk.Application): general_actions = [ ('quit', app_actions.on_quit), ('add-account', app_actions.on_add_account), - ('join-groupchat', app_actions.on_join_gc), ('manage-proxies', app_actions.on_manage_proxies), ('bookmarks', app_actions.on_manage_bookmarks), ('history-manager', app_actions.on_history_manager), @@ -493,7 +492,6 @@ class GajimApplication(Gtk.Application): return [ ('-start-single-chat', a.on_single_message, 'online', 's'), ('-start-chat', a.start_chat, 'online', 'as'), - ('-join-groupchat', a.on_join_gc, 'online', 'as'), ('-add-contact', a.on_add_contact, 'online', 'as'), ('-services', a.on_service_disco, 'online', 's'), ('-profile', a.on_profile, 'feature', 's'), @@ -507,7 +505,6 @@ class GajimApplication(Gtk.Application): ('-set-motd', a.on_set_motd, 'online', 's'), ('-update-motd', a.on_update_motd, 'online', 's'), ('-delete-motd', a.on_delete_motd, 'online', 's'), - ('-activate-bookmark', a.on_activate_bookmark, 'online', 'a{sv}'), ('-open-event', a.on_open_event, 'always', 'a{sv}'), ('-import-contacts', a.on_import_contacts, 'online', 's'), ] ===================================== gajim/chat_control.py ===================================== @@ -1550,13 +1550,9 @@ class ChatControl(ChatControlBase): Gtk.MessageType.ERROR) def _on_accept_gc_invitation(self, widget, event): - if event.continued: - app.interface.join_gc_room(self.account, str(event.muc), - app.nicks[self.account], event.password, - is_continued=True) - else: - app.interface.join_gc_minimal(self.account, str(event.muc)) - + app.interface.show_or_join_groupchat(self.account, + str(event.muc), + password=event.password) app.events.remove_events(self.account, self.contact.jid, event=event) def _on_cancel_gc_invitation(self, widget, event): ===================================== gajim/command_system/implementation/standard.py ===================================== @@ -20,6 +20,8 @@ Provides an actual implementation for the standard commands. from time import localtime, strftime from datetime import date +from gi.repository import GLib + from gajim.common import app from gajim.common import helpers from gajim.common.i18n import _ @@ -303,7 +305,9 @@ class StandardGroupChatCommands(CommandContainer): if '@' not in jid: jid = jid + '@' + app.get_server_from_jid(self.room_jid) - app.interface.join_gc_minimal(self.account, room_jid=jid) + app.app.activate_action( + 'groupchat-join', + GLib.Variant('as', [self.account, jid])) @command('part', 'close', raw=True, empty=True) @doc(_("Leave the group chat, optionally giving a reason, and close tab or window")) ===================================== gajim/common/modules/bookmarks.py ===================================== @@ -203,9 +203,9 @@ class Bookmarks(BaseModule): self._log.info('Autojoin Bookmark: %s', bookmark.jid) minimize = app.config.get_per('rooms', bookmark.jid, 'minimize_on_autojoin', True) - app.interface.join_gc_room( - self._account, str(bookmark.jid), bookmark.nick, - bookmark.password, minimize=minimize) + app.interface.join_groupchat(self._account, + str(bookmark.jid), + minimized=minimize) def add_bookmark(self, name: str, ===================================== gajim/common/modules/muc.py ===================================== @@ -33,7 +33,6 @@ from gajim.common import helpers from gajim.common.const import KindConstant from gajim.common.const import MUCJoinedState from gajim.common.const import SyncThreshold -from gajim.common.structs import MUCData from gajim.common.helpers import AdditionalDataDict from gajim.common.helpers import get_default_muc_config from gajim.common.helpers import get_sync_threshold @@ -134,15 +133,14 @@ class MUC(BaseModule): def get_mucs_with_state(self, states): return [muc for muc in self._muc_data.values() if muc.state in states] - def join(self, room_jid, nick, password, config=None): + def join(self, muc_data): if not app.account_is_connected(self._account): return - muc_data = MUCData(room_jid, nick, password, config) - self._muc_data[room_jid] = muc_data + self._muc_data[muc_data.jid] = muc_data self._con.get_module('Discovery').disco_muc( - room_jid, partial(self._join, muc_data)) + muc_data.jid, partial(self._join, muc_data)) def _join(self, muc_data): show = helpers.get_xmpp_show(app.SHOW_LIST[self._con.connected]) ===================================== gajim/dialogs.py ===================================== @@ -988,8 +988,7 @@ class TransformChatToMUC: app.automatic_rooms[self.account][room_jid] = {} app.automatic_rooms[self.account][room_jid]['invities'] = guest_list app.automatic_rooms[self.account][room_jid]['continue_tag'] = True - app.interface.join_gc_room(self.account, room_jid, - app.nicks[self.account], None, is_continued=True) + app.interface.create_groupchat(self.account, room_jid) self.window.destroy() def on_cancel_button_clicked(self, widget): ===================================== gajim/groupchat_control.py ===================================== @@ -107,7 +107,7 @@ class GroupchatControl(ChatControlBase): # will be processed with this command host. COMMAND_HOST = GroupChatCommands - def __init__(self, parent_win, contact, nick, acct, is_continued=False): + def __init__(self, parent_win, contact, muc_data, acct, is_continued=False): ChatControlBase.__init__(self, self.TYPE_ID, parent_win, 'groupchat_control', contact, acct) @@ -169,7 +169,7 @@ class GroupchatControl(ChatControlBase): self.handlers[id_] = widget self.room_jid = self.contact.jid - self.nick = nick + self._muc_data = muc_data bm_module = app.connections[self.account].get_module('Bookmarks') self.name = bm_module.get_name_from_bookmark(self.room_jid) @@ -189,7 +189,7 @@ class GroupchatControl(ChatControlBase): # sorted list of nicks who mentioned us (last at the end) self.attention_list = [] self.nick_hits = [] - self._nick_completion = NickCompletionGenerator(self.nick) + self._nick_completion = NickCompletionGenerator(muc_data.nick) self.last_key_tabs = False self.subject = '' @@ -360,6 +360,10 @@ class GroupchatControl(ChatControlBase): # instance object app.plugin_manager.gui_extension_point('groupchat_control', self) + @property + def nick(self): + return self._muc_data.nick + def add_actions(self): super().add_actions() actions = [ @@ -1409,8 +1413,7 @@ class GroupchatControl(ChatControlBase): def _nec_signed_in(self, obj): if obj.conn.name != self.account: return - password = app.gc_passwords.get(self.room_jid, '') - obj.conn.get_module('MUC').join(self.room_jid, self.nick, password) + obj.conn.get_module('MUC').join(self._muc_data) def _nec_decrypted_message_received(self, obj): if obj.conn.name != self.account: @@ -1545,9 +1548,7 @@ class GroupchatControl(ChatControlBase): def rejoin(self): if not self.autorejoin: return False - password = app.gc_passwords.get(self.room_jid, '') - app.connections[self.account].get_module('MUC').join( - self.room_jid, self.nick, password) + app.connections[self.account].get_module('MUC').join(self._muc_data) return True def draw_roster(self): @@ -2951,9 +2952,8 @@ class GroupchatControl(ChatControlBase): def _on_password_set_clicked(self, _button): password = self.xml.password_entry.get_text() - app.gc_passwords[self.room_jid] = password - app.connections[self.account].get_module('MUC').join( - self.room_jid, self.nick, password) + self._muc_data.password = password + app.connections[self.account].get_module('MUC').join(self._muc_data) self._show_page('groupchat') def _on_password_changed(self, entry, _param): ===================================== gajim/gtk/dialogs.py ===================================== @@ -791,16 +791,9 @@ class InvitationReceivedDialog(Gtk.ApplicationWindow): self._ui.message_expander.set_expanded(True) def on_accept_button_clicked(self, widget): - if self.is_continued: - app.interface.join_gc_room(self.account, - self.room_jid, - app.nicks[self.account], - self.password, - is_continued=True) - else: - app.interface.join_gc_minimal(self.account, - self.room_jid, - password=self.password) + app.interface.show_or_join_groupchat(self.account, + self.jid, + password=self.password) self.destroy() def on_decline_button_clicked(self, widget): ===================================== gajim/gtk/discovery.py ===================================== @@ -1352,8 +1352,7 @@ class ToplevelAgentBrowser(AgentBrowser): if not iter_: return service = model[iter_][0] - app.interface.join_gc_minimal(self.account, service, - transient_for=self.window.window) + app.interface.show_or_join_groupchat(self.account, service) def update_actions(self): if self.execute_button: @@ -1719,13 +1718,7 @@ class MucBrowser(AgentBrowser): if not iter_: return service = model[iter_][0] - window = app.get_app_window('JoinGroupchatWindow') - if window is None: - app.interface.join_gc_minimal(self.account, service) - else: - window.set_room(service) - window.present() - self.window.window.destroy() + app.interface.show_or_join_groupchat(self.account, service) def update_actions(self): sens = \ ===================================== gajim/gtk/groupchat_creation.py ===================================== @@ -223,11 +223,9 @@ class CreateGroupchatWindow(Gtk.ApplicationWindow): } # Create new group chat by joining - app.interface.join_gc_room( + app.interface.create_groupchat( self._account, str(room_jid), - app.nicks[self._account], - None, config=config) self.destroy() ===================================== gajim/gtk/groupchat_join.py ===================================== @@ -107,7 +107,7 @@ class GroupchatJoin(Gtk.ApplicationWindow): self._show_error_page(MUC_DISCO_ERRORS[error_code]) def _on_join(self, _button): - app.interface.join_gc_room(self.account, self.jid, None, None) + app.interface.show_or_join_groupchat(self.account, self.jid) self.destroy() def _on_destroy(self, *args): ===================================== gajim/gtk/join_groupchat.py deleted ===================================== @@ -1,312 +0,0 @@ -# This file is part of Gajim. -# -# Gajim is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published -# by the Free Software Foundation; version 3 only. -# -# Gajim is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with Gajim. If not, see <http://www.gnu.org/licenses/>. - - -from gi.repository import Gtk -from gi.repository import Gdk - -import nbxmpp -from nbxmpp.protocol import JID -from nbxmpp.util import is_error_result -from nbxmpp.structs import DiscoIdentity - -from gajim.common import app -from gajim.common import helpers -from gajim.common.i18n import _ -from gajim.common.caps_cache import muc_caps_cache -from gajim.common.exceptions import GajimGeneralException - -from gajim.gtk.discovery import ServiceDiscoveryWindow -from gajim.gtk.dialogs import ErrorDialog -from gajim.gtk.util import get_builder - - -class JoinGroupchatWindow(Gtk.ApplicationWindow): - def __init__(self, account, room_jid, password=None, automatic=None, - transient_for=None): - Gtk.ApplicationWindow.__init__(self) - self.set_name('JoinGroupchat') - self.set_application(app.app) - self.set_show_menubar(False) - self.set_resizable(False) - self.set_position(Gtk.WindowPosition.CENTER) - self.set_title(_('Join Group Chat')) - if transient_for: - self.set_transient_for(transient_for) - - self.automatic = automatic - self.password = password - self.requested_jid = None - self.room_jid = room_jid - self.account = account - - if self.room_jid is None: - self.minimal_mode = False - else: - self.minimal_mode = True - - glade_objects = ['main_box', 'account_label', 'account_combo', - 'server_label', 'server_combo', 'room_entry', - 'recently_button', 'recently_popover', - 'recently_treeview', 'search_button', 'password_label', - 'password_entry', 'nick_entry', 'bookmark_switch', - 'autojoin_switch'] - - self.builder = get_builder('join_groupchat_window.ui') - for obj in glade_objects: - setattr(self, obj, self.builder.get_object(obj)) - - self.add(self.main_box) - - # Show widgets depending on the mode the window is in - if not self.minimal_mode: - self.recently_button.show() - self.search_button.show() - - accounts = app.get_enabled_accounts_with_labels() - account_liststore = self.account_combo.get_model() - for acc in accounts: - account_liststore.append(acc) - - if not accounts: - return - - if not self.account: - self.account = accounts[0][0] - - self.builder.connect_signals(self) - self.connect('key-press-event', self._on_key_press_event) - - # Hide account combobox if there is only one account - if len(accounts) == 1: - self.account_combo.hide() - self.account_label.hide() - - self.account_combo.set_active_id(self.account) - - if self.minimal_mode: - if '@' in self.room_jid: - (room, server) = self.room_jid.split('@') - self.room_entry.set_text(room) - if not muc_caps_cache.supports( - self.room_jid, 'muc_passwordprotected'): - self.password_entry.hide() - self.password_label.hide() - self.nick_entry.grab_focus() - else: - self.password_entry.grab_focus() - else: - server = self.room_jid - self.room_entry.grab_focus() - - self.server_combo.insert_text(0, server) - self.server_combo.set_active(0) - - if self.password is not None: - self.password_entry.set_text(self.password) - - # Set bookmark switch sensitive if server supports bookmarks - acc = self.account_combo.get_active_id() - - self.show_all() - - def set_room(self, room_jid): - room, server = app.get_name_and_server_from_jid(room_jid) - self.room_entry.set_text(room) - self.server_combo.get_child().set_text(server) - - def _fill_recent_and_servers(self, account): - recently_liststore = self.recently_treeview.get_model() - recently_liststore.clear() - self.server_combo.remove_all() - recent = app.get_recent_groupchats(account) - servers = [] - for groupchat in recent: - label = '%s@%s' % (groupchat.room, groupchat.server) - - recently_liststore.append([groupchat.server, - groupchat.room, - groupchat.nickname, - label]) - servers.append(groupchat.server) - - self.recently_button.set_sensitive(bool(recent)) - - for server in set(servers): - self.server_combo.append_text(server) - - # Add own Server to ComboBox - muc_domain = app.get_muc_domain(account) - if muc_domain is not None: - self.server_combo.insert_text(0, muc_domain) - - def _on_recent_selected(self, treeview, *args): - (model, iter_) = treeview.get_selection().get_selected() - self.server_combo.get_child().set_text(model[iter_][0]) - self.room_entry.set_text(model[iter_][1]) - self.nick_entry.set_text(model[iter_][2]) - self.recently_popover.popdown() - - def _on_account_combo_changed(self, combo): - account = combo.get_active_id() - self.account = account - self.nick_entry.set_text(app.nicks[account]) - self._fill_recent_and_servers(account) - - def _on_jid_detection_changed(self, widget): - text = widget.get_text() - if text.startswith('xmpp:'): - text = text[5:] - if '@' in text: - room, server = text.split('@', 1) - server = server.split('?')[0] - widget.set_text('') - - if room: - self.room_entry.set_text(room) - - if server: - self.server_combo.get_child().set_text(server) - else: - self.server_combo.grab_focus() - - def _on_key_press_event(self, widget, event): - if event.keyval == Gdk.KEY_Escape: - self.destroy() - if event.keyval == Gdk.KEY_Return: - self._on_join_clicked() - return True - - def _on_join_clicked(self, *args): - account = self.account_combo.get_active_id() - nickname = self.nick_entry.get_text() - - if app.is_invisible(account): - app.interface.raise_dialog('join-while-invisible') - return - - server = self.server_combo.get_active_text() - room = self.room_entry.get_text() - - if room == '': - ErrorDialog(_('Invalid Group Chat'), - _('Please choose a group chat'), transient_for=self) - return - - self.room_jid = '%s@%s' % (room, server) - - try: - self.room_jid = helpers.parse_jid(self.room_jid) - except helpers.InvalidFormat as error: - ErrorDialog(_('Invalid XMPP Address'), str(error), transient_for=self) - return - - if app.in_groupchat(account, self.room_jid): - # If we already in the groupchat, join_gc_room will bring - # it to front - app.interface.join_gc_room(account, self.room_jid, nickname, '') - self.destroy() - return - - if nickname == '': - ErrorDialog(_('Invalid Nickname'), - _('Please choose a nickname'), transient_for=self) - return - - try: - helpers.parse_resource(nickname) - except helpers.InvalidFormat as error: - ErrorDialog(_('Invalid Nickname'), str(error), transient_for=self) - return - - if not app.account_is_connected(account): - ErrorDialog( - _('You are not connected to the server'), - _('You can not join a group chat unless you are connected.'), - transient_for=self) - return - - password = self.password_entry.get_text() - self._add_bookmark(account, nickname, password) - app.add_recent_groupchat(account, self.room_jid, nickname) - - if self.automatic: - app.automatic_rooms[self.account][self.room_jid] = self.automatic - - app.interface.join_gc_room(account, self.room_jid, nickname, password) - self.destroy() - - def _on_cancel_clicked(self, *args): - self.destroy() - - def _on_bookmark_activate(self, switch, param): - bookmark_state = switch.get_active() - self.autojoin_switch.set_sensitive(bookmark_state) - if not bookmark_state: - self.autojoin_switch.set_active(False) - - def _add_bookmark(self, account, nickname, password): - con = app.connections[account] - - add_bookmark = self.bookmark_switch.get_active() - if not add_bookmark: - return - - autojoin = self.autojoin_switch.get_active() - - # Add as bookmark, with autojoin and not minimized - name = app.get_nick_from_jid(self.room_jid) - con.get_module('Bookmarks').add_bookmark(name, - JID(self.room_jid), - autojoin, - password, - nickname) - - def _on_search_clicked(self, widget): - server = self.server_combo.get_active_text().strip() - con = app.connections[self.account] - con.get_module('Discovery').disco_info( - server, callback=self._disco_info_received) - - def _disco_info_error(self, from_, error): - ErrorDialog(_('Wrong server'), - _('%s is not a group chat server') % from_, - transient_for=self) - - def _disco_info_received(self, result): - if is_error_result(result): - ErrorDialog(_('Wrong server'), - _('%s is not a group chat server') % result.jid, - transient_for=self) - return - if nbxmpp.NS_MUC not in result.features: - ErrorDialog(_('Wrong server'), - _('%s is not a group chat server') % result.jid, - transient_for=self) - return - - jid = str(result.jid) - if jid in app.interface.instances[self.account]['disco']: - app.interface.instances[self.account]['disco'][jid].window.\ - present() - else: - try: - # Object will add itself to the window dict - ServiceDiscoveryWindow( - self.account, jid, - initial_identities=[DiscoIdentity(category='conference', - type='text', - name=None)]) - except GajimGeneralException: - pass ===================================== gajim/gtk/start_chat.py ===================================== @@ -304,7 +304,7 @@ class StartChatDialog(Gtk.ApplicationWindow): def _on_join_clicked(self, _button=None): account = self._muc_info_box.get_account() jid = self._muc_info_box.get_jid() - app.interface.join_gc_minimal(account, str(jid)) + app.interface.show_or_join_groupchat(account, str(jid)) self.ready_to_destroy = True def _on_back_clicked(self, _button=None): ===================================== gajim/gui_interface.py ===================================== @@ -77,6 +77,7 @@ from gajim.common import socks5 from gajim.common import helpers from gajim.common import passwords from gajim.common import logging_helpers +from gajim.common.structs import MUCData from gajim.common.nec import NetworkEvent from gajim.common.i18n import _ from gajim.common.connection_handlers_events import ( @@ -89,7 +90,6 @@ from gajim.common.const import SSLError from gajim import roster_window from gajim.common import ged -from gajim.common.caps_cache import muc_caps_cache from gajim.common import configpaths from gajim.common import optparser @@ -106,7 +106,6 @@ from gajim.gtk.dialogs import PlainConnectionDialog from gajim.gtk.dialogs import SSLErrorDialog from gajim.gtk.dialogs import InvitationReceivedDialog from gajim.gtk.profile import ProfileWindow -from gajim.gtk.join_groupchat import JoinGroupchatWindow from gajim.gtk.filechoosers import FileChooserDialog from gajim.gtk.emoji_data import emoji_data from gajim.gtk.emoji_data import emoji_ascii_data @@ -1396,51 +1395,6 @@ class Interface: if isinstance(ctrl, ChatControlBase): ctrl.scroll_to_end() - def join_gc_minimal(self, account, room_jid, password=None, - transient_for=None): - if account is not None: - if app.in_groupchat(account, room_jid): - # If we already in the groupchat, join_gc_room will bring - # it to front - app.interface.join_gc_room(account, room_jid, '', '') - return - - con = app.connections[account] - bookmark = con.get_module('Bookmarks').get_bookmark_from_jid(room_jid) - if bookmark is not None: - app.interface.join_gc_room( - account, str(bookmark.jid), bookmark.nick, bookmark.password) - return - - try: - room_jid = helpers.parse_jid(room_jid) - except helpers.InvalidFormat: - ErrorDialog(_('Invalid XMPP Address'), - transient_for=app.app.get_active_window()) - return - - connected_accounts = app.get_connected_accounts() - if account is not None and account not in connected_accounts: - connected_accounts = None - if not connected_accounts: - ErrorDialog( - _('You are not connected to the server'), - _('You can not join a group chat unless you are connected.'), - transient_for=app.app.get_active_window()) - return - - def _on_discover_result(): - if not muc_caps_cache.is_cached(room_jid): - ErrorDialog(_('XMPP Address is not a group chat'), - transient_for=app.app.get_active_window()) - return - JoinGroupchatWindow(account, room_jid, password=password, - transient_for=transient_for) - - disco_account = connected_accounts[0] if account is None else account - app.connections[disco_account].get_module('Discovery').disco_muc( - room_jid, _on_discover_result) - ################################################################################ ### Methods dealing with emoticons ################################################################################ @@ -1566,85 +1520,71 @@ class Interface: return True return False - def join_gc_room(self, account, room_jid, nick, password, minimize=False, - is_continued=False, config=None): - """ - Join the room immediately - """ + def create_groupchat_control(self, account, room_jid, muc_data, + minimize=False): + contact = app.contacts.create_contact(jid=room_jid, + account=account, + groups=[_('Group chats')], + sub='none', + groupchat=True) + app.contacts.add_contact(account, contact) - if app.contacts.get_contact(account, room_jid) and \ - not app.contacts.get_contact(account, room_jid).is_groupchat: - ErrorDialog( - _('This is not a group chat'), - _('%(room_jid)s is already in your contact list. Please check ' - 'if %(room_jid)s is a correct group chat name. If it is, ' - 'delete it from your contact list and try joining the group ' - 'chat again.') % {'room_jid': room_jid}) - return + if minimize: + control = GroupchatControl(None, contact, muc_data, account) + app.interface.minimized_controls[account][room_jid] = control + self.roster.add_groupchat(room_jid, account) + + else: + mw = self.msg_win_mgr.get_window(room_jid, account) + if not mw: + mw = self.msg_win_mgr.create_window(contact, + account, + GroupchatControl.TYPE_ID) + control = GroupchatControl(mw, contact, muc_data, account) + mw.new_tab(control) + mw.set_active_tab(control) - if not nick: - nick = app.nicks[account] + @staticmethod + def _create_muc_data(account, room_jid, password, config): + nick = app.nicks[account] + password = password - minimized_control = app.interface.minimized_controls[account].get( - room_jid, None) + # Fetch data from bookmarks + con = app.connections[account] + bookmark = con.get_module('Bookmarks').get_bookmark_from_jid(room_jid) + if bookmark is not None: + if bookmark.nick is not None: + nick = bookmark.nick - if (self.msg_win_mgr.has_window(room_jid, account) or \ - minimized_control) and app.gc_connected[account][room_jid]: - if self.msg_win_mgr.has_window(room_jid, account): - gc_ctrl = self.msg_win_mgr.get_gc_control(room_jid, account) - win = gc_ctrl.parent_win - win.set_active_tab(gc_ctrl) - else: - self.roster.on_groupchat_maximized(None, room_jid, account) + if bookmark.password is not None: + password = bookmark.password + + return MUCData(room_jid, nick, password, config) + + def create_groupchat(self, account, room_jid, config=None): + muc_data = self._create_muc_data(account, room_jid, None, config) + self.create_groupchat_control(account, room_jid, muc_data) + app.connections[account].get_module('MUC').join(muc_data) + + def show_or_join_groupchat(self, account, room_jid, **kwargs): + if self.show_groupchat(account, room_jid): return + self.join_groupchat(account, room_jid, **kwargs) + def join_groupchat(self, account, room_jid, password=None, minimized=False): if app.is_invisible(account): ErrorDialog( _('You cannot join a group chat while you are invisible')) return - if minimized_control is None and not self.msg_win_mgr.has_window( - room_jid, account): - # Join new groupchat - if minimize: - # GCMIN - contact = app.contacts.create_contact(jid=room_jid, - account=account, groups=[_('Group chats')], sub='none', - groupchat=True) - app.contacts.add_contact(account, contact) - gc_control = GroupchatControl(None, contact, nick, account) - app.interface.minimized_controls[account][room_jid] = \ - gc_control - self.roster.add_groupchat(room_jid, account) - else: - self.new_room(room_jid, nick, account, - is_continued=is_continued) - elif minimized_control is None: - # We are already in that groupchat - gc_control = self.msg_win_mgr.get_gc_control(room_jid, account) - gc_control.nick = nick - gc_control.parent_win.set_active_tab(gc_control) - - # Connect - app.connections[account].get_module('MUC').join( - room_jid, nick, password, config=config) - if password: - app.gc_passwords[room_jid] = password - - def new_room(self, room_jid, nick, account, is_continued=False): - # Get target window, create a control, and associate it with the window - # GCMIN - contact = app.contacts.create_contact(jid=room_jid, account=account, - groups=[_('Group chats')], sub='none', groupchat=True) - app.contacts.add_contact(account, contact) - mw = self.msg_win_mgr.get_window(contact.jid, account) - if not mw: - mw = self.msg_win_mgr.create_window(contact, account, - GroupchatControl.TYPE_ID) - gc_control = GroupchatControl(mw, contact, nick, account, - is_continued=is_continued) - mw.new_tab(gc_control) - mw.set_active_tab(gc_control) + if not app.account_is_connected(account): + return + + muc_data = self._create_muc_data(account, room_jid, password, None) + self.create_groupchat_control( + account, room_jid, muc_data, minimize=minimized) + + app.connections[account].get_module('MUC').join(muc_data) def new_private_chat(self, gc_contact, account, session=None): conn = app.connections[account] ===================================== gajim/gui_menu_builder.py ===================================== @@ -778,7 +778,7 @@ def get_conv_context_menu(account, uri): if uri.action == URIAction.JOIN: context_menu = [ ('copy-text', _('Copy XMPP Address')), - ('-join-groupchat', _('Join Groupchat')), + ('groupchat-join', _('Join Groupchat')), ] else: context_menu = [ @@ -810,7 +810,7 @@ def get_conv_context_menu(account, uri): ('copy-text', _('Copy XMPP Address/Email')), ('open-link', _('Open Email Composer')), ('-start-chat', _('Start Chat')), - ('-join-groupchat', _('Join Groupchat')), + ('groupchat-join', _('Join Groupchat')), ('-add-contact', _('Add to Contact List…')), ] else: @@ -828,10 +828,14 @@ def get_conv_context_menu(account, uri): action = 'app.%s' % action menuitem.set_action_name(action) + data = uri.data + if uri.type == URIType.XMPP: + data = uri.data['jid'] + if action in ('app.open-link', 'app.copy-text'): - value = GLib.Variant.new_string(uri.data) + value = GLib.Variant.new_string(data) else: - value = GLib.Variant.new_strv([account, uri.data]) + value = GLib.Variant.new_strv([account, data]) menuitem.set_action_target_value(value) menuitem.show() menu.append(menuitem) ===================================== gajim/remote_control.py ===================================== @@ -149,7 +149,6 @@ class GajimRemote(Server): </method> <method name='join_room'> <arg name='room_jid' type='s' /> - <arg name='nick' type='s' /> <arg name='password' type='s' /> <arg name='account' type='s' /> </method> @@ -895,7 +894,7 @@ class GajimRemote(Server): for acc in app.contacts.get_accounts(): app.connections[acc].send_stanza(str(xml)) - def join_room(self, room_jid, nick, password, account): + def join_room(self, room_jid, password, account): if not account: # get the first connected account accounts = app.connections.keys() @@ -911,10 +910,9 @@ class GajimRemote(Server): # zeroconf not support groupchats return - if not nick: - app.interface.join_gc_minimal(account, room_jid) - else: - app.interface.join_gc_room(account, room_jid, nick, password) + app.interface.show_or_join_groupchat(account, + room_jid, + password=password) def Introspect(self): return self.__doc__ ===================================== gajim/roster_window.py ===================================== @@ -2684,10 +2684,6 @@ class RosterWindow: ### FIXME: order callbacks in itself... ################################################################################ - def on_bookmark_menuitem_activate(self, widget, account, bookmark): - app.interface.join_gc_room( - account, str(bookmark.jid), bookmark.nick, bookmark.password) - def on_info(self, widget, contact, account): """ Call vcard_information_window class to display contact's information View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/23d0bfcf692615d8ffc5c205b8ddfabe9… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/23d0bfcf692615d8ffc5c205b8ddfabe9… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Fix typo
by Philipp Hörist 22 Jul '19

22 Jul '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: f4f7f1d1 by Andrey Gursky at 2019-07-22T02:03:27Z Fix typo Closes #9766 - - - - - 23d0bfcf by Andrey Gursky at 2019-07-22T02:55:30Z Make exception message more informative - - - - - 3 changed files: - gajim/common/modules/base.py - gajim/common/modules/message.py - gajim/session.py Changes: ===================================== gajim/common/modules/base.py ===================================== @@ -50,7 +50,7 @@ class BaseModule: def __getattr__(self, key): if key not in self._nbxmpp_methods: - raise AttributeError + raise AttributeError("attribute '%s' is neither part of object '%s' nor declared in '_nbxmpp_methods'" % (key, self.__class__.__name__)) if not app.account_is_connected(self._account): self._log.warning('Account not connected, cant use %s', key) return ===================================== gajim/common/modules/message.py ===================================== @@ -294,7 +294,7 @@ class Message(BaseModule): message_id=event.message_id) if muc_caps_cache.has_mam(event.room_jid): - finished = self._con.get_module('MAM').is_catchup_finished( + finished = self._con.get_module('MAM').is_catch_up_finished( event.room_jid) if not finished: return ===================================== gajim/session.py ===================================== @@ -140,7 +140,7 @@ class ChatControlSession: message_id=obj.message_id) jid = self.conn.get_own_jid().getStripped() - if self.conn.get_module('MAM').is_catchup_finished(jid): + if self.conn.get_module('MAM').is_catch_up_finished(jid): app.logger.set_archive_infos(jid, last_mam_id=obj.stanza_id, last_muc_timestamp=obj.timestamp) View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/623960beb212af053b5ffa7967010e4ad… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/623960beb212af053b5ffa7967010e4ad… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] StartChat: Only show GroupchatInfo when not already joined
by Philipp Hörist 21 Jul '19

21 Jul '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 623960be by Philipp Hörist at 2019-07-21T21:13:27Z StartChat: Only show GroupchatInfo when not already joined When we are already in a group chat just show the GroupChatControl instead of GroupchatInfo - - - - - 2 changed files: - gajim/gtk/start_chat.py - gajim/gui_interface.py Changes: ===================================== gajim/gtk/start_chat.py ===================================== @@ -259,7 +259,14 @@ class StartChatDialog(Gtk.ApplicationWindow): self._show_error_page(_('You can not join a group chat ' 'unless you are connected.')) return + + self.ready_to_destroy = True + if app.interface.show_groupchat(row.account, row.jid): + return + + self.ready_to_destroy = False self._disco_muc(row.account, row.jid) + else: app.interface.new_chat_from_jid(row.account, row.jid) self.ready_to_destroy = True ===================================== gajim/gui_interface.py ===================================== @@ -1553,6 +1553,19 @@ class Interface: ### Methods for opening new messages controls ################################################################################ + def show_groupchat(self, account, room_jid): + minimized_control = self.minimized_controls[account].get(room_jid) + if minimized_control is not None: + self.roster.on_groupchat_maximized(None, room_jid, account) + return True + + if self.msg_win_mgr.has_window(room_jid, account): + gc_ctrl = self.msg_win_mgr.get_gc_control(room_jid, account) + # FIXME: Access message window directly + gc_ctrl.parent_win.set_active_tab(gc_ctrl) + return True + return False + def join_gc_room(self, account, room_jid, nick, password, minimize=False, is_continued=False, config=None): """ View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/623960beb212af053b5ffa7967010e4ad4… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/623960beb212af053b5ffa7967010e4ad4… You're receiving this email because of your account on dev.gajim.org.

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits July 2019