Commits December 2018

commits@gajim.org

1 participants
81 discussions

[Git][gajim/gajim][gajim_1.1] Revert "AccountsWindow: Fix back button"
by Philipp Hörist 22 Dec '18

22 Dec '18

Philipp Hörist pushed to branch gajim_1.1 at gajim / gajim Commits: fd60c2fc by Philipp Hörist at 2018-12-22T23:33:23Z Revert "AccountsWindow: Fix back button" This reverts commit 108b087858f5dbb4217b212dfc40b5081cc5c395 - - - - - 1 changed file: - gajim/gtk/accounts.py Changes: ===================================== gajim/gtk/accounts.py ===================================== @@ -82,10 +82,6 @@ class AccountsWindow(Gtk.ApplicationWindow): app.ged.register_event_handler( 'our-show', ged.GUI2, self._nec_our_status) - @property - def stack(self): - return self._ui.stack - def _nec_our_status(self, event): self.update_accounts() View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/fd60c2fcf75885f2be40a33f9f5209c5b8… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/fd60c2fcf75885f2be40a33f9f5209c5b8… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim] Pushed new tag gajim-1.1.1
by Philipp Hörist 22 Dec '18

22 Dec '18

Philipp Hörist pushed new tag gajim-1.1.1 at gajim / gajim -- View it on GitLab: https://dev.gajim.org/gajim/gajim/tree/gajim-1.1.1 You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Windows: Fix build
by Philipp Hörist 22 Dec '18

22 Dec '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: b548b90a by Philipp Hörist at 2018-12-22T13:21:25Z Windows: Fix build nbxmpp now requires precis-i18n - - - - - 1 changed file: - win/_base.sh Changes: ===================================== win/_base.sh ===================================== @@ -93,6 +93,7 @@ function install_deps { mingw-w64-"${ARCH}"-"${PYTHON_ID}"-six PIP_REQUIREMENTS="\ +precis-i18n git+https://dev.gajim.org/gajim/python-nbxmpp.git git+https://dev.gajim.org/lovetox/pybonjour-python3.git git+https://github.com/enthought/pywin32-ctypes.git @@ -101,7 +102,6 @@ python-gnupg python-axolotl qrcode cssutils -precis-i18n " build_pip install $(echo "$PIP_REQUIREMENTS" | tr ["\\n"] [" "]) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/b548b90a6c7ee5e4421b98cb42fe727983… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/b548b90a6c7ee5e4421b98cb42fe727983… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.1] Raise version to 1.1.1
by Philipp Hörist 22 Dec '18

22 Dec '18

Philipp Hörist pushed to branch gajim_1.1 at gajim / gajim Commits: 1be5a07b by Philipp Hörist at 2018-12-22T13:14:49Z Raise version to 1.1.1 - - - - - 3 changed files: - appveyor.yml - data/org.gajim.Gajim.appdata.xml.in - gajim/__init__.py Changes: ===================================== appveyor.yml ===================================== @@ -32,8 +32,8 @@ build_script: bash "git clone C:/projects/gajim C:/msys64/home/appveyor/gajim" bash "C:/msys64/home/appveyor/gajim/win/build.sh $($env:MSYS_ARCH)" - Push-AppveyorArtifact "$($env:BUILDROOT)/Gajim.exe" -FileName "Gajim-1.1.0-$($env:ARCH)-$($env:TIME_STRING).exe" - Push-AppveyorArtifact "$($env:BUILDROOT)/Gajim-Portable.exe" -FileName "Gajim-Portable-1.1.0-$($env:ARCH)-$($env:TIME_STRING).exe" + Push-AppveyorArtifact "$($env:BUILDROOT)/Gajim.exe" -FileName "Gajim-1.1.1-$($env:ARCH)-$($env:TIME_STRING).exe" + Push-AppveyorArtifact "$($env:BUILDROOT)/Gajim-Portable.exe" -FileName "Gajim-Portable-1.1.1-$($env:ARCH)-$($env:TIME_STRING).exe" # on_finish: # - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1')) ===================================== data/org.gajim.Gajim.appdata.xml.in ===================================== @@ -101,6 +101,7 @@ <content_attribute id="money-gambling">none</content_attribute> </content_rating> <releases> + <release version="1.1.1" date="2018-12-23" /> <release version="1.1.0" date="2018-11-06" /> <release version="1.0.3" date="2018-05-20" /> <release version="1.0.2" date="2018-04-30" /> ===================================== gajim/__init__.py ===================================== @@ -1,7 +1,7 @@ import os import subprocess -__version__ = "1.1.0" +__version__ = "1.1.1" IS_FLATPAK = False if os.path.exists('/app/share/run-as-flatpak'): View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/1be5a07b1689426b7c909b3003c42710da… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/1be5a07b1689426b7c909b3003c42710da… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.1] Update ChangeLog
by Philipp Hörist 22 Dec '18

22 Dec '18

Philipp Hörist pushed to branch gajim_1.1 at gajim / gajim Commits: cf22b17d by Philipp Hörist at 2018-12-22T13:09:08Z Update ChangeLog - - - - - 1 changed file: - ChangeLog Changes: ===================================== ChangeLog ===================================== @@ -1,4 +1,4 @@ -Gajim 1.1.1 (19 December 2018) +Gajim 1.1.1 (23 December 2018) Bug fixes @@ -8,6 +8,8 @@ Gajim 1.1.1 (19 December 2018) * 9453 Fix opening links inside the group chat subject (MacOS/Windows) * 9465 Allow the full range of possible nicknames in group chats * 9067 Gajim crashes when receiving xhtml messages + * 9096 Error when clicking on a subscription notification + * 9446 Chatstate error in MUC conversation * 9471 Conversation Textview: Error on key press * 9472 Handle presences without from attr correctly * 9473 Error when creating a new group chat View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/cf22b17de3b26de05ed335a5e449e380cf… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/cf22b17de3b26de05ed335a5e449e380cf… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.1] 3 commits: Add more log output when calling handlers
by Philipp Hörist 22 Dec '18

22 Dec '18

Philipp Hörist pushed to branch gajim_1.1 at gajim / gajim Commits: 6ed2094b by Philipp Hörist at 2018-12-22T12:53:33Z Add more log output when calling handlers - - - - - f93797e2 by Philipp Hörist at 2018-12-22T12:53:50Z Send active instead of gone as last chatstate - Also attempt to fix #9446 - - - - - 29eea2f1 by Philipp Hörist at 2018-12-22T12:54:22Z Check if event was not consumed Fixes #9096 - - - - - 3 changed files: - gajim/common/ged.py - gajim/common/modules/chatstates.py - gajim/gui_interface.py Changes: ===================================== gajim/common/ged.py ===================================== @@ -24,6 +24,7 @@ Global Events Dispatcher module. import logging import traceback +import inspect from nbxmpp import NodeProcessed @@ -84,13 +85,19 @@ class GlobalEventsDispatcher: Error: %s''', handler, priority, event_name, error) def raise_event(self, event_name, *args, **kwargs): - log.debug('%s Args: %s', event_name, str(args)) + log.debug('Raise event: %s', event_name) if event_name in self.handlers: node_processed = False # Iterate over a copy of the handlers list, so while iterating # the original handlers list can be modified for _priority, handler in list(self.handlers[event_name]): try: + if inspect.ismethod(handler): + log.debug('Call handler %s on %s', + handler.__name__, + handler.__self__) + else: + log.debug('Call handler %s', handler.__name__) if handler(*args, **kwargs): return True except NodeProcessed: ===================================== gajim/common/modules/chatstates.py ===================================== @@ -171,6 +171,11 @@ class Chatstate: if contact is not None: contact = contact.as_contact() else: + # Contact not found, maybe we left the group chat + # or the contact was removed from the roster + log.info( + 'Contact %s not found, reset chatstate', jid) + self._chatstates.pop(jid, None) self._last_mouse_activity.pop(jid, None) self._last_keyboard_activity.pop(jid, None) continue @@ -206,14 +211,21 @@ class Chatstate: current_state = self._chatstates.get(contact.jid) setting = app.config.get('outgoing_chat_state_notifications') if setting == 'disabled': - # Send a last 'gone' state after user disabled chatstates + # Send a last 'active' state after user disabled chatstates if current_state is not None: - log.info('Send: %-10s - %s', State.GONE, contact.jid) - app.nec.push_outgoing_event( - MessageOutgoingEvent(None, - account=self._account, - jid=contact.jid, - chatstate=str(State.GONE))) + log.info('Send: %-10s - %s', State.ACTIVE, contact.jid) + + event_attrs = {'account': self._account, + 'jid': contact.jid, + 'chatstate': str(State.ACTIVE)} + + if contact.is_groupchat(): + app.nec.push_outgoing_event( + GcMessageOutgoingEvent(None, **event_attrs)) + else: + app.nec.push_outgoing_event( + MessageOutgoingEvent(None, **event_attrs)) + self._chatstates.pop(contact.jid, None) self._last_mouse_activity.pop(contact.jid, None) self._last_keyboard_activity.pop(contact.jid, None) ===================================== gajim/gui_interface.py ===================================== @@ -1694,18 +1694,24 @@ class Interface: self.roster.open_event(account, fjid, event) elif type_ == 'gc-invitation': event = app.events.get_first_event(account, jid, type_) + if event is None: + return dialogs.InvitationReceivedDialog(account, event.room_jid, jid, event.password, event.reason, event.is_continued) app.events.remove_events(account, jid, event) self.roster.draw_contact(jid, account) elif type_ == 'subscription_request': event = app.events.get_first_event(account, jid, type_) + if event is None: + return dialogs.SubscriptionRequestWindow(jid, event.text, account, event.nick) app.events.remove_events(account, jid, event) self.roster.draw_contact(jid, account) elif type_ == 'unsubscribed': event = app.events.get_first_event(account, jid, type_) + if event is None: + return self.show_unsubscribed_dialog(account, event.contact) app.events.remove_events(account, jid, event) self.roster.draw_contact(jid, account) View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/436eb2dfb0bda16302c87607ad4b702f7… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/436eb2dfb0bda16302c87607ad4b702f7… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] 2 commits: Add more property parsing
by Philipp Hörist 21 Dec '18

21 Dec '18

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 5f8368e5 by Philipp Hörist at 2018-12-21T22:33:14Z Add more property parsing - Add (XEP-0172) module - Add (XEP-0045) module - Add a BasePresence module which parses standard presence propertys - - - - - 8a87c2be by Philipp Hörist at 2018-12-21T23:34:08Z Simplify properties struct - - - - - 6 changed files: - nbxmpp/dispatcher_nb.py - + nbxmpp/modules/muc.py - + nbxmpp/modules/nickname.py - + nbxmpp/modules/presence.py - nbxmpp/protocol.py - nbxmpp/util.py Changes: ===================================== nbxmpp/dispatcher_nb.py ===================================== @@ -43,8 +43,11 @@ from nbxmpp.protocol import Error from nbxmpp.protocol import ERR_FEATURE_NOT_IMPLEMENTED from nbxmpp.modules.eme import EME from nbxmpp.modules.http_auth import HTTPAuth +from nbxmpp.modules.presence import BasePresence +from nbxmpp.modules.nickname import Nickname +from nbxmpp.modules.muc import MUC from nbxmpp.misc import unwrap_carbon -from nbxmpp.util import get_property_dict +from nbxmpp.util import get_properties_struct log = logging.getLogger('nbxmpp.dispatcher_nb') @@ -148,8 +151,11 @@ class XMPPDispatcher(PlugIn): self.handlers = handlers def _register_modules(self): + self._modules['BasePresence'] = BasePresence(self._owner) self._modules['EME'] = EME(self._owner) self._modules['HTTPAuth'] = HTTPAuth(self._owner) + self._modules['Nickname'] = Nickname(self._owner) + self._modules['MUC'] = MUC(self._owner) for instance in self._modules.values(): for handler in instance.handlers: @@ -477,7 +483,7 @@ class XMPPDispatcher(PlugIn): # Convert simplexml to Protocol object stanza = self.handlers[xmlns][name]['type'](node=stanza) - properties = get_property_dict(name) + properties = get_properties_struct(name) if name == 'message': # https://tools.ietf.org/html/rfc6120#section-8.1.1.1 # If the stanza does not include a 'to' address then the client MUST ===================================== nbxmpp/modules/muc.py ===================================== @@ -0,0 +1,51 @@ +# Copyright (C) 2018 Philipp Hörist <philipp AT hoerist.com> +# +# This file is part of nbxmpp. +# +# This program 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; either version 3 +# of the License, or (at your option) any later version. +# +# This program 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 this program; If not, see <http://www.gnu.org/licenses/>. + +import logging + +from nbxmpp.protocol import NS_MUC_USER +from nbxmpp.protocol import NS_MUC +from nbxmpp.util import StanzaHandler + +log = logging.getLogger('nbxmpp.m.presence') + + +class MUC: + def __init__(self, client): + self._client = client + self.handlers = [ + StanzaHandler(name='presence', + callback=self._process_muc_presence, + ns=NS_MUC, + priority=11), + StanzaHandler(name='presence', + callback=self._process_muc_user_presence, + ns=NS_MUC_USER, + priority=11), + ] + + def _process_muc_presence(self, _con, stanza, properties): + muc = stanza.getTag('x', namespace=NS_MUC) + if muc is None: + return + properties.from_muc = True + + def _process_muc_user_presence(self, _con, stanza, properties): + muc = stanza.getTag('x', namespace=NS_MUC_USER) + if muc is None: + return + properties.from_muc = True ===================================== nbxmpp/modules/nickname.py ===================================== @@ -0,0 +1,57 @@ +# Copyright (C) 2018 Philipp Hörist <philipp AT hoerist.com> +# +# This file is part of nbxmpp. +# +# This program 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; either version 3 +# of the License, or (at your option) any later version. +# +# This program 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 this program; If not, see <http://www.gnu.org/licenses/>. + +import logging + +from nbxmpp.protocol import NS_NICK +from nbxmpp.util import StanzaHandler + +log = logging.getLogger('nbxmpp.m.nickname') + + +class Nickname: + def __init__(self, client): + self._client = client + self.handlers = [ + StanzaHandler(name='message', + callback=self._process_nickname, + ns=NS_NICK, + priority=40), + StanzaHandler(name='presence', + callback=self._process_nickname, + ns=NS_NICK, + priority=40), + ] + + def _process_nickname(self, _con, stanza, properties): + if stanza.getName() == 'message': + properties.nickname = self._parse_nickname(stanza) + + elif stanza.getName() == 'presence': + # the nickname MUST NOT be included in presence broadcasts + # (i.e., <presence/> stanzas with no 'type' attribute or + # of type "unavailable"). + if properties.type in (None, 'unavailable'): + return + properties.nickname = self._parse_nickname(stanza) + + @staticmethod + def _parse_nickname(stanza): + nickname = stanza.getTagData('nick', namespace=NS_NICK) + if not nickname: + return + return nickname ===================================== nbxmpp/modules/presence.py ===================================== @@ -0,0 +1,91 @@ +# Copyright (C) 2018 Philipp Hörist <philipp AT hoerist.com> +# +# This file is part of nbxmpp. +# +# This program 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; either version 3 +# of the License, or (at your option) any later version. +# +# This program 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 this program; If not, see <http://www.gnu.org/licenses/>. + +import logging + +from nbxmpp.protocol import Error +from nbxmpp.protocol import ERR_BAD_REQUEST +from nbxmpp.protocol import NodeProcessed +from nbxmpp.protocol import presence_types +from nbxmpp.util import StanzaHandler + +log = logging.getLogger('nbxmpp.m.presence') + + +class BasePresence: + def __init__(self, client): + self._client = client + self.handlers = [ + StanzaHandler(name='presence', + callback=self._process_presence_base, + priority=10), + ] + + def _process_presence_base(self, _con, stanza, properties): + properties.type = self._parse_type(stanza) + properties.priority = self._parse_priority(stanza) + properties.show = self._parse_show(stanza) + properties.jid = stanza.getFrom() + properties.id = stanza.getID() + properties.status = stanza.getStatus() + + if properties.type == 'error': + properties.error_code = stanza.getErrorCode() + properties.error_message = stanza.getErrorMsg() + + own_jid = self._client.get_bound_jid() + if own_jid == stanza.getFrom(): + properties.self_presence = True + + @staticmethod + def _parse_priority(stanza): + priority = stanza.getPriority() + if priority is None: + return 0 + + try: + priority = int(priority) + except Exception: + log.warning('Invalid priority value: %s', priority) + log.warning(stanza) + return 0 + + if priority not in range(-128, 127): + log.warning('Invalid priority value: %s', priority) + log.warning(stanza) + return 0 + + return priority + + def _parse_type(self, stanza): + type_ = stanza.getType() + if type_ is None: + return + + if type_ not in presence_types: + log.warning('Presence with invalid type received') + log.warning(stanza) + self._client.send(Error(stanza, ERR_BAD_REQUEST)) + raise NodeProcessed + return type_ + + @staticmethod + def _parse_show(stanza): + show = stanza.getShow() + if show not in ('chat', 'away', 'xa', 'dnd'): + return + return show ===================================== nbxmpp/protocol.py ===================================== @@ -496,6 +496,16 @@ _status_conditions = { 'removed-shutdown': 332, } +presence_types = [ + 'error', + 'probe', + 'subscribe', + 'subscribed', + 'unavailable', + 'unsubscribe', + 'unsubscribed' +] + STREAM_NOT_AUTHORIZED = 'urn:ietf:params:xml:ns:xmpp-streams not-authorized' STREAM_REMOTE_CONNECTION_FAILED = 'urn:ietf:params:xml:ns:xmpp-streams remote-connection-failed' SASL_MECHANISM_TOO_WEAK = 'urn:ietf:params:xml:ns:xmpp-sasl mechanism-too-weak' ===================================== nbxmpp/util.py ===================================== @@ -50,50 +50,55 @@ def b64encode(data, return_type=str): return result.decode() -class PropertyBase: - def __init__(self): - self._data = {} - - def __getattr__(self, key): - return self._data[key] +class Properties: + pass - def __setattr__(self, key, value): - if '_data' in key: - super().__setattr__(key, value) - else: - self._data[key] = value - -class MessagePropertyDict(PropertyBase): +class MessageProperties: def __init__(self): - self._data = { - 'carbon_type': None, - 'eme': None, - 'http_auth': None, - } + self.carbon_type = None + self.eme = None + self.http_auth = None + self.nickname = None @property def is_http_auth(self): - return self._data['http_auth'] is not None + return self.http_auth is not None -class IqPropertyDict(PropertyBase): +class IqProperties: def __init__(self): - self._data = { - 'http_auth': None, - } + self.http_auth = None @property def is_http_auth(self): - return self._data['http_auth'] is not None + return self.http_auth is not None -def get_property_dict(name): +class PresenceProperties: + def __init__(self): + self.type = None + self.priority = None + self.show = None + self.jid = None + self.resource = None + self.id = None + self.nickname = None + self.self_presence = False + self.from_muc = False + self.status = '' + self.error_message = '' + self.error_code = '' + + +def get_properties_struct(name): if name == 'message': - return MessagePropertyDict() + return MessageProperties() if name == 'iq': - return IqPropertyDict() - return PropertyBase() + return IqProperties() + if name == 'presence': + return PresenceProperties() + return Properties() def validate_jid(jid_string): View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/987a239f019d0bc9bc6c65dda… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/987a239f019d0bc9bc6c65dda… 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 21 Dec '18

21 Dec '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 43f210bb by Philipp Hörist at 2018-12-21T18:33:34Z Remove unused code - - - - - 94479dd7 by Philipp Hörist at 2018-12-21T22:13:34Z Check if event was not consumed Fixes #9096 - - - - - 2 changed files: - gajim/common/connection_handlers.py - gajim/gui_interface.py Changes: ===================================== gajim/common/connection_handlers.py ===================================== @@ -448,11 +448,6 @@ class ConnectionHandlers(ConnectionSocks5Bytestream, agent=jid)) del self.awaiting_answers[id_] - def _dispatch_gc_msg_with_captcha(self, stanza, msg_obj): - msg_obj.stanza = stanza - app.nec.push_incoming_event(GcMessageReceivedEvent(None, - conn=self, msg_obj=msg_obj)) - def _nec_agent_removed(self, obj): if obj.conn.name != self.name: return ===================================== gajim/gui_interface.py ===================================== @@ -1619,18 +1619,24 @@ class Interface: self.roster.open_event(account, fjid, event) elif type_ == 'gc-invitation': event = app.events.get_first_event(account, jid, type_) + if event is None: + return dialogs.InvitationReceivedDialog(account, event.room_jid, jid, event.password, event.reason, event.is_continued) app.events.remove_events(account, jid, event) self.roster.draw_contact(jid, account) elif type_ == 'subscription_request': event = app.events.get_first_event(account, jid, type_) + if event is None: + return dialogs.SubscriptionRequestWindow(jid, event.text, account, event.nick) app.events.remove_events(account, jid, event) self.roster.draw_contact(jid, account) elif type_ == 'unsubscribed': event = app.events.get_first_event(account, jid, type_) + if event is None: + return self.show_unsubscribed_dialog(account, event.contact) app.events.remove_events(account, jid, event) self.roster.draw_contact(jid, account) View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/0e6011c0886ada7d46a467adc5fce39c4… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/0e6011c0886ada7d46a467adc5fce39c4… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: Remove unused code
by Philipp Hörist 21 Dec '18

21 Dec '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 40fc7271 by Philipp Hörist at 2018-12-21T13:13:08Z Remove unused code - - - - - 4503f466 by Philipp Hörist at 2018-12-21T17:36:09Z Simplify gc-message-received event - - - - - 0e6011c0 by Philipp Hörist at 2018-12-21T18:10:18Z Ignore bookmark updates from other jids Because we use +notify to subscribe to the bookmarks node, we get notifications from contacts that have an open access bookmarks node - - - - - 3 changed files: - gajim/common/connection_handlers_events.py - gajim/common/modules/bookmarks.py - gajim/common/modules/message.py Changes: ===================================== gajim/common/connection_handlers_events.py ===================================== @@ -369,59 +369,6 @@ class GcPresenceReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): class OurShowEvent(nec.NetworkIncomingEvent): name = 'our-show' -class GcMessageReceivedEvent(nec.NetworkIncomingEvent): - name = 'gc-message-received' - - def generate(self): - self.stanza = self.msg_obj.stanza - if not hasattr(self.msg_obj, 'additional_data'): - self.additional_data = AdditionalDataDict() - else: - self.additional_data = self.msg_obj.additional_data - self.id_ = self.msg_obj.stanza.getID() - self.unique_id = self.msg_obj.unique_id - self.fjid = self.msg_obj.fjid - self.msgtxt = self.msg_obj.msgtxt - self.jid = self.msg_obj.jid - self.room_jid = self.msg_obj.jid - self.nickname = self.msg_obj.resource - self.timestamp = self.msg_obj.timestamp - self.xhtml_msgtxt = self.stanza.getXHTML() - self.encrypted = self.msg_obj.encrypted - self.correct_id = None # XEP-0308 - self.delayed = self.msg_obj.delayed - - if app.config.get('ignore_incoming_xhtml'): - self.xhtml_msgtxt = None - - if self.msg_obj.resource: - # message from someone - self.nick = self.msg_obj.resource - else: - # message from server - self.nick = '' - - if not self.stanza.getTag('body'): # no <body> - return - - from gajim.common.modules.security_labels import parse_securitylabel - self.displaymarking = parse_securitylabel(self.stanza) - - from gajim.common.modules.misc import parse_correction - self.correct_id = parse_correction(self.stanza) - - return True - -class GcConfigChangedReceivedEvent(nec.NetworkIncomingEvent): - name = 'gc-config-changed-received' - - def generate(self): - self.conn = self.msg_event.conn - self.stanza = self.msg_event.stanza - self.room_jid = self.msg_event.room_jid - self.status_code = self.msg_event.status_code - return True - class MessageSentEvent(nec.NetworkIncomingEvent): name = 'message-sent' @@ -942,14 +889,14 @@ class NotificationEvent(nec.NetworkIncomingEvent): self.do_sound = True def handle_incoming_gc_msg_event(self, msg_obj): - if not msg_obj.msg_obj.gc_control: + if not msg_obj.gc_control: # we got a message from a room we're not in? ignore it return self.jid = msg_obj.jid - sound = msg_obj.msg_obj.gc_control.highlighting_for_message( + sound = msg_obj.gc_control.highlighting_for_message( msg_obj.msgtxt, msg_obj.timestamp)[1] - if msg_obj.nickname != msg_obj.msg_obj.gc_control.nick: + if msg_obj.nickname != msg_obj.gc_control.nick: self.do_sound = True if sound == 'received': self.sound_event = 'muc_message_received' @@ -997,7 +944,7 @@ class NotificationEvent(nec.NetworkIncomingEvent): self.popup_title = i18n.ngettext( 'New message from %(nickname)s', '%(n_msgs)i unread messages in %(groupchat_name)s', - count) % {'nickname': self.base_event.nick, + count) % {'nickname': msg_obj.nick, 'n_msgs': count, 'groupchat_name': contact.get_shown_name()} ===================================== gajim/common/modules/bookmarks.py ===================================== @@ -80,6 +80,10 @@ class Bookmarks(AbstractPEPModule): log.info('Ignore update, pubsub request in progress') return + if not self._con.get_own_jid().bareMatch(jid): + log.warning('%s has an open access bookmarks node', jid) + return + if not self._pubsub_support() or not self.conversion: return ===================================== gajim/common/modules/message.py ===================================== @@ -36,7 +36,6 @@ from gajim.common.modules.misc import parse_oob from gajim.common.modules.misc import parse_xhtml from gajim.common.modules.util import is_self_message from gajim.common.modules.util import is_muc_pm -from gajim.common.connection_handlers_events import GcMessageReceivedEvent log = logging.getLogger('gajim.c.m.message') @@ -278,11 +277,16 @@ class Message: return if groupchat: - app.nec.push_incoming_event(GcMessageReceivedEvent( - None, - conn=self._con, - msg_obj=event, - stanza_id=event.stanza_id)) + if not event.msgtxt: + return + + event.room_jid = event.jid + event.nickname = event.resource + event.xhtml_msgtxt = event.xhtml + event.nick = event.resource or '' + + app.nec.push_incoming_event(NetworkEvent('gc-message-received', + **vars(event))) return app.nec.push_incoming_event( View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/85e79e7b279843d945230714f881f2fad… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/85e79e7b279843d945230714f881f2fad… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Update setup.py
by Philipp Hörist 21 Dec '18

21 Dec '18

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 987a239f by Philipp Hörist at 2018-12-21T12:32:32Z Update setup.py - - - - - 1 changed file: - setup.py Changes: ===================================== setup.py ===================================== @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from setuptools import setup View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/987a239f019d0bc9bc6c65dda8… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/987a239f019d0bc9bc6c65dda8… You're receiving this email because of your account on dev.gajim.org.

1 0

← Newer
1
2
3
4
5
6
7
8
9
Older →

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits December 2018