Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] fix: GroupchatOutcasts: Make removing users work
by Philipp Hörist (＠lovetox) 21 Jun '22

21 Jun '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: d4e30292 by lovetox at 2022-06-21T19:03:33+02:00 fix: GroupchatOutcasts: Make removing users work - - - - - 1 changed file: - gajim/gtk/groupchat_outcasts.py Changes: ===================================== gajim/gtk/groupchat_outcasts.py ===================================== @@ -175,7 +175,7 @@ def _get_new_rows(self) -> set[OutcastRow]: reason=row[Column.REASON])) return rows - def _get_diff(self) -> list[OutcastRow]: + def _get_diff(self) -> tuple[list[OutcastRow], list[OutcastRow]]: new_rows = self._get_new_rows() @@ -192,17 +192,20 @@ def _get_diff(self) -> list[OutcastRow]: same_rows = {row for row in new_rows if row.jid in same} modified_rows = list(same_rows - self._current_rows) - return removed_rows + added_rows + modified_rows + return removed_rows, added_rows + modified_rows def _set_outcasts(self) -> None: - diff_rows = self._get_diff() + removed_rows, other_rows = self._get_diff() outcasts = {} - for row in diff_rows: + for row in other_rows: outcasts[row.jid] = {'affiliation': 'outcast'} if row.reason: outcasts[row.jid]['reason'] = row.reason + for row in removed_rows: + outcasts[row.jid] = {'affiliation': 'none'} + self._client.get_module('MUC').set_affiliation( self._contact.jid, outcasts, View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d4e3029221fbf7c8614cab5aa5a4ee3a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d4e3029221fbf7c8614cab5aa5a4ee3a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] imprv: Preferences: Add setting for emoji shortcodes
by Daniel Brötzmann (＠wurstsalat) 21 Jun '22

21 Jun '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: a5d1233d by wurstsalat at 2022-06-21T18:27:53+02:00 imprv: Preferences: Add setting for emoji shortcodes - - - - - 3 changed files: - gajim/common/setting_values.py - gajim/gtk/chat_action_processor.py - gajim/gtk/preferences.py Changes: ===================================== gajim/common/setting_values.py ===================================== @@ -107,6 +107,7 @@ class _ACCOUNT_DEFAULT: 'use_stun_server', 'use_urgency_hint', 'video_see_self', + 'enable_emoji_shortcodes', ] IntSettings = Literal[ @@ -294,6 +295,7 @@ class _ACCOUNT_DEFAULT: 'video_see_self': True, 'video_size': '', 'workspace_order': [], + 'enable_emoji_shortcodes': True, } BoolAccountSettings = Literal[ ===================================== gajim/gtk/chat_action_processor.py ===================================== @@ -178,6 +178,9 @@ def _update_commands_menu(self, self.popdown() def _check_for_emoji(self, start_iter: Gtk.TextIter) -> bool: + if not app.settings.get('enable_emoji_shortcodes'): + return False + assert self._current_iter is not None search = self._current_iter.backward_search( ':', ===================================== gajim/gtk/preferences.py ===================================== @@ -293,7 +293,11 @@ def __init__(self, *args: Any) -> None: SettingType.CONFIG, 'show_send_message_button', callback=self._on_show_send_message_button), - + Setting(SettingKind.SWITCH, + _('Emoji Shortcodes'), + SettingType.CONFIG, + 'enable_emoji_shortcodes', + desc=_('Show suggestions for shortcodes, e.g. :+1:')), Setting(SettingKind.SWITCH, _('Show Status Changes'), SettingType.CONFIG, View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a5d1233d41a671f5ece69a5e52768f95… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a5d1233d41a671f5ece69a5e52768f95… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: Chat: Display corrections for /me messages correctly
by Daniel Brötzmann (＠wurstsalat) 20 Jun '22

20 Jun '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 11ff1e70 by wurstsalat at 2022-06-21T00:10:07+02:00 fix: Chat: Display corrections for /me messages correctly Fixes #10933 - - - - - 9 changed files: - gajim/common/events.py - gajim/common/modules/mam.py - gajim/common/modules/message.py - gajim/gtk/chat_list.py - gajim/gtk/controls/base.py - gajim/gtk/controls/chat.py - gajim/gtk/conversation/message_widget.py - gajim/gtk/conversation/rows/message.py - gajim/gtk/conversation/view.py Changes: ===================================== gajim/common/events.py ===================================== @@ -349,6 +349,7 @@ class MessageUpdated(ApplicationEvent): account: str jid: JID msgtxt: str + nickname: Optional[str] properties: Any correct_id: str ===================================== gajim/common/modules/mam.py ===================================== @@ -313,9 +313,11 @@ def _mam_message_received(self, correct_id = parse_correction(properties) if correct_id is not None: + nickname = properties.muc_nickname or properties.nickname app.ged.raise_event(MessageUpdated(account=self._account, jid=jid, msgtxt=properties.body, + nickname=nickname, properties=properties, correct_id=correct_id)) app.storage.archive.store_message_correction( ===================================== gajim/common/modules/message.py ===================================== @@ -192,9 +192,11 @@ def _message_received(self, correct_id = parse_correction(properties) if correct_id is not None: + nickname = properties.muc_nickname or properties.nickname event = MessageUpdated(account=self._account, jid=event_attr['jid'], msgtxt=msgtxt, + nickname=nickname, properties=properties, correct_id=correct_id) ===================================== gajim/gtk/chat_list.py ===================================== @@ -433,7 +433,7 @@ def _on_message_updated(self, event: events.MessageUpdated) -> None: return if event.correct_id == row.message_id: - row.set_message_text(event.msgtxt) + row.set_message_text(event.msgtxt, event.nickname) def _on_message_moderated(self, event: events.MessageModerated) -> None: row = self._chats.get((event.account, event.jid)) ===================================== gajim/gtk/controls/base.py ===================================== @@ -327,7 +327,8 @@ def process_event(self, event: events.ApplicationEvent) -> None: getattr(self, method_name)(event) def _on_message_updated(self, event: events.MessageUpdated) -> None: - self.conversation_view.correct_message(event.correct_id, event.msgtxt) + self.conversation_view.correct_message( + event.correct_id, event.msgtxt, event.nickname) def _on_message_moderated(self, event: events.MessageModerated) -> None: text = get_retraction_text( ===================================== gajim/gtk/controls/chat.py ===================================== @@ -415,7 +415,7 @@ def _on_message_sent(self, event: events.MessageSent) -> None: if event.correct_id: self.conversation_view.correct_message( - event.correct_id, event.message) + event.correct_id, event.message, self.get_our_nick()) return self.add_message(event.message, ===================================== gajim/gtk/conversation/message_widget.py ===================================== @@ -60,8 +60,10 @@ def add_with_styling(self, self.add_content(result) def _add_action_phrase(self, text: str, nickname: str): + self.clear() widget = PlainWidget(self._account, self._selectable) widget.add_action_phrase(text, nickname) + widget.show_all() self.add(widget) def add_content(self, content: ContentT) -> None: ===================================== gajim/gtk/conversation/rows/message.py ===================================== @@ -417,9 +417,9 @@ def set_retracted(self, text: str) -> None: self._message_widget.add_with_styling(text) self.get_style_context().add_class('retracted-message') - def set_correction(self, text: str) -> None: + def set_correction(self, text: str, nickname: Optional[str]) -> None: if not isinstance(self._message_widget, PreviewWidget): - self._message_widget.add_with_styling(text) + self._message_widget.add_with_styling(text, nickname) self._has_receipt = False self._message_icons.set_receipt_icon_visible(False) ===================================== gajim/gtk/conversation/view.py ===================================== @@ -487,10 +487,14 @@ def scroll_to_end(self, force: bool = False) -> None: if self.autoscroll or force: GLib.idle_add(self.emit, 'scroll-to-end') - def correct_message(self, correct_id: str, text: str) -> None: + def correct_message(self, + correct_id: str, + text: str, + nickname: Optional[str] + ) -> None: message_row = self._get_row_by_message_id(correct_id) if message_row is not None: - message_row.set_correction(text) + message_row.set_correction(text, nickname) message_row.set_merged(False) def show_message_retraction(self, stanza_id: str, text: str) -> None: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/11ff1e707f34e5c7a0f892569495c294… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/11ff1e707f34e5c7a0f892569495c294… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: Styling: Process URIs when using /me command
by Philipp Hörist (＠lovetox) 20 Jun '22

20 Jun '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 5462da5a by lovetox at 2022-06-20T23:08:05+02:00 fix: Styling: Process URIs when using /me command Fixes #10988 - - - - - 2 changed files: - gajim/common/styling.py - gajim/gtk/conversation/plain_widget.py Changes: ===================================== gajim/common/styling.py ===================================== @@ -219,6 +219,21 @@ def process(text: Union[str, bytes], level: int = 0) -> ParsingResult: return ParsingResult(text, blocks) +def process_uris(text: Union[str, bytes]) -> list[BaseUri]: + if isinstance(text, bytes): + text = text.decode() + + uris: list[BaseUri] = [] + offset = 0 + offset_bytes = 0 + for line in text.splitlines(keepends=True): + uris += _parse_uris(line, offset, offset_bytes) + offset += len(line) + offset_bytes += len(line.encode()) + + return uris + + def _parse_blocks(text: str, level: int) -> list[Block]: blocks: list[Block] = [] text_len = len(text) ===================================== gajim/gtk/conversation/plain_widget.py ===================================== @@ -31,7 +31,9 @@ from gajim.common.helpers import open_uri from gajim.common.helpers import parse_uri from gajim.common.structs import URI +from gajim.common.styling import BaseUri from gajim.common.styling import PlainBlock +from gajim.common.styling import process_uris from ..menus import get_conv_action_context_menu from ..menus import get_conv_uri_context_menu @@ -70,9 +72,7 @@ def add_content(self, block: PlainBlock) -> None: self._text_widget.print_text_with_styling(block) def add_action_phrase(self, text: str, nickname: str) -> None: - text = text.replace('/me', f'* {nickname}', 1) - text = GLib.markup_escape_text(text) - self._text_widget.add_action_phrase(text) + self._text_widget.add_action_phrase(text, nickname) class MessageLabel(Gtk.Label): @@ -106,16 +106,19 @@ def _on_populate_popup(self, label: Gtk.Label, menu: Gtk.Menu) -> None: menu.prepend(action_menu_item) menu.show_all() - def print_text_with_styling(self, block: PlainBlock) -> None: - text = '' - after = GLib.markup_escape_text(block.text.strip()) - for uri in block.uris: + def _build_link_markup(self, text: str, uris: list[BaseUri]) -> str: + markup_text = '' + after = GLib.markup_escape_text(text.strip()) + for uri in uris: uri_escaped = GLib.markup_escape_text(uri.text) before, _, after = after.partition(uri_escaped) - text += before - text += uri.get_markup_string() - text += after + markup_text += before + markup_text += uri.get_markup_string() + markup_text += after + return markup_text + def print_text_with_styling(self, block: PlainBlock) -> None: + text = self._build_link_markup(block.text, block.uris) self.set_markup(text) if len(self.get_text()) > 10000: @@ -124,7 +127,10 @@ def print_text_with_styling(self, block: PlainBlock) -> None: self.set_attributes(make_pango_attributes(block)) - def add_action_phrase(self, text: str) -> None: + def add_action_phrase(self, text: str, nickname: str) -> None: + text = text.replace('/me', f'* {nickname}', 1) + uris = process_uris(text) + text = self._build_link_markup(text, uris) self.set_markup(f'<i>{text}</i>') def _on_activate_link(self, _label: Gtk.Label, uri: str) -> int: @@ -274,10 +280,18 @@ def replace_emoji(self, buffer_.delete_mark(start_mark) buffer_.delete_mark(end_mark) - def add_action_phrase(self, text: str) -> None: + def add_action_phrase(self, text: str, nickname: str) -> None: + text = text.replace('/me', f'* {nickname}', 1) + buffer_ = self.get_buffer() buffer_.insert(buffer_.get_start_iter(), text.strip()) + uris = process_uris(text) + for uri in uris: + start_iter = buffer_.get_iter_at_offset(uri.start) + end_iter = buffer_.get_iter_at_offset(uri.end) + buffer_.apply_tag_by_name(uri.name, start_iter, end_iter) + start_iter = buffer_.get_start_iter() end_iter = buffer_.get_end_iter() buffer_.apply_tag_by_name('emphasis', start_iter, end_iter) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/5462da5a803fdc87932aaaa28065ebbf… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/5462da5a803fdc87932aaaa28065ebbf… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: Preview: Align link button correctly
by Daniel Brötzmann (＠wurstsalat) 20 Jun '22

20 Jun '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 78c6711a by wurstsalat at 2022-06-20T22:51:09+02:00 fix: Preview: Align link button correctly Fixes #10997 - - - - - 1 changed file: - gajim/data/gui/preview.ui Changes: ===================================== gajim/data/gui/preview.ui ===================================== @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?>  <interface> - <requires lib="gtk+" version="3.20"/> + <requires lib="gtk+" version="3.24"/> <object class="GtkBox" id="preview_box"> <property name="visible">True</property> <property name="can-focus">False</property> @@ -158,8 +158,9 @@ <child> <object class="GtkLinkButton" id="link_button"> <property name="can-focus">True</property> - <property name="receives-default">True</property> + <property name="receives-default">False</property> <property name="no-show-all">True</property> + <property name="halign">start</property> <property name="relief">none</property> </object> <packing> View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/78c6711a2d50c91dc4717242e1333a48… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/78c6711a2d50c91dc4717242e1333a48… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: MUC: Don’t fail on presence from unknown occupants
by Philipp Hörist (＠lovetox) 20 Jun '22

20 Jun '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: db954b6d by lovetox at 2022-06-20T21:29:45+02:00 fix: MUC: Don’t fail on presence from unknown occupants Fixes #10981 - - - - - 1 changed file: - gajim/common/modules/muc.py Changes: ===================================== gajim/common/modules/muc.py ===================================== @@ -610,7 +610,15 @@ def _on_muc_user_presence(self, # unavailable presence, because we left the MUC return - presence = self._process_user_presence(properties) + try: + presence = self._process_user_presence(properties) + except KeyError: + # Sometimes it seems to happen that we get unavailable presence + # from occupants we don’t know + log.warning('Unexpected presence received') + log.warning(stanza) + return + occupant.update_presence(presence, properties) def _process_user_presence(self, View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/db954b6d86166b5ed9a366293083739a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/db954b6d86166b5ed9a366293083739a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: SystemStyleListener: Fix handling of color scheme states
by Philipp Hörist (＠lovetox) 20 Jun '22

20 Jun '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 32f2bcaa by André Apitzsch at 2022-06-20T19:51:03+02:00 fix: SystemStyleListener: Fix handling of color scheme states Supported color scheme states/values are 0: No preference 1: Prefer dark appearance 2: Prefer light appearance https://flatpak.github.io/xdg-desktop-portal/#gdbus-org.freedesktop.portal.… Fixes #10996. - - - - - 1 changed file: - gajim/common/dbus/system_style.py Changes: ===================================== gajim/common/dbus/system_style.py ===================================== @@ -16,7 +16,6 @@ from typing import Any from typing import Callable -from typing import cast from typing import Optional import sys @@ -65,7 +64,7 @@ def read_color_scheme(self) -> None: Gio.DBusCallFlags.NO_AUTO_START, -1, None) - (self._prefer_dark,) = cast(tuple[bool], result) + self._prefer_dark = result[0] == 1 except GLib.Error as error: log.error('Couldn’t read the color-scheme setting: %s', error.message) @@ -84,7 +83,7 @@ def _signal_setting_changed(self, namespace, name, value = parameters if (namespace == 'org.freedesktop.appearance' and name == 'color-scheme'): - self._prefer_dark = (value == 1) + self._prefer_dark = value == 1 self._callback() app.ged.raise_event(StyleChanged()) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/32f2bcaa13e8d404444e75e2dd890f78… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/32f2bcaa13e8d404444e75e2dd890f78… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ci: Flathub: Enable deploy
by Philipp Hörist (＠lovetox) 20 Jun '22

20 Jun '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: e90c5902 by lovetox at 2022-06-20T19:40:32+02:00 ci: Flathub: Enable deploy - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -129,7 +129,7 @@ deploy-flatpak: - if: '$CI_COMMIT_TAG' before_script: - eval $(ssh-agent -s) - # - echo "${FLATHUB_DEPLOY_KEY}" | tr -d '\r' | ssh-add - > /dev/null + - echo "${FLATHUB_DEPLOY_KEY}" | tr -d '\r' | ssh-add - > /dev/null - mkdir -p ~/.ssh - chmod 700 ~/.ssh - ssh-keyscan github.com >> ~/.ssh/known_hosts @@ -139,10 +139,11 @@ deploy-flatpak: - git clone https://github.com/flathub/org.gajim.Gajim.git - cd org.gajim.Gajim - mv ../flatpak/org.gajim.Gajim.yaml org.gajim.Gajim.yaml + - mv ../flatpak/app-overrides.json app-overrides.json - git diff - - git add org.gajim.Gajim.yaml + - git add --all - git commit -m "$CI_COMMIT_TAG" - # - git push + - git push publish-release: image: git-deploy:latest View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e90c5902dc067701b307624338d62cf9… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e90c5902dc067701b307624338d62cf9… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] imprv: Disable plugin updates by Gajim on flatpak
by Philipp Hörist (＠lovetox) 20 Jun '22

20 Jun '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 0fd5aa54 by André Apitzsch at 2022-06-20T18:17:18+02:00 imprv: Disable plugin updates by Gajim on flatpak There is no way for Gajim to update the plugins. Let flatpak handle this. - - - - - 4 changed files: - + flatpak/app-overrides.json - flatpak/org.gajim.Gajim.Devel.yaml - flatpak/org.gajim.Gajim.yaml - gajim/common/settings.py Changes: ===================================== flatpak/app-overrides.json ===================================== @@ -0,0 +1,5 @@ +{ + "plugins_update_check": false, + "plugins_auto_update": false, + "plugins_repository_enabled": false +} ===================================== flatpak/org.gajim.Gajim.Devel.yaml ===================================== @@ -317,11 +317,14 @@ modules: build-commands: - pip3 install . - touch /app/share/run-as-flatpak + - cp -t ${FLATPAK_DEST} app-overrides.json - echo -e '#!/bin/sh\ngajim --gapplication-app-id=org.gajim.Gajim.Devel "$@"' > /app/bin/gajim-devel - chmod 755 /app/bin/gajim-devel sources: - type: git url: https://dev.gajim.org/gajim/gajim.git + - type: file + path: app-overrides.json - type: shell commands: - sed -i "s+<id>org.gajim.Gajim</id>+<id>org.gajim.Gajim.Devel</id>+" data/org.gajim.Gajim.appdata.xml.in ===================================== flatpak/org.gajim.Gajim.yaml ===================================== @@ -311,9 +311,12 @@ modules: build-commands: - pip3 install . - touch /app/share/run-as-flatpak + - cp -t ${FLATPAK_DEST} app-overrides.json sources: - type: git url: https://dev.gajim.org/gajim/gajim.git tag: 1.4.4 + - type: file + path: app-overrides.json post-install: - install -d /app/plugins ===================================== gajim/common/settings.py ===================================== @@ -106,7 +106,10 @@ _CallbackDict = dict[tuple[str, Optional[str], Optional[JID]], list[weakref.WeakMethod[_SignalCallable]]] -OVERRIDES_PATH = Path('/etc/gajim/app-overrides.json') +if app.is_flatpak(): + OVERRIDES_PATH = Path('/app/app-overrides.json') +else: + OVERRIDES_PATH = Path('/etc/gajim/app-overrides.json') class Settings: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/0fd5aa540366a1fc289c5e77e527c5b9… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/0fd5aa540366a1fc289c5e77e527c5b9… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 4 commits: fix: Styling: Parse text correctly which contains uris and addresses
by Philipp Hörist (＠lovetox) 19 Jun '22

19 Jun '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: c8f9bbdb by lovetox at 2022-06-19T23:51:31+02:00 fix: Styling: Parse text correctly which contains uris and addresses Use one combined regex for uris and addresses so we get no overlaps Fixes #10974 - - - - - be62995e by lovetox at 2022-06-20T00:20:29+02:00 fix: Styling: Improve uri regex Add more url delimiters - - - - - 03033dfa by lovetox at 2022-06-20T00:21:05+02:00 fix: Styling: Improve address regex Allow "-" in domain part - - - - - 6df045ce by lovetox at 2022-06-20T00:21:08+02:00 chore: Styling: Add more tests - - - - - 2 changed files: - gajim/common/styling.py - test/no_gui/test_styling.py Changes: ===================================== gajim/common/styling.py ===================================== @@ -43,11 +43,13 @@ BLOCK_NESTED_RX = re.compile(PRE_NESTED_RX + '|' + QUOTE_RX, re.S | re.M) UNQUOTE_RX = re.compile(r'^> |^>', re.M) -URI_RX = r'((?P<protocol>[\w-]+://?|www[.])[\S()<>]+?(?=[,]?(\s|\Z)+))' -URI_RX = re.compile(URI_RX) +URI_RX = r'(?P<uri>([\w-]+://|www[.])[\S()<>]+?(?=[,>]?(\s|\Z)+))' +ADDRESS_RX = r'(?P<address>\b((xmpp|mailto):)?[\w-]*@([\w-]*?\.)+[\w]+([\?].*?(?=([\s\),]|$)))?)' # noqa: E501 +URI_ADDRESS_RX = URI_RX + '|' + ADDRESS_RX -ADDRESS_RX = r'(\b(?P<protocol>(xmpp|mailto):)?[\w-]*@(\w*?\.)+[\w]+([\?].*?(?=([\s\),]|$)))?)' # noqa: E501 +URI_RX = re.compile(URI_RX) ADDRESS_RX = re.compile(ADDRESS_RX) +URI_ADDRESS_RX = re.compile(URI_ADDRESS_RX) EMOJI_RX = emoji_data.get_regex() EMOJI_RX = re.compile(EMOJI_RX) @@ -319,12 +321,8 @@ def make(match: Match[str], is_address: bool) -> BaseUri: offset_bytes, is_address) - for match in URI_RX.finditer(line): - uri = make(match, False) - uris.append(uri) - - for match in ADDRESS_RX.finditer(line): - uri = make(match, True) + for match in URI_ADDRESS_RX.finditer(line): + uri = make(match, bool(match.group('address'))) uris.append(uri) return uris ===================================== test/no_gui/test_styling.py ===================================== @@ -325,6 +325,8 @@ EMAILS = [ 'asd(a)asd.at', 'asd(a)asd.asd.at', + 'asd(a)asd.asd-asd.at', + 'asd-asd(a)asd.asdasd.at', 'mailto:foo@bar.com.uk', ] @@ -339,6 +341,7 @@ URL_WITH_TEXT = [ ('see this http://userid@example.com/ link', 'http://userid@example.com/'), ('see this http://userid@example.com/, and ..', 'http://userid@example.com/'), + ('<http://userid@example.com/>', 'http://userid@example.com/'), ] XMPP_URIS = [ @@ -392,6 +395,5 @@ def test_xmpp_uris(self): self.assertTrue(text[start:end] == result) - if __name__ == "__main__": unittest.main() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/9914c246090155bf1f8daba85424b3c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/9914c246090155bf1f8daba85424b3c… You're receiving this email because of your account on dev.gajim.org.

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits