Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] Don't close chat with escape key by default
by Philipp Hörist 30 Aug '20

30 Aug '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: bd67cd00 by André Apitzsch at 2020-08-30T09:38:10+02:00 Don't close chat with escape key by default Fixes #10180. - - - - - 3 changed files: - gajim/common/config.py - gajim/common/setting_values.py - gajim/data/gui/shortcuts_window.ui Changes: ===================================== gajim/common/config.py ===================================== @@ -195,7 +195,7 @@ class Config: _('Controls the window where new messages are placed.\n\'always\' - All messages are sent to a single window.\n\'always_with_roster\' - Like \'always\' but the messages are in a single window along with the contact list.\n\'never\' - All messages get their own window.\n\'peracct\' - Messages for each account are sent to a specific window.\n\'pertype\' - Each message type (e.g. chats vs. group chats) is sent to a specific window.')], 'show_roster_on_startup':[opt_str, 'always', _('Show contact list window on startup.\n\'always\' - Always show contact list window.\n\'never\' - Never show contact list window.\n\'last_state\' - Restore last state of the contact list window.')], 'show_avatar_in_chat': [opt_bool, True, _('If enabled, Gajim displays the avatar in the chat window.')], - 'escape_key_closes': [opt_bool, True, _('If enabled, pressing Esc closes a tab/window.')], + 'escape_key_closes': [opt_bool, False, _('If enabled, pressing Esc closes a tab/window.')], 'hide_groupchat_banner': [opt_bool, False, _('Hides the banner in a group chat window.')], 'hide_chat_banner': [opt_bool, False, _('Hides the banner in a 1:1 chat window.')], 'hide_groupchat_occupants_list': [opt_bool, False, _('Hides the group chat participants list in a group chat window.')], ===================================== gajim/common/setting_values.py ===================================== @@ -132,7 +132,7 @@ APP_SETTINGS = { 'one_message_window': 'always', 'show_roster_on_startup': 'always', 'show_avatar_in_chat': True, - 'escape_key_closes': True, + 'escape_key_closes': False, 'hide_groupchat_banner': False, 'hide_chat_banner': False, 'hide_groupchat_occupants_list': False, ===================================== gajim/data/gui/shortcuts_window.ui ===================================== @@ -165,7 +165,7 @@ <child> <object class="GtkShortcutsShortcut"> <property name="visible">1</property> - <property name="accelerator">Escape <ctrl>w</property> + <property name="accelerator"><ctrl>w</property> <property name="title" translatable="yes">Close chat</property> </object> </child> View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/bd67cd00b5a1135d29271fa60a1f4ba9… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/bd67cd00b5a1135d29271fa60a1f4ba9… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 7 commits: Remove unused import
by Philipp Hörist 29 Aug '20

29 Aug '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 2e3b3d64 by lovetox at 2020-08-29T21:25:50+02:00 Remove unused import - - - - - 9c256c42 by lovetox at 2020-08-29T21:34:10+02:00 ChatControlBase: Move textview calls into TextView classes - - - - - 79c5f872 by lovetox at 2020-08-29T21:37:07+02:00 ChatControlBase: Use correct signal names _ works only because of compat code - - - - - 59db443a by lovetox at 2020-08-29T22:01:25+02:00 ChatControlBase: Simplify shutdown - - - - - 32d3c3cd by lovetox at 2020-08-29T23:27:39+02:00 ChatControlBase: Move connecting handlers into .ui file - - - - - 42953fb1 by lovetox at 2020-08-29T23:34:06+02:00 Fix typo - - - - - acbce41f by lovetox at 2020-08-29T23:34:32+02:00 Add debug helper methods - - - - - 9 changed files: - gajim/chat_control.py - gajim/chat_control_base.py - gajim/conversation_textview.py - gajim/data/gui/chat_control.ui - gajim/groupchat_control.py - gajim/gtk/htmltextview.py - gajim/gtk/message_input.py - gajim/gtk/util.py - gajim/message_window.py Changes: ===================================== gajim/chat_control.py ===================================== @@ -1104,16 +1104,7 @@ class ChatControl(ChatControlBase): self.account, force=True, backend=backend) - # remove all register handlers on widgets, created by self.xml - # to prevent circular references among objects - for i in list(self.handlers.keys()): - if self.handlers[i].handler_is_connected(i): - self.handlers[i].disconnect(i) - del self.handlers[i] - self.conv_textview.del_handlers() - self.msg_textview.destroy() - # PluginSystem: calling shutdown of super class (ChatControlBase) to let - # it remove it's GUI extension points + super(ChatControl, self).shutdown() def minimizable(self): ===================================== gajim/chat_control_base.py ===================================== @@ -33,7 +33,6 @@ from gi.repository import Gtk from gi.repository import Gdk from gi.repository import GLib from gi.repository import Gio -from gi.repository import GObject from gajim.common import events from gajim.common import app @@ -136,19 +135,6 @@ class ChatControlBase(ChatCommandProcessor, CommandTools, EventHelper): self.xml.connect_signals(self) self.widget = self.xml.get_object('%s_hbox' % widget_name) - if not self._type.is_groupchat: - # Create banner and connect signals - id_ = self.xml.banner_eventbox.connect( - 'button-press-event', - self._on_banner_eventbox_button_press_event) - self.handlers[id_] = self.xml.banner_eventbox - - if self.xml.banner_label is not None: - id_ = self.xml.banner_label.connect( - 'populate_popup', - self.on_banner_label_populate_popup) - self.handlers[id_] = self.xml.banner_label - self._accounts = app.get_enabled_accounts_with_labels() if len(self._accounts) > 1: account_badge = generate_account_badge(self.account) @@ -174,15 +160,6 @@ class ChatControlBase(ChatCommandProcessor, CommandTools, EventHelper): Gtk.TargetFlags.SAME_APP, 0)] - id_ = self.xml.overlay.connect('drag_data_received', - self._on_drag_data_received) - - self.handlers[id_] = self.xml.overlay - id_ = self.xml.overlay.connect('drag_motion', self._on_drag_motion) - self.handlers[id_] = self.xml.overlay - id_ = self.xml.overlay.connect('drag_leave', self._on_drag_leave) - self.handlers[id_] = self.xml.overlay - self.xml.overlay.drag_dest_set( Gtk.DestDefaults.ALL, self._dnd_list, @@ -191,47 +168,36 @@ class ChatControlBase(ChatCommandProcessor, CommandTools, EventHelper): # Create textviews and connect signals self.conv_textview = ConversationTextview(self.account) - self.conv_textview.tv.drag_dest_unset() + id_ = self.conv_textview.connect('quote', self.on_quote) - self.handlers[id_] = self.conv_textview.tv + self.handlers[id_] = self.conv_textview self.conv_textview.tv.connect('key-press-event', self._on_conv_textview_key_press_event) - self.conv_scrolledwindow = self.xml.conversation_scrolledwindow - self.conv_scrolledwindow.add(self.conv_textview.tv) - widget = self.conv_scrolledwindow.get_vadjustment() - id_ = widget.connect('changed', - self.on_conversation_vadjustment_changed) - self.handlers[id_] = widget + self.xml.conversation_scrolledwindow.add(self.conv_textview.tv) + widget = self.xml.conversation_scrolledwindow.get_vadjustment() + widget.connect('changed', self.on_conversation_vadjustment_changed) - vscrollbar = self.conv_scrolledwindow.get_vscrollbar() - id_ = vscrollbar.connect('button-release-event', - self._on_scrollbar_button_release) - self.handlers[id_] = vscrollbar + vscrollbar = self.xml.conversation_scrolledwindow.get_vscrollbar() + vscrollbar.connect('button-release-event', + self._on_scrollbar_button_release) - self.correcting = False - self.last_sent_msg = None - - # add MessageInputTextView to UI and connect signals self.msg_textview = MessageInputTextView() - self.msg_textview.drag_dest_unset() + self.msg_textview.connect('paste-clipboard', + self._on_message_textview_paste_event) + self.msg_textview.connect('key-press-event', + self._on_message_textview_key_press_event) + self.msg_textview.connect('populate-popup', + self.on_msg_textview_populate_popup) + self.msg_textview.connect('text-changed', + self._on_message_tv_buffer_changed) + self.msg_scrolledwindow = ScrolledWindow() self.msg_scrolledwindow.add(self.msg_textview) self.xml.hbox.pack_start(self.msg_scrolledwindow, True, True, 0) - id_ = self.msg_textview.connect('paste-clipboard', - self._on_message_textview_paste_event) - self.handlers[id_] = self.msg_textview - id_ = self.msg_textview.connect( - 'key_press_event', - self._on_message_textview_key_press_event) - self.handlers[id_] = self.msg_textview - id_ = self.msg_textview.connect('populate_popup', - self.on_msg_textview_populate_popup) - self.handlers[id_] = self.msg_textview - # the following vars are used to keep history of user's messages self.sent_history = [] self.sent_history_pos = 0 @@ -239,6 +205,9 @@ class ChatControlBase(ChatCommandProcessor, CommandTools, EventHelper): self.received_history_pos = 0 self.orig_msg = None + self.correcting = False + self.last_sent_msg = None + self.set_emoticon_popover() # Attach speller @@ -256,9 +225,6 @@ class ChatControlBase(ChatCommandProcessor, CommandTools, EventHelper): con = app.connections[self.account] con.get_module('Chatstate').set_active(self.contact) - id_ = self.msg_textview.connect('text-changed', - self._on_message_tv_buffer_changed) - self.handlers[id_] = self.msg_textview if parent_win is not None: id_ = parent_win.window.connect('motion-notify-event', self._on_window_motion_notify) @@ -301,7 +267,7 @@ class ChatControlBase(ChatCommandProcessor, CommandTools, EventHelper): if textview.get_buffer().props.has_selection: return Gdk.EVENT_PROPAGATE - # Focus the Messsage Input and resend the event + # Focus the Message Input and resend the event textview.unselect() self.msg_textview.grab_focus() self.msg_textview.get_toplevel().propagate_key_event(event) @@ -684,6 +650,21 @@ class ChatControlBase(ChatCommandProcessor, CommandTools, EventHelper): menu.show_all() def shutdown(self): + for i in list(self.handlers.keys()): + if self.handlers[i].handler_is_connected(i): + self.handlers[i].disconnect(i) + self.handlers.clear() + + self.conv_textview.del_handlers() + del self.conv_textview + del self.msg_textview + del self.msg_scrolledwindow + + self.widget.destroy() + del self.widget + + del self.xml + # PluginSystem: removing GUI extension points # connected with ChatControlBase instance object app.plugin_manager.remove_gui_extension_point('chat_control_base', self) @@ -1441,7 +1422,7 @@ class ChatControlBase(ChatCommandProcessor, CommandTools, EventHelper): if direction != Gdk.ScrollDirection.UP: return # Check if we have a Scrollbar - adjustment = self.conv_scrolledwindow.get_vadjustment() + adjustment = self.xml.conversation_scrolledwindow.get_vadjustment() if adjustment.get_upper() != adjustment.get_page_size(): app.log('autoscroll').info('Autoscroll disabled') self.conv_textview.autoscroll = False ===================================== gajim/conversation_textview.py ===================================== @@ -100,14 +100,6 @@ class ConversationTextview(GObject.GObject): self.tv = HtmlTextView(account) self.tv.connect('query-tooltip', self._query_tooltip) - # set properties - self.tv.set_border_width(1) - self.tv.set_accepts_tab(True) - self.tv.set_editable(False) - self.tv.set_cursor_visible(False) - self.tv.set_wrap_mode(Gtk.WrapMode.WORD_CHAR) - self.tv.set_left_margin(2) - self.tv.set_right_margin(2) self._buffer = self.tv.get_buffer() self.handlers = {} self.image_cache = {} ===================================== gajim/data/gui/chat_control.ui ===================================== @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.22"/> <object class="GtkAdjustment" id="adjustment1"> @@ -398,6 +398,9 @@ <object class="GtkOverlay" id="overlay"> <property name="visible">True</property> <property name="can_focus">False</property> + <signal name="drag-data-received" handler="_on_drag_data_received" swapped="no"/> + <signal name="drag-leave" handler="_on_drag_leave" swapped="no"/> + <signal name="drag-motion" handler="_on_drag_motion" swapped="no"/> <child> <object class="GtkPaned" id="paned1"> <property name="visible">True</property> @@ -412,6 +415,7 @@ <property name="name">ChatControl-BannerEventBox</property> <property name="can_focus">False</property> <property name="no_show_all">True</property> + <signal name="button-press-event" handler="_on_banner_eventbox_button_press_event" swapped="no"/> <child> <object class="GtkBox"> <property name="visible">True</property> ===================================== gajim/groupchat_control.py ===================================== @@ -1638,9 +1638,6 @@ class GroupchatControl(ChatControlBase): app.connections[self.account].get_module('MUC').leave( self.room_jid, reason=reason) - # PluginSystem: calling shutdown of super class (ChatControlBase) - # to let it remove it's GUI extension points - super(GroupchatControl, self).shutdown() # PluginSystem: removing GUI extension points connected with # GrouphatControl instance object app.plugin_manager.remove_gui_extension_point( @@ -1668,15 +1665,11 @@ class GroupchatControl(ChatControlBase): self.roster.destroy() self.roster = None - # remove all register handlers on wigets, created by self.xml - # to prevent circular references among objects - for i in list(self.handlers.keys()): - if self.handlers[i].handler_is_connected(i): - self.handlers[i].disconnect(i) - del self.handlers[i] # Remove unread events from systray app.events.remove_events(self.account, self.room_jid) + super(GroupchatControl, self).shutdown() + def safe_shutdown(self): if self.minimizable(): return True ===================================== gajim/gtk/htmltextview.py ===================================== @@ -703,9 +703,18 @@ class HtmlTextView(Gtk.TextView): def __init__(self, account, standalone=False): Gtk.TextView.__init__(self) - self.set_wrap_mode(Gtk.WrapMode.CHAR) - self.set_editable(False) + self.set_has_tooltip(True) + self.set_border_width(1) + self.set_accepts_tab(True) + self.set_editable(False) + self.set_cursor_visible(False) + self.set_wrap_mode(Gtk.WrapMode.WORD_CHAR) + self.set_left_margin(2) + self.set_right_margin(2) + + self.drag_dest_unset() + self.connect('copy-clipboard', self._on_copy_clipboard) self.get_buffer().eol_tag = self.get_buffer().create_tag('eol') ===================================== gajim/gtk/message_input.py ===================================== @@ -61,6 +61,8 @@ class MessageInputTextView(Gtk.TextView): self.set_pixels_below_lines(2) self.get_style_context().add_class('gajim-conversation-font') + self.drag_dest_unset() + # set undo list self.undo_list = [] # needed to know if we undid something ===================================== gajim/gtk/util.py ===================================== @@ -21,6 +21,7 @@ from typing import Tuple from typing import Optional import sys +import weakref import logging import textwrap from importlib import import_module @@ -811,3 +812,13 @@ class EventHelper(CommonEventHelper): def __on_destroy(self, *args): self.unregister_events() + + +def check_destroy(widget): + def _destroy(*args): + print('DESTROYED', args) + widget.connect('destroy', _destroy) + + +def check_finalize(obj, name): + weakref.finalize(obj, print, f'{name} has been finalized') ===================================== gajim/message_window.py ===================================== @@ -561,10 +561,6 @@ class MessageWindow(EventHelper): ask any confirmation """ def close(ctrl): - if reason is not None: # We are leaving gc with a status message - ctrl.shutdown(reason) - else: # We are leaving gc without status message or it's a chat - ctrl.shutdown() # Update external state app.events.remove_events( ctrl.account, ctrl.get_full_jid, @@ -588,6 +584,11 @@ class MessageWindow(EventHelper): if not self._controls[ctrl.account]: del self._controls[ctrl.account] + if reason is not None: # We are leaving gc with a status message + ctrl.shutdown(reason) + else: # We are leaving gc without status message or it's a chat + ctrl.shutdown() + self.check_tabs() self.show_title() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/cd9150b8a919e83868a2724a16d3214… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/cd9150b8a919e83868a2724a16d3214… 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 29 Aug '20

29 Aug '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: a8fcde47 by lovetox at 2020-08-29T07:21:32+02:00 Remove unused code - - - - - cd9150b8 by lovetox at 2020-08-29T20:55:22+02:00 ChatControlBase: Remove auto copy workaround We are now able to copy text with CTRL/META + c in the ConversationTextView and the MessageInput - - - - - 9 changed files: - gajim/application.py - gajim/chat_control_base.py - gajim/common/config.py - gajim/common/setting_values.py - gajim/conversation_textview.py - gajim/data/gui/preferences_window.ui - gajim/gtk/htmltextview.py - gajim/gtk/preferences.py - gajim/message_window.py Changes: ===================================== gajim/application.py ===================================== @@ -558,7 +558,6 @@ class GajimApplication(Gtk.Application): 'win.switch-tab-7': ['<Alt>7', '<Alt>KP_7'], 'win.switch-tab-8': ['<Alt>8', '<Alt>KP_8'], 'win.switch-tab-9': ['<Alt>9', '<Alt>KP_9'], - 'win.copy-text': ['<Control><Shift>c'], } for action, accels in shortcuts.items(): ===================================== gajim/chat_control_base.py ===================================== @@ -82,6 +82,14 @@ if app.is_installed('GSPELL'): from gi.repository import Gspell # pylint: disable=ungrouped-imports +if sys.platform == 'darwin': + COPY_MODIFIER = Gdk.ModifierType.META_MASK + COPY_MODIFIER_KEYS = (Gdk.KEY_Meta_L, Gdk.KEY_Meta_R) +else: + COPY_MODIFIER = Gdk.ModifierType.CONTROL_MASK + COPY_MODIFIER_KEYS = (Gdk.KEY_Control_L, Gdk.KEY_Control_R) + + ################################################################################ class ChatControlBase(ChatCommandProcessor, CommandTools, EventHelper): """ @@ -187,9 +195,8 @@ class ChatControlBase(ChatCommandProcessor, CommandTools, EventHelper): id_ = self.conv_textview.connect('quote', self.on_quote) self.handlers[id_] = self.conv_textview.tv - id_ = self.conv_textview.tv.connect('grab-focus', - self._on_html_textview_grab_focus) - self.handlers[id_] = self.conv_textview.tv + self.conv_textview.tv.connect('key-press-event', + self._on_conv_textview_key_press_event) self.conv_scrolledwindow = self.xml.conversation_scrolledwindow self.conv_scrolledwindow.add(self.conv_textview.tv) @@ -279,6 +286,27 @@ class ChatControlBase(ChatCommandProcessor, CommandTools, EventHelper): # to properly use the super, because of the old code. CommandTools.__init__(self) + def _on_conv_textview_key_press_event(self, textview, event): + if event.keyval in COPY_MODIFIER_KEYS: + # Don’t route modifier keys for copy action to the Message Input + # otherwise pressing CTRL/META + c (the next event after that) + # will not reach the textview (because the Message Input would get + # focused). + return Gdk.EVENT_PROPAGATE + + if event.get_state() & COPY_MODIFIER: + # Don’t reroute the event if it is META + c and the + # textview has a selection + if event.keyval == Gdk.KEY_c: + if textview.get_buffer().props.has_selection: + return Gdk.EVENT_PROPAGATE + + # Focus the Messsage Input and resend the event + textview.unselect() + self.msg_textview.grab_focus() + self.msg_textview.get_toplevel().propagate_key_event(event) + return Gdk.EVENT_STOP + @property def type(self): return self._type @@ -511,10 +539,6 @@ class ChatControlBase(ChatCommandProcessor, CommandTools, EventHelper): self.msg_textview.emit('insert-emoji') return Gdk.EVENT_STOP - if action == 'copy-text': - self.conv_textview.tv.emit('copy-clipboard') - return Gdk.EVENT_STOP - return Gdk.EVENT_PROPAGATE def add_actions(self): @@ -643,13 +667,6 @@ class ChatControlBase(ChatCommandProcessor, CommandTools, EventHelper): gspell_lang = checker.get_language() self.contact.settings.set('speller_language', gspell_lang.get_code()) - def _on_html_textview_grab_focus(self, textview): - # Abort signal so the textview does not get focused - # Focus the MessageInputTextView instead - GObject.signal_stop_emission_by_name(textview, 'grab-focus') - self.msg_textview.grab_focus() - return Gdk.EVENT_STOP - def on_banner_label_populate_popup(self, _label, menu): """ Override the default context menu and add our own menuitems ===================================== gajim/common/config.py ===================================== @@ -240,7 +240,6 @@ class Config: 'muclumbus_api_jid': [opt_str, 'rodrigo.de.mucobedo(a)dreckshal.de'], 'muclumbus_api_http_uri': [opt_str, 'https://search.jabbercat.org/api/1.0/search'], 'muclumbus_api_pref': [opt_str, 'http', _('API Preferences. Possible values: \'http\', \'iq\'')], - 'auto_copy': [opt_bool, True, _('Selecting text will copy it to the clipboard')], 'command_system_execute': [opt_bool, False, _('If enabled, Gajim will execute commands (/show, /sh, /execute, /exec).')], 'groupchat_roster_width': [opt_int, 210, _('Width of group chat roster in pixel')], 'dev_force_bookmark_2': [opt_bool, False, _('Force Bookmark 2 usage')], ===================================== gajim/common/setting_values.py ===================================== @@ -176,7 +176,6 @@ APP_SETTINGS = { 'muclumbus_api_jid': 'rodrigo.de.mucobedo(a)dreckshal.de', 'muclumbus_api_http_uri': 'https://search.jabbercat.org/api/1.0/search', 'muclumbus_api_pref': 'http', - 'auto_copy': True, 'command_system_execute': False, 'groupchat_roster_width': 210, 'dev_force_bookmark_2': False, ===================================== gajim/conversation_textview.py ===================================== @@ -74,96 +74,6 @@ TRUST_SYMBOL_DATA = { } -def is_selection_modified(mark): - name = mark.get_name() - return name in ('selection_bound', 'insert') - -def has_focus(widget): - return widget.get_state_flags() & Gtk.StateFlags.FOCUSED == \ - Gtk.StateFlags.FOCUSED - -class TextViewImage(Gtk.Image): - - def __init__(self, anchor, text): - super(TextViewImage, self).__init__() - self.anchor = anchor - self._selected = False - self._disconnect_funcs = [] - self.connect('parent-set', self.on_parent_set) - self.set_tooltip_markup(text) - self.anchor.plaintext = text - - def _get_selected(self): - parent = self.get_parent() - if not parent or not self.anchor: - return False - buffer_ = parent.get_buffer() - position = buffer_.get_iter_at_child_anchor(self.anchor) - bounds = buffer_.get_selection_bounds() - return bounds and position.in_range(*bounds) - - def get_state(self): - parent = self.get_parent() - if not parent: - return Gtk.StateType.NORMAL - if self._selected: - if has_focus(parent): - return Gtk.StateType.SELECTED - return Gtk.StateType.ACTIVE - return Gtk.StateType.NORMAL - - def _update_selected(self): - selected = self._get_selected() - if self._selected != selected: - self._selected = selected - self.queue_draw() - - def _do_connect(self, widget, signal, callback): - id_ = widget.connect(signal, callback) - def disconnect(): - widget.disconnect(id_) - self._disconnect_funcs.append(disconnect) - - def _disconnect_signals(self): - for func in self._disconnect_funcs: - func() - self._disconnect_funcs = [] - - def on_parent_set(self, widget, old_parent): - parent = self.get_parent() - if not parent: - self._disconnect_signals() - return - if isinstance(parent, Gtk.EventBox): - parent = parent.get_parent() - if not parent: - self._disconnect_signals() - return - - self._do_connect(parent, 'style-set', self.do_queue_draw) - self._do_connect(parent, 'focus-in-event', self.do_queue_draw) - self._do_connect(parent, 'focus-out-event', self.do_queue_draw) - - textbuf = parent.get_buffer() - self._do_connect(textbuf, 'mark-set', self.on_mark_set) - self._do_connect(textbuf, 'mark-deleted', self.on_mark_deleted) - - def do_queue_draw(self, *args): - self.queue_draw() - return False - - def on_mark_set(self, buf, iterat, mark): - self.on_mark_modified(mark) - return False - - def on_mark_deleted(self, buf, mark): - self.on_mark_modified(mark) - return False - - def on_mark_modified(self, mark): - if is_selection_modified(mark): - self._update_selected() - class ConversationTextview(GObject.GObject): """ Class for the conversation textview (where user reads already said messages) ===================================== gajim/data/gui/preferences_window.ui ===================================== @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.22"/> <object class="GtkAdjustment" id="adjustment_status_auto_away"> @@ -534,60 +534,7 @@ <property name="orientation">vertical</property> <property name="spacing">6</property> <child> - <object class="GtkFrame"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label_xalign">0</property> - <property name="shadow_type">none</property> - <child> - <object class="GtkAlignment"> - <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="margin_top">6</property> - <property name="orientation">vertical</property> - <property name="spacing">6</property> - <child> - <object class="GtkCheckButton" id="auto_copy"> - <property name="label" translatable="yes">Enable auto copy</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes">If enabled, selected text will automatically be copied to the clipboard, otherwise you can copy text with CTRL + SHIFT + C</property> - <property name="halign">start</property> - <property name="use_underline">True</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_auto_copy_toggled" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - </object> - </child> - </object> - </child> - <child type="label"> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">General</property> - <style> - <class name="bold"/> - <class name="margin-top6"/> - </style> - </object> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> + <placeholder/> </child> <child> <object class="GtkFrame"> ===================================== gajim/gtk/htmltextview.py ===================================== @@ -713,26 +713,10 @@ class HtmlTextView(Gtk.TextView): self.plugin_modified = False self._cursor_changed = False - self.connect('button-release-event', self._on_button_release) if standalone: self.connect('query-tooltip', self._query_tooltip) self.create_tags() - @staticmethod - def _on_button_release(textview, event): - if event.button == 1: - # Left Mouse button - - if not app.settings.get('auto_copy'): - return Gdk.EVENT_PROPAGATE - - if not textview.get_buffer().get_has_selection(): - return Gdk.EVENT_PROPAGATE - selected = textview.get_selected_text() - clipboard = textview.get_clipboard(Gdk.SELECTION_CLIPBOARD) - clipboard.set_text(selected, -1) - return Gdk.EVENT_PROPAGATE - def create_tags(self): color = app.css_config.get_value('.gajim-url', StyleAttr.COLOR) @@ -887,3 +871,8 @@ class HtmlTextView(Gtk.TextView): self.add_child_at_anchor(emoji, anchor) buffer_.delete_mark(start_mark) buffer_.delete_mark(end_mark) + + def unselect(self): + buffer_ = self.get_buffer() + insert_iter = buffer_.get_iter_at_mark(buffer_.get_insert()) + buffer_.select_range(insert_iter, insert_iter) ===================================== gajim/gtk/preferences.py ===================================== @@ -119,11 +119,6 @@ class Preferences(Gtk.ApplicationWindow): self._ui.sort_by_show_in_muc_checkbutton.set_active(st) ### Chat tab ### - ## General Settings - - # Enable auto copy - st = app.settings.get('auto_copy') - self._ui.auto_copy.set_active(st) ## Chat Settings # Use speller @@ -492,9 +487,6 @@ class Preferences(Gtk.ApplicationWindow): ctrl.roster.invalidate_sort() ### Chat tab ### - def on_auto_copy_toggled(self, widget): - self.on_checkbutton_toggled(widget, 'auto_copy') - def on_speller_checkbutton_toggled(self, widget): active = widget.get_active() app.settings.set('use_speller', active) ===================================== gajim/message_window.py ===================================== @@ -193,7 +193,6 @@ class MessageWindow(EventHelper): 'switch-tab-7', 'switch-tab-8', 'switch-tab-9', - 'copy-text', ] disabled_for_emacs = ( View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/55c7ed44fc7bb70e27ee07a586585e1… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/55c7ed44fc7bb70e27ee07a586585e1… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Settings: Restore default value if None is passed as value
by Philipp Hörist 28 Aug '20

28 Aug '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 55c7ed44 by lovetox at 2020-08-28T15:44:53+02:00 Settings: Restore default value if None is passed as value Fixes #10247 - - - - - 1 changed file: - gajim/common/settings.py Changes: ===================================== gajim/common/settings.py ===================================== @@ -383,6 +383,13 @@ class _Settings: if setting not in APP_SETTINGS: raise ValueError(f'Invalid app setting: {setting}') + if value is None: + try: + del self._settings['app'][setting] + except KeyError: + pass + return + default = APP_SETTINGS[setting] if not isinstance(value, type(default)): raise TypeError(f'Invalid type for {setting}: ' @@ -484,6 +491,13 @@ class _Settings: if setting not in ACCOUNT_SETTINGS['account']: raise ValueError(f'Invalid account setting: {setting}') + if value is None: + try: + del self._account_settings[account]['account'][setting] + except KeyError: + pass + return + default = ACCOUNT_SETTINGS['account'][setting] if not isinstance(value, type(default)): raise TypeError(f'Invalid type for {setting}: ' @@ -529,6 +543,13 @@ class _Settings: if setting not in ACCOUNT_SETTINGS['group_chat']: raise ValueError(f'Invalid group chat setting: {setting}') + if value is None: + try: + del self._account_settings[account]['group_chat'][setting] + except KeyError: + pass + return + default = ACCOUNT_SETTINGS['group_chat'][setting] if default is HAS_APP_DEFAULT: if context is None: @@ -579,6 +600,13 @@ class _Settings: if setting not in ACCOUNT_SETTINGS['contact']: raise ValueError(f'Invalid contact setting: {setting}') + if value is None: + try: + del self._account_settings[account]['contact'][setting] + except KeyError: + pass + return + default = ACCOUNT_SETTINGS['contact'][setting] if default is HAS_APP_DEFAULT: default = APP_SETTINGS[f'{setting}_default'] View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/55c7ed44fc7bb70e27ee07a586585e16… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/55c7ed44fc7bb70e27ee07a586585e16… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Add lost settings
by Philipp Hörist 28 Aug '20

28 Aug '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 5331e1b8 by lovetox at 2020-08-28T07:52:49+02:00 Add lost settings Settings where lost in the migration - - - - - 1 changed file: - gajim/common/setting_values.py Changes: ===================================== gajim/common/setting_values.py ===================================== @@ -186,6 +186,8 @@ APP_SETTINGS = { 'gc_print_status_default': False, 'gc_print_join_left_default': False, 'gc_send_chatstate_default': 'composing_only', + 'check_for_update': True, + 'last_update_check': '', 'always_ask_for_status_message': False, } View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/5331e1b8593a81cbc4d4cb2f6d529397… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/5331e1b8593a81cbc4d4cb2f6d529397… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Use new JID attributes/methods
by Philipp Hörist 27 Aug '20

27 Aug '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 61605616 by lovetox at 2020-08-27T23:19:28+02:00 Use new JID attributes/methods - - - - - 2246a711 by lovetox at 2020-08-27T23:19:28+02:00 Fix comment spelling - - - - - 30 changed files: - gajim/application.py - gajim/chat_control.py - gajim/common/app.py - gajim/common/client.py - gajim/common/connection_handlers.py - gajim/common/helpers.py - gajim/common/jingle_session.py - gajim/common/logger.py - gajim/common/modules/adhoc_commands.py - gajim/common/modules/announce.py - gajim/common/modules/caps.py - gajim/common/modules/chatstates.py - gajim/common/modules/discovery.py - gajim/common/modules/gateway.py - gajim/common/modules/iq.py - gajim/common/modules/mam.py - gajim/common/modules/message.py - gajim/common/modules/muc.py - gajim/common/modules/presence.py - gajim/common/modules/receipts.py - gajim/common/modules/roster.py - gajim/common/modules/user_activity.py - gajim/common/modules/user_avatar.py - gajim/common/modules/user_location.py - gajim/common/modules/user_mood.py - gajim/common/modules/user_nickname.py - gajim/common/modules/user_tune.py - gajim/common/modules/vcard_avatars.py - gajim/common/modules/vcard_temp.py - gajim/common/structs.py The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/0aba0f325a92768fbec9f93144ce413… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/0aba0f325a92768fbec9f93144ce413… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Remove unused imports
by Philipp Hörist 27 Aug '20

27 Aug '20

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 0abb59bd by lovetox at 2020-08-27T22:10:14+02:00 Remove unused imports - - - - - 3 changed files: - nbxmpp/modules/openpgp.py - nbxmpp/modules/user_avatar.py - nbxmpp/structs.py Changes: ===================================== nbxmpp/modules/openpgp.py ===================================== @@ -23,7 +23,6 @@ from nbxmpp.namespaces import Namespace from nbxmpp.protocol import NodeProcessed from nbxmpp.protocol import Node from nbxmpp.protocol import isResultNode -from nbxmpp.protocol import JID from nbxmpp.protocol import StanzaMalformed from nbxmpp.util import call_on_response from nbxmpp.util import callback ===================================== nbxmpp/modules/user_avatar.py ===================================== @@ -20,7 +20,6 @@ import base64 from nbxmpp.namespaces import Namespace from nbxmpp.protocol import NodeProcessed from nbxmpp.protocol import isResultNode -from nbxmpp.protocol import JID from nbxmpp.structs import StanzaHandler from nbxmpp.structs import AvatarMetaData from nbxmpp.structs import AvatarData ===================================== nbxmpp/structs.py ===================================== @@ -22,7 +22,6 @@ from collections import namedtuple from gi.repository import Soup from gi.repository import Gio -from nbxmpp.protocol import JID from nbxmpp.namespaces import Namespace from nbxmpp.protocol import Protocol from nbxmpp.protocol import Node View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/0abb59bd56c09e20a5bde76a… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/0abb59bd56c09e20a5bde76a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] 4 commits: Make JID object a namedtuple
by Philipp Hörist 27 Aug '20

27 Aug '20

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 723e5007 by lovetox at 2020-08-26T21:39:15+02:00 Make JID object a namedtuple - - - - - 3199c2f0 by lovetox at 2020-08-26T22:20:34+02:00 Use new JID attributes/methods - - - - - 597c55ea by lovetox at 2020-08-27T22:05:41+02:00 Add JID Escaping (XEP-0106) support Fixes #82 - - - - - 570a967b by lovetox at 2020-08-27T22:06:52+02:00 JID: Show punycode when using to_user_string() - - - - - 30 changed files: - nbxmpp/client.py - nbxmpp/dispatcher.py - nbxmpp/examples/client.py - nbxmpp/modules/activity.py - nbxmpp/modules/adhoc.py - nbxmpp/modules/annotations.py - nbxmpp/modules/bookmarks.py - nbxmpp/modules/dataforms.py - nbxmpp/modules/delay.py - nbxmpp/modules/location.py - nbxmpp/modules/mam.py - nbxmpp/modules/message.py - nbxmpp/modules/misc.py - nbxmpp/modules/mood.py - nbxmpp/modules/muc.py - nbxmpp/modules/nickname.py - nbxmpp/modules/omemo.py - nbxmpp/modules/openpgp.py - nbxmpp/modules/presence.py - nbxmpp/modules/receipts.py - nbxmpp/modules/register.py - nbxmpp/modules/tune.py - nbxmpp/modules/user_avatar.py - nbxmpp/old_dispatcher.py - nbxmpp/protocol.py - nbxmpp/structs.py - test/lib/util.py - test/unit/test_bookmarks.py - test/unit/test_error_parsing.py - test/unit/test_jid_parsing.py Changes: ===================================== nbxmpp/client.py ===================================== @@ -313,7 +313,7 @@ class Client(Observable): return self._jid def _set_bound_jid(self, jid): - self._jid = JID(jid) + self._jid = JID.from_string(jid) @property def has_error(self): ===================================== nbxmpp/dispatcher.py ===================================== @@ -362,7 +362,7 @@ class StanzaDispatcher(Observable): if name == 'iq': if stanza.getFrom() is None and own_jid is not None: - stanza.setFrom(own_jid.getBare()) + stanza.setFrom(own_jid.bare) if name == 'message': # https://tools.ietf.org/html/rfc6120#section-8.1.1.1 @@ -373,13 +373,14 @@ class StanzaDispatcher(Observable): to = stanza.getTo() if to is None: stanza.setTo(own_jid) - elif not to.bareMatch(own_jid): + + elif not to.bare_match(own_jid): self._log.warning('Message addressed to someone else: %s', stanza) return if stanza.getFrom() is None: - stanza.setFrom(own_jid.getBare()) + stanza.setFrom(own_jid.bare) # Unwrap carbon try: ===================================== nbxmpp/examples/client.py ===================================== @@ -80,8 +80,8 @@ class TestClient(Gtk.Window): def _create_client(self): self._client = Client(log_context='TEST') - self._client.set_domain(self.address.getDomain()) - self._client.set_username(self.address.getNode()) + self._client.set_domain(self.address.domain) + self._client.set_username(self.address.localpart) self._client.set_resource('test') proxy_ip = self._builder.proxy_ip.get_text() @@ -117,7 +117,7 @@ class TestClient(Gtk.Window): @property def address(self): - return JID(self._builder.address.get_text()) + return JID.from_string(self._builder.address.get_text()) @property def xml_box(self): ===================================== nbxmpp/modules/activity.py ===================================== @@ -91,6 +91,6 @@ class Activity(BaseModule): if data.text: item.addChild('text', payload=data.text) - jid = self._client.get_bound_jid().getBare() + jid = self._client.get_bound_jid().bare self._client.get_module('PubSub').publish( jid, Namespace.ACTIVITY, item, id_='current') ===================================== nbxmpp/modules/adhoc.py ===================================== @@ -41,7 +41,7 @@ class AdHoc(BaseModule): @call_on_response('_command_list_received') def request_command_list(self, jid=None): if jid is None: - jid = self._client.get_bound_jid().getBare() + jid = self._client.get_bound_jid().bare return get_disco_request(Namespace.DISCO_ITEMS, jid, node=Namespace.COMMANDS) ===================================== nbxmpp/modules/annotations.py ===================================== @@ -38,7 +38,7 @@ class Annotations(BaseModule): @property def domain(self): - return self._client.get_bound_jid().getDomain() + return self._client.get_bound_jid().domain @call_on_response('_annotations_received') def request_annotations(self): @@ -59,7 +59,7 @@ class Annotations(BaseModule): notes = [] for note in storage.getTags('note'): try: - jid = JID(note.getAttr('jid')) + jid = JID.from_string(note.getAttr('jid')) except Exception as error: self._log.warning('Invalid JID: %s, %s', note.getAttr('jid'), error) ===================================== nbxmpp/modules/bookmarks.py ===================================== @@ -131,7 +131,7 @@ class Bookmarks(BaseModule): confs = storage.getTags('conference') for conf in confs: try: - jid = JID(conf.getAttr('jid')) + jid = JID.from_string(conf.getAttr('jid')) except Exception as error: self._log.warning('Invalid JID: "%s", %s', conf.getAttr('jid'), @@ -161,7 +161,7 @@ class Bookmarks(BaseModule): return None try: - jid = JID(item.getAttr('id')) + jid = JID.from_string(item.getAttr('id')) except Exception as error: self._log.warning('Invalid JID: "%s", %s', item.getAttr('id'), @@ -209,7 +209,7 @@ class Bookmarks(BaseModule): @call_on_response('_bookmarks_received') def request_bookmarks(self, type_): - jid = self._client.get_bound_jid().getBare() + jid = self._client.get_bound_jid().bare if type_ == BookmarkStoreType.PUBSUB_BOOKMARK_2: self._log.info('Request bookmarks 2 (PubSub)') request = get_pubsub_request(jid, Namespace.BOOKMARKS_2) @@ -272,7 +272,7 @@ class Bookmarks(BaseModule): from_ = stanza.getFrom() if from_ is None: - from_ = self._client.get_bound_jid().getBare() + from_ = self._client.get_bound_jid().bare self._log.info('Received bookmarks from: %s', from_) for bookmark in bookmarks: self._log.info(bookmark) @@ -315,14 +315,14 @@ class Bookmarks(BaseModule): def retract_bookmark(self, bookmark_jid): self._log.info('Retract Bookmark: %s', bookmark_jid) - jid = self._client.get_bound_jid().getBare() + jid = self._client.get_bound_jid().bare self._client.get_module('PubSub').retract(jid, Namespace.BOOKMARKS_2, str(bookmark_jid)) def _store_bookmark_1(self, bookmarks): self._log.info('Store Bookmarks 1 (PubSub)') - jid = self._client.get_bound_jid().getBare() + jid = self._client.get_bound_jid().bare self._bookmark_1_queue = bookmarks item = self._build_storage_node(bookmarks) options = get_publish_options(BOOKMARK_1_OPTIONS) @@ -341,7 +341,7 @@ class Bookmarks(BaseModule): return self._log.info('Store Bookmarks 2 (PubSub)') - jid = self._client.get_bound_jid().getBare() + jid = self._client.get_bound_jid().bare for bookmark in bookmarks: self._bookmark_2_queue[bookmark.jid] = bookmark item = self._build_conference_node(bookmark) @@ -367,7 +367,7 @@ class Bookmarks(BaseModule): return self._node_configuration_in_progress = True - jid = self._client.get_bound_jid().getBare() + jid = self._client.get_bound_jid().bare self._client.get_module('PubSub').get_node_configuration( jid, node, ===================================== nbxmpp/modules/dataforms.py ===================================== @@ -424,7 +424,7 @@ class JidSingleField(ListSingleField): def is_valid(self): if self.value: try: - JID(self.value) + JID.from_string(self.value) return True, '' except Exception as error: return False, error @@ -479,7 +479,7 @@ class JidMultiField(ListMultiField): if self.values: for value in self.values: try: - JID(value) + JID.from_string(value) except Exception as error: return False, error return True, '' ===================================== nbxmpp/modules/delay.py ===================================== @@ -47,18 +47,18 @@ class Delay(BaseModule): # to indicate when the user has set the subject, # the 'from' attr on these delays is the MUC server # but we treat it as user timestamp - jids = [properties.jid.getBare(), - properties.jid.getDomain()] + jids = [properties.jid.bare, + properties.jid.domain] properties.user_timestamp = parse_delay(stanza, from_=jids) else: if properties.from_muc: # Some servers use the MUC JID, others the domain - jids = [properties.jid.getBare(), - properties.jid.getDomain()] + jids = [properties.jid.bare, + properties.jid.domain] else: - jids = [self._client.get_bound_jid().getDomain()] + jids = [self._client.get_bound_jid().domain] server_delay = parse_delay(stanza, from_=jids) if server_delay is not None: ===================================== nbxmpp/modules/location.py ===================================== @@ -70,6 +70,6 @@ class Location(BaseModule): if value is not None: item.addChild(tag, payload=value) - jid = self._client.get_bound_jid().getBare() + jid = self._client.get_bound_jid().bare self._client.get_module('PubSub').publish( jid, Namespace.LOCATION, item, id_='current') ===================================== nbxmpp/modules/mam.py ===================================== @@ -183,7 +183,7 @@ class MAM(BaseModule): continue try: - jid = JID(jid) + jid = JID.from_string(jid) except Exception: self._log.warning('Invalid jid found in preferences: %s', jid) ===================================== nbxmpp/modules/message.py ===================================== @@ -48,7 +48,7 @@ class BaseMessage(BaseModule): elif properties.is_mam_message and not properties.type.is_groupchat: own_jid = self._client.get_bound_jid() - if own_jid.bareMatch(stanza.getFrom()): + if own_jid.bare_match(stanza.getFrom()): properties.jid = stanza.getTo() else: properties.jid = stanza.getFrom() @@ -106,4 +106,4 @@ class BaseMessage(BaseModule): def _parse_self_message(stanza, properties): if properties.type.is_groupchat: return False - return stanza.getFrom().bareMatch(stanza.getTo()) + return stanza.getFrom().bare_match(stanza.getTo()) ===================================== nbxmpp/modules/misc.py ===================================== @@ -38,7 +38,7 @@ def unwrap_carbon(stanza, own_jid): return stanza, None # Carbon must be from our bare jid - if not stanza.getFrom() == own_jid.getBare(): + if stanza.getFrom() != own_jid.new_as_bare(): raise InvalidFrom('Invalid from: %s' % stanza.getAttr('from')) forwarded = carbon.getTag('forwarded', namespace=Namespace.FORWARD) @@ -49,14 +49,14 @@ def unwrap_carbon(stanza, own_jid): # Fill missing to/from to = message.getTo() if to is None: - message.setTo(own_jid.getBare()) + message.setTo(own_jid.bare) frm = message.getFrom() if frm is None: - message.setFrom(own_jid.getBare()) + message.setFrom(own_jid.bare) if type_ == 'received': - if message.getFrom().bareMatch(own_jid): + if message.getFrom().bare_match(own_jid): # Drop 'received' Carbons from ourself, we already # got the message with the 'sent' Carbon or via the # message itself @@ -95,11 +95,11 @@ def unwrap_mam(stanza, own_jid): # Fill missing to/from to = message.getTo() if to is None: - message.setTo(own_jid.getBare()) + message.setTo(own_jid.bare) frm = message.getFrom() if frm is None: - message.setFrom(own_jid.getBare()) + message.setFrom(own_jid.bare) # Timestamp parsing # Most servers dont set the 'from' attr, so we cant check for it ===================================== nbxmpp/modules/mood.py ===================================== @@ -80,6 +80,6 @@ class Mood(BaseModule): if data.text: item.addChild('text', payload=data.text) - jid = self._client.get_bound_jid().getBare() + jid = self._client.get_bound_jid().bare self._client.get_module('PubSub').publish( jid, Namespace.MOOD, item, id_='current') ===================================== nbxmpp/modules/muc.py ===================================== @@ -92,24 +92,22 @@ class MUC(BaseModule): if muc is None: return properties.from_muc = True - properties.muc_jid = properties.jid.copy() - properties.muc_jid.setBare() - properties.muc_nickname = properties.jid.getResource() + properties.muc_jid = properties.jid.new_as_bare() + properties.muc_nickname = properties.jid.resource def _process_muc_user_presence(self, _client, stanza, properties): muc_user = stanza.getTag('x', namespace=Namespace.MUC_USER) if muc_user is None: return properties.from_muc = True - properties.muc_jid = properties.jid.copy() - properties.muc_jid.setBare() + properties.muc_jid = properties.jid.new_as_bare() destroy = muc_user.getTag('destroy') if destroy is not None: alternate = destroy.getAttr('jid') if alternate is not None: try: - alternate = JID(alternate) + alternate = JID.from_string(alternate) except Exception as error: self._log.warning('Invalid alternate JID provided: %s', error) @@ -121,7 +119,7 @@ class MUC(BaseModule): password=muc_user.getTagData('password')) return - properties.muc_nickname = properties.jid.getResource() + properties.muc_nickname = properties.jid.resource # https://xmpp.org/extensions/xep-0045.html#registrar-statuscodes message_status_codes = [ @@ -170,9 +168,8 @@ class MUC(BaseModule): def _process_groupchat_message(self, _client, stanza, properties): properties.from_muc = True - properties.muc_jid = properties.jid.copy() - properties.muc_jid.setBare() - properties.muc_nickname = properties.jid.getResource() or None + properties.muc_jid = properties.jid.new_as_bare() + properties.muc_nickname = properties.jid.resource muc_user = stanza.getTag('x', namespace=Namespace.MUC_USER) if muc_user is not None: @@ -188,7 +185,7 @@ class MUC(BaseModule): if addresses is not None: address = addresses.getTag('address', attrs={'type': 'ofrom'}) if address is not None: - properties.muc_ofrom = JID(address.getAttr('jid')) + properties.muc_ofrom = JID.from_string(address.getAttr('jid')) def _process_message(self, _client, stanza, properties): muc_user = stanza.getTag('x', namespace=Namespace.MUC_USER) @@ -206,10 +203,9 @@ class MUC(BaseModule): return properties.from_muc = True - properties.muc_jid = properties.jid.copy() - properties.muc_jid.setBare() + properties.muc_jid = properties.jid.new_as_bare() - if not properties.jid.isBare: + if not properties.jid.is_bare: return # MUC Config change @@ -253,7 +249,7 @@ class MUC(BaseModule): return data = {} - data['muc'] = JID(direct.getAttr('jid')) + data['muc'] = JID.from_string(direct.getAttr('jid')) data['from_'] = properties.jid data['reason'] = direct.getAttr('reason') data['password'] = direct.getAttr('password') @@ -272,15 +268,14 @@ class MUC(BaseModule): return properties.from_muc = True - properties.muc_jid = properties.jid.copy() - properties.muc_jid.setBare() + properties.muc_jid = properties.jid.new_as_bare() data = {} invite = muc_user.getTag('invite') if invite is not None: - data['muc'] = JID(properties.jid.getBare()) - data['from_'] = JID(invite.getAttr('from')) + data['muc'] = properties.jid.new_as_bare() + data['from_'] = JID.from_string(invite.getAttr('from')) data['reason'] = invite.getTagData('reason') data['password'] = muc_user.getTagData('password') data['type'] = InviteType.MEDIATED @@ -296,8 +291,8 @@ class MUC(BaseModule): decline = muc_user.getTag('decline') if decline is not None: - data['muc'] = JID(properties.jid.getBare()) - data['from_'] = JID(decline.getAttr('from')) + data['muc'] = properties.jid.new_as_bare() + data['from_'] = JID.from_string(decline.getAttr('from')) data['reason'] = decline.getTagData('reason') properties.muc_decline = DeclineData(**data) return @@ -317,7 +312,7 @@ class MUC(BaseModule): nick = data_form['muc#roomnick'].value try: - jid = JID(data_form['muc#jid'].value) + jid = JID.from_string(data_form['muc#jid'].value) except Exception: self._log.warning('Invalid JID on voice request') self._log.warning(stanza) @@ -327,8 +322,7 @@ class MUC(BaseModule): nick=nick, form=data_form) properties.from_muc = True - properties.muc_jid = properties.jid.copy() - properties.muc_jid.setBare() + properties.muc_jid = properties.jid.new_as_bare() def approve_voice_request(self, muc_jid, voice_request): form = voice_request.form @@ -354,7 +348,7 @@ class MUC(BaseModule): users_dict = {} for item in items: try: - jid = JID(item.getAttr('jid')) + jid = JID.from_string(item.getAttr('jid')) except Exception as error: self._log.warning('Invalid JID: %s, %s', item.getAttr('jid'), error) @@ -573,7 +567,7 @@ class MUC(BaseModule): jid = item_dict.get('jid') if jid is not None: try: - jid = JID(jid) + jid = JID.from_string(jid) except InvalidJid as error: raise StanzaMalformed('invalid jid %s, %s' % (jid, error)) ===================================== nbxmpp/modules/nickname.py ===================================== @@ -87,6 +87,6 @@ class Nickname(BaseModule): item = Node('nick', {'xmlns': Namespace.NICK}) if nickname is not None: item.addData(nickname) - jid = self._client.get_bound_jid().getBare() + jid = self._client.get_bound_jid().bare self._client.get_module('PubSub').publish( jid, Namespace.NICK, item, id_='current') ===================================== nbxmpp/modules/omemo.py ===================================== @@ -192,14 +192,14 @@ class OMEMO(BaseModule): item.addChild('device').setAttr('id', device) self._log.info('Set devicelist: %s', devicelist) - jid = self._client.get_bound_jid().getBare() + jid = self._client.get_bound_jid().bare self._client.get_module('PubSub').publish( jid, Namespace.OMEMO_TEMP_DL, item, id_='current') @call_on_response('_devicelist_received') def request_devicelist(self, jid=None): if jid is None: - jid = self._client.get_bound_jid().getBare() + jid = self._client.get_bound_jid().bare self._log.info('Request devicelist from: %s', jid) return get_pubsub_request(jid, Namespace.OMEMO_TEMP_DL, max_items=1) @@ -225,7 +225,7 @@ class OMEMO(BaseModule): self._log.info('Set bundle') node = '%s:%s' % (Namespace.OMEMO_TEMP_BUNDLE, device_id) - jid = self._client.get_bound_jid().getBare() + jid = self._client.get_bound_jid().bare self._client.get_module('PubSub').publish( jid, node, item, id_='current') ===================================== nbxmpp/modules/openpgp.py ===================================== @@ -155,7 +155,7 @@ class OpenPGP(BaseModule): item.addChild('pubkey-metadata', attrs=attrs) self._log.info('Set keylist: %s', keylist) - jid = self._client.get_bound_jid().getBare() + jid = self._client.get_bound_jid().bare self._client.get_module('PubSub').publish( jid, Namespace.OPENPGP_PK, item, id_='current') @@ -169,7 +169,7 @@ class OpenPGP(BaseModule): node = '%s:%s' % (Namespace.OPENPGP_PK, fingerprint) self._log.info('Set public key') - jid = self._client.get_bound_jid().getBare() + jid = self._client.get_bound_jid().bare self._client.get_module('PubSub').publish( jid, node, item, id_='current') @@ -181,7 +181,7 @@ class OpenPGP(BaseModule): @callback def _public_key_received(self, stanza): - jid = JID(stanza.getFrom().getBare()) + jid = stanza.getFrom().bare if not isResultNode(stanza): return raise_error(self._log.info, stanza) @@ -219,7 +219,7 @@ class OpenPGP(BaseModule): @callback def _keylist_received(self, stanza): - jid = JID(stanza.getFrom().getBare()) + jid = stanza.getFrom().bare if not isResultNode(stanza): return raise_error(self._log.info, stanza) @@ -239,7 +239,7 @@ class OpenPGP(BaseModule): @call_on_response('_secret_key_received') def request_secret_key(self): self._log.info('Request secret key') - jid = self._client.get_bound_jid().getBare() + jid = self._client.get_bound_jid().bare return get_pubsub_request(jid, Namespace.OPENPGP_SK, max_items=1) @callback @@ -275,7 +275,7 @@ class OpenPGP(BaseModule): item.setData(b64encode(secret_key)) self._log.info('Set secret key') - jid = self._client.get_bound_jid().getBare() + jid = self._client.get_bound_jid().bare self._client.get_module('PubSub').publish( jid, Namespace.OPENPGP_SK, item, id_='current') @@ -338,7 +338,7 @@ def create_signcrypt_node(stanza, not_encrypted_nodes): stanza.delChild(node) signcrypt = Node('signcrypt', attrs={'xmlns': Namespace.OPENPGP}) - signcrypt.addChild('to', attrs={'jid': stanza.getTo().getBare()}) + signcrypt.addChild('to', attrs={'jid': str(stanza.getTo().bare)}) timestamp = time.strftime('%Y-%m-%dT%H:%M:%SZ', time.gmtime()) signcrypt.addChild('time', attrs={'stamp': timestamp}) ===================================== nbxmpp/modules/presence.py ===================================== @@ -49,7 +49,7 @@ class BasePresence(BaseModule): own_jid = self._client.get_bound_jid() properties.self_presence = own_jid == properties.jid - properties.self_bare = properties.jid.bareMatch(own_jid) + properties.self_bare = properties.jid.bare_match(own_jid) def _parse_priority(self, stanza): priority = stanza.getPriority() ===================================== nbxmpp/modules/receipts.py ===================================== @@ -68,10 +68,10 @@ def build_receipt(stanza): is_muc_pm = isMucPM(stanza) - jid = stanza.getFrom().copy() + jid = stanza.getFrom() typ = stanza.getType() if typ == 'groupchat' or not is_muc_pm: - jid.setBare() + jid = jid.new_as_bare() message = Message(to=jid, typ=typ) if is_muc_pm: ===================================== nbxmpp/modules/register.py ===================================== @@ -168,8 +168,8 @@ class Register(BaseModule): @call_on_response('_on_password_change') def change_password(self, password): - domain = self._client.get_bound_jid().getDomain() - username = self._client.get_bound_jid().getNode() + domain = self._client.get_bound_jid().domain + username = self._client.get_bound_jid().localpart iq = Iq('set', Namespace.REGISTER, to=domain) query = iq.getQuery() query.setTagData('username', username) @@ -192,7 +192,7 @@ class Register(BaseModule): @call_on_response('_default_response') def change_password_with_form(self, form): - domain = self._client.get_bound_jid().getDomain() + domain = self._client.get_bound_jid().domain iq = Iq('set', Namespace.REGISTER, to=domain) iq.setQueryPayload(form) return iq ===================================== nbxmpp/modules/tune.py ===================================== @@ -70,6 +70,6 @@ class Tune(BaseModule): if value is not None: item.addChild(tag, payload=value) - jid = self._client.get_bound_jid().getBare() + jid = self._client.get_bound_jid().bare self._client.get_module('PubSub').publish( jid, Namespace.TUNE, item, id_='current') ===================================== nbxmpp/modules/user_avatar.py ===================================== @@ -88,7 +88,7 @@ class UserAvatar(BaseModule): def _avatar_data_received(self, stanza): jid = stanza.getFrom() if jid is None: - jid = JID(self._client.get_bound_jid().getBare()) + jid = self._client.get_bound_jid().bare if not isResultNode(stanza): return raise_error(self._log.warning, stanza) ===================================== nbxmpp/old_dispatcher.py ===================================== @@ -561,7 +561,7 @@ class XMPPDispatcher(PlugIn): if name == 'iq': if stanza.getFrom() is None and own_jid is not None: - stanza.setFrom(own_jid.getBare()) + stanza.setFrom(own_jid.bare) if name == 'message': # https://tools.ietf.org/html/rfc6120#section-8.1.1.1 @@ -572,12 +572,13 @@ class XMPPDispatcher(PlugIn): to = stanza.getTo() if to is None: stanza.setTo(own_jid) - elif not to.bareMatch(own_jid): + + elif not to.bare_match(own_jid): log.warning('Message addressed to someone else: %s', stanza) return if stanza.getFrom() is None: - stanza.setFrom(own_jid.getBare()) + stanza.setFrom(own_jid.bare) # Unwrap carbon try: ===================================== nbxmpp/protocol.py ===================================== @@ -21,7 +21,9 @@ sub- stanzas) handling routines import time import hashlib import functools +import warnings from base64 import b64encode +from collections import namedtuple from gi.repository import GLib @@ -439,6 +441,7 @@ _status_conditions = { } _localpart_disallowed_chars = set('"&\'/:<>@') +_localpart_escape_chars = ' "&\'/:<>@' STREAM_NOT_AUTHORIZED = 'urn:ietf:params:xml:ns:xmpp-streams not-authorized' @@ -659,33 +662,11 @@ stream_exceptions = {'bad-format': BadFormat, 'xml-not-well-formed': XMLNotWellFormed} -(a)functools.lru_cache(maxsize=None) -def parse_jid(jid): - # https://tools.ietf.org/html/rfc7622#section-3.2 - - # Remove any portion from the first '/' character to the end of the - # string (if there is a '/' character present). - - # Remove any portion from the beginning of the string to the first - # '@' character (if there is an '@' character present). - - if jid.find('/') != -1: - rest, resourcepart = jid.split('/', 1) - resourcepart = validate_resourcepart(resourcepart) - else: - rest, resourcepart = jid, '' - - if rest.find('@') != -1: - localpart, domainpart = rest.split('@', 1) - localpart = validate_localpart(localpart) - else: - localpart, domainpart = '', rest +def deprecation_warning(message): + warnings.warn(message, DeprecationWarning) - domainpart = validate_domainpart(domainpart) - return localpart, domainpart, resourcepart - -(a)functools.lru_cache(maxsize=32768) +(a)functools.lru_cache(maxsize=None) def validate_localpart(localpart): if not localpart or len(localpart.encode()) > 1023: raise LocalpartByteLimit @@ -700,7 +681,7 @@ def validate_localpart(localpart): raise LocalpartNotAllowedChar -(a)functools.lru_cache(maxsize=32768) +(a)functools.lru_cache(maxsize=None) def validate_resourcepart(resourcepart): if not resourcepart or len(resourcepart.encode()) > 1023: raise ResourcepartByteLimit @@ -712,7 +693,7 @@ def validate_resourcepart(resourcepart): raise ResourcepartNotAllowedChar -(a)functools.lru_cache(maxsize=4096) +(a)functools.lru_cache(maxsize=None) def validate_domainpart(domainpart): if not domainpart: raise DomainpartByteLimit @@ -729,167 +710,265 @@ def validate_domainpart(domainpart): domainpart = domainpart[:-1] try: - idna.encode(domainpart, uts46=True) + idna_encode(domainpart) except Exception: raise DomainpartNotAllowedChar return domainpart -class JID: - """ - JID can be built from string, modified, compared, serialised into string - """ +(a)functools.lru_cache(maxsize=None) +def idna_encode(domain): + return idna.encode(domain, uts46=True).decode() - def __init__(self, jid=None, node='', domain='', resource=''): - """ - JID can be specified as string (jid argument) or as separate parts - Examples: - JID('node@domain/resource') - JID(node='node',domain='domain.org') - """ - if not jid and not domain: - raise ValueError('JID must contain at least domain name') +(a)functools.lru_cache(maxsize=None) +def escape_localpart(localpart): + # https://xmpp.org/extensions/xep-0106.html#bizrules-algorithm + # + # If there are any instances of character sequences that correspond + # to escapings of the disallowed characters + # (e.g., the character sequence "\27") or the escaping character + # (i.e., the character sequence "\5c") in the source address, + # the leading backslash character MUST be escaped to the character + # sequence "\5c" + + for char in '\\' + _localpart_escape_chars: + seq = "\\{:02x}".format(ord(char)) + localpart = localpart.replace(seq, "\\5c{:02x}".format(ord(char))) + + # Escape all other chars + for char in _localpart_escape_chars: + localpart = localpart.replace(char, "\\{:02x}".format(ord(char))) + + return localpart + + +(a)functools.lru_cache(maxsize=None) +def unescape_localpart(localpart): + if localpart.startswith('\\20') or localpart.endswith('\\20'): + # Escaped JIDs are not allowed to start or end with \20 + # so this localpart must be already unescaped + return localpart + + for char in _localpart_escape_chars: + seq = "\\{:02x}".format(ord(char)) + localpart = localpart.replace(seq, char) + + for char in _localpart_escape_chars + "\\": + seq = "\\5c{:02x}".format(ord(char)) + localpart = localpart.replace(seq, "\\{:02x}".format(ord(char))) + + return localpart + + +class JID(namedtuple('JID', + ['jid', 'localpart', 'domain', 'resource'])): + + __slots__ = [] + + def __new__(cls, jid=None, localpart=None, domain=None, resource=None): + if jid is not None: + deprecation_warning('JID(jid) is deprecated, use from_string()') + return JID.from_string(str(jid)) + + if localpart is not None: + localpart = validate_localpart(localpart) + + domain = validate_domainpart(domain) + + if resource is not None: + resource = validate_resourcepart(resource) + + return super().__new__(cls, None, localpart, domain, resource) - if isinstance(jid, JID): - self.node, self.domain = jid.node, jid.domain - self.resource = jid.resource - elif domain: - self.node, self.domain, self.resource = node, domain, resource + @classmethod + @functools.lru_cache(maxsize=None) + def from_string(cls, jid_string): + # https://tools.ietf.org/html/rfc7622#section-3.2 + + # Remove any portion from the first '/' character to the end of the + # string (if there is a '/' character present). + + # Remove any portion from the beginning of the string to the first + # '@' character (if there is an '@' character present). + + if jid_string.find('/') != -1: + rest, resourcepart = jid_string.split('/', 1) else: - self.node, self.domain, self.resource = parse_jid(jid) + rest, resourcepart = jid_string, None - def copy(self): - return JID(self) + if rest.find('@') != -1: + localpart, domainpart = rest.split('@', 1) + else: + localpart, domainpart = None, rest - def getNode(self): - """ - Return the node part of the JID - """ - return self.node + return cls(jid=None, + localpart=localpart, + domain=domainpart, + resource=resourcepart) - def setNode(self, node): - """ - Set the node part of the JID to new value. Specify None to remove - the node part - """ - self.node = node.lower() + @classmethod + @functools.lru_cache(maxsize=None) + def from_user_input(cls, user_input, escaped=False): + # Use this if we want JIDs to be escaped according to XEP-0106 + # The standard JID parsing cannot be applied because user_input is + # not a valid JID. - def getDomain(self): - """ - Return the domain part of the JID - """ - return self.domain + # Only user_input which after escaping result in a bare JID can be + # successfully parsed. - def setDomain(self, domain): - """ - Set the domain part of the JID to new value - """ - self.domain = domain.lower() + # The assumpution is user_input is a bare JID so we start with an + # rsplit on @ because we assume there is no resource, so the char @ + # in the localpart can later be escaped. - def getResource(self): - """ - Return the resource part of the JID - """ - return self.resource + if escaped: + # for convenience + return cls.from_string(user_input) - def setResource(self, resource): - """ - Set the resource part of the JID to new value. - Specify None to remove the resource part - """ - self.resource = resource + if '@' in user_input: + localpart, domainpart = user_input.rsplit('@', 1) + if localpart.startswith(' ') or localpart.endswith(' '): + raise LocalpartNotAllowedChar - def getStripped(self): - """ - Return the bare representation of JID. I.e. string value w/o resource - """ - if not self.node: - return self.domain - return '%s@%s' % (self.node, self.domain) + localpart = escape_localpart(localpart) - def getBare(self): - """ - Return the bare representation of JID. I.e. string value w/o resource - """ - if not self.node: - return self.domain - return '%s@%s' % (self.node, self.domain) + else: + localpart = None + domainpart = user_input - def setBare(self): - """ - Deletes the resource which makes the JID bare - """ - self.resource = '' + return cls(jid=None, + localpart=localpart, + domain=domainpart, + resource=None) - @property - def isBare(self): - return self.node and self.domain and not self.resource + def __str__(self): + if self.localpart: + jid = f'{self.localpart}(a){self.domain}' + else: + jid = self.domain - @property - def isDomain(self): - return self.domain and not self.node and not self.resource + if self.resource is not None: + return f'{jid}/{self.resource}' + return jid - @property - def isFull(self): - return bool(self.domain and self.node and self.resource) + def __hash__(self): + return hash(str(self)) def __eq__(self, other): - """ - Compare the JID to another instance or to string for equality - """ - if not isinstance(other, JID): + if isinstance(other, str): + deprecation_warning('comparing string with JID is deprected') try: - other = JID(other) + return JID.from_string(other) == self except Exception: return False - - return (self.node == other.node and - self.domain == other.domain and - self.resource == other.resource) + return super().__eq__(other) def __ne__(self, other): - """ - Compare the JID to another instance or to string for non-equality - """ return not self.__eq__(other) - def bareMatch(self, other): - """ - Compare the node and domain parts of the JID's for equality - """ - if not isinstance(other, JID): - try: - other = JID(other) - except Exception: - return False + def domain_to_ascii(self): + return idna_encode(self.domain) - return (self.node == other.node and - self.domain == other.domain) + @property + def bare(self): + if self.localpart is not None: + return f'{self.localpart}(a){self.domain}' + return self.domain - def __str__(self): - """ - Serialise JID into string - """ - if self.node: - jid = '%s@%s' % (self.node, self.domain) + @property + def is_bare(self): + return self.resource is None + + def new_as_bare(self): + if self.resource is None: + return self + return self._replace(resource=None) + + def bare_match(self, other): + if isinstance(other, str): + other = JID.from_string(other) + return self.bare == other.bare + + @property + def is_domain(self): + return self.localpart is None and self.resource is None + + @property + def is_full(self): + return (self.localpart is not None and + self.domain is not None and + self.resource is not None) + + def new_with(self, **kwargs): + return self._replace(**kwargs) + + def to_user_string(self, show_punycode=True): + domain = self.domain_to_ascii() + if domain.startswith('xn--') and show_punycode: + domain_encoded = f' ({domain})' else: - jid = self.domain + domain_encoded = '' - if self.resource: - return '%s/%s' % (jid, self.resource) - return jid + if self.localpart is None: + return f'{self}{domain_encoded}' - def __hash__(self): - """ - Produce hash of the JID, Allows to use JID objects as keys of the - dictionary - """ - return hash(str(self)) + localpart = unescape_localpart(self.localpart) + + if self.resource is None: + return f'{localpart}(a){self.domain}{domain_encoded}' + return f'{localpart}(a){self.domain}/{self.resource}{domain_encoded}' + + def bareMatch(self, other): + deprecation_warning('bareMatch() is deprected use bare_match()') + return self.bare_match(other) + + @property + def isBare(self): + deprecation_warning('isBare() is deprected use ' + 'the attribute is_bare') + return self.is_bare + + @property + def isDomain(self): + deprecation_warning('isDomain() is deprected use ' + 'the attribute is_domain') + return self.is_domain - def __repr__(self): - return str(self) + @property + def isFull(self): + deprecation_warning('isFull() is deprected use ' + 'the attribute is_full') + return self.is_full + + def copy(self): + deprecation_warning('copy() is not needed, JID is immutable') + return self + + def getNode(self): + deprecation_warning('getNode() is deprected use ' + 'the attribute localpart') + return self.localpart + + def getDomain(self): + deprecation_warning('getDomain() is deprected use ' + 'the attribute domain') + return self.domain + + def getResource(self): + deprecation_warning('getResource() is deprected use ' + 'the attribute resource') + return self.resource + + def getStripped(self): + deprecation_warning('getStripped() is deprected use ' + 'the attribute bare') + return self.bare + + def getBare(self): + deprecation_warning('getBare() is deprected use ' + 'the attribute bare') + return self.bare class StreamErrorNode(Node): @@ -1035,7 +1114,7 @@ class Protocol(Node): """ attr = self.getAttr('jid') if attr: - return JID(attr) + return JID.from_string(attr) return attr def getID(self): @@ -1048,7 +1127,9 @@ class Protocol(Node): """ Set the value of the 'to' attribute """ - self.setAttr('to', JID(val)) + if not isinstance(val, JID): + val = JID.from_string(val) + self.setAttr('to', val) def getType(self): """ @@ -1060,7 +1141,9 @@ class Protocol(Node): """ Set the value of the 'from' attribute """ - self.setAttr('from', JID(val)) + if not isinstance(val, JID): + val = JID.from_string(val) + self.setAttr('from', val) def setType(self, val): """ @@ -1202,7 +1285,8 @@ class Protocol(Node): Set the item 'item' to the value 'val' """ if item in ['to', 'from']: - val = JID(val) + if not isinstance(val, JID): + val = JID.from_string(val) return self.setAttr(item, val) ===================================== nbxmpp/structs.py ===================================== @@ -250,7 +250,7 @@ class DiscoInfo(namedtuple('DiscoInfo', 'stanza identities features dataforms ti return self.muc_identity_name if self.jid is not None: - return self.jid.getNode() + return self.jid.localpart return None @property @@ -931,9 +931,7 @@ class PresenceProperties: def new_jid(self): if not self.is_nickname_changed: raise ValueError('This is not a nickname change') - jid = JID(self.jid) - jid.setResource(self.muc_user.nick) - return jid + return self.jid.new_with(resource=self.muc_user.nick) @property def is_kicked(self): ===================================== test/lib/util.py ===================================== @@ -14,7 +14,7 @@ class StanzaHandlerTest(unittest.TestCase): self.client.is_websocket = False self.dispatcher = StanzaDispatcher(self.client) - self.client.get_bound_jid.return_value = JID('test(a)test.test') + self.client.get_bound_jid.return_value = JID.from_string('test(a)test.test') self.dispatcher.reset_parser() self.dispatcher.process_data(STREAM_START) ===================================== test/unit/test_bookmarks.py ===================================== @@ -13,12 +13,12 @@ class BookmarkTest(StanzaHandlerTest): def _on_message(_con, _stanza, properties): data = [ - BookmarkData(jid=JID('theplay(a)conference.shakespeare.lit'), + BookmarkData(jid=JID.from_string('theplay(a)conference.shakespeare.lit'), name='The Play\'s the Thing', autojoin=True, password='pass', nick='JC'), - BookmarkData(jid=JID('second(a)conference.shakespeare.lit'), + BookmarkData(jid=JID.from_string('second(a)conference.shakespeare.lit'), name='Second room', autojoin=False, password=None, @@ -71,7 +71,7 @@ class BookmarkTest(StanzaHandlerTest): def test_bookmark_2_parsing(self): def _on_message(_con, _stanza, properties): - data = BookmarkData(jid=JID('theplay(a)conference.shakespeare.lit'), + data = BookmarkData(jid=JID.from_string('theplay(a)conference.shakespeare.lit'), name='The Play\'s the Thing', autojoin=True, password=None, ===================================== test/unit/test_error_parsing.py ===================================== @@ -1,6 +1,7 @@ import unittest from nbxmpp.protocol import Iq +from nbxmpp.protocol import JID from nbxmpp.util import error_factory @@ -29,4 +30,4 @@ class TestErrorParsing(unittest.TestCase): self.assertEqual(error.get_text('de'), 'File zu groß. Erlaubt sind 20000 bytes') self.assertEqual(error.type, 'modify') self.assertEqual(error.id, 'step_03') - self.assertEqual(error.jid, 'upload.montague.tld') + self.assertEqual(error.jid, JID.from_string('upload.montague.tld')) ===================================== test/unit/test_jid_parsing.py ===================================== @@ -30,7 +30,7 @@ class JIDParsing(unittest.TestCase): ] for jid in tests: - JID(jid) + JID.from_string(jid) def test_invalid_jids(self): tests = [ @@ -48,7 +48,7 @@ class JIDParsing(unittest.TestCase): for jid, exception in tests: with self.assertRaises(exception): - JID(jid) + JID.from_string(jid) def test_ip_literals(self): tests = [ @@ -57,7 +57,7 @@ class JIDParsing(unittest.TestCase): ] for jid in tests: - JID(jid) + JID.from_string(jid) def test_jid_equality(self): tests = [ @@ -67,4 +67,112 @@ class JIDParsing(unittest.TestCase): ] for jid in tests: - self.assertTrue(JID(jid) == jid) + self.assertTrue(JID.from_string(jid) == JID.from_string(jid)) + + def test_jid_escaping(self): + # (user input, escaped) + tests = [ + (r'space cadet(a)example.com', + r'space\20cadet(a)example.com'), + + (r'call me "ishmael"@example.com', + r'call\20me\20\22ishmael\22(a)example.com'), + + (r'at&t guy(a)example.com', + r'at\26t\20guy(a)example.com'), + + ('d\'artagnan(a)example.com', + r'd\27artagnan(a)example.com'), + + (r'/.fanboy(a)example.com', + r'\2f.fanboy(a)example.com'), + + (r'::foo::@example.com', + r'\3a\3afoo\3a\3a(a)example.com'), + + (r'<foo>@example.com', + r'\3cfoo\3e(a)example.com'), + + (r'user@host@example.com', + r'user\40host(a)example.com'), + + (r'c:\net@example.com', + r'c\3a\net(a)example.com'), + + (r'c:\\net@example.com', + r'c\3a\\net(a)example.com'), + + (r'c:\cool stuff(a)example.com', + r'c\3a\cool\20stuff(a)example.com'), + + (r'c:\5commas@example.com', + r'c\3a\5c5commas(a)example.com'), + + (r'call me\20(a)example.com', + r'call\20me\5c20(a)example.com'), + ] + + tests2 = [ + 'juliet(a)example.com', + 'juliet(a)example.com', + 'juliet(a)example.com', + 'juliet(a)example.com', + 'fussball(a)example.com', + 'fu\U000000DFball(a)example.com', + '\U000003C0(a)example.com', + '\U000003A3(a)example.com', + '\U000003C3(a)example.com', + '\U000003C2(a)example.com', + 'example.com', + ] + + test3 = [ + '\\20callme\\20(a)example.com', + '\\20callme(a)example.com', + 'callme\\20(a)example.com', + ] + + test4 = [ + ('call\\20me(a)example.com', 'call me(a)example.com',) + ] + + fail_tests = [ + r'c:\5commas@example.com/asd', + r'juliet(a)example.com/test' + ] + + for user_input, escaped in tests: + # Parse user input and escape it + jid = JID.from_user_input(user_input) + + self.assertTrue(jid.domain == 'example.com') + self.assertTrue(str(jid) == escaped) + self.assertTrue(jid.to_user_string() == user_input) + + # We must fail on invalid JIDs + with self.assertRaises(Exception): + JID.from_string(user_input) + + # Parse escaped JIDs + jid = JID.from_string(escaped) + self.assertTrue(str(jid) == escaped) + self.assertTrue(jid.domain == 'example.com') + + for jid in tests2: + # show that from_string() and from_user_input() produce the same + # result for valid bare JIDs + self.assertTrue(JID.from_string(jid) == JID.from_user_input(jid)) + + for jid in test3: + # JIDs starting or ending with \20 are not escaped + self.assertTrue(JID.from_string(jid).to_user_string() == jid) + + for user_input, user_string in test4: + # Test escaped keyword argument + self.assertTrue(JID.from_user_input(user_input, escaped=True) != JID.from_user_input(user_input)) + self.assertTrue(JID.from_user_input(user_input, escaped=True).to_user_string() == user_string) + + for user_input in fail_tests: + # from_user_input does only support bare jids + with self.assertRaises(Exception): + JID.from_user_input(user_input) View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/dac89332b570dedabfd4f0d… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/dac89332b570dedabfd4f0d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Helpers: Drop webbrowser
by Philipp Hörist 26 Aug '20

26 Aug '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 36044900 by André Apitzsch at 2020-08-26T22:43:20+02:00 Helpers: Drop webbrowser Gio.AppInfo on Windows supports web and mail types - - - - - 0aba0f32 by André Apitzsch at 2020-08-26T22:43:20+02:00 Use system map application to open geo links if available - - - - - 1 changed file: - gajim/common/helpers.py Changes: ===================================== gajim/common/helpers.py ===================================== @@ -32,7 +32,6 @@ import sys import re import os import subprocess -import webbrowser import base64 import hashlib import shlex @@ -1101,6 +1100,9 @@ def parse_uri(uri): if not lon: return URI(type=URIType.UNKNOWN, data=uri) + if Gio.AppInfo.get_default_for_uri_scheme('geo'): + return URI(type=URIType.GEO, data=uri) + uri = geo_provider_from_location(lat, lon) return URI(type=URIType.GEO, data=uri) @@ -1119,17 +1121,10 @@ def open_uri(uri, account=None): open_file(uri.data) elif uri.type == URIType.MAIL: - uri = 'mailto:%s' % uri.data - if os.name == 'nt': - webbrowser.open(uri) - else: - Gio.AppInfo.launch_default_for_uri(uri) + Gio.AppInfo.launch_default_for_uri(f'mailto:{uri.data}') elif uri.type in (URIType.WEB, URIType.GEO): - if os.name == 'nt': - webbrowser.open(uri.data) - else: - Gio.AppInfo.launch_default_for_uri(uri.data) + Gio.AppInfo.launch_default_for_uri(uri.data) elif uri.type == URIType.AT: app.interface.new_chat_from_jid(account, uri.data) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/4934434a97da6e42b51a90de891cff3… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/4934434a97da6e42b51a90de891cff3… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] DOAP: Add XEP-0441
by Philipp Hörist 26 Aug '20

26 Aug '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 4934434a by wurstsalat at 2020-08-26T08:25:29+02:00 DOAP: Add XEP-0441 - - - - - 1 changed file: - data/gajim.doap Changes: ===================================== data/gajim.doap ===================================== @@ -584,5 +584,12 @@ <xmpp:version>0.2</xmpp:version> </xmpp:SupportedXep> </implements> + <implements> + <xmpp:SupportedXep> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0441.html" /> + <xmpp:status>complete</xmpp:status> + <xmpp:version>0.2</xmpp:version> + </xmpp:SupportedXep> + </implements> </Project> </rdf:RDF> View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/4934434a97da6e42b51a90de891cff3a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/4934434a97da6e42b51a90de891cff3a… 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