Commits

commits@gajim.org

17632 discussions

[Git][gajim/python-nbxmpp][master] 4 commits: JID: return bool for isFull()
by Philipp Hörist 13 Apr '20

13 Apr '20

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 2862f900 by lovetox at 2020-04-13T15:30:45+02:00 JID: return bool for isFull() - - - - - 9ae48ff3 by lovetox at 2020-04-13T15:50:09+02:00 JID: Refactor __eq__() - - - - - cbfb6e15 by lovetox at 2020-04-13T16:02:46+02:00 Tests: Add test for JID __eq__() - - - - - 8016441c by lovetox at 2020-04-13T16:21:52+02:00 JID: Refactor some methods - - - - - 2 changed files: - nbxmpp/protocol.py - test/unit/test_jid_parsing.py Changes: ===================================== nbxmpp/protocol.py ===================================== @@ -881,13 +881,13 @@ class JID: """ Return the bare representation of JID. I.e. string value w/o resource """ - return self.__str__(0) + return '%s@%s' % (self.node, self.domain) def getBare(self): """ Return the bare representation of JID. I.e. string value w/o resource """ - return self.__str__(0) + return '%s@%s' % (self.node, self.domain) def setBare(self): """ @@ -905,18 +905,21 @@ class JID: @property def isFull(self): - return self.domain and self.node and self.resource + return bool(self.domain and self.node and self.resource) def __eq__(self, other): """ Compare the JID to another instance or to string for equality """ - try: - other = JID(other) - except ValueError: - return 0 - return self.resource == other.resource and \ - self.__str__(0) == other.__str__(0) + if not isinstance(other, JID): + try: + other = JID(other) + except Exception: + return False + + return (self.node == other.node and + self.domain == other.domain and + self.resource == other.resource) def __ne__(self, other): """ @@ -928,18 +931,26 @@ class JID: """ Compare the node and domain parts of the JID's for equality """ - return self.__str__(0) == JID(other).__str__(0) + if not isinstance(other, JID): + try: + other = JID(other) + except Exception: + return False - def __str__(self, wresource=1): + return (self.node == other.node and + self.domain == other.domain) + + def __str__(self): """ Serialise JID into string """ if self.node: - jid = self.node + '@' + self.domain + jid = '%s@%s' % (self.node, self.domain) else: jid = self.domain - if wresource and self.resource: - return jid + '/' + self.resource + + if self.resource: + return '%s/%s' % (jid, self.resource) return jid def __hash__(self): ===================================== test/unit/test_jid_parsing.py ===================================== @@ -58,3 +58,13 @@ class JIDParsing(unittest.TestCase): for jid in tests: JID(jid) + + def test_jid_equality(self): + tests = [ + 'juliet(a)example.com', + 'juliet(a)example.com/foo', + 'example.com', + ] + + for jid in tests: + self.assertTrue(JID(jid) == jid) View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/2fd29576567326da5cd3cad… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/2fd29576567326da5cd3cad… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] 2 commits: Protocol: Cache JID parsing results
by Philipp Hörist 13 Apr '20

13 Apr '20

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: cb5aef14 by lovetox at 2020-04-13T15:08:25+02:00 Protocol: Cache JID parsing results - - - - - 2fd29576 by lovetox at 2020-04-13T15:09:04+02:00 Fix pylint error - - - - - 1 changed file: - nbxmpp/protocol.py Changes: ===================================== nbxmpp/protocol.py ===================================== @@ -21,6 +21,7 @@ sub- stanzas) handling routines import time import hashlib import socket +import functools from base64 import b64encode from precis_i18n import get_profile @@ -707,31 +708,32 @@ class DiscoInfoMalformed(Exception): pass stream_exceptions = {'bad-format': BadFormat, - 'bad-namespace-prefix': BadNamespacePrefix, - 'conflict': Conflict, - 'connection-timeout': ConnectionTimeout, - 'host-gone': HostGone, - 'host-unknown': HostUnknown, - 'improper-addressing': ImproperAddressing, - 'internal-server-error': InternalServerError, - 'invalid-from': InvalidFrom, - 'invalid-id': InvalidID, - 'invalid-namespace': InvalidNamespace, - 'invalid-xml': InvalidXML, - 'not-authorized': NotAuthorized, - 'policy-violation': PolicyViolation, - 'remote-connection-failed': RemoteConnectionFailed, - 'resource-constraint': ResourceConstraint, - 'restricted-xml': RestrictedXML, - 'see-other-host': SeeOtherHost, - 'system-shutdown': SystemShutdown, - 'undefined-condition': UndefinedCondition, - 'unsupported-encoding': UnsupportedEncoding, - 'unsupported-stanza-type': UnsupportedStanzaType, - 'unsupported-version': UnsupportedVersion, - 'xml-not-well-formed': XMLNotWellFormed} - - + 'bad-namespace-prefix': BadNamespacePrefix, + 'conflict': Conflict, + 'connection-timeout': ConnectionTimeout, + 'host-gone': HostGone, + 'host-unknown': HostUnknown, + 'improper-addressing': ImproperAddressing, + 'internal-server-error': InternalServerError, + 'invalid-from': InvalidFrom, + 'invalid-id': InvalidID, + 'invalid-namespace': InvalidNamespace, + 'invalid-xml': InvalidXML, + 'not-authorized': NotAuthorized, + 'policy-violation': PolicyViolation, + 'remote-connection-failed': RemoteConnectionFailed, + 'resource-constraint': ResourceConstraint, + 'restricted-xml': RestrictedXML, + 'see-other-host': SeeOtherHost, + 'system-shutdown': SystemShutdown, + 'undefined-condition': UndefinedCondition, + 'unsupported-encoding': UnsupportedEncoding, + 'unsupported-stanza-type': UnsupportedStanzaType, + 'unsupported-version': UnsupportedVersion, + 'xml-not-well-formed': XMLNotWellFormed} + + +(a)functools.lru_cache(maxsize=None) def parse_jid(jid): # https://tools.ietf.org/html/rfc7622#section-3.2 View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/b169eb1a940d9ee06115c30… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/b169eb1a940d9ee06115c30… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Logger: Correctly calculate execution time
by Philipp Hörist 13 Apr '20

13 Apr '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 7987770a by lovetox at 2020-04-13T13:16:21+02:00 Logger: Correctly calculate execution time - - - - - 1 changed file: - gajim/common/logger.py Changes: ===================================== gajim/common/logger.py ===================================== @@ -186,9 +186,9 @@ def caps_decoder(dict_): def timeit(func): def func_wrapper(self, *args, **kwargs): - start = time.time() / 1e9 + start = time.time() result = func(self, *args, **kwargs) - exec_time = (time.time() / 1e9 - start) + exec_time = (time.time() - start) * 1e3 level = 30 if exec_time > 50 else 10 log.log(level, 'Execution time for %s: %s ms', func.__name__, math.ceil(exec_time)) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/7987770a1dc0c47eb049764bfe98600d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/7987770a1dc0c47eb049764bfe98600d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Transports: Add missing IRC icons
by Philipp Hörist 13 Apr '20

13 Apr '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: a9d5f50b by lovetox at 2020-04-13T12:05:35+02:00 Transports: Add missing IRC icons - - - - - 5 changed files: - + gajim/data/icons/hicolor/16x16/status/irc-event.png - + gajim/data/icons/hicolor/16x16/status/irc-muc-active.png - + gajim/data/icons/hicolor/16x16/status/irc-muc-inactive.png - + gajim/data/icons/hicolor/32x32/status/irc-muc-active.png - + gajim/data/icons/hicolor/32x32/status/irc-muc-inactive.png Changes: ===================================== gajim/data/icons/hicolor/16x16/status/irc-event.png ===================================== Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/irc-event.png differ ===================================== gajim/data/icons/hicolor/16x16/status/irc-muc-active.png ===================================== Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/irc-muc-active.png differ ===================================== gajim/data/icons/hicolor/16x16/status/irc-muc-inactive.png ===================================== Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/irc-muc-inactive.png differ ===================================== gajim/data/icons/hicolor/32x32/status/irc-muc-active.png ===================================== Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/irc-muc-active.png differ ===================================== gajim/data/icons/hicolor/32x32/status/irc-muc-inactive.png ===================================== Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/irc-muc-inactive.png differ View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a9d5f50b8f7e27c4c8bfcc0e2405c492… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a9d5f50b8f7e27c4c8bfcc0e2405c492… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Notifications: Improve Windows notification style
by Philipp Hörist 12 Apr '20

12 Apr '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: c3ee820d by Daniel Brötzmann at 2020-04-12T08:35:46+02:00 Notifications: Improve Windows notification style - - - - - ce40feff by Daniel Brötzmann at 2020-04-12T08:35:47+02:00 Config: Remove obsolete colors - - - - - 5 changed files: - gajim/common/config.py - gajim/data/gui/popup_notification_window.ui - gajim/data/style/default.css - gajim/data/style/gajim.css - gajim/gtk/notification.py Changes: ===================================== gajim/common/config.py ===================================== @@ -90,15 +90,6 @@ class Config: 'allow_hide_roster': [opt_bool, False, _('Allow to hide the contact list window even if the notification area icon is not shown.'), False], 'iconset': [opt_str, DEFAULT_ICONSET, '', True], 'use_transports_iconsets': [opt_bool, True, '', True], - 'notif_signin_color': [opt_color, '#32CD32', _('Notification color for contacts signing in.')], # limegreen - 'notif_signout_color': [opt_color, '#FF0000', _('Notification color for contacts signing out.')], # red - 'notif_message_color': [opt_color, '#1E90FF', _('Notification color for new message notification.')], # dodgerblue - 'notif_ftrequest_color': [opt_color, '#F0E68C', _('Notification color for file transfer request.')], # khaki - 'notif_fterror_color': [opt_color, '#B22222', _('Notification color for file transfer errors.')], # firebrick - 'notif_ftcomplete_color': [opt_color, '#9ACD32', _('Notification color for stopped or completed file transfers.')], # yellowgreen - 'notif_invite_color': [opt_color, '#D2B48C', _('Notification color for group chat invitations.')], # tan1 - 'notif_status_color': [opt_color, '#D8BFD8', _('Notification background color for changed status.')], # thistle2 - 'notif_other_color': [opt_color, '#FFFFFF', _('Notification color for other dialogs.')], # white 'collapsed_rows': [opt_str, '', _('List of rows (accounts and groups) that are collapsed (space separated).'), True], 'roster_theme': [opt_str, _('default'), '', True], 'mergeaccounts': [opt_bool, False, '', True], ===================================== gajim/data/gui/popup_notification_window.ui ===================================== @@ -1,30 +1,44 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> - <requires lib="gtk+" version="3.12"/> + <requires lib="gtk+" version="3.20"/> <object class="GtkEventBox" id="eventbox"> - <property name="name">PopupNotificationEventBox</property> + <property name="name">NotificationPopup</property> <property name="visible">True</property> <property name="can_focus">False</property> <child> <object class="GtkBox"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="border_width">4</property> <property name="spacing">6</property> <child> - <object class="GtkImage" id="image"> - <property name="width_request">68</property> - <property name="height_request">86</property> + <object class="GtkBox" id="color_bar"> + <property name="width_request">6</property> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <placeholder/> + </child> </object> <packing> <property name="expand">False</property> - <property name="fill">False</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> + <child> + <object class="GtkImage" id="image"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="icon_size">6</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> <child> <object class="GtkBox"> <property name="visible">True</property> @@ -36,11 +50,10 @@ <property name="can_focus">False</property> <child> <object class="GtkLabel" id="event_type_label"> + <property name="name">NotificationPopupTitle</property> <property name="width_request">196</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Event Type</property> - <property name="use_markup">True</property> <property name="wrap">True</property> <property name="xalign">0</property> </object> @@ -68,7 +81,7 @@ </object> <packing> <property name="expand">False</property> - <property name="fill">False</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> @@ -82,14 +95,14 @@ <child> <object class="GtkLabel" id="event_description_label"> <property name="width_request">218</property> - <property name="height_request">64</property> + <property name="height_request">50</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Event desc</property> <property name="wrap">True</property> <property name="ellipsize">end</property> <property name="max_width_chars">30</property> <property name="xalign">0</property> + <property name="yalign">0</property> </object> <packing> <property name="expand">False</property> @@ -101,7 +114,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">2</property> </packing> </child> </object> ===================================== gajim/data/style/default.css ===================================== @@ -50,3 +50,30 @@ .gajim-search-highlight { color: rgb(170, 220, 220) } +.gajim-notify-message { + color: rgb(30, 144, 255); +} +.gajim-notify-signin { + color: rgb(68, 134, 38); +} +.gajim-notify-signout { + color: rgb(134, 22, 22); +} +.gajim-notify-status { + color: rgb(170, 170, 170); +} +.gajim-notify-invite { + color: rgb(224, 145, 42); +} +.gajim-notify-ft-request { + color: rgb(240, 230, 140); +} +.gajim-notify-ft-error { + color: rgb(226, 33, 33); +} +.gajim-notify-ft-complete { + color: rgb(139, 185, 48); +} +.gajim-notify-other { + color: rgb(255, 255, 255); +} ===================================== gajim/data/style/gajim.css ===================================== @@ -280,3 +280,23 @@ button.flat.link { padding: 0; border: 0; } .assistant-grid { padding: 18px; margin: 6px;} .assistant-grid > box stack { padding: 18px; } + +/* Windows notification */ +#NotificationPopup { + background-color: #333333; + padding: 4px; +} +#NotificationPopup label { + color: #FFF; +} +#NotificationPopup button { + border-width: 0; + background-image: none; + background-color: inherit; + box-shadow: none; + text-shadow: none; + -gtk-icon-shadow: none; +} +#NotificationPopupTitle { + font-weight: bold; +} ===================================== gajim/gtk/notification.py ===================================== @@ -36,6 +36,7 @@ from gajim import gtkgui_helpers from gajim.common import app from gajim.common import helpers from gajim.common import ged +from gajim.common.const import StyleAttr from gajim.common.i18n import _ from gajim.common.nec import EventHelper @@ -252,10 +253,8 @@ class PopupNotification(Gtk.Window): self.set_type_hint(Gdk.WindowTypeHint.NOTIFICATION) self.set_focus_on_map(False) self.set_accept_focus(False) - self.set_name('NotificationPopup') self.set_skip_taskbar_hint(True) self.set_decorated(False) - self.set_size_request(312, 95) self._timeout_id = None self.account = account @@ -265,57 +264,53 @@ class PopupNotification(Gtk.Window): self._ui = get_builder('popup_notification_window.ui') self.add(self._ui.eventbox) - if not text: - text = app.get_name_from_jid(account, jid) # default value of text - if not title: - title = '' - - self._ui.event_type_label.set_markup( - '<span foreground="black" weight="bold">%s</span>' % - GLib.markup_escape_text(title)) - - css = '#NotificationPopup {background-color: black }' - gtkgui_helpers.add_css_to_widget(self, css) - if event_type == _('Contact Signed In'): - bg_color = app.config.get('notif_signin_color') + bg_color = app.css_config.get_value('.gajim-notify-signin', + StyleAttr.COLOR) elif event_type == _('Contact Signed Out'): - bg_color = app.config.get('notif_signout_color') + bg_color = app.css_config.get_value('.gajim-notify-signout', + StyleAttr.COLOR) elif event_type in (_('New Message'), - _('New Private Message'), _('New E-mail')): - bg_color = app.config.get('notif_message_color') + _('New Private Message'), + _('New E-mail')): + bg_color = app.css_config.get_value('.gajim-notify-message', + StyleAttr.COLOR) elif event_type == _('File Transfer Request'): - bg_color = app.config.get('notif_ftrequest_color') + bg_color = app.css_config.get_value('.gajim-notify-ft-request', + StyleAttr.COLOR) elif event_type == _('File Transfer Error'): - bg_color = app.config.get('notif_fterror_color') + bg_color = app.css_config.get_value('.gajim-notify-ft-error', + StyleAttr.COLOR) elif event_type in (_('File Transfer Completed'), _('File Transfer Stopped')): - bg_color = app.config.get('notif_ftcomplete_color') + bg_color = app.css_config.get_value('.gajim-notify-ft-complete', + StyleAttr.COLOR) elif event_type == _('Group Chat Invitation'): - bg_color = app.config.get('notif_invite_color') + bg_color = app.css_config.get_value('.gajim-notify-invite', + StyleAttr.COLOR) elif event_type == _('Contact Changed Status'): - bg_color = app.config.get('notif_status_color') - else: # Unknown event! Shouldn't happen but deal with it - bg_color = app.config.get('notif_other_color') + bg_color = app.css_config.get_value('.gajim-notify-status', + StyleAttr.COLOR) + else: # Unknown event (shouldn't happen, but deal with it) + bg_color = app.css_config.get_value('.gajim-notify-other', + StyleAttr.COLOR) + + bar_class = ''' + .popup-bar { + background-color: %s + }''' % bg_color + gtkgui_helpers.add_css_to_widget(self._ui.color_bar, bar_class) + self._ui.color_bar.get_style_context().add_class('popup-bar') - background_class = ''' - .popup-style { - border-image: none; - background-image: none; - background-color: %s }''' % bg_color - - gtkgui_helpers.add_css_to_widget(self._ui.eventbox, background_class) - self._ui.eventbox.get_style_context().add_class('popup-style') - - gtkgui_helpers.add_css_to_widget( - self._ui.close_button, background_class) - self._ui.close_button.get_style_context().add_class('popup-style') + if not title: + title = '' + self._ui.event_type_label.set_markup(title) + if not text: + text = app.get_name_from_jid(account, jid) # default value of text escaped_text = GLib.markup_escape_text(text) - self._ui.event_description_label.set_markup( - '<span foreground="black">%s</span>' % escaped_text) + self._ui.event_description_label.set_markup(escaped_text) - # set the image self._ui.image.set_from_icon_name(icon_name, Gtk.IconSize.DIALOG) self.move(*self._get_window_pos()) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/07c1911115828c067df7156886bb678… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/07c1911115828c067df7156886bb678… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix blurry notification icon
by Philipp Hörist 12 Apr '20

12 Apr '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 07c19111 by André Apitzsch at 2020-04-12T08:31:44+02:00 Fix blurry notification icon - - - - - 1 changed file: - gajim/gtk/notification.py Changes: ===================================== gajim/gtk/notification.py ===================================== @@ -228,7 +228,7 @@ class Notification(EventHelper): contact = app.contacts.get_contact(account, jid) if contact is None: return None - return app.interface.get_avatar(contact, 16, scale, pixbuf=True) + return app.interface.get_avatar(contact, 32, scale, pixbuf=True) def _on_popup_destroy(self, *args): self._win32_active_popup = None View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/07c1911115828c067df7156886bb678e… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/07c1911115828c067df7156886bb678e… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] GroupchatInvite: Only load contacts when showing the page
by Philipp Hörist 11 Apr '20

11 Apr '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 036a7176 by lovetox at 2020-04-11T23:23:53+02:00 GroupchatInvite: Only load contacts when showing the page Fixes #10055 - - - - - 2 changed files: - gajim/groupchat_control.py - gajim/gtk/groupchat_invite.py Changes: ===================================== gajim/groupchat_control.py ===================================== @@ -511,7 +511,7 @@ class GroupchatControl(ChatControlBase): self._show_page('muc-info') def _on_invite(self, _action, _param): - self._invite_box.update() + self._invite_box.load_contacts() self._show_page('invite') def _on_invite_ready(self, _, invitable): ===================================== gajim/gtk/groupchat_invite.py ===================================== @@ -54,8 +54,6 @@ class GroupChatInvite(Gtk.Box): self._new_contact_row_visible = False self._room_jid = room_jid - self.update() - self._ui.search_entry.connect('search-changed', self._on_search_changed) self._ui.search_entry.connect('next-match', @@ -254,7 +252,7 @@ class GroupChatInvite(Gtk.Box): return locale.strcoll(name1.lower(), name2.lower()) - def update(self): + def load_contacts(self): self._ui.contacts_listbox.foreach(self._ui.contacts_listbox.remove) self._ui.invitees_listbox.foreach(self._ui.invitees_listbox.remove) self._accounts = app.get_enabled_accounts_with_labels() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/036a7176ed3d4e2558a0e0bbf9fed7ca… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/036a7176ed3d4e2558a0e0bbf9fed7ca… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Receipts: Don't send receipt if message could not be decrypted
by Philipp Hörist 11 Apr '20

11 Apr '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 89d4b34a by lovetox at 2020-04-11T22:22:32+02:00 Receipts: Don't send receipt if message could not be decrypted Fixes #10051 - - - - - 549c3c92 by lovetox at 2020-04-11T22:25:17+02:00 Receipts: Don't stop propagation in all cases - - - - - 1 changed file: - gajim/common/modules/receipts.py Changes: ===================================== gajim/common/modules/receipts.py ===================================== @@ -39,6 +39,8 @@ class Receipts(BaseModule): return if properties.type.is_error: + if properties.receipt.is_request: + return # Don't propagate this event further raise nbxmpp.NodeProcessed @@ -56,6 +58,12 @@ class Receipts(BaseModule): if not app.config.get_per('accounts', self._account, 'answer_receipts'): return + + if properties.eme is not None: + # Don't send receipt for message which couldn't be decrypted + if not properties.is_encrypted: + return + contact = self._get_contact(properties) if contact is None: return View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/07a8c98d6dc4050b4a3e1870ca9860e… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/07a8c98d6dc4050b4a3e1870ca9860e… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] 3 commits: Websocket: Pass stanza on data-sent
by Philipp Hörist 11 Apr '20

11 Apr '20

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 828ee78b by lovetox at 2020-04-11T17:35:39+02:00 Websocket: Pass stanza on data-sent - - - - - 5d2bcd74 by lovetox at 2020-04-11T22:00:24+02:00 Smacks: Copy stanza before adding it to the queue - - - - - b169eb1a by lovetox at 2020-04-11T22:03:56+02:00 EntityCaps: Add missing node on disco info reply - - - - - 3 changed files: - nbxmpp/modules/entity_caps.py - nbxmpp/smacks.py - nbxmpp/websocket.py Changes: ===================================== nbxmpp/modules/entity_caps.py ===================================== @@ -57,6 +57,7 @@ class EntityCaps(BaseModule): return iq = stanza.buildReply('result') + iq.setQuerynode(self._node) query = iq.getQuery() for identity in self._caps.identities: query.addChild(node=identity.get_node()) ===================================== nbxmpp/smacks.py ===================================== @@ -126,14 +126,13 @@ class Smacks: # We did not yet sent 'enable' so the server # will not count our stanzas return - if (stanza.getName() == 'message' and - stanza.getType() in ('chat', 'groupchat')): - timestamp = time.strftime('%Y-%m-%dT%H:%M:%SZ', time.gmtime()) - attrs = {'stamp': timestamp} - if stanza.getType() != 'groupchat': - # Dont leak our JID to Groupchats - attrs['from'] = str(self._client.get_bound_jid()) - stanza.addChild('delay', namespace=NS_DELAY2, attrs=attrs) + + # Make a full copy so we dont run into problems when + # the stanza is modified after sending for some reason + stanza = type(stanza)(node=str(stanza)) + + self._add_delay(stanza) + self._uqueue.append(stanza) self._log.debug('OUT, %s', stanza.getName()) self._out_h += 1 @@ -144,6 +143,22 @@ class Smacks: if (self._in_h - self._acked_h) > 100: self._send_ack() + def _add_delay(self, stanza): + if stanza.getName() != 'message': + return + + if stanza.getType() not in ('chat', 'groupchat'): + return + + timestamp = time.strftime('%Y-%m-%dT%H:%M:%SZ', time.gmtime()) + attrs = {'stamp': timestamp} + + if stanza.getType() != 'groupchat': + # Dont leak our JID to Groupchats + attrs['from'] = str(self._client.get_bound_jid()) + + stanza.addChild('delay', namespace=NS_DELAY2, attrs=attrs) + def _resend_queue(self): """ Resends unsent stanzas when a new session is established. ===================================== nbxmpp/websocket.py ===================================== @@ -139,7 +139,7 @@ class WebsocketConnection(Connection): data = str(stanza) self._websocket.send_text(data) self._log_stanza(data, received=False) - self.notify('data-sent', data) + self.notify('data-sent', stanza) def disconnect(self): if self._state == TCPState.CONNECTING: View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/852b29d8be3816ea8dbf8c5… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/852b29d8be3816ea8dbf8c5… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] MAM: Check for first and last element in IQ result
by Philipp Hörist 11 Apr '20

11 Apr '20

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 852b29d8 by lovetox at 2020-04-11T16:08:56+02:00 MAM: Check for first and last element in IQ result - - - - - 1 changed file: - nbxmpp/modules/mam.py Changes: ===================================== nbxmpp/modules/mam.py ===================================== @@ -119,6 +119,12 @@ class MAM(BaseModule): 'rsm set missing') complete = fin.getAttr('complete') == 'true' + if not complete: + if rsm.first is None or rsm.last is None: + return raise_error(self._log.warning, + stanza, + 'stanza-malformed', + 'missing first or last element') return MAMQueryData(jid=jid, complete=complete, View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/852b29d8be3816ea8dbf8c54… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/852b29d8be3816ea8dbf8c54… You're receiving this email because of your account on dev.gajim.org.

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits