Commits December 2022

commits@gajim.org

1 participants
148 discussions

[Git][gajim/gajim][master] fix: Commands: Attempt to parse only if message can have a command
by Daniel Brötzmann (＠wurstsalat) 20 Dec '22

20 Dec '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 7a8a7d55 by wurstsalat at 2022-12-20T09:29:25+01:00 fix: Commands: Attempt to parse only if message can have a command Fixes #11341 - - - - - 1 changed file: - gajim/gtk/message_actions_box.py Changes: ===================================== gajim/gtk/message_actions_box.py ===================================== @@ -509,7 +509,8 @@ def _on_msg_textview_key_press_event(self, message = self.msg_textview.get_text() if (message.startswith('/') and not message.startswith('//') and - not message.startswith('/me ')): + not message.startswith('/me ') and + len(message) > 1): try: app.commands.parse(self._contact.type_string, message) except CommandFailed: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/7a8a7d558125f4bd226b8aff558d324e… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/7a8a7d558125f4bd226b8aff558d324e… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: cq: Use pyright specific ignore code
by Philipp Hörist (＠lovetox) 19 Dec '22

19 Dec '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 67ab4b10 by Philipp Hörist at 2022-12-19T16:25:33+01:00 cq: Use pyright specific ignore code - - - - - 91889803 by Philipp Hörist at 2022-12-19T19:17:55+01:00 ci: Update ruff config - - - - - 9 changed files: - gajim/common/preview_helpers.py - gajim/common/settings.py - gajim/common/storage/archive.py - gajim/common/storage/base.py - gajim/common/storage/cache.py - gajim/common/storage/events.py - gajim/gtk/notification.py - gajim/gtk/util.py - pyproject.toml Changes: ===================================== gajim/common/preview_helpers.py ===================================== @@ -278,7 +278,7 @@ def pixbuf_from_data(data: bytes) -> Optional[GdkPixbuf.Pixbuf]: # Fallback to Pillow input_file = BytesIO(data) image = Image.open(BytesIO(data)).convert('RGBA') - array = GLib.Bytes.new(image.tobytes()) # type: ignore + array = GLib.Bytes.new(image.tobytes()) # pyright: ignore width, height = image.size pixbuf = GdkPixbuf.Pixbuf.new_from_bytes(array, GdkPixbuf.Colorspace.RGB, ===================================== gajim/common/settings.py ===================================== @@ -258,7 +258,7 @@ def _load_app_overrides(self) -> None: def _namedtuple_factory(cursor: sqlite3.Cursor, row: tuple[Any, ...]) -> NamedTuple: fields = [col[0] for col in cursor.description] - return namedtuple('Row', fields)(*row) # type: ignore + return namedtuple('Row', fields)(*row) # pyright: ignore def _connect_database(self) -> None: path = configpaths.get('SETTINGS') ===================================== gajim/common/storage/archive.py ===================================== @@ -191,7 +191,7 @@ def _namedtuple_factory(self, assert cursor.description is not None fields = [col[0] for col in cursor.description] - Row = namedtuple('Row', fields) # type: ignore + Row = namedtuple('Row', fields) # pyright: ignore named_row = Row(*row) if 'additional_data' in fields: _dict = json.loads(named_row.additional_data or '{}') ===================================== gajim/common/storage/base.py ===================================== @@ -91,7 +91,7 @@ def _jid_converter(jid: bytes) -> JID: def _convert_disco_info(disco_info: bytes) -> DiscoInfo: - return parse_disco_info(Iq(node=disco_info)) # type: ignore + return parse_disco_info(Iq(node=disco_info)) # pyright: ignore def _adapt_disco_info(disco_info: DiscoInfo) -> str: @@ -112,7 +112,7 @@ def _convert_json(json_string: bytes) -> dict[str, Any]: class Encoder(json.JSONEncoder): def default(self, o: Any) -> Any: if isinstance(o, set): - return list(o) # type: ignore + return list(o) # pyright: ignore if isinstance(o, JID): return {'__type': 'JID', 'value': str(o)} ===================================== gajim/common/storage/cache.py ===================================== @@ -87,7 +87,7 @@ class UnreadTableRow(NamedTuple): account: str jid: JID - count: int # type: ignore + count: int # pyright: ignore message_id: str timestamp: float @@ -121,7 +121,7 @@ def _namedtuple_factory(cursor: sqlite3.Cursor, assert cursor.description is not None fields = [col[0] for col in cursor.description] - Row = namedtuple('Row', fields) # type: ignore + Row = namedtuple('Row', fields) # pyright: ignore return Row(*row) def _migrate(self) -> None: @@ -212,7 +212,7 @@ def get_last_disco_info(self, disco_info = self._disco_info_cache.get(jid) if disco_info is not None: max_timestamp = time.time() - max_age if max_age else 0 - if max_timestamp > disco_info.timestamp: # type: ignore + if max_timestamp > disco_info.timestamp: # pyright: ignore return None return disco_info ===================================== gajim/common/storage/events.py ===================================== @@ -88,7 +88,7 @@ def _namedtuple_factory(cursor: sqlite3.Cursor, assert cursor.description is not None fields = [col[0] for col in cursor.description] - Row = namedtuple('Row', fields) # type: ignore + Row = namedtuple('Row', fields) # pyright: ignore return Row(*row) def _migrate(self) -> None: ===================================== gajim/gtk/notification.py ===================================== @@ -299,7 +299,7 @@ def on_proxy_ready(_source: Gio.DBusProxy, res: Gio.AsyncResult) -> None: try: proxy = Gio.DBusProxy.new_finish(res) - self._caps = proxy.GetCapabilities() # type: ignore + self._caps = proxy.GetCapabilities() # pyright: ignore except GLib.Error as error: log.warning('Notifications D-Bus not available: %s', error) else: ===================================== gajim/gtk/util.py ===================================== @@ -506,7 +506,7 @@ def text_to_color(text: str) -> tuple[float, float, float]: background = (0, 0, 0) # RGB (0, 0, 0) black else: background = (1, 1, 1) # RGB (255, 255, 255) white - return nbxmpp.util.text_to_color(text, background) # type: ignore + return nbxmpp.util.text_to_color(text, background) # pyright: ignore def get_contact_color(contact: types.ChatContactT @@ -566,7 +566,7 @@ def get_pixbuf_from_data(file_data: bytes) -> Optional[GdkPixbuf.Pixbuf]: 'convert avatar image using pillow') try: avatar = Image.open(BytesIO(file_data)).convert('RGBA') - array = GLib.Bytes.new(avatar.tobytes()) # type: ignore + array = GLib.Bytes.new(avatar.tobytes()) # pyright: ignore width, height = avatar.size pixbuf = GdkPixbuf.Pixbuf.new_from_bytes( array, GdkPixbuf.Colorspace.RGB, @@ -626,7 +626,7 @@ def load_pixbuf(path: Union[str, Path], log.debug('Error', exc_info=True) return None - array = GLib.Bytes.new(avatar.tobytes()) # type: ignore + array = GLib.Bytes.new(avatar.tobytes()) # pyright: ignore width, height = avatar.size pixbuf = GdkPixbuf.Pixbuf.new_from_bytes( array, GdkPixbuf.Colorspace.RGB, True, @@ -681,7 +681,7 @@ def get_app_windows(account: str) -> list[Gtk.Window]: windows: list[Gtk.Window] = [] for win in app.app.get_windows(): if hasattr(win, 'account'): - if win.account == account: # type: ignore + if win.account == account: # pyright: ignore windows.append(win) return windows @@ -695,11 +695,11 @@ def get_app_window(name: str, continue if account is not None: - if account != win.account: # type: ignore + if account != win.account: # pyright: ignore continue if jid is not None: - if jid != win.jid: # type: ignore + if jid != win.jid: # pyright: ignore continue return win return None @@ -728,7 +728,7 @@ def get_gtk_version() -> str: class EventHelper(CommonEventHelper): def __init__(self): CommonEventHelper.__init__(self) - self.connect('destroy', self.__on_destroy) # type: ignore + self.connect('destroy', self.__on_destroy) # pyright: ignore def __on_destroy(self, *args: Any) -> None: self.unregister_events() ===================================== pyproject.toml ===================================== @@ -95,6 +95,7 @@ select = [ "C901", # mccabe # "D", # pydocstyle "E", # pycodestyle + # "EM", # flake8-errmsg # "ERA", # eradicate "F", # pyflakes # "FBT", # flake8-boolean-trap View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/57f18dc623f0b5b5b4179ef5d7ff70d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/57f18dc623f0b5b5b4179ef5d7ff70d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ci: Adapt to pygobject-stub changes
by Philipp Hörist (＠lovetox) 19 Dec '22

19 Dec '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 57f18dc6 by Philipp Hörist at 2022-12-19T01:08:47+01:00 ci: Adapt to pygobject-stub changes Old libraries need to be specified at install time - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -26,7 +26,7 @@ test-pyright: - "**/*.py" script: - pip3 install git+https://dev.gajim.org/gajim/python-nbxmpp.git - - pip3 install git+https://github.com/pygobject/pygobject-stubs.git + - PYGOBJECT_STUB_CONFIG=Gtk3,Gdk3,Soup2 pip3 install git+https://github.com/pygobject/pygobject-stubs.git - npm install pyright - python3 .ci/link-gtk.py - $(npm bin)/pyright --version View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/57f18dc623f0b5b5b4179ef5d7ff70dd… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/57f18dc623f0b5b5b4179ef5d7ff70dd… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][soup3] 199 commits: cfix: Flatpak: Fix package build
by Philipp Hörist (＠lovetox) 17 Dec '22

17 Dec '22

Philipp Hörist pushed to branch soup3 at gajim / gajim Commits: 98d2d873 by André Apitzsch at 2022-10-31T18:29:25+01:00 cfix: Flatpak: Fix package build With the switch to pyproject.toml build isolation is used by default. As flatpak build runs in offline mode, no dependencies could be downloaded to the isolated environment. That's why build failed. - - - - - e426ed6c by wurstsalat at 2022-11-01T00:27:49+01:00 fix: Don’t fail when trying to reset last message id - - - - - 45e1f810 by wurstsalat at 2022-11-01T20:39:00+01:00 fix: Message selection: Don’t fail hard if log_line_id is None Fixes #11263 - - - - - 8c244751 by wurstsalat at 2022-11-01T20:48:39+01:00 imprv: Add msg_log_id to live message events Improves the situation for #11263 - - - - - ae404955 by wurstsalat at 2022-11-01T20:56:31+01:00 cfix: Always return value for log_message - - - - - 53814974 by wurstsalat at 2022-11-01T21:09:52+01:00 refactor: Move menus for roster view and start chat button - - - - - c7ab8603 by wurstsalat at 2022-11-01T21:59:26+01:00 refactor: Use GTK theme colors for floating overlay box - - - - - 266c1290 by wurstsalat at 2022-11-01T23:44:44+01:00 refactor: CSS: Order classes, reduce redundancy - - - - - c848f2ff by wurstsalat at 2022-11-02T20:52:38+01:00 fix: CSS: Move overriding rules to bottom Fixes #11269 - - - - - a3a6d3ec by wurstsalat at 2022-11-02T21:10:24+01:00 new: CSS: Add general purpose classes - - - - - 755fd601 by wurstsalat at 2022-11-02T21:13:58+01:00 fix: CSS: Fix settings related inconsistencies - - - - - e5d7586b by wurstsalat at 2022-11-02T23:45:51+01:00 cq: Preview helpers: Add type annotations - - - - - 3bfb40a4 by wurstsalat at 2022-11-02T23:50:15+01:00 new: CSS: Add generic listbox and dnd-area classes - - - - - 4ef4e483 by Philipp Hörist at 2022-11-04T00:00:05+01:00 fix: Plugins: Replace usage of gui_extention_point() Use the newer extension_point() call, which does not replay calls on plugin activation. - - - - - c5e6af29 by Philipp Hörist at 2022-11-04T22:59:27+00:00 fix: Fix various issues with chat markers - - - - - 78d96078 by wurstsalat at 2022-11-05T11:22:42+01:00 cfix: CSS: Simplify gajim-listbox style - - - - - c5f6cc12 by wurstsalat at 2022-11-05T14:59:06+01:00 fix: MessageInputTextView: Handle is_correcting if no contact is set Fixes #11272 - - - - - 31421f74 by mjk at 2022-11-05T16:16:40+00:00 imprv: Styling: Validate link syntax deeper and *after* parenthesis correction - - - - - d94d8272 by mjk at 2022-11-05T21:14:00+00:00 refactor: Always include the source string in the result of parse_uri Improves debuggability, obviates formatting the errors. - - - - - c6714b64 by mjk at 2022-11-05T21:18:52+00:00 fix: URI parsing: Properly unescape XMPP URIs and handle unknown query types - - - - - b5b81605 by mjk at 2022-11-05T21:18:52+00:00 refactor: Clean up {parse,open}_uri * Remove URIType.UNKNOWN * Remove special handling of JID-like strings. This almost never happens, and if it does, it's only due to some unsanitized input, e.g. server contact addresses blindly turned into hyperlinks with no validation (to be improved). * Misc. - - - - - 0fda2adf by mjk at 2022-11-05T21:18:52+00:00 fix: URI parsing: Properly unescape mailto URIs - - - - - f0feaba1 by mjk at 2022-11-05T21:18:52+00:00 fix: URI parsing: More robustness with geo URIs * Don't treat altitude as part of longitude * Detect more invalid URIs - - - - - 69af2ce6 by mjk at 2022-11-05T21:18:52+00:00 imprv: URI parsing: Detect invalid file URIs earlier ...including: in chat messages and file sending UI. Also, don't generate wrong URIs like 'file://file:/path' when opening 'file:/path', and properly escape paths: 'file:///¿Qué%3F' <- '/¿Qué?'. - - - - - 710cab12 by mjk at 2022-11-05T21:19:12+00:00 refactor: Minor refactoring and TODOs sprinkling in open_uri - - - - - 7eaa8ae5 by mjk at 2022-11-05T21:20:28+00:00 imprv: VCardGrid: Linkify all URI-type fields iff they are valid URIs - - - - - 225f6eca by mjk at 2022-11-05T21:20:28+00:00 cq: Remove unused imports - - - - - c497eae2 by mjk at 2022-11-05T21:20:36+00:00 refactor: Factor open_uri_externally out of open_uri - - - - - da620714 by mjk at 2022-11-05T21:21:44+00:00 change: Block opening file:/ links by default Controlled by a new ACE variable. Fixes #11276 - - - - - e93a928b by mjk at 2022-11-05T21:21:44+00:00 refactor: Use sys.platform in open_file(_uri) - - - - - 1f081612 by Philipp Hörist at 2022-11-05T23:27:57+01:00 refactor: Make open_file() only accept Path objects - - - - - 6f6ce444 by Philipp Hörist at 2022-11-05T23:33:19+01:00 cq: Remove unused import - - - - - d08913b5 by wurstsalat at 2022-11-06T14:02:25+01:00 imprv: Accounts window: Use equal widths for account switch label - - - - - e7736e63 by Nicoco at 2022-11-06T13:20:29+00:00 imprv: Chatstates: Add a timeout for the "composing" animation - - - - - b5398fd0 by Philipp Hörist at 2022-11-06T23:44:22+01:00 refactor: Control: Simplify request history callback - - - - - 0a5e2a79 by wurstsalat at 2022-11-07T16:38:59+01:00 cq: CSS: Simplify some rules - - - - - 2d6e4b5a by wurstsalat at 2022-11-08T14:27:57+01:00 imprv: Preferences: Improve preview settings - - - - - 35b754f6 by wurstsalat at 2022-11-08T16:02:10+01:00 cfix: Preferences: Revert preview file size units - - - - - 8e5bb40c by wurstsalat at 2022-11-09T20:32:44+01:00 fix: Preview: Stop further processing if decompression bomb detected Fixes #11280 - - - - - dfa950f3 by Philipp Hörist at 2022-11-11T19:07:12+01:00 perf: Control: Request history more efficiently - Limit how many events are requested - Merge events and messages and add them afterwards - - - - - 40770fa7 by wurstsalat at 2022-11-13T14:17:10+01:00 cq: Update pyright config - - - - - c549fff0 by wurstsalat at 2022-11-15T12:00:59+01:00 imprv: ChatList: Scroll to top when switching workspace - - - - - 096e6d69 by Daniel Brötzmann at 2022-11-15T12:15:17+00:00 chore: DOAP: Add XEP-0402 - - - - - 69553e56 by wurstsalat at 2022-11-16T12:32:53+01:00 fix: ConversationView: Fix scrollbar not being the right-most widget This makes it possible to easily 'find' the scrollbar while having Gajim in fullscreen mode. - - - - - 2cf08d52 by wurstsalat at 2022-11-16T12:44:11+01:00 cfix: SearchView: Add separate class for search view rows - - - - - 7b3971b6 by wurstsalat at 2022-11-16T16:50:52+01:00 fix: Preview: Respect MUC context for PMs Fixes #11289 - - - - - 7ccf4806 by wurstsalat at 2022-11-17T17:38:46+01:00 fix: MessageActionsBox: Reintroduce gui_extension_point This is necessary when activating plugins after launch - - - - - d7121d8e by wurstsalat at 2022-11-18T14:07:32+01:00 fix: GroupchatRoster: Set visibility when hiding Hides the roster completely, so that the chat scrollbar is the right-most widget. Caveat: Un-reveal animation is gone - - - - - 23f90923 by wurstsalat at 2022-11-24T16:57:55+01:00 other: Remove obsolete htmltextview test - - - - - a3d7d6a3 by mjk at 2022-11-24T19:43:00+00:00 imprv: Prettify display of geographical locations - - - - - 42adccad by wurstsalat at 2022-11-24T20:54:40+01:00 refactor: MoreMenuButton: Use Gio.Menu Fixes #11262 - - - - - 01fd1b72 by wurstsalat at 2022-11-24T22:08:22+01:00 fix: Chatstates: Switch to Chatstate.ACTIVE after timeout - - - - - a6037e25 by wurstsalat at 2022-11-24T22:23:04+00:00 change: Add FileTransferSelector as a central page for sending files Fixes #9511 - - - - - 53d01bd6 by wurstsalat at 2022-11-24T23:33:00+01:00 refactor: Remove obsolete FileTransferSend dialog - - - - - 45033e89 by wurstsalat at 2022-11-25T15:14:42+01:00 refactor: Preview: Use Gio.Menu and Actions - - - - - 66d9ad4d by wurstsalat at 2022-11-25T15:25:54+01:00 cfix: Preferences: Use correct preview actions - - - - - 26f68c7f by wurstsalat at 2022-11-25T15:26:17+01:00 cfix: Menus: Fix linting error - - - - - b02f54d3 by wurstsalat at 2022-11-25T15:26:40+01:00 cq: File Choosers: Fix typo - - - - - 027b2d47 by wurstsalat at 2022-11-25T15:27:57+01:00 cfix: FileTransferSelector: Improve file choosing - - - - - 88daed91 by wurstsalat at 2022-11-25T16:24:19+01:00 cq: Contacts: Add more log output - - - - - b8c09a65 by wurstsalat at 2022-11-25T17:38:12+01:00 fix: SearchView: Set chat type correctly for ResultRows Fixes #11087 - - - - - 8e0f472a by wurstsalat at 2022-11-25T18:30:44+01:00 fix: ChatFunctionPage: Don't close control on cancelling join error Fixes #11116 - - - - - 44eab3c1 by wurstsalat at 2022-11-25T19:00:31+01:00 refactor: AvatarStorage: Access some methods directly - - - - - be7f2621 by wurstsalat at 2022-11-25T21:03:37+01:00 cq: Settings: Improve type annotations - - - - - 3c312d13 by wurstsalat at 2022-11-26T12:09:58+00:00 change: Jingle: Remove XTLS support XTLS has never been standardized, see https://datatracker.ietf.org/doc/html/draft-meyer-xmpp-e2e-encryption Gajim used this for file transfers, but there probably was no other client supporting this now obsolete feature. Today, using XEP-0396: Jingle Encrypted Transports - OMEMO would be the preferred solution. Part of #11160 - - - - - 8aafb212 by wurstsalat at 2022-11-27T14:45:22+01:00 fix: SSLErrorDialog: Fix test, remove OpenSSL usage - - - - - df1b8a56 by wurstsalat at 2022-11-27T14:57:16+01:00 chore: Update pyright config - - - - - 1c327c75 by wurstsalat at 2022-11-27T15:02:17+01:00 cfix: Menus: Add ellipsis to Save as… preview menu item - - - - - bd8b229b by wurstsalat at 2022-11-27T16:45:56+01:00 fix: GUI tests: Adapt GUI tests to Gajim changes - - - - - 8da84be4 by wurstsalat at 2022-11-27T19:35:20+00:00 refactor: CertificateBox: Use cryptography module for certificate details - - - - - b2957213 by wurstsalat at 2022-11-27T19:35:20+00:00 change: Dependencies: Remove pyOpenSSL, add python-cryptography - - - - - bf75d672 by Philipp Hörist at 2022-11-27T23:43:04+01:00 ci: Add ruff configuration - - - - - fde324b2 by Philipp Hörist at 2022-11-27T23:50:02+01:00 ci: Debian: Add cryptography to build dependencies - - - - - d0032cd9 by wurstsalat at 2022-11-27T23:36:19+00:00 imprv: Settings: Unify timestamp settings Part of #10948 - - - - - 020230b5 by wurstsalat at 2022-11-28T10:29:41+01:00 imprv: Message selection: Use date_time_format instead of time_format - - - - - 4b6f68da by wurstsalat at 2022-11-28T18:10:11+01:00 chore: Update builder.pyi - - - - - d4c21af6 by wurstsalat at 2022-11-28T18:48:06+01:00 cq: AccountWizard: Improve type annotations - - - - - 806d4757 by wurstsalat at 2022-11-29T13:18:01+01:00 fix: MessageInputTextView: Reintroduce gui_extension_point This is necessary when activating plugins after launch - - - - - 2f8986b3 by wurstsalat at 2022-11-30T00:22:34+01:00 cq: Remove unnecessary pyright ignore comments - - - - - b84ef377 by mjk at 2022-11-30T21:05:07+00:00 imprv: Styling: Introduce URI scheme whitelisting Fixes #11266 Co-authored-by: Philipp Hörist <philipp(a)hoerist.com> - - - - - ec0008b7 by mjk at 2022-11-30T21:17:13+00:00 fix: Styling: Linkify URIs only if at the start of a word - - - - - 88989297 by mjk at 2022-11-30T21:19:03+00:00 refactor: Tests: Improve failure reports in test_styling - - - - - eebbe3e8 by wurstsalat at 2022-11-30T21:34:12+00:00 refactor: Remove old emoji code Fixes #10932 - - - - - d0fb8c5b by mjk at 2022-11-30T21:58:07+00:00 fix: Preview: Handle multiple simultaneous certificate verification errors - - - - - 58c59ec5 by Philipp Hörist at 2022-11-30T23:38:26+01:00 refactor: Move GstPbutils import into method app.detect_dependencies() needs to call gi.require() first, so import this inside the method - - - - - d3953b58 by Philipp Hörist at 2022-11-30T23:59:57+01:00 imprv: Features: Add entry for Audio Preview - - - - - 4ad531df by Philipp Hörist at 2022-12-01T00:14:02+01:00 refactor: Remove debian related package names - - - - - 8011ff31 by wurstsalat at 2022-12-01T21:31:30+01:00 imprv: Message selection: Improve styling - - - - - ace22758 by wurstsalat at 2022-12-01T22:46:29+01:00 imprv: Message selection: Imrpove wording for deselecting messages - - - - - 977a6f77 by wurstsalat at 2022-12-03T00:31:38+01:00 imprv: MUC: Add method for aborting join - - - - - a77decef by Philipp Hörist at 2022-12-03T09:42:30+01:00 cfix: AccountWizard: Don’t translate URL labels - - - - - 5c3c60fc by Weblate at 2022-12-03T09:55:58+01:00 chore: Update translations - - - - - d724c016 by Philipp Hörist at 2022-12-03T10:01:10+01:00 chore: Cleanup stale translations - - - - - 12b0a427 by wurstsalat at 2022-12-03T09:05:20+00:00 imprv: DataFormWidget: Set min width on right box Fixes #11222 - - - - - 4d501a60 by Philipp Hörist at 2022-12-03T10:20:01+01:00 release: 1.5.4 - - - - - 52816f7f by Philipp Hörist at 2022-12-03T21:10:11+01:00 ci: Automatically create Gitlab Release - - - - - 3becd516 by Philipp Hörist at 2022-12-03T21:46:07+01:00 cq: Remove newline - - - - - 0e53991c by Philipp Hörist at 2022-12-03T22:16:46+01:00 cq: Fix typing for cairo.Context - - - - - 2bbcd18b by Philipp Hörist at 2022-12-03T22:26:27+01:00 cq: Ignore flake8 unused-import errors - - - - - 3d5363d0 by Philipp Hörist at 2022-12-04T00:41:11+01:00 refactor: Scripts: Fix various issues - Use logging module everywhere - Fix boolean traps - replace exit() with sys.exit() - - - - - 576b1aa1 by Philipp Hörist at 2022-12-04T00:57:07+01:00 cq: Use builtin types for annotations - - - - - 89507a76 by Philipp Hörist at 2022-12-04T11:42:45+01:00 cfix: Use __future__ import for annotations Fixes #11314 - - - - - 38fd03ce by André Apitzsch at 2022-12-04T11:58:58+01:00 chore: Flatpak: Update dependencies - - - - - 48a1b1ff by Philipp Hörist at 2022-12-04T13:22:06+01:00 cq: Tests: Fix ruff linter errors - - - - - b69d7b2e by Philipp Hörist at 2022-12-04T19:33:59+01:00 cq: Fix typo in annotation - - - - - 156b23cf by Philipp Hörist at 2022-12-04T19:38:45+01:00 refactor: Raise AssertionError explicitly assert can be optimized out by python, as this is not a assert for helping the type checker it should be raised explicitly. - - - - - 9294172c by Philipp Hörist at 2022-12-04T20:19:38+01:00 refactor: Simplify sorted list insertion Handler lists are very small and are not changed very often - - - - - 5c874f20 by Philipp Hörist at 2022-12-04T20:46:57+01:00 cq: Settings: Mark loop var as not used - - - - - b48e6922 by Philipp Hörist at 2022-12-04T20:56:07+01:00 refactor: Replace lru_cache(maxsize=None) with shorthand - - - - - 16ce9f7e by Philipp Hörist at 2022-12-04T21:39:40+01:00 refactor: Use set literals - - - - - 5265a80c by wurstsalat at 2022-12-04T22:56:12+01:00 refactor: Translations: Use p_() method for translation context - - - - - fd47095e by Philipp Hörist at 2022-12-04T23:54:56+01:00 refactor: Remove unnecessary map() usage - - - - - 6c666114 by Philipp Hörist at 2022-12-04T23:54:56+01:00 refactor: Remove unnecessary method arguments - - - - - 532e2249 by Philipp Hörist at 2022-12-04T23:54:56+01:00 refactor: Use "not in" for inclusion check - - - - - f256b6ec by Philipp Hörist at 2022-12-05T00:00:21+01:00 refactor: Remove unnecessary variable assignment before return - - - - - 90cd87a2 by Philipp Hörist at 2022-12-05T00:00:21+01:00 refactor: Simplify import - - - - - c4068f05 by Philipp Hörist at 2022-12-05T00:00:21+01:00 cq: Reorder comparison - - - - - 012daf50 by Philipp Hörist at 2022-12-05T00:00:21+01:00 cq: Add noqa for false positive ruff checks - - - - - 53f96919 by Philipp Hörist at 2022-12-05T00:00:21+01:00 refactor: PluginManager: Simplify setting module attribute - - - - - 90a53769 by Philipp Hörist at 2022-12-05T00:00:21+01:00 refactor: Rename AppIndicator import - - - - - d14e1ee9 by Philipp Hörist at 2022-12-05T00:00:21+01:00 refactor: Follow CapWords convention for classes - - - - - b73700ee by Philipp Hörist at 2022-12-05T00:00:21+01:00 refactor: Assistant: Use dict literal - - - - - 93890f8d by Philipp Hörist at 2022-12-05T00:00:21+01:00 refactor: Remove unnecessary method cache This method is not expensive and only called a few times - - - - - 6440fd60 by Philipp Hörist at 2022-12-05T00:00:21+01:00 ci: Update ruff configuration - - - - - 9e9101a7 by Philipp Hörist at 2022-12-05T00:00:21+01:00 ci: Repace pylint/flake8 with ruff - - - - - f681bcee by mjk at 2022-12-07T17:03:40+03:00 feat: Resurrect URI-specific context menus - - - - - dfac89f7 by mjk at 2022-12-07T17:03:40+03:00 refactor: Make URI context menus more data-driven ...and cover missing URITypes, adding "coverage" tests. - - - - - 340e33d0 by mjk at 2022-12-08T11:00:12+00:00 refactor: Simplify the type of URI.data No casts/type assertions needed now. - - - - - e65badc7 by mjk at 2022-12-08T11:00:56+00:00 imprv: Use the unified Start/Join Chat flow for ?join links * Immediately switch to the chat if already open. * Don't "crash" if current account is offline. - - - - - 753e8345 by mjk at 2022-12-08T11:00:56+00:00 refactor: Make xmpp query type handling in open_uri more change-proof - - - - - def536da by mjk at 2022-12-08T11:00:56+00:00 imprv: Restore ability to manually disambiguate JID-like addresses ...by storing them in `href` attributes as internal-use `about:ambiguous-address?a@b.c` URIs. Storing raw `a(a)b.c` in `href` wouldn't make a lot of semantic sense, as that's a relative-path URI with the meaning of "the thing named 'a(a)b.c' in the same directory as the current document". Plus, it would either entail handling these addresses outside `parse_uri()`, or changing its purpose of parsing only absolute URIs. - - - - - 66e748fd by mjk at 2022-12-08T11:00:56+00:00 imprv: Add dedicated context menu for non-specific URI types - - - - - 278ea276 by Philipp Hörist at 2022-12-08T13:11:46+01:00 refactor: Harmonize groupchat-join/open-chat action We want the behavior of groupchat-join, but not only for group chats. This consolidates the code into the open-chat action. - - - - - ca5f6104 by mesonium at 2022-12-08T12:14:05+00:00 feat: Preview: Add audio preview controls and visualization * Remove the delay when starting a playback * Don't scrub during seek when dragging the slider * Don't open audio stream connections before playing * Determine the duration early to prevent missing duration info + Show total duration + Add option to display remaining play time + Add possibility to seek by clicking into the seekbar + Add possibility to seek by scrolling with the mouse wheel + Add fast forward and rewind buttons + Add buttons to change the playback speed + Add automatic restoration of the audio player settings in a session + Add automatic stop of other streams when starting to play + Add a visualization of the RMS peaks - - - - - 84ff274e by mjk at 2022-12-08T22:38:34+00:00 feat: Allow sending files by copy-pasting them from file managers - - - - - 2a595826 by mjk at 2022-12-08T22:55:46+00:00 fix: Preview: Don't treat multi-line message body as previewable URL - - - - - 2b5ab697 by Philipp Hörist at 2022-12-09T00:13:08+01:00 fix: Remember last folder correctly after sending file - - - - - 38ed7621 by Philipp Hörist at 2022-12-09T00:26:52+01:00 cfix: AudioPreview: Use symbolic icons - - - - - 6b9cb548 by wurstsalat at 2022-12-09T22:10:57+01:00 cq: Move remove_invalid_xml_chars method and add test - - - - - 83f23865 by wurstsalat at 2022-12-09T22:25:05+01:00 cq: Tests: Code formatting, simplifications - - - - - e726baf5 by wurstsalat at 2022-12-09T23:06:57+01:00 cq: Assistant: Add overloads for add_default_page - - - - - d409b47b by wurstsalat at 2022-12-09T23:34:18+01:00 cq: Assistant: Add overloads for get_page - - - - - 60cf91b8 by wurstsalat at 2022-12-09T23:36:17+01:00 cq: GUI tests: Code formatting and simplifications - - - - - 9337eeaa by wurstsalat at 2022-12-09T23:51:25+01:00 cq: Generate ui types without linting errors - - - - - a6550805 by wurstsalat at 2022-12-09T23:59:07+01:00 cq: Types: Remove obsolete types - - - - - 73db9f99 by wurstsalat at 2022-12-10T11:24:07+01:00 cq: Plugins: Improve type annotations - - - - - 7ee6b8b9 by wurstsalat at 2022-12-10T11:24:33+01:00 cq: Preferences: Ignore type error - - - - - a9894439 by wurstsalat at 2022-12-10T11:25:05+01:00 cq: Styling: Type annotations - - - - - ba5ef575 by wurstsalat at 2022-12-10T13:12:05+01:00 cq: SynchronizeAccounts: Use better ListStore set method - - - - - 8e7dbb69 by wurstsalat at 2022-12-10T13:12:19+01:00 cq: RosterItemExchange: Use better ListStore set method - - - - - a82b744d by wurstsalat at 2022-12-10T13:15:55+01:00 cq: FileChoosers: Improve type annotations - - - - - 5131ebf8 by wurstsalat at 2022-12-10T13:15:55+01:00 cq: Control: Fix indentation warning - - - - - 7272cc30 by wurstsalat at 2022-12-10T13:15:55+01:00 cq: ComponentSearch: Fix type annotations - - - - - 93e4ed5f by wurstsalat at 2022-12-10T13:15:55+01:00 cq: Assistant: Fix type annotations - - - - - 896be5ed by wurstsalat at 2022-12-10T13:15:55+01:00 cq: Update pyrightconfig - - - - - f187e303 by wurstsalat at 2022-12-10T17:41:38+01:00 cq: Add stubs for css_parser - - - - - 1945cf94 by wurstsalat at 2022-12-10T17:50:41+01:00 cq: Fix ruff errors - - - - - 40243c8e by wurstsalat at 2022-12-11T13:37:25+01:00 cq: Add /mac folder to pyrightconfig - - - - - 17076ced by Philipp Hörist at 2022-12-11T14:13:55+01:00 new: Settings: Allow to create Settings in memory - - - - - 1d2fa904 by Philipp Hörist at 2022-12-11T14:13:55+01:00 new: Settings: Add shutdown() method - - - - - c81ea41b by Grzegorz Szymaszek at 2022-12-11T21:37:16+01:00 cfix: Add missing and remove unneeded execute bits Remove the execute bit from files that most likely should not be executable in a Unix-like environment, like Markdown or Yaml. Set the execute bit on files that most likely should be executable: those having "#!/usr/bin/env ..." or similar solutions. - - - - - 7b64058e by wurstsalat at 2022-12-12T11:05:45+01:00 fix: Fonts: Fix emoji rendering on MacOS - - - - - 37c3cb3a by wurstsalat at 2022-12-12T18:24:13+01:00 imprv: AppPage: Show date for last update check - - - - - eeb456b4 by wurstsalat at 2022-12-12T19:31:06+01:00 imprv: Timestamps: Use date/time format preference in more places Fixes #10948 - - - - - 3742e9da by Philipp Hörist at 2022-12-12T20:25:46+01:00 other: Discover translations correctly - - - - - 1d239b90 by André Apitzsch at 2022-12-12T20:54:05+01:00 cfix: Re-add comments for translators to po files - - - - - ff048ff7 by André Apitzsch at 2022-12-12T20:54:05+01:00 other: Filetransfer: Add hint for translators - - - - - 689e324e by Philipp Hörist at 2022-12-12T21:35:44+01:00 cfix: VCard: Fix typo - - - - - 221097db by Philipp Hörist at 2022-12-13T19:38:09+01:00 fix: Menus: Don’t use GLib variant text format parsing All strings would need to be escaped, not using the text format is less error prone. Fixes #11331 - - - - - 0bdce8ac by Philipp Hörist at 2022-12-13T19:40:15+01:00 other: Scripts: Execute pyright last in pre-push-tests It takes the most time, so execute it last - - - - - e070a951 by Philipp Hörist at 2022-12-13T19:43:42+01:00 cfix: Menus: Remove obsolete string escaping - - - - - 0f3204b4 by Philipp Hörist at 2022-12-13T19:46:56+01:00 cfix: Menus: Don’t quote string value - - - - - dab9bf29 by Philipp Hörist at 2022-12-13T20:00:57+01:00 refactor: Menus: Don’t pass params with action name For consistency sake - - - - - 53bf4e2f by Philipp Hörist at 2022-12-13T20:17:29+01:00 refactor: Menus: Don’t pass action with Gio.MenuItem.new() The action gets feeded to parse_detail_name() which breaks when the action name has "(" in it. - - - - - d1f57886 by Philipp Hörist at 2022-12-13T20:29:56+01:00 refactor: Menus: Port component search menu to GajimMenu - - - - - 75104e75 by Philipp Hörist at 2022-12-13T20:47:11+01:00 refactor: Import MenuList type hints - - - - - fc4a56e2 by Philipp Hörist at 2022-12-13T22:38:08+01:00 cq: Typecheck more modules - - - - - e52f7b78 by wurstsalat at 2022-12-14T19:34:29+01:00 fix: AvatarSelector: Set default crop scale to 1.0 Fixes #11331 - - - - - 16cd4ebd by wurstsalat at 2022-12-14T19:44:56+01:00 imprv: BaseAvatarChooserDialog: Allow all image types Fixes #11328 - - - - - 26752631 by wurstsalat at 2022-12-14T20:13:22+01:00 fix: Notifications: Use correct nickname for /me messages Fixes #11334 - - - - - 2ba73b51 by mjk at 2022-12-15T00:07:16+03:00 cfix: File choosers: Fix type mismatches in accept callback Fixes the regression introduced in 84ff274e345da79e075589d48026ec767729eb8e - - - - - 834d4a31 by mjk at 2022-12-15T00:07:16+03:00 refactor: File choosers: Type-related changes * Simplify accept callback signature * Allow more type checker visibility - - - - - c08a2946 by Philipp Hörist at 2022-12-14T23:32:23+01:00 refactor: Move Singleton into util.classes - - - - - 5651884d by Philipp Hörist at 2022-12-14T23:36:31+01:00 refactor: Move text_helpers into util module - - - - - 6054a21b by Philipp Hörist at 2022-12-14T23:55:19+01:00 ci: Simplify pyright config - - - - - e741c8e3 by Philipp Hörist at 2022-12-15T00:02:45+01:00 cq: Events: Fix type annotation - - - - - f2ef6140 by Philipp Hörist at 2022-12-15T00:03:30+01:00 ci: Update pyright config - - - - - 782cafb2 by mjk at 2022-12-14T23:32:40+00:00 imprv: Highlight the file when opening containing folder - - - - - 2601e782 by Philipp Hörist at 2022-12-17T14:03:37+01:00 refactor: Simplify dict iteration - - - - - e00c67e5 by Philipp Hörist at 2022-12-17T14:03:37+01:00 ci: Update ruff config - - - - - 7416caa3 by Philipp Hörist at 2022-12-17T14:03:37+01:00 chore: Update .gitignore - - - - - 38d8c685 by Philipp Hörist at 2022-12-17T14:03:37+01:00 fix: Add missing PyGObject dependency to setup.cfg - - - - - 91373ccc by Philipp Hörist at 2022-12-17T14:03:37+01:00 new: Add optional dependencies to setup.py - - - - - 714203b7 by Philipp Hörist at 2022-12-17T14:03:37+01:00 new: Add script for creating a development environment - Update README.md - - - - - 6918456e by Philipp Hörist at 2022-12-17T22:11:46+01:00 new: Add PyGObject-stubs as optional dependency - - - - - 84bbda53 by Philipp Hörist at 2022-12-17T23:35:59+01:00 cfix: Define codespell dependency correctly - - - - - c14daba2 by Philipp Hörist at 2022-12-17T23:41:59+01:00 new: Add more optional dependencies for development - - - - - 4574b392 by Philipp Hörist at 2022-12-17T23:45:52+01:00 change: Port to libsoup3 - - - - - b065d48f by Philipp Hörist at 2022-12-17T23:51:05+01:00 soup - - - - - 30 changed files: - .chglog/CHANGELOG.tpl.md - .chglog/config.yml - .ci/appveyor_build.py - .ci/deploy.py - .ci/link-gtk.py - + .ci/make_release.py - − .ci/pylint.sh - .gitignore - .gitlab-ci.yml - .gitlab/issue_templates/Release.md - ChangeLog - README.md - data/gajim.doap - data/org.gajim.Gajim.appdata.xml.in - debian/control - flatpak/org.gajim.Gajim.Devel.yaml - flatpak/org.gajim.Gajim.yaml - flatpak/update_flatpak_repo.sh - gajim/__init__.py - gajim/common/app.py - gajim/common/application.py - gajim/common/client.py - gajim/common/configpaths.py - gajim/common/const.py - + gajim/common/dbus/file_manager.py - gajim/common/dbus/remote_control.py - gajim/common/events.py - gajim/common/ged.py - gajim/common/helpers.py - gajim/common/i18n.py The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/27faaef78f01fb33ebc1d341b73f460… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/27faaef78f01fb33ebc1d341b73f460… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][soup3] fix: Create Temp File
by Philipp Hörist (＠lovetox) 17 Dec '22

17 Dec '22

Philipp Hörist pushed to branch soup3 at gajim / python-nbxmpp Commits: 5c75d08a by Philipp Hörist at 2022-12-13T16:07:25+01:00 fix: Create Temp File - - - - - 2 changed files: - nbxmpp/http.py - test/unit/test_http.py Changes: ===================================== nbxmpp/http.py ===================================== @@ -40,8 +40,6 @@ log = logging.getLogger('nbxmpp.http') HTTP_METHODS_T = Literal['GET', 'POST'] CHUNK_SIZE = 32768 DEFAULT_USER_AGENT = f'nbxmpp/{nbxmpp.__version__}' - - SIGNAL_ACTIONS = GObject.SignalFlags.RUN_LAST | GObject.SignalFlags.ACTION @@ -51,10 +49,17 @@ class HTTPLogAdapter(logging.LoggerAdapter): class HTTPSession: - def __init__(self, user_agent: str = DEFAULT_USER_AGENT) -> None: + def __init__(self, + user_agent: str = DEFAULT_USER_AGENT, + sniffer: bool = False + ) -> None: + self._session = Soup.Session() self._session.set_user_agent(user_agent) + if sniffer: + self._session.add_feature_by_type(Soup.ContentSniffer) + self._requests: list[HTTPRequest] = [] def get_soup_session(self) -> Soup.Session: @@ -189,7 +194,7 @@ class HTTPRequest(GObject.GObject): self._request_content_type = content_type self._request_content_length = len(data) - def set_response_body_path(self, path: Path) -> None: + def set_response_body_from_path(self, path: Path) -> None: self._response_body_file = Gio.File.new_for_path(str(path)) def connect(self, @@ -233,6 +238,7 @@ class HTTPRequest(GObject.GObject): uri_string: str, timeout: Optional[int] = None, callback: Optional[Callable[[HTTPRequest], Any]] = None, + user_data: Optional[Any] = None ) -> None: if callback is not None: ===================================== test/unit/test_http.py ===================================== @@ -1,4 +1,5 @@ from time import time +import tempfile import unittest from unittest.mock import call from unittest.mock import Mock @@ -37,7 +38,7 @@ class HTTP(unittest.TestCase): def tearDownClass(cls): pass - def test_in_memory_download_to_file(self): + def test_download_to_file(self): mainloop = GLib.MainLoop() @@ -46,8 +47,8 @@ class HTTP(unittest.TestCase): callback_mock = Mock() - request.set_response_body_path( - Path('/home/lovetox/Downloads/test123')) + temp_dir = tempfile.gettempdir() + request.set_response_body_from_path(Path(temp_dir) / 'file') request.connect('response-progress', callback_mock.progress) request.connect('starting-response-body', callback_mock.starting) request.connect('finished', callback_mock.finished) View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/5c75d08a2334a9b6dc179635… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/5c75d08a2334a9b6dc179635… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] new: Add more optional dependencies for development
by Philipp Hörist (＠lovetox) 17 Dec '22

17 Dec '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: c14daba2 by Philipp Hörist at 2022-12-17T23:41:59+01:00 new: Add more optional dependencies for development - - - - - 1 changed file: - setup.cfg Changes: ===================================== setup.cfg ===================================== @@ -30,6 +30,8 @@ dev = codespell[toml] nbxmpp @ git+https://dev.gajim.org/gajim/python-nbxmpp.git PyGObject-stubs @ git+https://github.com/pygobject/pygobject-stubs.git + python-gitlab + sentry-sdk [options.package_data] gajim = View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c14daba286500fc93e7dd8aa7ad54807… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c14daba286500fc93e7dd8aa7ad54807… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] cfix: Define codespell dependency correctly
by Philipp Hörist (＠lovetox) 17 Dec '22

17 Dec '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 84bbda53 by Philipp Hörist at 2022-12-17T23:35:59+01:00 cfix: Define codespell dependency correctly - - - - - 1 changed file: - setup.cfg Changes: ===================================== setup.cfg ===================================== @@ -27,7 +27,7 @@ install_requires = [options.extras_require] dev = ruff - codespell + codespell[toml] nbxmpp @ git+https://dev.gajim.org/gajim/python-nbxmpp.git PyGObject-stubs @ git+https://github.com/pygobject/pygobject-stubs.git View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/84bbda53560bac3c6ef452735d34bcc8… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/84bbda53560bac3c6ef452735d34bcc8… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] new: Add PyGObject-stubs as optional dependency
by Philipp Hörist (＠lovetox) 17 Dec '22

17 Dec '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 6918456e by Philipp Hörist at 2022-12-17T22:11:46+01:00 new: Add PyGObject-stubs as optional dependency - - - - - 1 changed file: - setup.cfg Changes: ===================================== setup.cfg ===================================== @@ -29,6 +29,7 @@ dev = ruff codespell nbxmpp @ git+https://dev.gajim.org/gajim/python-nbxmpp.git + PyGObject-stubs @ git+https://github.com/pygobject/pygobject-stubs.git [options.package_data] gajim = View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/6918456e1d05095abe0772d7e619466e… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/6918456e1d05095abe0772d7e619466e… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][message-replies] feat: Add support for XEP-0461: Message Replies
by Daniel Brötzmann (＠wurstsalat) 17 Dec '22

17 Dec '22

Daniel Brötzmann pushed to branch message-replies at gajim / gajim Commits: bacff021 by wurstsalat at 2022-12-17T20:47:13+01:00 feat: Add support for XEP-0461: Message Replies - - - - - 20 changed files: - data/gajim.doap - gajim/common/client.py - gajim/common/events.py - gajim/common/modules/message.py - gajim/common/storage/archive.py - gajim/common/storage/base.py - gajim/common/structs.py - gajim/common/util/text.py - gajim/data/gui/message_actions_box.ui - gajim/data/style/gajim.css - gajim/gtk/builder.pyi - gajim/gtk/chat_list_row.py - gajim/gtk/chat_stack.py - gajim/gtk/const.py - gajim/gtk/control.py - gajim/gtk/conversation/rows/message.py - gajim/gtk/conversation/view.py - gajim/gtk/menus.py - gajim/gtk/message_actions_box.py - + gajim/gtk/referred_message_widget.py Changes: ===================================== data/gajim.doap ===================================== @@ -693,5 +693,12 @@ <xmpp:version>0.1.0</xmpp:version> </xmpp:SupportedXep> </implements> + <implements> + <xmpp:SupportedXep> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0461.html"/> + <xmpp:status>complete</xmpp:status> + <xmpp:version>0.1.0</xmpp:version> + </xmpp:SupportedXep> + </implements> </Project> </rdf:RDF> ===================================== gajim/common/client.py ===================================== @@ -508,6 +508,7 @@ def _send_message(self, message: OutgoingMessage) -> None: label=message.label, correct_id=message.correct_id, message_id=message.message_id, + reply_data=message.reply_data, msg_log_id=log_line_id, play_sound=message.play_sound)) ===================================== gajim/common/events.py ===================================== @@ -30,6 +30,7 @@ from nbxmpp.structs import HTTPAuthData from nbxmpp.structs import ModerationData from nbxmpp.structs import LocationData +from nbxmpp.structs import ReplyData from nbxmpp.structs import RosterItem from nbxmpp.structs import TuneData from nbxmpp.const import Affiliation @@ -168,6 +169,7 @@ class MessageSent(ApplicationEvent): additional_data: AdditionalDataDict label: Optional[SecurityLabel] correct_id: Optional[str] + reply_data: Optional[ReplyData] play_sound: bool ===================================== gajim/common/modules/message.py ===================================== @@ -219,7 +219,8 @@ def _message_received(self, subject=properties.subject, additional_data=additional_data, stanza_id=stanza_id or message_id, - message_id=properties.id) + message_id=properties.id, + reply_data=properties.reply_data) event.msg_log_id = msg_log_id app.ged.raise_event(event) @@ -261,7 +262,8 @@ def _log_muc_message(self, event: GcMessageReceived) -> Optional[int]: contact_name=event.properties.muc_nickname, additional_data=event.additional_data, stanza_id=event.stanza_id, - message_id=event.properties.id) + message_id=event.properties.id, + reply_data=event.properties.reply_data) return msg_log_id return None @@ -315,6 +317,14 @@ def build_message_stanza(self, message: OutgoingMessage) -> nbxmpp.Message: stanza.setTag('replace', attrs={'id': message.correct_id}, namespace=Namespace.CORRECT) + if message.reply_data is not None: + assert message.reply_data.fallback_start is not None + assert message.reply_data.fallback_end is not None + stanza.setReply(str(message.jid), + message.reply_data.id, + message.reply_data.fallback_start, + message.reply_data.fallback_end) + # XEP-0359 message.message_id = generate_id() stanza.setID(message.message_id) @@ -403,5 +413,6 @@ def log_message(self, message: OutgoingMessage) -> Optional[int]: subject=message.subject, additional_data=message.additional_data, message_id=message.message_id, - stanza_id=message.message_id) + stanza_id=message.message_id, + reply_data=message.reply_data) return msg_log_id ===================================== gajim/common/storage/archive.py ===================================== @@ -39,9 +39,11 @@ from nbxmpp import JID from nbxmpp.structs import CommonError from nbxmpp.structs import MessageProperties +from nbxmpp.structs import ReplyData from gajim.common import app from gajim.common import configpaths +from gajim.common import types from gajim.common.helpers import AdditionalDataDict from gajim.common.const import MAX_MESSAGE_CORRECTION_DELAY from gajim.common.const import KindConstant @@ -113,6 +115,7 @@ class ConversationRow(NamedTuple): stanza_id: str error: CommonError marker: str + reply_data: ReplyData class LastConversationRow(NamedTuple): @@ -123,6 +126,15 @@ class LastConversationRow(NamedTuple): additional_data: AdditionalDataDict message_id: str stanza_id: str + reply_data: ReplyData + + +class ReferredMessageRow(NamedTuple): + log_line_id: int + contact_name: str + kind: int + time: float + message: str class SearchLogRow(NamedTuple): @@ -269,6 +281,13 @@ def _migrate(self) -> None: ] self._execute_multiple(statements) + if user_version < 8: + statements = [ + 'ALTER TABLE logs ADD COLUMN "reply_data" TEXT', + 'PRAGMA user_version=8' + ] + self._execute_multiple(statements) + @staticmethod def _like(search_str: str) -> str: return f'%{search_str}%' @@ -386,7 +405,8 @@ def get_conversation_before_after(self, SELECT contact_name, time, kind, show, message, subject, additional_data, log_line_id, message_id, stanza_id, error as "error [common_error]", - marker as "marker [marker]" + marker as "marker [marker]", + reply_data as "reply_data [reply_data]" FROM logs NATURAL JOIN jids WHERE jid IN ({jids}) AND account_id = {account_id} AND kind NOT IN ({kinds}) @@ -425,7 +445,7 @@ def get_last_conversation_line(self, sql = ''' SELECT contact_name, time, kind, message, stanza_id, message_id, - additional_data + additional_data, reply_data as "reply_data [reply_data]" FROM logs NATURAL JOIN jids WHERE jid IN ({jids}) AND account_id = {account_id} AND kind NOT IN ({kinds}) @@ -463,7 +483,8 @@ def get_conversation_around(self, SELECT contact_name, time, kind, show, message, subject, additional_data, log_line_id, message_id, stanza_id, error as "error [common_error]", - marker as "marker [marker]" + marker as "marker [marker]", + reply_data as "reply_data [reply_data]" FROM logs NATURAL JOIN jids WHERE jid IN ({jids}) AND account_id = {account_id} AND kind NOT IN ({kinds}) @@ -477,7 +498,8 @@ def get_conversation_around(self, SELECT contact_name, time, kind, show, message, subject, additional_data, log_line_id, message_id, stanza_id, error as "error [common_error]", - marker as "marker [marker]" + marker as "marker [marker]", + reply_data as "reply_data [reply_data]" FROM logs NATURAL JOIN jids WHERE jid IN ({jids}) AND account_id = {account_id} AND kind NOT IN ({kinds}) @@ -522,7 +544,8 @@ def get_conversation_between(self, SELECT contact_name, time, kind, show, message, subject, additional_data, log_line_id, message_id, stanza_id, error as "error [common_error]", - marker as "marker [marker]" + marker as "marker [marker]", + reply_data as "reply_data [reply_data]" FROM logs NATURAL JOIN jids WHERE jid IN ({jids}) AND account_id = {account_id} AND kind NOT IN ({kinds}) @@ -1051,6 +1074,30 @@ def try_message_correction(self, return True + @timeit + def get_referred_message(self, + contact: types.ChatContactT, + message_id: str + ) -> Optional[ReferredMessageRow]: + + jids = [contact.jid] + account_id = self.get_account_id(contact.account) + message_id_type = 'message_id' + if contact.is_groupchat: + message_id_type = 'stanza_id' + + sql = ''' + SELECT log_line_id, contact_name, kind, time, message + FROM logs NATURAL JOIN jids WHERE jid IN ({jids}) + AND account_id = {account_id} + AND {message_id_type} = ? + '''.format(jids=', '.join('?' * len(jids)), + account_id=account_id, + message_id_type=message_id_type) + return self._con.execute( + sql, + tuple(jids) + (message_id, )).fetchone() + @timeit def update_additional_data(self, account: str, ===================================== gajim/common/storage/base.py ===================================== @@ -36,6 +36,7 @@ from nbxmpp.structs import RosterItem from nbxmpp.structs import DiscoInfo from nbxmpp.structs import CommonError +from nbxmpp.structs import ReplyData from nbxmpp.const import Role from nbxmpp.const import Affiliation from nbxmpp.const import StatusCode @@ -71,6 +72,21 @@ def _adapt_common_error(common_error: CommonError) -> str: sqlite3.register_adapter(CommonError, _adapt_common_error) +def _convert_reply_data(reply_data: bytes) -> ReplyData: + data = json.loads(reply_data) + return ReplyData(id=data['id'], + fallback_start=data['fallback_start'], + fallback_end=data['fallback_end']) + + +def _adapt_reply_data(reply_data: ReplyData) -> str: + return json.dumps(reply_data._asdict()) + + +sqlite3.register_converter('reply_data', _convert_reply_data) +sqlite3.register_adapter(ReplyData, _adapt_reply_data) + + def _convert_marker(marker: bytes): return 'received' if int(marker) == 0 else 'displayed' ===================================== gajim/common/structs.py ===================================== @@ -34,6 +34,7 @@ from nbxmpp.protocol import JID from nbxmpp.structs import MucSubject from nbxmpp.structs import PresenceProperties +from nbxmpp.structs import ReplyData from gajim.common import types from gajim.common.const import MUCJoinedState @@ -102,6 +103,7 @@ def __init__(self, control: Optional[Any] = None, attention: Optional[bool] = None, correct_id: Optional[str] = None, + reply_data: Optional[ReplyData] = None, oob_url: Optional[str] = None, xhtml: Optional[str] = None, nodes: Optional[Any] = None, @@ -140,6 +142,7 @@ def __init__(self, self.control = control self.attention = attention self.correct_id = correct_id + self.reply_data = reply_data self.oob_url = oob_url ===================================== gajim/common/util/text.py ===================================== @@ -14,6 +14,8 @@ from __future__ import annotations +from typing import Optional + import re from gi.repository import GLib @@ -49,6 +51,26 @@ def jid_to_iri(jid: str) -> str: return 'xmpp:' + escape_iri_path(jid) +def remove_fallback_text(text: str, + start: Optional[int], + end: Optional[int] + ) -> str: + + if start is None: + start = 0 + + if end is None: + return text[start:] + + before = text[:start] + after = text[end:] + return before + after + + +def quote_text(text: str) -> str: + return '> ' + text.replace('\n', '\n> ') + '\n' + + def format_duration(ns: float, total_ns: float) -> str: seconds = ns / 1e9 minutes = seconds / 60 ===================================== gajim/data/gui/message_actions_box.ui ===================================== @@ -5,246 +5,264 @@ <object class="GtkBox" id="box"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="hexpand">True</property> - <property name="spacing">2</property> + <property name="orientation">vertical</property> + <property name="spacing">3</property> <child> - <object class="GtkButton" id="quick_invite_button"> + <object class="GtkBox" id="action_box"> <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">True</property> - <property name="tooltip-text" translatable="yes">Invite Contacts…</property> - <property name="action-name">win.invite</property> - <property name="relief">none</property> + <property name="can-focus">False</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="hexpand">True</property> + <property name="spacing">2</property> <child> - <object class="GtkImage"> + <object class="GtkButton" id="quick_invite_button"> <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="icon-name">list-add-symbolic</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="tooltip-text" translatable="yes">Invite Contacts…</property> + <property name="action-name">win.invite</property> + <property name="relief">none</property> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">list-add-symbolic</property> + </object> + </child> + <style> + <class name="message-actions-box-button"/> + <class name="flat"/> + </style> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack-type">end</property> + <property name="position">0</property> + </packing> </child> - <style> - <class name="message-actions-box-button"/> - <class name="flat"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="pack-type">end</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkMenuButton" id="settings_menu"> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">True</property> - <property name="relief">none</property> <child> - <object class="GtkImage"> + <object class="GtkMenuButton" id="settings_menu"> <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="icon-name">open-menu-symbolic</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="relief">none</property> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">open-menu-symbolic</property> + </object> + </child> + <style> + <class name="message-actions-box-button"/> + </style> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack-type">end</property> + <property name="position">0</property> + </packing> </child> - <style> - <class name="message-actions-box-button"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="pack-type">end</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="encryption_details_button"> - <property name="can-focus">True</property> - <property name="focus-on-click">False</property> - <property name="receives-default">True</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="no-show-all">True</property> - <property name="relief">none</property> - <signal name="clicked" handler="_on_encryption_details_clicked" swapped="no"/> <child> - <object class="GtkImage" id="encryption_details_image"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="icon_size">1</property> + <object class="GtkButton" id="encryption_details_button"> + <property name="can-focus">True</property> + <property name="focus-on-click">False</property> + <property name="receives-default">True</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="no-show-all">True</property> + <property name="relief">none</property> + <signal name="clicked" handler="_on_encryption_details_clicked" swapped="no"/> + <child> + <object class="GtkImage" id="encryption_details_image"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon_size">1</property> + </object> + </child> + <style> + <class name="message-actions-box-button"/> + </style> </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="pack-type">end</property> + <property name="position">1</property> + </packing> </child> - <style> - <class name="message-actions-box-button"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="pack-type">end</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkMenuButton" id="encryption_menu_button"> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">True</property> - <property name="relief">none</property> <child> - <object class="GtkImage" id="encryption_image"> + <object class="GtkMenuButton" id="encryption_menu_button"> <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="icon-name">channel-insecure-symbolic</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="relief">none</property> + <child> + <object class="GtkImage" id="encryption_image"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">channel-insecure-symbolic</property> + </object> + </child> + <style> + <class name="message-actions-box-button"/> + </style> </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> - <style> - <class name="message-actions-box-button"/> - </style> - </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> - <child> - <object class="GtkButton" id="sendfile_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="action-name">win.send-file</property> - <property name="action-target">['']</property> - <property name="relief">none</property> <child> - <object class="GtkImage"> + <object class="GtkButton" id="sendfile_button"> <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="icon-name">mail-attachment-symbolic</property> + <property name="can-focus">True</property> + <property name="focus-on-click">False</property> + <property name="receives-default">True</property> + <property name="action-name">win.send-file</property> + <property name="action-target">['']</property> + <property name="relief">none</property> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">mail-attachment-symbolic</property> + </object> + </child> + <style> + <class name="message-actions-box-button"/> + </style> </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="pack-type">end</property> + <property name="position">3</property> + </packing> </child> - <style> - <class name="message-actions-box-button"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="pack-type">end</property> - <property name="position">3</property> - </packing> - </child> - <child> - <object class="GtkMenuButton" id="emoticons_button"> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">True</property> - <property name="tooltip-text" translatable="yes">Show a list of emojis</property> - <property name="action-name">win.show-emoji-chooser</property> - <property name="relief">none</property> <child> - <object class="GtkImage"> + <object class="GtkMenuButton" id="emoticons_button"> <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="icon-name">face-smile-symbolic</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="tooltip-text" translatable="yes">Show a list of emojis</property> + <property name="action-name">win.show-emoji-chooser</property> + <property name="relief">none</property> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">face-smile-symbolic</property> + </object> + </child> + <style> + <class name="message-actions-box-button"/> + </style> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">5</property> + </packing> + </child> + <child> + <object class="GtkButton" id="send_message_button"> + <property name="can-focus">True</property> + <property name="focus-on-click">False</property> + <property name="receives-default">True</property> + <property name="no-show-all">True</property> + <property name="tooltip-text" translatable="yes">Send Message</property> + <property name="action-name">win.send-message</property> + <property name="relief">none</property> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">gajim-send-message-symbolic</property> + </object> + </child> + <style> + <class name="message-actions-box-button"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="pack-type">end</property> + <property name="position">6</property> + </packing> </child> - <style> - <class name="message-actions-box-button"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">5</property> - </packing> - </child> - <child> - <object class="GtkButton" id="send_message_button"> - <property name="can-focus">True</property> - <property name="focus-on-click">False</property> - <property name="receives-default">True</property> - <property name="no-show-all">True</property> - <property name="tooltip-text" translatable="yes">Send Message</property> - <property name="action-name">win.send-message</property> - <property name="relief">none</property> <child> - <object class="GtkImage"> + <object class="GtkMenuButton" id="formattings_button"> <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="icon-name">gajim-send-message-symbolic</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">Format your message</property> + <property name="relief">none</property> + <property name="direction">up</property> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">format-text-bold-symbolic</property> + <property name="icon_size">1</property> + </object> + </child> + <style> + <class name="message-actions-box-button"/> + </style> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">7</property> + </packing> </child> - <style> - <class name="message-actions-box-button"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="pack-type">end</property> - <property name="position">6</property> - </packing> - </child> - <child> - <object class="GtkMenuButton" id="formattings_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">Format your message</property> - <property name="relief">none</property> - <property name="direction">up</property> <child> - <object class="GtkImage"> + <object class="GtkScrolledWindow" id="input_scrolled"> <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="icon-name">format-text-bold-symbolic</property> - <property name="icon_size">1</property> + <property name="can-focus">True</property> + <property name="margin-start">3</property> + <property name="margin-end">3</property> + <property name="hexpand">True</property> + <property name="shadow-type">in</property> + <property name="overlay-scrolling">False</property> + <property name="max-content-height">100</property> + <property name="propagate-natural-height">True</property> + <child> + <placeholder/> + </child> + <style> + <class name="message-input-border"/> + <class name="scrolled-no-border"/> + <class name="no-scroll-indicator"/> + <class name="scrollbar-style"/> + <class name="one-line-scrollbar"/> + </style> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">8</property> + </packing> + </child> + <child> + <placeholder/> </child> - <style> - <class name="message-actions-box-button"/> - </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">7</property> + <property name="pack-type">end</property> + <property name="position">0</property> </packing> </child> <child> <placeholder/> </child> - <child> - <object class="GtkScrolledWindow" id="input_scrolled"> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="margin-start">3</property> - <property name="margin-end">3</property> - <property name="shadow-type">in</property> - <property name="overlay-scrolling">False</property> - <property name="max-content-height">100</property> - <property name="propagate-natural-height">True</property> - <child> - <placeholder/> - </child> - <style> - <class name="message-input-border"/> - <class name="scrolled-no-border"/> - <class name="no-scroll-indicator"/> - <class name="scrollbar-style"/> - <class name="one-line-scrollbar"/> - </style> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">9</property> - </packing> - </child> </object> </interface> ===================================== gajim/data/style/gajim.css ===================================== @@ -630,6 +630,12 @@ .code-widget-header button { padding: 0; } +/* ReferredMessageWidget */ +.referred-message { + border-left: 3px solid @borders; + padding: 3px 8px; +} + /* PreviewWidget */ .preview-box { border: 1px solid; ===================================== gajim/gtk/builder.pyi ===================================== @@ -572,6 +572,7 @@ class ManageSoundsBuilder(Builder): class MessageActionsBoxBuilder(Builder): box: Gtk.Box + action_box: Gtk.Box quick_invite_button: Gtk.Button settings_menu: Gtk.MenuButton encryption_details_button: Gtk.Button ===================================== gajim/gtk/chat_list_row.py ===================================== @@ -50,6 +50,7 @@ from gajim.common.modules.contacts import GroupchatContact from gajim.common.modules.contacts import GroupchatParticipant from gajim.common.storage.draft import DraftStorage +from gajim.common.util.text import remove_fallback_text from .menus import get_chat_list_row_menu from .builder import get_builder @@ -147,6 +148,12 @@ def _display_last_conversation_line(self) -> None: if line.message is not None: message_text = line.message + if line.reply_data is not None: + message_text = remove_fallback_text( + line.message, + line.reply_data.fallback_start, + line.reply_data.fallback_end) + if line.additional_data is not None: retracted_by = line.additional_data.get_value( 'retracted', 'by') ===================================== gajim/gtk/chat_stack.py ===================================== @@ -516,6 +516,7 @@ def _update_chat_actions(self, contact: BareContact) -> None: app.window.get_action('quote').set_enabled(online) app.window.get_action('mention').set_enabled(online) + app.window.get_action('reply').set_enabled(online) def _update_group_chat_actions(self, contact: GroupchatContact) -> None: joined = contact.is_joined @@ -540,6 +541,7 @@ def _update_group_chat_actions(self, contact: GroupchatContact) -> None: app.window.get_action('quote').set_enabled(joined) app.window.get_action('mention').set_enabled(joined) + app.window.get_action('reply').set_enabled(joined) app.window.get_action('retract-message').set_enabled(joined) def _update_participant_actions(self, @@ -750,6 +752,11 @@ def _on_send_message(self) -> None: if correct_id is None: return + reply_data = None + message_reply = self._message_action_box.get_reply_data() + if message_reply is not None: + reply_data, message = message_reply + chatstate = client.get_module('Chatstate').get_active_chatstate( contact) @@ -764,11 +771,14 @@ def _on_send_message(self) -> None: chatstate=chatstate, label=label, control=self._chat_control, - correct_id=correct_id) + correct_id=correct_id, + reply_data=reply_data) client.send_message(message_) self._message_action_box.msg_textview.clear() + if message_reply is not None: + self._message_action_box.disable_reply_mode() app.storage.drafts.set(contact, '') def get_last_message_id(self, contact: ChatContactT) -> Optional[str]: ===================================== gajim/gtk/const.py ===================================== @@ -196,6 +196,8 @@ def __str__(self): ('copy-message', 's', True), ('retract-message', 'a{sv}', False), ('quote', 's', False), + ('reply', 's', False), + ('jump-to-message', 'au', True), ('mention', 's', False), ('send-file-httpupload', 'as', False), ('send-file-jingle', 'as', False), ===================================== gajim/gtk/control.py ===================================== @@ -29,6 +29,7 @@ from nbxmpp import JID from nbxmpp.const import StatusCode from nbxmpp.structs import MucSubject +from nbxmpp.structs import ReplyData from nbxmpp.modules.security_labels import Displaymarking from gajim.common import app @@ -47,6 +48,7 @@ from gajim.common.modules.contacts import GroupchatContact from gajim.common.modules.httpupload import HTTPFileTransfer from gajim.common.storage.archive import ConversationRow +from gajim.common.util.text import remove_fallback_text from gajim.gui.conversation.message_selection import MessageSelection from gajim.gui.conversation.view import ConversationView @@ -99,6 +101,8 @@ def __init__(self) -> None: app.window.get_action('activate-message-selection').connect( 'activate', self._on_activate_message_selection) + app.window.get_action('jump-to-message').connect( + 'activate', self._on_jump_to_message) self.widget = cast(Gtk.Box, self._ui.get_object('control_box')) self.widget.show_all() @@ -289,7 +293,8 @@ def _on_message_sent(self, event: events.MessageSent) -> None: displaymarking=displaymarking, message_id=message_id, msg_log_id=event.msg_log_id, - additional_data=event.additional_data) + additional_data=event.additional_data, + reply_data=event.reply_data) def _on_message_received(self, event: events.MessageReceived) -> None: if not self._is_event_processable(event): @@ -312,7 +317,8 @@ def _on_message_received(self, event: events.MessageReceived) -> None: msg_log_id=event.msg_log_id, message_id=event.properties.id, stanza_id=event.stanza_id, - additional_data=event.additional_data) + additional_data=event.additional_data, + reply_data=event.properties.reply_data) def _on_mam_message_received(self, event: events.MamMessageReceived) -> None: @@ -331,7 +337,8 @@ def _on_mam_message_received(self, contact=event.properties.muc_nickname, message_id=event.properties.id, stanza_id=event.stanza_id, - additional_data=event.additional_data) + additional_data=event.additional_data, + reply_data=event.properties.reply_data) else: @@ -351,7 +358,8 @@ def _on_mam_message_received(self, tim=event.properties.mam.timestamp, message_id=event.properties.id, stanza_id=event.stanza_id, - additional_data=event.additional_data) + additional_data=event.additional_data, + reply_data=event.properties.reply_data) def _on_gc_message_received(self, event: events.GcMessageReceived) -> None: if not self._is_event_processable(event): @@ -371,7 +379,8 @@ def _on_gc_message_received(self, event: events.GcMessageReceived) -> None: message_id=event.properties.id, stanza_id=event.stanza_id, msg_log_id=event.msg_log_id, - additional_data=event.additional_data) + additional_data=event.additional_data, + reply_data=event.properties.reply_data) def _on_message_updated(self, event: events.MessageUpdated) -> None: if not self._is_event_processable(event): @@ -491,6 +500,14 @@ def _on_copy_selection(self, _widget: MessageSelection) -> None: def _on_cancel_selection(self, _widget: MessageSelection) -> None: self._scrolled_view.disable_row_selection() + def _on_jump_to_message(self, + _action: Gio.SimpleAction, + param: GLib.Variant + ) -> None: + + log_line_id, timestamp = param.unpack() + self.scroll_to_message(log_line_id, timestamp) + def _on_jump_to_end(self, _button: Gtk.Button) -> None: self.reset_view() @@ -545,12 +562,23 @@ def _add_message(self, msg_log_id: Optional[int] = None, message_id: Optional[str] = None, stanza_id: Optional[str] = None, - additional_data: Optional[AdditionalDataDict] = None + additional_data: Optional[AdditionalDataDict] = None, + reply_data: Optional[ReplyData] = None ) -> None: if additional_data is None: additional_data = AdditionalDataDict() + referred_message = None + if reply_data is not None: + referred_message = app.storage.archive.get_referred_message( + self._contact, reply_data.id) + if referred_message is not None: + text = remove_fallback_text( + text, + reply_data.fallback_start, + reply_data.fallback_end) + if self._allow_add_message(): self._scrolled_view.add_message( text, @@ -561,7 +589,8 @@ def _add_message(self, message_id=message_id, stanza_id=stanza_id, log_line_id=msg_log_id, - additional_data=additional_data) + additional_data=additional_data, + referred_message=referred_message) if not self._scrolled_view.get_autoscroll(): if kind == 'outgoing': @@ -745,6 +774,16 @@ def add_messages(self, messages: list[ConversationRow]): message_text = get_retraction_text( self.contact.account, retracted_by, reason) + referred_message = None + if msg.reply_data is not None: + referred_message = app.storage.archive.get_referred_message( + self._contact, msg.reply_data.id) + if referred_message is not None: + message_text = remove_fallback_text( + message_text, + msg.reply_data.fallback_start, + msg.reply_data.fallback_end) + self._scrolled_view.add_message( message_text, kind, @@ -755,7 +794,8 @@ def add_messages(self, messages: list[ConversationRow]): stanza_id=msg.stanza_id, log_line_id=msg.log_line_id, marker=msg.marker, - error=msg.error) + error=msg.error, + referred_message=referred_message) def add_message(self, text: str, @@ -765,7 +805,8 @@ def add_message(self, msg_log_id: Optional[int] = None, stanza_id: Optional[str] = None, message_id: Optional[str] = None, - additional_data: Optional[AdditionalDataDict] = None + additional_data: Optional[AdditionalDataDict] = None, + reply_data: Optional[ReplyData] = None ) -> None: if kind == 'incoming': @@ -781,7 +822,8 @@ def add_message(self, msg_log_id=msg_log_id, message_id=message_id, stanza_id=stanza_id, - additional_data=additional_data) + additional_data=additional_data, + reply_data=reply_data) def _on_user_nickname_changed(self, _contact: types.GroupchatContact, @@ -1194,6 +1236,7 @@ def add_muc_message(self, stanza_id: Optional[str] = None, msg_log_id: Optional[int] = None, additional_data: Optional[AdditionalDataDict] = None, + reply_data: Optional[ReplyData] = None ) -> None: assert isinstance(self._contact, GroupchatContact) @@ -1212,7 +1255,8 @@ def add_muc_message(self, message_id=message_id, stanza_id=stanza_id, msg_log_id=msg_log_id, - additional_data=additional_data) + additional_data=additional_data, + reply_data=reply_data) def _on_room_subject(self, contact: GroupchatContact, ===================================== gajim/gtk/conversation/rows/message.py ===================================== @@ -44,6 +44,7 @@ from gajim.common.i18n import is_rtl_text from gajim.common.modules.contacts import GroupchatContact from gajim.common.modules.contacts import GroupchatParticipant +from gajim.common.storage.archive import ReferredMessageRow from gajim.common.types import ChatContactT from .base import BaseRow @@ -55,7 +56,7 @@ from ..message_widget import MessageWidget from ...preview import PreviewWidget from ...util import format_fingerprint - +from ...referred_message_widget import ReferredMessageWidget MERGE_TIMEFRAME = timedelta(seconds=120) @@ -74,7 +75,9 @@ def __init__(self, display_marking: Optional[Displaymarking] = None, marker: Optional[str] = None, error: Union[CommonError, StanzaError, None] = None, - log_line_id: Optional[int] = None) -> None: + log_line_id: Optional[int] = None, + referred_message: Optional[ReferredMessageRow] = None + ) -> None: BaseRow.__init__(self, account) self.type = 'chat' @@ -104,6 +107,8 @@ def __init__(self, # Keep original text for message correction self._original_text: str = text + self._ref_message_widget = None + if self._is_groupchat: our_nick = get_group_chat_nick(self._account, self._contact.jid) from_us = name == our_nick @@ -125,6 +130,11 @@ def __init__(self, app.preview_manager.create_preview( text, self._message_widget, from_us, muc_context) else: + if referred_message is not None: + self._ref_message_widget = ReferredMessageWidget( + self._contact, + referred_message) + self._message_widget = MessageWidget(account) self._message_widget.add_with_styling(text, nickname=name) if self._is_groupchat: @@ -183,7 +193,13 @@ def __init__(self, self._avatar_box = AvatarBox(self._contact, name, avatar) self._bottom_box = Gtk.Box(spacing=6) - self._bottom_box.add(self._message_widget) + if self._ref_message_widget is not None: + box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=3) + box.add(self._ref_message_widget) + box.add(self._message_widget) + self._bottom_box.add(box) + else: + self._bottom_box.add(self._message_widget) if is_rtl_text(text): self._bottom_box.set_halign(Gtk.Align.END) ===================================== gajim/gtk/conversation/view.py ===================================== @@ -47,6 +47,7 @@ from gajim.common.modules.contacts import GroupchatContact from gajim.common.modules.httpupload import HTTPFileTransfer from gajim.common.storage.archive import ConversationRow +from gajim.common.storage.archive import ReferredMessageRow from gajim.common.modules.contacts import BareContact from gajim.common.types import ChatContactT @@ -503,7 +504,8 @@ def add_message(self, display_marking: Optional[Displaymarking] = None, additional_data: Optional[AdditionalDataDict] = None, marker: Optional[str] = None, - error: Union[CommonError, StanzaError, None] = None + error: Union[CommonError, StanzaError, None] = None, + referred_message: Optional[ReferredMessageRow] = None ) -> None: if not timestamp: @@ -522,7 +524,8 @@ def add_message(self, display_marking=display_marking, marker=marker, error=error, - log_line_id=log_line_id) + log_line_id=log_line_id, + referred_message=referred_message) if message_id is not None: self._message_id_row_map[message_id] = message_row ===================================== gajim/gtk/menus.py ===================================== @@ -678,9 +678,20 @@ def get_chat_row_menu(contact: types.ChatContactT, show_quote = not self_contact.role.is_visitor else: show_quote = False + if show_quote: - menu_items.append(( - p_('Message row action', 'Quote…'), 'win.quote', text)) + if isinstance(contact, GroupchatContact) and stanza_id is None: + menu_items.append(( + p_('Message row action', 'Quote…'), 'win.quote', text)) + else: + if isinstance(contact, GroupchatContact): + reply_to_id = stanza_id + else: + reply_to_id = message_id + menu_items.append(( + p_('Message row action', 'Reply…'), + 'win.reply', + GLib.Variant('s', reply_to_id))) show_correction = False if message_id is not None: ===================================== gajim/gtk/message_actions_box.py ===================================== @@ -30,6 +30,7 @@ from nbxmpp.const import Chatstate from nbxmpp.modules.security_labels import SecurityLabel +from nbxmpp.structs import ReplyData from gajim.common import app from gajim.common.commands import CommandFailed @@ -40,7 +41,7 @@ from gajim.common.modules.contacts import GroupchatContact from gajim.common.modules.contacts import GroupchatParticipant from gajim.common.types import ChatContactT -from gajim.gui.security_label_selector import SecurityLabelSelector +from gajim.common.util.text import quote_text from .builder import get_builder from .dialogs import ErrorDialog @@ -51,6 +52,8 @@ from .menus import get_self_contact_menu from .menus import get_singlechat_menu from .message_input import MessageInputTextView +from .referred_message_widget import ReferredMessageWidget +from .security_label_selector import SecurityLabelSelector log = logging.getLogger('gajim.gui.messageactionsbox') @@ -70,6 +73,10 @@ def __init__(self) -> None: # For undo self.space_pressed = False + # For message replies + self._reply_data = None + self._reply_quoted_text = None + self._ui.send_message_button.set_visible( app.settings.get('show_send_message_button')) app.settings.bind_signal('show_send_message_button', @@ -77,7 +84,8 @@ def __init__(self) -> None: 'set_visible') self._security_label_selector = SecurityLabelSelector() - self._ui.box.pack_start(self._security_label_selector, False, True, 0) + self._ui.action_box.pack_start( + self._security_label_selector, False, True, 0) self.msg_textview = MessageInputTextView() self.msg_textview.get_buffer().connect('changed', @@ -102,7 +110,7 @@ def __init__(self) -> None: self._connect_actions() app.plugin_manager.gui_extension_point( - 'message_actions_box', self, self._ui.box) + 'message_actions_box', self, self._ui.action_box) def get_current_contact(self) -> ChatContactT: assert self._contact is not None @@ -120,6 +128,7 @@ def _connect_actions(self) -> None: 'show-emoji-chooser', 'quote', 'mention', + 'reply', 'correct-message', ] @@ -159,6 +168,11 @@ def _on_action(self, assert param self.msg_textview.insert_as_quote(param.get_string()) + elif action_name == 'reply': + assert param + reply_to_id = param.get_string() + self._enable_reply_mode(reply_to_id) + elif action_name == 'mention': assert param self.msg_textview.mention_participant(param.get_string()) @@ -530,6 +544,48 @@ def _on_msg_textview_key_press_event(self, return False + def _enable_reply_mode(self, reply_to_id: str) -> None: + assert self._contact is not None + referred_message_row = app.storage.archive.get_referred_message( + self._contact, reply_to_id) + assert referred_message_row is not None + + self._reply_quoted_text = quote_text(referred_message_row.message) + self._reply_data = ReplyData( + id=reply_to_id, + fallback_start=0, + fallback_end=len(self._reply_quoted_text)) + + close_button = Gtk.Button.new_from_icon_name( + 'window-close-symbolic', Gtk.IconSize.BUTTON) + close_button.set_valign(Gtk.Align.CENTER) + close_button.set_tooltip_text(_('Cancel')) + close_button.connect('clicked', self.disable_reply_mode) + + ref_widget = ReferredMessageWidget(self._contact, referred_message_row) + + self._reply_box = Gtk.Box(spacing=14) + self._reply_box.add(close_button) + self._reply_box.add(ref_widget) + + self._ui.box.pack_start(self._reply_box, True, True, 0) + self._reply_box.show_all() + + self.msg_textview.grab_focus() + + def disable_reply_mode(self, *args: Any) -> None: + self._reply_data = None + self._reply_quoted_text = None + self._reply_box.destroy() + + def get_reply_data(self) -> Optional[tuple[ReplyData, str]]: + if self._reply_data is None or self._reply_quoted_text is None: + return None + + message = self.msg_textview.get_text() + fallback_text = f'{self._reply_quoted_text}{message}' + return self._reply_data, fallback_text + def _on_paste_clipboard(self, texview: MessageInputTextView ) -> None: ===================================== gajim/gtk/referred_message_widget.py ===================================== @@ -0,0 +1,93 @@ +# This file is part of Gajim. +# +# Gajim 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; version 3 only. +# +# Gajim 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 Gajim. If not, see <http://www.gnu.org/licenses/>. + +from __future__ import annotations + +from datetime import datetime + +from gi.repository import GLib +from gi.repository import Gtk +from gi.repository import Pango + +from gajim.common import app +from gajim.common import types +from gajim.common.const import KindConstant +from gajim.common.helpers import from_one_line +from gajim.common.i18n import _ +from gajim.common.storage.archive import ReferredMessageRow + + +class ReferredMessageWidget(Gtk.Box): + def __init__(self, + contact: types.ChatContactT, + referred_message: ReferredMessageRow + ) -> None: + + Gtk.Box.__init__(self, orientation=Gtk.Orientation.VERTICAL) + self.set_halign(Gtk.Align.START) + self.get_style_context().add_class('referred-message') + + self._referred_message = referred_message + + if contact.is_groupchat: + ref_str = _('%s wrote') % referred_message.contact_name + else: + if referred_message.kind == KindConstant.CHAT_MSG_RECV: + ref_str = _('%s wrote') % contact.name + else: + ref_str = _('You wrote') + + icon = Gtk.Image.new_from_icon_name( + 'mail-reply-sender-symbolic', + Gtk.IconSize.BUTTON) + icon.get_style_context().add_class('dim-label') + + name_label = Gtk.Label(label=ref_str) + name_label.get_style_context().add_class('dim-label') + + date_time = datetime.fromtimestamp(referred_message.time) + time_format = from_one_line(app.settings.get('date_time_format')) + timestamp_label = Gtk.Label( + label=f'({date_time.strftime(time_format)})') + timestamp_label.get_style_context().add_class('dim-label') + + jump_to_button = Gtk.LinkButton(label=_('[view message]')) + jump_to_button.connect('activate-link', self._on_jump_clicked) + + meta_box = Gtk.Box(spacing=6) + meta_box.get_style_context().add_class('small-label') + meta_box.add(icon) + meta_box.add(name_label) + meta_box.add(timestamp_label) + meta_box.add(jump_to_button) + + message_text = referred_message.message.split('\n')[0] + message_label = Gtk.Label(label=message_text) + message_label.set_halign(Gtk.Align.START) + message_label.set_max_width_chars(52) + message_label.set_ellipsize(Pango.EllipsizeMode.END) + message_label.get_style_context().add_class('dim-label') + + self.add(meta_box) + self.add(message_label) + + self.show_all() + + def _on_jump_clicked(self, _button: Gtk.LinkButton) -> bool: + app.window.activate_action( + 'jump-to-message', GLib.Variant( + 'au', + [self._referred_message.log_line_id, + self._referred_message.time])) + return True View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/bacff0210de55a89829716a860e5a40a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/bacff0210de55a89829716a860e5a40a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim] Pushed new branch reactions
by Daniel Brötzmann (＠wurstsalat) 17 Dec '22

17 Dec '22

Daniel Brötzmann pushed new branch reactions at gajim / gajim -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/tree/reactions You're receiving this email because of your account on dev.gajim.org.

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
15
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 December 2022