Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] Groupchat: Remove subject popover code
by Philipp Hörist 08 Aug '19

08 Aug '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 61679239 by Philipp Hörist at 2019-08-08T15:10:25Z Groupchat: Remove subject popover code - - - - - 1 changed file: - gajim/groupchat_control.py Changes: ===================================== gajim/groupchat_control.py ===================================== @@ -57,7 +57,6 @@ from gajim.common.caps_cache import muc_caps_cache from gajim.common import events from gajim.common import app from gajim.common import helpers -from gajim.common.helpers import open_uri from gajim.common.helpers import event_filter from gajim.common import ged from gajim.common.i18n import _ @@ -88,7 +87,6 @@ from gajim.gtk.util import NickCompletionGenerator from gajim.gtk.util import get_icon_name from gajim.gtk.util import get_affiliation_surface from gajim.gtk.util import get_builder -from gajim.gtk.util import make_href_markup log = logging.getLogger('gajim.groupchat_control') @@ -193,8 +191,6 @@ class GroupchatControl(ChatControlBase): self._nick_completion = NickCompletionGenerator(muc_data.nick) self.last_key_tabs = False - self.subject = '' - self.name_label = self.xml.get_object('banner_name_label') self.event_box = self.xml.get_object('banner_eventbox') @@ -292,13 +288,7 @@ class GroupchatControl(ChatControlBase): 'go-next-symbolic', Gtk.IconSize.MENU) self.hide_roster_button.connect('clicked', lambda *args: self.show_roster()) - self.subject_button = Gtk.MenuButton() - self.subject_button.set_image(Gtk.Image.new_from_icon_name( - 'go-down-symbolic', Gtk.IconSize.MENU)) - self.subject_button.set_popover(SubjectPopover()) - self.subject_button.set_no_show_all(True) self.banner_actionbar.pack_end(self.hide_roster_button) - self.banner_actionbar.pack_start(self.subject_button) # Holds CaptchaRequest widget self._captcha_request = None @@ -374,6 +364,12 @@ class GroupchatControl(ChatControlBase): def nick(self): return self._muc_data.nick + @property + def subject(self): + if self._subject_data is None: + return '' + return self._subject_data.subject + def add_actions(self): super().add_actions() actions = [ @@ -1107,7 +1103,7 @@ class GroupchatControl(ChatControlBase): def draw_banner_text(self): """ Draw the text in the fat line at the top of the window that houses the - room jid, subject + room jid """ self.name_label.set_ellipsize(Pango.EllipsizeMode.END) if self.is_continued: @@ -1117,11 +1113,6 @@ class GroupchatControl(ChatControlBase): self.name_label.set_text(name) - if self.subject: - subject = GLib.markup_escape_text(self.subject) - subject_text = make_href_markup(subject) - self.subject_button.get_popover().set_text(subject_text) - def _nec_update_avatar(self, obj): if obj.contact.room_jid != self.room_jid: return @@ -1362,16 +1353,14 @@ class GroupchatControl(ChatControlBase): found_here = text.find(special_word, start) return False - def set_subject(self, subject): - self.subject = subject - self.draw_banner_text() - @event_filter(['account', 'room_jid']) def _on_subject(self, event): if self.subject == event.subject or event.is_fake: # Probably a rejoin, we already showed that subject return - self.set_subject(event.subject) + + self._subject_data = event + text = _('%(nick)s has set the subject to %(subject)s') % { 'nick': event.nickname, 'subject': event.subject} @@ -1384,13 +1373,6 @@ class GroupchatControl(ChatControlBase): self._muc_data.state != MUCJoinedState.JOINED): self.add_info_message(text) - if not event.subject: - self.subject_button.hide() - else: - self.subject_button.show() - - self._subject_data = event - @event_filter(['account', 'room_jid']) def _on_config_changed(self, event): # http://www.xmpp.org/extensions/xep-0045.html#roomconfig-notify @@ -3038,48 +3020,3 @@ class GroupchatControl(ChatControlBase): def _on_abort_button_clicked(self, _button): self.parent_win.window.lookup_action( 'disconnect-%s' % self.control_id).activate() - - -class SubjectPopover(Gtk.Popover): - def __init__(self): - Gtk.Popover.__init__(self) - self.set_name('SubjectPopover') - - scrolledwindow = Gtk.ScrolledWindow() - scrolledwindow.set_max_content_height(250) - scrolledwindow.set_propagate_natural_height(True) - scrolledwindow.set_propagate_natural_width(True) - scrolledwindow.set_policy(Gtk.PolicyType.NEVER, - Gtk.PolicyType.AUTOMATIC) - - self.label = Gtk.Label() - self.label.set_line_wrap(True) - self.label.set_line_wrap_mode(Pango.WrapMode.WORD_CHAR) - self.label.set_max_width_chars(80) - self.label.connect('activate-link', self._on_activate_link) - - scrolledwindow.add(self.label) - - box = Gtk.Box() - box.add(scrolledwindow) - box.show_all() - self.add(box) - - self.connect_after('show', self._after_show) - - def set_text(self, text): - self.label.set_markup(text) - - def _after_show(self, *args): - # Gtk Bug: If we set selectable True, on show - # everything inside the Label is selected. - # So we switch after show to False and again to True - self.label.set_selectable(False) - self.label.set_selectable(True) - - @staticmethod - def _on_activate_link(_label, uri): - # We have to use this, because the default GTK handler - # is not cross-platform compatible - open_uri(uri) - return Gdk.EVENT_STOP View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/61679239434380e1db657725ece35aa8e6… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/61679239434380e1db657725ece35aa8e6… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 5 commits: GroupchatInfo: Improve some things
by Philipp Hörist 08 Aug '19

08 Aug '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: d1bc33e7 by Philipp Hörist at 2019-08-08T11:53:50Z GroupchatInfo: Improve some things - Allow the width to be passed as option - Fix some fields when the Widget is filled with data multiple times - Simplify code - - - - - 25828b1c by Philipp Hörist at 2019-08-08T13:52:55Z Groupchat: Add info page - - - - - 629f07c4 by Philipp Hörist at 2019-08-08T14:31:18Z Refactor making href pango markup - - - - - f6df6ec5 by Philipp Hörist at 2019-08-08T14:39:42Z GroupchatInfo: Convert URIs to markup links - - - - - 4dcc79c1 by Philipp Hörist at 2019-08-08T14:44:18Z GroupchatInfo: Use open_uri() for subject links - - - - - 9 changed files: - gajim/chat_control.py - gajim/chat_control_base.py - gajim/common/helpers.py - gajim/data/gui/groupchat_control.ui - gajim/data/gui/groupchat_info_scrolled.ui - gajim/groupchat_control.py - gajim/gtk/groupchat_info.py - gajim/gtk/util.py - gajim/gui_menu_builder.py Changes: ===================================== gajim/chat_control.py ===================================== @@ -68,6 +68,7 @@ from gajim.gtk.util import format_activity from gajim.gtk.util import format_tune from gajim.gtk.util import format_location from gajim.gtk.util import get_activity_icon_name +from gajim.gtk.util import make_href_markup from gajim.command_system.implementation.hosts import ChatCommands from gajim.command_system.framework import CommandHost # pylint: disable=unused-import @@ -760,7 +761,7 @@ class ChatControl(ChatControlBase): label_tooltip = '%s%s' % (name, acct_info) if status_escaped: - status_text = self.urlfinder.sub(self.make_href, status_escaped) + status_text = make_href_markup(status_escaped) status_text = '<span size="x-small" weight="light">%s</span>' % status_text self.banner_status_label.set_tooltip_text(status) self.banner_status_label.set_no_show_all(False) ===================================== gajim/chat_control_base.py ===================================== @@ -24,7 +24,6 @@ # along with Gajim. If not, see <http://www.gnu.org/licenses/>. import os -import re import time from tempfile import TemporaryDirectory @@ -42,7 +41,6 @@ from gajim.common.i18n import _ from gajim.common.helpers import AdditionalDataDict from gajim.common.contacts import GC_Contact from gajim.common.connection_handlers_events import MessageOutgoingEvent -from gajim.common.const import StyleAttr from gajim.common.const import Chatstate from gajim import gtkgui_helpers @@ -56,7 +54,6 @@ from gajim.gtk.dialogs import DialogButton from gajim.gtk.dialogs import NewConfirmationDialog from gajim.gtk.dialogs import NewConfirmationCheckDialog from gajim.gtk import util -from gajim.gtk.util import convert_rgb_to_hex from gajim.gtk.util import at_the_end from gajim.gtk.util import get_show_in_roster from gajim.gtk.util import get_show_in_systray @@ -93,15 +90,6 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): # Multiple hardware keycodes can trigger a keyval like Gdk.KEY_c. keycodes_c = get_hardware_key_codes(Gdk.KEY_c) - def make_href(self, match): - url_color = app.css_config.get_value('.gajim-url', StyleAttr.COLOR) - color = convert_rgb_to_hex(url_color) - url = match.group() - if '://' not in url: - url = 'https://' + url - return '<a href="%s"><span foreground="%s">%s</span></a>' % ( - url, color, match.group()) - def get_nb_unread(self): jid = self.contact.jid if self.resource: @@ -234,9 +222,6 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): self._on_banner_eventbox_button_press_event) self.handlers[id_] = widget - self.urlfinder = re.compile( - r"(www\.(?!\.)|[a-z][a-z0-9+.-]*://)[^\s<>'\"]+[^!,\.\s<>\)'\"\]]") - self.banner_status_label = self.xml.get_object('banner_label') if self.banner_status_label is not None: id_ = self.banner_status_label.connect('populate_popup', ===================================== gajim/common/helpers.py ===================================== @@ -85,6 +85,9 @@ log = logging.getLogger('gajim.c.helpers') special_groups = (_('Transports'), _('Not in contact list'), _('Observers'), _('Group chats')) +URL_REGEX = re.compile( + r"(www\.(?!\.)|[a-z][a-z0-9+.-]*://)[^\s<>'\"]+[^!,\.\s<>\)'\"\]]") + class InvalidFormat(Exception): pass ===================================== gajim/data/gui/groupchat_control.ui ===================================== @@ -1131,6 +1131,68 @@ <property name="position">7</property> </packing> </child> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkGrid" id="info_grid"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">center</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="orientation">vertical</property> + <property name="row_spacing">12</property> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="homogeneous">True</property> + <child> + <object class="GtkButton" id="info_close_button"> + <property name="label" translatable="yes">_Close</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="receives_default">True</property> + <property name="halign">center</property> + <property name="valign">start</property> + <property name="use_underline">True</property> + <signal name="clicked" handler="_on_page_cancel_clicked" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <placeholder/> + </child> + <style> + <class name="margin-18"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + </object> + <packing> + <property name="name">muc-info</property> + <property name="position">8</property> + </packing> + </child> </object> <packing> <property name="expand">True</property> ===================================== gajim/data/gui/groupchat_info_scrolled.ui ===================================== @@ -298,6 +298,7 @@ <property name="wrap_mode">word-char</property> <property name="selectable">True</property> <property name="xalign">0</property> + <signal name="activate-link" handler="_on_activate_subject_link" swapped="no"/> </object> <packing> <property name="left_attach">1</property> ===================================== gajim/groupchat_control.py ===================================== @@ -83,10 +83,12 @@ from gajim.gtk.tooltips import GCTooltip from gajim.gtk.groupchat_config import GroupchatConfig from gajim.gtk.adhoc import AdHocCommand from gajim.gtk.dataform import DataFormWidget +from gajim.gtk.groupchat_info import GroupChatInfoScrolled from gajim.gtk.util import NickCompletionGenerator from gajim.gtk.util import get_icon_name from gajim.gtk.util import get_affiliation_surface from gajim.gtk.util import get_builder +from gajim.gtk.util import make_href_markup log = logging.getLogger('gajim.groupchat_control') @@ -301,6 +303,11 @@ class GroupchatControl(ChatControlBase): # Holds CaptchaRequest widget self._captcha_request = None + # MUC Info + self._subject_data = None + self._muc_info_box = GroupChatInfoScrolled(self.account, {'width': 600}) + self.xml.info_grid.attach(self._muc_info_box, 0, 0, 1, 1) + # GC Roster tooltip self.gc_tooltip = GCTooltip() @@ -378,6 +385,7 @@ class GroupchatControl(ChatControlBase): ('request-voice-', self._on_request_voice), ('execute-command-', self._on_execute_command), ('upload-avatar-', self._on_upload_avatar), + ('information-', self._on_information), ] for action in actions: @@ -633,6 +641,15 @@ class GroupchatControl(ChatControlBase): def _on_disconnect(self, action, param): self.leave() + def _on_information(self, action, param): + disco_info = muc_caps_cache.cache[self.contact.jid] + self._muc_info_box.set_from_disco_info(disco_info) + if self._subject_data is not None: + self._muc_info_box.set_subject(self._subject_data.subject) + self._muc_info_box.set_author(self._subject_data.nickname, + self._subject_data.user_timestamp) + self._show_page('muc-info') + def _on_destroy_room(self, action, param): def _on_confirm(reason, jid): if jid: @@ -1102,7 +1119,7 @@ class GroupchatControl(ChatControlBase): if self.subject: subject = GLib.markup_escape_text(self.subject) - subject_text = self.urlfinder.sub(self.make_href, subject) + subject_text = make_href_markup(subject) self.subject_button.get_popover().set_text(subject_text) def _nec_update_avatar(self, obj): @@ -1372,6 +1389,8 @@ class GroupchatControl(ChatControlBase): else: self.subject_button.show() + self._subject_data = event + @event_filter(['account', 'room_jid']) def _on_config_changed(self, event): # http://www.xmpp.org/extensions/xep-0045.html#roomconfig-notify @@ -2428,6 +2447,8 @@ class GroupchatControl(ChatControlBase): self._on_password_cancel_clicked() elif self._get_current_page() == 'captcha': self._on_captcha_cancel_clicked() + elif self._get_current_page() == 'muc-info': + self._on_page_cancel_clicked() elif self._get_current_page() in ('error', 'captcha-error'): self._on_page_close_clicked() else: @@ -2888,6 +2909,8 @@ class GroupchatControl(ChatControlBase): self.xml.progress_spinner.stop() elif page_name == 'progress': self.xml.progress_spinner.start() + elif page_name == 'muc-info': + self.xml.info_close_button.grab_default() elif page_name == 'password': self.xml.password_entry.set_text('') self.xml.password_entry.grab_focus() @@ -3006,7 +3029,7 @@ class GroupchatControl(ChatControlBase): app.connections[self.account].get_module('MUC').join(self._muc_data) self._show_page('progress') - def _on_page_cancel_clicked(self, _button): + def _on_page_cancel_clicked(self, _button=None): self._show_page('groupchat') def _on_page_close_clicked(self, _button=None): ===================================== gajim/gtk/groupchat_info.py ===================================== @@ -15,6 +15,7 @@ import time from gi.repository import Gdk +from gi.repository import GLib from gi.repository import Gtk from nbxmpp.protocol import NS_MAM_1 @@ -26,6 +27,7 @@ from gajim.common.helpers import open_uri from gajim.common.const import RFC5646_LANGUAGE_TAGS from gajim.gtk.util import get_builder +from gajim.gtk.util import make_href_markup MUC_FEATURES = { @@ -93,9 +95,11 @@ MUC_FEATURES = { class GroupChatInfoScrolled(Gtk.ScrolledWindow): - def __init__(self, account=None): + def __init__(self, account=None, options=None): Gtk.ScrolledWindow.__init__(self) - self.set_size_request(400, -1) + if options is None: + options = {} + self.set_size_request(options.get('width', 400), -1) self.set_vexpand(True) self.set_min_content_height(400) self.set_policy(Gtk.PolicyType.NEVER, @@ -117,23 +121,21 @@ class GroupChatInfoScrolled(Gtk.ScrolledWindow): return self._info.jid def set_author(self, author, epoch_timestamp=None): - if not author: - return - - if epoch_timestamp is not None: + has_author = bool(author) + if has_author and epoch_timestamp is not None: time_ = time.strftime('%c', time.localtime(epoch_timestamp)) author = '{} - {}'.format(author, time_) - self._ui.author.set_text(author) - self._ui.author.set_visible(True) - self._ui.author_label.set_visible(True) + self._ui.author.set_text(author or '') + self._ui.author.set_visible(has_author) + self._ui.author_label.set_visible(has_author) def set_subject(self, subject): - if not subject: - return - self._ui.subject.set_text(subject) - self._ui.subject.set_visible(True) - self._ui.subject_label.set_visible(True) + has_subject = bool(subject) + subject = GLib.markup_escape_text(subject or '') + self._ui.subject.set_markup(make_href_markup(subject)) + self._ui.subject.set_visible(has_subject) + self._ui.subject_label.set_visible(has_subject) def set_from_disco_info(self, info): self._info = info @@ -150,10 +152,7 @@ class GroupChatInfoScrolled(Gtk.ScrolledWindow): self._ui.description_label.set_visible(has_desc) # Set subject - has_subject = bool(info.muc_subject) - self._ui.subject.set_text(info.muc_subject or '') - self._ui.subject.set_visible(has_subject) - self._ui.subject_label.set_visible(has_subject) + self.set_subject(info.muc_subject) # Set user has_users = info.muc_users is not None @@ -165,6 +164,7 @@ class GroupChatInfoScrolled(Gtk.ScrolledWindow): self._ui.address.set_text(str(info.jid)) # Set contacts + self._ui.contact_box.foreach(self._ui.contact_box.remove) has_contacts = bool(info.muc_contacts) if has_contacts: for contact in info.muc_contacts: @@ -223,6 +223,13 @@ class GroupChatInfoScrolled(Gtk.ScrolledWindow): open_uri('xmpp:%s?message' % button.get_uri(), account=self._account) return Gdk.EVENT_STOP + @staticmethod + def _on_activate_subject_link(_label, uri): + # We have to use this, because the default GTK handler + # is not cross-platform compatible + open_uri(uri) + return Gdk.EVENT_STOP + @staticmethod def _get_feature_icon(icon, tooltip): image = Gtk.Image.new_from_icon_name(icon, Gtk.IconSize.MENU) ===================================== gajim/gtk/util.py ===================================== @@ -45,10 +45,12 @@ from gajim.common import app from gajim.common import configpaths from gajim.common import i18n from gajim.common.i18n import _ +from gajim.common.helpers import URL_REGEX from gajim.common.const import MOODS from gajim.common.const import ACTIVITIES from gajim.common.const import LOCATION_DATA from gajim.common.const import Display +from gajim.common.const import StyleAttr from gajim.gtk.const import GajimIconSet @@ -698,3 +700,17 @@ def load_pixbuf(path, size=None): height, GdkPixbuf.InterpType.BILINEAR) return pixbuf + + +def make_href_markup(string): + url_color = app.css_config.get_value('.gajim-url', StyleAttr.COLOR) + color = convert_rgb_to_hex(url_color) + + def _to_href(match): + url = match.group() + if '://' not in url: + url = 'https://' + url + return '<a href="%s"><span foreground="%s">%s</span></a>' % ( + url, color, match.group()) + + return URL_REGEX.sub(_to_href, string) ===================================== gajim/gui_menu_builder.py ===================================== @@ -579,6 +579,7 @@ def get_singlechat_menu(control_id, account, jid): def get_groupchat_menu(control_id, account, jid): groupchat_menu = [ + ('win.information-', _('Information')), (_('Manage Group Chat'), [ ('win.change-subject-', _('Change Subject')), ('win.configure-', _('Configure Group Chat')), View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/6b789e162d88fe8d5cd4298cb39465e2f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/6b789e162d88fe8d5cd4298cb39465e2f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: MAM: Minor code simplification
by Philipp Hörist 07 Aug '19

07 Aug '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 36805577 by Philipp Hörist at 2019-08-06T20:32:11Z MAM: Minor code simplification - - - - - 6b789e16 by Philipp Hörist at 2019-08-07T16:11:25Z Groupchat: Update roster status icon on join/leave - - - - - 2 changed files: - gajim/common/modules/mam.py - gajim/groupchat_control.py Changes: ===================================== gajim/common/modules/mam.py ===================================== @@ -123,7 +123,7 @@ class MAM(BaseModule): else: archive_jid = self._con.get_own_jid().getBare() - namespace = self._con.get_module('MAM').archiving_namespace + namespace = self.archiving_namespace timestamp = None if properties.stanza_id is None or namespace != nbxmpp.NS_MAM_2: @@ -132,8 +132,7 @@ class MAM(BaseModule): if not archive_jid == properties.stanza_id.by: return - if not self._con.get_module('MAM').is_catch_up_finished( - archive_jid): + if not self.is_catch_up_finished(archive_jid): return app.logger.set_archive_infos(archive_jid, ===================================== gajim/groupchat_control.py ===================================== @@ -1496,6 +1496,9 @@ class GroupchatControl(ChatControlBase): if self.parent_win: self.parent_win.redraw_tab(self) + # Update Roster + app.interface.roster.draw_contact(self.room_jid, self.account) + formattings_button = self.xml.get_object('formattings_button') formattings_button.set_sensitive(True) @@ -1524,10 +1527,8 @@ class GroupchatControl(ChatControlBase): con = app.connections[self.account] con.get_module('Chatstate').remove_delay_timeout(self.contact) - contact = app.contacts.get_groupchat_contact(self.account, - self.room_jid) - if contact is not None: - app.interface.roster.draw_contact(self.room_jid, self.account) + # Update Roster + app.interface.roster.draw_contact(self.room_jid, self.account) # We don't redraw the whole banner here, because only icon change self._update_banner_state_image() View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/a6b4d993bd9b08b2686165bec72678b72… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/a6b4d993bd9b08b2686165bec72678b72… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Simplify module import
by Philipp Hörist 05 Aug '19

05 Aug '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: a6b4d993 by Philipp Hörist at 2019-08-05T22:03:59Z Simplify module import - - - - - 1 changed file: - gajim/common/modules/message.py Changes: ===================================== gajim/common/modules/message.py ===================================== @@ -21,7 +21,6 @@ from nbxmpp.structs import StanzaHandler from nbxmpp.const import MessageType from gajim.common import app -from gajim.common import caps_cache from gajim.common.i18n import _ from gajim.common.nec import NetworkIncomingEvent from gajim.common.nec import NetworkEvent @@ -294,7 +293,7 @@ class Message(BaseModule): message_id=event.message_id) def _check_for_mam_compliance(self, room_jid, stanza_id): - namespace = caps_cache.muc_caps_cache.get_mam_namespace(room_jid) + namespace = muc_caps_cache.get_mam_namespace(room_jid) if stanza_id is None and namespace == nbxmpp.NS_MAM_2: self._log.warning('%s announces mam:2 without stanza-id', room_jid) @@ -307,7 +306,7 @@ class Message(BaseModule): return None, None if properties.type.is_groupchat: - namespace = caps_cache.muc_caps_cache.get_mam_namespace( + namespace = muc_caps_cache.get_mam_namespace( properties.jid.getBare()) archive = properties.jid else: View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/a6b4d993bd9b08b2686165bec72678b727… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/a6b4d993bd9b08b2686165bec72678b727… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: MUC: Add log message when requesting MUC history
by Philipp Hörist 05 Aug '19

05 Aug '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 922fa4f1 by Philipp Hörist at 2019-08-05T20:49:00Z MUC: Add log message when requesting MUC history - timestamp() makes it necessary to use timezone aware datetime objects - - - - - dce96b5f by Philipp Hörist at 2019-08-05T21:05:30Z Logger: Improve log message - - - - - ca1b2091 by Philipp Hörist at 2019-08-05T21:58:16Z MAM: Improve MAM efficiency This looks at all messages incoming and saves the stanza-id if there is one. Previously this was only done for messages of type=chat, which left out muc invites and captcha messages, leading to fetching these messages later again. - - - - - 5 changed files: - gajim/common/logger.py - gajim/common/modules/mam.py - gajim/common/modules/message.py - gajim/common/modules/muc.py - gajim/session.py Changes: ===================================== gajim/common/logger.py ===================================== @@ -1463,5 +1463,5 @@ class Logger: sql = '''UPDATE last_archive_message SET {} WHERE jid_id = ?'''.format(args) self._con.execute(sql, tuple(kwargs.values()) + (jid_id,)) - log.info('Save archive infos: %s', kwargs) + log.info('Set message archive info: %s %s', jid, kwargs) self._timeout_commit() ===================================== gajim/common/modules/mam.py ===================================== @@ -40,6 +40,9 @@ class MAM(BaseModule): BaseModule.__init__(self, con) self.handlers = [ + StanzaHandler(name='message', + callback=self._set_message_archive_info, + priority=41), StanzaHandler(name='message', callback=self._mam_message_received, priority=51), @@ -101,6 +104,42 @@ class MAM(BaseModule): # A message we received return properties.mam.id, None + def _set_message_archive_info(self, _con, _stanza, properties): + if (properties.is_mam_message or + properties.is_pubsub or + properties.is_muc_subject): + return + + if properties.type.is_groupchat: + archive_jid = properties.jid.getBare() + namespace = muc_caps_cache.get_mam_namespace(archive_jid) + timestamp = properties.timestamp + if namespace is None: + # MUC History + app.logger.set_archive_infos( + archive_jid, + last_muc_timestamp=timestamp) + return + + else: + archive_jid = self._con.get_own_jid().getBare() + namespace = self._con.get_module('MAM').archiving_namespace + timestamp = None + + if properties.stanza_id is None or namespace != nbxmpp.NS_MAM_2: + return + + if not archive_jid == properties.stanza_id.by: + return + + if not self._con.get_module('MAM').is_catch_up_finished( + archive_jid): + return + + app.logger.set_archive_infos(archive_jid, + last_mam_id=properties.stanza_id.id, + last_muc_timestamp=timestamp) + def _mam_message_received(self, _con, stanza, properties): if not properties.is_mam_message: return ===================================== gajim/common/modules/message.py ===================================== @@ -293,16 +293,6 @@ class Message(BaseModule): stanza_id=event.stanza_id, message_id=event.message_id) - if muc_caps_cache.has_mam(event.room_jid): - finished = self._con.get_module('MAM').is_catch_up_finished( - event.room_jid) - if not finished: - return - - app.logger.set_archive_infos(event.room_jid, - last_mam_id=event.stanza_id, - last_muc_timestamp=event.timestamp) - def _check_for_mam_compliance(self, room_jid, stanza_id): namespace = caps_cache.muc_caps_cache.get_mam_namespace(room_jid) if stanza_id is None and namespace == nbxmpp.NS_MAM_2: ===================================== gajim/common/modules/muc.py ===================================== @@ -19,6 +19,7 @@ import time import logging from datetime import datetime from datetime import timedelta +from datetime import timezone from functools import partial import nbxmpp @@ -302,13 +303,16 @@ class MUC(BaseModule): if archive is not None and archive.last_muc_timestamp is not None: since_epoch = float(archive.last_muc_timestamp) - since_date = datetime.utcfromtimestamp(since_epoch) + since_date = datetime.fromtimestamp(since_epoch, timezone.utc) if threshold != SyncThreshold.NO_THRESHOLD: - threshold_date = datetime.utcnow() - timedelta(days=threshold) + now = datetime.now(timezone.utc) + threshold_date = now - timedelta(days=threshold) since_date = max(threshold_date, since_date) date_string = since_date.strftime('%Y-%m-%dT%H:%M:%SZ') muc_x.setTag('history', {'since': date_string}) + self._log.info('Request MUC history since: %s (%s)', + date_string, since_date.timestamp()) self._log.info('Threshold for %s: %s', room_jid, threshold) def _on_error_presence(self, _con, _stanza, properties): ===================================== gajim/session.py ===================================== @@ -139,12 +139,6 @@ class ChatControlSession: stanza_id=obj.unique_id, message_id=obj.message_id) - jid = self.conn.get_own_jid().getStripped() - if self.conn.get_module('MAM').is_catch_up_finished(jid): - app.logger.set_archive_infos(jid, - last_mam_id=obj.stanza_id, - last_muc_timestamp=obj.timestamp) - if obj.muc_pm and not obj.gc_control: # This is a carbon of a PM from a MUC we are not currently # joined. We log it silently without notification. View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/66fc682605b7812d4b4c7a3b4833f7d1f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/66fc682605b7812d4b4c7a3b4833f7d1f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ChatControl: Fix displaying errors
by Philipp Hörist 05 Aug '19

05 Aug '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 66fc6826 by Philipp Hörist at 2019-08-05T19:02:31Z ChatControl: Fix displaying errors - - - - - 1 changed file: - gajim/session.py Changes: ===================================== gajim/session.py ===================================== @@ -339,7 +339,7 @@ class ChatControlSession: if msg_type == 'error': typ = 'error' - self.control.print_conversation(msg, typ, tim=tim, encrypted=encrypted, + self.control.add_message(msg, typ, tim=tim, encrypted=encrypted, subject=subject, xhtml=xhtml, displaymarking=displaymarking, additional_data=additional_data) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/66fc682605b7812d4b4c7a3b4833f7d1f2… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/66fc682605b7812d4b4c7a3b4833f7d1f2… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Add None check for stanza_id
by Philipp Hörist 05 Aug '19

05 Aug '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 36a316ae by Philipp Hörist at 2019-08-05T15:33:55Z Add None check for stanza_id nbxmpp makes sure that 'by' and 'id' are set if stanza_id is not None - - - - - 1 changed file: - gajim/common/modules/message.py Changes: ===================================== gajim/common/modules/message.py ===================================== @@ -313,8 +313,7 @@ class Message(BaseModule): # Deduplicate self message with message-id return None, properties.id - if properties.stanza_id.by is None: - # We can not verify who sent this stanza-id, ignore it. + if properties.stanza_id is None: return None, None if properties.type.is_groupchat: View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/36a316ae3bb548fce1a0f7cc655849c772… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/36a316ae3bb548fce1a0f7cc655849c772… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Message: Only set stanza_id data if it is valid
by Philipp Hörist 05 Aug '19

05 Aug '19

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 59b6c18b by Philipp Hörist at 2019-08-05T15:30:25Z Message: Only set stanza_id data if it is valid - - - - - 1 changed file: - nbxmpp/modules/message.py Changes: ===================================== nbxmpp/modules/message.py ===================================== @@ -46,7 +46,8 @@ class BaseMessage: # Stanza ID id_, by = stanza.getStanzaIDAttrs() - properties.stanza_id = StanzaIDData(id=id_, by=by) + if id_ is not None and by is not None: + properties.stanza_id = StanzaIDData(id=id_, by=by) if properties.type.is_error: properties.error = ErrorProperties(stanza) View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/59b6c18b5d9535e09204a86571… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/59b6c18b5d9535e09204a86571… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] MUC: Ignore captcha challenges received via MAM
by Philipp Hörist 05 Aug '19

05 Aug '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: c1687d75 by Philipp Hörist at 2019-08-05T12:36:45Z MUC: Ignore captcha challenges received via MAM - - - - - 1 changed file: - gajim/common/modules/muc.py Changes: ===================================== gajim/common/modules/muc.py ===================================== @@ -602,6 +602,11 @@ class MUC(BaseModule): if not properties.is_captcha_challenge: return + if properties.is_mam_message: + # Some servers store captcha challenges in MAM, dont process them + self._log.warning('Ignore captcha challenge received from MAM') + raise nbxmpp.NodeProcessed + muc_data = self._muc_data.get(properties.jid) if muc_data is None: return View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/c1687d75aa8d212319b693175f2046b607… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/c1687d75aa8d212319b693175f2046b607… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] MUC: Change nick only on self presence
by Philipp Hörist 05 Aug '19

05 Aug '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: cb97b189 by Philipp Hörist at 2019-08-05T11:40:06Z MUC: Change nick only on self presence - - - - - 1 changed file: - gajim/common/modules/muc.py Changes: ===================================== gajim/common/modules/muc.py ===================================== @@ -371,13 +371,14 @@ class MUC(BaseModule): properties.muc_nickname) if properties.is_nickname_changed: + if properties.is_muc_self_presence: + muc_data.nick = properties.muc_user.nick app.contacts.remove_gc_contact(self._account, contact) contact.name = properties.muc_user.nick app.contacts.add_gc_contact(self._account, contact) self._log.info('Nickname changed: %s to %s', properties.jid, properties.muc_user.nick) - muc_data.nick = properties.muc_user.nick self._raise_muc_event('muc-nickname-changed', properties) return View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/cb97b189996bd1a6f29249f9e21af6f44f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/cb97b189996bd1a6f29249f9e21af6f44f… 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