Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] 2 commits: Add a bookmark sorting method
by Philipp Hörist 04 Sep '18

04 Sep '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: b62335ea by Philipp Hörist at 2018-09-04T21:22:57Z Add a bookmark sorting method - - - - - 27f75806 by Philipp Hörist at 2018-09-04T22:06:59Z Light refactring of bookmark code - Convert xs:boolean values in bookmark module - Use python booleans for minimize and autojoin in other parts of Gajim - Use add_bookmark() instead of manipulating the bookmarks dict - - - - - 9 changed files: - gajim/common/helpers.py - gajim/common/modules/bookmarks.py - gajim/common/modules/util.py - gajim/disco.py - gajim/groupchat_control.py - gajim/gtk/bookmarks.py - gajim/gtk/join_groupchat.py - gajim/gui_menu_builder.py - gajim/roster_window.py Changes: ===================================== gajim/common/helpers.py ===================================== --- a/gajim/common/helpers.py +++ b/gajim/common/helpers.py @@ -499,16 +499,6 @@ def get_file_path_from_dnd_dropped_uri(uri): path = path[5:] # 5 is len('file:') return path -def from_xs_boolean_to_python_boolean(value): - # this is xs:boolean so 'true', 'false', '1', '0' - # convert those to True/False (python booleans) - if value in ('1', 'true'): - val = True - else: # '0', 'false' or anything else - val = False - - return val - def get_xmpp_show(show): if show in ('online', 'offline'): return None ===================================== gajim/common/modules/bookmarks.py ===================================== --- a/gajim/common/modules/bookmarks.py +++ b/gajim/common/modules/bookmarks.py @@ -15,6 +15,8 @@ # XEP-0048: Bookmarks import logging +import copy +from collections import OrderedDict import nbxmpp @@ -22,6 +24,8 @@ 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.modules.util import from_xs_boolean +from gajim.common.modules.util import to_xs_boolean log = logging.getLogger('gajim.c.m.bookmarks') @@ -35,6 +39,27 @@ class Bookmarks: self.handlers = [] + def get_sorted_bookmarks(self, short_name=False): + # This returns a sorted by name copy of the bookmarks + sorted_bookmarks = {} + for jid, bookmarks in self.bookmarks.items(): + bookmark_copy = copy.deepcopy(bookmarks) + if not bookmark_copy['name']: + # No name was given for this bookmark + # Use the first part of JID instead + name = jid.split("@")[0] + bookmark_copy['name'] = name + + if short_name: + name = bookmark_copy['name'] + name = (name[:42] + '..') if len(name) > 42 else name + bookmark_copy['name'] = name + + sorted_bookmarks[jid] = bookmark_copy + return OrderedDict( + sorted(sorted_bookmarks.items(), + key=lambda bookmark: bookmark[1]['name'].lower())) + def _pubsub_support(self): return (self._con.get_module('PEP').supported and self._con.get_module('PubSub').publish_options) @@ -170,8 +195,8 @@ class Bookmarks: log.debug('Found Bookmark: %s', jid) self.bookmarks[jid] = { 'name': conf.getAttr('name'), - 'autojoin': autojoin_val, - 'minimize': minimize_val, + 'autojoin': from_xs_boolean(autojoin_val), + 'minimize': from_xs_boolean(minimize_val), 'password': conf.getTagData('password'), 'nick': conf.getTagData('nick'), 'print_status': print_status} @@ -185,10 +210,10 @@ class Bookmarks: for jid, bm in self.bookmarks.items(): conf_node = storage_node.addChild(name="conference") conf_node.setAttr('jid', jid) - conf_node.setAttr('autojoin', bm['autojoin']) + conf_node.setAttr('autojoin', to_xs_boolean(bm['autojoin'])) conf_node.setAttr('name', bm['name']) - conf_node.setTag( - 'minimize', namespace=NS_GAJIM_BM).setData(bm['minimize']) + conf_node.setTag('minimize', namespace=NS_GAJIM_BM).setData( + to_xs_boolean(bm['minimize'])) # Only add optional elements if not empty # Note: need to handle both None and '' as empty # thus shouldn't use "is not None" @@ -256,15 +281,14 @@ class Bookmarks: if app.is_invisible(self._account): return for jid, bm in self.bookmarks.items(): - if bm['autojoin'] in ('1', 'true'): + if bm['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 - minimize = bm['minimize'] in ('1', 'true') app.interface.join_gc_room( self._account, jid, bm['nick'], - bm['password'], minimize=minimize) + bm['password'], minimize=bm['minimize']) def add_bookmark(self, name, jid, autojoin, minimize, password, nick): ===================================== gajim/common/modules/util.py ===================================== --- a/gajim/common/modules/util.py +++ b/gajim/common/modules/util.py @@ -39,3 +39,36 @@ def is_muc_pm(message, jid, groupchat=False): if app.logger.jid_is_room_jid(jid.getStripped()): return True return False + + +def from_xs_boolean(value): + # Convert a xs:boolean ('true', 'false', '1', '0', '') + # to a python boolean (True, False) + if value in (True, False): + return value + + if value in ('1', 'true'): + return True + + # '0', 'false' or empty + if value in ('0', 'false', ''): + return False + + raise ValueError( + 'Cant convert %s to python boolean' % value) + + +def to_xs_boolean(value): + # Convert to xs:boolean ('true', 'false') + # from a python boolean (True, False) or None + if value in ('true', 'false'): + return value + + if value is True: + return 'true' + + if value in (False, None): + return 'false' + + raise ValueError( + 'Cant convert %s to xs:boolean' % value) ===================================== gajim/disco.py ===================================== --- a/gajim/disco.py +++ b/gajim/disco.py @@ -1708,19 +1708,11 @@ class MucBrowser(AgentBrowser): def on_bookmark_button_clicked(self, *args): con = app.connections[self.account] - model, iter = self.window.services_treeview.get_selection().get_selected() - if not iter: + model, iter_ = self.window.services_treeview.get_selection().get_selected() + if not iter_: return - name = app.config.get_per('accounts', self.account, 'name') - room_jid = model[iter][0] - bm = { - 'name': room_jid.split('@')[0], - 'autojoin': '0', - 'minimize': '0', - 'password': '', - 'nick': name - } + room_jid = model[iter_][0] if room_jid in con.get_module('Bookmarks').bookmarks: ErrorDialog( _('Bookmark already set'), @@ -1728,10 +1720,12 @@ class MucBrowser(AgentBrowser): transient_for=self.window.window) return - con.get_module('Bookmarks').bookmarks[room_jid] = bm - con.get_module('Bookmarks').store_bookmarks() - - gui_menu_builder.build_bookmark_menu(self.account) + con.get_module('Bookmarks').add_bookmark(room_jid.split('@')[0], + room_jid, + False, + False, + '' + '') InformationDialog( _('Bookmark has been added successfully'), ===================================== gajim/groupchat_control.py ===================================== --- a/gajim/groupchat_control.py +++ b/gajim/groupchat_control.py @@ -715,9 +715,12 @@ class GroupchatControl(ChatControlBase): """ password = app.gc_passwords.get(self.room_jid, '') con = app.connections[self.account] - con.get_module('Bookmarks').add_bookmark( - self.name, self.room_jid, - '1', '1', password, self.nick) + con.get_module('Bookmarks').add_bookmark(self.name, + self.room_jid, + True, + True, + password, + self.nick) self.update_actions() def _on_request_voice(self, action, param): ===================================== gajim/gtk/bookmarks.py ===================================== --- a/gajim/gtk/bookmarks.py +++ b/gajim/gtk/bookmarks.py @@ -45,29 +45,17 @@ class ManageBookmarksWindow: None, None, None, None, account_label]) con = app.connections[account] - bookmarks = con.get_module('Bookmarks').bookmarks - for jid, bookmark in bookmarks.items(): - if not bookmark['name']: - # No name was given for this bookmark. - # Use the first part of JID instead... - name = jid.split("@")[0] - bookmark['name'] = name - - # make '1', '0', 'true', 'false' (or other) to True/False - autojoin = helpers.from_xs_boolean_to_python_boolean( - bookmark['autojoin']) - - minimize = helpers.from_xs_boolean_to_python_boolean( - bookmark['minimize']) + bookmarks = con.get_module('Bookmarks').get_sorted_bookmarks() + for jid, bookmark in bookmarks.items(): print_status = bookmark.get('print_status', '') if print_status not in ('', 'all', 'in_and_out', 'none'): print_status = '' self.treestore.append(iter_, [account, bookmark['name'], jid, - autojoin, - minimize, + bookmark['autojoin'], + bookmark['minimize'], bookmark['password'], bookmark['nick'], print_status, @@ -215,23 +203,16 @@ class ManageBookmarksWindow: con.get_module('Bookmarks').bookmarks = {} for bm in account.iterchildren(): - # Convert True/False/None to '1' or '0' - autojoin = str(int(bm[3])) - minimize = str(int(bm[4])) - name = bm[1] - jid = bm[2] - pw = bm[5] - nick = bm[6] - # create the bookmark-dict bmdict = { - 'name': name, - 'autojoin': autojoin, - 'minimize': minimize, - 'password': pw, - 'nick': nick, + 'name': bm[1], + 'autojoin': bm[3], + 'minimize': bm[4], + 'password': bm[5], + 'nick': bm[6], 'print_status': bm[7]} + jid = bm[2] con.get_module('Bookmarks').bookmarks[jid] = bmdict con.get_module('Bookmarks').store_bookmarks() ===================================== gajim/gtk/join_groupchat.py ===================================== --- a/gajim/gtk/join_groupchat.py +++ b/gajim/gtk/join_groupchat.py @@ -261,12 +261,16 @@ class JoinGroupchatWindow(Gtk.ApplicationWindow): if not add_bookmark: return - autojoin = int(self.autojoin_switch.get_active()) + autojoin = self.autojoin_switch.get_active() # Add as bookmark, with autojoin and not minimized name = app.get_nick_from_jid(self.room_jid) - con.get_module('Bookmarks').add_bookmark( - name, self.room_jid, autojoin, 1, password, nickname) + con.get_module('Bookmarks').add_bookmark(name, + self.room_jid, + autojoin, + True, + password, + nickname) def _on_search_clicked(self, widget): server = self.server_combo.get_active_text().strip() ===================================== gajim/gui_menu_builder.py ===================================== --- a/gajim/gui_menu_builder.py +++ b/gajim/gui_menu_builder.py @@ -679,7 +679,8 @@ def get_groupchat_menu(control_id): def get_bookmarks_menu(account, rebuild=False): con = app.connections[account] - boomarks = con.get_module('Bookmarks').bookmarks + boomarks = con.get_module('Bookmarks').get_sorted_bookmarks( + short_name=True) if not boomarks: return None menu = Gio.Menu() @@ -695,13 +696,6 @@ def get_bookmarks_menu(account, rebuild=False): section = Gio.Menu() for jid, bookmark in boomarks.items(): name = bookmark['name'] - if not name: - # No name was given for this bookmark. - # Use the first part of JID instead... - name = jid.split("@")[0] - - # Shorten long names - name = (name[:42] + '..') if len(name) > 42 else name action = 'app.{}-activate-bookmark'.format(account) menuitem = Gio.MenuItem.new(name, action) ===================================== gajim/roster_window.py ===================================== --- a/gajim/roster_window.py +++ b/gajim/roster_window.py @@ -5488,15 +5488,10 @@ class RosterWindow: item = Gtk.SeparatorMenuItem.new() gc_sub_menu.append(item) - for jid, bookmark in con.get_module('Bookmarks').bookmarks.items(): + bookmarks = con.get_module('Bookmarks').get_sorted_bookmarks( + short_name=True) + for jid, bookmark in bookmarks.items(): name = bookmark['name'] - if not name: - # No name was given for this bookmark. - # Use the first part of JID instead... - name = jid.split("@")[0] - - # Shorten long names - name = (name[:42] + '..') if len(name) > 42 else name # Do not use underline. item = Gtk.MenuItem.new_with_label(name) View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/a9a115d359094fd969f75f85faa48dcca… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/a9a115d359094fd969f75f85faa48dcca… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix highlight on messages without time
by Philipp Hörist 02 Sep '18

02 Sep '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: a9a115d3 by Philipp Hörist at 2018-09-02T21:31:42Z Fix highlight on messages without time - - - - - 1 changed file: - gajim/groupchat_control.py Changes: ===================================== gajim/groupchat_control.py ===================================== --- a/gajim/groupchat_control.py +++ b/gajim/groupchat_control.py @@ -1438,7 +1438,7 @@ class GroupchatControl(ChatControlBase): sound = 'received' # Is it a history message? Don't want sound-floods when we join. - if time.mktime(time.localtime()) - tim > 1: + if tim is not None and time.mktime(time.localtime()) - tim > 1: sound = None return (highlight, sound) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/a9a115d359094fd969f75f85faa48dccae… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/a9a115d359094fd969f75f85faa48dccae… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: music_track_listener: don't hard code media players
by Philipp Hörist 02 Sep '18

02 Sep '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: b56f9c6f by André Apitzsch at 2018-09-01T22:46:37Z music_track_listener: don't hard code media players inspired by https://gitlab.gnome.org/GNOME/gnome-shell/blob/0ba346b7504d1d53cb6e107c51e… - - - - - b8444fec by André Apitzsch at 2018-09-02T16:58:28Z music_track_listener: recognize playing song when listener is enabled - - - - - 2 changed files: - gajim/gui_interface.py - gajim/music_track_listener.py Changes: ===================================== gajim/gui_interface.py ===================================== --- a/gajim/gui_interface.py +++ b/gajim/gui_interface.py @@ -2099,11 +2099,13 @@ class Interface: if not self.music_track_changed_signal: self.music_track_changed_signal = listener.connect( 'music-track-changed', self.music_track_changed) + listener.start() def disable_music_listener(self): listener = MusicTrackListener.get() listener.disconnect(self.music_track_changed_signal) self.music_track_changed_signal = None + listener.stop() @staticmethod def music_track_changed(unused_listener, music_track_info, account=None): ===================================== gajim/music_track_listener.py ===================================== --- a/gajim/music_track_listener.py +++ b/gajim/music_track_listener.py @@ -30,20 +30,7 @@ from gi.repository import Gio, GLib log = logging.getLogger('gajim.music_track_listener') - -def _get_music_players(): - players = [ - 'org.mpris.MediaPlayer2.audacious', - 'org.mpris.MediaPlayer2.bmp', - 'org.mpris.MediaPlayer2.clementine', - 'org.mpris.MediaPlayer2.GnomeMusic', - 'org.mpris.MediaPlayer2.quodlibet', - 'org.mpris.MediaPlayer2.rhythmbox', - 'org.mpris.MediaPlayer2.vlc', - 'org.mpris.MediaPlayer2.xmms2' - ] - - return players +MPRIS_PLAYER_PREFIX = 'org.mpris.MediaPlayer2.' class MusicTrackInfo(object): @@ -65,22 +52,69 @@ class MusicTrackListener(GObject.GObject): return cls._instance def __init__(self): - super(MusicTrackListener, self).__init__() - self.con = {} - - players = _get_music_players() - for name in players: - Gio.bus_watch_name( - Gio.BusType.SESSION, - name, - Gio.BusNameWatcherFlags.NONE, - self._appeared, - self._vanished) - - def _appeared(self, connection, name, name_owner, *user_data): + super().__init__() + self.players = {} + + def start(self): + proxy = Gio.DBusProxy.new_for_bus_sync( + Gio.BusType.SESSION, + Gio.DBusProxyFlags.NONE, + None, + 'org.freedesktop.DBus', + '/org/freedesktop/DBus', + 'org.freedesktop.DBus', + None) + + self.connection = proxy.get_connection() + self.connection.signal_subscribe( + 'org.freedesktop.DBus', + 'org.freedesktop.DBus', + 'NameOwnerChanged', + '/org/freedesktop/DBus', + None, + Gio.DBusSignalFlags.NONE, + self._signal_name_owner_changed) + + try: + result = proxy.call_sync( + 'ListNames', + None, + Gio.DBusCallFlags.NONE, + -1, + None) + except GLib.Error as e: + if e.domain == 'g-dbus-error-quark': + log.debug("Could not list names: %s", e.message) + return + else: + raise + + for name in result[0]: + if name.startswith(MPRIS_PLAYER_PREFIX): + self._add_player(name) + + def stop(self): + for name in list(self.players): + if name.startswith(MPRIS_PLAYER_PREFIX): + self._remove_player(name) + + def _signal_name_owner_changed(self, connection, sender_name, object_path, + interface_name, signal_name, parameters, *user_data): + name, oldOwner, newOwner = parameters + if name.startswith(MPRIS_PLAYER_PREFIX): + if newOwner and not oldOwner: + self._add_player(name) + else: + self._remove_player(name) + + def _add_player(self, name): '''Set up a listener for music player signals''' log.info('%s appeared', name) - self.con[name] = connection.signal_subscribe( + + if name in self.players: + return + + self.players[name] = self.connection.signal_subscribe( name, 'org.freedesktop.DBus.Properties', 'PropertiesChanged', @@ -94,12 +128,12 @@ class MusicTrackListener(GObject.GObject): if info is not None: self.emit('music-track-changed', info) - def _vanished(self, connection, name, *user_data): + def _remove_player(self, name): log.info('%s vanished', name) - if name in self.con: - connection.signal_unsubscribe( - self.con[name]) - self.con.pop(name) + if name in self.players: + self.connection.signal_unsubscribe( + self.players[name]) + self.players.pop(name) self.emit('music-track-changed', None) @@ -176,4 +210,5 @@ if __name__ == '__main__': print(music_track_info.title) listener = MusicTrackListener.get() listener.connect('music-track-changed', music_track_change_cb) - GObject.MainLoop().run() + listener.start() + GLib.MainLoop().run() View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/be6c2d4f7a49e53c64c1f169cff8d070e… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/be6c2d4f7a49e53c64c1f169cff8d070e… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Send all presence through the presence module
by Philipp Hörist 01 Sep '18

01 Sep '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: c68f4f10 by Philipp Hörist at 2018-09-01T16:06:21Z Send all presence through the presence module - - - - - be6c2d4f by Philipp Hörist at 2018-09-01T18:40:20Z Add XEP-0398 optimizations - If the server implements XEP-0398 we dont need to add the avatar sha anymore, the server adds it for us. - It also means we dont have to query our own avatar from vcard at start because the server tells us the avatar sha that is published with the inital presence reflection - - - - - 11 changed files: - gajim/common/config.py - gajim/common/connection.py - gajim/common/connection_handlers.py - gajim/common/connection_handlers_events.py - gajim/common/modules/discovery.py - gajim/common/modules/muc.py - gajim/common/modules/presence.py - gajim/common/modules/user_avatar.py - gajim/common/modules/vcard_avatars.py - gajim/common/modules/vcard_temp.py - gajim/gtk/server_info.py Changes: ===================================== gajim/common/config.py ===================================== --- a/gajim/common/config.py +++ b/gajim/common/config.py @@ -241,7 +241,6 @@ class Config: 'roster_window_skip_taskbar': [opt_bool, False, _('Don\'t show roster in the system taskbar.')], 'use_urgency_hint': [opt_bool, True, _('If true, make the window flash (the default behaviour in most Window Managers) when holding pending events.')], 'notification_timeout': [opt_int, 5], - 'send_sha_in_gc_presence': [opt_bool, True, _('Jabberd1.4 does not like sha info when one join a password protected group chat. Turn this option to False to stop sending sha info in group chat presences.')], 'one_message_window': [opt_str, 'always', #always, never, peracct, pertype should not be translated _('Controls the window where new messages are placed.\n\'always\' - All messages are sent to a single window.\n\'always_with_roster\' - Like \'always\' but the messages are in a single window along with the roster.\n\'never\' - All messages get their own window.\n\'peracct\' - Messages for each account are sent to a specific window.\n\'pertype\' - Each message type (e.g. chats vs. groupchats) is sent to a specific window.')], ===================================== gajim/common/connection.py ===================================== --- a/gajim/common/connection.py +++ b/gajim/common/connection.py @@ -38,7 +38,6 @@ import socket import operator import string import time -import hmac import hashlib import json import logging @@ -60,12 +59,10 @@ from gajim.common import helpers from gajim.common import app from gajim.common import gpg from gajim.common import passwords -from gajim.common import i18n from gajim.common import idle from gajim.common.connection_handlers import * from gajim.common.contacts import GC_Contact from gajim.common import modules -from gajim.gtkgui_helpers import get_action log = logging.getLogger('gajim.c.connection') @@ -117,6 +114,7 @@ class CommonConnection: self.roster_supported = True self.addressing_supported = False + self.avatar_conversion = False self.muc_jid = {} # jid of muc server for each transport type self._stun_servers = [] # STUN servers of our jabber server @@ -474,10 +472,11 @@ class CommonConnection: if self.connection: app.nec.push_incoming_event(BeforeChangeShowEvent(None, conn=self, show=show, message=msg)) - p = nbxmpp.Presence(typ = 'unavailable') - p = self.add_sha(p, False) - if msg: - p.setStatus(msg) + + p = self.get_module('Presence').get_presence( + typ='unavailable', + status=msg, + caps=False) self.connection.RegisterDisconnectHandler(self._on_disconnected) self.connection.send(p, now=True) @@ -542,7 +541,6 @@ class Connection(CommonConnection, ConnectionHandlers): # server {'icq': ['icq.server.com', 'icq2.server.com'], } self.streamError = '' - self.secret_hmac = str(random.random())[2:].encode('utf-8') self.removing_account = False # We only request POSH once @@ -1351,9 +1349,6 @@ class Connection(CommonConnection, ConnectionHandlers): self.on_connect_auth = None # END connect - def add_lang(self, stanza): - stanza.setAttr('xml:lang', i18n.LANG) - def send_keepalive(self): # nothing received for the last foo seconds if self.connection: @@ -1372,15 +1367,15 @@ class Connection(CommonConnection, ConnectionHandlers): # offline presence first as it's required by XEP-0126 if self.connected > 1 and self.get_module('PrivacyLists').supported: self.on_purpose = True - p = nbxmpp.Presence(typ='unavailable') - p = self.add_sha(p, False) - if msg: - p.setStatus(msg) + self.remove_all_transfers() - self.connection.send(p) + self.get_module('Presence').send_presence( + typ='unavailable', + status=msg, + caps=False) # try to set the privacy rule - iq = self.get_module('PrivacyLists').set_invisible_rule( + self.get_module('PrivacyLists').set_invisible_rule( callback=self._continue_invisible, msg=msg, signed=signed, @@ -1394,19 +1389,19 @@ class Connection(CommonConnection, ConnectionHandlers): self.connected = app.SHOW_LIST.index('invisible') self.status = msg priority = app.get_priority(self.name, 'invisible') - p = nbxmpp.Presence(priority=priority) - p = self.add_sha(p, True) - if msg: - p.setStatus(msg) - if signed: - p.setTag(nbxmpp.NS_SIGNED + ' x').setData(signed) - self.connection.send(p) + + self.get_module('Presence').send_presence( + priority=priority, + status=msg, + sign=signed) + self.priority = priority app.nec.push_incoming_event(OurShowEvent(None, conn=self, show='invisible')) if initial: - # ask our VCard - self.get_module('VCardTemp').request_vcard() + if not self.avatar_conversion: + # ask our VCard + self.get_module('VCardTemp').request_vcard() # Get bookmarks self.get_module('Bookmarks').get_bookmarks() @@ -1486,20 +1481,21 @@ class Connection(CommonConnection, ConnectionHandlers): if not msg: msg = '' if show == 'offline': - p = nbxmpp.Presence(typ='unavailable', to=jid) - p = self.add_sha(p, False) - if msg: - p.setStatus(msg) + self.get_module('Presence').send_presence( + jid, + 'unavailable', + caps=False, + status=msg) + else: signed = self.get_signed_presence(msg) priority = app.get_priority(self.name, sshow) - p = nbxmpp.Presence(typ=None, priority=priority, show=sshow, to=jid) - p = self.add_sha(p) - if msg: - p.setStatus(msg) - if signed: - p.setTag(nbxmpp.NS_SIGNED + ' x').setData(signed) - self.connection.send(p) + self.get_module('Presence').send_presence( + jid, + priority=priority, + show=sshow, + status=msg, + sign=signed) def _change_to_invisible(self, msg): signed = self.get_signed_presence(msg) @@ -1512,18 +1508,16 @@ class Connection(CommonConnection, ConnectionHandlers): def _update_status(self, show, msg, idle_time=None): xmpp_show = helpers.get_xmpp_show(show) priority = app.get_priority(self.name, xmpp_show) - p = nbxmpp.Presence(typ=None, priority=priority, show=xmpp_show) - p = self.add_sha(p) - if msg: - p.setStatus(msg) signed = self.get_signed_presence(msg) - if signed: - p.setTag(nbxmpp.NS_SIGNED + ' x').setData(signed) - if idle_time: - idle_node = p.setTag('idle', namespace=nbxmpp.NS_IDLE) - idle_node.setAttr('since', idle_time) + + self.get_module('Presence').send_presence( + priority=priority, + show=xmpp_show, + status=msg, + sign=signed, + idle_time=idle_time) + if self.connection: - self.connection.send(p) self.priority = priority app.nec.push_incoming_event(OurShowEvent(None, conn=self, show=show)) @@ -1654,9 +1648,12 @@ class Connection(CommonConnection, ConnectionHandlers): if not app.account_is_connected(self.name): return show = helpers.get_xmpp_show(app.SHOW_LIST[self.connected]) - p = nbxmpp.Presence(to=agent, typ=ptype, show=show) - p = self.add_sha(p, ptype != 'unavailable') - self.connection.send(p) + + self.get_module('Presence').send_presence( + agent, + ptype, + show=show, + caps=ptype != 'unavailable') def send_captcha(self, jid, form_node): if not app.account_is_connected(self.name): @@ -1697,56 +1694,19 @@ class Connection(CommonConnection, ConnectionHandlers): password, change_nick, rejoin)) def _join_gc(self, nick, show, room_jid, password, change_nick, rejoin): - # Check time first in the FAST table - last_date = app.logger.get_room_last_message_time( - self.name, room_jid) - if not last_date: - last_date = 0 - - p = nbxmpp.Presence(to='%s/%s' % (room_jid, nick), - show=show, status=self.status) - h = hmac.new(self.secret_hmac, room_jid.encode('utf-8'), hashlib.md5).\ - hexdigest()[:6] - id_ = self.connection.getAnID() - id_ = 'gajim_muc_' + id_ + '_' + h - p.setID(id_) - if app.config.get('send_sha_in_gc_presence'): - p = self.add_sha(p) - self.add_lang(p) if change_nick: - self.connection.send(p) - return - - t = p.setTag(nbxmpp.NS_MUC + ' x') - if muc_caps_cache.has_mam(room_jid): - # The room is MAM capable dont get MUC History - t.setTag('history', {'maxchars': '0'}) + self.get_module('Presence').send_presence( + '%s/%s' % (room_jid, nick), + show=show, + status=self.status) else: - # Request MUC History (not MAM) - tags = {} - timeout = app.config.get_per('rooms', room_jid, - 'muc_restore_timeout') - if timeout is None or timeout == -2: - timeout = app.config.get('muc_restore_timeout') - if last_date == 0 and timeout >= 0: - last_date = time.time() - timeout * 60 - elif not rejoin and timeout >= 0: - last_date = max(last_date, time.time() - timeout * 60) - last_date = time.strftime('%Y-%m-%dT%H:%M:%SZ', time.gmtime( - last_date)) - tags['since'] = last_date - - nb = app.config.get_per('rooms', room_jid, 'muc_restore_lines') - if nb is None or nb == -2: - nb = app.config.get('muc_restore_lines') - if nb >= 0: - tags['maxstanzas'] = nb - if tags: - t.setTag('history', tags) - - if password: - t.setTagData('password', password) - self.connection.send(p) + self.get_module('MUC').send_muc_join_presence( + '%s/%s' % (room_jid, nick), + show=show, + status=self.status, + room_jid=room_jid, + password=password, + rejoin=rejoin) def _nec_gc_message_outgoing(self, obj): if obj.account != self.name: @@ -1809,26 +1769,20 @@ class Connection(CommonConnection, ConnectionHandlers): if show == 'offline': ptype = 'unavailable' xmpp_show = helpers.get_xmpp_show(show) - p = nbxmpp.Presence(to='%s/%s' % (jid, nick), typ=ptype, - show=xmpp_show, status=status) - h = hmac.new(self.secret_hmac, jid.encode('utf-8'), hashlib.md5).\ - hexdigest()[:6] - id_ = self.connection.getAnID() - id_ = 'gajim_muc_' + id_ + '_' + h - p.setID(id_) - if app.config.get('send_sha_in_gc_presence') and show != 'offline': - p = self.add_sha(p, ptype != 'unavailable') - self.add_lang(p) - if auto: - if app.is_installed('IDLE') and app.config.get('autoaway'): - idle_sec = idle.Monitor.get_idle_sec() - idle_time = time.strftime('%Y-%m-%dT%H:%M:%SZ', - time.gmtime(time.time() - idle_sec)) - idle_node = p.setTag('idle', namespace=nbxmpp.NS_IDLE) - idle_node.setAttr('since', idle_time) - # send instantly so when we go offline, status is sent to gc before we - # disconnect from jabber server - self.connection.send(p) + + idle_time = None + if auto and app.is_installed('IDLE') and app.config.get('autoaway'): + idle_sec = idle.Monitor.get_idle_sec() + idle_time = time.strftime('%Y-%m-%dT%H:%M:%SZ', + time.gmtime(time.time() - idle_sec)) + + self.get_module('Presence').send_presence( + '%s/%s' % (jid, nick), + typ=ptype, + show=xmpp_show, + status=status, + caps=ptype != 'unavailable', + idle_time=idle_time) def get_password(self, callback, type_): if app.config.get_per('accounts', self.name, 'anonymous_auth') and \ ===================================== gajim/common/connection_handlers.py ===================================== --- a/gajim/common/connection_handlers.py +++ b/gajim/common/connection_handlers.py @@ -422,20 +422,6 @@ class ConnectionHandlers(ConnectionSocks5Bytestream, app.ged.remove_event_handler('agent-removed', ged.CORE, self._nec_agent_removed) - def add_sha(self, p, send_caps=True): - p = self.get_module('VCardAvatars').add_update_node(p) - if send_caps: - return self._add_caps(p) - return p - - def _add_caps(self, p): - ''' advertise our capabilities in presence stanza (xep-0115)''' - c = p.setTag('c', namespace=nbxmpp.NS_CAPS) - c.setAttr('hash', 'sha-1') - c.setAttr('node', 'http://gajim.org') - c.setAttr('ver', app.caps_hash[self.name]) - return p - def _ErrorCB(self, con, iq_obj): log.debug('ErrorCB') app.nec.push_incoming_event(IqErrorReceivedEvent(None, conn=self, @@ -582,21 +568,21 @@ class ConnectionHandlers(ConnectionSocks5Bytestream, if show not in ['offline', 'online', 'chat', 'away', 'xa', 'dnd']: return priority = app.get_priority(self.name, sshow) - p = nbxmpp.Presence(typ=None, priority=priority, show=sshow) - if msg: - p.setStatus(msg) - if signed: - p.setTag(nbxmpp.NS_SIGNED + ' x').setData(signed) - p = self.add_sha(p) + + self.get_module('Presence').send_presence( + priority=priority, + show=sshow, + status=msg, + sign=signed) if self.connection: - self.connection.send(p) self.priority = priority app.nec.push_incoming_event(OurShowEvent(None, conn=self, show=show)) - # ask our VCard - self.get_module('VCardTemp').request_vcard() + if not self.avatar_conversion: + # ask our VCard + self.get_module('VCardTemp').request_vcard() # Get bookmarks self.get_module('Bookmarks').get_bookmarks() ===================================== gajim/common/connection_handlers_events.py ===================================== --- a/gajim/common/connection_handlers_events.py +++ b/gajim/common/connection_handlers_events.py @@ -288,7 +288,7 @@ PresenceHelperEvent): xtags = self.stanza.getTags('x') for x in xtags: namespace = x.getNamespace() - if namespace == nbxmpp.NS_MUC_USER: + if namespace in (nbxmpp.NS_MUC_USER, nbxmpp.NS_MUC): self.is_gc = True elif namespace == nbxmpp.NS_SIGNED: sig_tag = x @@ -296,14 +296,6 @@ PresenceHelperEvent): # XEP-0091 self._generate_timestamp(self.stanza.timestamp) - if not self.is_gc and self.id_ and self.id_.startswith('gajim_muc_') \ - and self.ptype == 'error': - # Error presences may not include sent stanza, so we don't detect - # it's a muc presence. So detect it by ID - h = hmac.new(self.conn.secret_hmac, self.jid.encode('utf-8'), - hashlib.md5).hexdigest()[:6] - if self.id_.split('_')[-1] == h: - self.is_gc = True self.status = self.stanza.getStatus() or '' self._generate_show() self._generate_prio() ===================================== gajim/common/modules/discovery.py ===================================== --- a/gajim/common/modules/discovery.py +++ b/gajim/common/modules/discovery.py @@ -178,6 +178,10 @@ class Discovery: self._con.get_module('PEP').pass_disco(from_, *args) self._con.get_module('PubSub').pass_disco(from_, *args) + identities, features, data, node = args + if 'urn:xmpp:pep-vcard-conversion:0' in features: + self._con.avatar_conversion = True + def discover_server_info(self): # Calling this method starts the connect_maschine() server = self._con.get_own_jid().getDomain() ===================================== gajim/common/modules/muc.py ===================================== --- a/gajim/common/modules/muc.py +++ b/gajim/common/modules/muc.py @@ -15,6 +15,7 @@ # XEP-0045: Multi-User Chat # XEP-0249: Direct MUC Invitations +import time import logging import nbxmpp @@ -23,6 +24,7 @@ from gajim.common import i18n from gajim.common.modules import dataforms from gajim.common import app from gajim.common import helpers +from gajim.common.caps_cache import muc_caps_cache from gajim.common.nec import NetworkIncomingEvent log = logging.getLogger('gajim.c.m.muc') @@ -50,6 +52,56 @@ class MUC: self._con.muc_jid['jabber'] = from_ raise nbxmpp.NodeProcessed + def send_muc_join_presence(self, *args, room_jid=None, password=None, + rejoin=False, **kwargs): + if not app.account_is_connected(self._account): + return + presence = self._con.get_module('Presence').get_presence( + *args, **kwargs) + + if room_jid is not None: + self._add_history_query(presence, room_jid, rejoin) + + if password is not None: + presence.setTagData('password', password) + + log.debug('Send MUC join presence:\n%s', presence) + + self._con.connection.send(presence) + + def _add_history_query(self, presence, room_jid, rejoin): + last_date = app.logger.get_room_last_message_time( + self._account, room_jid) + if not last_date: + last_date = 0 + + history = presence.setTag(nbxmpp.NS_MUC + ' x') + if muc_caps_cache.has_mam(room_jid): + # The room is MAM capable dont get MUC History + history.setTag('history', {'maxchars': '0'}) + else: + # Request MUC History (not MAM) + tags = {} + timeout = app.config.get_per('rooms', room_jid, + 'muc_restore_timeout') + if timeout is None or timeout == -2: + timeout = app.config.get('muc_restore_timeout') + if last_date == 0 and timeout >= 0: + last_date = time.time() - timeout * 60 + elif not rejoin and timeout >= 0: + last_date = max(last_date, time.time() - timeout * 60) + last_date = time.strftime('%Y-%m-%dT%H:%M:%SZ', time.gmtime( + last_date)) + tags['since'] = last_date + + nb = app.config.get_per('rooms', room_jid, 'muc_restore_lines') + if nb is None or nb == -2: + nb = app.config.get('muc_restore_lines') + if nb >= 0: + tags['maxstanzas'] = nb + if tags: + history.setTag('history', tags) + def set_subject(self, room_jid, subject): if not app.account_is_connected(self._account): return ===================================== gajim/common/modules/presence.py ===================================== --- a/gajim/common/modules/presence.py +++ b/gajim/common/modules/presence.py @@ -75,9 +75,7 @@ class Presence: raise nbxmpp.NodeProcessed if auto_auth or is_transport or jid in self.jids_for_auto_auth: - presence = nbxmpp.Presence(fjid, 'subscribed') - presence = self._add_sha(presence) - self._con.connection.send(presence) + self.send_presence(fjid, 'subscribed') if not status: status = _('I would like to add you to my roster.') @@ -124,17 +122,13 @@ class Presence: if not app.account_is_connected(self._account): return log.info('Subscribed: %s', jid) - presence = nbxmpp.Presence(jid, 'subscribed') - presence = self._add_sha(presence) - self._con.connection.send(presence) + self.send_presence(jid, 'subscribed') def unsubscribed(self, jid): if not app.account_is_connected(self._account): return log.info('Unsubscribed: %s', jid) - presence = nbxmpp.Presence(jid, 'unsubscribed') - presence = self._add_sha(presence) - self._con.connection.send(presence) + self.send_presence(jid, 'unsubscribed') def unsubscribe(self, jid, remove_auth=True): if not app.account_is_connected(self._account): @@ -150,7 +144,7 @@ class Presence: self._con.getRoster().Unsubscribe(jid) self._con.getRoster().setItem(jid) - def subscribe(self, jid, msg='', name='', groups=None, + def subscribe(self, jid, msg=None, name='', groups=None, auto_auth=False, user_nick=''): if not app.account_is_connected(self._account): return @@ -172,29 +166,43 @@ class Presence: item.addChild('group').setData(group) self._con.connection.send(iq) - presence = nbxmpp.Presence(jid, 'subscribe') - if user_nick: - nick = presence.setTag('nick', namespace=nbxmpp.NS_NICK) - nick.setData(user_nick) - presence = self._add_sha(presence) - if msg: - presence.setStatus(msg) - self._con.connection.send(presence) + self.send_presence(jid, 'subscribe', msg) - def _add_sha(self, presence, send_caps=True): - vcard = self._con.get_module('VCardAvatars') - presence = vcard.add_update_node(presence) - if send_caps: - return self._add_caps(presence) - return presence + def get_presence(self, to=None, typ=None, priority=None, + show=None, status=None, nick=None, caps=True, + sign=None, idle_time=None): + presence = nbxmpp.Presence(to, typ, priority, show, status) + if nick is not None: + nick_tag = presence.setTag('nick', namespace=nbxmpp.NS_NICK) + nick_tag.setData(nick) + + if sign: + presence.setTag(nbxmpp.NS_SIGNED + ' x').setData(sign) + + if idle_time is not None: + idle_node = presence.setTag('idle', namespace=nbxmpp.NS_IDLE) + idle_node.setAttr('since', idle_time) + + if not self._con.avatar_conversion: + # XEP-0398 not supported by server so + # we add the avatar sha to our presence + self._con.get_module('VCardAvatars').add_update_node(presence) + + if caps: + attrs = {'hash': 'sha-1', + 'node': 'http://gajim.org', + 'ver': app.caps_hash[self._account]} + presence.setTag('c', namespace=nbxmpp.NS_CAPS, attrs=attrs) - def _add_caps(self, presence): - c = presence.setTag('c', namespace=nbxmpp.NS_CAPS) - c.setAttr('hash', 'sha-1') - c.setAttr('node', 'http://gajim.org') - c.setAttr('ver', app.caps_hash[self._account]) return presence + def send_presence(self, *args, **kwargs): + if not app.account_is_connected(self._account): + return + presence = self.get_presence(*args, **kwargs) + log.debug('Send presence:\n%s', presence) + self._con.connection.send(presence) + def parse_show(stanza): show = stanza.getShow() ===================================== gajim/common/modules/user_avatar.py ===================================== --- a/gajim/common/modules/user_avatar.py +++ b/gajim/common/modules/user_avatar.py @@ -107,8 +107,8 @@ class UserAvatar(AbstractPEPModule): else: own_jid = self._con.get_own_jid().getStripped() app.logger.set_avatar_sha(own_jid, jid, sha) - app.contacts.set_avatar(self._account, jid, sha) + app.contacts.set_avatar(self._account, jid, sha) app.interface.update_avatar(self._account, jid) def _extract_info(self, item): ===================================== gajim/common/modules/vcard_avatars.py ===================================== --- a/gajim/common/modules/vcard_avatars.py +++ b/gajim/common/modules/vcard_avatars.py @@ -16,6 +16,7 @@ import os import logging +from pathlib import Path import nbxmpp @@ -38,6 +39,16 @@ class VCardAvatars: ] self.avatar_advertised = False + self._find_own_avatar() + + def _find_own_avatar(self): + sha = app.config.get_per('accounts', self._account, 'avatar_sha') + if not sha: + return + path = Path(configpaths.get('AVATAR')) / sha + if not path.exists(): + log.info('Missing own avatar, reset sha') + app.config.set_per('accounts', self._account, 'avatar_sha', '') def _presence_received(self, con, stanza): update = stanza.getTag('x', namespace=nbxmpp.NS_VCARD_UPDATE) @@ -54,9 +65,14 @@ class VCardAvatars: if self._con.get_own_jid().bareMatch(jid): if self._con.get_own_jid() == jid: - # Reflection of our own presence - return - self._self_update_received(jid, avatar_sha) + # Initial presence reflection + if self._con.avatar_conversion: + # XEP-0398: Tells us the current avatar sha on the + # inital presence reflection + self._self_update_received(jid, avatar_sha) + else: + # Presence from another resource of ours + self._self_update_received(jid, avatar_sha) return # Check if presence is from a MUC service @@ -76,6 +92,9 @@ class VCardAvatars: if avatar_sha == '': # Empty <photo/> tag, means no avatar is advertised log.info('%s has no avatar published', full_jid) + app.config.set_per('accounts', self._account, 'avatar_sha', '') + app.contacts.set_avatar(self._account, jid, None) + app.interface.update_avatar(self._account, jid) return log.info('Update: %s %s', jid, avatar_sha) @@ -83,8 +102,16 @@ class VCardAvatars: 'accounts', self._account, 'avatar_sha') if avatar_sha != current_sha: - log.info('Request : %s', jid) - self._con.get_module('VCardTemp').request_vcard(RequestAvatar.SELF) + path = Path(configpaths.get('AVATAR')) / avatar_sha + if path.exists(): + app.config.set_per( + 'accounts', self._account, 'avatar_sha', avatar_sha) + app.contacts.set_avatar(self._account, jid, avatar_sha) + app.interface.update_avatar(self._account, jid) + else: + log.info('Request : %s', jid) + self._con.get_module('VCardTemp').request_vcard( + RequestAvatar.SELF) else: log.info('Avatar already known: %s %s', jid, avatar_sha) @@ -168,18 +195,25 @@ class VCardAvatars: else: log.info('Avatar already known: %s', nick) - def send_avatar_presence(self, force=False): - if self.avatar_advertised and not force: - log.debug('Avatar already advertised') - return + def send_avatar_presence(self, force=False, after_publish=False): + if self._con.avatar_conversion: + if not after_publish: + # XEP-0398: We only resend presence after we publish a + # new avatar + return + else: + if self.avatar_advertised and not force: + log.debug('Avatar already advertised') + return + show = helpers.get_xmpp_show(app.SHOW_LIST[self._con.connected]) - pres = nbxmpp.Presence(typ=None, priority=self._con.priority, - show=show, status=self._con.status) - pres = self._con.add_sha(pres) - self._con.connection.send(pres) + + self._con.get_module('Presence').send_presence( + priority=self._con.priority, + show=show, + status=self._con.status) + self.avatar_advertised = True - app.interface.update_avatar(self._account, - self._con.get_own_jid().getStripped()) def add_update_node(self, node): update = node.setTag('x', namespace=nbxmpp.NS_VCARD_UPDATE) @@ -189,7 +223,6 @@ class VCardAvatars: log.info('Send avatar presence to: %s %s', node.getTo() or own_jid, sha or 'no sha advertised') update.setTagData('photo', sha) - return node def get_instance(*args, **kwargs): ===================================== gajim/common/modules/vcard_temp.py ===================================== --- a/gajim/common/modules/vcard_temp.py +++ b/gajim/common/modules/vcard_temp.py @@ -14,7 +14,6 @@ # XEP-0054: vcard-temp -import os import hashlib import binascii import base64 @@ -23,7 +22,6 @@ import logging import nbxmpp from gajim.common import app -from gajim.common import configpaths from gajim.common.const import RequestAvatar from gajim.common.nec import NetworkIncomingEvent from gajim.common.connection_handlers_events import InformationEvent @@ -156,8 +154,10 @@ class VCardTemp: 'accounts', self._account, 'avatar_sha', sha or '') own_jid = self._con.get_own_jid().getStripped() app.contacts.set_avatar(self._account, own_jid, sha) + app.interface.update_avatar( + self._account, self._con.get_own_jid().getStripped()) self._con.get_module('VCardAvatars').send_avatar_presence( - force=True) + after_publish=True) log.info('%s: Published: %s', self._account, sha) app.nec.push_incoming_event( VcardPublishedEvent(None, conn=self._con)) @@ -231,28 +231,28 @@ class VCardTemp: self._own_vcard = vcard self.own_vcard_received = True + if avatar_sha is None: + # No avatar found in vcard log.info('No avatar found') app.config.set_per('accounts', self._account, 'avatar_sha', '') + app.contacts.set_avatar(self._account, jid, avatar_sha) self._con.get_module('VCardAvatars').send_avatar_presence(force=True) return - current_sha = app.config.get_per('accounts', self._account, 'avatar_sha') + # Avatar found in vcard + current_sha = app.config.get_per( + 'accounts', self._account, 'avatar_sha') if current_sha == avatar_sha: - path = os.path.join(configpaths.get('AVATAR'), current_sha) - if not os.path.isfile(path): - log.info('Caching: %s', current_sha) - app.interface.save_avatar(photo_decoded) self._con.get_module('VCardAvatars').send_avatar_presence() else: app.interface.save_avatar(photo_decoded) + app.contacts.set_avatar(self._account, jid, avatar_sha) + app.config.set_per( + 'accounts', self._account, 'avatar_sha', avatar_sha) + self._con.get_module('VCardAvatars').send_avatar_presence(force=True) - app.config.set_per('accounts', self._account, 'avatar_sha', avatar_sha) - if app.is_invisible(self._account): - log.info('We are invisible, not advertising avatar') - return - - self._con.get_module('VCardAvatars').send_avatar_presence(force=True) + app.interface.update_avatar(self._account, jid) def _on_room_avatar_received(self, jid, resource, room, vcard, expected_sha): ===================================== gajim/gtk/server_info.py ===================================== --- a/gajim/gtk/server_info.py +++ b/gajim/gtk/server_info.py @@ -177,7 +177,10 @@ class ServerInfoDialog(Gtk.Dialog): mam_enabled), Feature('XEP-0363: HTTP File Upload', con.get_module('HTTPUpload').available, - con.get_module('HTTPUpload').httpupload_namespace, None)] + con.get_module('HTTPUpload').httpupload_namespace, None), + Feature('XEP-0398: Avatar Conversion', + con.avatar_conversion, '', None) + ] def add_info(self, info): self.info_listbox.add(ServerInfoItem(info)) View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/7d723d7b9846c0226b4c0d3b068e08b77… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/7d723d7b9846c0226b4c0d3b068e08b77… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix contact not beeing found after room destroy
by Philipp Hörist 01 Sep '18

01 Sep '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 7d723d7b by Philipp Hörist at 2018-09-01T10:44:45Z Fix contact not beeing found after room destroy - - - - - 1 changed file: - gajim/common/contacts.py Changes: ===================================== gajim/common/contacts.py ===================================== --- a/gajim/common/contacts.py +++ b/gajim/common/contacts.py @@ -469,7 +469,7 @@ class Contacts(): self._contacts = {} def add_contact(self, contact): - if contact.jid not in self._contacts: + if contact.jid not in self._contacts or contact.is_groupchat(): self._contacts[contact.jid] = [contact] return contacts = self._contacts[contact.jid] View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/7d723d7b9846c0226b4c0d3b068e08b772… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/7d723d7b9846c0226b4c0d3b068e08b772… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Disco the room after it has been created
by Philipp Hörist 31 Aug '18

31 Aug '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: be96422a by Philipp Hörist at 2018-08-31T22:03:24Z Disco the room after it has been created - - - - - 1 changed file: - gajim/groupchat_control.py Changes: ===================================== gajim/groupchat_control.py ===================================== --- a/gajim/groupchat_control.py +++ b/gajim/groupchat_control.py @@ -1818,6 +1818,8 @@ class GroupchatControl(ChatControlBase): # app.py) self.print_conversation(_('Room logging is enabled')) if '201' in obj.status_code: + app.connections[self.account].get_module('Discovery').disco_muc( + self.room_jid, self.update_actions, update=True) self.print_conversation(_('A new room has been created')) if '210' in obj.status_code: self.print_conversation(\ View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/be96422a1498cca384d4ba41e919908549… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/be96422a1498cca384d4ba41e919908549… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix missing attribute
by Philipp Hörist 31 Aug '18

31 Aug '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 527762f7 by Philipp Hörist at 2018-08-31T04:37:53Z Fix missing attribute - - - - - 1 changed file: - gajim/common/connection_handlers_events.py Changes: ===================================== gajim/common/connection_handlers_events.py ===================================== --- a/gajim/common/connection_handlers_events.py +++ b/gajim/common/connection_handlers_events.py @@ -487,6 +487,7 @@ class GcMessageReceivedEvent(nec.NetworkIncomingEvent): self.xhtml_msgtxt = self.stanza.getXHTML() self.encrypted = self.msg_obj.encrypted self.correct_id = None # XEP-0308 + self.delayed = self.msg_obj.delayed if app.config.get('ignore_incoming_xhtml'): self.xhtml_msgtxt = None View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/527762f726577e451421a2c11228e8f2a6… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/527762f726577e451421a2c11228e8f2a6… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Unify to use app.get_account_label()
by Philipp Hörist 30 Aug '18

30 Aug '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 7743c11a by Sophie Herold at 2018-08-30T17:27:40Z Unify to use app.get_account_label() - - - - - 9 changed files: - gajim/accounts_window.py - gajim/chat_control.py - gajim/common/app.py - gajim/common/helpers.py - gajim/gtk/start_chat.py - gajim/gui_menu_builder.py - gajim/roster_window.py - gajim/statusicon.py - gajim/tooltips.py Changes: ===================================== gajim/accounts_window.py ===================================== --- a/gajim/accounts_window.py +++ b/gajim/accounts_window.py @@ -377,8 +377,7 @@ class Account(Gtk.Box): self.options = AccountPage(account, parent) self.parent = parent - account_label = app.config.get_per('accounts', account, 'account_label') - self.label = Gtk.Label(label=account_label or account) + self.label = Gtk.Label(app.get_account_label(account)) self.label.set_halign(Gtk.Align.START) self.label.set_hexpand(True) @@ -402,9 +401,7 @@ class Account(Gtk.Box): self.parent.set_page(self.options, 'account') def update(self): - account_label = app.config.get_per( - 'accounts', self.account, 'account_label') - self.label.set_text(account_label or self.account) + self.label.set_text(app.get_account_label(self.account)) self._update_image() def _update_image(self): @@ -453,10 +450,9 @@ class GenericOptionPage(Gtk.Box): row.get_child().on_row_activated() def set_entry_text(self, toggle, update=False): - account_label = app.config.get_per( - 'accounts', self.account, 'account_label') + account_label = app.get_account_label(self.account) if update: - self.entry.set_text(account_label or self.account) + self.entry.set_text(account_label) return if toggle.get_active(): self.entry.set_sensitive(True) @@ -465,7 +461,7 @@ class GenericOptionPage(Gtk.Box): self.entry.set_sensitive(False) value = self.entry.get_text() if not value: - value = account_label or self.account + value = account_label app.config.set_per('accounts', self.account, 'account_label', value or self.account) if app.config.get_per('accounts', self.account, 'active'): ===================================== gajim/chat_control.py ===================================== --- a/gajim/chat_control.py +++ b/gajim/chat_control.py @@ -663,7 +663,8 @@ class ChatControl(ChatControlBase): if other_contact_.get_shown_name() == \ self.contact.get_shown_name(): acct_info = i18n.direction_mark + ' (%s)' % \ - GLib.markup_escape_text(self.account) + GLib.markup_escape_text( + app.get_account_label(self.account)) break status = contact.status ===================================== gajim/common/app.py ===================================== --- a/gajim/common/app.py +++ b/gajim/common/app.py @@ -411,13 +411,14 @@ def get_enabled_accounts_with_labels(exclude_local=True, connected_only=False, if private_storage_only and not account_supports_private_storage(acc): continue - acc_label = config.get_per( - 'accounts', acc, 'account_label') or acc - accounts.append([acc, acc_label]) + accounts.append([acc, get_account_label(acc)]) accounts.sort(key=lambda xs: str.lower(xs[1])) return accounts +def get_account_label(account): + return config.get_per('accounts', account, 'account_label') or account + def account_is_zeroconf(account): return connections[account].is_zeroconf ===================================== gajim/common/helpers.py ===================================== --- a/gajim/common/helpers.py +++ b/gajim/common/helpers.py @@ -1121,10 +1121,9 @@ def get_accounts_info(): message = message.strip() if message != '': single_line += ': ' + message - account_label = app.config.get_per( - 'accounts', account, 'account_label') + account_label = app.get_account_label(account) accounts.append({'name': account, - 'account_label': account_label or account, + 'account_label': account_label, 'status_line': single_line, 'show': status, 'message': message}) ===================================== gajim/gtk/start_chat.py ===================================== --- a/gajim/gtk/start_chat.py +++ b/gajim/gtk/start_chat.py @@ -262,8 +262,7 @@ class ContactRow(Gtk.Grid): self.set_column_spacing(12) self.set_size_request(260, -1) self.account = account - self.account_label = app.config.get_per( - 'accounts', account, 'account_label') or account + self.account_label = app.get_account_label(account) self.show_account = show_account self.jid = jid self.contact = contact ===================================== gajim/gui_menu_builder.py ===================================== --- a/gajim/gui_menu_builder.py +++ b/gajim/gui_menu_builder.py @@ -799,10 +799,9 @@ def build_accounts_menu(): return if len(accounts_list) > 1: for acc in accounts_list: - label = escape_mnemonic( - app.config.get_per('accounts', acc, 'account_label')) + label = escape_mnemonic(app.get_account_label(acc)) acc_menu.append_submenu( - label or acc, get_account_menu(acc)) + label, get_account_menu(acc)) else: acc_menu = get_account_menu(accounts_list[0]) menubar.remove(menu_position) ===================================== gajim/roster_window.py ===================================== --- a/gajim/roster_window.py +++ b/gajim/roster_window.py @@ -1075,8 +1075,7 @@ class RosterWindow: account_name = _('Merged accounts') accounts = [] else: - acclabel = app.config.get_per('accounts', account, 'account_label') - account_name = acclabel or account + account_name = app.get_account_label(account) accounts = [account] if account in self.collapsed_rows and \ @@ -5075,9 +5074,8 @@ class RosterWindow: accounts.append(account) accounts.sort() for account in accounts: - label = app.config.get_per('accounts', account, - 'account_label') - item = Gtk.MenuItem.new_with_label(label or account) + label = app.get_account_label(account) + item = Gtk.MenuItem.new_with_label(label) account_menu = self.build_account_menu(account) item.set_submenu(account_menu) menu.append(item) ===================================== gajim/statusicon.py ===================================== --- a/gajim/statusicon.py +++ b/gajim/statusicon.py @@ -243,8 +243,7 @@ class StatusIcon: self.popup_menus.append(account_menu_for_chat_with) for account in accounts_list: - account_label = app.config.get_per( - 'accounts', account, 'account_label') or account + account_label = app.get_account_label(account) if app.account_is_connected(account): # for chat_with item = Gtk.MenuItem.new_with_label( @@ -287,8 +286,7 @@ class StatusIcon: self.popup_menus.append(account_menu_for_single_message) for account in accounts_list: - account_label = app.config.get_per( - 'accounts', account, 'account_label') or account + account_label = app.get_account_label(account) if app.connections[account].is_zeroconf or \ not app.account_is_connected(account): continue ===================================== gajim/tooltips.py ===================================== --- a/gajim/tooltips.py +++ b/gajim/tooltips.py @@ -150,12 +150,12 @@ class NotificationAreaTooltip(StatusTable): show_lock = False if message: self.add_status_row(file_path, acct['show'], - GLib.markup_escape_text(acct['account_label']) + ' - ' + message, - show_lock=show_lock, indent=False) + GLib.markup_escape_text(acct['account_label']) + ' - ' + \ + message, show_lock=show_lock, indent=False) else: self.add_status_row(file_path, acct['show'], - GLib.markup_escape_text(acct['account_label']), show_lock=show_lock, - indent=False) + GLib.markup_escape_text(acct['account_label']), + show_lock=show_lock, indent=False) for line in acct['event_lines']: self.add_text_row(' ' + line, 1) @@ -333,12 +333,12 @@ class RosterTooltip(Gtk.Window, StatusTable): show_lock = False if message: self.add_status_row(file_path, acct['show'], - GLib.markup_escape_text(acct['name']) + ' - ' + message, - show_lock=show_lock, indent=False) + GLib.markup_escape_text(acct['account_label']) + ' - ' + \ + message, show_lock=show_lock, indent=False) else: self.add_status_row(file_path, acct['show'], - GLib.markup_escape_text(acct['name']), show_lock=show_lock, - indent=False) + GLib.markup_escape_text(acct['account_label']), + show_lock=show_lock, indent=False) for line in acct['event_lines']: self.add_text_row(' ' + line, 1) @@ -371,7 +371,7 @@ class RosterTooltip(Gtk.Window, StatusTable): nbr_on, nbr_total = app.\ contacts.get_nb_online_total_contacts( accounts=[account]) - account_name = account + account_name = app.get_account_label(account) if app.account_is_connected(account): account_name += ' (%s/%s)' % (repr(nbr_on), repr(nbr_total)) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/7743c11a50fe43d9baf00aa16f274cb7b6… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/7743c11a50fe43d9baf00aa16f274cb7b6… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Parse delay after decryption
by Philipp Hörist 30 Aug '18

30 Aug '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 8a342611 by Philipp Hörist at 2018-08-30T17:19:47Z Parse delay after decryption Delay could be encrypted with full stanza encryption - - - - - dd8dda9b by Philipp Hörist at 2018-08-30T17:19:47Z Fix displaying MUC subjects with delay tag Dont print it as "old" conversation, instead add the delay timestamp at the end of the subject - - - - - 5 changed files: - gajim/common/connection_handlers_events.py - gajim/common/modules/message.py - gajim/groupchat_control.py - gajim/remote_control.py - gajim/roster_window.py Changes: ===================================== gajim/common/connection_handlers_events.py ===================================== --- a/gajim/common/connection_handlers_events.py +++ b/gajim/common/connection_handlers_events.py @@ -25,7 +25,6 @@ from calendar import timegm import hashlib import hmac import logging -import sys from time import time as time_time import OpenSSL.crypto @@ -499,13 +498,13 @@ class GcMessageReceivedEvent(nec.NetworkIncomingEvent): # message from server self.nick = '' - self.has_timestamp = bool(self.stanza.timestamp) - self.subject = self.stanza.getSubject() if self.subject is not None: - app.nec.push_incoming_event(GcSubjectReceivedEvent(None, - conn=self.conn, msg_event=self)) + app.nec.push_incoming_event( + nec.NetworkEvent('gc-subject-received', + nickname=self.msg_obj.resource, + **vars(self.msg_obj))) return conditions = self.stanza.getStatusConditions() @@ -566,21 +565,6 @@ class GcMessageReceivedEvent(nec.NetworkIncomingEvent): return True -class GcSubjectReceivedEvent(nec.NetworkIncomingEvent): - name = 'gc-subject-received' - base_network_events = [] - - def generate(self): - self.conn = self.msg_event.conn - self.stanza = self.msg_event.stanza - self.room_jid = self.msg_event.room_jid - self.nickname = self.msg_event.nickname - self.fjid = self.msg_event.fjid - self.subject = self.msg_event.subject - self.msgtxt = self.msg_event.msgtxt - self.has_timestamp = self.msg_event.has_timestamp - return True - class GcConfigChangedReceivedEvent(nec.NetworkIncomingEvent): name = 'gc-config-changed-received' base_network_events = [] ===================================== gajim/common/modules/message.py ===================================== --- a/gajim/common/modules/message.py +++ b/gajim/common/modules/message.py @@ -178,10 +178,6 @@ class Message: session.last_receive = time.time() - timestamp = parse_delay(stanza) - if timestamp is None: - timestamp = time.time() - event_attr = { 'conn': self._con, 'stanza': stanza, @@ -191,7 +187,6 @@ class Message: 'additional_data': {}, 'forwarded': forwarded, 'sent': sent, - 'timestamp': timestamp, 'fjid': fjid, 'jid': jid, 'resource': resource, @@ -223,6 +218,11 @@ class Message: except nbxmpp.NodeProcessed: return + timestamp, delayed = parse_delay(event.stanza), True + if timestamp is None: + timestamp = time.time() + delayed = False + event_attr = { 'popup': False, 'msg_log_id': None, @@ -234,6 +234,8 @@ class Message: 'form_node': parse_form(event.stanza), 'xhtml': parse_xhtml(event.stanza), 'chatstate': parse_chatstate(event.stanza), + 'timestamp': timestamp, + 'delayed': delayed, } parse_oob(event.stanza, event.additional_data) @@ -245,7 +247,7 @@ class Message: event.msgtxt = _('message') self._con.dispatch_error_message( event.stanza, event.msgtxt, - event.session, event.fjid, event.timestamp) + event.session, event.fjid, timestamp) return if event.mtype == 'groupchat': ===================================== gajim/groupchat_control.py ===================================== --- a/gajim/groupchat_control.py +++ b/gajim/groupchat_control.py @@ -1239,7 +1239,7 @@ class GroupchatControl(ChatControlBase): additional_data=obj.additional_data) else: # message from someone - if obj.has_timestamp: + if obj.delayed: # don't print xhtml if it's an old message. # Like that xhtml messages are grayed too. self.print_old_conversation( @@ -1492,20 +1492,22 @@ class GroupchatControl(ChatControlBase): self.subject = subject self.draw_banner_text() - def _nec_gc_subject_received(self, obj): - if obj.conn.name != self.account: + def _nec_gc_subject_received(self, event): + if event.conn.name != self.account: return - if obj.room_jid != self.room_jid: + if event.jid != self.room_jid: return - self.set_subject(obj.subject) + self.set_subject(event.subject) text = _('%(nick)s has set the subject to %(subject)s') % { - 'nick': obj.nickname, 'subject': obj.subject} - if obj.has_timestamp: - self.print_old_conversation(text) - else: - self.print_conversation(text) + 'nick': event.nickname, 'subject': event.subject} + + if event.delayed: + date = time.strftime('%d-%m-%Y %H:%M:%S', + time.localtime(event.timestamp)) + text = '%s - %s' % (text, date) + self.print_conversation(text) - if obj.subject == '': + if event.subject == '': self.subject_button.hide() else: self.subject_button.show() ===================================== gajim/remote_control.py ===================================== --- a/gajim/remote_control.py +++ b/gajim/remote_control.py @@ -383,7 +383,7 @@ class GajimRemote(Server): # event has not been handled at GUI level return self.raise_signal('GCMessage', (obj.conn.name, [obj.fjid, obj.msgtxt, - obj.timestamp, obj.has_timestamp, obj.xhtml_msgtxt, obj.status_code, + obj.timestamp, obj.delayed, obj.xhtml_msgtxt, obj.status_code, obj.displaymarking, obj.captcha_form, obj.needs_highlight])) def on_our_status(self, obj): ===================================== gajim/roster_window.py ===================================== --- a/gajim/roster_window.py +++ b/gajim/roster_window.py @@ -2694,10 +2694,10 @@ class RosterWindow: def _nec_gc_subject_received(self, obj): contact = app.contacts.get_contact_with_highest_priority( - obj.conn.name, obj.room_jid) + obj.conn.name, obj.jid) if contact: contact.status = obj.subject - self.draw_contact(obj.room_jid, obj.conn.name) + self.draw_contact(obj.jid, obj.conn.name) def _nec_metacontacts_received(self, obj): self.redraw_metacontacts(obj.conn.name) View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/08d0cde95dbe064a5a8a2b666c35c7775… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/08d0cde95dbe064a5a8a2b666c35c7775… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] improve string for translators
by Yann Leboulanger 30 Aug '18

30 Aug '18

Yann Leboulanger pushed to branch master at gajim / gajim Commits: 08d0cde9 by Yann Leboulanger at 2018-08-30T12:57:33Z improve string for translators - - - - - 1 changed file: - gajim/groupchat_control.py Changes: ===================================== gajim/groupchat_control.py ===================================== --- a/gajim/groupchat_control.py +++ b/gajim/groupchat_control.py @@ -1586,7 +1586,8 @@ class GroupchatControl(ChatControlBase): self.print_conversation(_('Ping? (%s)') % nick) elif obj.name == 'ping-reply': self.print_conversation( - _('Pong! (%s %s s.)') % (nick, obj.seconds)) + _('Pong! (%(nick)s %(delay)s s.)') % {'nick': nick, + 'delay': obj.seconds}) elif obj.name == 'ping-error': self.print_conversation(_('Error.')) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/08d0cde95dbe064a5a8a2b666c35c77755… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/08d0cde95dbe064a5a8a2b666c35c77755… 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