Commits

commits@gajim.org

17632 discussions

[Git][gajim/python-nbxmpp][master] 3 commits: chore: Add config files for git-chglog
by Philipp Hörist (＠lovetox) 18 May '22

18 May '22

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 2b49dcca by lovetox at 2022-05-18T20:09:52+02:00 chore: Add config files for git-chglog - - - - - 5367dc30 by lovetox at 2022-05-18T20:11:37+02:00 chore: Update ChangeLog - - - - - 319eb623 by lovetox at 2022-05-18T20:11:37+02:00 release: 3.0.2 - - - - - 5 changed files: - + .chglog/CHANGELOG.tpl.md - + .chglog/config.yml - ChangeLog - nbxmpp/__init__.py - setup.cfg Changes: ===================================== .chglog/CHANGELOG.tpl.md ===================================== @@ -0,0 +1,44 @@ +{{ if .Versions -}} +<a name="unreleased"></a> +## [Unreleased] + +{{ if .Unreleased.CommitGroups -}} +{{ range .Unreleased.CommitGroups -}} +{{ .Title }} + +{{ range .Commits -}} + * {{if .Refs}}{{range .Refs}}#{{.Ref}} {{end}}{{end}}{{ if .Scope }}**{{ .Scope }}:** {{ end }}{{ .Subject }} +{{ end }} +{{ end -}} +{{ end -}} +{{ end -}} + + +{{ range .Versions }} +<a name="{{ .Tag.Name }}"></a> +## {{ if .Tag.Previous }}[{{ .Tag.Name }}]{{ else }}{{ .Tag.Name }}{{ end }} - {{ datetime "2006-01-02" .Tag.Date }} +{{ range .CommitGroups -}} +{{ .Title }} +{{ range .Commits -}} + * {{ if .Scope }}**{{ .Scope }}:** {{ end }}{{ .Subject }} +{{ end }} +{{ end -}} + +{{- if .NoteGroups -}} +{{ range .NoteGroups -}} +{{ .Title }} +{{ range .Notes }} +{{ .Body }} +{{ end }} +{{ end -}} +{{ end -}} +{{ end -}} + +{{- if .Versions }} +[Unreleased]: {{ .Info.RepositoryURL }}/compare/{{ $latest := index .Versions 0 }}{{ $latest.Tag.Name }}...HEAD +{{ range .Versions -}} +{{ if .Tag.Previous -}} +[{{ .Tag.Name }}]: {{ $.Info.RepositoryURL }}/compare/{{ .Tag.Previous.Name }}...{{ .Tag.Name }} +{{ end -}} +{{ end -}} +{{ end -}} \ No newline at end of file ===================================== .chglog/config.yml ===================================== @@ -0,0 +1,33 @@ +style: gitlab +template: CHANGELOG.tpl.md +info: + title: CHANGELOG + repository_url: https://dev.gajim.org/gajim/python-nbxmpp +options: + commits: + filters: + Type: + - feat + - perf + - fix + commit_groups: + sort_by: Custom + title_order: + - feat + - perf + - fix + title_maps: + feat: New + perf: Performance Improvements + fix: Bug Fixes + header: + pattern: "^(\\w*)\\:\\s(.*)$" + pattern_maps: + - Type + - Subject + issues: + prefix: + - "#" + refs: + actions: + - Fixes ===================================== ChangeLog ===================================== @@ -1,3 +1,12 @@ +python-nbxmpp 3.0.2 (18 May 2022) + + Bug Fixes + + * Roster: Raise exception if a full jid is found + * AdHoc: Don’t raise on empty nodes + * Roster: Don’t fail when no roster attribute is found + * #126 Remove redundant wheel dependency + python-nbxmpp 3.0.1 (09 May 2022) Bugfix ===================================== nbxmpp/__init__.py ===================================== @@ -4,4 +4,4 @@ from .protocol import * gi.require_version('Soup', '2.4') -__version__: str = '3.0.1' +__version__: str = '3.0.2' ===================================== setup.cfg ===================================== @@ -1,6 +1,6 @@ [metadata] name = nbxmpp -version = 3.0.1 +version = 3.0.2 description = XMPP Library author = Yann Leboulanger, Philipp Hoerist author_email = gajim-devel(a)gajim.org View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/e81b1dae9f197ca3bc7ffee… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/e81b1dae9f197ca3bc7ffee… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: Draw icon avatars with correct size and scale
by Daniel Brötzmann (＠wurstsalat) 18 May '22

18 May '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: d75ac091 by wurstsalat at 2022-05-18T19:33:25+02:00 fix: Draw icon avatars with correct size and scale - - - - - 1 changed file: - gajim/gtk/avatar.py Changes: ===================================== gajim/gtk/avatar.py ===================================== @@ -180,17 +180,17 @@ def add_status_to_avatar(surface: cairo.ImageSurface, def get_icon_avatar(size: int, scale: int, icon_name: str) -> cairo.ImageSurface: - - if scale is not None: - size = size * scale - width = size height = size - surface = cairo.ImageSurface(cairo.Format.ARGB32, width, height) + surface = cairo.ImageSurface( + cairo.Format.ARGB32, + width * scale, + height * scale) + surface.set_device_scale(scale, scale) context = cairo.Context(surface) - pixbuf = load_icon_pixbuf(icon_name, size=size, scale=scale) + pixbuf = load_icon_pixbuf(icon_name, size=size, scale=1) Gdk.cairo_set_source_pixbuf( context, pixbuf, View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d75ac0918fe03a1fbece36179c4ada55… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d75ac0918fe03a1fbece36179c4ada55… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: Don't fail when trying to remove chat history
by Daniel Brötzmann (＠wurstsalat) 18 May '22

18 May '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 7a3a6822 by wurstsalat at 2022-05-18T19:30:01+02:00 fix: Don't fail when trying to remove chat history A group chat from bookmarks could have no history at all, because Gajim never joined it in the past. Fixes #10880 - - - - - 1 changed file: - gajim/common/storage/archive.py Changes: ===================================== gajim/common/storage/archive.py ===================================== @@ -1384,7 +1384,11 @@ def remove_history(self, account: str, jid: JID) -> None: If it's a group chat, remove last MAM ID as well. """ account_id = self.get_account_id(account) - jid_id = self.get_jid_id(jid) + try: + jid_id = self.get_jid_id(jid) + except ValueError: + log.info('No history entries for: %s', jid) + return sql = 'DELETE FROM logs WHERE account_id = ? AND jid_id = ?' self._con.execute(sql, (account_id, jid_id)) @@ -1392,7 +1396,11 @@ def remove_history(self, account: str, jid: JID) -> None: log.info('Removed history for: %s', jid) def forget_jid_data(self, account: str, jid: JID) -> None: - jid_id = self.get_jid_id(jid) + try: + jid_id = self.get_jid_id(jid) + except ValueError: + log.info('No history entries for: %s', jid) + return sql = 'DELETE FROM jids WHERE jid_id = ?' self._con.execute(sql, (jid_id,)) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/7a3a6822aa4459701e27571c923dbac6… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/7a3a6822aa4459701e27571c923dbac6… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: fix: Trayicon: Remove obsolete config option
by Philipp Hörist (＠lovetox) 17 May '22

17 May '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: da400c0d by lovetox at 2022-05-17T22:42:51+02:00 fix: Trayicon: Remove obsolete config option - Remove "on_event" because it is obsolete and none functional - Rename config value to show_trayicon - Preferences: Change to SwitchSetting - - - - - 574e387c by lovetox at 2022-05-17T23:33:05+02:00 fix: Main: Show window correctly on startup When show_main_window_on_startup is set to never, show_all() was never called leading to an empty window after raising the application. Fixes #10865 - - - - - 4 changed files: - gajim/common/setting_values.py - gajim/gtk/main.py - gajim/gtk/preferences.py - gajim/gtk/status_icon.py Changes: ===================================== gajim/common/setting_values.py ===================================== @@ -92,6 +92,7 @@ class _ACCOUNT_DEFAULT: 'show_subject_on_join', 'show_transports_group', 'show_xhtml', + 'show_trayicon', 'showoffline', 'sort_by_show_in_muc', 'sort_by_show_in_roster', @@ -161,7 +162,6 @@ class _ACCOUNT_DEFAULT: 'show_main_window_on_startup', 'speller_language', 'stun_server', - 'trayicon', 'video_framerate', 'video_input_device', 'video_size', @@ -185,7 +185,7 @@ class _ACCOUNT_DEFAULT: 'autoxa_message': '', 'ask_online_status': False, 'ask_offline_status': False, - 'trayicon': 'always', + 'show_trayicon': True, 'allow_hide_roster': False, 'roster_theme': 'default', 'sort_by_show_in_roster': True, ===================================== gajim/gtk/main.py ===================================== @@ -99,6 +99,7 @@ def __init__(self) -> None: self.connect('motion-notify-event', self._on_window_motion_notify) self.connect('notify::is-active', self._on_window_active) self.connect('delete-event', self._on_window_delete) + self.connect('window-state-event', self._on_window_state_changed) self._ui.connect_signals(self) @@ -164,18 +165,17 @@ def _prepare_window(self) -> None: window_width = app.settings.get('mainwin_width') window_height = app.settings.get('mainwin_height') resize_window(self, window_width, window_height) + self.show_all() - if app.settings.get('show_main_window_on_startup') == 'always': - self.show_all() - elif app.settings.get('show_main_window_on_startup') == 'never': - if app.settings.get('trayicon') != 'always': - # Without trayicon, we have to show the main window - self.show_all() - app.settings.set('last_main_window_visible', True) - else: - if (app.settings.get('last_main_window_visible') or - app.settings.get('trayicon') != 'always'): - self.show_all() + show_main_window = app.settings.get('show_main_window_on_startup') + if (show_main_window == 'always' or + not app.settings.get('show_trayicon')): + # Without trayicon, we have to show the main window + return + + if (show_main_window == 'never' or + not app.settings.get('last_main_window_visible')): + self.hide() def _on_account_enabled(self, event: events.AccountEnabled) -> None: self._account_side_bar.add_account(event.account) @@ -428,6 +428,15 @@ def _on_ok(is_checked: bool) -> None: callback=_on_ok)]).show() return True + def _on_window_state_changed(self, + window: MainWindow, + event: Gdk.EventWindowState) -> None: + + iconified = bool(Gdk.WindowState.ICONIFIED & event.new_window_state) + hidden = bool(Gdk.WindowState.WITHDRAWN & event.new_window_state) + visible = not (iconified or hidden) + app.settings.set('last_main_window_visible', visible) + def _set_startup_finished(self) -> None: self._startup_finished = True self._chat_page.set_startup_finished() @@ -807,8 +816,6 @@ def quit(self) -> None: window_width, window_height = self.get_size() app.settings.set('mainwin_width', window_width) app.settings.set('mainwin_height', window_height) - app.settings.set( - 'last_main_window_visible', self.get_property('visible')) app.settings.save() def on_continue2(message: Optional[str]) -> None: ===================================== gajim/gtk/preferences.py ===================================== @@ -458,18 +458,12 @@ def __init__(self, *args: Any) -> None: class VisualNotifications(PreferenceBox): def __init__(self, *args: Any) -> None: - trayicon_items = { - 'never': _('Hide icon'), - 'on_event': _('Only show for pending events'), - 'always': _('Always show icon'), - } settings = [ - Setting(SettingKind.POPOVER, + Setting(SettingKind.SWITCH, _('Notification Area Icon'), SettingType.CONFIG, - 'trayicon', - props={'entries': trayicon_items}), + 'show_trayicon'), Setting(SettingKind.NOTIFICATIONS, _('Show Notifications'), ===================================== gajim/gtk/status_icon.py ===================================== @@ -59,14 +59,16 @@ class StatusIcon: def __init__(self) -> None: if self._can_use_libindicator(): - app.settings.connect_signal('trayicon', self._on_setting_changed) + app.settings.connect_signal('show_trayicon', + self._on_setting_changed) self._backend = AppIndicator() log.info('Use AppIndicator3 backend') elif app.is_display(Display.WAYLAND): self._backend = NoneBackend() log.info('libappindicator not found or disabled') else: - app.settings.connect_signal('trayicon', self._on_setting_changed) + app.settings.connect_signal('show_trayicon', + self._on_setting_changed) self._backend = GtkStatusIcon() log.info('Use GtkStatusIcon backend') @@ -236,7 +238,7 @@ def update_state(self, count: int = 0) -> None: # Shutdown in progress, don't update icon return - if app.settings.get('trayicon') == 'never': + if not app.settings.get('show_trayicon'): self._status_icon.set_visible(False) return @@ -315,7 +317,7 @@ def __init__(self) -> None: self.update_state() def update_state(self, count: int = 0) -> None: - if app.settings.get('trayicon') == 'never': + if not app.settings.get('show_trayicon'): self._status_icon.set_status(appindicator.IndicatorStatus.PASSIVE) return View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/597297c2729aa8a27add0141c747d40… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/597297c2729aa8a27add0141c747d40… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] chore: Add config files for git-chglog
by Philipp Hörist (＠lovetox) 17 May '22

17 May '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 597297c2 by lovetox at 2022-05-17T21:17:38+02:00 chore: Add config files for git-chglog - - - - - 2 changed files: - + .chglog/CHANGELOG.tpl.md - + .chglog/config.yml Changes: ===================================== .chglog/CHANGELOG.tpl.md ===================================== @@ -0,0 +1,44 @@ +{{ if .Versions -}} +<a name="unreleased"></a> +## [Unreleased] + +{{ if .Unreleased.CommitGroups -}} +{{ range .Unreleased.CommitGroups -}} +{{ .Title }} + +{{ range .Commits -}} + * {{if .Refs}}{{range .Refs}}#{{.Ref}} {{end}}{{end}}{{ if .Scope }}**{{ .Scope }}:** {{ end }}{{ .Subject }} +{{ end }} +{{ end -}} +{{ end -}} +{{ end -}} + + +{{ range .Versions }} +<a name="{{ .Tag.Name }}"></a> +## {{ if .Tag.Previous }}[{{ .Tag.Name }}]{{ else }}{{ .Tag.Name }}{{ end }} - {{ datetime "2006-01-02" .Tag.Date }} +{{ range .CommitGroups -}} +{{ .Title }} +{{ range .Commits -}} + * {{ if .Scope }}**{{ .Scope }}:** {{ end }}{{ .Subject }} +{{ end }} +{{ end -}} + +{{- if .NoteGroups -}} +{{ range .NoteGroups -}} +{{ .Title }} +{{ range .Notes }} +{{ .Body }} +{{ end }} +{{ end -}} +{{ end -}} +{{ end -}} + +{{- if .Versions }} +[Unreleased]: {{ .Info.RepositoryURL }}/compare/{{ $latest := index .Versions 0 }}{{ $latest.Tag.Name }}...HEAD +{{ range .Versions -}} +{{ if .Tag.Previous -}} +[{{ .Tag.Name }}]: {{ $.Info.RepositoryURL }}/compare/{{ .Tag.Previous.Name }}...{{ .Tag.Name }} +{{ end -}} +{{ end -}} +{{ end -}} \ No newline at end of file ===================================== .chglog/config.yml ===================================== @@ -0,0 +1,33 @@ +style: gitlab +template: CHANGELOG.tpl.md +info: + title: CHANGELOG + repository_url: https://dev.gajim.org/gajim/gajim +options: + commits: + filters: + Type: + - feat + - perf + - fix + commit_groups: + sort_by: Custom + title_order: + - feat + - perf + - fix + title_maps: + feat: New + perf: Performance Improvements + fix: Bug Fixes + header: + pattern: "^(\\w*)\\:\\s(.*)$" + pattern_maps: + - Type + - Subject + issues: + prefix: + - "#" + refs: + actions: + - Fixes View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/597297c2729aa8a27add0141c747d401… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/597297c2729aa8a27add0141c747d401… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: Windows: Hide status icon on shutdown
by Philipp Hörist (＠lovetox) 17 May '22

17 May '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 9d3e996d by wurstsalat at 2022-05-17T09:59:48+02:00 fix: Windows: Hide status icon on shutdown Fixes #10862 - - - - - 2 changed files: - gajim/common/application.py - gajim/gtk/status_icon.py Changes: ===================================== gajim/common/application.py ===================================== @@ -83,6 +83,8 @@ def _log(self) -> logging.Logger: return app.log('gajim.application') def start_shutdown(self, *args: Any, **kwargs: Any) -> None: + app.app.systray.shutdown() + accounts_to_disconnect: dict[str, Client] = {} for account, client in app.connections.items(): ===================================== gajim/gtk/status_icon.py ===================================== @@ -93,6 +93,9 @@ def _on_unread_count_changed(self, *args: Any) -> None: def is_visible(self) -> bool: return self._backend.is_visible() + def shutdown(self) -> None: + self._backend.shutdown() + class NoneBackend: def update_state(self, count: int = 0) -> None: @@ -101,6 +104,9 @@ def update_state(self, count: int = 0) -> None: def is_visible(self) -> bool: return False + def shutdown(self) -> None: + pass + class GtkMenuBackend(EventHelper): def __init__(self) -> None: @@ -215,6 +221,7 @@ class GtkStatusIcon(GtkMenuBackend): def __init__(self) -> None: GtkMenuBackend.__init__(self) self._hide_menuitem_added = False + self._shutdown = False self._status_icon = Gtk.StatusIcon() self._status_icon.set_tooltip_text('Gajim') # Needed for Windows @@ -225,6 +232,10 @@ def __init__(self) -> None: self.update_state() def update_state(self, count: int = 0) -> None: + if self._shutdown: + # Shutdown in progress, don't update icon + return + if app.settings.get('trayicon') == 'never': self._status_icon.set_visible(False) return @@ -242,6 +253,11 @@ def update_state(self, count: int = 0) -> None: def is_visible(self) -> bool: return self._status_icon.get_visible() + def shutdown(self) -> None: + # Necessary on Windows in order to remove icon from tray on shutdown + self._shutdown = True + self._status_icon.set_visible(False) + def _on_size_changed(self, _status_icon: Gtk.StatusIcon, size: int) -> None: @@ -317,3 +333,6 @@ def update_state(self, count: int = 0) -> None: def is_visible(self) -> bool: status = self._status_icon.get_status() return status == appindicator.IndicatorStatus.ACTIVE + + def shutdown(self) -> None: + pass View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/9d3e996dd14bdb4c8b6deba12ec0d9c2… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/9d3e996dd14bdb4c8b6deba12ec0d9c2… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] chore: Remove obsolete 'time_stamp' setting
by Daniel Brötzmann (＠wurstsalat) 17 May '22

17 May '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 91ef7589 by wurstsalat at 2022-05-17T09:27:58+02:00 chore: Remove obsolete 'time_stamp' setting - - - - - 1 changed file: - gajim/common/setting_values.py Changes: ===================================== gajim/common/setting_values.py ===================================== @@ -161,7 +161,6 @@ class _ACCOUNT_DEFAULT: 'show_main_window_on_startup', 'speller_language', 'stun_server', - 'time_stamp', 'trayicon', 'video_framerate', 'video_input_device', @@ -209,7 +208,6 @@ class _ACCOUNT_DEFAULT: 'hide_on_main_window_x_button': False, 'main_window_skip_taskbar': False, 'latest_disco_addresses': '', - 'time_stamp': '%x | %X ', 'change_roster_title': True, 'restore_timeout': -1, 'send_on_ctrl_enter': False, @@ -625,7 +623,6 @@ class WorkspaceSettings(TypedDict): 'ascii_formatting': _('Treat * / _ pairs as possible formatting characters.'), 'gc_refer_to_nick_char': _('Character to add after nickname when using nickname completion (tab) in group chat.'), 'save_main_window_position': _('If enabled, Gajim will save the main window position when hiding it, and restore it when showing the window again.'), - 'time_stamp': _('This option lets you customize the timestamp that is printed in conversation. For example \'[%H:%M] \' will show \'[hour:minute] \'. See python doc on strftime for full documentation (https://docs.python.org/3/library/time.html#time.strftime).'), 'chat_timestamp_format': 'https://docs.python.org/3/library/time.html#time.strftime', 'change_roster_title': _('If enabled, Gajim will add * and [n] in contact list window title.'), 'restore_timeout': _('How far back in time (minutes) chat history is restored. -1 means no limit.'), View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/91ef758993cab9c6332979fae55dd5b6… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/91ef758993cab9c6332979fae55dd5b6… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: Chat: Handle race condition when calling focus()
by Philipp Hörist (＠lovetox) 16 May '22

16 May '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 7e6b655c by lovetox at 2022-05-17T00:00:27+02:00 fix: Chat: Handle race condition when calling focus() focus() is called asynchron, this means self.msg_textview does sometimes not exist anymore if shutdown() was called. Fixes #10552 - - - - - 1 changed file: - gajim/gtk/controls/chat.py Changes: ===================================== gajim/gtk/controls/chat.py ===================================== @@ -267,6 +267,11 @@ def remove_actions(self) -> None: app.window.remove_action(f'{action}{self.control_id}') def focus(self) -> None: + if not hasattr(self, 'msg_textview'): + # focus() is called sometimes with GLib.idle_add() + # This means there is the possibility that shutdown() was called + # before focus is executed. + return self.msg_textview.grab_focus() def delegate_action(self, action: str) -> int: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/7e6b655cbb07f96dd9bf77cf4da002b1… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/7e6b655cbb07f96dd9bf77cf4da002b1… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: Bookmarks: Ignore bookmarks for roster contacts
by Philipp Hörist (＠lovetox) 16 May '22

16 May '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 388490b8 by lovetox at 2022-05-16T22:35:08+02:00 fix: Bookmarks: Ignore bookmarks for roster contacts Some clients allow to add MUCs as roster contacts, this creates confusion when we receive them via bookmarks and assume they are a MUC. Fixes #10781 - - - - - 1 changed file: - gajim/common/modules/bookmarks.py Changes: ===================================== gajim/common/modules/bookmarks.py ===================================== @@ -34,6 +34,7 @@ from gajim.common.events import BookmarksReceived from gajim.common.types import BookmarksDict from gajim.common.modules.base import BaseModule +from gajim.common.modules.contacts import GroupchatContact from gajim.common.modules.util import event_node @@ -218,11 +219,24 @@ def _bookmarks_received(self, task: Task) -> None: bookmarks = [] self._request_in_progress = False + + self._cleanup_bookmarks(bookmarks) self._bookmarks = self._convert_to_dict(bookmarks) self.auto_join_bookmarks(self.bookmarks) app.ged.raise_event( BookmarksReceived(account=self._account)) + def _cleanup_bookmarks(self, bookmarks: list[BookmarkData]) -> None: + for bookmark in list(bookmarks): + contact = self._client.get_module('Contacts').get_contact( + bookmark.jid, groupchat=True) + if not isinstance(contact, GroupchatContact): + # The contact exists probably in the roster and is therefore + # assumed to not be a MUC + self._log.warning('Received bookmark but jid is not ' + 'a groupchat: %s', bookmark.jid) + bookmarks.remove(bookmark) + def store_bookmarks(self, bookmarks: List[BookmarkData]) -> None: if not app.account_is_available(self._account): return View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/388490b8f35d22169812bf35a5746c94… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/388490b8f35d22169812bf35a5746c94… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] fix: Roster: Raise exception if a full jid is found
by Philipp Hörist (＠lovetox) 16 May '22

16 May '22

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: e81b1dae by lovetox at 2022-05-16T18:17:51+02:00 fix: Roster: Raise exception if a full jid is found - - - - - 1 changed file: - nbxmpp/structs.py Changes: ===================================== nbxmpp/structs.py ===================================== @@ -378,6 +378,9 @@ class RosterItem: raise Exception('jid attribute missing') jid = JID.from_string(jid) + if jid.is_full: + raise Exception('full jid in roster not allowed') + groups = {group.getData() for group in node.getTags('group')} return cls(jid=jid, View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/e81b1dae9f197ca3bc7ffee9… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/e81b1dae9f197ca3bc7ffee9… 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