Commits June 2018

commits@gajim.org

1 participants
47 discussions

[Git][gajim/gajim][master] Flatpak: add gspell
by Philipp Hörist 28 Jun '18

28 Jun '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 34dca605 by André Apitzsch at 2018-06-28T07:32:02+02:00 Flatpak: add gspell - - - - - 1 changed file: - org.gajim.Gajim.json Changes: ===================================== org.gajim.Gajim.json ===================================== --- a/org.gajim.Gajim.json +++ b/org.gajim.Gajim.json @@ -350,6 +350,34 @@ ] }, { + "name": "gspell", + "cleanup": [ + "/bin" + ], + "sources": [ + { + "type": "archive", + "url": "https://download.gnome.org/sources/gspell/1.8/gspell-1.8.1.tar.xz", + "sha256": "819a1d23c7603000e73f5e738bdd284342e0cd345fb0c7650999c31ec741bbe5" + } + ], + "modules": [ + { + "name": "enchant2", + "cleanup": [ + "/bin" + ], + "sources": [ + { + "type": "archive", + "url": "https://github.com/AbiWord/enchant/releases/download/v2.2.3/enchant-2.2.3.t…", + "sha256": "abd8e915675cff54c0d4da5029d95c528362266557c61c7149d53fa069b8076d" + } + ] + } + ] + }, + { "name": "python3-nbxmpp", "buildsystem": "simple", "build-commands": [ View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/34dca605c549d9e4ce260d191f030e7136… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/34dca605c549d9e4ce260d191f030e7136… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix join groupchat dialog with multiple accounts
by Philipp Hörist 27 Jun '18

27 Jun '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: ce9af46f by Philipp Hörist at 2018-06-28T00:04:17+02:00 Fix join groupchat dialog with multiple accounts The dialog didnt show the account combobox when activated via CTRL + J from the Roster Also add a application action for join groupchat - - - - - 5 changed files: - gajim/app_actions.py - gajim/application.py - gajim/common/app.py - gajim/dialogs.py - gajim/roster_window.py Changes: ===================================== gajim/app_actions.py ===================================== --- a/gajim/app_actions.py +++ b/gajim/app_actions.py @@ -120,16 +120,17 @@ def on_service_disco(action, param): def on_join_gc(action, param): - account = param.get_string() - invisible_show = app.SHOW_LIST.index('invisible') - if app.connections[account].connected == invisible_show: - app.interface.raise_dialog('join-while-invisible') - return - if 'join_gc' in interface.instances[account]: - interface.instances[account]['join_gc'].present() + account = None + if param is None: + if not app.get_connected_accounts(): + return + else: + account = param.get_string() + window = app.get_app_window(dialogs.JoinGroupchatWindow) + if window is None: + dialogs.JoinGroupchatWindow(account, None) else: - interface.instances[account]['join_gc'] = \ - dialogs.JoinGroupchatWindow(account, None) + window.present() def on_add_contact(action, param): ===================================== gajim/application.py ===================================== --- a/gajim/application.py +++ b/gajim/application.py @@ -303,6 +303,7 @@ class GajimApplication(Gtk.Application): ('quit', app_actions.on_quit), ('accounts', app_actions.on_accounts), ('add-account', app_actions.on_add_account), + ('join-groupchat', app_actions.on_join_gc), ('manage-proxies', app_actions.on_manage_proxies), ('start-chat', app_actions.on_new_chat), ('bookmarks', app_actions.on_manage_bookmarks), ===================================== gajim/common/app.py ===================================== --- a/gajim/common/app.py +++ b/gajim/common/app.py @@ -577,3 +577,9 @@ def prefers_app_menu(): if sys.platform == 'win32': return False return app.prefers_app_menu() + +def get_app_window(cls): + for win in app.get_windows(): + if isinstance(win, cls): + return win + return None ===================================== gajim/dialogs.py ===================================== --- a/gajim/dialogs.py +++ b/gajim/dialogs.py @@ -2351,10 +2351,10 @@ class JoinGroupchatWindow(Gtk.ApplicationWindow): else: for widget in extended_widgets: getattr(self, widget).show() - self._fill_recent_and_servers(account) if account is None: connected_accounts = app.get_connected_accounts() + account = connected_accounts[0] for acc in connected_accounts: self.account_combo.append_text(acc) else: @@ -2378,8 +2378,6 @@ class JoinGroupchatWindow(Gtk.ApplicationWindow): # Select first account self.account_combo.set_active(0) - if self.minimal_mode == 0: - self.recent_combo.set_active(0) if self.password is not None: self.password_entry.set_text(self.password) @@ -2393,7 +2391,7 @@ class JoinGroupchatWindow(Gtk.ApplicationWindow): # Show password field if we are in extended mode or # The MUC is passwordprotected if self.minimal_mode == 0 or muc_caps_cache.supports( - room_jid, 'muc_passwordprotected'): + room_jid, 'muc_passwordprotected'): self.password_entry.show() self.password_label.show() @@ -2405,12 +2403,15 @@ class JoinGroupchatWindow(Gtk.ApplicationWindow): self.server_combo.get_child().set_text(server) def _fill_recent_and_servers(self, account): + self.recent_combo.remove_all() + self.server_combo.remove_all() recent = app.get_recent_groupchats(account) servers = [] for groupchat in recent: text = '%s on %s@%s' % (groupchat.nickname, groupchat.room, groupchat.server) + self.recent_combo.append_text(text) servers.append(groupchat.server) @@ -2435,7 +2436,11 @@ class JoinGroupchatWindow(Gtk.ApplicationWindow): def _on_account_combo_changed(self, combo): account = combo.get_active_text() + self.account = account self.nick_entry.set_text(app.nicks[account]) + if self.minimal_mode == 0: + self._fill_recent_and_servers(account) + self.recent_combo.set_active(0) def _on_key_press_event(self, widget, event): if event.keyval == Gdk.KEY_Escape: @@ -2448,6 +2453,11 @@ class JoinGroupchatWindow(Gtk.ApplicationWindow): account = self.account_combo.get_active_text() nickname = self.nick_entry.get_text() + invisible_show = app.SHOW_LIST.index('invisible') + if app.connections[account].connected == invisible_show: + app.interface.raise_dialog('join-while-invisible') + return + if self.minimal_mode < 2: if self.minimal_mode == 0: server = self.server_combo.get_active_text() @@ -2526,7 +2536,6 @@ class JoinGroupchatWindow(Gtk.ApplicationWindow): def _on_destroy(self, *args): if self.minimal_mode == 0: - del app.interface.instances[self.account]['join_gc'] app.ged.remove_event_handler('agent-info-received', ged.GUI1, self._nec_agent_info_received) app.ged.remove_event_handler('agent-info-error-received', ged.GUI1, ===================================== gajim/roster_window.py ===================================== --- a/gajim/roster_window.py +++ b/gajim/roster_window.py @@ -3626,16 +3626,7 @@ class RosterWindow: """ When the join gc menuitem is clicked, show the join gc window """ - invisible_show = app.SHOW_LIST.index('invisible') - if app.connections[account].connected == invisible_show: - dialogs.ErrorDialog(_('You cannot join a group chat while you are ' - 'invisible')) - return - if 'join_gc' in app.interface.instances[account]: - app.interface.instances[account]['join_gc'].present() - else: - app.interface.instances[account]['join_gc'] = \ - dialogs.JoinGroupchatWindow(account, None) + app.app.activate_action('join-groupchat') def on_show_transports_action(self, action, param): app.config.set('show_transports_group', param.get_boolean()) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/ce9af46fc382560c82f4ee558e58390e3e… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/ce9af46fc382560c82f4ee558e58390e3e… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Refactor last activity code into own module
by Philipp Hörist 25 Jun '18

25 Jun '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 8fa1ee46 by Philipp Hörist at 2018-06-25T23:00:40+02:00 Refactor last activity code into own module - - - - - 129f72bf by Philipp Hörist at 2018-06-25T23:47:06+02:00 Refactor http auth code into own module - - - - - 6 changed files: - gajim/common/connection.py - gajim/common/connection_handlers.py - gajim/common/connection_handlers_events.py - + gajim/common/modules/http_auth.py - + gajim/common/modules/last_activity.py - gajim/gui_interface.py Changes: ===================================== gajim/common/connection.py ===================================== --- a/gajim/common/connection.py +++ b/gajim/common/connection.py @@ -69,6 +69,8 @@ from gajim.common.modules.ping import Ping from gajim.common.modules.search import Search from gajim.common.modules.annotations import Annotations from gajim.common.modules.roster_item_exchange import RosterItemExchange +from gajim.common.modules.last_activity import LastActivity +from gajim.common.modules.http_auth import HTTPAuth from gajim.common.connection_handlers import * from gajim.common.contacts import GC_Contact from gajim.gtkgui_helpers import get_action @@ -662,6 +664,8 @@ class Connection(CommonConnection, ConnectionHandlers): self.register_module('Search', Search, self) self.register_module('Annotations', Annotations, self) self.register_module('RosterItemExchange', RosterItemExchange, self) + self.register_module('LastActivity', LastActivity, self) + self.register_module('HTTPAuth', HTTPAuth, self) app.ged.register_event_handler('privacy-list-received', ged.CORE, self._nec_privacy_list_received) ===================================== gajim/common/connection_handlers.py ===================================== --- a/gajim/common/connection_handlers.py +++ b/gajim/common/connection_handlers.py @@ -48,7 +48,6 @@ from gajim.common import app from gajim.common import dataforms from gajim.common import jingle_xtls from gajim.common import configpaths -from gajim.common import idle from gajim.common.caps_cache import muc_caps_cache from gajim.common.commands import ConnectionCommands from gajim.common.pubsub import ConnectionPubSub @@ -1343,10 +1342,6 @@ ConnectionHTTPUpload): Archiving313PreferencesChangedReceivedEvent) app.nec.register_incoming_event(NotificationEvent) - app.ged.register_event_handler('http-auth-received', ged.CORE, - self._nec_http_auth_received) - app.ged.register_event_handler('last-request-received', ged.CORE, - self._nec_last_request_received) app.ged.register_event_handler('roster-set-received', ged.CORE, self._nec_roster_set_received) app.ged.register_event_handler('private-storage-bookmarks-received', @@ -1378,10 +1373,6 @@ ConnectionHTTPUpload): ConnectionArchive313.cleanup(self) ConnectionPubSub.cleanup(self) ConnectionHTTPUpload.cleanup(self) - app.ged.remove_event_handler('http-auth-received', ged.CORE, - self._nec_http_auth_received) - app.ged.remove_event_handler('last-request-received', ged.CORE, - self._nec_last_request_received) app.ged.remove_event_handler('roster-set-received', ged.CORE, self._nec_roster_set_received) app.ged.remove_event_handler('private-storage-bookmarks-received', @@ -1424,32 +1415,6 @@ ConnectionHTTPUpload): c.setAttr('ver', app.caps_hash[self.name]) return p - def build_http_auth_answer(self, iq_obj, answer): - if not self.connection or self.connected < 2: - return - if answer == 'yes': - confirm = iq_obj.getTag('confirm') - reply = iq_obj.buildReply('result') - if iq_obj.getName() == 'message': - reply.addChild(node=confirm) - self.connection.send(reply) - elif answer == 'no': - err = nbxmpp.Error(iq_obj, nbxmpp.protocol.ERR_NOT_AUTHORIZED) - self.connection.send(err) - - def _nec_http_auth_received(self, obj): - if obj.conn.name != self.name: - return - if obj.opt in ('yes', 'no'): - obj.conn.build_http_auth_answer(obj.stanza, obj.opt) - return True - - def _HttpAuthCB(self, con, iq_obj): - log.debug('HttpAuthCB') - app.nec.push_incoming_event(HttpAuthReceivedEvent(None, conn=self, - stanza=iq_obj)) - raise nbxmpp.NodeProcessed - def _ErrorCB(self, con, iq_obj): log.debug('ErrorCB') app.nec.push_incoming_event(IqErrorReceivedEvent(None, conn=self, @@ -1640,29 +1605,6 @@ ConnectionHTTPUpload): app.config.set_per('accounts', self.name, 'roster_version', obj.version) - def _LastCB(self, con, iq_obj): - log.debug('LastCB') - if not self.connection or self.connected < 2: - return - app.nec.push_incoming_event(LastRequestEvent(None, conn=self, - stanza=iq_obj)) - raise nbxmpp.NodeProcessed - - def _nec_last_request_received(self, obj): - if obj.conn.name != self.name: - return - if app.is_installed('IDLE') and app.config.get_per('accounts', self.name, - 'send_idle_time'): - iq_obj = obj.stanza.buildReply('result') - qp = iq_obj.setQuery() - qp.attrs['seconds'] = idle.Monitor.get_idle_sec() - else: - iq_obj = obj.stanza.buildReply('error') - err = nbxmpp.ErrorNode(name=nbxmpp.NS_STANZAS + \ - ' service-unavailable') - iq_obj.addChild(node=err) - self.connection.send(iq_obj) - def _messageCB(self, con, msg): """ Called when we receive a message @@ -2086,7 +2028,6 @@ ConnectionHTTPUpload): nbxmpp.NS_DISCO_INFO) con.RegisterHandler('iq', self._DiscoverInfoErrorCB, 'error', nbxmpp.NS_DISCO_INFO) - con.RegisterHandler('iq', self._LastCB, 'get', nbxmpp.NS_LAST) con.RegisterHandler('iq', self._MucOwnerCB, 'result', nbxmpp.NS_MUC_OWNER) con.RegisterHandler('iq', self._MucAdminCB, 'result', @@ -2094,7 +2035,6 @@ ConnectionHTTPUpload): con.RegisterHandler('iq', self._PrivateCB, 'result', nbxmpp.NS_PRIVATE) con.RegisterHandler('iq', self._SecLabelCB, 'result', nbxmpp.NS_SECLABEL_CATALOG) - con.RegisterHandler('iq', self._HttpAuthCB, 'get', nbxmpp.NS_HTTP_AUTH) con.RegisterHandler('iq', self._CommandExecuteCB, 'set', nbxmpp.NS_COMMANDS) con.RegisterHandler('iq', self._DiscoverInfoGetCB, 'get', ===================================== gajim/common/connection_handlers_events.py ===================================== --- a/gajim/common/connection_handlers_events.py +++ b/gajim/common/connection_handlers_events.py @@ -180,23 +180,6 @@ class HelperEvent: self.muc_pm = muc_user.getChildren() == [] return self.muc_pm -class HttpAuthReceivedEvent(nec.NetworkIncomingEvent): - name = 'http-auth-received' - base_network_events = [] - - def generate(self): - self.opt = app.config.get_per('accounts', self.conn.name, 'http_auth') - self.iq_id = self.stanza.getTagAttr('confirm', 'id') - self.method = self.stanza.getTagAttr('confirm', 'method') - self.url = self.stanza.getTagAttr('confirm', 'url') - # In case it's a message with a body - self.msg = self.stanza.getTagData('body') - return True - -class LastRequestEvent(nec.NetworkIncomingEvent): - name = 'last-request-received' - base_network_events = [] - class RosterReceivedEvent(nec.NetworkIncomingEvent): name = 'roster-received' base_network_events = [] @@ -1064,8 +1047,8 @@ class MessageReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): # check if the message is a XEP-0070 confirmation request if self.stanza.getTag('confirm', namespace=nbxmpp.NS_HTTP_AUTH): - app.nec.push_incoming_event(HttpAuthReceivedEvent(None, - conn=self.conn, stanza=self.stanza)) + self.conn.get_module('HTTPAuth').answer_request( + self.conn, self.stanza) return try: ===================================== gajim/common/modules/http_auth.py ===================================== --- /dev/null +++ b/gajim/common/modules/http_auth.py @@ -0,0 +1,76 @@ +# 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/>. + +# XEP-0070: Verifying HTTP Requests via XMPP + +import logging + +import nbxmpp + +from gajim.common import app +from gajim.common.nec import NetworkIncomingEvent + +log = logging.getLogger('gajim.c.m.http_auth') + + +class HTTPAuth: + def __init__(self, con): + self._con = con + self._account = con.name + + self.handlers = [ + ('iq', self.answer_request, 'get', nbxmpp.NS_HTTP_AUTH) + ] + + def answer_request(self, con, stanza): + log.info('Auth request received') + auto_answer = app.config.get_per( + 'accounts', self._account, 'http_auth') + if auto_answer in ('yes', 'no'): + self.build_http_auth_answer(stanza, auto_answer) + raise nbxmpp.NodeProcessed + + iq_id = stanza.getTagAttr('confirm', 'id') + method = stanza.getTagAttr('confirm', 'method') + url = stanza.getTagAttr('confirm', 'url') + # In case it's a message with a body + msg = stanza.getTagData('body') + + app.nec.push_incoming_event( + HttpAuthReceivedEvent(None, conn=self._con, + iq_id=iq_id, + method=method, + url=url, + msg=msg, + stanza=stanza)) + + raise nbxmpp.NodeProcessed + + def build_http_auth_answer(self, stanza, answer): + if answer == 'yes': + log.info('Auth request approved') + confirm = stanza.getTag('confirm') + reply = stanza.buildReply('result') + if stanza.getName() == 'message': + reply.addChild(node=confirm) + self._con.connection.send(reply) + elif answer == 'no': + log.info('Auth request denied') + err = nbxmpp.Error(stanza, nbxmpp.protocol.ERR_NOT_AUTHORIZED) + self._con.connection.send(err) + + +class HttpAuthReceivedEvent(NetworkIncomingEvent): + name = 'http-auth-received' + base_network_events = [] ===================================== gajim/common/modules/last_activity.py ===================================== --- /dev/null +++ b/gajim/common/modules/last_activity.py @@ -0,0 +1,52 @@ +# 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/>. + +# XEP-0012: Last Activity + +import logging + +import nbxmpp + +from gajim.common import app +from gajim.common import idle + +log = logging.getLogger('gajim.c.m.last_activity') + + +class LastActivity: + def __init__(self, con): + self._con = con + self._account = con.name + + self.handlers = [('iq', self._answer_request, 'get', nbxmpp.NS_LAST)] + + def _answer_request(self, con, stanza): + log.info('Request from %s', stanza.getFrom()) + if not app.account_is_connected(self._account): + return + + allow_send = app.config.get_per( + 'accounts', self._account, 'send_idle_time') + if app.is_installed('IDLE') and allow_send: + iq = stanza.buildReply('result') + query = iq.setQuery() + query.attrs['seconds'] = idle.Monitor.get_idle_sec() + else: + iq = stanza.buildReply('error') + err = nbxmpp.ErrorNode(nbxmpp.ERR_SERVICE_UNAVAILABLE) + iq.addChild(node=err) + + self._con.connection.send(iq) + + raise nbxmpp.NodeProcessed ===================================== gajim/gui_interface.py ===================================== --- a/gajim/gui_interface.py +++ b/gajim/gui_interface.py @@ -173,7 +173,8 @@ class Interface: def handle_event_http_auth(obj): #('HTTP_AUTH', account, (method, url, transaction_id, iq_obj, msg)) def response(account, answer): - obj.conn.build_http_auth_answer(obj.stanza, answer) + obj.conn.get_module('HTTPAuth').build_http_auth_answer( + obj.stanza, answer) def on_yes(is_checked, obj): response(obj, 'yes') View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/b74706afcf41cd9d4efc48f032705e16b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/b74706afcf41cd9d4efc48f032705e16b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Remove unused code
by Philipp Hörist 25 Jun '18

25 Jun '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: f382ce2a by Philipp Hörist at 2018-06-25T20:08:48+02:00 Remove unused code - - - - - b74706af by Philipp Hörist at 2018-06-25T22:43:09+02:00 Refactor roster item exchange code into own module - - - - - 5 changed files: - gajim/common/connection.py - gajim/common/connection_handlers.py - gajim/common/connection_handlers_events.py - + gajim/common/modules/roster_item_exchange.py - gajim/roster_window.py Changes: ===================================== gajim/common/connection.py ===================================== --- a/gajim/common/connection.py +++ b/gajim/common/connection.py @@ -68,6 +68,7 @@ from gajim.common.modules.software_version import SoftwareVersion from gajim.common.modules.ping import Ping from gajim.common.modules.search import Search from gajim.common.modules.annotations import Annotations +from gajim.common.modules.roster_item_exchange import RosterItemExchange from gajim.common.connection_handlers import * from gajim.common.contacts import GC_Contact from gajim.gtkgui_helpers import get_action @@ -486,12 +487,6 @@ class CommonConnection: def account_changed(self, new_name): self.name = new_name - def get_settings(self): - """ - To be implemented by derived classes - """ - raise NotImplementedError - def get_bookmarks(self): """ To be implemented by derived classes @@ -666,6 +661,7 @@ class Connection(CommonConnection, ConnectionHandlers): self.register_module('Ping', Ping, self) self.register_module('Search', Search, self) self.register_module('Annotations', Annotations, self) + self.register_module('RosterItemExchange', RosterItemExchange, self) app.ged.register_event_handler('privacy-list-received', ged.CORE, self._nec_privacy_list_received) @@ -2052,32 +2048,6 @@ class Connection(CommonConnection, ConnectionHandlers): else: self.log_message(obj, obj.jid) - def send_contacts(self, contacts, fjid, type_='message'): - """ - Send contacts with RosterX (Xep-0144) - """ - if not app.account_is_connected(self.name): - return - if type_ == 'message': - if len(contacts) == 1: - msg = _('Sent contact: "%(jid)s" (%(name)s)') % { - 'jid': contacts[0].get_full_jid(), - 'name': contacts[0].get_shown_name()} - else: - msg = _('Sent contacts:') - for contact in contacts: - msg += '\n "%s" (%s)' % (contact.get_full_jid(), - contact.get_shown_name()) - stanza = nbxmpp.Message(to=app.get_jid_without_resource(fjid), - body=msg) - elif type_ == 'iq': - stanza = nbxmpp.Iq(to=fjid, typ='set') - x = stanza.addChild(name='x', namespace=nbxmpp.NS_ROSTERX) - for contact in contacts: - x.addChild(name='item', attrs={'action': 'add', 'jid': contact.jid, - 'name': contact.get_shown_name()}) - self.connection.send(stanza) - def send_stanza(self, stanza): """ Send a stanza untouched @@ -2223,17 +2193,6 @@ class Connection(CommonConnection, ConnectionHandlers): query.setTagData('prompt', prompt) self.connection.SendAndCallForResponse(iq, _on_prompt_result) - def get_settings(self): - """ - Get Gajim settings as described in XEP 0049 - """ - if not app.account_is_connected(self.name): - return - iq = nbxmpp.Iq(typ='get') - iq2 = iq.addChild(name='query', namespace=nbxmpp.NS_PRIVATE) - iq2.addChild(name='gajim', namespace='gajim:prefs') - self.connection.send(iq) - def seclabel_catalogue(self, to, callback): if not app.account_is_connected(self.name): return ===================================== gajim/common/connection_handlers.py ===================================== --- a/gajim/common/connection_handlers.py +++ b/gajim/common/connection_handlers.py @@ -1663,15 +1663,6 @@ ConnectionHTTPUpload): iq_obj.addChild(node=err) self.connection.send(iq_obj) - def _rosterItemExchangeCB(self, con, msg): - """ - XEP-0144 Roster Item Echange - """ - log.debug('rosterItemExchangeCB') - app.nec.push_incoming_event(RosterItemExchangeEvent(None, conn=self, - stanza=msg)) - raise nbxmpp.NodeProcessed - def _messageCB(self, con, msg): """ Called when we receive a message @@ -2075,8 +2066,6 @@ ConnectionHTTPUpload): con.RegisterHandler('message', self._pubsubEventCB, makefirst=True) con.RegisterHandler('iq', self._rosterSetCB, 'set', nbxmpp.NS_ROSTER) con.RegisterHandler('iq', self._siSetCB, 'set', nbxmpp.NS_SI) - con.RegisterHandler('iq', self._rosterItemExchangeCB, 'set', - nbxmpp.NS_ROSTERX) con.RegisterHandler('iq', self._siErrorCB, 'error', nbxmpp.NS_SI) con.RegisterHandler('iq', self._siResultCB, 'result', nbxmpp.NS_SI) con.RegisterHandler('iq', self._discoGetCB, 'get', nbxmpp.NS_DISCO) ===================================== gajim/common/connection_handlers_events.py ===================================== --- a/gajim/common/connection_handlers_events.py +++ b/gajim/common/connection_handlers_events.py @@ -193,51 +193,6 @@ class HttpAuthReceivedEvent(nec.NetworkIncomingEvent): self.msg = self.stanza.getTagData('body') return True -class RosterItemExchangeEvent(nec.NetworkIncomingEvent, HelperEvent): - name = 'roster-item-exchange-received' - base_network_events = [] - - def generate(self): - self.get_id() - self.get_jid_resource() - self.exchange_items_list = {} - items_list = self.stanza.getTag('x').getChildren() - if not items_list: - return - self.action = items_list[0].getAttr('action') - if self.action is None: - self.action = 'add' - for item in self.stanza.getTag('x', namespace=nbxmpp.NS_ROSTERX).\ - getChildren(): - try: - jid = helpers.parse_jid(item.getAttr('jid')) - except helpers.InvalidFormat: - log.warning('Invalid JID: %s, ignoring it' % item.getAttr('jid')) - continue - name = item.getAttr('name') - contact = app.contacts.get_contact(self.conn.name, jid) - groups = [] - same_groups = True - for group in item.getTags('group'): - groups.append(group.getData()) - # check that all suggested groups are in the groups we have for - # this contact - if not contact or group not in contact.groups: - same_groups = False - if contact: - # check that all groups we have for this contact are in the - # suggested groups - for group in contact.groups: - if group not in groups: - same_groups = False - if contact.sub in ('both', 'to') and same_groups: - continue - self.exchange_items_list[jid] = [] - self.exchange_items_list[jid].append(name) - self.exchange_items_list[jid].append(groups) - if self.exchange_items_list: - return True - class LastRequestEvent(nec.NetworkIncomingEvent): name = 'last-request-received' base_network_events = [] @@ -1103,8 +1058,8 @@ class MessageReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): # check if the message is a roster item exchange (XEP-0144) if self.stanza.getTag('x', namespace=nbxmpp.NS_ROSTERX): - app.nec.push_incoming_event(RosterItemExchangeEvent(None, - conn=self.conn, stanza=self.stanza)) + self.conn.get_module('RosterItemExchange').received_item( + self.conn, self.stanza) return # check if the message is a XEP-0070 confirmation request ===================================== gajim/common/modules/roster_item_exchange.py ===================================== --- /dev/null +++ b/gajim/common/modules/roster_item_exchange.py @@ -0,0 +1,122 @@ +# 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/>. + +# XEP-0144: Roster Item Exchange + +import logging + +import nbxmpp + +from gajim.common import app +from gajim.common import helpers +from gajim.common.nec import NetworkIncomingEvent + +log = logging.getLogger('gajim.c.m.roster_item_exchange') + + +class RosterItemExchange: + def __init__(self, con): + self._con = con + self._account = con.name + + self.handlers = [ + ('iq', self.received_item, 'set', nbxmpp.NS_ROSTERX) + ] + + def received_item(self, con, stanza): + # stanza can be a message or a iq + + log.info('Received roster items from %s', stanza.getFrom()) + + exchange_items_list = {} + items_list = stanza.getTag( + 'x', namespace=nbxmpp.NS_ROSTERX).getChildren() + if items_list is None: + return + action = items_list[0].getAttr('action') + if not action: + action = 'add' + + for item in items_list: + try: + jid = helpers.parse_jid(item.getAttr('jid')) + except helpers.InvalidFormat: + log.warning('Invalid JID: %s, ignoring it', + item.getAttr('jid')) + continue + name = item.getAttr('name') + contact = app.contacts.get_contact(self._account, jid) + groups = [] + same_groups = True + for group in item.getTags('group'): + groups.append(group.getData()) + # check that all suggested groups are in the groups we have for + # this contact + if not contact or group not in contact.groups: + same_groups = False + if contact: + # check that all groups we have for this contact are in the + # suggested groups + for group in contact.groups: + if group not in groups: + same_groups = False + if contact.sub in ('both', 'to') and same_groups: + continue + exchange_items_list[jid] = [name, groups] + + if not exchange_items_list: + return + + log.info('Items: %s', exchange_items_list) + + app.nec.push_incoming_event(RosterItemExchangeEvent( + None, conn=self._con, + fjid=str(stanza.getFrom()), + exchange_items_list=exchange_items_list, + action=action)) + + if stanza.name == 'iq': + raise nbxmpp.NodeProcessed + + def send_contacts(self, contacts, fjid, type_='message'): + if not app.account_is_connected(self._account): + return + + if type_ == 'message': + if len(contacts) == 1: + msg = _('Sent contact: "%(jid)s" (%(name)s)') % { + 'jid': contacts[0].get_full_jid(), + 'name': contacts[0].get_shown_name()} + else: + msg = _('Sent contacts:') + for contact in contacts: + msg += '\n "%s" (%s)' % (contact.get_full_jid(), + contact.get_shown_name()) + stanza = nbxmpp.Message(to=app.get_jid_without_resource(fjid), + body=msg) + elif type_ == 'iq': + stanza = nbxmpp.Iq(to=fjid, typ='set') + x = stanza.addChild(name='x', namespace=nbxmpp.NS_ROSTERX) + for contact in contacts: + name = contact.get_shown_name() + x.addChild(name='item', attrs={'action': 'add', + 'jid': contact.jid, + 'name': name}) + log.info('Send contact: %s %s', contact.jid, name) + self._con.connection.send(stanza) + + +class RosterItemExchangeEvent(NetworkIncomingEvent): + name = 'roster-item-exchange-received' + base_network_events = [] ===================================== gajim/roster_window.py ===================================== --- a/gajim/roster_window.py +++ b/gajim/roster_window.py @@ -4117,13 +4117,14 @@ class RosterWindow: self.dragging = False def on_drop_rosterx(self, widget, account_source, c_source, account_dest, - c_dest, was_big_brother, context, etime): + c_dest, was_big_brother, context, etime): type_ = 'message' - if c_dest.show not in ('offline', 'error') and c_dest.supports( - NS_ROSTERX): + if (c_dest.show not in ('offline', 'error') and + c_dest.supports(NS_ROSTERX)): type_ = 'iq' - app.connections[account_dest].send_contacts([c_source], - c_dest.get_full_jid(), type_=type_) + con = app.connections[account_dest] + con.get_module('RosterItemExchange').send_contacts( + [c_source], c_dest.get_full_jid(), type_=type_) def on_drop_in_contact(self, widget, account_source, c_source, account_dest, c_dest, was_big_brother, context, etime): @@ -4534,7 +4535,7 @@ class RosterWindow: menu.attach_to_widget(self.tree, None) menu.connect('selection-done', gtkgui_helpers.destroy_widget) menu.show_all() - menu.popup(None, None, None, None, 1, etime) + menu.popup_at_pointer(None) ################################################################################ ### Everything about images and icons.... View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/c39da015cc5b07a0c207146ead4bc4d32… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/c39da015cc5b07a0c207146ead4bc4d32… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Refactor search code into own module
by Philipp Hörist 25 Jun '18

25 Jun '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: a0bc6f01 by Philipp Hörist at 2018-06-25T19:34:10+02:00 Refactor search code into own module - - - - - c39da015 by Philipp Hörist at 2018-06-25T20:04:56+02:00 Refactor annotations code into own module - - - - - 7 changed files: - gajim/common/connection.py - gajim/common/connection_handlers.py - gajim/common/connection_handlers_events.py - + gajim/common/modules/annotations.py - + gajim/common/modules/search.py - gajim/search_window.py - gajim/vcard.py Changes: ===================================== gajim/common/connection.py ===================================== --- a/gajim/common/connection.py +++ b/gajim/common/connection.py @@ -66,6 +66,8 @@ from gajim.common import idle from gajim.common.modules.entity_time import EntityTime from gajim.common.modules.software_version import SoftwareVersion from gajim.common.modules.ping import Ping +from gajim.common.modules.search import Search +from gajim.common.modules.annotations import Annotations from gajim.common.connection_handlers import * from gajim.common.contacts import GC_Contact from gajim.gtkgui_helpers import get_action @@ -626,7 +628,6 @@ class Connection(CommonConnection, ConnectionHandlers): self.last_time_to_reconnect = None self.new_account_info = None self.new_account_form = None - self.annotations = {} self.last_io = app.idlequeue.current_time() self.last_sent = [] self.password = passwords.get_password(name) @@ -663,6 +664,8 @@ class Connection(CommonConnection, ConnectionHandlers): self.register_module('EntityTime', EntityTime, self) self.register_module('SoftwareVersion', SoftwareVersion, self) self.register_module('Ping', Ping, self) + self.register_module('Search', Search, self) + self.register_module('Annotations', Annotations, self) app.ged.register_event_handler('privacy-list-received', ged.CORE, self._nec_privacy_list_received) @@ -1771,7 +1774,7 @@ class Connection(CommonConnection, ConnectionHandlers): self.get_bookmarks() # Get annotations - self.get_annotations() + self.get_module('Annotations').get_annotations() # Inform GUI we just signed in app.nec.push_incoming_event(SignedInEvent(None, conn=self)) @@ -2378,34 +2381,6 @@ class Connection(CommonConnection, ConnectionHandlers): self.connection.send(iq) app.log('bookmarks').info('Bookmarks published (PrivateStorage)') - def get_annotations(self): - """ - Get Annonations from storage as described in XEP 0048, and XEP 0145 - """ - self.annotations = {} - if not app.account_is_connected(self.name): - return - iq = nbxmpp.Iq(typ='get') - iq2 = iq.addChild(name='query', namespace=nbxmpp.NS_PRIVATE) - iq2.addChild(name='storage', namespace='storage:rosternotes') - self.connection.send(iq) - - def store_annotations(self): - """ - Set Annonations in private storage as described in XEP 0048, and XEP 0145 - """ - if not app.account_is_connected(self.name): - return - iq = nbxmpp.Iq(typ='set') - iq2 = iq.addChild(name='query', namespace=nbxmpp.NS_PRIVATE) - iq3 = iq2.addChild(name='storage', namespace='storage:rosternotes') - for jid in self.annotations.keys(): - if self.annotations[jid]: - iq4 = iq3.addChild(name = "note") - iq4.setAttr('jid', jid) - iq4.setData(self.annotations[jid]) - self.connection.send(iq) - def get_roster_delimiter(self): """ Get roster group delimiter from storage as described in XEP 0083 @@ -2938,24 +2913,6 @@ class Connection(CommonConnection, ConnectionHandlers): else: self.time_to_reconnect = None - def request_search_fields(self, jid): - iq = nbxmpp.Iq(typ='get', to=jid, queryNS=nbxmpp.NS_SEARCH) - self.connection.send(iq) - - def send_search_form(self, jid, form, is_form): - iq = nbxmpp.Iq(typ='set', to=jid, queryNS=nbxmpp.NS_SEARCH) - item = iq.setQuery() - if is_form: - item.addChild(node=form) - else: - for i in form.keys(): - item.setTagData(i, form[i]) - def _on_response(resp): - app.nec.push_incoming_event(SearchResultReceivedEvent(None, - conn=self, stanza=resp)) - - self.connection.SendAndCallForResponse(iq, _on_response) - def load_roster_from_db(self): app.nec.push_incoming_event(RosterReceivedEvent(None, conn=self)) ===================================== gajim/common/connection_handlers.py ===================================== --- a/gajim/common/connection_handlers.py +++ b/gajim/common/connection_handlers.py @@ -1335,9 +1335,6 @@ ConnectionHTTPUpload): app.nec.register_incoming_event(PrivateStorageBookmarksReceivedEvent) app.nec.register_incoming_event(BookmarksReceivedEvent) - app.nec.register_incoming_event( - PrivateStorageRosternotesReceivedEvent) - app.nec.register_incoming_event(RosternotesReceivedEvent) app.nec.register_incoming_event(StreamConflictReceivedEvent) app.nec.register_incoming_event(StreamOtherHostReceivedEvent) app.nec.register_incoming_event(MessageReceivedEvent) @@ -1354,8 +1351,6 @@ ConnectionHTTPUpload): ged.CORE, self._nec_roster_set_received) app.ged.register_event_handler('private-storage-bookmarks-received', ged.CORE, self._nec_private_storate_bookmarks_received) - app.ged.register_event_handler('private-storage-rosternotes-received', - ged.CORE, self._nec_private_storate_rosternotes_received) app.ged.register_event_handler('roster-received', ged.CORE, self._nec_roster_received) app.ged.register_event_handler('iq-error-received', ged.CORE, @@ -1391,8 +1386,6 @@ ConnectionHTTPUpload): ged.CORE, self._nec_roster_set_received) app.ged.remove_event_handler('private-storage-bookmarks-received', ged.CORE, self._nec_private_storate_bookmarks_received) - app.ged.remove_event_handler('private-storage-rosternotes-received', - ged.CORE, self._nec_private_storate_rosternotes_received) app.ged.remove_event_handler('roster-received', ged.CORE, self._nec_roster_received) app.ged.remove_event_handler('iq-error-received', ged.CORE, @@ -1587,12 +1580,6 @@ ConnectionHTTPUpload): if resend_to_pubsub: self.store_bookmarks('pubsub') - def _nec_private_storate_rosternotes_received(self, obj): - if obj.conn.name != self.name: - return - for jid in obj.annotations: - self.annotations[jid] = obj.annotations[jid] - def _PrivateCB(self, con, iq_obj): """ Private Data (XEP 048 and 049) @@ -2011,33 +1998,13 @@ ConnectionHTTPUpload): self.get_bookmarks() # Get annotations from private namespace - self.get_annotations() + self.get_module('Annotations').get_annotations() # Inform GUI we just signed in app.nec.push_incoming_event(SignedInEvent(None, conn=self)) self.send_awaiting_pep() self.continue_connect_info = None - def _SearchCB(self, con, iq_obj): - log.debug('SearchCB') - app.nec.push_incoming_event(SearchFormReceivedEvent(None, - conn=self, stanza=iq_obj)) - - def _search_fields_received(self, con, iq_obj): - jid = jid = helpers.get_jid_from_iq(iq_obj) - tag = iq_obj.getTag('query', namespace = nbxmpp.NS_SEARCH) - if not tag: - self.dispatch('SEARCH_FORM', (jid, None, False)) - return - df = tag.getTag('x', namespace=nbxmpp.NS_DATA) - if df: - self.dispatch('SEARCH_FORM', (jid, df, True)) - return - df = {} - for i in iq_obj.getQueryPayload(): - df[i.getName()] = i.getData() - self.dispatch('SEARCH_FORM', (jid, df, False)) - def _PubkeyGetCB(self, con, iq_obj): log.info('PubkeyGetCB') jid_from = helpers.get_full_jid_from_iq(iq_obj) @@ -2145,7 +2112,6 @@ ConnectionHTTPUpload): nbxmpp.NS_DISCO_INFO) con.RegisterHandler('iq', self._DiscoverItemsGetCB, 'get', nbxmpp.NS_DISCO_ITEMS) - con.RegisterHandler('iq', self._SearchCB, 'result', nbxmpp.NS_SEARCH) con.RegisterHandler('iq', self._PrivacySetCB, 'set', nbxmpp.NS_PRIVACY) con.RegisterHandler('iq', self._ArchiveCB, ns=nbxmpp.NS_MAM_1) con.RegisterHandler('iq', self._ArchiveCB, ns=nbxmpp.NS_MAM_2) ===================================== gajim/common/connection_handlers_events.py ===================================== --- a/gajim/common/connection_handlers_events.py +++ b/gajim/common/connection_handlers_events.py @@ -450,36 +450,6 @@ class BookmarksReceivedEvent(nec.NetworkIncomingEvent): self.bookmarks = self.base_event.bookmarks return True -class PrivateStorageRosternotesReceivedEvent(nec.NetworkIncomingEvent): - name = 'private-storage-rosternotes-received' - base_network_events = ['private-storage-received'] - - def generate(self): - self.conn = self.base_event.conn - if self.base_event.namespace != nbxmpp.NS_ROSTERNOTES: - return - notes = self.base_event.storage_node.getTags('note') - self.annotations = {} - for note in notes: - try: - jid = helpers.parse_jid(note.getAttr('jid')) - except helpers.InvalidFormat: - log.warning('Invalid JID: %s, ignoring it' % note.getAttr('jid')) - continue - annotation = note.getData() - self.annotations[jid] = annotation - if self.annotations: - return True - -class RosternotesReceivedEvent(nec.NetworkIncomingEvent): - name = 'rosternotes-received' - base_network_events = ['private-storage-rosternotes-received'] - - def generate(self): - self.conn = self.base_event.conn - self.annotations = self.base_event.annotations - return True - class PubsubReceivedEvent(nec.NetworkIncomingEvent): name = 'pubsub-received' base_network_events = [] @@ -513,51 +483,6 @@ class PubsubBookmarksReceivedEvent(nec.NetworkIncomingEvent, BookmarksHelper): self.parse_bookmarks() return True -class SearchFormReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): - name = 'search-form-received' - base_network_events = [] - - def generate(self): - self.get_jid_resource() - self.data = None - self.is_dataform = False - tag = self.stanza.getTag('query', namespace=nbxmpp.NS_SEARCH) - if not tag: - return True - self.data = tag.getTag('x', namespace=nbxmpp.NS_DATA) - if self.data: - self.is_dataform = True - return True - self.data = {} - for i in self.stanza.getQueryPayload(): - self.data[i.getName()] = i.getData() - return True - - -class SearchResultReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): - name = 'search-result-received' - base_network_events = [] - - def generate(self): - self.get_jid_resource() - self.data = None - self.is_dataform = False - tag = self.stanza.getTag('query', namespace=nbxmpp.NS_SEARCH) - if not tag: - return True - self.data = tag.getTag('x', namespace=nbxmpp.NS_DATA) - if self.data: - self.is_dataform = True - return True - self.data = [] - for item in tag.getTags('item'): - # We also show attributes. jid is there - f = item.attrs - for i in item.getPayload(): - f[i.getName()] = i.getData() - self.data.append(f) - return True - class IqErrorReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): name = 'iq-error-received' base_network_events = [] ===================================== gajim/common/modules/annotations.py ===================================== --- /dev/null +++ b/gajim/common/modules/annotations.py @@ -0,0 +1,92 @@ +# 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/>. + +# XEP-0145: Annotations + +import logging + +import nbxmpp + +from gajim.common import app +from gajim.common import helpers + +log = logging.getLogger('gajim.c.m.annotations') + + +class Annotations: + def __init__(self, con): + self._con = con + self._account = con.name + self._server = self._con.get_own_jid().getDomain() + + self.handlers = [] + self.annotations = {} + + def get_annotations(self): + if not app.account_is_connected(self._account): + return + + log.info('Request annotations for %s', self._server) + iq = nbxmpp.Iq(typ='get') + iq2 = iq.addChild(name='query', namespace=nbxmpp.NS_PRIVATE) + iq2.addChild(name='storage', namespace='storage:rosternotes') + + self._con.connection.SendAndCallForResponse(iq, self._result_received) + + def _result_received(self, stanza): + if not nbxmpp.isResultNode(stanza): + log.info('Error: %s', stanza.getError()) + return + + log.info('Received annotations from %s', self._server) + self.annotations = {} + query = stanza.getTag('query') + storage_node = query.getTag('storage') + if storage_node is None: + return + + notes = storage_node.getTags('note') + if notes is None: + return + + for note in notes: + try: + jid = helpers.parse_jid(note.getAttr('jid')) + except helpers.InvalidFormat: + log.warning('Invalid JID: %s, ignoring it', + note.getAttr('jid')) + continue + self.annotations[jid] = note.getData() + + def store_annotations(self): + if not app.account_is_connected(self._account): + return + + iq = nbxmpp.Iq(typ='set') + iq2 = iq.addChild(name='query', namespace=nbxmpp.NS_PRIVATE) + iq3 = iq2.addChild(name='storage', namespace='storage:rosternotes') + for jid in self.annotations.keys(): + if self.annotations[jid]: + iq4 = iq3.addChild(name='note') + iq4.setAttr('jid', jid) + iq4.setData(self.annotations[jid]) + + self._con.connection.SendAndCallForResponse( + iq, self._store_result_received) + + def _store_result_received(self, stanza): + if not nbxmpp.isResultNode(stanza): + log.warning('Storing rosternotes failed: %s', stanza.getError()) + return + log.info('Storing rosternotes successful') ===================================== gajim/common/modules/search.py ===================================== --- /dev/null +++ b/gajim/common/modules/search.py @@ -0,0 +1,114 @@ +# 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/>. + +# XEP-0055: Jabber Search + +import logging + +import nbxmpp + +from gajim.common import app +from gajim.common.nec import NetworkIncomingEvent + +log = logging.getLogger('gajim.c.m.search') + + +class Search: + def __init__(self, con): + self._con = con + self._account = con.name + + self.handlers = [] + + def request_search_fields(self, jid): + log.info('Request search fields from %s', jid) + iq = nbxmpp.Iq(typ='get', to=jid, queryNS=nbxmpp.NS_SEARCH) + self._con.connection.SendAndCallForResponse(iq, self._fields_received) + + def _fields_received(self, stanza): + data = None + is_dataform = False + + if nbxmpp.isResultNode(stanza): + log.info('Received search fields from %s', stanza.getFrom()) + tag = stanza.getTag('query', namespace=nbxmpp.NS_SEARCH) + if tag is None: + log.info('Invalid stanza: %s', stanza) + return + + data = tag.getTag('x', namespace=nbxmpp.NS_DATA) + if data is not None: + is_dataform = True + else: + data = {} + for i in stanza.getQueryPayload(): + data[i.getName()] = i.getData() + else: + log.info('Error: %s', stanza.getError()) + + app.nec.push_incoming_event( + SearchFormReceivedEvent(None, conn=self._con, + is_dataform=is_dataform, + data=data)) + + def send_search_form(self, jid, form, is_form): + iq = nbxmpp.Iq(typ='set', to=jid, queryNS=nbxmpp.NS_SEARCH) + item = iq.setQuery() + if is_form: + item.addChild(node=form) + else: + for i in form.keys(): + item.setTagData(i, form[i]) + + self._con.connection.SendAndCallForResponse(iq, self._received_result) + + def _received_result(self, stanza): + data = None + is_dataform = False + + if nbxmpp.isResultNode(stanza): + log.info('Received result from %s', stanza.getFrom()) + tag = stanza.getTag('query', namespace=nbxmpp.NS_SEARCH) + if tag is None: + log.info('Invalid stanza: %s', stanza) + return + + data = tag.getTag('x', namespace=nbxmpp.NS_DATA) + if data is not None: + is_dataform = True + else: + data = [] + for item in tag.getTags('item'): + # We also show attributes. jid is there + f = item.attrs + for i in item.getPayload(): + f[i.getName()] = i.getData() + data.append(f) + else: + log.info('Error: %s', stanza.getError()) + + app.nec.push_incoming_event( + SearchResultReceivedEvent(None, conn=self._con, + is_dataform=is_dataform, + data=data)) + + +class SearchFormReceivedEvent(NetworkIncomingEvent): + name = 'search-form-received' + base_network_events = [] + + +class SearchResultReceivedEvent(NetworkIncomingEvent): + name = 'search-result-received' + base_network_events = [] ===================================== gajim/search_window.py ===================================== --- a/gajim/search_window.py +++ b/gajim/search_window.py @@ -68,7 +68,8 @@ class SearchWindow: self._nec_search_result_received) def request_form(self): - app.connections[self.account].request_search_fields(self.jid) + con = app.connections[self.account] + con.get_module('Search').request_search_fields(self.jid) def pulse_callback(self): self.progressbar.pulse() @@ -91,16 +92,16 @@ class SearchWindow: self.window.destroy() def on_search_button_clicked(self, button): + con = app.connections[self.account] if self.is_form: self.data_form_widget.data_form.type_ = 'submit' - app.connections[self.account].send_search_form(self.jid, - self.data_form_widget.data_form.get_purged(), True) + con.get_module('Search').send_search_form( + self.jid, self.data_form_widget.data_form.get_purged(), True) else: infos = self.data_form_widget.get_infos() if 'instructions' in infos: del infos['instructions'] - app.connections[self.account].send_search_form(self.jid, infos, - False) + con.get_module('Search').send_search_form(self.jid, infos, False) self.search_vbox.remove(self.data_form_widget) ===================================== gajim/vcard.py ===================================== --- a/gajim/vcard.py +++ b/gajim/vcard.py @@ -109,7 +109,8 @@ class VcardWindow: self.set_entity_time) self.fill_jabber_page() - annotations = app.connections[self.account].annotations + con = app.connections[self.account] + annotations = con.get_module('Annotations').annotations if self.contact.jid in annotations: buffer_ = self.xml.get_object('textview_annotation').get_buffer() buffer_.set_text(annotations[self.contact.jid]) @@ -140,12 +141,13 @@ class VcardWindow: GLib.source_remove(self.update_progressbar_timeout_id) del app.interface.instances[self.account]['infos'][self.contact.jid] buffer_ = self.xml.get_object('textview_annotation').get_buffer() - annotation = buffer_.get_text(buffer_.get_start_iter(), + new_annotation = buffer_.get_text(buffer_.get_start_iter(), buffer_.get_end_iter(), True) - connection = app.connections[self.account] - if annotation != connection.annotations.get(self.contact.jid, ''): - connection.annotations[self.contact.jid] = annotation - connection.store_annotations() + con = app.connections[self.account] + annotations = con.get_module('Annotations').annotations + if new_annotation != annotations.get(self.contact.jid, ''): + annotations[self.contact.jid] = new_annotation + con.get_module('Annotations').store_annotations() app.ged.remove_event_handler('version-result-received', ged.GUI1, self.set_os_info) app.ged.remove_event_handler('time-result-received', ged.GUI1, View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/6d2a07df70ba0ea9e543cdb9852d8a5d3… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/6d2a07df70ba0ea9e543cdb9852d8a5d3… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 4 commits: Refactor entity time code into own module
by Philipp Hörist 24 Jun '18

24 Jun '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 14990103 by Philipp Hörist at 2018-06-24T23:33:42+02:00 Refactor entity time code into own module - - - - - 81d9e1bc by Philipp Hörist at 2018-06-24T23:33:42+02:00 Refactor software version code into own module - - - - - 7b957a28 by Philipp Hörist at 2018-06-24T23:33:42+02:00 Refactor ping code into own module - - - - - 6d2a07df by Philipp Hörist at 2018-06-24T23:33:42+02:00 Remove support for XEP-0090 This is deprecated almost 10 years - - - - - 14 changed files: - gajim/chat_control.py - gajim/chat_control_base.py - gajim/command_system/implementation/standard.py - gajim/common/connection.py - gajim/common/connection_handlers.py - gajim/common/connection_handlers_events.py - + gajim/common/modules/__init__.py - + gajim/common/modules/entity_time.py - + gajim/common/modules/ping.py - + gajim/common/modules/software_version.py - gajim/groupchat_control.py - gajim/remote_control.py - gajim/server_info.py - gajim/vcard.py Changes: ===================================== gajim/chat_control.py ===================================== --- a/gajim/chat_control.py +++ b/gajim/chat_control.py @@ -1230,14 +1230,16 @@ class ChatControl(ChatControlBase): return self.update_ui() - def _nec_ping_reply(self, obj): - if obj.control: - if obj.control != self: - return - else: - if self.contact != obj.contact: - return - self.print_conversation(_('Pong! (%s s.)') % obj.seconds, 'status') + def _nec_ping(self, obj): + if self.contact != obj.contact: + return + if obj.name == 'ping-sent': + self.print_conversation(_('Ping?'), 'status') + elif obj.name == 'ping-reply': + self.print_conversation( + _('Pong! (%s s.)') % obj.seconds, 'status') + elif obj.name == 'ping-error': + self.print_conversation(_('Error.'), 'status') def show_avatar(self): if not app.config.get('show_avatar_in_chat'): ===================================== gajim/chat_control_base.py ===================================== --- a/gajim/chat_control_base.py +++ b/gajim/chat_control_base.py @@ -193,16 +193,6 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): if self.parent_win: self.parent_win.redraw_tab(self) - def _nec_ping_sent(self, obj): - if self.contact != obj.contact: - return - self.print_conversation(_('Ping?'), 'status') - - def _nec_ping_error(self, obj): - if self.contact != obj.contact: - return - self.print_conversation(_('Error.'), 'status') - def status_url_clicked(self, widget, url): helpers.launch_browser_mailer('url', url) @@ -381,11 +371,11 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): app.ged.register_event_handler('our-show', ged.GUI1, self._nec_our_status) app.ged.register_event_handler('ping-sent', ged.GUI1, - self._nec_ping_sent) + self._nec_ping) app.ged.register_event_handler('ping-reply', ged.GUI1, - self._nec_ping_reply) + self._nec_ping) app.ged.register_event_handler('ping-error', ged.GUI1, - self._nec_ping_error) + self._nec_ping) # This is basically a very nasty hack to surpass the inability # to properly use the super, because of the old code. ===================================== gajim/command_system/implementation/standard.py ===================================== --- a/gajim/command_system/implementation/standard.py +++ b/gajim/command_system/implementation/standard.py @@ -178,7 +178,7 @@ class StandardCommonChatCommands(CommandContainer): def ping(self): if self.account == app.ZEROCONF_ACC_NAME: raise CommandError(_('Command is not supported for zeroconf accounts')) - app.connections[self.account].sendPing(self.contact) + app.connections[self.account].get_module('Ping').send_ping(self.contact) @command @doc(_("Send DTMF sequence through an open audio session")) @@ -391,5 +391,5 @@ class StandardGroupChatCommands(CommandContainer): if self.account == app.ZEROCONF_ACC_NAME: raise CommandError(_('Command is not supported for zeroconf accounts')) gc_c = app.contacts.get_gc_contact(self.account, self.room_jid, nick) - app.connections[self.account].sendPing(gc_c, self) + app.connections[self.account].get_module('Ping').send_ping(gc_c) ===================================== gajim/common/connection.py ===================================== --- a/gajim/common/connection.py +++ b/gajim/common/connection.py @@ -63,6 +63,9 @@ from gajim.common import gpg from gajim.common import passwords from gajim.common import i18n from gajim.common import idle +from gajim.common.modules.entity_time import EntityTime +from gajim.common.modules.software_version import SoftwareVersion +from gajim.common.modules.ping import Ping from gajim.common.connection_handlers import * from gajim.common.contacts import GC_Contact from gajim.gtkgui_helpers import get_action @@ -81,6 +84,7 @@ class CommonConnection: def __init__(self, name): self.name = name + self._modules = {} # self.connected: # 0=>offline, # 1=>connection in progress, @@ -162,6 +166,15 @@ class CommonConnection: """ app.ged.raise_event(event, self.name, data) + def get_module(self, name): + return self._modules[name] + + def get_module_handlers(self): + return self._modules.values() + + def register_module(self, name, cls, *args, **kwargs): + self._modules[name] = cls(*args, **kwargs) + def reconnect(self): """ To be implemented by derived classes @@ -471,12 +484,6 @@ class CommonConnection: def account_changed(self, new_name): self.name = new_name - def request_os_info(self, jid, resource): - """ - To be implemented by derived classes - """ - raise NotImplementedError - def get_settings(self): """ To be implemented by derived classes @@ -653,6 +660,10 @@ class Connection(CommonConnection, ConnectionHandlers): self.sm = Smacks(self) # Stream Management + self.register_module('EntityTime', EntityTime, self) + self.register_module('SoftwareVersion', SoftwareVersion, self) + self.register_module('Ping', Ping, self) + app.ged.register_event_handler('privacy-list-received', ged.CORE, self._nec_privacy_list_received) app.ged.register_event_handler('agent-info-error-received', ged.CORE, @@ -1518,45 +1529,6 @@ class Connection(CommonConnection, ConnectionHandlers): if self.connection: self.connection.send(' ') - def _on_xmpp_ping_answer(self, iq_obj): - self.awaiting_xmpp_ping_id = None - - def sendPing(self, pingTo=None, control=None): - """ - Send XMPP Ping (XEP-0199) request. If pingTo is not set, ping is sent to - server to detect connection failure at application level - If control is set, display result there - """ - if not app.account_is_connected(self.name): - return - id_ = self.connection.getAnID() - if pingTo: - to = pingTo.get_full_jid() - app.nec.push_incoming_event(PingSentEvent(None, conn=self, - contact=pingTo)) - else: - to = app.config.get_per('accounts', self.name, 'hostname') - self.awaiting_xmpp_ping_id = id_ - iq = nbxmpp.Iq('get', to=to) - iq.addChild(name='ping', namespace=nbxmpp.NS_PING) - iq.setID(id_) - def _on_response(resp): - timePong = time.time() - if not nbxmpp.isResultNode(resp): - app.nec.push_incoming_event(PingErrorEvent(None, conn=self, - contact=pingTo)) - return - timeDiff = round(timePong - timePing, 2) - app.nec.push_incoming_event(PingReplyEvent(None, conn=self, - contact=pingTo, seconds=timeDiff, control=control)) - if pingTo: - timePing = time.time() - self.connection.SendAndCallForResponse(iq, _on_response) - else: - self.connection.SendAndCallForResponse(iq, self._on_xmpp_ping_answer) - app.idlequeue.set_alarm(self.check_pingalive, app.config.get_per( - 'accounts', self.name, 'time_for_ping_alive_answer')) - def get_active_default_lists(self): if not app.account_is_connected(self.name): return @@ -1823,8 +1795,10 @@ class Connection(CommonConnection, ConnectionHandlers): self.connection = con if not app.account_is_connected(self.name): return + self.connection.set_send_timeout(self.keepalives, self.send_keepalive) - self.connection.set_send_timeout2(self.pingalives, self.sendPing) + self.connection.set_send_timeout2( + self.pingalives, self.get_module('Ping').send_keepalive_ping) self.connection.onreceive(None) self.privacy_rules_requested = False @@ -2232,51 +2206,6 @@ class Connection(CommonConnection, ConnectionHandlers): self.connection = con nbxmpp.features_nb.getRegInfo(con, self._hostname) - def request_os_info(self, jid, resource, groupchat_jid=None): - """ - groupchat_jid is used when we want to send a request to a real jid and - act as if the answer comes from the groupchat_jid - """ - if not app.account_is_connected(self.name): - return - # If we are invisible, do not request - if self.connected == app.SHOW_LIST.index('invisible'): - self.dispatch('OS_INFO', (jid, resource, _('Not fetched because of invisible status'), _('Not fetched because of invisible status'))) - return - to_whom_jid = jid - if resource: - to_whom_jid += '/' + resource - iq = nbxmpp.Iq(to=to_whom_jid, typ='get', queryNS=nbxmpp.NS_VERSION) - id_ = self.connection.getAnID() - iq.setID(id_) - if groupchat_jid: - self.groupchat_jids[id_] = groupchat_jid - self.version_ids.append(id_) - self.connection.send(iq) - - def request_entity_time(self, jid, resource, groupchat_jid=None): - """ - groupchat_jid is used when we want to send a request to a real jid and - act as if the answer comes from the groupchat_jid - """ - if not app.account_is_connected(self.name): - return - # If we are invisible, do not request - if self.connected == app.SHOW_LIST.index('invisible'): - self.dispatch('ENTITY_TIME', (jid, resource, _('Not fetched because of invisible status'))) - return - to_whom_jid = jid - if resource: - to_whom_jid += '/' + resource - iq = nbxmpp.Iq(to=to_whom_jid, typ='get') - iq.addChild('time', namespace=nbxmpp.NS_TIME_REVISED) - id_ = self.connection.getAnID() - iq.setID(id_) - if groupchat_jid: - self.groupchat_jids[id_] = groupchat_jid - self.entity_time_ids.append(id_) - self.connection.send(iq) - def request_gateway_prompt(self, jid, prompt=None): def _on_prompt_result(resp): app.nec.push_incoming_event(GatewayPromptReceivedEvent(None, @@ -2999,15 +2928,6 @@ class Connection(CommonConnection, ConnectionHandlers): self.connection.send(message) - def check_pingalive(self): - if not app.config.get_per('accounts', self.name, 'active'): - # Account may have been disabled - return - if self.awaiting_xmpp_ping_id: - # We haven't got the pong in time, disco and reconnect - log.warning("No reply received for keepalive ping. Reconnecting.") - self.disconnectedReconnCB() - def _reconnect_alarm(self): if not app.config.get_per('accounts', self.name, 'active'): # Account may have been disabled ===================================== gajim/common/connection_handlers.py ===================================== --- a/gajim/common/connection_handlers.py +++ b/gajim/common/connection_handlers.py @@ -1324,16 +1324,11 @@ ConnectionHTTPUpload): # keep the latest subscribed event for each jid to prevent loop when we # acknowledge presences self.subscribed_events = {} - # IDs of jabber:iq:version requests - self.version_ids = [] - # IDs of urn:xmpp:time requests - self.entity_time_ids = [] # IDs of disco#items requests self.disco_items_ids = [] # IDs of disco#info requests self.disco_info_ids = [] - # ID of urn:xmpp:ping requests - self.awaiting_xmpp_ping_id = None + self.continue_connect_info = None self.privacy_default_list = None @@ -1353,14 +1348,8 @@ ConnectionHTTPUpload): app.ged.register_event_handler('http-auth-received', ged.CORE, self._nec_http_auth_received) - app.ged.register_event_handler('version-request-received', ged.CORE, - self._nec_version_request_received) app.ged.register_event_handler('last-request-received', ged.CORE, self._nec_last_request_received) - app.ged.register_event_handler('time-request-received', ged.CORE, - self._nec_time_request_received) - app.ged.register_event_handler('time-revised-request-received', - ged.CORE, self._nec_time_revised_request_received) app.ged.register_event_handler('roster-set-received', ged.CORE, self._nec_roster_set_received) app.ged.register_event_handler('private-storage-bookmarks-received', @@ -1371,8 +1360,6 @@ ConnectionHTTPUpload): self._nec_roster_received) app.ged.register_event_handler('iq-error-received', ged.CORE, self._nec_iq_error_received) - app.ged.register_event_handler('ping-received', ged.CORE, - self._nec_ping_received) app.ged.register_event_handler('subscribe-presence-received', ged.CORE, self._nec_subscribe_presence_received) app.ged.register_event_handler('subscribed-presence-received', @@ -1398,14 +1385,8 @@ ConnectionHTTPUpload): ConnectionHTTPUpload.cleanup(self) app.ged.remove_event_handler('http-auth-received', ged.CORE, self._nec_http_auth_received) - app.ged.remove_event_handler('version-request-received', ged.CORE, - self._nec_version_request_received) app.ged.remove_event_handler('last-request-received', ged.CORE, self._nec_last_request_received) - app.ged.remove_event_handler('time-request-received', ged.CORE, - self._nec_time_request_received) - app.ged.remove_event_handler('time-revised-request-received', - ged.CORE, self._nec_time_revised_request_received) app.ged.remove_event_handler('roster-set-received', ged.CORE, self._nec_roster_set_received) app.ged.remove_event_handler('private-storage-bookmarks-received', @@ -1416,8 +1397,6 @@ ConnectionHTTPUpload): self._nec_roster_received) app.ged.remove_event_handler('iq-error-received', ged.CORE, self._nec_iq_error_received) - app.ged.remove_event_handler('ping-received', ged.CORE, - self._nec_ping_received) app.ged.remove_event_handler('subscribe-presence-received', ged.CORE, self._nec_subscribe_presence_received) app.ged.remove_event_handler('subscribed-presence-received', @@ -1585,14 +1564,6 @@ ConnectionHTTPUpload): def _nec_iq_error_received(self, obj): if obj.conn.name != self.name: return - if obj.id_ in self.version_ids: - app.nec.push_incoming_event(VersionResultReceivedEvent(None, - conn=self, stanza=obj.stanza)) - return True - if obj.id_ in self.entity_time_ids: - app.nec.push_incoming_event(TimeResultReceivedEvent(None, - conn=self, stanza=obj.stanza)) - return True if obj.id_ in self.disco_items_ids: app.nec.push_incoming_event(AgentItemsErrorReceivedEvent(None, conn=self, stanza=obj.stanza)) @@ -1682,31 +1653,6 @@ ConnectionHTTPUpload): app.config.set_per('accounts', self.name, 'roster_version', obj.version) - def _VersionCB(self, con, iq_obj): - log.debug('VersionCB') - if not self.connection or self.connected < 2: - return - app.nec.push_incoming_event(VersionRequestEvent(None, conn=self, - stanza=iq_obj)) - raise nbxmpp.NodeProcessed - - def _nec_version_request_received(self, obj): - if obj.conn.name != self.name: - return - send_os = app.config.get_per('accounts', self.name, 'send_os_info') - if send_os: - iq_obj = obj.stanza.buildReply('result') - qp = iq_obj.getQuery() - qp.setTagData('name', 'Gajim') - qp.setTagData('version', app.version) - qp.setTagData('os', helpers.get_os_info()) - else: - iq_obj = obj.stanza.buildReply('error') - err = nbxmpp.ErrorNode(name=nbxmpp.NS_STANZAS + \ - ' service-unavailable') - iq_obj.addChild(node=err) - self.connection.send(iq_obj) - def _LastCB(self, con, iq_obj): log.debug('LastCB') if not self.connection or self.connected < 2: @@ -1730,66 +1676,6 @@ ConnectionHTTPUpload): iq_obj.addChild(node=err) self.connection.send(iq_obj) - def _VersionResultCB(self, con, iq_obj): - log.debug('VersionResultCB') - app.nec.push_incoming_event(VersionResultReceivedEvent(None, - conn=self, stanza=iq_obj)) - - def _TimeCB(self, con, iq_obj): - log.debug('TimeCB') - if not self.connection or self.connected < 2: - return - app.nec.push_incoming_event(TimeRequestEvent(None, conn=self, - stanza=iq_obj)) - raise nbxmpp.NodeProcessed - - def _nec_time_request_received(self, obj): - if obj.conn.name != self.name: - return - if app.config.get_per('accounts', self.name, 'send_time_info'): - iq_obj = obj.stanza.buildReply('result') - qp = iq_obj.setQuery() - qp.setTagData('utc', strftime('%Y%m%dT%H:%M:%S', gmtime())) - qp.setTagData('tz', tzname[daylight]) - qp.setTagData('display', strftime('%c', localtime())) - else: - iq_obj = obj.stanza.buildReply('error') - err = nbxmpp.ErrorNode(name=nbxmpp.NS_STANZAS + \ - ' service-unavailable') - iq_obj.addChild(node=err) - self.connection.send(iq_obj) - - def _TimeRevisedCB(self, con, iq_obj): - log.debug('TimeRevisedCB') - if not self.connection or self.connected < 2: - return - app.nec.push_incoming_event(TimeRevisedRequestEvent(None, conn=self, - stanza=iq_obj)) - raise nbxmpp.NodeProcessed - - def _nec_time_revised_request_received(self, obj): - if obj.conn.name != self.name: - return - if app.config.get_per('accounts', self.name, 'send_time_info'): - iq_obj = obj.stanza.buildReply('result') - qp = iq_obj.setTag('time', namespace=nbxmpp.NS_TIME_REVISED) - qp.setTagData('utc', strftime('%Y-%m-%dT%H:%M:%SZ', gmtime())) - isdst = localtime().tm_isdst - zone = -(timezone, altzone)[isdst] / 60.0 - tzo = (zone / 60, abs(zone % 60)) - qp.setTagData('tzo', '%+03d:%02d' % (tzo)) - else: - iq_obj = obj.stanza.buildReply('error') - err = nbxmpp.ErrorNode(name=nbxmpp.NS_STANZAS + \ - ' service-unavailable') - iq_obj.addChild(node=err) - self.connection.send(iq_obj) - - def _TimeRevisedResultCB(self, con, iq_obj): - log.debug('TimeRevisedResultCB') - app.nec.push_incoming_event(TimeResultReceivedEvent(None, conn=self, - stanza=iq_obj)) - def _rosterItemExchangeCB(self, con, msg): """ XEP-0144 Roster Item Echange @@ -1983,23 +1869,6 @@ ConnectionHTTPUpload): app.nec.push_incoming_event(MucAdminReceivedEvent(None, conn=self, stanza=iq_obj)) - def _IqPingCB(self, con, iq_obj): - log.debug('IqPingCB') - app.nec.push_incoming_event(PingReceivedEvent(None, conn=self, - stanza=iq_obj)) - raise nbxmpp.NodeProcessed - - def _nec_ping_received(self, obj): - if obj.conn.name != self.name: - return - if not self.connection or self.connected < 2: - return - iq_obj = obj.stanza.buildReply('result') - q = iq_obj.getTag('ping') - if q: - iq_obj.delChild(q) - self.connection.send(iq_obj) - def _PrivacySetCB(self, con, iq_obj): """ Privacy lists (XEP 016) @@ -2261,15 +2130,7 @@ ConnectionHTTPUpload): nbxmpp.NS_DISCO_INFO) con.RegisterHandler('iq', self._DiscoverInfoErrorCB, 'error', nbxmpp.NS_DISCO_INFO) - con.RegisterHandler('iq', self._VersionCB, 'get', nbxmpp.NS_VERSION) - con.RegisterHandler('iq', self._TimeCB, 'get', nbxmpp.NS_TIME) - con.RegisterHandler('iq', self._TimeRevisedCB, 'get', - nbxmpp.NS_TIME_REVISED) con.RegisterHandler('iq', self._LastCB, 'get', nbxmpp.NS_LAST) - con.RegisterHandler('iq', self._VersionResultCB, 'result', - nbxmpp.NS_VERSION) - con.RegisterHandler('iq', self._TimeRevisedResultCB, 'result', - nbxmpp.NS_TIME_REVISED) con.RegisterHandler('iq', self._MucOwnerCB, 'result', nbxmpp.NS_MUC_OWNER) con.RegisterHandler('iq', self._MucAdminCB, 'result', @@ -2284,7 +2145,6 @@ ConnectionHTTPUpload): nbxmpp.NS_DISCO_INFO) con.RegisterHandler('iq', self._DiscoverItemsGetCB, 'get', nbxmpp.NS_DISCO_ITEMS) - con.RegisterHandler('iq', self._IqPingCB, 'get', nbxmpp.NS_PING) con.RegisterHandler('iq', self._SearchCB, 'result', nbxmpp.NS_SEARCH) con.RegisterHandler('iq', self._PrivacySetCB, 'set', nbxmpp.NS_PRIVACY) con.RegisterHandler('iq', self._ArchiveCB, ns=nbxmpp.NS_MAM_1) @@ -2310,3 +2170,7 @@ ConnectionHTTPUpload): nbxmpp.NS_BLOCKING) con.RegisterHandler('iq', self._BlockingResultCB, 'result', nbxmpp.NS_BLOCKING) + + for module in self.get_module_handlers(): + for handler in module.handlers: + con.RegisterHandler(*handler) ===================================== gajim/common/connection_handlers_events.py ===================================== --- a/gajim/common/connection_handlers_events.py +++ b/gajim/common/connection_handlers_events.py @@ -193,100 +193,6 @@ class HttpAuthReceivedEvent(nec.NetworkIncomingEvent): self.msg = self.stanza.getTagData('body') return True -class VersionResultReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): - name = 'version-result-received' - base_network_events = [] - - def generate(self): - self.get_id() - self.get_jid_resource(check_fake_jid=True) - if self.id_ in self.conn.version_ids: - self.conn.version_ids.remove(self.id_) - - self.client_info = '' - self.os_info = '' - - if self.stanza.getType() == 'error': - return True - - qp = self.stanza.getTag('query') - if qp.getTag('name'): - self.client_info += qp.getTag('name').getData() - if qp.getTag('version'): - self.client_info += ' ' + qp.getTag('version').getData() - if qp.getTag('os'): - self.os_info += qp.getTag('os').getData() - - return True - -class TimeResultReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): - name = 'time-result-received' - base_network_events = [] - - def generate(self): - self.get_id() - self.get_jid_resource(check_fake_jid=True) - if self.id_ in self.conn.entity_time_ids: - self.conn.entity_time_ids.remove(self.id_) - - self.time_info = '' - - if self.stanza.getType() == 'error': - return True - - qp = self.stanza.getTag('time') - if not qp: - # wrong answer - return - tzo = qp.getTag('tzo').getData() - if tzo.lower() == 'z': - tzo = '0:0' - try: - tzoh, tzom = tzo.split(':') - except Exception as e: - # wrong tzo - return - utc_time = qp.getTag('utc').getData() - ZERO = datetime.timedelta(0) - class UTC(datetime.tzinfo): - def utcoffset(self, dt): - return ZERO - def tzname(self, dt): - return "UTC" - def dst(self, dt): - return ZERO - - class contact_tz(datetime.tzinfo): - def utcoffset(self, dt): - return datetime.timedelta(hours=int(tzoh), minutes=int(tzom)) - def tzname(self, dt): - return "remote timezone" - def dst(self, dt): - return ZERO - - if utc_time[-1:] == 'Z': - # Remove the trailing 'Z' - utc_time = utc_time[:-1] - elif utc_time[-6:] == "+00:00": - # Remove the trailing "+00:00" - utc_time = utc_time[:-6] - else: - log.info("Wrong timezone defintion: %s" % utc_time) - return - try: - t = datetime.datetime.strptime(utc_time, '%Y-%m-%dT%H:%M:%S') - except ValueError: - try: - t = datetime.datetime.strptime(utc_time, - '%Y-%m-%dT%H:%M:%S.%f') - except ValueError as e: - log.info('Wrong time format: %s' % str(e)) - return - - t = t.replace(tzinfo=UTC()) - self.time_info = t.astimezone(contact_tz()).strftime('%c') - return True - class RosterItemExchangeEvent(nec.NetworkIncomingEvent, HelperEvent): name = 'roster-item-exchange-received' base_network_events = [] @@ -332,22 +238,10 @@ class RosterItemExchangeEvent(nec.NetworkIncomingEvent, HelperEvent): if self.exchange_items_list: return True -class VersionRequestEvent(nec.NetworkIncomingEvent): - name = 'version-request-received' - base_network_events = [] - class LastRequestEvent(nec.NetworkIncomingEvent): name = 'last-request-received' base_network_events = [] -class TimeRequestEvent(nec.NetworkIncomingEvent): - name = 'time-request-received' - base_network_events = [] - -class TimeRevisedRequestEvent(nec.NetworkIncomingEvent): - name = 'time-revised-request-received' - base_network_events = [] - class RosterReceivedEvent(nec.NetworkIncomingEvent): name = 'roster-received' base_network_events = [] @@ -675,10 +569,6 @@ class IqErrorReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): self.errcode = self.stanza.getErrorCode() return True -class PingReceivedEvent(nec.NetworkIncomingEvent): - name = 'ping-received' - base_network_events = [] - class StreamReceivedEvent(nec.NetworkIncomingEvent): name = 'stream-received' base_network_events = [] @@ -2072,18 +1962,6 @@ class ConnectionLostEvent(nec.NetworkIncomingEvent): show='offline')) return True -class PingSentEvent(nec.NetworkIncomingEvent): - name = 'ping-sent' - base_network_events = [] - -class PingReplyEvent(nec.NetworkIncomingEvent): - name = 'ping-reply' - base_network_events = [] - -class PingErrorEvent(nec.NetworkIncomingEvent): - name = 'ping-error' - base_network_events = [] - class CapsPresenceReceivedEvent(nec.NetworkIncomingEvent, HelperEvent, PresenceHelperEvent): name = 'caps-presence-received' ===================================== gajim/common/modules/__init__.py ===================================== --- /dev/null +++ b/gajim/common/modules/__init__.py ===================================== gajim/common/modules/entity_time.py ===================================== --- /dev/null +++ b/gajim/common/modules/entity_time.py @@ -0,0 +1,164 @@ +# 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/>. + +# XEP-0202: Entity Time + +import logging +import datetime +import time + +import nbxmpp + +from gajim.common import app +from gajim.common.nec import NetworkIncomingEvent + +log = logging.getLogger('gajim.c.m.entity_time') + +ZERO = datetime.timedelta(0) + + +class EntityTime: + def __init__(self, con): + self._con = con + self._account = con.name + + self.handlers = [ + ('iq', self._answer_request, 'get', nbxmpp.NS_TIME_REVISED), + ] + + def request_entity_time(self, jid, resource): + if not app.account_is_connected(self._account): + return + # If we are invisible, do not request + if self._con.connected == app.SHOW_LIST.index('invisible'): + return + + if resource: + jid += '/' + resource + iq = nbxmpp.Iq(to=jid, typ='get') + iq.addChild('time', namespace=nbxmpp.NS_TIME_REVISED) + + log.info('Requested: %s', jid) + + self._con.connection.SendAndCallForResponse(iq, self._result_received) + + def _result_received(self, stanza): + time_info = None + if not nbxmpp.isResultNode(stanza): + log.info('Error: %s', stanza.getError()) + else: + time_info = self._extract_info(stanza) + + log.info('Received: %s %s', + stanza.getFrom(), time_info) + + app.nec.push_incoming_event( + TimeResultReceivedEvent(None, conn=self._con, + jid=stanza.getFrom(), + time_info=time_info)) + + def _extract_info(self, stanza): + time_ = stanza.getTag('time') + if not time_: + log.warning('No time node: %s', stanza) + return + + tzo = time_.getTag('tzo').getData() + if tzo.lower() == 'z': + tzo = '0:0' + try: + tzoh, tzom = tzo.split(':') + except Exception as e: + log.warning('Wrong tzo node: %s', stanza) + return + utc_time = time_.getTag('utc').getData() + + if utc_time[-1:] == 'Z': + # Remove the trailing 'Z' + utc_time = utc_time[:-1] + elif utc_time[-6:] == "+00:00": + # Remove the trailing "+00:00" + utc_time = utc_time[:-6] + else: + log.warning('Wrong timezone defintion: %s', utc_time) + return + + try: + t = datetime.datetime.strptime(utc_time, '%Y-%m-%dT%H:%M:%S') + except ValueError: + try: + t = datetime.datetime.strptime(utc_time, + '%Y-%m-%dT%H:%M:%S.%f') + except ValueError as e: + log.warning('Wrong time format: %s', e) + return + + t = t.replace(tzinfo=UTC()) + return t.astimezone(contact_tz(tzoh, tzom)).strftime('%c') + + def _answer_request(self, con, stanza): + log.info('%s asked for the time', stanza.getFrom()) + if app.config.get_per('accounts', self._account, 'send_time_info'): + iq = stanza.buildReply('result') + time_ = iq.setTag('time', namespace=nbxmpp.NS_TIME_REVISED) + formated_time = time.strftime('%Y-%m-%dT%H:%M:%SZ', time.gmtime()) + time_.setTagData('utc', formated_time) + isdst = time.localtime().tm_isdst + zone = -(time.timezone, time.altzone)[isdst] / 60.0 + tzo = (zone / 60, abs(zone % 60)) + time_.setTagData('tzo', '%+03d:%02d' % (tzo)) + log.info('Answer: %s %s', formated_time, '%+03d:%02d' % (tzo)) + else: + iq = stanza.buildReply('error') + err = nbxmpp.ErrorNode(nbxmpp.ERR_SERVICE_UNAVAILABLE) + iq.addChild(node=err) + log.info('Send service-unavailable') + self._con.connection.send(iq) + raise nbxmpp.NodeProcessed + + +class TimeResultReceivedEvent(NetworkIncomingEvent): + name = 'time-result-received' + base_network_events = [] + + def generate(self): + return True + + +class UTC(datetime.tzinfo): + def utcoffset(self, dt): + return ZERO + + def tzname(self, dt): + return "UTC" + + def dst(self, dt): + return ZERO + + +class contact_tz(datetime.tzinfo): + + def __init__(self, tzoh, tzom): + self._tzoh = tzoh + self._tzom = tzom + + def utcoffset(self, dt): + return datetime.timedelta(hours=int(self._tzoh), + minutes=int(self._tzom)) + + def tzname(self, dt): + return "remote timezone" + + def dst(self, dt): + return ZERO ===================================== gajim/common/modules/ping.py ===================================== --- /dev/null +++ b/gajim/common/modules/ping.py @@ -0,0 +1,122 @@ +# 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/>. + +# XEP-0199: XMPP Ping + +import logging +import time + +import nbxmpp + +from gajim.common import app +from gajim.common.nec import NetworkIncomingEvent + +log = logging.getLogger('gajim.c.m.ping') + + +class Ping: + def __init__(self, con): + self._con = con + self._account = con.name + self._alarm_time = None + + self.handlers = [ + ('iq', self._answer_request, 'get', nbxmpp.NS_PING), + ] + + def _get_ping_iq(self, to): + iq = nbxmpp.Iq('get', to=to) + iq.addChild(name='ping', namespace=nbxmpp.NS_PING) + return iq + + def send_keepalive_ping(self): + if not app.account_is_connected(self._account): + return + + to = app.config.get_per('accounts', self._account, 'hostname') + self._con.connection.SendAndCallForResponse(self._get_ping_iq(to), + self._keepalive_received) + + log.info('Send keepalive') + + seconds = app.config.get_per('accounts', self._account, + 'time_for_ping_alive_answer') + self._alarm_time = app.idlequeue.set_alarm(self._reconnect, seconds) + + def _keepalive_received(self, stanza): + log.info('Received keepalive') + app.idlequeue.remove_alarm(self._reconnect, self._alarm_time) + + def _reconnect(self): + if not app.config.get_per('accounts', self._account, 'active'): + # Account may have been disabled + return + + # We haven't got the pong in time, disco and reconnect + log.warning('No reply received for keepalive ping. Reconnecting...') + self._con.disconnectedReconnCB() + + def send_ping(self, contact): + if not app.account_is_connected(self._account): + return + + to = contact.get_full_jid() + iq = self._get_ping_iq(to) + + log.info('Send ping to %s', to) + + self._con.connection.SendAndCallForResponse( + iq, self._pong_received, {'ping_time': time.time(), + 'contact': contact}) + + app.nec.push_incoming_event( + PingSentEvent(None, conn=self._con, contact=contact)) + + def _pong_received(self, con, stanza, ping_time, contact): + if not nbxmpp.isResultNode(stanza): + log.info('Error: %s', stanza.getError()) + app.nec.push_incoming_event( + PingErrorEvent(None, conn=self._con, contact=contact)) + return + diff = round(time.time() - ping_time, 2) + log.info('Received pong from %s after %s seconds', + stanza.getFrom(), diff) + app.nec.push_incoming_event( + PingReplyEvent(None, conn=self._con, + contact=contact, + seconds=diff)) + + def _answer_request(self, con, stanza): + iq = stanza.buildReply('result') + q = iq.getTag('ping') + if q is not None: + iq.delChild(q) + self._con.connection.send(iq) + log.info('Send pong to %s', stanza.getFrom()) + raise nbxmpp.NodeProcessed + + +class PingSentEvent(NetworkIncomingEvent): + name = 'ping-sent' + base_network_events = [] + + +class PingReplyEvent(NetworkIncomingEvent): + name = 'ping-reply' + base_network_events = [] + + +class PingErrorEvent(NetworkIncomingEvent): + name = 'ping-error' + base_network_events = [] ===================================== gajim/common/modules/software_version.py ===================================== --- /dev/null +++ b/gajim/common/modules/software_version.py @@ -0,0 +1,106 @@ +# 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/>. + +# XEP-0092: Software Version + +import logging + +import nbxmpp + +from gajim.common import app +from gajim.common.helpers import get_os_info +from gajim.common.nec import NetworkIncomingEvent + +log = logging.getLogger('gajim.c.m.software_version') + + +class SoftwareVersion: + def __init__(self, con): + self._con = con + self._account = con.name + + self.handlers = [ + ('iq', self._answer_request, 'get', nbxmpp.NS_VERSION), + ] + + def request_os_info(self, jid, resource): + if not app.account_is_connected(self._account): + return + # If we are invisible, do not request + if self._con.connected == app.SHOW_LIST.index('invisible'): + return + + if resource: + jid += '/' + resource + iq = nbxmpp.Iq(to=jid, typ='get', queryNS=nbxmpp.NS_VERSION) + + log.info('Requested: %s', jid) + + self._con.connection.SendAndCallForResponse(iq, self._result_received) + + def _result_received(self, stanza): + client_info, os_info = None, None + if not nbxmpp.isResultNode(stanza): + log.info('Error: %s', stanza.getError()) + else: + try: + client_info, os_info = self._extract_info(stanza) + except Exception: + log.exception('Error') + log.error(stanza) + + log.info('Received: %s %s %s', + stanza.getFrom(), client_info, os_info) + + app.nec.push_incoming_event( + VersionResultReceivedEvent(None, conn=self._con, + jid=stanza.getFrom(), + client_info=client_info, + os_info=os_info)) + + def _extract_info(self, stanza): + query = stanza.getTag('query') + name = query.getTag('name').getData() + version = query.getTag('version').getData() + client_info = '%s %s' % (name, version) + os_info = query.getTag('os') + if os_info is not None: + os_info = os_info.getData() + return client_info, os_info + + def _answer_request(self, con, stanza): + log.info('%s asked for the software version', stanza.getFrom()) + if app.config.get_per('accounts', self._account, 'send_os_info'): + os_info = get_os_info() + iq = stanza.buildReply('result') + query = iq.getQuery() + query.setTagData('name', 'Gajim') + query.setTagData('version', app.version) + query.setTagData('os', os_info) + log.info('Answer: Gajim %s %s', app.version, os_info) + else: + iq = stanza.buildReply('error') + err = nbxmpp.ErrorNode(nbxmpp.ERR_SERVICE_UNAVAILABLE) + iq.addChild(node=err) + log.info('Send service-unavailable') + self._con.connection.send(iq) + raise nbxmpp.NodeProcessed + + +class VersionResultReceivedEvent(NetworkIncomingEvent): + name = 'version-result-received' + base_network_events = [] + + def generate(self): + return True ===================================== gajim/groupchat_control.py ===================================== --- a/gajim/groupchat_control.py +++ b/gajim/groupchat_control.py @@ -1572,14 +1572,18 @@ class GroupchatControl(ChatControlBase): obj.xhtml, self.session, msg_log_id=obj.msg_log_id, encrypted=obj.encrypted, displaymarking=obj.displaymarking) - def _nec_ping_reply(self, obj): - if obj.control: - if obj.control != self: - return - else: - if self.contact != obj.contact: - return - self.print_conversation(_('Pong! (%s s.)') % obj.seconds) + def _nec_ping(self, obj): + if self.contact.jid != obj.contact.room_jid: + return + + nick = obj.contact.get_shown_name() + if obj.name == 'ping-sent': + self.print_conversation(_('Ping? (%s)') % nick) + elif obj.name == 'ping-reply': + self.print_conversation( + _('Pong! (%s %s s.)') % (nick, obj.seconds)) + elif obj.name == 'ping-error': + self.print_conversation(_('Error.')) def got_connected(self): # Make autorejoin stop. ===================================== gajim/remote_control.py ===================================== --- a/gajim/remote_control.py +++ b/gajim/remote_control.py @@ -145,12 +145,15 @@ class Remote: obj.jid, obj.message, obj.keyID, chatstate])) def on_os_info(self, obj): - self.raise_signal('OsInfo', (obj.conn.name, [obj.jid, obj.resource, - obj.client_info, obj.os_info])) + self.raise_signal('OsInfo', (obj.conn.name, [obj.jid.getStripped(), + obj.getResource(), + obj.client_info, + obj.os_info])) def on_time(self, obj): - self.raise_signal('EntityTime', (obj.conn.name, [obj.jid, obj.resource, - obj.time_info])) + self.raise_signal('EntityTime', (obj.conn.name, [obj.jid.getStripped(), + obj.jid.getResource(), + obj.time_info])) def on_roster_info(self, obj): self.raise_signal('RosterInfo', (obj.conn.name, [obj.jid, obj.nickname, ===================================== gajim/server_info.py ===================================== --- a/gajim/server_info.py +++ b/gajim/server_info.py @@ -74,7 +74,8 @@ class ServerInfoDialog(Gtk.Dialog): self.version = '' self.uptime = '' self.hostname = app.get_hostname_from_account(account) - app.connections[account].request_os_info(self.hostname, None) + con = app.connections[account] + con.get_module('SoftwareVersion').request_os_info(self.hostname, None) self.request_last_activity() for feature in self.get_features(): ===================================== gajim/vcard.py ===================================== --- a/gajim/vcard.py +++ b/gajim/vcard.py @@ -276,15 +276,15 @@ class VcardWindow: if self.xml.get_object('information_notebook').get_n_pages() < 5: return if self.gc_contact: - if obj.fjid != self.contact.jid: + if obj.jid != self.contact.jid: return - elif app.get_jid_without_resource(obj.fjid) != self.contact.jid: + elif obj.jid.getStripped() != self.contact.jid: return i = 0 client = '' os = '' while i in self.os_info: - if self.os_info[i]['resource'] == obj.resource: + if self.os_info[i]['resource'] == obj.jid.getResource(): if obj.client_info: self.os_info[i]['client'] = obj.client_info else: @@ -315,14 +315,14 @@ class VcardWindow: if self.xml.get_object('information_notebook').get_n_pages() < 5: return if self.gc_contact: - if obj.fjid != self.contact.jid: + if obj.jid != self.contact.jid: return - elif app.get_jid_without_resource(obj.fjid) != self.contact.jid: + elif obj.jid.getStripped() != self.contact.jid: return i = 0 time_s = '' while i in self.time_info: - if self.time_info[i]['resource'] == obj.resource: + if self.time_info[i]['resource'] == obj.jid.getResource(): if obj.time_info: self.time_info[i]['time'] = obj.time_info else: @@ -415,6 +415,8 @@ class VcardWindow: if not self.contact.status: self.contact.status = '' + con = app.connections[self.account] + # do not wait for os_info if contact is not connected or has error # additional check for observer is needed, as show is offline for him if self.contact.show in ('offline', 'error')\ @@ -423,11 +425,11 @@ class VcardWindow: else: # Request os info if contact is connected if self.gc_contact: j, r = app.get_room_and_nick_from_fjid(self.real_jid) - GLib.idle_add(app.connections[self.account].request_os_info, - j, r, self.contact.jid) + GLib.idle_add(con.get_module('SoftwareVersion').request_os_info, + j, r) else: - GLib.idle_add(app.connections[self.account].request_os_info, - self.contact.jid, self.contact.resource) + GLib.idle_add(con.get_module('SoftwareVersion').request_os_info, + self.contact.jid, self.contact.resource) # do not wait for entity_time if contact is not connected or has error # additional check for observer is needed, as show is offline for him @@ -437,11 +439,11 @@ class VcardWindow: else: # Request entity time if contact is connected if self.gc_contact: j, r = app.get_room_and_nick_from_fjid(self.real_jid) - GLib.idle_add(app.connections[self.account].\ - request_entity_time, j, r, self.contact.jid) + GLib.idle_add(con.get_module('EntityTime').request_entity_time, + j, r) else: - GLib.idle_add(app.connections[self.account].\ - request_entity_time, self.contact.jid, self.contact.resource) + GLib.idle_add(con.get_module('EntityTime').request_entity_time, + self.contact.jid, self.contact.resource) self.os_info = {0: {'resource': self.real_resource, 'client': '', 'os': ''}} @@ -456,10 +458,10 @@ class VcardWindow: uf_resources += '\n' + c.resource + \ _(' resource with priority ') + str(c.priority) if c.show not in ('offline', 'error'): - GLib.idle_add(app.connections[self.account].\ - request_os_info, c.jid, c.resource) - GLib.idle_add(app.connections[self.account].\ - request_entity_time, c.jid, c.resource) + GLib.idle_add(con.get_module('SoftwareVersion').request_os_info, + c.jid, c.resource) + GLib.idle_add(con.get_module('EntityTime').request_entity_time, + c.jid, c.resource) self.os_info[i] = {'resource': c.resource, 'client': '', 'os': ''} self.time_info[i] = {'resource': c.resource, 'time': ''} @@ -472,7 +474,6 @@ class VcardWindow: self.fill_status_label() - con = app.connections[self.account] if self.gc_contact: con.request_vcard(self._nec_vcard_received, self.gc_contact.get_full_jid(), room=True) View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/10e1e1fe14281efac318ab858af994595… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/10e1e1fe14281efac318ab858af994595… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Replace progress bars in ad-hoc commands window with spinners
by Philipp Hörist 24 Jun '18

24 Jun '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 10e1e1fe by Alexander Krotov at 2018-06-24T02:45:01+03:00 Replace progress bars in ad-hoc commands window with spinners Progress bar "pulse" method indicates that something has been done. For example, when indexing files, it can indicate that one file has been processed, but the number of files to process is unknown. In case of ad-hoc commands, there is only an indication that Gajim is waiting for the network, so spinner is more appropriate here. - - - - - 2 changed files: - gajim/adhoc_commands.py - gajim/data/gui/adhoc_commands_window.ui Changes: ===================================== gajim/adhoc_commands.py ===================================== --- a/gajim/adhoc_commands.py +++ b/gajim/adhoc_commands.py @@ -74,9 +74,10 @@ class CommandWindow: self.on_adhoc_commands_window_delete_event) for name in ('restart_button', 'back_button', 'forward_button', 'execute_button', 'finish_button', 'close_button', 'stages_notebook', - 'retrieving_commands_stage_vbox', 'command_list_stage_vbox', - 'command_treeview', 'sending_form_stage_vbox', - 'sending_form_progressbar', 'notes_label', 'no_commands_stage_vbox', + 'retrieving_commands_stage_vbox', 'retrieving_commands_spinner', + 'command_list_stage_vbox', 'command_treeview', + 'sending_form_stage_vbox', 'sending_form_spinner', + 'notes_label', 'no_commands_stage_vbox', 'error_stage_vbox', 'error_description_label'): setattr(self, name, self.xml.get_object(name)) @@ -90,7 +91,6 @@ class CommandWindow: def initiate(self): - self.pulse_id = None # to satisfy self.setup_pulsing() self.commandlist = None # a list of (commandname, commanddescription) # command's data @@ -158,7 +158,7 @@ class CommandWindow: def on_adhoc_commands_window_destroy(self, *anything): # TODO: do all actions that are needed to remove this object from memory - self.remove_pulsing() + pass def on_adhoc_commands_window_delete_event(self, *anything): if self.stage_window_delete_cb: @@ -191,8 +191,7 @@ class CommandWindow: # request command list self.request_command_list() - self.setup_pulsing( - self.xml.get_object('retrieving_commands_progressbar')) + self.retrieving_commands_spinner.start() # setup the callbacks self.stage_finish_cb = self.stage1_finish @@ -202,7 +201,7 @@ class CommandWindow: self.stage1_adhoc_commands_window_delete_event def stage1_finish(self): - self.remove_pulsing() + self.retrieving_commands_spinner.stop() def stage1_close_button_clicked(self, widget): # cancelling in this stage is not critical, so we don't @@ -371,8 +370,7 @@ class CommandWindow: self.execute_button.set_sensitive(False) self.finish_button.set_sensitive(False) - self.sending_form_progressbar.show() - self.setup_pulsing(self.sending_form_progressbar) + self.sending_form_spinner.start() self.send_command(action) def stage3_next_form(self, command): @@ -380,8 +378,7 @@ class CommandWindow: self.stage5(error=_('Service sent malformed data'), senderror=True) return - self.remove_pulsing() - self.sending_form_progressbar.hide() + self.sending_form_spinner.stop() if not self.sessionid: self.sessionid = command.getAttr('sessionid') @@ -530,30 +527,6 @@ class CommandWindow: def stage5_restart_button_clicked(self, widget): self.restart() -# helpers to handle pulsing in progressbar - def setup_pulsing(self, progressbar): - """ - Set the progressbar to pulse. Makes a custom function to repeatedly call - progressbar.pulse() method - """ - assert not self.pulse_id - assert isinstance(progressbar, Gtk.ProgressBar) - - def callback(): - progressbar.pulse() - return True # important to keep callback be called back! - - # 12 times per second (80 milliseconds) - self.pulse_id = GLib.timeout_add(80, callback) - - def remove_pulsing(self): - """ - Stop pulsing, useful when especially when removing widget - """ - if self.pulse_id: - GLib.source_remove(self.pulse_id) - self.pulse_id = None - # handling xml stanzas def request_command_list(self): """ ===================================== gajim/data/gui/adhoc_commands_window.ui ===================================== --- a/gajim/data/gui/adhoc_commands_window.ui +++ b/gajim/data/gui/adhoc_commands_window.ui @@ -41,14 +41,15 @@ </packing> </child> <child> - <object class="GtkProgressBar" id="retrieving_commands_progressbar"> + <object class="GtkSpinner" id="retrieving_commands_spinner"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="pulse_step">0.050000000745099998</property> + <property name="halign">center</property> + <property name="valign">center</property> </object> <packing> - <property name="expand">False</property> - <property name="fill">False</property> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> @@ -153,16 +154,15 @@ </packing> </child> <child> - <object class="GtkProgressBar" id="sending_form_progressbar"> + <object class="GtkSpinner" id="sending_form_spinner"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="pulse_step">0.050000000745099998</property> - <property name="text" translatable="yes">Please wait...</property> + <property name="halign">center</property> + <property name="valign">center</property> </object> <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="pack_type">end</property> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/10e1e1fe14281efac318ab858af9945954… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/10e1e1fe14281efac318ab858af9945954… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Send cancel IQ if muc configuration is aborted
by Philipp Hörist 23 Jun '18

23 Jun '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: fd137be3 by Philipp Hörist at 2018-06-23T23:36:26+02:00 Send cancel IQ if muc configuration is aborted Fixes #9069 - - - - - 2 changed files: - gajim/common/connection.py - gajim/config.py Changes: ===================================== gajim/common/connection.py ===================================== --- a/gajim/common/connection.py +++ b/gajim/common/connection.py @@ -2720,6 +2720,17 @@ class Connection(CommonConnection, ConnectionHandlers): self.add_lang(iq) self.connection.send(iq) + def cancel_gc_config(self, room_jid): + if not app.account_is_connected(self.name): + return + cancel = nbxmpp.Node(tag='x', attrs={'xmlns': nbxmpp.NS_DATA, + 'type': 'cancel'}) + iq = nbxmpp.Iq(typ='set', + queryNS=nbxmpp.NS_MUC_OWNER, + payload=cancel, + to=room_jid) + self.connection.send(iq) + def destroy_gc_room(self, room_jid, reason = '', jid = ''): if not app.account_is_connected(self.name): return ===================================== gajim/config.py ===================================== --- a/gajim/config.py +++ b/gajim/config.py @@ -1642,9 +1642,12 @@ class GroupchatConfigWindow: affiliation) self.xml.connect_signals(self) + self.window.connect('delete-event', self.on_cancel_button_clicked) self.window.show_all() - def on_cancel_button_clicked(self, widget): + def on_cancel_button_clicked(self, *args): + if self.form: + app.connections[self.account].cancel_gc_config(self.room_jid) self.window.destroy() def on_cell_edited(self, cell, path, new_text): View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/fd137be30ff3dff9097b3ee3b7e557a716… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/fd137be30ff3dff9097b3ee3b7e557a716… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix joining rooms with upper cases
by Philipp Hörist 23 Jun '18

23 Jun '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: a30a61e5 by Philipp Hörist at 2018-06-23T22:33:03+02:00 Fix joining rooms with upper cases Fixes #9198 - - - - - 1 changed file: - gajim/dialogs.py Changes: ===================================== gajim/dialogs.py ===================================== --- a/gajim/dialogs.py +++ b/gajim/dialogs.py @@ -2460,6 +2460,8 @@ class JoinGroupchatWindow(Gtk.ApplicationWindow): return self.room_jid = '%s@%s' % (room, server) + self.room_jid = self.room_jid.lower() + if app.in_groupchat(account, self.room_jid): # If we already in the groupchat, join_gc_room will bring # it to front View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/a30a61e5ffda0c4bd89048b136aee29838… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/a30a61e5ffda0c4bd89048b136aee29838… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Add loading single builder objects on Windows
by Philipp Hörist 23 Jun '18

23 Jun '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 9b07cf8d by Philipp Hörist at 2018-06-23T20:35:16+02:00 Add loading single builder objects on Windows This was still missing from the Windows translation fix - - - - - 1 changed file: - gajim/gtkgui_helpers.py Changes: ===================================== gajim/gtkgui_helpers.py ===================================== --- a/gajim/gtkgui_helpers.py +++ b/gajim/gtkgui_helpers.py @@ -142,6 +142,10 @@ def _translate(gui_file, widget): xml_text = ET.tostring(tree.getroot(), encoding='unicode', method='xml') + if widget is not None: + builder = Gtk.Builder() + builder.add_objects_from_string(xml_text, [widget]) + return builder return Gtk.Builder.new_from_string(xml_text, -1) else: if widget is not None: View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/9b07cf8d41044b3b05ef799a9e8989195d… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/9b07cf8d41044b3b05ef799a9e8989195d… 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 June 2018