Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] Handle PEP bookmarks notifications
by Philipp Hörist 16 Dec '18

16 Dec '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 96edd799 by Philipp Hörist at 2018-12-16T23:36:45Z Handle PEP bookmarks notifications - Handle PEP bookmark notifications - On new bookmarks with the auto join flag set, join the MUC - Dont merge private and pubsub bookmarks - Only use pubsub if the conversion feature is announced - - - - - 3 changed files: - gajim/common/app.py - gajim/common/const.py - gajim/common/modules/bookmarks.py Changes: ===================================== gajim/common/app.py ===================================== @@ -159,7 +159,7 @@ gajim_common_features = [nbxmpp.NS_BYTESTREAM, nbxmpp.NS_SI, nbxmpp.NS_FILE, nbxmpp.NS_ROSTERX, nbxmpp.NS_SECLABEL, nbxmpp.NS_HASHES_2, nbxmpp.NS_HASHES_MD5, nbxmpp.NS_HASHES_SHA1, nbxmpp.NS_HASHES_SHA256, nbxmpp.NS_HASHES_SHA512, nbxmpp.NS_CONFERENCE, nbxmpp.NS_CORRECT, - nbxmpp.NS_EME, 'urn:xmpp:avatar:metadata+notify'] + nbxmpp.NS_EME, 'urn:xmpp:avatar:metadata+notify', 'storage:bookmarks+notify'] # Optional features gajim supports per account gajim_optional_features = {} # type: Dict[str, List[str]] ===================================== gajim/common/const.py ===================================== @@ -172,6 +172,7 @@ class PEPEventType(IntEnum): NICKNAME = 5 AVATAR = 6 ATOM = 7 + BOOKMARKS = 8 @unique ===================================== gajim/common/modules/bookmarks.py ===================================== @@ -14,32 +14,54 @@ # XEP-0048: Bookmarks +from typing import Any +from typing import List +from typing import Optional + import logging import copy from collections import OrderedDict import nbxmpp +from gi.repository import GLib from gajim.common import app from gajim.common import helpers from gajim.common.const import BookmarkStorageType -from gajim.common.nec import NetworkIncomingEvent +from gajim.common.const import PEPEventType +from gajim.common.nec import NetworkEvent +from gajim.common.exceptions import StanzaMalformed +from gajim.common.modules.pep import AbstractPEPModule +from gajim.common.modules.pep import AbstractPEPData from gajim.common.modules.util import from_xs_boolean from gajim.common.modules.util import to_xs_boolean + log = logging.getLogger('gajim.c.m.bookmarks') NS_GAJIM_BM = 'xmpp:gajim.org/bookmarks' -class Bookmarks: +class BookmarksData(AbstractPEPData): + + type_ = PEPEventType.BOOKMARKS + + +class Bookmarks(AbstractPEPModule): + + name = 'storage' + namespace = 'storage:bookmarks' + pep_class = BookmarksData + store_publish = False + _log = log + def __init__(self, con): - self._con = con - self._account = con.name + AbstractPEPModule.__init__(self, con) + self.bookmarks = {} self.conversion = False - - self.handlers = [] + self._join_timeouts = [] + self._request_in_progress = False def pass_disco(self, from_, _identities, features, _data, _node): if nbxmpp.NS_BOOKMARK_CONVERSION not in features: @@ -47,6 +69,52 @@ class Bookmarks: self.conversion = True log.info('Discovered Bookmarks Conversion: %s', from_) + def _extract_info(self, item): + storage = item.getTag('storage', namespace=self.namespace) + if storage is None: + raise StanzaMalformed('No storage node') + return storage + + def _notification_received(self, jid: nbxmpp.JID, user_pep: Any) -> None: + if self._request_in_progress: + log.info('Ignore update, pubsub request in progress') + return + + if not self._pubsub_support() or not self.conversion: + return + + old_bookmarks = self._convert_to_set(self.bookmarks) + self.bookmarks = self._parse_bookmarks(user_pep.data) + self._act_on_changed_bookmarks(old_bookmarks) + app.nec.push_incoming_event( + NetworkEvent('bookmarks-received', account=self._account)) + + def _act_on_changed_bookmarks(self, old_bookmarks): + new_bookmarks = self._convert_to_set(self.bookmarks) + changed = new_bookmarks - old_bookmarks + if not changed: + return + + join = [jid for jid, autojoin in changed if autojoin] + for jid in join: + log.info('Schedule autojoin in 10s for: %s', jid) + # If another client creates a MUC, the MUC is locked until the + # configuration is finished. Give the user some time to finish + # the configuration. + timeout_id = GLib.timeout_add_seconds( + 10, self._join_with_timeout, join) + self._join_timeouts.append(timeout_id) + + # TODO: leave mucs + # leave = [jid for jid, autojoin in changed if not autojoin] + + @staticmethod + def _convert_to_set(bookmarks): + set_ = set() + for jid in bookmarks: + set_.add((jid, bookmarks[jid]['autojoin'])) + return set_ + def get_sorted_bookmarks(self, short_name=False): # This returns a sorted by name copy of the bookmarks sorted_bookmarks = {} @@ -72,65 +140,43 @@ class Bookmarks: return (self._con.get_module('PEP').supported and self._con.get_module('PubSub').publish_options) - def get_bookmarks(self, storage_type=None): + def get_bookmarks(self): if not app.account_is_connected(self._account): return - if storage_type in (None, BookmarkStorageType.PUBSUB): - if self._pubsub_support(): - self._request_pubsub_bookmarks() - else: - # Fallback, request private storage - self._request_private_bookmarks() + if self._pubsub_support() and self.conversion: + self._request_pubsub_bookmarks() else: - log.info('Request Bookmarks (PrivateStorage)') self._request_private_bookmarks() def _request_pubsub_bookmarks(self) -> None: log.info('Request Bookmarks (PubSub)') + self._request_in_progress = True self._con.get_module('PubSub').send_pb_retrieve( - '', 'storage:bookmarks', - cb=self._pubsub_bookmarks_received) - - def _pubsub_bookmarks_received(self, _con, stanza): - if not nbxmpp.isResultNode(stanza): - log.info('No pubsub bookmarks: %s', stanza.getError()) - # Fallback, request private storage, only if server - # doesnt have bookmark conversion - if not self.conversion: - self._request_private_bookmarks() - return - - log.info('Received Bookmarks (PubSub)') - self._parse_bookmarks(stanza) - if not self.conversion: - # If server does not have bookmark conversion, request private - # storage and try to merge the bookmarks - self._request_private_bookmarks() + '', 'storage:bookmarks', cb=self._bookmarks_received) def _request_private_bookmarks(self) -> None: - if not app.account_is_connected(self._account): - return - + self._request_in_progress = True iq = nbxmpp.Iq(typ='get') query = iq.addChild(name='query', namespace=nbxmpp.NS_PRIVATE) query.addChild(name='storage', namespace='storage:bookmarks') log.info('Request Bookmarks (PrivateStorage)') self._con.connection.SendAndCallForResponse( - iq, self._private_bookmarks_received) + iq, self._bookmarks_received, {}) - def _private_bookmarks_received(self, stanza: nbxmpp.Iq) -> None: + def _bookmarks_received(self, _con, stanza): + self._request_in_progress = False if not nbxmpp.isResultNode(stanza): - log.info('No private bookmarks: %s', stanza.getError()) + log.info('No bookmarks found: %s', stanza.getError()) else: - log.info('Received Bookmarks (PrivateStorage)') - merged = self._parse_bookmarks(stanza, check_merge=True) - if merged and self._pubsub_support(): - log.info('Merge PrivateStorage with PubSub') - self.store_bookmarks(BookmarkStorageType.PUBSUB) - self.auto_join_bookmarks() - app.nec.push_incoming_event(BookmarksReceivedEvent( - None, account=self._account)) + log.info('Received Bookmarks') + storage = self._get_storage_node(stanza) + if storage is not None: + self.bookmarks = self._parse_bookmarks(storage) + self.auto_join_bookmarks() + + app.nec.push_incoming_event( + NetworkEvent('bookmarks-received', account=self._account)) @staticmethod def _get_storage_node(stanza): @@ -163,13 +209,9 @@ class Bookmarks: return return storage - def _parse_bookmarks(self, stanza: nbxmpp.Iq, - check_merge: bool = False) -> bool: - merged = False - storage = self._get_storage_node(stanza) - if storage is None: - return False - + @staticmethod + def _parse_bookmarks(storage: nbxmpp.Node) -> bool: + bookmarks = {} confs = storage.getTags('conference') for conf in confs: autojoin_val = conf.getAttr('autojoin') @@ -177,18 +219,14 @@ class Bookmarks: autojoin_val = False minimize_val = conf.getTag('minimize', namespace=NS_GAJIM_BM) - if not minimize_val: # not there, try old Gajim behaviour - minimize_val = conf.getAttr('minimize') - if not minimize_val: # not there (it's optional) - minimize_val = False + if not minimize_val: + minimize_val = False else: minimize_val = minimize_val.getData() print_status = conf.getTag('print_status', namespace=NS_GAJIM_BM) if not print_status: # not there, try old Gajim behaviour - print_status = conf.getTagData('print_status') - if not print_status: # not there, try old Gajim behaviour - print_status = conf.getTagData('show_status') + print_status = None else: print_status = print_status.getData() @@ -213,20 +251,16 @@ class Bookmarks: log.warning(error) continue - if check_merge: - if jid in self.bookmarks: - continue - merged = True - log.debug('Found Bookmark: %s', jid) - self.bookmarks[jid] = bookmark + bookmarks[jid] = bookmark - return merged + return bookmarks - def _build_storage_node(self) -> nbxmpp.Node: + @staticmethod + def _build_storage_node(bookmarks): storage_node = nbxmpp.Node( tag='storage', attrs={'xmlns': 'storage:bookmarks'}) - for jid, bm in self.bookmarks.items(): + for jid, bm in bookmarks.items(): conf_node = storage_node.addChild(name="conference") conf_node.setAttr('jid', jid) conf_node.setAttr('autojoin', to_xs_boolean(bm['autojoin'])) @@ -246,6 +280,9 @@ class Bookmarks: namespace=NS_GAJIM_BM).setData(bm['print_status']) return storage_node + def _build_node(self, _data): + pass + @staticmethod def get_bookmark_publish_options() -> nbxmpp.Node: options = nbxmpp.Node(nbxmpp.NS_DATA + ' x', @@ -257,23 +294,14 @@ class Bookmarks: field.setTagData('value', 'whitelist') return options - def store_bookmarks(self, storage_type=None): + def store_bookmarks(self): if not app.account_is_connected(self._account): return - storage_node = self._build_storage_node() - - if storage_type is None: - if self._pubsub_support(): - self._pubsub_store(storage_node) - if self.conversion: - # Only push to either pubsub or private storage - return - self._private_store(storage_node) - elif storage_type == BookmarkStorageType.PUBSUB: - if self._pubsub_support(): - self._pubsub_store(storage_node) - elif storage_type == BookmarkStorageType.PRIVATE: + storage_node = self._build_storage_node(self.bookmarks) + if self._pubsub_support() and self.conversion: + self._pubsub_store(storage_node) + else: self._private_store(storage_node) def _pubsub_store(self, storage_node: nbxmpp.Node) -> None: @@ -301,18 +329,27 @@ class Bookmarks: log.error('Error: %s', stanza.getError()) return - def auto_join_bookmarks(self) -> None: + def _join_with_timeout(self, bookmarks: Optional[List[str]] = None) -> None: + self._join_timeouts.pop(0) + self.auto_join_bookmarks(bookmarks) + + def auto_join_bookmarks(self, bookmarks: Optional[List[str]] = None) -> None: if app.is_invisible(self._account): return - for jid, bm in self.bookmarks.items(): - if bm['autojoin']: + if bookmarks is None: + bookmarks = self.bookmarks.keys() + + for jid in bookmarks: + bookmark = self.bookmarks[jid] + if bookmark['autojoin']: # Only join non-opened groupchats. Opened one are already # auto-joined on re-connection if jid not in app.gc_connected[self._account]: # we are not already connected + log.info('Autojoin Bookmark: %s', jid) app.interface.join_gc_room( - self._account, jid, bm['nick'], - bm['password'], minimize=bm['minimize']) + self._account, jid, bookmark['nick'], + bookmark['password'], minimize=bookmark['minimize']) def add_bookmark(self, name, jid, autojoin, minimize, password, nick): @@ -325,8 +362,8 @@ class Bookmarks: 'print_status': None} self.store_bookmarks() - app.nec.push_incoming_event(BookmarksReceivedEvent( - None, account=self._account)) + app.nec.push_incoming_event( + NetworkEvent('bookmarks-received', account=self._account)) def get_name_from_bookmark(self, jid: str) -> str: fallback = jid.split('@')[0] @@ -341,9 +378,12 @@ class Bookmarks: self._con.get_module('PubSub').send_pb_purge('', 'storage:bookmarks') self._con.get_module('PubSub').send_pb_delete('', 'storage:bookmarks') + def _remove_timeouts(self): + for _id in self._join_timeouts: + GLib.source_remove(_id) -class BookmarksReceivedEvent(NetworkIncomingEvent): - name = 'bookmarks-received' + def cleanup(self): + self._remove_timeouts() def get_instance(*args, **kwargs): View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/96edd79963b305517b2effce0f7415fb38… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/96edd79963b305517b2effce0f7415fb38… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix error on key press
by Philipp Hörist 16 Dec '18

16 Dec '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 19b0e73f by Philipp Hörist at 2018-12-16T00:01:44Z Fix error on key press Fixes #9471 - - - - - 2 changed files: - gajim/chat_control_base.py - gajim/gtk/util.py Changes: ===================================== gajim/chat_control_base.py ===================================== @@ -57,6 +57,7 @@ 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 +from gajim.gtk.util import get_primary_accel_mod from gajim.gtk.emoji_chooser import emoji_chooser from gajim.command_system.implementation.middleware import ChatCommandProcessor @@ -81,24 +82,6 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): A base class containing a banner, ConversationTextview, MessageTextView """ - keymap = Gdk.Keymap.get_for_display(Gdk.Display.get_default()) - try: - keycode_c = keymap.get_entries_for_keyval(Gdk.KEY_c)[1][0].keycode - except TypeError: - keycode_c = 54 - except IndexError: - # FIXME - # On some keyboard layouts there is no keyval for KEY_c - keycode_c = None - - try: - keycode_ins = keymap.get_entries_for_keyval(Gdk.KEY_Insert)[1][0].keycode - except TypeError: - keycode_ins = 118 - except IndexError: - # There is no KEY_Insert (MacOS) - keycode_ins = None - def make_href(self, match): url_color = app.css_config.get_value('.gajim-url', StyleAttr.COLOR) color = convert_rgb_to_hex(url_color) @@ -567,20 +550,18 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): if event.button == 3: # right click self.parent_win.popup_menu(event) - def _conv_textview_key_press_event(self, widget, event): - # translate any layout to latin_layout - _valid, entries = self.keymap.get_entries_for_keyval(event.keyval) - keycode = entries[0].keycode - if (event.get_state() & Gdk.ModifierType.CONTROL_MASK and keycode in ( - self.keycode_c, self.keycode_ins)): - return False + def _conv_textview_key_press_event(self, _widget, event): + if (event.get_state() & get_primary_accel_mod() and + event.keyval in (Gdk.KEY_c, Gdk.KEY_Insert)): + return Gdk.EVENT_PROPAGATE - if event.get_state() & Gdk.ModifierType.SHIFT_MASK and \ - event.keyval in (Gdk.KEY_Page_Down, Gdk.KEY_Page_Up): + if (event.get_state() & Gdk.ModifierType.SHIFT_MASK and + event.keyval in (Gdk.KEY_Page_Down, Gdk.KEY_Page_Up)): self._on_scroll(None, event.keyval) - return False + return Gdk.EVENT_PROPAGATE + self.parent_win.notebook.event(event) - return True + return Gdk.EVENT_STOP def _on_message_textview_key_press_event(self, widget, event): if event.keyval == Gdk.KEY_space: ===================================== gajim/gtk/util.py ===================================== @@ -472,3 +472,11 @@ def get_show_in_systray(type_, jid): # it's not an highlighted message, don't show in systray return False return app.config.get('trayicon_notification_on_events') + + +def get_primary_accel_mod(): + """ + Returns the primary Gdk.ModifierType modifier. + cmd on osx, ctrl everywhere else. + """ + return Gtk.accelerator_parse("<Primary>")[1] View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/19b0e73f444c09765f0a2a4df6fcefaa57… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/19b0e73f444c09765f0a2a4df6fcefaa57… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] DBus: Show correct unread message number
by Philipp Hörist 15 Dec '18

15 Dec '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 674ec48f by Philipp Hörist at 2018-12-15T22:59:27Z DBus: Show correct unread message number Fixes #8362 - - - - - 1 changed file: - gajim/remote_control.py Changes: ===================================== gajim/remote_control.py ===================================== @@ -901,7 +901,11 @@ class GajimRemote(Server): return contact_dict def get_unread_msgs_number(self): - return str(app.events.get_nb_events()) + unread = app.events.get_nb_events() + for event in app.events.get_all_events(['printed_gc_msg']): + if not app.config.notify_for_muc(event.jid): + unread -= 1 + return str(unread) def start_chat(self, account): if not account: View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/674ec48fa2b23a73e631489072829426df… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/674ec48fa2b23a73e631489072829426df… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Improve MUC notifications
by Philipp Hörist 15 Dec '18

15 Dec '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 760645f5 by Philipp Hörist at 2018-12-15T22:37:44Z Improve MUC notifications - Play sound for received messages, if notify for all messages is activated - Send system notifications on MUC messages - Make notify for all the default in private MUCs Fixes #9383 - - - - - 9 changed files: - gajim/chat_control_base.py - gajim/common/config.py - gajim/common/connection_handlers_events.py - gajim/common/events.py - gajim/groupchat_control.py - gajim/gtk/notification.py - gajim/gtk/util.py - gajim/message_window.py - gajim/roster_window.py Changes: ===================================== gajim/chat_control_base.py ===================================== @@ -905,8 +905,7 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): return if kind == 'incoming': if not self.type_id == message_control.TYPE_GC or \ - app.config.get('notify_on_all_muc_messages') or \ - app.config.get_per('rooms', jid, 'notify_on_all_messages') or \ + app.config.notify_for_muc(jid) or \ 'marked' in other_tags_for_text: # it's a normal message, or a muc message with want to be # notified about if quitting just after ===================================== gajim/common/config.py ===================================== @@ -482,7 +482,7 @@ class Config: 'contact_disconnected': [False, 'disconnected.wav'], 'message_sent': [False, 'sent.wav'], 'muc_message_highlight': [True, 'gc_message1.wav', _('Sound to play when a group chat message contains one of the words in muc_highlight_words, or when a group chat message contains your nickname.')], - 'muc_message_received': [False, 'gc_message2.wav', _('Sound to play when any MUC message arrives.')], + 'muc_message_received': [True, 'gc_message2.wav', _('Sound to play when any MUC message arrives.')], } proxies_default = { @@ -638,13 +638,15 @@ class Config: obj[subname] = value self._timeout_save() - def get_per(self, optname, key=None, subname=None): # per_group_of_option + def get_per(self, optname, key=None, subname=None, default=None): # per_group_of_option if optname not in self.__options_per_key: return None dict_ = self.__options_per_key[optname][1] if not key: return list(dict_.keys()) if key not in dict_: + if default is not None: + return default if subname in self.__options_per_key[optname][0]: return self.__options_per_key[optname][0][subname][1] return None @@ -712,6 +714,11 @@ class Config: return (account not in no_log_for) and (jid not in no_log_for) + def notify_for_muc(self, room): + all_ = self.get('notify_on_all_muc_messages') + room = self.get_per('rooms', room, 'notify_on_all_messages') + return all_ or room + def _init_options(self): for opt in self.__options[0]: self.__options[1][opt] = self.__options[0][opt][Option.VAL] ===================================== gajim/common/connection_handlers_events.py ===================================== @@ -1036,7 +1036,46 @@ class NotificationEvent(nec.NetworkIncomingEvent): else: self.do_sound = False - self.do_popup = False + self.control = app.interface.msg_win_mgr.search_control( + msg_obj.jid, self.account) + + if self.control is not None: + self.control_focused = self.control.has_focus() + + if app.config.get('notify_on_new_message'): + notify_for_muc = (app.config.notify_for_muc(self.jid) or + sound == 'highlight') + if not notify_for_muc: + self.do_popup = False + + elif self.control_focused: + self.do_popup = False + + elif app.config.get('autopopupaway'): + # always show notification + self.do_popup = True + + elif app.connections[self.conn.name].connected in (2, 3): + # we're online or chat + self.do_popup = True + + self.popup_msg_type = 'gc_msg' + self.popup_event_type = _('New Group Chat Message') + + if app.config.get('notification_preview_message'): + self.popup_text = msg_obj.msgtxt + + type_events = ['printed_marked_gc_msg', 'printed_gc_msg'] + count = len(app.events.get_events(self.account, self.jid, type_events)) + + contact = app.contacts.get_contact(self.account, self.jid) + + self.popup_title = i18n.ngettext( + 'New message from %(nickname)s', + '%(n_msgs)i unread messages in %(groupchat_name)s', + count) % {'nickname': self.base_event.nick, + 'n_msgs': count, + 'groupchat_name': contact.get_shown_name()} def handle_incoming_pres_event(self, pres_obj): if app.jid_is_transport(pres_obj.jid): ===================================== gajim/common/events.py ===================================== @@ -332,6 +332,16 @@ class Events: events_list.append(ev) return events_list + def get_all_events(self, types=None): + accounts = self._events.keys() + events = [] + for account in accounts: + for jid in self._events[account]: + for event in self._events[account][jid]: + if types is None or event.type_ in types: + events.append(event) + return events + def get_first_event(self, account=None, jid=None, type_=None): """ Return the first event of type type_ if given ===================================== gajim/groupchat_control.py ===================================== @@ -375,8 +375,11 @@ class GroupchatControl(ChatControlBase): act.connect('change-state', self._on_minimize) self.parent_win.window.add_action(act) + # Enable notify on all for private rooms + members_only = muc_caps_cache.supports(self.contact.jid, + 'muc#roomconfig_membersonly') value = app.config.get_per( - 'rooms', self.contact.jid, 'notify_on_all_messages') + 'rooms', self.contact.jid, 'notify_on_all_messages', members_only) act = Gio.SimpleAction.new_stateful( 'notify-on-message-' + self.control_id, @@ -1294,8 +1297,7 @@ class GroupchatControl(ChatControlBase): def get_nb_unread(self): type_events = ['printed_marked_gc_msg'] - if app.config.get('notify_on_all_muc_messages') or \ - app.config.get_per('rooms', self.room_jid, 'notify_on_all_messages'): + if app.config.notify_for_muc(self.room_jid): type_events.append('printed_gc_msg') nb = len(app.events.get_events(self.account, self.room_jid, type_events)) @@ -1314,25 +1316,30 @@ class GroupchatControl(ChatControlBase): Returns a 2-Tuple. The first says whether or not to highlight the text, the second, what sound to play """ - highlight, sound = (None, None) + highlight, sound = None, None + + notify = app.config.notify_for_muc(self.room_jid) + message_sound_enabled = app.config.get_per('soundevents', + 'muc_message_received', + 'enabled') # Are any of the defined highlighting words in the text? if self.needs_visual_notification(text): highlight = True - if app.config.get_per('soundevents', 'muc_message_highlight', - 'enabled'): + if app.config.get_per('soundevents', + 'muc_message_highlight', + 'enabled'): sound = 'highlight' # Do we play a sound on every muc message? - elif app.config.get_per('soundevents', 'muc_message_received', \ - 'enabled'): + elif notify and message_sound_enabled: sound = 'received' # Is it a history message? Don't want sound-floods when we join. if tim is not None and time.mktime(time.localtime()) - tim > 1: sound = None - return (highlight, sound) + return highlight, sound def check_and_possibly_add_focus_out_line(self): """ ===================================== gajim/gtk/notification.py ===================================== @@ -111,7 +111,8 @@ class Notification: if event.type_ == 'gc-invitation': self._withdraw('gc-invitation', event.account, event.room_jid) if event.type_ in ('normal', 'printed_chat', 'chat', - 'printed_pm', 'pm'): + 'printed_pm', 'pm', 'printed_marked_gc_msg', + 'printed_gc_msg'): self._withdraw('new-message', event.account, event.jid) def _nec_our_status(self, obj): @@ -164,6 +165,7 @@ class Notification: if event_type in ( _('Contact Signed In'), _('Contact Signed Out'), _('New Message'), _('New Single Message'), _('New Private Message'), + _('New Group Chat Message'), _('Contact Changed Status'), _('File Transfer Request'), _('File Transfer Error'), _('File Transfer Completed'), _('File Transfer Stopped'), _('Groupchat Invitation'), @@ -193,7 +195,8 @@ class Notification: notif_id = self._make_id('connection-failed', account) elif event_type in (_('New Message'), _('New Single Message'), - _('New Private Message')): + _('New Private Message'), + _('New Group Chat Message')): avatar = app.contacts.get_avatar(account, jid) if avatar: icon_pixbuf = avatar ===================================== gajim/gtk/util.py ===================================== @@ -467,11 +467,8 @@ def get_show_in_systray(type_, jid): """ Return True if this event must be shown in systray, else False """ - notify = app.config.get('notify_on_all_muc_messages') - notify_for_jid = app.config.get_per( - 'rooms', jid, 'notify_on_all_messages') - - if type_ == 'printed_gc_msg' and not notify and not notify_for_jid: + notify = app.config.notify_for_muc(jid) + if type_ == 'printed_gc_msg' and not notify: # it's not an highlighted message, don't show in systray return False return app.config.get('trayicon_notification_on_events') ===================================== gajim/message_window.py ===================================== @@ -490,10 +490,9 @@ class MessageWindow: return unread = 0 for ctrl in self.controls(): - if ctrl.type_id == message_control.TYPE_GC and not \ - app.config.get('notify_on_all_muc_messages') and not \ - app.config.get_per('rooms', ctrl.room_jid, - 'notify_on_all_messages') and not ctrl.attention_flag: + if (ctrl.type_id == message_control.TYPE_GC and not + app.config.notify_for_muc(ctrl.room_jid) and not + ctrl.attention_flag): # count only pm messages unread += ctrl.get_nb_unread_pm() continue @@ -509,10 +508,8 @@ class MessageWindow: if control.type_id == message_control.TYPE_GC: name = control.room_jid.split('@')[0] - urgent = control.attention_flag or \ - app.config.get('notify_on_all_muc_messages') or \ - app.config.get_per('rooms', control.room_jid, - 'notify_on_all_messages') + urgent = (control.attention_flag or + app.config.notify_for_muc(control.room_jid)) else: name = control.contact.get_shown_name() if control.resource: ===================================== gajim/roster_window.py ===================================== @@ -2520,10 +2520,10 @@ class RosterWindow: return # check if we have unread messages unread = app.events.get_nb_events() - if not app.config.get('notify_on_all_muc_messages'): - unread_not_to_notify = app.events.get_nb_events( - ['printed_gc_msg']) - unread -= unread_not_to_notify + + for event in app.events.get_all_events(['printed_gc_msg']): + if not app.config.notify_for_muc(event.jid): + unread -= 1 # check if we have recent messages recent = False View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/760645f5c3006de6c47353c02461f8067f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/760645f5c3006de6c47353c02461f8067f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Dont draw contact after selection change
by Philipp Hörist 14 Dec '18

14 Dec '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: dac53707 by Philipp Hörist at 2018-12-14T20:39:58Z Dont draw contact after selection change This seems to be an old codepath, currently there is no need to redraw a contact on selection change Fixes #9496 - - - - - 1 changed file: - gajim/groupchat_control.py Changes: ===================================== gajim/groupchat_control.py ===================================== @@ -174,8 +174,6 @@ class GroupchatControl(ChatControlBase): self.widget_set_visible(self.xml.get_object('banner_eventbox'), app.config.get('hide_groupchat_banner')) - self._last_selected_contact = None # None or holds jid, account tuple - # muc attention flag (when we are mentioned in a muc) # if True, the room has mentioned us self.attention_flag = False @@ -198,12 +196,8 @@ class GroupchatControl(ChatControlBase): self.event_box = self.xml.get_object('banner_eventbox') self.list_treeview = self.xml.get_object('list_treeview') - selection = self.list_treeview.get_selection() - id_ = selection.connect('changed', - self.on_list_treeview_selection_changed) - self.handlers[id_] = selection id_ = self.list_treeview.connect('style-set', - self.on_list_treeview_style_set) + self.on_list_treeview_style_set) self.handlers[id_] = self.list_treeview # flag that stops hpaned position event @@ -912,21 +906,6 @@ class GroupchatControl(ChatControlBase): nick = contact[Column.NICK] self.draw_contact(nick) - def on_list_treeview_selection_changed(self, selection): - model, selected_iter = selection.get_selected() - self.draw_contact(self.nick) - if self._last_selected_contact is not None: - self.draw_contact(self._last_selected_contact) - if selected_iter is None: - self._last_selected_contact = None - return - contact = model[selected_iter] - nick = contact[Column.NICK] - self._last_selected_contact = nick - if contact[Column.TYPE] != 'contact': - return - self.draw_contact(nick, selected=True, focus=True) - def get_tab_label(self, chatstate): """ Markup the label if necessary. Returns a tuple such as: (new_label_str, @@ -1625,7 +1604,7 @@ class GroupchatControl(ChatControlBase): if ctrl and msg: ctrl.send_message(msg) - def draw_contact(self, nick, selected=False, focus=False): + def draw_contact(self, nick): iter_ = self.get_contact_iter(nick) if not iter_: return View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/dac5370780961b05782d0767ee6f21788f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/dac5370780961b05782d0767ee6f21788f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Fix bind after failed resume
by Philipp Hörist 14 Dec '18

14 Dec '18

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 7f39ed31 by Philipp Hörist at 2018-12-14T20:14:48Z Fix bind after failed resume We already received the features at the time of a failed resume so the handler is never called - - - - - 1 changed file: - nbxmpp/bind.py Changes: ===================================== nbxmpp/bind.py ===================================== @@ -47,6 +47,12 @@ class NonBlockingBind(PlugIn): self._owner.RegisterHandler( 'features', self._on_features, xmlns=NS_STREAMS) + feats = self._owner.Dispatcher.Stream.features + if feats is not None: + if feats.getTag('bind', namespace=NS_BIND) is not None: + # We already received the features + self._on_features(None, feats) + def _on_features(self, _con, feats): """ Determine if server supports resource binding and set some internal @@ -123,4 +129,4 @@ class NonBlockingBind(PlugIn): if feats.getTag('sm', namespace=NS_STREAM_MGMT): self._owner.Smacks.send_enable() self._owner.Dispatcher.Event(Realm.CONNECTING, Event.CONNECTION_ACTIVE) - self.PlugOut() \ No newline at end of file + self.PlugOut() View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/7f39ed31591c7d0eea66259d4b… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/7f39ed31591c7d0eea66259d4b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix start chat menu action
by Philipp Hörist 12 Dec '18

12 Dec '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 5843827a by Philipp Hörist at 2018-12-12T22:35:36Z Fix start chat menu action Fixes #8275 - - - - - 1 changed file: - gajim/gui_menu_builder.py Changes: ===================================== gajim/gui_menu_builder.py ===================================== @@ -933,19 +933,13 @@ def get_conv_context_menu(account, kind, text): menuitem.set_label(label) if action.startswith('-'): + text = text.replace('xmpp:', '') + text = text.split('?')[0] action = 'app.%s%s' % (account, action) else: action = 'app.%s' % action menuitem.set_action_name(action) - if 'join-groupchat' in action: - text = text.replace('xmpp:', '') - text = text.split('?')[0] - - if 'add-contact' in action: - text = text.replace('xmpp:', '') - text = text.split('?')[0] - if action == 'app.open-link': value = GLib.Variant.new_strv([kind, text]) elif action == 'app.copy-link': View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/5843827abc94818e867dab1b82cdb1d18b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/5843827abc94818e867dab1b82cdb1d18b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Fix disabled join groupchat menu
by Philipp Hörist 10 Dec '18

10 Dec '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 4e814dab by Philipp Hörist at 2018-12-10T21:30:37Z Fix disabled join groupchat menu When there are no bookmarks on the server the join groupchat menu was disabled, preventing the user to open the join groupchat dialog - - - - - be420d44 by Philipp Hörist at 2018-12-10T21:30:45Z Implement XEP-0411 Bookmarks Conversion If bookmarks conversion is announced by the server: - Dont merge bookmarks - Only push to either private storage or pubsub - - - - - 4 changed files: - gajim/common/modules/bookmarks.py - gajim/groupchat_control.py - gajim/gtk/join_groupchat.py - gajim/gui_menu_builder.py Changes: ===================================== gajim/common/modules/bookmarks.py ===================================== @@ -38,7 +38,6 @@ class Bookmarks: self._account = con.name self.bookmarks = {} self.conversion = False - self.available = False self.handlers = [] @@ -96,14 +95,18 @@ class Bookmarks: def _pubsub_bookmarks_received(self, _con, stanza): if not nbxmpp.isResultNode(stanza): log.info('No pubsub bookmarks: %s', stanza.getError()) - # Fallback, request private storage - self._request_private_bookmarks() + # Fallback, request private storage, only if server + # doesnt have bookmark conversion + if not self.conversion: + self._request_private_bookmarks() return - self.available = True log.info('Received Bookmarks (PubSub)') self._parse_bookmarks(stanza) - self._request_private_bookmarks() + if not self.conversion: + # If server does not have bookmark conversion, request private + # storage and try to merge the bookmarks + self._request_private_bookmarks() def _request_private_bookmarks(self) -> None: if not app.account_is_connected(self._account): @@ -120,7 +123,6 @@ class Bookmarks: if not nbxmpp.isResultNode(stanza): log.info('No private bookmarks: %s', stanza.getError()) else: - self.available = True log.info('Received Bookmarks (PrivateStorage)') merged = self._parse_bookmarks(stanza, check_merge=True) if merged and self._pubsub_support(): @@ -264,6 +266,9 @@ class Bookmarks: if storage_type is None: if self._pubsub_support(): self._pubsub_store(storage_node) + if self.conversion: + # Only push to either pubsub or private storage + return self._private_store(storage_node) elif storage_type == BookmarkStorageType.PUBSUB: if self._pubsub_support(): ===================================== gajim/groupchat_control.py ===================================== @@ -419,10 +419,9 @@ class GroupchatControl(ChatControlBase): # Bookmarks con = app.connections[self.account] - bookmark_support = con.get_module('Bookmarks').available bookmarked = self.room_jid in con.get_module('Bookmarks').bookmarks win.lookup_action('bookmark-' + self.control_id).set_enabled( - self.is_connected and bookmark_support and not bookmarked) + self.is_connected and not bookmarked) # Request Voice role = self.get_role(self.nick) ===================================== gajim/gtk/join_groupchat.py ===================================== @@ -113,10 +113,6 @@ class JoinGroupchatWindow(Gtk.ApplicationWindow): # Set bookmark switch sensitive if server supports bookmarks acc = self.account_combo.get_active_id() - con = app.connections[acc] - if not con.get_module('Bookmarks').available: - self.bookmark_switch.set_sensitive(False) - self.autojoin_switch.set_sensitive(False) self.show_all() ===================================== gajim/gui_menu_builder.py ===================================== @@ -714,10 +714,8 @@ def get_groupchat_menu(control_id, account, jid): def get_bookmarks_menu(account, rebuild=False): con = app.connections[account] - boomarks = con.get_module('Bookmarks').get_sorted_bookmarks( - short_name=True) - if not boomarks: - return None + boomarks = con.get_module('Bookmarks').get_sorted_bookmarks(short_name=True) + menu = Gio.Menu() # Build Join Groupchat View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/6e30d3af6473d41de42f1d60cd0363215… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/6e30d3af6473d41de42f1d60cd0363215… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.1] Update ChangeLog
by Philipp Hörist 09 Dec '18

09 Dec '18

Philipp Hörist pushed to branch gajim_1.1 at gajim / gajim Commits: c9033938 by Philipp Hörist at 2018-12-09T20:41:25Z Update ChangeLog - - - - - 1 changed file: - ChangeLog Changes: ===================================== ChangeLog ===================================== @@ -1,3 +1,24 @@ +Gajim 1.1.1 (10 December 2018) + + Bug fixes + + * 9427 Placeholder not cleared if pasting text into message input + * 9444 Determine the delay timestamp correctly when using mam:1 + * 9453 Fix opening links inside the group chat subject (MacOS/Windows) + * 9465 Allow the full range of possible nicknames in group chats + * 9067 Gajim crashes when receiving xhtml messages + * 9472 Handle presences without from attr correctly + * 9473 Error when creating a new group chat + * 9491 Identify group chat subject changes correctly + * Determine soundplayer correctly on unix systems + * In some circumstances plugins could not be deleted + * Show correct contact status on tabs + * Dont answer group chat receipt requests + * Fix receipts for private messages + * Pressing the back button in the Accounts window leads to an error + * Better handle not available keyring backends + * Dont show incorrect contact on private messages + Gajim 1.1.0 (06 November 2018) New View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/c90339383c5276df677407e63af3dbad05… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/c90339383c5276df677407e63af3dbad05… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.1] 2 commits: Find correct contact on private message
by Philipp Hörist 09 Dec '18

09 Dec '18

Philipp Hörist pushed to branch gajim_1.1 at gajim / gajim Commits: 5af79671 by Philipp Hörist at 2018-12-09T20:24:43Z Find correct contact on private message get_contact() returns also a contact if only the bare jid matches, which for private messages is the groupchat contact object. - - - - - 2a8d5739 by Philipp Hörist at 2018-12-09T20:24:56Z MUC: Identify subject change correctly Fixes #9491 - - - - - 5 changed files: - gajim/common/connection_handlers_events.py - gajim/common/modules/message.py - gajim/groupchat_control.py - gajim/roster_window.py - gajim/session.py Changes: ===================================== gajim/common/connection_handlers_events.py ===================================== @@ -432,15 +432,6 @@ class GcMessageReceivedEvent(nec.NetworkIncomingEvent): # message from server self.nick = '' - self.subject = self.stanza.getSubject() - - if self.subject is not None: - app.nec.push_incoming_event( - nec.NetworkEvent('gc-subject-received', - nickname=self.msg_obj.resource, - **vars(self.msg_obj))) - return - conditions = self.stanza.getStatusConditions() if conditions: self.status_code = [] ===================================== gajim/common/modules/message.py ===================================== @@ -227,7 +227,10 @@ class Message: subject = event.stanza.getSubject() groupchat = event.mtype == 'groupchat' - muc_subject = subject and groupchat + + # XEP-0045: only a message that contains a <subject/> but no <body/> + # element shall be considered a subject change for MUC purposes. + muc_subject = subject and groupchat and not event.msgtxt # Determine timestamps if groupchat: @@ -284,6 +287,11 @@ class Message: event.session, event.fjid, timestamp) return + if muc_subject: + app.nec.push_incoming_event(NetworkEvent('gc-subject-received', + **vars(event))) + return + if groupchat: app.nec.push_incoming_event(GcMessageReceivedEvent( None, ===================================== gajim/groupchat_control.py ===================================== @@ -1535,7 +1535,7 @@ class GroupchatControl(ChatControlBase): self.draw_banner_text() def _nec_gc_subject_received(self, event): - if event.conn.name != self.account: + if event.account != self.account: return if event.jid != self.room_jid: return @@ -1544,7 +1544,7 @@ class GroupchatControl(ChatControlBase): return self.set_subject(event.subject) text = _('%(nick)s has set the subject to %(subject)s') % { - 'nick': event.nickname, 'subject': event.subject} + 'nick': event.resource, 'subject': event.subject} if event.delayed: date = time.strftime('%d-%m-%Y %H:%M:%S', ===================================== gajim/roster_window.py ===================================== @@ -2700,10 +2700,10 @@ class RosterWindow: def _nec_gc_subject_received(self, obj): contact = app.contacts.get_contact_with_highest_priority( - obj.conn.name, obj.jid) + obj.account, obj.jid) if contact: contact.status = obj.subject - self.draw_contact(obj.jid, obj.conn.name) + self.draw_contact(obj.jid, obj.account) def _nec_metacontacts_received(self, obj): self.redraw_metacontacts(obj.conn.name) ===================================== gajim/session.py ===================================== @@ -79,11 +79,13 @@ class ChatControlSession: """ if obj.session != self: return - contact = app.contacts.get_contact(self.conn.name, obj.jid, - obj.resource) - if not contact: - contact = app.contacts.get_gc_contact(self.conn.name, obj.jid, - obj.resource) + + if obj.muc_pm: + contact = app.contacts.get_gc_contact( + self.conn.name, obj.jid, obj.resource) + else: + contact = app.contacts.get_contact( + self.conn.name, obj.jid, obj.resource) if self.resource != obj.resource: self.resource = obj.resource if self.control: View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/1c09b50791eecd26c706a53d877912e1d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/1c09b50791eecd26c706a53d877912e1d… 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