Commits May 2022

commits@gajim.org

1 participants
193 discussions

[Git][gajim/gajim][master] ci: Run debian build
by Philipp Hörist (＠lovetox) 22 May '22

22 May '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 297127ac by lovetox at 2022-05-22T22:47:51+02:00 ci: Run debian build - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -63,6 +63,7 @@ build-linux: - if: '$CI_COMMIT_TAG' script: - python3 setup.py sdist + - python3 .ci/debian_build.py "$(find dist/gajim-*)" artifacts: name: "gajim-$CI_COMMIT_REF_NAME-$CI_COMMIT_SHA" View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/297127ac16895a77150f43c605e33fc4… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/297127ac16895a77150f43c605e33fc4… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: ci: Add debian build script
by Philipp Hörist (＠lovetox) 22 May '22

22 May '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: ce5c3f48 by lovetox at 2022-05-22T21:58:34+02:00 ci: Add debian build script - - - - - 86d8ea51 by lovetox at 2022-05-22T21:58:34+02:00 ci: Update debian files - Make changelog generic - Change package name - - - - - 3 changed files: - + .ci/debian_build.py - debian/changelog - debian/control Changes: ===================================== .ci/debian_build.py ===================================== @@ -0,0 +1,99 @@ +#!/usr/bin/env python3 + +from __future__ import annotations + +import argparse +import dataclasses +import logging +import shutil +import subprocess +from datetime import datetime +from datetime import timezone +from pathlib import Path + +LOG_FORMAT = '%(asctime)s %(levelname)s %(message)s' +logging.basicConfig(format=LOG_FORMAT, level=logging.DEBUG) +log = logging.getLogger() + +ROOT_DIR = Path(__file__).resolve().parent.parent +BUILD_DIR = ROOT_DIR / 'debian_build' + +DATE = datetime.now().strftime('%Y%m%d') +DATE_TIME = datetime.now(tz=timezone.utc).strftime('%a, %d %b %Y %T %z') + + +(a)dataclasses.dataclass +class ReleaseContext: + app: str + pkg_name: str + release_name: str + release_dir: Path + tarball: Path + + @classmethod + def from_tarball(cls, path: str) -> ReleaseContext: + tarball = Path(path) + app = tarball.name.split('-', maxsplit=1)[0] + pkg_name = f'{app}-nightly' + release_name = f'{pkg_name}_{DATE}' + release_dir = BUILD_DIR / release_name + return cls(app=app, + pkg_name=pkg_name, + release_name=release_name, + release_dir=release_dir, + tarball=tarball) + + +def clean_build_dir() -> None: + log.info('Cleanup build directory') + if BUILD_DIR.exists(): + shutil.rmtree(BUILD_DIR) + BUILD_DIR.mkdir() + + +def prepare_package_dir(context: ReleaseContext) -> None: + log.info('Extract tarball') + tarball = Path(shutil.copy(context.tarball, BUILD_DIR)) + tarball = tarball.rename(BUILD_DIR / f'{context.release_name}.orig.tar.gz') + shutil.unpack_archive(tarball, BUILD_DIR) + + log.info('Rename dir to: %s', context.release_name) + folder = list(BUILD_DIR.glob(f'{context.app}-?.?.?'))[0] + folder = folder.rename(context.release_dir) + + log.info('Copy debian folder into release directory') + shutil.copytree(ROOT_DIR / 'debian', context.release_dir / 'debian') + + +def prepare_changelog(context: ReleaseContext) -> None: + log.info('Prepare Changelog') + changelog = context.release_dir / 'debian' / 'changelog' + content = changelog.read_text() + content = content.replace('{DATE}', DATE) + content = content.replace('{DATE_TIME}', DATE_TIME) + changelog.write_text(content) + + +def build(context: ReleaseContext) -> None: + log.info('Start package build') + subprocess.run( + [ + 'dpkg-buildpackage', + '-rfakeroot', + '--no-sign' + ], + cwd=context.release_dir, + check=True) + + +if __name__ == '__main__': + parser = argparse.ArgumentParser(description='Build debian package') + parser.add_argument('tarball', help='Path to tarball e.g. app.tar.gz') + args = parser.parse_args() + + context = ReleaseContext.from_tarball(args.tarball) + + clean_build_dir() + prepare_package_dir(context) + prepare_changelog(context) + build(context) ===================================== debian/changelog ===================================== @@ -1,6 +1,5 @@ -gajim-svn (20060820) unstable; urgency=low +gajim-nightly ({DATE}) unstable; urgency=low - * daily snapshot - - -- Yann Le Boulanger <asterix(a)lagaule.org> Sun, 20 Aug 2006 01:30:01 +0200 + * https://dev.gajim.org/gajim/gajim/-/commits/master + -- Gajim CI <ci(a)gajim.org> {DATE_TIME} ===================================== debian/control ===================================== @@ -1,4 +1,4 @@ -Source: gajim-default-nightly +Source: gajim-nightly Section: net Priority: optional Maintainer: Yann Leboulanger <asterix(a)lagaule.org> @@ -12,7 +12,7 @@ Homepage: https://gajim.org Vcs-Git: https://dev.gajim.org/gajim/gajim.git Vcs-Browser: https://dev.gajim.org/gajim/gajim/tree/master -Package: gajim-default-nightly +Package: gajim-nightly Architecture: all Depends: python3 (>= 3.9), View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/c88a131bc02ea7d1fe04d0960c8c28c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/c88a131bc02ea7d1fe04d0960c8c28c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] chore: Add debian folder
by Yann Leboulanger (＠asterix) 22 May '22

22 May '22

Yann Leboulanger pushed to branch master at gajim / gajim Commits: c88a131b by Yann Leboulanger at 2022-05-22T19:06:51+02:00 chore: Add debian folder - - - - - 9 changed files: - + debian/changelog - + debian/compat - + debian/control - + debian/copyright - + debian/gajim.manpages - + debian/pyversions - + debian/rules - + debian/source/format - + debian/watch Changes: ===================================== debian/changelog ===================================== @@ -0,0 +1,6 @@ +gajim-svn (20060820) unstable; urgency=low + + * daily snapshot + + -- Yann Le Boulanger <asterix(a)lagaule.org> Sun, 20 Aug 2006 01:30:01 +0200 + ===================================== debian/compat ===================================== @@ -0,0 +1 @@ +13 ===================================== debian/control ===================================== @@ -0,0 +1,56 @@ +Source: gajim-default-nightly +Section: net +Priority: optional +Maintainer: Yann Leboulanger <asterix(a)lagaule.org> +Build-Depends: + debhelper (>= 9), + dh-python, + python3 (>= 3.9), + gettext (>= 0.17-4), +Standards-Version: 4.0.0 +Homepage: https://gajim.org +Vcs-Git: https://dev.gajim.org/gajim/gajim.git +Vcs-Browser: https://dev.gajim.org/gajim/gajim/tree/master + +Package: gajim-default-nightly +Architecture: all +Depends: + python3 (>= 3.9), + ${misc:Depends}, ${python3:Depends}, + python3-gi (>=3.32.0), + python3-gi-cairo, + gir1.2-gtk-3.0 (>=3.22), + python3-nbxmpp-nightly (>= 20160905), + python3-openssl, + python3-keyring, + python3-css-parser, + python3-precis-i18n, + python3-packaging, +Recommends: + ca-certificates, + dbus, + python3-dbus, + notification-daemon, + python3-crypto, + pulseaudio-utils | alsa-utils | sox | oss4-base, + python3-gnupg (>= 0.3.8), +Suggests: + network-manager, + gir1.2-gtkspell3-3.0, + aspell-en | aspell-dictionary, + gir1.2-gnomekeyring-1.0, + gnome-keyring, + python3-kerberos, + texlive-latex-base, + dvipng, + gir1.2-farstream-0.2, + gir1.2-gstreamer-1.0, + gstreamer1.0-plugins-good, + gstreamer1.0-gtk3, + python3-pycurl, + gir1.2-gupnpigd-1.0, +Conflicts: gajim +Description: XMPP client written in Python / GTK + Gajim is a XMPP client. It has a tabbed user interface with normal + chats, group chats, and has many features such as, TLS, GPG, SSL, multiple + accounts, avatars, file transfers, audio/video call, D-Bus and Metacontacts. ===================================== debian/copyright ===================================== @@ -0,0 +1,27 @@ +This package was debianized by Yann L.B. asterix(a)lagaule.org on +Wed, 16 Jun 2005 20:00:00 +0100. + +It was downloaded from: + http://www.gajim.org/downloads/ + +Upstream Authors: + - Yann Le Boulanger <asterix(a)lagaule.org> + + +Copyright: (c) 2003-2011 Gajim Team + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with Debian system; see the file /usr/share/common-licenses/GPL. If not, +write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. + ===================================== debian/gajim.manpages ===================================== @@ -0,0 +1 @@ +data/gajim.1 ===================================== debian/pyversions ===================================== @@ -0,0 +1 @@ +3.9- ===================================== debian/rules ===================================== @@ -0,0 +1,12 @@ +#!/usr/bin/make -f + +DPKG_EXPORT_BUILDFLAGS = 1 +include /usr/share/dpkg/default.mk + +export PYBUILD_NAME=gajim + +%: + dh $@ --with python3 --buildsystem=pybuild + +# test target is broken +override_dh_auto_test: ===================================== debian/source/format ===================================== @@ -0,0 +1 @@ +3.0 (quilt) ===================================== debian/watch ===================================== @@ -0,0 +1,8 @@ +# Control file for uscan +# Run the "uscan" command to check for upstream updates and more. +# See uscan(1) for format + +# Compulsory line, this is a version 3 file +version=3 + +http://gajim.org/downloads/([\d.]*)/gajim-([\d\.]*)\.tar\.(?:gz|bz2|xz) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c88a131bc02ea7d1fe04d0960c8c28cb… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c88a131bc02ea7d1fe04d0960c8c28cb… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] chore: Add debian folder
by Yann Leboulanger (＠asterix) 22 May '22

22 May '22

Yann Leboulanger pushed to branch master at gajim / python-nbxmpp Commits: 217a40e8 by Yann Leboulanger at 2022-05-22T19:05:58+02:00 chore: Add debian folder - - - - - 7 changed files: - + debian/changelog - + debian/compat - + debian/control - + debian/copyright - + debian/rules - + debian/source/format - + debian/watch Changes: ===================================== debian/changelog ===================================== @@ -0,0 +1,6 @@ +python3-nbxmpp-nightly (20161014) unstable; urgency=low + + * daily snapshot + + -- Yann Leboulanger <asterix(a)lagaule.org> Fri, 14 Oct 2016 21:23:01 +0200 + ===================================== debian/compat ===================================== @@ -0,0 +1 @@ +9 ===================================== debian/control ===================================== @@ -0,0 +1,23 @@ +Source: python3-nbxmpp-nightly +Section: python +Priority: optional +Maintainer: Yann Leboulanger <asterix(a)lagaule.org> +Build-Depends: + debhelper (>= 9), + dh-python, + python3-all, + python3-gi, +Standards-Version: 3.9.8 +Homepage: https://dev.gajim.org/gajim/python-nbxmpp +Vcs-Svn: https://dev.gajim.org/gajim/python-nbxmpp.git +Vcs-Browser: https://dev.gajim.org/gajim/python-nbxmpp/tree/master + +Package: python3-nbxmpp-nightly +Architecture: all +Depends: ${misc:Depends},${python3:Depends}, python3-gi, gir1.2-soup-2.4 +Conflicts: python3-nbxmpp +Description: Non blocking XMPP Python library + python-nbxmpp is a XMPP library forked from xmpppy but which uses non-blocking + sockets. It supports many authentication mechanisms, TLS, proxies, BOSH, ... + . + This is the Python 3 version of this library. ===================================== debian/copyright ===================================== @@ -0,0 +1,27 @@ +This package was debianized by Yann L. asterix(a)lagaule.org on +Tue, 27 Nov 2012 12:21:05 +0100. + +It was downloaded from: + http://python-nbxmpp.gajim.org/downloads + +Upstream Authors: + - Yann Leboulanger <asterix(a)lagaule.org> + + +Copyright: (c) 2012 Gajim Team + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with Debian system; see the file /usr/share/common-licenses/GPL. If not, +write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. + ===================================== debian/rules ===================================== @@ -0,0 +1,9 @@ +#!/usr/bin/make -f + +DPKG_EXPORT_BUILDFLAGS = 1 +include /usr/share/dpkg/default.mk + +export PYBUILD_NAME=nbxmpp + +%: + dh $@ --with python3 --buildsystem=pybuild ===================================== debian/source/format ===================================== @@ -0,0 +1 @@ +3.0 (quilt) ===================================== debian/watch ===================================== View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/217a40e8aaae81211044e25a… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/217a40e8aaae81211044e25a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: MUC: Display moderated messages again
by Philipp Hörist (＠lovetox) 22 May '22

22 May '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 6f7925e5 by lovetox at 2022-05-22T16:41:38+02:00 fix: MUC: Display moderated messages again - Split correction and moderation into its own events - - - - - 6 changed files: - gajim/common/events.py - gajim/common/modules/muc.py - gajim/gtk/chat_list.py - gajim/gtk/chat_list_stack.py - gajim/gtk/controls/base.py - gajim/gtk/main.py Changes: ===================================== gajim/common/events.py ===================================== @@ -25,6 +25,7 @@ from nbxmpp.protocol import JID from nbxmpp.structs import HTTPAuthData +from nbxmpp.structs import ModerationData from nbxmpp.structs import LocationData from nbxmpp.structs import RosterItem from nbxmpp.structs import TuneData @@ -362,6 +363,14 @@ class MessageUpdated(ApplicationEvent): correct_id: str +@dataclass +class MessageModerated(ApplicationEvent): + name: str = field(init=False, default='message-moderated') + account: str + jid: JID + moderation: ModerationData + + @dataclass class MamMessageReceived(ApplicationEvent): name: str = field(init=False, default='mam-message-received') ===================================== gajim/common/modules/muc.py ===================================== @@ -34,7 +34,7 @@ from gajim.common import helpers from gajim.common.const import KindConstant from gajim.common.const import MUCJoinedState -from gajim.common.events import MessageUpdated +from gajim.common.events import MessageModerated from gajim.common.events import MucAdded from gajim.common.events import MucDecline from gajim.common.events import MucInvitation @@ -89,7 +89,8 @@ def __init__(self, con): typ='groupchat', priority=49), StanzaHandler(name='message', - callback=self._on_update_message, + callback=self._on_moderation, + ns=Namespace.FASTEN, typ='groupchat', priority=49), StanzaHandler(name='message', @@ -671,17 +672,19 @@ def _on_subject_change(self, _con, _stanza, properties): raise nbxmpp.NodeProcessed - def _on_update_message(self, _con, _stanza, properties): - if properties.is_moderation: - app.storage.archive.update_additional_data( - self._account, properties.moderation.stanza_id, properties) + def _on_moderation(self, _con, _stanza, properties): + if not properties.is_moderation: + return - app.ged.raise_event( - MessageUpdated(account=self._account, - jid=properties.jid, - properties=properties)) + app.storage.archive.update_additional_data( + self._account, properties.moderation.stanza_id, properties) - raise nbxmpp.NodeProcessed + app.ged.raise_event( + MessageModerated(account=self._account, + jid=properties.jid, + moderation=properties.moderation)) + + raise nbxmpp.NodeProcessed def _fake_subject_change(self, room_jid): # This is for servers which don’t send empty subjects as part of the ===================================== gajim/gtk/chat_list.py ===================================== @@ -376,6 +376,8 @@ def process_event(self, event: events.ApplicationEvent) -> None: self._on_message_received(event) elif isinstance(event, events.MessageUpdated): self._on_message_updated(event) + elif isinstance(event, events.MessageModerated): + self._on_message_moderated(event) elif isinstance(event, events.PresenceReceived): self._on_presence_received(event) elif isinstance(event, events.MessageSent): @@ -429,17 +431,20 @@ def _on_message_updated(self, event: events.MessageUpdated) -> None: if row is None: return - if hasattr(event, 'correct_id'): - if event.correct_id == row.message_id: - row.set_message_text(event.msgtxt) - - if event.properties.is_moderation: - if event.properties.moderation.stanza_id == row.stanza_id: - text = get_retraction_text( - event.account, - event.properties.moderation.moderator_jid, - event.properties.moderation.reason) - row.set_message_text(text) + if event.correct_id == row.message_id: + row.set_message_text(event.msgtxt) + + def _on_message_moderated(self, event: events.MessageModerated) -> None: + row = self._chats.get((event.account, event.jid)) + if row is None: + return + + if event.moderation.stanza_id == row.stanza_id: + text = get_retraction_text( + event.account, + event.moderation.moderator_jid, + event.moderation.reason) + row.set_message_text(text) def _on_message_sent(self, event: events.MessageSent) -> None: msgtext = event.message ===================================== gajim/gtk/chat_list_stack.py ===================================== @@ -39,6 +39,7 @@ events.MamMessageReceived, events.GcMessageReceived, events.MessageUpdated, + events.MessageModerated, events.PresenceReceived, events.MessageSent, events.JingleRequestReceived, ===================================== gajim/gtk/controls/base.py ===================================== @@ -331,18 +331,15 @@ def process_event(self, event: events.ApplicationEvent) -> None: getattr(self, method_name)(event) def _on_message_updated(self, event: events.MessageUpdated) -> None: - if hasattr(event, 'correct_id'): - self.conversation_view.correct_message( - event.correct_id, event.msgtxt) - return + self.conversation_view.correct_message(event.correct_id, event.msgtxt) - if event.properties.is_moderation: - text = get_retraction_text( - self.account, - event.properties.moderation.moderator_jid, - event.properties.moderation.reason) - self.conversation_view.show_message_retraction( - event.properties.moderation.stanza_id, text) + def _on_message_moderated(self, event: events.MessageModerated) -> None: + text = get_retraction_text( + self.account, + event.moderation.moderator_jid, + event.moderation.reason) + self.conversation_view.show_message_retraction( + event.moderation.stanza_id, text) def _on_conversation_view_key_press(self, _listbox: ConversationView, ===================================== gajim/gtk/main.py ===================================== @@ -110,6 +110,7 @@ def __init__(self) -> None: ('mam-message-received', ged.CORE, self._on_event), ('gc-message-received', ged.CORE, self._on_event), ('message-updated', ged.CORE, self._on_event), + ('message-moderated', ged.CORE, self._on_event), ('receipt-received', ged.GUI1, self._on_event), ('displayed-received', ged.GUI1, self._on_event), ('message-error', ged.GUI1, self._on_event), View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/6f7925e5e6c22e4cf5f4023a285bf179… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/6f7925e5e6c22e4cf5f4023a285bf179… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: Preferences: Hide non-functional xhtml setting
by Philipp Hörist (＠lovetox) 22 May '22

22 May '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: a1120260 by lovetox at 2022-05-22T14:41:41+02:00 fix: Preferences: Hide non-functional xhtml setting - - - - - 1 changed file: - gajim/gtk/preferences.py Changes: ===================================== gajim/gtk/preferences.py ===================================== @@ -260,12 +260,12 @@ def __init__(self, *args: Any) -> None: 'positive_184_ack', desc=_('Add a checkmark to received messages')), - Setting(SettingKind.SWITCH, - _('XHTML Formatting'), - SettingType.CONFIG, - 'show_xhtml', - desc=_('Render XHTML styles (colors, etc.) of incoming ' - 'messages')), + # Setting(SettingKind.SWITCH, + # _('XHTML Formatting'), + # SettingType.CONFIG, + # 'show_xhtml', + # desc=_('Render XHTML styles (colors, etc.) of incoming ' + # 'messages')), Setting(SettingKind.SWITCH, _('Show Send Message Button'), View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a1120260e96b835839c96b50471d56b0… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a1120260e96b835839c96b50471d56b0… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: Remove `Save conversation` setting
by Philipp Hörist (＠lovetox) 22 May '22

22 May '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: df30c37e by lovetox at 2022-05-22T14:31:57+02:00 fix: Remove `Save conversation` setting This setting is superseded by the `Keep Chat History` setting. - - - - - 8 changed files: - gajim/common/helpers.py - gajim/common/modules/message.py - gajim/common/modules/muc.py - gajim/common/modules/presence.py - gajim/common/setting_values.py - gajim/gtk/accounts.py - gajim/gtk/controls/chat.py - gajim/gtk/settings.py Changes: ===================================== gajim/common/helpers.py ===================================== @@ -1395,20 +1395,6 @@ def get_idle_status_message(state: str, status_message: str) -> str: return message -def should_log(account: str, jid: str) -> bool: - """ - Should conversations between a local account and a remote jid be logged? - """ - no_log_for = app.settings.get_account_setting(account, 'no_log_for') - - if not no_log_for: - no_log_for = '' - - no_log_for = no_log_for.split() - - return (account not in no_log_for) and (jid not in no_log_for) - - def ask_for_status_message(status: str, signin: bool = False) -> bool: if status is None: # We try to change the message ===================================== gajim/common/modules/message.py ===================================== @@ -28,7 +28,6 @@ from gajim.common.events import MessageUpdated from gajim.common.events import RawMessageReceived from gajim.common.helpers import AdditionalDataDict -from gajim.common.helpers import should_log from gajim.common.const import KindConstant from gajim.common.modules.base import BaseModule from gajim.common.modules.util import get_eme_message @@ -200,13 +199,12 @@ def _message_received(self, _con, stanza, properties): properties=properties, correct_id=correct_id) - if should_log(self._account, jid): - app.storage.archive.store_message_correction( - self._account, - jid, - correct_id, - msgtxt, - properties.type.is_groupchat) + app.storage.archive.store_message_correction( + self._account, + jid, + correct_id, + msgtxt, + properties.type.is_groupchat) app.ged.raise_event(event) return @@ -229,7 +227,7 @@ def _message_received(self, _con, stanza, properties): if properties.is_sent_carbon: log_type = KindConstant.CHAT_MSG_SENT - if not should_log(self._account, jid) or not msgtxt: + if not msgtxt: return app.storage.archive.insert_into_logs( @@ -266,11 +264,7 @@ def _message_error_received(self, _con, _stanza, properties): def _log_muc_message(self, event): self._check_for_mam_compliance(event.room_jid, event.stanza_id) - if (should_log(self._account, event.jid) and - event.msgtxt and event.properties.muc_nickname): - # if not event.nick, it means message comes from room itself - # usually it hold description and can be send at each connection - # so don't store it in logs + if event.msgtxt and event.properties.muc_nickname: app.storage.archive.insert_into_logs( self._account, event.jid, @@ -394,9 +388,6 @@ def log_message(self, message): if not message.is_loggable: return - if not should_log(self._account, message.jid): - return - if message.message is None: return ===================================== gajim/common/modules/muc.py ===================================== @@ -620,8 +620,7 @@ def _log_muc_event(self, event_name, properties): 'muc-user-status-show-changed']: return - if (not app.settings.get('log_contact_status_changes') or - not helpers.should_log(self._account, properties.jid)): + if not app.settings.get('log_contact_status_changes'): return additional_data = AdditionalDataDict() ===================================== gajim/common/modules/presence.py ===================================== @@ -29,7 +29,6 @@ from gajim.common.events import SubscribedPresenceReceived from gajim.common.events import UnsubscribedPresenceReceived from gajim.common.i18n import _ -from gajim.common.helpers import should_log from gajim.common.structs import PresenceData from gajim.common.const import KindConstant from gajim.common.const import ShowConstant @@ -148,8 +147,6 @@ def _presence_received(self, _con, stanza, properties): def _log_presence(self, properties): if not app.settings.get('log_contact_status_changes'): return - if not should_log(self._account, properties.jid.bare): - return show = ShowConstant[properties.show.name] if properties.type.is_unavailable: ===================================== gajim/common/setting_values.py ===================================== @@ -353,7 +353,6 @@ class _ACCOUNT_DEFAULT: 'last_status', 'last_status_msg', 'name', - 'no_log_for', 'password', 'proxy', 'recent_groupchats', @@ -442,7 +441,6 @@ class _ACCOUNT_DEFAULT: 'custom_host': '', 'custom_type': 'START TLS', 'sync_with_global_status': False, - 'no_log_for': '', 'attached_gpg_keys': '', 'http_auth': 'ask', 'file_transfer_proxies': '', ===================================== gajim/gtk/accounts.py ===================================== @@ -674,11 +674,6 @@ def __init__(self, account: str) -> None: Setting(SettingKind.SWITCH, _('Connect on startup'), SettingType.ACCOUNT_CONFIG, 'autoconnect'), - Setting(SettingKind.SWITCH, - _('Save conversations for all contacts'), - SettingType.ACCOUNT_CONFIG, 'no_log_for', - desc=_('Store conversations on the harddrive')), - Setting(SettingKind.SWITCH, _('Global Status'), SettingType.ACCOUNT_CONFIG, 'sync_with_global_status', desc=_('Synchronise the status of all accounts')), ===================================== gajim/gtk/controls/chat.py ===================================== @@ -29,7 +29,6 @@ from typing import Type from typing import Optional -import time import logging import sys @@ -61,8 +60,6 @@ from gajim.gui.conversation.view import ConversationView from gajim.gui.const import TARGET_TYPE_URI_LIST from gajim.gui.const import ControlType -from gajim.gui.dialogs import DialogButton -from gajim.gui.dialogs import ConfirmationDialog from gajim.gui.util import open_window from gajim.command_system.implementation.hosts import ChatCommands @@ -602,36 +599,6 @@ def shutdown(self) -> None: app.check_finalize(self) def allow_shutdown(self, _method, on_yes, on_no): - row = self.conversation_view.get_last_message_row() - if row is None: - on_yes(self) - return - - if time.time() - row.timestamp < 2: - # Under 2 seconds since last message - no_log_for = app.settings.get_account_setting( - self.account, 'no_log_for').split() - more = '' - if self.contact.jid in no_log_for: - more = _('Note: Chat history is disabled for this contact.') - if self.account in no_log_for: - more = _('Note: Chat history is disabled for this account.') - text = _('You just received a new message from %s.\n' - 'Do you want to close this tab?') % self.contact.name - if more: - text += '\n' + more - - ConfirmationDialog( - _('Close'), - _('New Message'), - text, - [DialogButton.make('Cancel', - callback=lambda: on_no(self)), - DialogButton.make('Remove', - text=_('_Close'), - callback=lambda: on_yes(self))], - transient_for=app.window).show() - return on_yes(self) def _on_avatar_update(self, ===================================== gajim/gtk/settings.py ===================================== @@ -326,10 +326,6 @@ def __get_value(type_: SettingType, if type_ == SettingType.ACCOUNT_CONFIG: if value == 'password': return passwords.get_password(account) - if value == 'no_log_for': - no_log = app.settings.get_account_setting( - account, 'no_log_for').split() - return account not in no_log return app.settings.get_account_setting(account, value) if type_ == SettingType.ACTION: @@ -348,9 +344,6 @@ def set_value(self, state: AllSettingsT) -> None: if self.value == 'password': assert isinstance(state, str) passwords.save_password(self.account, state) - if self.value == 'no_log_for': - assert isinstance(state, bool) - self.set_no_log_for(self.account, state) else: app.settings.set_account_setting(self.account, self.value, @@ -367,17 +360,6 @@ def set_value(self, state: AllSettingsT) -> None: if self.callback is not None: self.callback(state, self.data) - @staticmethod - def set_no_log_for(account: str, state: bool) -> None: - no_log = app.settings.get_account_setting(account, 'no_log_for').split() - if state and account in no_log: - no_log.remove(account) - elif not state and account not in no_log: - no_log.append(account) - app.settings.set_account_setting(account, - 'no_log_for', - ' '.join(no_log)) - def on_row_activated(self) -> None: raise NotImplementedError View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/df30c37e5627f1a0bcf6413c0c2f9ec5… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/df30c37e5627f1a0bcf6413c0c2f9ec5… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: imprv: Add log_line_id to CallRow and FileTransferJingleRow
by Daniel Brötzmann (＠wurstsalat) 21 May '22

21 May '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: b86e41a5 by wurstsalat at 2022-05-21T21:31:36+02:00 imprv: Add log_line_id to CallRow and FileTransferJingleRow This enables jumping to these rows by log_line_id - - - - - d5fe10e3 by wurstsalat at 2022-05-21T21:31:36+02:00 feat: SearchView: Add calendar for browsing history - - - - - 6 changed files: - gajim/common/storage/archive.py - gajim/data/gui/search_view.ui - gajim/gtk/builder.pyi - gajim/gtk/conversation/rows/call.py - gajim/gtk/conversation/rows/file_transfer_jingle.py - gajim/gtk/search_view.py Changes: ===================================== gajim/common/storage/archive.py ===================================== @@ -134,6 +134,15 @@ class SearchLogRow(NamedTuple): log_line_id: int +class HistoryDayRow(NamedTuple): + day: int + + +class MessageMetaRow(NamedTuple): + log_line_id: int + time: float + + class LastArchiveMessageRow(NamedTuple): id: int last_mam_id: str @@ -551,46 +560,6 @@ def get_conversation_between(self, sql, tuple(jids) + (before, after)).fetchall() - @timeit - def get_messages_for_date(self, - account: str, - jid: str, - date: datetime.datetime): - """ - Load the complete conversation with a given jid on a specific date - - :param account: The account - - :param jid: The jid for which we request the conversation - - :param date: datetime.datetime instance - example: datetime.datetime(year, month, day) - - returns a list of namedtuples - """ - - jids = [jid] - account_id = self.get_account_id(account) - - delta = datetime.timedelta( - hours=23, minutes=59, seconds=59, microseconds=999999) - date_ts = date.timestamp() - delta_ts = (date + delta).timestamp() - - sql = ''' - SELECT contact_name, time, kind, show, message, subject, - additional_data, log_line_id - FROM logs NATURAL JOIN jids WHERE jid IN ({jids}) - AND account_id = {account_id} - AND time BETWEEN ? AND ? - ORDER BY time DESC, log_line_id DESC - '''.format(jids=', '.join('?' * len(jids)), - account_id=account_id) - - return self._con.execute( - sql, - tuple(jids) + (date_ts, delta_ts)).fetchall() - @timeit def search_log(self, _account: str, @@ -751,27 +720,17 @@ def search_all_logs(self, yield result @timeit - def get_days_with_logs(self, - _account: str, - jid: str, - year: int, - month: int) -> Any: + def get_days_with_history(self, + account: str, + jid: str, + year: int, + month: int + ) -> list[HistoryDayRow]: """ - Request the days in a month where we received messages - for a given `jid`. - - :param account: The account - - :param jid: The jid for which we request the days - - :param year: The year - - :param month: The month - - returns a list of namedtuples + Get days in month where messages for 'jid' exist """ jids = [jid] - + account_id = self.get_account_id(account) kinds = map(str, [KindConstant.STATUS, KindConstant.GCSTATUS]) @@ -785,10 +744,12 @@ def get_days_with_logs(self, SELECT DISTINCT CAST(strftime('%d', time, 'unixepoch', 'localtime') AS INTEGER) AS day FROM logs NATURAL JOIN jids WHERE jid IN ({jids}) + AND account_id = {account_id} AND time BETWEEN ? AND ? AND kind NOT IN ({kinds}) ORDER BY time """.format(jids=', '.join('?' * len(jids)), + account_id=account_id, kinds=', '.join(kinds)) return self._con.execute(sql, tuple(jids) + @@ -796,26 +757,25 @@ def get_days_with_logs(self, (date + delta).timestamp())).fetchall() @timeit - def get_last_date_that_has_logs(self, _account: str, jid: str) -> Any: + def get_last_history_timestamp(self, + account: str, + jid: str + ) -> Optional[float]: """ - Get the timestamp of the last message we received for the jid. - - :param account: The account - - :param jid: The jid for which we request the last timestamp - - returns a timestamp or None + Get the timestamp of the last message we received for the jid """ jids = [jid] - + account_id = self.get_account_id(account) kinds = map(str, [KindConstant.STATUS, KindConstant.GCSTATUS]) sql = ''' SELECT MAX(time) as time FROM logs NATURAL JOIN jids WHERE jid IN ({jids}) + AND account_id = {account_id} AND kind NOT IN ({kinds}) - '''.format(jids=', '.join('?' * len(jids)), + '''.format(account_id=account_id, + jids=', '.join('?' * len(jids)), kinds=', '.join(kinds)) # fetchone() returns always at least one Row with all @@ -823,26 +783,25 @@ def get_last_date_that_has_logs(self, _account: str, jid: str) -> Any: return self._con.execute(sql, tuple(jids)).fetchone().time @timeit - def get_first_date_that_has_logs(self, _account: str, jid: str) -> Any: + def get_first_history_timestamp(self, + account: str, + jid: str + ) -> Optional[float]: """ - Get the timestamp of the first message we received for the jid. - - :param account: The account - - :param jid: The jid for which we request the first timestamp - - returns a timestamp or None + Get the timestamp of the first message we received for the jid """ jids = [jid] - + account_id = self.get_account_id(account) kinds = map(str, [KindConstant.STATUS, KindConstant.GCSTATUS]) sql = ''' SELECT MIN(time) as time FROM logs NATURAL JOIN jids WHERE jid IN ({jids}) + AND account_id = {account_id} AND kind NOT IN ({kinds}) '''.format(jids=', '.join('?' * len(jids)), + account_id=account_id, kinds=', '.join(kinds)) # fetchone() returns always at least one Row with all @@ -850,25 +809,17 @@ def get_first_date_that_has_logs(self, _account: str, jid: str) -> Any: return self._con.execute(sql, tuple(jids)).fetchone().time @timeit - def get_date_has_logs(self, - _account: str, - jid: str, - date: datetime.datetime) -> Any: + def date_has_history(self, + account: str, + jid: str, + date: datetime.datetime + ) -> Optional[float]: """ - Get single timestamp of a message we received for the jid - in the time range of one day. - - :param account: The account - - :param jid: The jid for which we request the first timestamp - - :param date: datetime.datetime instance - example: datetime.datetime(year, month, day) - - returns a timestamp or None + Get a single timestamp of a message for 'jid' + in time range of one day """ jids = [jid] - + account_id = self.get_account_id(account) delta = datetime.timedelta( hours=23, minutes=59, seconds=59, microseconds=999999) @@ -878,12 +829,44 @@ def get_date_has_logs(self, sql = ''' SELECT time FROM logs NATURAL JOIN jids WHERE jid IN ({jids}) + AND account_id = {account_id} AND time BETWEEN ? AND ? - '''.format(jids=', '.join('?' * len(jids))) + '''.format(jids=', '.join('?' * len(jids)), + account_id=account_id) return self._con.execute( sql, tuple(jids) + (start, end)).fetchone() + @timeit + def get_first_message_meta_for_date(self, + account: str, + jid: str, + date: datetime.datetime + ) -> Optional[MessageMetaRow]: + """ + Load meta data for the first message of a specific date + """ + jids = [jid] + account_id = self.get_account_id(account) + + delta = datetime.timedelta( + hours=23, minutes=59, seconds=59, microseconds=999999) + date_ts = date.timestamp() + delta_ts = (date + delta).timestamp() + + sql = ''' + SELECT time, log_line_id + FROM logs NATURAL JOIN jids WHERE jid IN ({jids}) + AND account_id = {account_id} + AND time BETWEEN ? AND ? + ORDER BY time ASC, log_line_id ASC + '''.format(jids=', '.join('?' * len(jids)), + account_id=account_id) + + return self._con.execute( + sql, + tuple(jids) + (date_ts, delta_ts)).fetchone() + @timeit def deduplicate_muc_message(self, account: str, ===================================== gajim/data/gui/search_view.ui ===================================== @@ -2,121 +2,130 @@  <interface> <requires lib="gtk+" version="3.24"/> - <object class="GtkBox" id="header_box"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="hexpand">True</property> - <property name="spacing">6</property> - <child> - <object class="GtkSeparator"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="valign">center</property> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="header_name_label"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="ellipsize">end</property> - <property name="max-width-chars">15</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="header_date_label"> - <property name="visible">True</property> - <property name="can-focus">False</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> - <child> - <object class="GtkSeparator"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="valign">center</property> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">3</property> - </packing> - </child> - <style> - <class name="search-view-header"/> - </style> - </object> -  - <object class="GtkGrid" id="result_row_grid"> - <property name="visible">True</property> + <object class="GtkPopover" id="calendar_popover"> <property name="can-focus">False</property> - <property name="row-spacing">3</property> - <property name="column-spacing">12</property> - <child> - <object class="GtkImage" id="row_avatar"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="valign">start</property> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">0</property> - <property name="height">2</property> - </packing> - </child> <child> - <object class="GtkLabel" id="row_time_label"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="halign">end</property> - <property name="single-line-mode">True</property> - <style> - <class name="dim-label"/> - </style> - </object> - <packing> - <property name="left-attach">2</property> - <property name="top-attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="row_name_label"> + <object class="GtkBox"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="halign">start</property> - <property name="ellipsize">end</property> - <property name="single-line-mode">True</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> + <child> + <object class="GtkCalendar" id="calendar"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="year">2022</property> + <property name="month">4</property> + <property name="day">21</property> + <signal name="day-selected" handler="_on_date_selected" swapped="no"/> + <signal name="month-changed" handler="_on_month_changed" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="homogeneous">True</property> + <child> + <object class="GtkButton"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <signal name="clicked" handler="_on_first_date_selected" swapped="no"/> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">go-first-symbolic</property> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <signal name="clicked" handler="_on_previous_date_selected" swapped="no"/> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">go-previous-symbolic</property> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkButton"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <signal name="clicked" handler="_on_next_date_selected" swapped="no"/> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">go-next-symbolic</property> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkButton"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <signal name="clicked" handler="_on_last_date_selected" swapped="no"/> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">go-last-symbolic</property> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> + </child> + <style> + <class name="linked"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> <style> - <class name="bold"/> + <class name="padding-6"/> </style> </object> - <packing> - <property name="left-attach">1</property> - <property name="top-attach">0</property> - </packing> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> </child> - <style> - <class name="search-view-row-grid"/> - </style> </object> <object class="GtkBox" id="search_box"> <property name="visible">True</property> @@ -141,7 +150,8 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="pack-type">end</property> + <property name="position">3</property> </packing> </child> <child> @@ -163,7 +173,30 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkMenuButton" id="calendar_button"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="focus-on-click">False</property> + <property name="receives-default">True</property> + <property name="tooltip-text" translatable="yes">Browse history by date</property> + <property name="popover">calendar_popover</property> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">x-office-calendar-symbolic</property> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack-type">end</property> + <property name="position">2</property> </packing> </child> </object> @@ -304,4 +337,120 @@ <class name="search-view"/> </style> </object> + <object class="GtkBox" id="header_box"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="hexpand">True</property> + <property name="spacing">6</property> + <child> + <object class="GtkSeparator"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="valign">center</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="header_name_label"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="ellipsize">end</property> + <property name="max-width-chars">15</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="header_date_label"> + <property name="visible">True</property> + <property name="can-focus">False</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkSeparator"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="valign">center</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> + </child> + <style> + <class name="search-view-header"/> + </style> + </object> +  + <object class="GtkGrid" id="result_row_grid"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="row-spacing">3</property> + <property name="column-spacing">12</property> + <child> + <object class="GtkImage" id="row_avatar"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="valign">start</property> + </object> + <packing> + <property name="left-attach">0</property> + <property name="top-attach">0</property> + <property name="height">2</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="row_time_label"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="halign">end</property> + <property name="single-line-mode">True</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="left-attach">2</property> + <property name="top-attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="row_name_label"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="halign">start</property> + <property name="ellipsize">end</property> + <property name="single-line-mode">True</property> + <style> + <class name="bold"/> + </style> + </object> + <packing> + <property name="left-attach">1</property> + <property name="top-attach">0</property> + </packing> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <style> + <class name="search-view-row-grid"/> + </style> + </object> </interface> ===================================== gajim/gtk/builder.pyi ===================================== @@ -803,6 +803,15 @@ class RosterTooltipBuilder(Builder): class SearchViewBuilder(Builder): + calendar_popover: Gtk.Popover + calendar: Gtk.Calendar + search_box: Gtk.Box + calendar_button: Gtk.MenuButton + search_entry: Gtk.SearchEntry + search_checkbutton: Gtk.CheckButton + date_hint: Gtk.Label + results_listbox: Gtk.ListBox + placeholder: Gtk.Box header_box: Gtk.Box header_name_label: Gtk.Label header_date_label: Gtk.Label @@ -810,12 +819,6 @@ class SearchViewBuilder(Builder): row_avatar: Gtk.Image row_time_label: Gtk.Label row_name_label: Gtk.Label - search_box: Gtk.Box - search_entry: Gtk.SearchEntry - search_checkbutton: Gtk.CheckButton - date_hint: Gtk.Label - results_listbox: Gtk.ListBox - placeholder: Gtk.Box class ServerInfoBuilder(Builder): ===================================== gajim/gtk/conversation/rows/call.py ===================================== @@ -80,6 +80,7 @@ def __init__(self, sid = db_message.additional_data.get_value('gajim', 'sid') module = self._client.get_module('Jingle') self._session = module.get_jingle_session(self._contact.jid, sid) + self.log_line_id = db_message.log_line_id self._avatar_placeholder = Gtk.Box() self._avatar_placeholder.set_size_request(AvatarSize.ROSTER, -1) ===================================== gajim/gtk/conversation/rows/file_transfer_jingle.py ===================================== @@ -82,6 +82,7 @@ def __init__(self, self._file_props = FilesProp.getFilePropBySid(sid) if self._file_props is None: log.debug('File prop not found for SID: %s', sid) + self.log_line_id = db_message.log_line_id else: assert event is not None self._file_props = event.file_props ===================================== gajim/gtk/search_view.py ===================================== @@ -18,7 +18,8 @@ from typing import Iterator from typing import Optional -import datetime +from datetime import datetime +from datetime import timedelta import itertools import logging import time @@ -33,11 +34,14 @@ from gajim.common import app from gajim.common import ged from gajim.common.const import AvatarSize +from gajim.common.const import Direction from gajim.common.const import KindConstant from gajim.common.storage.archive import SearchLogRow from .conversation.message_widget import MessageWidget from .builder import get_builder +from .util import gtk_month +from .util import python_month log = logging.getLogger('gajim.gui.search_view') @@ -59,6 +63,9 @@ def __init__(self) -> None: self._results_iterator: Optional[Iterator[SearchLogRow]] = None self._scope: str = 'everywhere' + self._first_date: Optional[datetime] = None + self._last_date: Optional[datetime] = None + self._ui = get_builder('search_view.ui') self._ui.results_listbox.set_header_func(self._header_func) self.add(self._ui.search_box) @@ -71,6 +78,7 @@ def __init__(self) -> None: app.ged.register_event_handler('account-disabled', ged.GUI1, self._on_account_state) + self._update_calendar() self.show_all() def _on_account_state(self, _event: Any) -> None: @@ -119,7 +127,7 @@ def _on_search(self, entry: Gtk.Entry) -> None: text, before_filters = self._strip_filters(text, 'before') if before_filters is not None: try: - before_filters = min([datetime.datetime.fromisoformat(date) for + before_filters = min([datetime.fromisoformat(date) for date in before_filters]) except ValueError: self._ui.date_hint.show() @@ -129,14 +137,14 @@ def _on_search(self, entry: Gtk.Entry) -> None: text, after_filters = self._strip_filters(text, 'after') if after_filters is not None: try: - after_filters = min([datetime.datetime.fromisoformat(date) for + after_filters = min([datetime.fromisoformat(date) for date in after_filters]) # if only the day is specified, we want to look after the # end of that day. # if precision is increased,we do want to look during the # day as well. if after_filters.hour == after_filters.minute == 0: - after_filters += datetime.timedelta(days=1) + after_filters += timedelta(days=1) except ValueError: self._ui.date_hint.show() return @@ -202,6 +210,120 @@ def _on_edge_reached(self, self._add_results() + def _update_calendar(self) -> None: + if self._scope == 'everywhere': + self._ui.calendar_button.set_sensitive(False) + else: + self._ui.calendar_button.set_sensitive(True) + + first_log = app.storage.archive.get_first_history_timestamp( + self._account, self._jid) + if first_log is None: + return + self._first_date = self._get_date_from_timestamp(first_log) + last_log = app.storage.archive.get_last_history_timestamp( + self._account, self._jid) + if last_log is None: + return + self._last_date = self._get_date_from_timestamp(last_log) + + month = gtk_month(self._last_date.month) + self._ui.calendar.select_month(month, self._last_date.year) + + def _on_month_changed(self, calendar: Gtk.Calendar) -> None: + # Mark days with history in calendar + year, month, _day = calendar.get_date() + if year < 1900: + calendar.select_month(0, 1900) + calendar.select_day(1) + return + + calendar.clear_marks() + month = python_month(month) + + history_days = app.storage.archive.get_days_with_history( + self._account, self._jid, year, month) + for date in history_days: + calendar.mark_day(date.day) + + def _on_date_selected(self, calendar: Gtk.Calendar) -> None: + year, month, day = calendar.get_date() + py_m = python_month(month) + date = datetime(year, py_m, day) + self._scroll_to_date(date) + + def _on_first_date_selected(self, _button: Gtk.Button) -> None: + assert self._first_date is not None + gtk_m = gtk_month(self._first_date.month) + self._ui.calendar.select_month(gtk_m, self._first_date.year) + self._ui.calendar.select_day(self._first_date.day) + + def _on_last_date_selected(self, _button: Gtk.Button) -> None: + assert self._last_date is not None + gtk_m = gtk_month(self._last_date.month) + self._ui.calendar.select_month(gtk_m, self._last_date.year) + self._ui.calendar.select_day(self._last_date.day) + + def _on_previous_date_selected(self, _button: Gtk.Button) -> None: + delta = timedelta(days=-1) + assert self._first_date is not None + self._select_date(delta, self._first_date, Direction.NEXT) + + def _on_next_date_selected(self, _button: Gtk.Button) -> None: + delta = timedelta(days=1) + assert self._last_date is not None + self._select_date(delta, self._last_date, Direction.PREV) + + def _select_date(self, + delta: timedelta, + end_date: datetime, + direction: Direction + ) -> None: + # Iterate through days until history entry found or + # supplied end_date (first_date/last_date) reached + year, month, day = self._ui.calendar.get_date() + py_m = python_month(month) + date = datetime(year, py_m, day) + + history = None + while history is None: + if direction == Direction.PREV: + if end_date <= date: + return + else: + if end_date >= date: + return + + date = date + delta + if date == end_date: + break + history = app.storage.archive.date_has_history( + self._account, self._jid, date) + + gtk_m = gtk_month(date.month) + self._ui.calendar.select_month(gtk_m, date.year) + self._ui.calendar.select_day(date.day) + + def _scroll_to_date(self, date: datetime) -> None: + control = app.window.get_active_control() + if control is None: + return + if control.contact.jid == self._jid: + meta_row = app.storage.archive.get_first_message_meta_for_date( + self._account, self._jid, date) + if meta_row is None: + return + control.scroll_to_message( + meta_row.log_line_id, + meta_row.time) + + @staticmethod + def _get_date_from_timestamp(timestamp: float) -> datetime: + localtime = time.localtime(timestamp) + year, month, day = localtime[0], localtime[1], localtime[2] + date = datetime(year, month, day) + return date + @staticmethod def _get_accounts() -> dict[int, str]: accounts: dict[int, str] = {} @@ -232,7 +354,14 @@ def set_focus(self) -> None: def set_context(self, account: Optional[str], jid: Optional[JID]) -> None: self._account = account self._jid = jid - self._ui.search_checkbutton.set_active(jid is None) + everywhere = bool(jid is None) + self._ui.search_checkbutton.set_active(everywhere) + context = account is not None and jid is not None + if not context or everywhere: + self._scope = 'everywhere' + else: + self._scope = 'contact' + self._update_calendar() class RowHeader(Gtk.Box): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/22cfbb00c2c237b1c95502ae49c70cf… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/22cfbb00c2c237b1c95502ae49c70cf… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 5 commits: ci: Remove sdist script
by Philipp Hörist (＠lovetox) 21 May '22

21 May '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 490174a0 by lovetox at 2022-05-21T20:19:50+02:00 ci: Remove sdist script Plugin installer does not exist anymore, so we can execute sdist directly - - - - - 269be7c4 by lovetox at 2022-05-21T20:19:55+02:00 ci: Remove tag strip code In the future tags will only be the version without prefix - - - - - 20de5c1f by lovetox at 2022-05-21T20:20:42+02:00 ci: Update gitlab-ci.yml - Add publish stage - Remove manual steps - Remove usage of sdist script - - - - - 18b9e3af by lovetox at 2022-05-21T20:37:32+02:00 chore: Scripts: Prepare bump_version.py for new tag - - - - - 22cfbb00 by lovetox at 2022-05-21T20:40:27+02:00 chore: Update Release.md - - - - - 6 changed files: - .ci/appveyor_build.py - .ci/deploy.py - − .ci/sdist.py - .gitlab-ci.yml - .gitlab/issue_templates/Release.md - scripts/bump_version.py Changes: ===================================== .ci/appveyor_build.py ===================================== @@ -31,7 +31,7 @@ def get_gajim_version() -> str: tag = os.environ.get('CI_COMMIT_TAG') if tag is None: exit('No tag found') - return tag.removesuffix('gajim-') + return tag def push_yaml_to_project() -> None: ===================================== .ci/deploy.py ===================================== @@ -44,7 +44,7 @@ def get_gajim_tag() -> str: tag = os.environ.get('CI_COMMIT_TAG') if tag is None: exit('No tag found') - return tag.removeprefix('gajim-') + return tag def find_linux_tarball(filedir: Path) -> Path: ===================================== .ci/sdist.py deleted ===================================== @@ -1,56 +0,0 @@ -#!/usr/bin/env python3 - -import io -import requests -import shutil -import subprocess -import zipfile -from pathlib import Path - -from rich.console import Console - -console = Console() - - -PLUGINS = [ - 'plugin_installer', -] - -PLUGINS_BASE_URL = 'https://ftp.gajim.org' -PLUGINS_FOLDER = Path('./gajim/data/plugins') - - -def get_plugins_url(plugin: str) -> str: - return f'{PLUGINS_BASE_URL}/plugins_master_zip/{plugin}.zip' - - -def extraxt_zip(zip_bytes: bytes, path: Path) -> None: - console.print('Extract to', path) - with zipfile.ZipFile(io.BytesIO(zip_bytes)) as zip_file: - zip_file.extractall(path) - - -def download_plugins() -> None: - PLUGINS_FOLDER.mkdir(parents=True) - for plugin in PLUGINS: - url = get_plugins_url(plugin) - console.print('Download', url) - req = requests.get(url) - req.raise_for_status() - extraxt_zip(req.content, PLUGINS_FOLDER) - - -def setup() -> None: - console.print('Setup') - subprocess.call(['python3', 'setup.py', 'sdist']) - - -def cleanup() -> None: - console.print('Cleanup') - shutil.rmtree(PLUGINS_FOLDER) - - -if __name__ == '__main__': - download_plugins() - setup() - cleanup() ===================================== .gitlab-ci.yml ===================================== @@ -9,6 +9,7 @@ stages: - test - build - deploy + - publish test-other: stage: test @@ -61,7 +62,7 @@ build-linux: - if: '$GAJIM_NIGHTLY_BUILD' - if: '$CI_COMMIT_TAG' script: - - python3 .ci/sdist.py + - python3 setup.py sdist artifacts: name: "gajim-$CI_COMMIT_REF_NAME-$CI_COMMIT_SHA" @@ -91,7 +92,6 @@ deploy-linux: rules: - if: '$GAJIM_NIGHTLY_BUILD' - if: '$CI_COMMIT_TAG' - when: manual variables: DEPLOY_TYPE: "linux" script: @@ -114,13 +114,38 @@ deploy-flatpak: needs: [] rules: - if: '$CI_COMMIT_TAG' - when: manual + before_script: + # - echo "${FLATHUB_DEPLOY_KEY}" | tr -d '\r' | ssh-add - > /dev/null + - mkdir -p ~/.ssh + - ssh-keyscan https://github.com >> ~/.ssh/known_hosts script: + - git config user.email "$CI_GIT_USER_EMAIL" + - git config user.name "$CI_GIT_USER_USERNAME" - git clone https://github.com/flathub/org.gajim.Gajim.git - cd org.gajim.Gajim - - git config user.email "ci(a)gajim.org" - - git config user.name "CI Deploy" - mv ../flatpak/org.gajim.Gajim.yaml org.gajim.Gajim.yaml - git diff - git add org.gajim.Gajim.yaml - git commit -m "$CI_COMMIT_TAG" + # - git push + +publish-release: + stage: publish + needs: ['deploy-linux', build-and-deploy-windows] + rules: + - if: '$CI_COMMIT_TAG' + before_script: + - echo "${WEBSITE_DEPLOY_KEY}" | tr -d '\r' | ssh-add - > /dev/null + - mkdir -p ~/.ssh + - ssh-keyscan dev.gajim.org >> ~/.ssh/known_hosts + script: + - git config --global user.email "$CI_GIT_USER_EMAIL" + - git config --global user.name "$CI_GIT_USER_USERNAME" + - git clone git@dev.gajim.org:gajim/website.git + - cd website + - git checkout master + - python3 ./scripts/bump_version.py $CI_COMMIT_TAG + - git diff + - git add -u + - git commit -m "Release Gajim $CI_COMMIT_TAG" + - git push ===================================== .gitlab/issue_templates/Release.md ===================================== @@ -8,7 +8,7 @@ ## Build * [ ] Merge translations from Weblate * [ ] Update `ChangeLog` * [ ] Run `./scripts/bump_version.py x.x.x` -* [ ] Push release tag `gajim-x.x.x` +* [ ] Push release tag `x.x.x` * [ ] Update Debian repository on gajim.org ## Update ===================================== scripts/bump_version.py ===================================== @@ -39,8 +39,8 @@ def bump_flatpak(current_version: str, new_version: str) -> None: with FLATPAK.open('r', encoding='utf8') as f: content = f.read() - content = content.replace(f'gajim-{current_version}', - f'gajim-{new_version}', 1) + content = content.replace(f'tag: {current_version}', + f'tag: {new_version}', 1) with FLATPAK.open('w', encoding='utf8') as f: f.write(content) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/c799dbff91076b792fadc4236b6d415… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/c799dbff91076b792fadc4236b6d415… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim] Pushed new tag gajim-1.4.1
by Philipp Hörist (＠lovetox) 21 May '22

21 May '22

Philipp Hörist pushed new tag gajim-1.4.1 at gajim / gajim -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/tree/gajim-1.4.1 You're receiving this email because of your account on dev.gajim.org.

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
20
Older →

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 May 2022