Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] chore: Fix missing return
by Philipp Hörist (＠lovetox) 02 May '22

02 May '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 6781ec1b by lovetox at 2022-05-03T00:17:01+02:00 chore: Fix missing return - - - - - 1 changed file: - gajim/common/modules/mam.py Changes: ===================================== gajim/common/modules/mam.py ===================================== @@ -133,6 +133,7 @@ def _get_stanza_id(properties, archive_jid): 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): if (properties.is_mam_message or View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/6781ec1b7fa05d674a840ffdd8fdfe85… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/6781ec1b7fa05d674a840ffdd8fdfe85… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] chore: Add newline
by Philipp Hörist (＠lovetox) 02 May '22

02 May '22

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: af0778f3 by lovetox at 2022-05-03T00:08:25+02:00 chore: Add newline - - - - - 1 changed file: - nbxmpp/modules/message.py Changes: ===================================== nbxmpp/modules/message.py ===================================== @@ -117,4 +117,4 @@ class BaseMessage(BaseModule): stanza_ids.append(StanzaIDData(id=id_, by=by)) - return stanza_ids \ No newline at end of file + return stanza_ids View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/af0778f3b00532412b8247e0… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/af0778f3b00532412b8247e0… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: Handle multiple stanza-id elements
by Philipp Hörist (＠lovetox) 02 May '22

02 May '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 159219cf by lovetox at 2022-05-03T00:07:07+02:00 fix: Handle multiple stanza-id elements - - - - - 6 changed files: - gajim/common/modules/mam.py - gajim/common/modules/message.py - gajim/gajim.py - gajim/gtk/chat_list.py - gajim/gtk/controls/groupchat.py - setup.cfg Changes: ===================================== gajim/common/modules/mam.py ===================================== @@ -128,6 +128,12 @@ def _get_unique_id(self, properties): # A message we received return properties.mam.id, None + @staticmethod + def _get_stanza_id(properties, archive_jid): + for stanza_id in properties.stanza_ids: + if stanza_id.by == archive_jid: + return stanza_id + def _set_message_archive_info(self, _con, _stanza, properties): if (properties.is_mam_message or properties.is_pubsub or @@ -155,10 +161,11 @@ def _set_message_archive_info(self, _con, _stanza, properties): archive_jid = self._con.get_own_jid().bare timestamp = None - if properties.stanza_id is None: + if not properties.stanza_ids: return - if not archive_jid == properties.stanza_id.by: + stanza_id = self._get_stanza_id(properties, archive_jid) + if stanza_id is None: return if not self.is_catch_up_finished(archive_jid): @@ -166,7 +173,7 @@ def _set_message_archive_info(self, _con, _stanza, properties): app.storage.archive.set_archive_infos( archive_jid, - last_mam_id=properties.stanza_id.id, + last_mam_id=stanza_id.id, last_muc_timestamp=timestamp) def _mam_message_received(self, _con, stanza, properties): ===================================== gajim/common/modules/message.py ===================================== @@ -292,7 +292,7 @@ def _get_unique_id(self, properties): # Deduplicate self message with message-id return None, properties.id - if properties.stanza_id is None: + if not properties.stanza_ids: return None, None if properties.type.is_groupchat: @@ -309,8 +309,10 @@ def _get_unique_id(self, properties): archive = self._con.get_own_jid() - if archive.bare_match(properties.stanza_id.by): - return properties.stanza_id.id, None + for stanza_id in properties.stanza_ids: + if archive.bare_match(stanza_id.by): + return stanza_id.id, None + # stanza-id not added by the archive, ignore it. return None, None ===================================== gajim/gajim.py ===================================== @@ -30,7 +30,7 @@ from gajim.common import i18n -_MIN_NBXMPP_VER = '3.0.0-dev2' +_MIN_NBXMPP_VER = '3.0.0.dev3' _MIN_GTK_VER = '3.22.27' _MIN_CAIRO_VER = '1.16.0' _MIN_PYGOBJECT_VER = '3.32.0' ===================================== gajim/gtk/chat_list.py ===================================== @@ -397,13 +397,9 @@ def _on_message_received(self, event: MessageEventT) -> None: row.set_nick(nick) if event.name == 'mam-message-received': row.set_timestamp(event.properties.mam.timestamp) - row.set_stanza_id(event.stanza_id) else: row.set_timestamp(event.properties.timestamp) - stanza_id = None - if event.properties.stanza_id: - stanza_id = event.properties.stanza_id.id - row.set_stanza_id(stanza_id) + row.set_stanza_id(event.stanza_id) row.set_message_id(event.unique_id) row.set_message_text( event.msgtxt, ===================================== gajim/gtk/controls/groupchat.py ===================================== @@ -612,15 +612,13 @@ def _on_gc_message_received(self, event: events.GcMessageReceived) -> None: else: if event.properties.muc_nickname == self.contact.nickname: self.last_sent_txt = event.msgtxt - stanza_id = None - if event.properties.stanza_id: - stanza_id = event.properties.stanza_id.id + self.add_message(event.msgtxt, contact=event.properties.muc_nickname, tim=event.properties.timestamp, displaymarking=event.displaymarking, message_id=event.properties.id, - stanza_id=stanza_id, + stanza_id=event.stanza_id, additional_data=event.additional_data) event.needs_highlight = helpers.message_needs_highlight( event.msgtxt, ===================================== setup.cfg ===================================== @@ -22,7 +22,7 @@ test_suite = test install_requires = css-parser keyring - nbxmpp>=2.99.0 + nbxmpp>=3.0.0.dev3 packaging precis-i18n>=1.0.0 pyOpenSSL>=16.2 View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/159219cfdf72538316b25416b79b8c70… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/159219cfdf72538316b25416b79b8c70… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] 2 commits: fix: Handle multiple stanza-id elements
by Philipp Hörist (＠lovetox) 02 May '22

02 May '22

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: dd932855 by lovetox at 2022-05-03T00:01:27+02:00 fix: Handle multiple stanza-id elements - - - - - f744ed58 by lovetox at 2022-05-03T00:02:35+02:00 3.0.0.dev3 - - - - - 4 changed files: - nbxmpp/__init__.py - nbxmpp/modules/message.py - nbxmpp/structs.py - setup.cfg Changes: ===================================== nbxmpp/__init__.py ===================================== @@ -4,4 +4,4 @@ from .protocol import * gi.require_version('Soup', '2.4') -__version__: str = "3.0.0-dev2" +__version__: str = "3.0.0.dev3" ===================================== nbxmpp/modules/message.py ===================================== @@ -61,10 +61,7 @@ class BaseMessage(BaseModule): properties.id = stanza.getID() properties.self_message = self._parse_self_message(stanza, properties) - # Stanza ID - id_, by = stanza.getStanzaIDAttrs() - if id_ is not None and by is not None: - properties.stanza_id = StanzaIDData(id=id_, by=by) + properties.stanza_ids = self._parse_stanza_ids(stanza) if properties.type.is_error: properties.error = error_factory(stanza) @@ -107,3 +104,17 @@ class BaseMessage(BaseModule): if properties.type.is_groupchat: return False return stanza.getFrom().bare_match(stanza.getTo()) + + def _parse_stanza_ids(self, stanza): + stanza_ids = [] + for stanza_id in stanza.getTags('stanza-id', namespace=Namespace.SID): + id_ = stanza_id.getAttr('id') + by = stanza_id.getAttr('by') + if not id_ or not by: + self._log.warning('Missing attributes on stanza-id') + self._log.warning(stanza) + continue + + stanza_ids.append(StanzaIDData(id=id_, by=by)) + + return stanza_ids \ No newline at end of file ===================================== nbxmpp/structs.py ===================================== @@ -945,7 +945,7 @@ class MessageProperties: carbon: Optional[CarbonData] = None type: MessageType = MessageType.NORMAL id: Optional[str] = None - stanza_id: Optional[str] = None + stanza_ids: list[StanzaIDData] = field(default_factory=list) from_: Optional[JID] = None to: Optional[JID] = None jid: Optional[JID] = None ===================================== setup.cfg ===================================== @@ -1,6 +1,6 @@ [metadata] name = nbxmpp -version = 3.0.0-dev2 +version = 3.0.0.dev3 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/da6244965e125b517421cda… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/da6244965e125b517421cda… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.3] chore: Update Chinese (Simplified) translation
by Weblate (＠weblate) 02 May '22

02 May '22

Weblate pushed to branch gajim_1.3 at gajim / gajim Commits: 0a52344b by Weblate at 2022-05-02T21:31:24+02:00 chore: Update Chinese (Simplified) translation Translated using Weblate (Chinese (Simplified)) Currently translated at 77.3% (1716 of 2219 strings) Co-authored-by: Weblate <noreply(a)weblate.org> Co-authored-by: lovetox <philipp(a)hoerist.com> Translate-URL: https://translate.gajim.org/projects/gajim/1-3/zh_Hans/ Translation: Gajim/1.3 - - - - - 1 changed file: - po/zh_CN.po Changes: ===================================== po/zh_CN.po ===================================== @@ -5,14 +5,14 @@ # wwld <wwld(a)radio.lzusiyu.org>, 2005. # kangkang <kanger(a)gamil.com>, 2005. # Guanhao Yin <yinguanhao(a)gmail.com>, 2010. -# +# lovetox <philipp(a)hoerist.com>, 2022. msgid "" msgstr "" "Project-Id-Version: Gajim\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-01-01 17:44+0100\n" -"PO-Revision-Date: 2022-03-26 18:27+0000\n" -"Last-Translator: andy Z <andy.baker(a)dismail.de>\n" +"PO-Revision-Date: 2022-05-02 19:31+0000\n" +"Last-Translator: lovetox <philipp(a)hoerist.com>\n" "Language-Team: Chinese (Simplified) <https://translate.gajim.org/projects/" "gajim/1-3/zh_Hans/>\n" "Language: zh_CN\n" @@ -20,7 +20,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Weblate 4.1.1\n" +"X-Generator: Weblate 4.11.2\n" #: gajim/history_manager.py:78 msgid "Usage:" @@ -1485,7 +1485,7 @@ msgstr "列出联系人列表中所有联系人。每个联系人一行" #: gajim/gajim_remote.py:171 gajim/gajim_remote.py:180 #: gajim/gajim_remote.py:187 msgid "?CLI:account" -msgstr "？CLI：account" +msgstr "" #: gajim/gajim_remote.py:87 msgid "show only contacts of the given account" @@ -1501,7 +1501,7 @@ msgstr "改变一个或多个账户状态" #: gajim/gajim_remote.py:100 msgid "?CLI:status" -msgstr "？CLI：status" +msgstr "" #: gajim/gajim_remote.py:100 msgid "" @@ -1513,7 +1513,7 @@ msgstr "" #: gajim/gajim_remote.py:101 gajim/gajim_remote.py:121 #: gajim/gajim_remote.py:132 gajim/gajim_remote.py:141 msgid "?CLI:message" -msgstr "？CLI：message" +msgstr "" #: gajim/gajim_remote.py:101 msgid "status message" @@ -1531,7 +1531,7 @@ msgstr "改变一个或多个账户的优先级" #: gajim/gajim_remote.py:110 msgid "?CLI:priority" -msgstr "？CLI：priority" +msgstr "" #: gajim/gajim_remote.py:110 msgid "priority you want to give to the account" @@ -2672,11 +2672,11 @@ msgstr "高级配置编辑器 (ACE)" #: gajim/gtk/advanced_config.py:80 msgid "?config:Preference Name" -msgstr "?config：首选项名称" +msgstr "首选项名称" #: gajim/gtk/advanced_config.py:91 msgid "?config:Value" -msgstr "?config：值" +msgstr "值" #: gajim/gtk/advanced_config.py:100 msgid "?config:Type" @@ -2684,7 +2684,7 @@ msgstr "" #: gajim/gtk/advanced_config.py:133 msgid "?config description:None" -msgstr "?config description：无" +msgstr "无" #: gajim/gtk/preferences.py:63 gajim/data/gui/shortcuts_window.ui:31 msgid "Preferences" @@ -3799,7 +3799,7 @@ msgstr "文件名： %s" #: gajim/gtk/tooltips.py:533 msgid "?Noun:Download" -msgstr "?名词：下载" +msgstr "下载" #: gajim/gtk/tooltips.py:534 gajim/gtk/filetransfer.py:747 msgid "Sender: " @@ -3807,7 +3807,7 @@ msgstr "发送者： " #: gajim/gtk/tooltips.py:539 msgid "?Noun:Upload" -msgstr "?名词：上传" +msgstr "上传" #: gajim/gtk/tooltips.py:540 gajim/gtk/filetransfer.py:240 #: gajim/gtk/filetransfer.py:749 @@ -3816,50 +3816,43 @@ msgstr "接收者： " #: gajim/gtk/tooltips.py:546 msgid "?transfer type:Type: " -msgstr "?传输类型：类型： " +msgstr "类型： " #: gajim/gtk/tooltips.py:552 -#, fuzzy msgid "?transfer status:Transferred: " -msgstr "？transfer status：暂停" +msgstr "暂停 " #: gajim/gtk/tooltips.py:555 -#, fuzzy msgid "?transfer status:Status: " -msgstr "？transfer status：暂停" +msgstr "暂停 " #: gajim/gtk/tooltips.py:557 msgid "Description: " msgstr "描述： " #: gajim/gtk/tooltips.py:581 -#, fuzzy msgid "?transfer status:Aborted" -msgstr "？transfer status：暂停" +msgstr "暂停" #: gajim/gtk/tooltips.py:583 -#, fuzzy msgid "?transfer status:Completed" -msgstr "？transfer status：暂停" +msgstr "暂停" #: gajim/gtk/tooltips.py:585 msgid "?transfer status:Paused" -msgstr "？transfer status：暂停" +msgstr "暂停" #: gajim/gtk/tooltips.py:588 -#, fuzzy msgid "?transfer status:Stalled" -msgstr "？transfer status：暂停" +msgstr "暂停" #: gajim/gtk/tooltips.py:592 -#, fuzzy msgid "?transfer status:Transferring" -msgstr "？transfer status：暂停" +msgstr "暂停" #: gajim/gtk/tooltips.py:593 gajim/gtk/tooltips.py:594 -#, fuzzy msgid "?transfer status:Not started" -msgstr "？transfer status：暂停" +msgstr "暂停" #: gajim/gtk/remove_account.py:42 gajim/gtk/accounts.py:341 msgid "Remove" @@ -4545,7 +4538,7 @@ msgstr "收到的群聊消息" #: gajim/gtk/groupchat_info.py:38 msgid "?Group chat feature:Open" -msgstr "?群聊功能：打开" +msgstr "打开" #: gajim/gtk/groupchat_info.py:39 #, fuzzy @@ -4581,7 +4574,7 @@ msgstr "" #: gajim/gtk/groupchat_info.py:56 msgid "?Group chat feature:Moderated" -msgstr "?群聊功能：受管制的" +msgstr "受管制的" #: gajim/gtk/groupchat_info.py:57 msgid "" @@ -4609,7 +4602,7 @@ msgstr "" #: gajim/gtk/groupchat_info.py:70 msgid "?Group chat feature:Hidden" -msgstr "?群聊功能：隐藏" +msgstr "隐藏" #: gajim/gtk/groupchat_info.py:71 msgid "This group chat can not be found via search" @@ -4644,7 +4637,7 @@ msgstr "" #: gajim/gtk/groupchat_info.py:89 msgid "?Group chat feature:Temporary" -msgstr "?群聊功能：临时" +msgstr "临时" #: gajim/gtk/groupchat_info.py:90 msgid "This group chat will be destroyed once the last participant left" @@ -5241,9 +5234,8 @@ msgid "" msgstr "允许 Gajim 自动检测本地网络中的客户端以便进行无服务器聊天" #: gajim/gtk/features.py:108 -#, fuzzy msgid "Requires: gir1.2-avahi-0.6" -msgstr "需要： gir1.2-gupnpigd-1.0" +msgstr "需要： gir1.2-avahi-0.6" #: gajim/gtk/features.py:109 #, python-format @@ -5462,7 +5454,7 @@ msgstr "" #: gajim/gtk/profile.py:37 gajim/gtk/vcard_grid.py:42 msgid "?profile:Role" -msgstr "?个人资料：角色" +msgstr "角色" #: gajim/gtk/profile.py:38 gajim/gtk/vcard_grid.py:45 msgid "URL" @@ -5562,7 +5554,7 @@ msgstr "组织" #: gajim/gtk/vcard_grid.py:44 msgid "?profile:Note" -msgstr "?个人资料：附注" +msgstr "附注" #: gajim/gtk/vcard_grid.py:51 msgid "Your public key or authentication certificate" @@ -6216,7 +6208,7 @@ msgstr "访客" #: gajim/common/helpers.py:268 msgid "?Group Chat Contact Affiliation:None" -msgstr "？群聊联系人阶级：None" +msgstr "" #: gajim/common/helpers.py:271 msgid "Owners" @@ -6747,7 +6739,7 @@ msgstr "%(nick)s 改变了状态" #: gajim/common/const.py:287 msgid "?Group chat name:Team" -msgstr "?群聊名称：团队" +msgstr "团队" #: gajim/common/const.py:288 msgid "?Group chat description:Project discussion" @@ -6787,7 +6779,7 @@ msgstr "群聊邀请" #: gajim/common/const.py:296 msgid "?Group chat name:Repairs" -msgstr "?群聊名称：修理" +msgstr "修理" #: gajim/common/const.py:297 msgid "?Group chat description:Local help group" @@ -6800,7 +6792,7 @@ msgstr "群聊支持" #: gajim/common/const.py:299 msgid "?Group chat name:News" -msgstr "?群聊名称：新闻" +msgstr "新闻" #: gajim/common/const.py:300 #, fuzzy View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/0a52344b3d3c7aea8a5ae2ca0db6e6bd… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/0a52344b3d3c7aea8a5ae2ca0db6e6bd… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: Preview: Improve behavior in public group chats
by Daniel Brötzmann (＠wurstsalat) 02 May '22

02 May '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: e8a8484a by wurstsalat at 2022-05-02T21:31:41+02:00 fix: Preview: Improve behavior in public group chats - - - - - 1 changed file: - gajim/gtk/preview.py Changes: ===================================== gajim/gtk/preview.py ===================================== @@ -134,6 +134,7 @@ def update(self, preview: Preview, data: Optional[GdkPixbufType]) -> None: self._ui.download_button.hide() self._ui.open_folder_button.show() self._ui.save_as_button.show() + self._ui.link_button.hide() if (preview.orig_path is not None and preview.is_audio and app.is_installed('GST') and contains_audio_streams(preview.orig_path)): @@ -154,6 +155,7 @@ def update(self, preview: Preview, data: Optional[GdkPixbufType]) -> None: image = Gtk.Image.new_from_icon_name( 'dialog-question', Gtk.IconSize.DIALOG) self._ui.icon_button.set_image(image) + self._ui.download_button.show() file_size_string = _('Automatic preview disabled') self._ui.file_size.set_text(file_size_string) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e8a8484a65325acc1c4ab836d4bf0b42… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e8a8484a65325acc1c4ab836d4bf0b42… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: Chatstates: Ignore non chat messages
by Philipp Hörist (＠lovetox) 02 May '22

02 May '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: be5318ee by lovetox at 2022-05-02T20:21:27+02:00 fix: Chatstates: Ignore non chat messages - - - - - 1 changed file: - gajim/common/modules/chatstates.py Changes: ===================================== gajim/common/modules/chatstates.py ===================================== @@ -129,11 +129,14 @@ def _presence_received(self, contact.notify('chatstate-update') def _process_chatstate(self, _con, _stanza, properties): + if properties.type.is_error: + return + if not properties.has_chatstate: return if (properties.is_self_message or - properties.type.is_groupchat or + not properties.type.is_chat or properties.is_mam_message or properties.is_carbon_message and properties.carbon.is_sent): return View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/be5318ee7f7bd1bf7eb8eef71b0921c9… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/be5318ee7f7bd1bf7eb8eef71b0921c9… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] perf: Add more finalize checks
by Philipp Hörist (＠lovetox) 01 May '22

01 May '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 764cb1cf by lovetox at 2022-05-01T20:26:14+02:00 perf: Add more finalize checks - - - - - 2 changed files: - gajim/gtk/accounts.py - gajim/gtk/settings.py Changes: ===================================== gajim/gtk/accounts.py ===================================== @@ -98,6 +98,7 @@ def _on_key_press(self, def _on_destroy(self, _widget: AccountsWindow) -> None: self._check_relogin() + app.check_finalize(self) def update_account_label(self, account: str) -> None: self._accounts[account].update_account_label() ===================================== gajim/gtk/settings.py ===================================== @@ -83,6 +83,10 @@ def __init__(self, self.show_all() self.connect_after('key-press-event', self.on_key_press) + self.connect_after('destroy', self.__on_destroy) + + def __on_destroy(self, widget: SettingsDialog) -> None: + app.check_finalize(self) def on_key_press(self, _widget: Gtk.Widget, event: Gdk.EventKey) -> None: if event.keyval == Gdk.KEY_Escape: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/764cb1cf3776a4844e8476e6bb2d8b4b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/764cb1cf3776a4844e8476e6bb2d8b4b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] perf: Profile: Fix memory leak
by Philipp Hörist (＠lovetox) 01 May '22

01 May '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 4b3f47b1 by lovetox at 2022-05-01T20:08:07+02:00 perf: Profile: Fix memory leak - - - - - 1 changed file: - gajim/gtk/profile.py Changes: ===================================== gajim/gtk/profile.py ===================================== @@ -143,6 +143,8 @@ def __init__(self, account: str) -> None: self.connect('destroy', self._on_destroy) def _on_destroy(self, *args: Any) -> None: + self._avatar_selector = None + self._ui.privacy_popover.destroy() app.check_finalize(self) def _on_access_model_received(self, task: Task) -> None: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/4b3f47b1842401851fc05bbe4d035db8… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/4b3f47b1842401851fc05bbe4d035db8… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] chore: Add type annotations
by Philipp Hörist (＠lovetox) 01 May '22

01 May '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 1abae4c4 by lovetox at 2022-05-01T15:30:50+02:00 chore: Add type annotations - - - - - 2 changed files: - gajim/common/storage/archive.py - gajim/common/storage/cache.py Changes: ===================================== gajim/common/storage/archive.py ===================================== @@ -178,6 +178,7 @@ def _namedtuple_factory(self, cursor: sqlite.Cursor, row: tuple[Any, ...]) -> NamedTuple: + assert cursor.description is not None fields = [col[0] for col in cursor.description] Row = namedtuple("Row", fields) # type: ignore named_row = Row(*row) @@ -333,6 +334,7 @@ def get_jid_id(self, sql = 'INSERT INTO jids (jid, type) VALUES (?, ?)' lastrowid = self._con.execute(sql, (jid, type_)).lastrowid + assert lastrowid is not None self._jid_ids[jid] = JidsTableRow(jid_id=lastrowid, jid=jid, type=type_) @@ -1188,6 +1190,7 @@ def insert_into_logs(self, lastrowid = self._con.execute( sql, (account_id, jid_id, time_, kind) + tuple(kwargs.values())).lastrowid + assert lastrowid is not None log.info('Insert into DB: jid: %s, time: %s, kind: %s, stanza_id: %s', jid, time_, kind, kwargs.get('stanza_id', None)) ===================================== gajim/common/storage/cache.py ===================================== @@ -117,6 +117,8 @@ def init(self, **kwargs: Any) -> None: @staticmethod def _namedtuple_factory(cursor: sqlite3.Cursor, row: tuple[Any, ...]) -> NamedTuple: + + assert cursor.description is not None fields = [col[0] for col in cursor.description] Row = namedtuple('Row', fields) # type: ignore return Row(*row) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/1abae4c46aa3c3f1044c3310652077f6… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/1abae4c46aa3c3f1044c3310652077f6… 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