Commits June 2021

commits@gajim.org

1 participants
17 discussions

[Git][gajim/gajim][master] HTTPUpload: Raise FileError if path is not accessible
by Daniel Brötzmann (＠wurstsalat) 30 Jun '21

30 Jun '21

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 1f2131e8 by wurstsalat at 2021-06-30T16:06:03+02:00 HTTPUpload: Raise FileError if path is not accessible Fixes #10560 - - - - - 1 changed file: - gajim/common/modules/httpupload.py Changes: ===================================== gajim/common/modules/httpupload.py ===================================== @@ -88,7 +88,7 @@ def pass_disco(self, info): def make_transfer(self, path, encryption, contact, groupchat=False): if not path or not os.path.exists(path): - return None + raise FileError(_('Could not access file')) invalid_file = False stat = os.stat(path) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/1f2131e8d85bc63580e4b2a146683d02… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/1f2131e8d85bc63580e4b2a146683d02… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Servers: Remove blabber.im
by Daniel Brötzmann (＠wurstsalat) 26 Jun '21

26 Jun '21

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: c4d4b013 by wurstsalat at 2021-06-26T17:14:18+02:00 Servers: Remove blabber.im Service is gone - - - - - 1 changed file: - gajim/data/other/servers.json Changes: ===================================== gajim/data/other/servers.json ===================================== @@ -1,6 +1,5 @@ [ "0nl1ne.at", - "blabber.im", "creep.im", "deshalbfrei.org", "draugr.de", View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c4d4b0134202b9fe3b3c11a28fa1be25… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c4d4b0134202b9fe3b3c11a28fa1be25… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Preview: Mute logging for netloc discovery
by Daniel Brötzmann (＠wurstsalat) 12 Jun '21

12 Jun '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 49655930 by wurstsalat at 2021-06-12T11:30:02+02:00 Preview: Mute logging for netloc discovery - - - - - 1 changed file: - gajim/common/preview.py Changes: ===================================== gajim/common/preview.py ===================================== @@ -167,7 +167,6 @@ def _accept_uri(urlparts, uri, additional_data): return True if not urlparts.netloc: - log.info('No netloc found in URL: %s', uri) return False # aesgcm View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/49655930ff2aeaca5e78d0938bd86a0c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/49655930ff2aeaca5e78d0938bd86a0c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix spell checking
by Daniel Brötzmann (＠wurstsalat) 10 Jun '21

10 Jun '21

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: b395ca61 by André Apitzsch at 2021-06-10T19:59:55+02:00 Fix spell checking Disable spell checking only if there is no text, so it doesn't crash on correction. - - - - - 1 changed file: - gajim/gtk/message_input.py Changes: ===================================== gajim/gtk/message_input.py ===================================== @@ -114,9 +114,10 @@ def _on_focus_in(self, _widget, _event): return False def _on_focus_out(self, _widget, _event): - self.toggle_speller(False) scrolled = self.get_parent() scrolled.get_style_context().remove_class('message-input-focus') + if not self.has_text(): + self.toggle_speller(False) return False def insert_text(self, text): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b395ca61083f3dc6e02237c86cc3187b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b395ca61083f3dc6e02237c86cc3187b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Preview: Consider public/private MUCs
by Daniel Brötzmann (＠wurstsalat) 08 Jun '21

08 Jun '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: cc8d56cf by wurstsalat at 2021-06-08T19:38:03+02:00 Preview: Consider public/private MUCs - - - - - 3 changed files: - gajim/common/preview.py - gajim/gtk/conversation/rows/message.py - gajim/gtk/preferences.py Changes: ===================================== gajim/common/preview.py ===================================== @@ -212,7 +212,7 @@ def get_previewable(self, text, additional_data): return True - def create_preview(self, uri, widget): + def create_preview(self, uri, widget, context): if uri.startswith('geo:'): preview = Preview(uri, None, None, None, 96, widget) preview.update_widget() @@ -221,6 +221,12 @@ def create_preview(self, uri, widget): preview = self._process_web_uri(uri, widget) if not preview.orig_exists(): + if context is not None: + allow_in_public = app.settings.get('preview_anonymous_muc') + if context == 'public' and not allow_in_public: + preview.update_widget() + return + self.download_content(preview) elif not preview.thumb_exists(): ===================================== gajim/gtk/conversation/rows/message.py ===================================== @@ -22,6 +22,7 @@ from gajim.common import app from gajim.common.const import AvatarSize from gajim.common.const import TRUST_SYMBOL_DATA +from gajim.common.helpers import get_muc_context from gajim.common.helpers import reduce_chars_newlines from gajim.common.helpers import to_user_string from gajim.common.styling import process @@ -75,9 +76,12 @@ def __init__(self, is_previewable = app.interface.preview_manager.get_previewable( text, additional_data) if is_previewable: + context = None + if self._is_groupchat: + context = get_muc_context(self._contact.jid) self._message_widget = PreviewWidget(account) app.interface.preview_manager.create_preview( - text, self._message_widget) + text, self._message_widget, context) else: result = process(text) self._message_widget = MessageWidget(account) ===================================== gajim/gtk/preferences.py ===================================== @@ -504,6 +504,13 @@ def __init__(self, *args): desc=_('Maximum file size for preview generation'), props={'entries': sizes}), + Setting(SettingKind.SWITCH, + _('Preview in Public Group Chats'), + SettingType.CONFIG, + 'preview_anonymous_muc', + desc=_('Generate preview automatically in public ' + 'group chats (may disclose your data)')), + Setting(SettingKind.SWITCH, _('Preview all Image URLs'), SettingType.CONFIG, View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/cc8d56cf32e32da15623f9289ce734a2… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/cc8d56cf32e32da15623f9289ce734a2… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Contacts: Add get_disco()
by Philipp Hörist (＠lovetox) 08 Jun '21

08 Jun '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: a9d92037 by lovetox at 2021-06-08T18:16:13+02:00 Contacts: Add get_disco() - - - - - 1 changed file: - gajim/common/modules/contacts.py Changes: ===================================== gajim/common/modules/contacts.py ===================================== @@ -438,6 +438,9 @@ def get_user_nicknames(self): client = app.get_client(self._account) return client.get_module('MUC').get_joined_users(self._jid) + def get_disco(self, max_age=0): + return app.storage.cache.get_last_disco_info(self.jid, max_age=max_age) + class GroupchatParticipant(CommonContact): def __init__(self, logger, jid, account): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a9d920374220bbb93a4163d2291647cd… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a9d920374220bbb93a4163d2291647cd… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix spell checking
by Daniel Brötzmann 07 Jun '21

07 Jun '21

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 303f36b9 by André Apitzsch at 2021-06-07T21:59:04+02:00 Fix spell checking Fixes #10558. - - - - - 1 changed file: - gajim/gtk/message_input.py Changes: ===================================== gajim/gtk/message_input.py ===================================== @@ -108,11 +108,13 @@ def _on_destroy(self, *args): Gdk.DragAction.DEFAULT) def _on_focus_in(self, _widget, _event): + self.toggle_speller(True) scrolled = self.get_parent() scrolled.get_style_context().add_class('message-input-focus') return False def _on_focus_out(self, _widget, _event): + self.toggle_speller(False) scrolled = self.get_parent() scrolled.get_style_context().remove_class('message-input-focus') return False View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/303f36b9afd39ed781b57a945dd7555e… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/303f36b9afd39ed781b57a945dd7555e… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] AudioWidget: Display minutes and seconds correctly
by Daniel Brötzmann 07 Jun '21

07 Jun '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: f86fefe1 by wurstsalat at 2021-06-07T21:11:38+02:00 AudioWidget: Display minutes and seconds correctly - - - - - 1 changed file: - gajim/gtk/preview_audio.py Changes: ===================================== gajim/gtk/preview_audio.py ===================================== @@ -143,8 +143,8 @@ def _format_audio_timestamp(_widget, ns): minutes = seconds / 60 hours = minutes / 60 - i_seconds = int(seconds) - i_minutes = int(minutes) + i_seconds = int(seconds) % 60 + i_minutes = int(minutes) % 60 i_hours = int(hours) if i_hours > 0: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/f86fefe1afdaae0eadbe612a3c5ee8bc… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/f86fefe1afdaae0eadbe612a3c5ee8bc… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] 2 commits: MessageRow: Refactor arguments
by Daniel Brötzmann 06 Jun '21

06 Jun '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 9a2380e9 by wurstsalat at 2021-06-06T23:23:06+02:00 MessageRow: Refactor arguments - - - - - bee9acf8 by wurstsalat at 2021-06-06T23:23:09+02:00 BaseControl: Remove unused argument in add_message - - - - - 4 changed files: - gajim/gtk/controls/base.py - gajim/gtk/conversation/rows/base.py - gajim/gtk/conversation/rows/message.py - gajim/gtk/conversation/view.py Changes: ===================================== gajim/gtk/controls/base.py ===================================== @@ -1075,7 +1075,6 @@ def add_message(self, kind, name, tim, - restored=False, displaymarking=None, msg_log_id=None, message_id=None, @@ -1336,7 +1335,7 @@ def fetch_n_lines_history(self, _scrolled, before, n_lines): def add_messages(self, messages): for msg in messages: - if not msg: + if not msg or not msg.message: continue contact_name = msg.contact_name @@ -1353,8 +1352,6 @@ def add_messages(self, messages): else: raise ValueError('no kind attribute') - if not msg.message: - continue self.conversation_view.add_message( msg.message, kind, ===================================== gajim/gtk/conversation/rows/base.py ===================================== @@ -31,7 +31,8 @@ class BaseRow(Gtk.ListBoxRow): def __init__(self, account, widget=None): Gtk.ListBoxRow.__init__(self) - self.account = account + self._account = account + self._client = app.get_client(account) self.type = '' self.timestamp = None self.kind = None ===================================== gajim/gtk/conversation/rows/message.py ===================================== @@ -40,13 +40,12 @@ class MessageRow(BaseRow): def __init__(self, account, + contact, message_id, timestamp, kind, name, text, - avatar, - is_groupchat, additional_data=None, display_marking=None, marker=None, @@ -64,6 +63,11 @@ def __init__(self, self.name = name or '' self.text = text + self._contact = contact + self._is_groupchat = False + if contact is not None and contact.is_groupchat: + self._is_groupchat = True + self._corrections = [] self._has_receipt = marker == 'received' self._has_displayed = marker == 'displayed' @@ -78,13 +82,15 @@ def __init__(self, result = process(text) self._message_widget = MessageWidget(account) self._message_widget.add_content(result) - if is_groupchat: - self._check_for_highlight(result) + if self._is_groupchat: + self_contact = self._contact.get_self() + if self_contact.name != name: + self._check_for_highlight(result) self._meta_box = Gtk.Box(spacing=6) self._meta_box.set_hexpand(True) - self._meta_box.pack_start( - self.create_name_widget(name, kind, is_groupchat), False, True, 0) + name_widget = self.create_name_widget(name, kind, self._is_groupchat) + self._meta_box.pack_start(name_widget, False, True, 0) timestamp_label = self.create_timestamp_widget(self.timestamp) timestamp_label.set_margin_start(6) self._meta_box.pack_end(timestamp_label, False, True, 0) @@ -117,12 +123,12 @@ def __init__(self, self.set_receipt() self._meta_box.pack_end(self._message_icons, False, True, 0) - - self._avatar_surface = Gtk.Image.new_from_surface(avatar) + avatar = self._get_avatar(kind, name) + self._avatar_image = Gtk.Image.new_from_surface(avatar) avatar_placeholder = Gtk.Box() avatar_placeholder.set_size_request(AvatarSize.ROSTER, -1) avatar_placeholder.set_valign(Gtk.Align.START) - avatar_placeholder.add(self._avatar_surface) + avatar_placeholder.add(self._avatar_image) bottom_box = Gtk.Box(spacing=6) bottom_box.add(self._message_widget) @@ -139,12 +145,29 @@ def __init__(self, def _check_for_highlight(self, content): highlight_words = app.settings.get('muc_highlight_words').split(';') - highlight_words.append(app.nicks[self.account]) + highlight_words.append(app.nicks[self._account]) highlight_words = [word.lower() for word in highlight_words if word] if any(match in content.text.lower() for match in highlight_words): self.get_style_context().add_class( 'conversation-mention-highlight') + def _get_avatar(self, kind, name): + if self._contact is None: + return None + + scale = self.get_scale_factor() + if self._is_groupchat: + contact = self._contact.get_resource(name) + return contact.get_avatar(AvatarSize.ROSTER, scale, add_show=False) + + if kind == 'outgoing': + contact = self._client.get_module('Contacts').get_contact( + str(self._client.get_own_jid().bare)) + else: + contact = self._contact + + return contact.get_avatar(AvatarSize.ROSTER, scale, add_show=False) + def is_same_sender(self, message): return message.name == self.name @@ -242,21 +265,22 @@ def set_error(self, tooltip): self._message_icons.set_error_icon_visible(True) self._message_icons.set_error_tooltip(tooltip) - def update_avatar(self, avatar): - self._avatar_surface.set_from_surface(avatar) + def update_avatar(self): + avatar = self._get_avatar(self.kind, self.name) + self._avatar_image.set_from_surface(avatar) def set_merged(self, merged): self._merged = merged if merged: self.get_style_context().add_class('merged') - self._avatar_surface.set_no_show_all(True) - self._avatar_surface.hide() + self._avatar_image.set_no_show_all(True) + self._avatar_image.hide() self._meta_box.set_no_show_all(True) self._meta_box.hide() else: self.get_style_context().remove_class('merged') - self._avatar_surface.set_no_show_all(False) - self._avatar_surface.show() + self._avatar_image.set_no_show_all(False) + self._avatar_image.show() self._meta_box.set_no_show_all(False) self._meta_box.show() ===================================== gajim/gtk/conversation/view.py ===================================== @@ -22,7 +22,6 @@ from gi.repository import Gtk from gajim.common import app -from gajim.common.const import AvatarSize from gajim.common.helpers import to_user_string from gajim.common.helpers import get_start_of_day @@ -190,21 +189,14 @@ def add_message(self, self.correct_message(correct_id, message_id, text) return - avatar = self._get_avatar(kind, name) - - is_groupchat = False - if self._contact is not None: - is_groupchat = self._contact.is_groupchat - message = MessageRow( self._account, + self._contact, message_id, timestamp, kind, name, text, - avatar, - is_groupchat, additional_data=additional_data, display_marking=display_marking, marker=marker, @@ -217,23 +209,6 @@ def add_message(self, self._insert_message(message) - def _get_avatar(self, kind, name): - if self._contact is None: - return None - - scale = self.get_scale_factor() - if self._contact.is_groupchat: - contact = self._contact.get_resource(name) - return contact.get_avatar(AvatarSize.ROSTER, scale, add_show=False) - - if kind == 'outgoing': - contact = self._client.get_module('Contacts').get_contact( - str(self._client.get_own_jid().bare)) - else: - contact = self._contact - - return contact.get_avatar(AvatarSize.ROSTER, scale, add_show=False) - def _insert_message(self, message): self.add(message) self._add_date_row(message.timestamp) @@ -402,8 +377,7 @@ def set_read_marker(self, id_): def update_avatars(self): for row in self.get_children(): if row.type == 'chat': - avatar = self._get_avatar(row.kind, row.name) - row.update_avatar(avatar) + row.update_avatar() def update_text_tags(self): for row in self.get_children(): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/67e62aec08c189a6b5740335a730c55… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/67e62aec08c189a6b5740335a730c55… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] MessageRow: Implement MUC highlight
by Daniel Brötzmann 06 Jun '21

06 Jun '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 67e62aec by wurstsalat at 2021-06-06T19:44:02+02:00 MessageRow: Implement MUC highlight - - - - - 2 changed files: - gajim/gtk/conversation/rows/base.py - gajim/gtk/conversation/rows/message.py Changes: ===================================== gajim/gtk/conversation/rows/base.py ===================================== @@ -31,6 +31,7 @@ class BaseRow(Gtk.ListBoxRow): def __init__(self, account, widget=None): Gtk.ListBoxRow.__init__(self) + self.account = account self.type = '' self.timestamp = None self.kind = None ===================================== gajim/gtk/conversation/rows/message.py ===================================== @@ -68,11 +68,6 @@ def __init__(self, self._has_receipt = marker == 'received' self._has_displayed = marker == 'displayed' - # if is_groupchat: - # if other_text_tags and 'marked' in other_text_tags: - # self.get_style_context().add_class( - # 'conversation-mention-highlight') - is_previewable = app.interface.preview_manager.get_previewable( text, additional_data) if is_previewable: @@ -83,6 +78,8 @@ def __init__(self, result = process(text) self._message_widget = MessageWidget(account) self._message_widget.add_content(result) + if is_groupchat: + self._check_for_highlight(result) self._meta_box = Gtk.Box(spacing=6) self._meta_box.set_hexpand(True) @@ -140,6 +137,14 @@ def __init__(self, self.show_all() + def _check_for_highlight(self, content): + highlight_words = app.settings.get('muc_highlight_words').split(';') + highlight_words.append(app.nicks[self.account]) + highlight_words = [word.lower() for word in highlight_words if word] + if any(match in content.text.lower() for match in highlight_words): + self.get_style_context().add_class( + 'conversation-mention-highlight') + def is_same_sender(self, message): return message.name == self.name View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/67e62aec08c189a6b5740335a730c55e… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/67e62aec08c189a6b5740335a730c55e… You're receiving this email because of your account on dev.gajim.org.

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits June 2021