Daniel Brötzmann pushed to branch generate-ogp-previews at gajim / gajim
Commits:
f54d9c4b by cal0pteryx at 2026-02-15T11:57:37+01:00
other: Remove new setting; check for encryption
- - - - -
4 changed files:
- gajim/common/setting_values.py
- gajim/gtk/message_actions_box.py
- gajim/gtk/message_url_previews.py
- gajim/gtk/preference/app.py
Changes:
=====================================
gajim/common/setting_values.py
=====================================
@@ -60,7 +60,6 @@ class _ACCOUNTDEFAULT:
'preview_allow_all_images',
'preview_anonymous_muc',
'preview_verify_https',
- 'generate_url_previews',
'print_status_in_chats',
'remote_control',
'send_on_ctrl_enter',
@@ -218,7 +217,6 @@ class _ACCOUNTDEFAULT:
'preview_max_file_size': 10485760,
'preview_size': 400,
'preview_verify_https': True,
- 'generate_url_previews': True,
'providers_list_url':
'https://data.xmpp.net/providers/v2/providers-B.json',
'print_status_in_chats': False,
'quick_reaction_emojis': '👍,❤,🤣',
=====================================
gajim/gtk/message_actions_box.py
=====================================
@@ -322,7 +322,9 @@ def switch_contact(self, contact: ChatContactT) -> None:
self._ui.edit_box.set_visible(self._is_correcting)
self._restore_draft()
-
self._message_url_previews.generate_url_previews(self._message_input.get_text())
+ self._message_url_previews.generate_url_previews(
+ self._message_input.get_text(), contact
+ )
self._security_label_selector.switch_contact(contact)
@@ -723,7 +725,9 @@ def _on_buffer_changed(self, _message_input:
MessageInputTextView) -> None:
allow_send_message(has_text, self._contact)
)
-
self._message_url_previews.generate_url_previews(self._message_input.get_text())
+ self._message_url_previews.generate_url_previews(
+ self._message_input.get_text(), self._contact
+ )
encryption_name = self._contact.settings.get("encryption")
=====================================
gajim/gtk/message_url_previews.py
=====================================
@@ -16,6 +16,7 @@
from gajim.common.file_transfer_manager import FileTransfer
from gajim.common.open_graph_parser import OpenGraphParser
from gajim.common.regex import URL_REGEX
+from gajim.common.types import ChatContactT
from gajim.gtk.preview.open_graph import OpenGraphPreviewWidget
from gajim.gtk.util.misc import container_remove_all
@@ -41,10 +42,15 @@ def get_open_graph_data(self) -> dict[str, OpenGraphData] |
None:
return None
return self._previews
- def generate_url_previews(self, text: str) -> None:
- # TODOs:
- # - make only available if chat is not encrypted (meta data leaks)
- if not app.settings.get("generate_url_previews"):
+ def generate_url_previews(self, text: str, contact: ChatContactT) -> None:
+ if contact.is_groupchat:
+ if not app.settings.get("gc_enable_link_preview_default"):
+ return
+ else:
+ if not app.settings.get("enable_link_preview_default"):
+ return
+
+ if contact.settings.get("encryption"):
return
if self._preview_timeout_id is not None:
=====================================
gajim/gtk/preference/app.py
=====================================
@@ -196,13 +196,6 @@ def __init__(self) -> None:
"enable_emoji_shortcodes",
desc=_("Show suggestions for shortcodes, e.g. :+1:"),
),
- Setting(
- SettingKind.SWITCH,
- _("Generate Link Preview"),
- SettingType.CONFIG,
- "generate_url_previews",
- desc=_("Generate and send previews for links"),
- ),
]
for setting in settings:
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/commit/f54d9c4b4a598f098e1550ebcef5839ebb7e6c21
--
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/commit/f54d9c4b4a598f098e1550ebcef5839ebb7e6c21
You're receiving this email because of your account on dev.gajim.org.
_______________________________________________
Commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]
