Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] fix: DirectorySearch: Correctly connect form validation
by Daniel Brötzmann (＠wurstsalat) 29 May '22

29 May '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 44bcafae by wurstsalat at 2022-05-29T23:38:11+02:00 fix: DirectorySearch: Correctly connect form validation - - - - - 1 changed file: - gajim/gtk/search.py Changes: ===================================== gajim/gtk/search.py ===================================== @@ -190,7 +190,7 @@ def _show_form(self, form: Optional[Node]) -> None: self.add(self._dataform_widget) def _on_is_valid(self, _widget: DataFormWidget, is_valid: bool) -> None: - self.complete = True + self.complete = is_valid self.update_page_complete() def get_submit_form(self) -> dataforms.SimpleDataForm: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/44bcafaeece862d7eacc04af7f776343… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/44bcafaeece862d7eacc04af7f776343… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] refactor: Don’t translate unused strings
by Philipp Hörist (＠lovetox) 29 May '22

29 May '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 77c1f4d6 by lovetox at 2022-05-29T18:51:17+02:00 refactor: Don’t translate unused strings Strings in the old config backend are not displayed anywhere anymore. - - - - - 1 changed file: - gajim/common/config.py Changes: ===================================== gajim/common/config.py ===================================== @@ -39,7 +39,6 @@ from gi.repository import GLib import gajim -from gajim.common.i18n import _ @unique @@ -51,6 +50,7 @@ class Option(IntEnum): # Option.DESC also should be there RESTART = 3 + opt_int = ['integer', 0] opt_str = ['string', 0] opt_bool = ['boolean', 0] @@ -67,148 +67,146 @@ class Config: # name: [ type, default_value, help_string, restart ] 'autopopup': [opt_bool, False], 'autopopupaway': [opt_bool, False], - 'sounddnd': [opt_bool, False, _('Play sound even when being busy.')], + 'sounddnd': [opt_bool, False, 'Play sound even when being busy.'], 'showoffline': [opt_bool, True], - 'show_only_chat_and_online': [opt_bool, False, _('Show only online and free for chat contacts in the contact list.')], + 'show_only_chat_and_online': [opt_bool, False, 'Show only online and free for chat contacts in the contact list.'], 'show_transports_group': [opt_bool, True], 'autoaway': [opt_bool, True], - 'autoawaytime': [opt_int, 5, _('Time in minutes, after which your status changes to away.')], - 'autoaway_message': [opt_str, _('$S (Away: Idle more than $T min)'), _('$S will be replaced by current status message, $T by the \'autoawaytime\' value.')], + 'autoawaytime': [opt_int, 5, 'Time in minutes, after which your status changes to away.'], + 'autoaway_message': [opt_str, '$S (Away: Idle more than $T min)', '$S will be replaced by current status message, $T by the \'autoawaytime\' value.'], 'autoxa': [opt_bool, True], - 'autoxatime': [opt_int, 15, _('Time in minutes, after which your status changes to not available.')], - 'autoxa_message': [opt_str, _('$S (Not available: Idle more than $T min)'), _('$S will be replaced by current status message, $T by the \'autoxatime\' value.')], + 'autoxatime': [opt_int, 15, 'Time in minutes, after which your status changes to not available.'], + 'autoxa_message': [opt_str, '$S (Not available: Idle more than $T min)', '$S will be replaced by current status message, $T by the \'autoxatime\' value.'], 'ask_online_status': [opt_bool, False], 'ask_offline_status': [opt_bool, False], - 'trayicon': [opt_str, 'always', _('When to show the notification area icon. Can be \'never\', \'on_event\', and \'always\'.'), False], - 'allow_hide_roster': [opt_bool, False, _('Allow to hide the contact list window even if the notification area icon is not shown.'), False], + 'trayicon': [opt_str, 'always', 'When to show the notification area icon. Can be \'never\', \'on_event\', and \'always\'.', False], + 'allow_hide_roster': [opt_bool, False, 'Allow to hide the contact list window even if the notification area icon is not shown.', False], 'iconset': [opt_str, DEFAULT_ICONSET, '', True], 'use_transports_iconsets': [opt_bool, True, '', True], - 'collapsed_rows': [opt_str, '', _('List of rows (accounts and groups) that are collapsed (space separated).'), True], + 'collapsed_rows': [opt_str, '', 'List of rows (accounts and groups) that are collapsed (space separated).', True], 'roster_theme': [opt_str, 'default', '', True], 'mergeaccounts': [opt_bool, False, '', True], 'sort_by_show_in_roster': [opt_bool, True, '', True], 'sort_by_show_in_muc': [opt_bool, False, '', True], 'use_speller': [opt_bool, False, ], 'show_xhtml': [opt_bool, True, ], - 'speller_language': [opt_str, '', _('Language used for spell checking.')], + 'speller_language': [opt_str, '', 'Language used for spell checking.'], 'emoticons_theme': [opt_str, 'noto-emoticons', '', True], 'ascii_formatting': [opt_bool, True, - _('Treat * / _ pairs as possible formatting characters.'), True], - 'show_ascii_formatting_chars': [opt_bool, True, _('If enabled, do not ' - 'remove */_ . So *abc* will be bold but with * * not removed.')], + 'Treat * / _ pairs as possible formatting characters.', True], + 'show_ascii_formatting_chars': [opt_bool, True, 'If enabled, do not ' + 'remove */_ . So *abc* will be bold but with * * not removed.'], 'sounds_on': [opt_bool, True], - 'gc_refer_to_nick_char': [opt_str, ',', _('Character to add after nickname when using nickname completion (tab) in group chat.')], + 'gc_refer_to_nick_char': [opt_str, ',', 'Character to add after nickname when using nickname completion (tab) in group chat.'], 'msgwin-max-state': [opt_bool, False], 'msgwin-x-position': [opt_int, -1], # Default is to let the window manager decide 'msgwin-y-position': [opt_int, -1], # Default is to let the window manager decide 'msgwin-width': [opt_int, 500], 'msgwin-height': [opt_int, 440], - 'save-roster-position': [opt_bool, True, _('If enabled, Gajim will save the contact list window position when hiding it, and restore it when showing the contact list window again.')], + 'save-roster-position': [opt_bool, True, 'If enabled, Gajim will save the contact list window position when hiding it, and restore it when showing the contact list window again.'], 'roster_x-position': [opt_int, 0], 'roster_y-position': [opt_int, 0], 'roster_width': [opt_int, 200], 'roster_height': [opt_int, 400], - 'roster_on_the_right': [opt_bool, False, _('Place the contact list on the right in single window mode'), True], + 'roster_on_the_right': [opt_bool, False, 'Place the contact list on the right in single window mode', True], 'latest_disco_addresses': [opt_str, ''], - 'time_stamp': [opt_str, '%x | %X ', _('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).')], - 'change_roster_title': [opt_bool, True, _('If enabled, Gajim will add * and [n] in contact list window title.')], - 'restore_timeout': [opt_int, -1, _('How far back in time (minutes) chat history is restored. -1 means no limit.')], - 'send_on_ctrl_enter': [opt_bool, False, _('Send message on Ctrl+Enter and make a new line with Enter.')], + 'time_stamp': [opt_str, '%x | %X ', '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).'], + 'change_roster_title': [opt_bool, True, 'If enabled, Gajim will add * and [n] in contact list window title.'], + 'restore_timeout': [opt_int, -1, 'How far back in time (minutes) chat history is restored. -1 means no limit.'], + 'send_on_ctrl_enter': [opt_bool, False, 'Send message on Ctrl+Enter and make a new line with Enter.'], 'last_roster_visible': [opt_bool, True], - 'key_up_lines': [opt_int, 25, _('How many lines to store for Ctrl+KeyUP (previously sent messages).')], + 'key_up_lines': [opt_int, 25, 'How many lines to store for Ctrl+KeyUP (previously sent messages).'], 'version': [opt_str, gajim.__version__], # which version created the config 'search_engine': [opt_str, 'https://duckduckgo.com/?q=%s'], - 'dictionary_url': [opt_str, 'WIKTIONARY', _('Either a custom URL with %%s in it (where %%s is the word/phrase) or \'WIKTIONARY\' (which means use Wikitionary).')], + 'dictionary_url': [opt_str, 'WIKTIONARY', 'Either a custom URL with %%s in it (where %%s is the word/phrase) or \'WIKTIONARY\' (which means use Wikitionary).'], 'always_english_wikipedia': [opt_bool, False], 'always_english_wiktionary': [opt_bool, True], - 'remote_control': [opt_bool, False, _('If checked, Gajim can be controlled remotely using gajim-remote.'), True], - 'confirm_paste_image': [opt_bool, True, _('Ask before pasting an image.')], - 'confirm_close_muc': [opt_bool, True, _('Ask before closing a group chat tab/window.')], - 'confirm_close_multiple_tabs': [opt_bool, True, _('Ask before closing tabbed chat window if there are chats that can lose data (chat, private chat).')], + 'remote_control': [opt_bool, False, 'If checked, Gajim can be controlled remotely using gajim-remote.', True], + 'confirm_paste_image': [opt_bool, True, 'Ask before pasting an image.'], + 'confirm_close_muc': [opt_bool, True, 'Ask before closing a group chat tab/window.'], + 'confirm_close_multiple_tabs': [opt_bool, True, 'Ask before closing tabbed chat window if there are chats that can lose data (chat, private chat).'], 'notify_on_file_complete': [opt_bool, True], 'file_transfers_port': [opt_int, 28011], - 'ft_add_hosts_to_send': [opt_str, '', _('List of send hosts (comma separated) in addition to local interfaces for file transfers (in case of address translation/port forwarding).')], - 'use_kib_mib': [opt_bool, False, _('IEC standard says KiB = 1024 bytes, KB = 1000 bytes.')], + 'ft_add_hosts_to_send': [opt_str, '', 'List of send hosts (comma separated) in addition to local interfaces for file transfers (in case of address translation/port forwarding).'], + 'use_kib_mib': [opt_bool, False, 'IEC standard says KiB = 1024 bytes, KB = 1000 bytes.'], 'notify_on_all_muc_messages': [opt_bool, False], - 'trayicon_notification_on_events': [opt_bool, True, _('Notify of events in the notification area.')], + 'trayicon_notification_on_events': [opt_bool, True, 'Notify of events in the notification area.'], 'last_save_dir': [opt_str, ''], 'last_send_dir': [opt_str, ''], 'last_sounds_dir': [opt_str, ''], 'tabs_position': [opt_str, 'left'], - 'tabs_always_visible': [opt_bool, False, _('Show tab when only one conversation?')], - 'tabs_border': [opt_bool, False, _('Show tabbed notebook border in chat windows?')], - 'tabs_close_button': [opt_bool, True, _('Show close button in tab?')], - 'notification_preview_message': [opt_bool, True, _('Preview new messages in notification popup?')], + 'tabs_always_visible': [opt_bool, False, 'Show tab when only one conversation?'], + 'tabs_border': [opt_bool, False, 'Show tabbed notebook border in chat windows?'], + 'tabs_close_button': [opt_bool, True, 'Show close button in tab?'], + 'notification_preview_message': [opt_bool, True, 'Preview new messages in notification popup?'], 'notification_position_x': [opt_int, -1], 'notification_position_y': [opt_int, -1], - 'muc_highlight_words': [opt_str, '', _('A list of words (semicolon separated) that will be highlighted in group chats.')], - 'quit_on_roster_x_button': [opt_bool, False, _('If enabled, Gajim quits when clicking the X button of your Window Manager. This setting is taken into account only if the notification area icon is used.')], - 'hide_on_roster_x_button': [opt_bool, False, _('If enabled, Gajim hides the contact list window when pressing the X button instead of minimizing into the notification area.')], - 'show_status_msgs_in_roster': [opt_bool, True, _('If enabled, Gajim will display the status message (if not empty) underneath the contact name in the contact list window.'), True], + 'muc_highlight_words': [opt_str, '', 'A list of words (semicolon separated) that will be highlighted in group chats.'], + 'quit_on_roster_x_button': [opt_bool, False, 'If enabled, Gajim quits when clicking the X button of your Window Manager. This setting is taken into account only if the notification area icon is used.'], + 'hide_on_roster_x_button': [opt_bool, False, 'If enabled, Gajim hides the contact list window when pressing the X button instead of minimizing into the notification area.'], + 'show_status_msgs_in_roster': [opt_bool, True, 'If enabled, Gajim will display the status message (if not empty) underneath the contact name in the contact list window.', True], 'show_avatars_in_roster': [opt_bool, True, '', True], 'show_mood_in_roster': [opt_bool, True, '', True], 'show_activity_in_roster': [opt_bool, True, '', True], 'show_tunes_in_roster': [opt_bool, True, '', True], 'show_location_in_roster': [opt_bool, True, '', True], - 'avatar_position_in_roster': [opt_str, 'right', _('Define the position of avatars in the contact list. Can be \'left\' or \'right\'.'), True], - 'print_status_in_chats': [opt_bool, False, _('If disabled, Gajim will no longer print status messages in chats when a contact changes their status (and/or their status message).')], - 'print_join_left_default': [opt_bool, False, _('Default Setting: Show a status message for every join or leave in a group chat.')], - 'print_status_muc_default': [opt_bool, False, _('Default Setting: Show a status message for all status changes (away, dnd, etc.) of users in a group chat.')], + 'avatar_position_in_roster': [opt_str, 'right', 'Define the position of avatars in the contact list. Can be \'left\' or \'right\'.', True], + 'print_status_in_chats': [opt_bool, False, 'If disabled, Gajim will no longer print status messages in chats when a contact changes their status (and/or their status message).'], + 'print_join_left_default': [opt_bool, False, 'Default Setting: Show a status message for every join or leave in a group chat.'], + 'print_status_muc_default': [opt_bool, False, 'Default Setting: Show a status message for all status changes (away, dnd, etc.) of users in a group chat.'], 'log_contact_status_changes': [opt_bool, False], - 'roster_window_skip_taskbar': [opt_bool, False, _('Don\'t show contact list window in the system taskbar.')], - 'use_urgency_hint': [opt_bool, True, _('If enabled, Gajim makes the window flash (the default behaviour in most Window Managers) when holding pending events.')], + 'roster_window_skip_taskbar': [opt_bool, False, 'Don\'t show contact list window in the system taskbar.'], + 'use_urgency_hint': [opt_bool, True, 'If enabled, Gajim makes the window flash (the default behaviour in most Window Managers) when holding pending events.'], 'notification_timeout': [opt_int, 5], - 'one_message_window': [opt_str, 'always', - #always, never, peracct, pertype should not be translated - _('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.')], - '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.')], - 'chat_merge_consecutive_nickname': [opt_bool, False, _('In a chat, show the nickname at the beginning of a line only when it\'s not the same person talking as in the previous message.')], - 'ctrl_tab_go_to_next_composing': [opt_bool, True, _('Ctrl+Tab switches to the next composing tab when there are no tabs with messages pending.')], - 'confirm_block': [opt_str, '', _('Show a confirmation dialog to block a contact? Empty string means never show the dialog.')], - 'enable_negative_priority': [opt_bool, False, _('If enabled, you will be able to set a negative priority to your account in the Accounts window. BE CAREFUL, when you are logged in with a negative priority, you will NOT receive any message from your server.')], - 'show_contacts_number': [opt_bool, True, _('If enabled, Gajim will show both the number of online and total contacts in account rows as well as in group rows.')], - 'change_status_window_timeout': [opt_int, 15, _('Time of inactivity needed before the change status window closes down.')], - 'max_conversation_lines': [opt_int, 500, _('Maximum number of lines that are printed in conversations. Oldest lines are cleared.')], - 'uri_schemes': [opt_str, 'aaa:// aaas:// acap:// cap:// cid: crid:// data: dav: dict:// dns: fax: file:/ ftp:// geo: go: gopher:// h323: http:// https:// iax: icap:// im: imap:// info: ipp:// iris: iris.beep: iris.xpc: iris.xpcs: iris.lwz: ldap:// mid: modem: msrp:// msrps:// mtqp:// mupdate:// news: nfs:// nntp:// opaquelocktoken: pop:// pres: prospero:// rtsp:// service: sip: sips: sms: snmp:// soap.beep:// soap.beeps:// tag: tel: telnet:// tftp:// thismessage:/ tip:// tv: urn:// vemmi:// xmlrpc.beep:// xmlrpc.beeps:// z39.50r:// z39.50s:// about: apt: cvs:// daap:// ed2k:// feed: fish:// git:// iax2: irc:// ircs:// ldaps:// magnet: mms:// rsync:// ssh:// svn:// sftp:// smb:// webcal:// aesgcm://', _('Valid URI schemes. Only schemes in this list will be accepted as \'real\' URI (mailto and xmpp are handled separately).'), True], - 'shell_like_completion': [opt_bool, False, _('If enabled, completion in group chats will be like a shell auto-completion.')], + 'one_message_window': [opt_str, 'always', '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.'], + '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.'], + 'chat_merge_consecutive_nickname': [opt_bool, False, 'In a chat, show the nickname at the beginning of a line only when it\'s not the same person talking as in the previous message.'], + 'ctrl_tab_go_to_next_composing': [opt_bool, True, 'Ctrl+Tab switches to the next composing tab when there are no tabs with messages pending.'], + 'confirm_block': [opt_str, '', 'Show a confirmation dialog to block a contact? Empty string means never show the dialog.'], + 'enable_negative_priority': [opt_bool, False, 'If enabled, you will be able to set a negative priority to your account in the Accounts window. BE CAREFUL, when you are logged in with a negative priority, you will NOT receive any message from your server.'], + 'show_contacts_number': [opt_bool, True, 'If enabled, Gajim will show both the number of online and total contacts in account rows as well as in group rows.'], + 'change_status_window_timeout': [opt_int, 15, 'Time of inactivity needed before the change status window closes down.'], + 'max_conversation_lines': [opt_int, 500, 'Maximum number of lines that are printed in conversations. Oldest lines are cleared.'], + 'uri_schemes': [opt_str, 'aaa:// aaas:// acap:// cap:// cid: crid:// data: dav: dict:// dns: fax: file:/ ftp:// geo: go: gopher:// h323: http:// https:// iax: icap:// im: imap:// info: ipp:// iris: iris.beep: iris.xpc: iris.xpcs: iris.lwz: ldap:// mid: modem: msrp:// msrps:// mtqp:// mupdate:// news: nfs:// nntp:// opaquelocktoken: pop:// pres: prospero:// rtsp:// service: sip: sips: sms: snmp:// soap.beep:// soap.beeps:// tag: tel: telnet:// tftp:// thismessage:/ tip:// tv: urn:// vemmi:// xmlrpc.beep:// xmlrpc.beeps:// z39.50r:// z39.50s:// about: apt: cvs:// daap:// ed2k:// feed: fish:// git:// iax2: irc:// ircs:// ldaps:// magnet: mms:// rsync:// ssh:// svn:// sftp:// smb:// webcal:// aesgcm://', 'Valid URI schemes. Only schemes in this list will be accepted as \'real\' URI (mailto and xmpp are handled separately).', True], + 'shell_like_completion': [opt_bool, False, 'If enabled, completion in group chats will be like a shell auto-completion.'], 'audio_input_device': [opt_str, 'autoaudiosrc ! volume name=gajim_vol'], 'audio_output_device': [opt_str, 'autoaudiosink'], 'video_input_device': [opt_str, 'autovideosrc'], - 'video_framerate': [opt_str, '', _('Optionally fix Jingle output video framerate. Example: 10/1 or 25/2.')], - 'video_size': [opt_str, '', _('Optionally resize Jingle output video. Example: 320x240.')], - 'video_see_self': [opt_bool, True, _('If enabled, you will see your webcam\'s video stream as well.')], + 'video_framerate': [opt_str, '', 'Optionally fix Jingle output video framerate. Example: 10/1 or 25/2.'], + 'video_size': [opt_str, '', 'Optionally resize Jingle output video. Example: 320x240.'], + 'video_see_self': [opt_bool, True, 'If enabled, you will see your webcam\'s video stream as well.'], 'audio_input_volume': [opt_int, 50], 'audio_output_volume': [opt_int, 50], - 'use_stun_server': [opt_bool, False, _('If enabled, Gajim will try to use a STUN server when using Jingle. The one in \'stun_server\' option, or the one given by the XMPP server.')], - 'stun_server': [opt_str, '', _('STUN server to use when using Jingle')], - 'global_proxy': [opt_str, '', _('Proxy used for all outgoing connections if the account does not have a specific proxy configured.')], - 'ignore_incoming_attention': [opt_bool, False, _('If enabled, Gajim will ignore incoming attention requests (\'wizz\').')], - 'remember_opened_chat_controls': [opt_bool, True, _('If enabled, Gajim will reopen chat windows that were opened last time Gajim was closed.')], - 'positive_184_ack': [opt_bool, False, _('If enabled, Gajim will display an icon to show that sent messages have been received by your contact.')], - 'use_keyring': [opt_bool, True, _('If enabled, Gajim will use the System\'s Keyring to store account passwords.')], - 'remote_commands': [opt_bool, False, _('If enabled, Gajim will execute XEP-0146 Commands.')], - 'dark_theme': [opt_int, 2, _('2: System, 1: Enabled, 0: Disabled')], - 'public_room_sync_threshold': [opt_int, 1, _('Maximum history in days we request from a public group chat archive. 0: As much as possible.')], - 'private_room_sync_threshold': [opt_int, 0, _('Maximum history in days we request from a private group chat archive. 0: As much as possible.')], - 'show_subject_on_join': [opt_bool, True, _('If enabled, Gajim shows the group chat subject in the chat window when joining.')], - 'show_chatstate_in_roster': [opt_bool, True, _('If enabled, the contact row is colored according to the current chat state of the contact.')], - 'show_chatstate_in_tabs': [opt_bool, True, _('If enabled, the tab is colored according to the current chat state of the contact.')], - 'show_chatstate_in_banner': [opt_bool, True, _('Shows a text in the banner that describes the current chat state of the contact.')], - 'send_chatstate_default': [opt_str, 'composing_only', _('Chat state notifications that are sent to contacts. Possible values: all, composing_only, disabled')], - 'send_chatstate_muc_default': [opt_str, 'composing_only', _('Chat state notifications that are sent to the group chat. Possible values: \'all\', \'composing_only\', \'disabled\'')], + 'use_stun_server': [opt_bool, False, 'If enabled, Gajim will try to use a STUN server when using Jingle. The one in \'stun_server\' option, or the one given by the XMPP server.'], + 'stun_server': [opt_str, '', 'STUN server to use when using Jingle'], + 'global_proxy': [opt_str, '', 'Proxy used for all outgoing connections if the account does not have a specific proxy configured.'], + 'ignore_incoming_attention': [opt_bool, False, 'If enabled, Gajim will ignore incoming attention requests (\'wizz\'.'], + 'remember_opened_chat_controls': [opt_bool, True, 'If enabled, Gajim will reopen chat windows that were opened last time Gajim was closed.'], + 'positive_184_ack': [opt_bool, False, 'If enabled, Gajim will display an icon to show that sent messages have been received by your contact.'], + 'use_keyring': [opt_bool, True, 'If enabled, Gajim will use the System\'s Keyring to store account passwords.'], + 'remote_commands': [opt_bool, False, 'If enabled, Gajim will execute XEP-0146 Commands.'], + 'dark_theme': [opt_int, 2, '2: System, 1: Enabled, 0: Disabled'], + 'public_room_sync_threshold': [opt_int, 1, 'Maximum history in days we request from a public group chat archive. 0: As much as possible.'], + 'private_room_sync_threshold': [opt_int, 0, 'Maximum history in days we request from a private group chat archive. 0: As much as possible.'], + 'show_subject_on_join': [opt_bool, True, 'If enabled, Gajim shows the group chat subject in the chat window when joining.'], + 'show_chatstate_in_roster': [opt_bool, True, 'If enabled, the contact row is colored according to the current chat state of the contact.'], + 'show_chatstate_in_tabs': [opt_bool, True, 'If enabled, the tab is colored according to the current chat state of the contact.'], + 'show_chatstate_in_banner': [opt_bool, True, 'Shows a text in the banner that describes the current chat state of the contact.'], + 'send_chatstate_default': [opt_str, 'composing_only', 'Chat state notifications that are sent to contacts. Possible values: all, composing_only, disabled'], + 'send_chatstate_muc_default': [opt_str, 'composing_only', 'Chat state notifications that are sent to the group chat. Possible values: \'all\', \'composing_only\', \'disabled\''], 'muclumbus_api_jid': [opt_str, 'api(a)search.jabber.network'], 'muclumbus_api_http_uri': [opt_str, 'https://search.jabber.network/api/1.0/search'], - 'muclumbus_api_pref': [opt_str, 'http', _('API Preferences. Possible values: \'http\', \'iq\'')], - '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')], - 'show_help_start_chat': [opt_bool, True, _('Shows an info bar with helpful hints in the Start / Join Chat dialog')], - 'check_for_update': [opt_bool, True, _('Check for Gajim updates periodically')], - 'last_update_check': [opt_str, '', _('Date of the last update check')], + 'muclumbus_api_pref': [opt_str, 'http', 'API Preferences. Possible values: \'http\', \'iq\''], + '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'], + 'show_help_start_chat': [opt_bool, True, 'Shows an info bar with helpful hints in the Start / Join Chat dialog'], + 'check_for_update': [opt_bool, True, 'Check for Gajim updates periodically'], + 'last_update_check': [opt_str, '', 'Date of the last update check'], 'always_ask_for_status_message': [opt_bool, False], }, {}) # type: Tuple[Dict[str, List[Any]], Dict[Any, Any]] @@ -226,35 +224,34 @@ class Config: 'password': [opt_str, ''], 'resource': [opt_str, 'gajim.$rand', '', True], 'priority': [opt_int, 0, '', True], - 'adjust_priority_with_status': [opt_bool, False, _('Priority will change automatically according to your status. Priorities are defined in \'autopriority_*\' options.')], + 'adjust_priority_with_status': [opt_bool, False, 'Priority will change automatically according to your status. Priorities are defined in \'autopriority_*\' options.'], 'autopriority_online': [opt_int, 50], 'autopriority_chat': [opt_int, 50], 'autopriority_away': [opt_int, 40], 'autopriority_xa': [opt_int, 30], 'autopriority_dnd': [opt_int, 20], 'autoconnect': [opt_bool, False, '', True], - 'restore_last_status': [opt_bool, False, _('If enabled, the last status will be restored.')], - 'autoauth': [opt_bool, False, _('If enabled, contacts requesting authorization will be accepted automatically.')], - 'active': [opt_bool, True, _('If disabled, this account will be disabled and will not appear in the contact list window.'), True], + 'restore_last_status': [opt_bool, False, 'If enabled, the last status will be restored.'], + 'autoauth': [opt_bool, False, 'If enabled, contacts requesting authorization will be accepted automatically.'], + 'active': [opt_bool, True, 'If disabled, this account will be disabled and will not appear in the contact list window.', True], 'proxy': [opt_str, '', '', True], 'keyid': [opt_str, '', '', True], 'keyname': [opt_str, '', '', True], - 'use_plain_connection': [opt_bool, False, _('Use an unencrypted connection to the server')], + 'use_plain_connection': [opt_bool, False, 'Use an unencrypted connection to the server'], 'confirm_unencrypted_connection': [opt_bool, True], 'use_custom_host': [opt_bool, False, '', True], 'custom_port': [opt_int, 5222, '', True], 'custom_host': [opt_str, '', '', True], - 'custom_type': [opt_str, 'START TLS', _('ConnectionType: START TLS, DIRECT TLS or PLAIN'), True], + 'custom_type': [opt_str, 'START TLS', 'ConnectionType: START TLS, DIRECT TLS or PLAIN', True], 'sync_with_global_status': [opt_bool, False, ], - 'no_log_for': [opt_str, '', _('List of XMPP Addresses (space separated) for which you do not want to store chat history. You can also add the name of an account to disable storing chat history for this account.')], + 'no_log_for': [opt_str, '', 'List of XMPP Addresses (space separated) for which you do not want to store chat history. You can also add the name of an account to disable storing chat history for this account.'], 'attached_gpg_keys': [opt_str, ''], - 'http_auth': [opt_str, 'ask'], # yes, no, ask - # proxy65 for FT + 'http_auth': [opt_str, 'ask'], # yes, no, ask 'file_transfer_proxies': [opt_str, ''], - 'use_ft_proxies': [opt_bool, False, _('If enabled, Gajim will use your IP and proxies defined in \'file_transfer_proxies\' option for file transfers.'), True], - 'test_ft_proxies_on_startup': [opt_bool, False, _('If enabled, Gajim will test file transfer proxies on startup to be sure they work. Openfire\'s proxies are known to fail this test even if they work.')], - 'msgwin-x-position': [opt_int, -1], # Default is to let the wm decide - 'msgwin-y-position': [opt_int, -1], # Default is to let the wm decide + 'use_ft_proxies': [opt_bool, False, 'If enabled, Gajim will use your IP and proxies defined in \'file_transfer_proxies\' option for file transfers.', True], + 'test_ft_proxies_on_startup': [opt_bool, False, 'If enabled, Gajim will test file transfer proxies on startup to be sure they work. Openfire\'s proxies are known to fail this test even if they work.'], + 'msgwin-x-position': [opt_int, -1], # Default is to let the wm decide + 'msgwin-y-position': [opt_int, -1], # Default is to let the wm decide 'msgwin-width': [opt_int, 480], 'msgwin-height': [opt_int, 440], 'is_zeroconf': [opt_bool, False], @@ -264,21 +261,21 @@ class Config: 'zeroconf_last_name': [opt_str, '', '', True], 'zeroconf_jabber_id': [opt_str, '', '', True], 'zeroconf_email': [opt_str, '', '', True], - 'answer_receipts': [opt_bool, True, _('If enabled, Gajim will answer to message receipt requests.')], + 'answer_receipts': [opt_bool, True, 'If enabled, Gajim will answer to message receipt requests.'], 'publish_tune': [opt_bool, False], 'publish_location': [opt_bool, False], 'request_user_data': [opt_bool, True], 'ignore_unknown_contacts': [opt_bool, False], - 'send_os_info': [opt_bool, True, _('Allow Gajim to send information about the operating system you are running.')], - 'send_time_info': [opt_bool, True, _('Allow Gajim to send your local time.')], + 'send_os_info': [opt_bool, True, 'Allow Gajim to send information about the operating system you are running.'], + 'send_time_info': [opt_bool, True, 'Allow Gajim to send your local time.'], 'send_idle_time': [opt_bool, True], 'roster_version': [opt_str, ''], - 'subscription_request_msg': [opt_str, '', _('Message that is sent to contacts you want to add.')], - 'ft_send_local_ips': [opt_bool, True, _('If enabled, Gajim will send your local IP so your contact can connect to your machine for file transfers.')], - 'opened_chat_controls': [opt_str, '', _('List of XMPP Addresses (space separated) for which the chat window will be re-opened on next startup.')], + 'subscription_request_msg': [opt_str, '', 'Message that is sent to contacts you want to add.'], + 'ft_send_local_ips': [opt_bool, True, 'If enabled, Gajim will send your local IP so your contact can connect to your machine for file transfers.'], + 'opened_chat_controls': [opt_str, '', 'List of XMPP Addresses (space separated) for which the chat window will be re-opened on next startup.'], 'recent_groupchats': [opt_str, ''], - 'filetransfer_preference' : [opt_str, 'httpupload', _('Preferred file transfer mechanism for file drag&drop on a chat window. Can be \'httpupload\' (default) or \'jingle\'.')], - 'allow_posh': [opt_bool, True, _('Allow certificate verification with POSH.')], + 'filetransfer_preference': [opt_str, 'httpupload', 'Preferred file transfer mechanism for file drag&drop on a chat window. Can be \'httpupload\' (default) or \'jingle\'.'], + 'allow_posh': [opt_bool, True, 'Allow certificate verification with POSH.'], }, {}), 'statusmsg': ({ 'message': [opt_str, ''], @@ -301,32 +298,32 @@ class Config: 'pass': [opt_str, ''], }, {}), 'contacts': ({ - 'speller_language': [opt_str, '', _('Language used for spell checking.')], - 'send_chatstate': [opt_str, 'composing_only', _('Chat state notifications that are sent to contacts. Possible values: \'all\', \'composing_only\', \'disabled\'')], + 'speller_language': [opt_str, '', 'Language used for spell checking.'], + 'send_chatstate': [opt_str, 'composing_only', 'Chat state notifications that are sent to contacts. Possible values: \'all\', \'composing_only\', \'disabled\''], }, {}), 'encryption': ({ - 'encryption': [opt_str, '', _('The currently active encryption for that contact.')], + 'encryption': [opt_str, '', 'The currently active encryption for that contact.'], }, {}), 'rooms': ({ - 'speller_language': [opt_str, '', _('Language used for spell checking.')], - 'notify_on_all_messages': [opt_bool, False, _('If enabled, a notification is created for every message in this group chat.')], - 'print_status': [opt_bool, False, _('Show a status message for all status changes (away, dnd, etc.) of users in a group chat.')], - 'print_join_left': [opt_bool, False, _('Show a status message for every join or leave in a group chat.')], - 'send_chatstate': [opt_str, 'composing_only', _('Chat state notifications that are sent to the group chat. Possible values: \'all\', \'composing_only\' or \'disabled\'.')], + 'speller_language': [opt_str, '', 'Language used for spell checking.'], + 'notify_on_all_messages': [opt_bool, False, 'If enabled, a notification is created for every message in this group chat.'], + 'print_status': [opt_bool, False, 'Show a status message for all status changes (away, dnd, etc.) of users in a group chat.'], + 'print_join_left': [opt_bool, False, 'Show a status message for every join or leave in a group chat.'], + 'send_chatstate': [opt_str, 'composing_only', 'Chat state notifications that are sent to the group chat. Possible values: \'all\', \'composing_only\' or \'disabled\'.'], }, {}), 'plugins': ({ - 'active': [opt_bool, False, _('If enabled, plugins will be activated on startup (this is saved when exiting Gajim). This option SHOULD NOT be used to (de)activate plugins. Use the plugin window instead.')], + 'active': [opt_bool, False, 'If enabled, plugins will be activated on startup (this is saved when exiting Gajim). This option SHOULD NOT be used to (de)activate plugins. Use the plugin window instead.'], }, {}), } # type: Dict[str, Tuple[Dict[str, List[Any]], Dict[Any, Any]]] statusmsg_default = { - _('Sleeping'): ['ZZZZzzzzzZZZZZ', 'inactive', 'sleeping', '', 'sleepy', ''], - _('Back soon'): [_('Back in some minutes.'), '', '', '', '', ''], - _('Eating'): [_('I\'m eating.'), 'eating', 'other', '', '', ''], - _('Movie'): [_('I\'m watching a movie.'), 'relaxing', 'watching_a_movie', '', '', ''], - _('Working'): [_('I\'m working.'), 'working', 'other', '', '', ''], - _('Phone'): [_('I\'m on the phone.'), 'talking', 'on_the_phone', '', '', ''], - _('Out'): [_('I\'m out enjoying life.'), 'relaxing', 'going_out', '', '', ''], + 'Sleeping': ['ZZZZzzzzzZZZZZ', 'inactive', 'sleeping', '', 'sleepy', ''], + 'Back soon': ['Back in some minutes.', '', '', '', '', ''], + 'Eating': ['I\'m eating.', 'eating', 'other', '', '', ''], + 'Movie': ['I\'m watching a movie.', 'relaxing', 'watching_a_movie', '', '', ''], + 'Working': ['I\'m working.', 'working', 'other', '', '', ''], + 'Phone': ['I\'m on the phone.', 'talking', 'on_the_phone', '', '', ''], + 'Out': ['I\'m out enjoying life.', 'relaxing', 'going_out', '', '', ''], } soundevents_default = { @@ -337,12 +334,12 @@ class Config: 'contact_connected': [False, 'connected.wav'], 'contact_disconnected': [False, 'disconnected.wav'], 'message_sent': [False, 'sent.wav'], - 'muc_message_highlight': [True, 'gc_message1.wav', _('Sound to play when a group chat message contains one of the words in \'muc_highlight_words\' or your nickname is mentioned.')], - 'muc_message_received': [True, 'gc_message2.wav', _('Sound to play when any group chat message arrives.')], + 'muc_message_highlight': [True, 'gc_message1.wav', 'Sound to play when a group chat message contains one of the words in \'muc_highlight_words\' or your nickname is mentioned.'], + 'muc_message_received': [True, 'gc_message2.wav', 'Sound to play when any group chat message arrives.'], } proxies_default = { - _('Tor'): ['socks5', 'localhost', 9050], + 'Tor': ['socks5', 'localhost', 9050], } def foreach(self, cb, data=None): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/77c1f4d69ec5142c130d2b2ed366e111… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/77c1f4d69ec5142c130d2b2ed366e111… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: fix: History: Don’t remove JID IDs from database
by Daniel Brötzmann (＠wurstsalat) 29 May '22

29 May '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 1b188e22 by wurstsalat at 2022-05-29T17:08:37+02:00 fix: History: Don’t remove JID IDs from database A JID ID can be used by more than one account - - - - - 5c9f034e by wurstsalat at 2022-05-29T17:09:39+02:00 chore: Message: Add type annotations - - - - - 4475e1cd by wurstsalat at 2022-05-29T17:18:53+02:00 chore: MAM: Add type annotations - - - - - 4 changed files: - gajim/common/modules/mam.py - gajim/common/modules/message.py - gajim/common/storage/archive.py - gajim/gtk/application.py Changes: ===================================== gajim/common/modules/mam.py ===================================== @@ -14,26 +14,38 @@ # XEP-0313: Message Archive Management +from __future__ import annotations + +from typing import Any +from typing import Optional + import time from datetime import datetime from datetime import timedelta import nbxmpp -from nbxmpp.namespaces import Namespace -from nbxmpp.util import generate_id from nbxmpp.errors import StanzaError from nbxmpp.errors import MalformedStanzaError from nbxmpp.errors import is_error +from nbxmpp.namespaces import Namespace +from nbxmpp.protocol import JID +from nbxmpp.protocol import Message +from nbxmpp.structs import DiscoInfo +from nbxmpp.structs import MessageProperties from nbxmpp.structs import StanzaHandler +from nbxmpp.structs import StanzaIDData +from nbxmpp.task import Task +from nbxmpp.util import generate_id from nbxmpp.modules.util import raise_if_error from gajim.common import app +from gajim.common import types from gajim.common.events import ArchivingIntervalFinished from gajim.common.events import FeatureDiscovered from gajim.common.events import MamMessageReceived from gajim.common.events import MessageUpdated from gajim.common.events import RawMamMessageReceived -from gajim.common.const import ArchiveState +from gajim.common.const import ArchiveState, ClientState from gajim.common.const import KindConstant from gajim.common.const import SyncThreshold from gajim.common.helpers import AdditionalDataDict @@ -54,7 +66,7 @@ class MAM(BaseModule): 'make_query', ] - def __init__(self, con): + def __init__(self, con: types.Client) -> None: BaseModule.__init__(self, con) self.handlers = [ @@ -67,15 +79,15 @@ def __init__(self, con): ] self.available = False - self._mam_query_ids = {} + self._mam_query_ids: dict[str, str] = {} # Holds archive jids where catch up was successful - self._catch_up_finished = [] + self._catch_up_finished: list[str] = [] self._con.connect_signal('state-changed', self._on_client_state_changed) self._con.connect_signal('resume-failed', self._on_client_resume_failed) - def pass_disco(self, info): + def pass_disco(self, info: DiscoInfo) -> None: if Namespace.MAM_2 not in info.features: return @@ -86,24 +98,34 @@ def pass_disco(self, info): FeatureDiscovered(account=self._account, feature=Namespace.MAM_2)) - def _on_client_resume_failed(self, _client, _signal_name): + def _on_client_resume_failed(self, + _client: types.Client, + _signal_name: str + ) -> None: self._reset_state() - def _on_client_state_changed(self, _client, _signal_name, state): + def _on_client_state_changed(self, + _client: types.Client, + _signal_name: str, + state: ClientState + ) -> None: if state.is_disconnected: self._reset_state() - def _reset_state(self): + def _reset_state(self) -> None: self._mam_query_ids.clear() self._catch_up_finished.clear() - def _remove_query_id(self, jid): + def _remove_query_id(self, jid: JID) -> None: self._mam_query_ids.pop(jid, None) - def is_catch_up_finished(self, jid): + def is_catch_up_finished(self, jid: str) -> bool: return jid in self._catch_up_finished - def _from_valid_archive(self, _stanza, properties): + def _from_valid_archive(self, + _stanza: Message, + properties: MessageProperties + ) -> bool: if properties.type.is_groupchat: expected_archive = properties.jid else: @@ -111,7 +133,9 @@ def _from_valid_archive(self, _stanza, properties): return properties.mam.archive.bare_match(expected_archive) - def _get_unique_id(self, properties): + def _get_unique_id(self, + properties: MessageProperties + ) -> tuple[Optional[str], Optional[str]]: if properties.type.is_groupchat: return properties.mam.id, None @@ -129,13 +153,19 @@ def _get_unique_id(self, properties): return properties.mam.id, None @staticmethod - def _get_stanza_id(properties, archive_jid): + def _get_stanza_id(properties: MessageProperties, + archive_jid: str + ) -> Optional[StanzaIDData]: for stanza_id in properties.stanza_ids: if stanza_id.by == archive_jid: return stanza_id return None - def _set_message_archive_info(self, _con, _stanza, properties): + def _set_message_archive_info(self, + _con: types.xmppClient, + _stanza: Message, + properties: MessageProperties + ) -> None: if (properties.is_mam_message or properties.is_pubsub or properties.is_muc_subject): @@ -177,7 +207,11 @@ def _set_message_archive_info(self, _con, _stanza, properties): last_mam_id=stanza_id.id, last_muc_timestamp=timestamp) - def _mam_message_received(self, _con, stanza, properties): + def _mam_message_received(self, + _con: types.xmppClient, + stanza: Message, + properties: MessageProperties + ) -> None: if not properties.is_mam_message: return @@ -265,7 +299,7 @@ def _mam_message_received(self, _con, stanza, properties): return stanza_id = message_id - event_attr = { + event_attr: dict[str, Any] = { 'account': self._account, 'jid': jid, 'msgtxt': properties.body, @@ -305,16 +339,16 @@ def _mam_message_received(self, _con, stanza, properties): app.ged.raise_event(MamMessageReceived(**event_attr)) - def _is_valid_request(self, properties): + def _is_valid_request(self, properties: MessageProperties) -> bool: valid_id = self._mam_query_ids.get(properties.mam.archive, None) return valid_id == properties.mam.query_id - def _get_query_id(self, jid): + def _get_query_id(self, jid: str) -> str: query_id = generate_id() self._mam_query_ids[jid] = query_id return query_id - def _get_query_params(self): + def _get_query_params(self) -> tuple[Optional[ſtr], Optional[datetime]]: own_jid = self._con.get_own_jid().bare archive = app.storage.archive.get_archive_infos(own_jid) @@ -334,7 +368,10 @@ def _get_query_params(self): own_jid, start_date) return mam_id, start_date - def _get_muc_query_params(self, jid, threshold): + def _get_muc_query_params(self, + jid: JID, + threshold: SyncThreshold + ) -> tuple[Optional[str], Optional[datetime]]: archive = app.storage.archive.get_archive_infos(jid) mam_id = None start_date = None @@ -419,7 +456,9 @@ def request_archive_on_signin(self): oldest_mam_timestamp=start_date.timestamp()) @as_task - def request_archive_on_muc_join(self, jid): + def request_archive_on_muc_join(self, + jid: JID + ): _task = yield threshold = app.settings.get_group_chat_setting(self._account, @@ -455,7 +494,11 @@ def request_archive_on_muc_join(self, jid): last_muc_timestamp=time.time()) @as_task - def _execute_query(self, jid, mam_id, start_date): + def _execute_query(self, + jid: JID, + mam_id: Optional[str], + start_date: Optional[datetime] + ): _task = yield if jid in self._catch_up_finished: @@ -492,10 +535,11 @@ def _execute_query(self, jid, mam_id, start_date): yield result def request_archive_interval(self, - start_date, - end_date, - after=None, - queryid=None): + start_date: datetime, + end_date: datetime, + after: Optional[str] = None, + queryid: Optional[str] = None + ) -> str: jid = self._con.get_own_jid().bare @@ -518,7 +562,7 @@ def request_archive_interval(self, user_data=(queryid, start_date, end_date)) return queryid - def _on_interval_result(self, task): + def _on_interval_result(self, task: Task) -> None: queryid, start_date, end_date = task.get_user_data() try: ===================================== gajim/common/modules/message.py ===================================== @@ -14,14 +14,21 @@ # Message handler +from __future__ import annotations + +from typing import Any +from typing import Optional + import time import nbxmpp from nbxmpp.namespaces import Namespace +from nbxmpp.structs import MessageProperties from nbxmpp.structs import StanzaHandler from nbxmpp.util import generate_id from gajim.common import app +from gajim.common import types from gajim.common.events import GcMessageReceived from gajim.common.events import MessageError from gajim.common.events import MessageReceived @@ -34,10 +41,11 @@ from gajim.common.modules.misc import parse_correction from gajim.common.modules.misc import parse_oob from gajim.common.modules.misc import parse_xhtml +from gajim.common.structs import OutgoingMessage class Message(BaseModule): - def __init__(self, con): + def __init__(self, con: types.Client) -> None: BaseModule.__init__(self, con) self.handlers = [ @@ -57,7 +65,11 @@ def __init__(self, con): self._message_namespaces = set([Namespace.ROSTERX, Namespace.IBB]) - def _check_if_unknown_contact(self, _con, stanza, properties): + def _check_if_unknown_contact(self, + _con: types.xmppClient, + stanza: nbxmpp.Message, + properties: MessageProperties + ) -> None: if (properties.type.is_groupchat or properties.is_muc_pm or properties.is_self_message or @@ -78,7 +90,11 @@ def _check_if_unknown_contact(self, _con, stanza, properties): self._log.warning(stanza) raise nbxmpp.NodeProcessed - def _message_received(self, _con, stanza, properties): + def _message_received(self, + _con: types.xmppClient, + stanza: nbxmpp.Message, + properties: MessageProperties + ) -> None: if (properties.is_mam_message or properties.is_pubsub or properties.type.is_error): @@ -172,7 +188,7 @@ def _message_received(self, _con, stanza, properties): if properties.has_security_label: displaymarking = properties.security_label.displaymarking - event_attr = { + event_attr: dict[str, Any] = { 'conn': self._con, 'stanza': stanza, 'account': self._account, @@ -241,7 +257,11 @@ def _message_received(self, _con, stanza, properties): stanza_id=stanza_id or message_id, message_id=properties.id) - def _message_error_received(self, _con, _stanza, properties): + def _message_error_received(self, + _con: types.xmppClient, + _stanza: nbxmpp.Message, + properties: MessageProperties + ) -> None: jid = properties.jid if not properties.is_muc_pm: jid = jid.new_as_bare() @@ -261,7 +281,7 @@ def _message_error_received(self, _con, _stanza, properties): message_id=properties.id, error=properties.error)) - def _log_muc_message(self, event): + def _log_muc_message(self, event: GcMessageReceived) -> None: self._check_for_mam_compliance(event.room_jid, event.stanza_id) if event.msgtxt and event.properties.muc_nickname: @@ -276,12 +296,14 @@ def _log_muc_message(self, event): stanza_id=event.stanza_id, message_id=event.properties.id) - def _check_for_mam_compliance(self, room_jid, stanza_id): + def _check_for_mam_compliance(self, room_jid: str, stanza_id: str) -> None: disco_info = app.storage.cache.get_last_disco_info(room_jid) if stanza_id is None and disco_info.mam_namespace == Namespace.MAM_2: self._log.warning('%s announces mam:2 without stanza-id', room_jid) - def _get_unique_id(self, properties): + def _get_unique_id(self, + properties: MessageProperties + ) -> tuple[Optional[str], Optional[str]]: if properties.is_self_message: # Deduplicate self message with message-id return None, properties.id @@ -310,7 +332,7 @@ def _get_unique_id(self, properties): # stanza-id not added by the archive, ignore it. return None, None - def build_message_stanza(self, message): + def build_message_stanza(self, message: OutgoingMessage) -> nbxmpp.Message: own_jid = self._con.get_own_jid() stanza = nbxmpp.Message(to=message.jid, @@ -384,7 +406,7 @@ def build_message_stanza(self, message): return stanza - def log_message(self, message): + def log_message(self, message: OutgoingMessage) -> None: if not message.is_loggable: return ===================================== gajim/common/storage/archive.py ===================================== @@ -1379,21 +1379,6 @@ def remove_history(self, account: str, jid: JID) -> None: self._delayed_commit() log.info('Removed history for: %s', jid) - def forget_jid_data(self, account: str, jid: JID) -> None: - 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,)) - - sql = 'DELETE FROM last_archive_message WHERE jid_id = ?' - self._con.execute(sql, (jid_id,)) - - self._delayed_commit() - log.info('Forgot data for: %s', jid) - def remove_all_history(self) -> None: """ Remove all messages for all accounts ===================================== gajim/gtk/application.py ===================================== @@ -806,7 +806,6 @@ def _on_forget_groupchat_action(_action: Gio.SimpleAction, client.get_module('Bookmarks').remove(params.jid) app.storage.archive.remove_history(params.account, params.jid) - app.storage.archive.forget_jid_data(params.account, params.jid) @staticmethod def _on_groupchat_join_action(_action: Gio.SimpleAction, View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/f67ac3861d546f1baa6a25d69cfa200… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/f67ac3861d546f1baa6a25d69cfa200… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] imprv: Group chat roster: Store visibility
by Daniel Brötzmann (＠wurstsalat) 29 May '22

29 May '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: f67ac386 by wurstsalat at 2022-05-29T13:30:04+02:00 imprv: Group chat roster: Store visibility - - - - - 1 changed file: - gajim/gtk/controls/groupchat.py Changes: ===================================== gajim/gtk/controls/groupchat.py ===================================== @@ -124,6 +124,8 @@ def __init__(self, account: str, jid: JID) -> None: self.roster = GroupchatRoster(self.account, self.room_jid, self) self.xml.roster_revealer.add(self.roster) + self.xml.roster_revealer.set_reveal_child( + not app.settings.get('hide_groupchat_occupants_list')) self.roster.connect('row-activated', self._on_roster_row_activated) self.add_actions() @@ -524,6 +526,7 @@ def _show_roster(self, *args: Any) -> None: transition = Gtk.RevealerTransitionType.SLIDE_LEFT self.xml.roster_revealer.set_transition_type(transition) self.xml.roster_revealer.set_reveal_child(show) + app.settings.set('hide_groupchat_occupants_list', show) def _on_roster_row_activated(self, _roster: GroupchatRoster, View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/f67ac3861d546f1baa6a25d69cfa2000… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/f67ac3861d546f1baa6a25d69cfa2000… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: Search: Add fail-safe for incomplete JID ID tables
by Daniel Brötzmann (＠wurstsalat) 29 May '22

29 May '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: c7dbd582 by wurstsalat at 2022-05-29T13:16:01+02:00 fix: Search: Add fail-safe for incomplete JID ID tables Fixes #10922 - - - - - 2 changed files: - gajim/common/storage/archive.py - gajim/gtk/search_view.py Changes: ===================================== gajim/common/storage/archive.py ===================================== @@ -284,8 +284,9 @@ def _get_jid_ids_from_db(self) -> None: self._jid_ids[row.jid] = row self._jid_ids_reversed[row.jid_id] = row - def get_jid_from_id(self, jid_id: int) -> JidsTableRow: - return self._jid_ids_reversed[jid_id] + def get_jid_from_id(self, jid_id: int) -> Optional[JidsTableRow]: + # Use get as a fail-safe for cases where the JID ID table is incomplete + return self._jid_ids_reversed.get(jid_id) def get_jids_in_db(self) -> KeysView[JID]: return self._jid_ids.keys() ===================================== gajim/gtk/search_view.py ===================================== @@ -191,6 +191,8 @@ def _add_results(self) -> None: for msg in itertools.islice(self._results_iterator, 25): if self._scope == 'everywhere': archive_jid = app.storage.archive.get_jid_from_id(msg.jid_id) + if archive_jid is None: + continue result_row = ResultRow( msg, accounts[msg.account_id], View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c7dbd58263e5e70b8529639f414663ea… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c7dbd58263e5e70b8529639f414663ea… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: Fix "Compiling" messages in setup.py
by Philipp Hörist (＠lovetox) 29 May '22

29 May '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: a9806a90 by JURAJ LUTTER at 2022-05-29T09:12:50+02:00 fix: Fix "Compiling" messages in setup.py - - - - - 1 changed file: - setup.py Changes: ===================================== setup.py ===================================== @@ -62,7 +62,7 @@ def build_translation() -> None: cwd=REPO_DIR, check=True) - print('Compiling %s >> %s', po_file, mo_file) + print('Compiling %s >> %s' % (po_file, mo_file)) def install_trans(data_files) -> None: @@ -94,7 +94,7 @@ def build_man() -> None: with open(filename, 'rb') as f_in,\ gzip.open(man_file_gz, 'wb') as f_out: f_out.writelines(f_in) - print('Compiling %s >> %s', filename, man_file_gz) + print('Compiling %s >> %s' % (filename, man_file_gz)) def install_man(data_files) -> None: @@ -140,7 +140,7 @@ def merge(in_file, out_file, option, po_dir: str = 'po') -> None: msg = ('ERROR: %s was not merged into the translation files!\n' % out_file) raise SystemExit(msg) - print('Compiling %s >> %s', in_file, out_file) + print('Compiling %s >> %s' % (in_file, out_file)) class build(_build): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a9806a90365ab4c65ceaa138a6413026… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a9806a90365ab4c65ceaa138a6413026… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: ChatControl: Don't update AV actions for PMs
by Daniel Brötzmann (＠wurstsalat) 28 May '22

28 May '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: c34f3da0 by wurstsalat at 2022-05-28T23:09:57+02:00 fix: ChatControl: Don't update AV actions for PMs Fixes: #10921 - - - - - 1 changed file: - gajim/gtk/controls/chat.py Changes: ===================================== gajim/gtk/controls/chat.py ===================================== @@ -197,12 +197,13 @@ def update_actions(self) -> None: online and self._client.get_module('Blocking').supported) # Jingle AV - self._get_action('start-voice-call-').set_enabled( - online and self.contact.supports_audio() - and sys.platform != 'win32') - self._get_action('start-video-call-').set_enabled( - online and self.contact.supports_video() - and sys.platform != 'win32') + if self.type.is_chat: + self._get_action('start-voice-call-').set_enabled( + online and self.contact.supports_audio() + and sys.platform != 'win32') + self._get_action('start-video-call-').set_enabled( + online and self.contact.supports_video() + and sys.platform != 'win32') # Send message has_text = self.msg_textview.has_text() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c34f3da062c1fbb34041223535ef16b8… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c34f3da062c1fbb34041223535ef16b8… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: InfoBar: Add style rule for anchors in dark mode
by Daniel Brötzmann (＠wurstsalat) 28 May '22

28 May '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 5daf4cb2 by wurstsalat at 2022-05-28T23:03:58+02:00 fix: InfoBar: Add style rule for anchors in dark mode - - - - - 1 changed file: - gajim/data/style/gajim-dark.css Changes: ===================================== gajim/data/style/gajim-dark.css ===================================== @@ -5,15 +5,27 @@ infobar.info > revealer > box { color: #D9EDF7; background-color: #3A87AD; } +infobar.info > revealer > box > box * { + color: #D9EDF7; +} infobar.question > revealer > box { color: #D9EDF7; background-color: #295A72; } +infobar.question > revealer > box > box * { + color: #D9EDF7; +} infobar.warning > revealer > box { color: #FCF8E3; background-color: #D2822B; } +infobar.warning > revealer > box > box * { + color: #FCF8E3; +} infobar.error > revealer > box { color: #FCE5D5; background-color: #D64937; } +infobar.error > revealer > box > box * { + color: #FCE5D5; +} View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/5daf4cb241023cccfcce6fd9ddffa8b9… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/5daf4cb241023cccfcce6fd9ddffa8b9… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: chore: VCard4: Add type annotations
by Daniel Brötzmann (＠wurstsalat) 28 May '22

28 May '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 661eef28 by wurstsalat at 2022-05-28T21:34:03+02:00 chore: VCard4: Add type annotations - - - - - 358180cf by wurstsalat at 2022-05-28T21:39:19+02:00 chore: PubSub: Add type annotations - - - - - 33b9bf03 by wurstsalat at 2022-05-28T21:43:38+02:00 chore: HTTPAuth: Add type annotations - - - - - 4 changed files: - gajim/common/modules/http_auth.py - gajim/common/modules/pubsub.py - gajim/common/modules/vcard4.py - pyrightconfig.json Changes: ===================================== gajim/common/modules/http_auth.py ===================================== @@ -14,17 +14,26 @@ # XEP-0070: Verifying HTTP Requests via XMPP +from __future__ import annotations + +from typing import Union + import nbxmpp +from nbxmpp.protocol import Iq +from nbxmpp.protocol import Message +from nbxmpp.structs import IqProperties +from nbxmpp.structs import MessageProperties from nbxmpp.structs import StanzaHandler from nbxmpp.namespaces import Namespace from gajim.common import app +from gajim.common import types from gajim.common.events import HttpAuth from gajim.common.modules.base import BaseModule class HTTPAuth(BaseModule): - def __init__(self, con): + def __init__(self, con: types.Client) -> None: BaseModule.__init__(self, con) self.handlers = [ @@ -39,7 +48,11 @@ def __init__(self, con): priority=45) ] - def _http_auth(self, _con, stanza, properties): + def _http_auth(self, + _con: types.xmppClient, + stanza: Union[Iq, Message], + properties: Union[IqProperties, MessageProperties] + ) -> None: if not properties.is_http_auth: return @@ -56,7 +69,10 @@ def _http_auth(self, _con, stanza, properties): stanza=stanza)) raise nbxmpp.NodeProcessed - def build_http_auth_answer(self, stanza, answer): + def build_http_auth_answer(self, + stanza: Union[Iq, Message], + answer: str + ) -> None: if answer == 'yes': self._log.info('Auth request approved') confirm = stanza.getTag('confirm') ===================================== gajim/common/modules/pubsub.py ===================================== @@ -20,10 +20,17 @@ # XEP-0060: Publish-Subscribe +from __future__ import annotations + +from typing import Any +from typing import Callable + import nbxmpp from nbxmpp.namespaces import Namespace +from nbxmpp.structs import DiscoInfo from gajim.common import app +from gajim.common import types from gajim.common.modules.base import BaseModule @@ -38,17 +45,21 @@ class PubSub(BaseModule): 'get_access_model', ] - def __init__(self, con): + def __init__(self, con: types.Client) -> None: BaseModule.__init__(self, con) self.publish_options = False - def pass_disco(self, info): + def pass_disco(self, info: DiscoInfo) -> None: if Namespace.PUBSUB_PUBLISH_OPTIONS in info.features: self._log.info('Discovered Pubsub publish options: %s', info.jid) self.publish_options = True - def send_pb_subscription_query(self, jid, cb, **kwargs): + def send_pb_subscription_query(self, + jid: str, + cb: Callable[..., Any], + **kwargs: Any + ) -> None: if not app.account_is_available(self._account): return @@ -58,7 +69,12 @@ def send_pb_subscription_query(self, jid, cb, **kwargs): self._con.connection.SendAndCallForResponse(query, cb, kwargs) - def send_pb_subscribe(self, jid, node, cb, **kwargs): + def send_pb_subscribe(self, + jid: str, + node: str, + cb: Callable[..., Any], + **kwargs: Any + ) -> None: if not app.account_is_available(self._account): return @@ -69,7 +85,12 @@ def send_pb_subscribe(self, jid, node, cb, **kwargs): self._con.connection.SendAndCallForResponse(query, cb, kwargs) - def send_pb_unsubscribe(self, jid, node, cb, **kwargs): + def send_pb_unsubscribe(self, + jid: str, + node: str, + cb: Callable[..., Any], + **kwargs: Any + ) -> None: if not app.account_is_available(self._account): return ===================================== gajim/common/modules/vcard4.py ===================================== @@ -14,6 +14,9 @@ # XEP-0292: vCard4 Over XMPP +from __future__ import annotations + +from gajim.common import types from gajim.common.modules.base import BaseModule @@ -25,5 +28,5 @@ class VCard4(BaseModule): 'set_vcard', ] - def __init__(self, con): + def __init__(self, con: types.Client) -> None: BaseModule.__init__(self, con) ===================================== pyrightconfig.json ===================================== @@ -33,6 +33,7 @@ "gajim/common/modules/pep.py", "gajim/common/modules/register.py", "gajim/common/modules/vcard_temp.py", + "gajim/common/modules/vcard4.py", "gajim/common/passwords.py", "gajim/common/regex.py", "gajim/common/setting_values.py", View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/382784a92f03bcd63de1813939d1c41… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/382784a92f03bcd63de1813939d1c41… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: chore: VCardAvatars: Add type annotations
by Daniel Brötzmann (＠wurstsalat) 28 May '22

28 May '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: e016d425 by wurstsalat at 2022-05-28T21:15:01+02:00 chore: VCardAvatars: Add type annotations - - - - - 382784a9 by wurstsalat at 2022-05-28T21:17:06+02:00 chore: VCardTemp: Add type annotations - - - - - 3 changed files: - gajim/common/modules/vcard_avatars.py - gajim/common/modules/vcard_temp.py - pyrightconfig.json Changes: ===================================== gajim/common/modules/vcard_avatars.py ===================================== @@ -14,20 +14,31 @@ # XEP-0153: vCard-Based Avatars -from nbxmpp.namespaces import Namespace -from nbxmpp.structs import StanzaHandler +from __future__ import annotations + +from typing import Generator +from typing import Optional + from nbxmpp.const import AvatarState from nbxmpp.modules.util import is_error +from nbxmpp.modules.vcard_temp import VCard +from nbxmpp.namespaces import Namespace +from nbxmpp.protocol import JID +from nbxmpp.protocol import Presence +from nbxmpp.structs import DiscoInfo +from nbxmpp.structs import PresenceProperties +from nbxmpp.structs import StanzaHandler from gajim.common import app +from gajim.common import types from gajim.common.modules.base import BaseModule from gajim.common.modules.util import as_task class VCardAvatars(BaseModule): - def __init__(self, con): + def __init__(self, con: types.Client) -> None: BaseModule.__init__(self, con) - self._requested_shas = [] + self._requested_shas: list[str] = [] self.handlers = [ StanzaHandler(name='presence', @@ -38,18 +49,22 @@ def __init__(self, con): self.avatar_conversion_available = False - self._muc_avatar_cache = {} + self._muc_avatar_cache: dict[JID, str] = {} - def pass_disco(self, info): + def pass_disco(self, info: DiscoInfo) -> None: is_available = Namespace.VCARD_CONVERSION in info.features self.avatar_conversion_available = is_available self._log.info('Discovered Avatar Conversion') - def get_avatar_sha(self, jid): + def get_avatar_sha(self, jid: JID) -> Optional[str]: return self._muc_avatar_cache.get(jid) @as_task - def _request_vcard(self, jid, expected_sha, type_): + def _request_vcard(self, + jid: JID, + expected_sha: str, + type_: str + ) -> Generator[VCard, None, None]: _task = yield vcard = yield self._con.get_module('VCardTemp').request_vcard(jid=jid) @@ -86,7 +101,11 @@ def _request_vcard(self, jid, expected_sha, type_): contact.update_avatar(avatar_sha) - def _presence_received(self, _con, _stanza, properties): + def _presence_received(self, + _con: types.xmppClient, + _stanza: Presence, + properties: PresenceProperties + ) -> None: if not properties.type.is_available: return @@ -108,7 +127,7 @@ def _presence_received(self, _con, _stanza, properties): properties.avatar_sha, muc is not None) - def muc_disco_info_update(self, disco_info): + def muc_disco_info_update(self, disco_info: DiscoInfo) -> None: if not disco_info.supports(Namespace.VCARD): return @@ -123,7 +142,12 @@ def muc_disco_info_update(self, disco_info): state = AvatarState.EMPTY if not avatar_sha else AvatarState.ADVERTISED self._process_update(disco_info.jid, state, avatar_sha, True) - def _process_update(self, jid, state, avatar_sha, groupchat): + def _process_update(self, + jid: JID, + state: AvatarState, + avatar_sha: str, + groupchat: bool + ) -> None: contact = self._con.get_module('Contacts').get_contact( jid, groupchat=groupchat) @@ -162,7 +186,7 @@ def _process_update(self, jid, state, avatar_sha, groupchat): else: self._request_vcard(jid, avatar_sha, 'contact') - def _muc_update_received(self, properties): + def _muc_update_received(self, properties: PresenceProperties) -> None: contact = self._con.get_module('Contacts').get_contact(properties.jid, groupchat=True) nick = properties.jid.resource ===================================== gajim/common/modules/vcard_temp.py ===================================== @@ -14,8 +14,12 @@ # XEP-0054: vcard-temp +from __future__ import annotations + from nbxmpp.namespaces import Namespace +from nbxmpp.structs import DiscoInfo +from gajim.common import types from gajim.common.modules.base import BaseModule @@ -27,13 +31,13 @@ class VCardTemp(BaseModule): 'set_vcard', ] - def __init__(self, con): + def __init__(self, con: types.Client) -> None: BaseModule.__init__(self, con) self._own_vcard = None self.supported = False - def pass_disco(self, info): + def pass_disco(self, info: DiscoInfo) -> None: if Namespace.VCARD not in info.features: return ===================================== pyrightconfig.json ===================================== @@ -32,6 +32,7 @@ "gajim/common/modules/chat_markers.py", "gajim/common/modules/pep.py", "gajim/common/modules/register.py", + "gajim/common/modules/vcard_temp.py", "gajim/common/passwords.py", "gajim/common/regex.py", "gajim/common/setting_values.py", View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/661a3025f364cf2ba4fbc351ef50e15… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/661a3025f364cf2ba4fbc351ef50e15… 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