Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] 2 commits: Create desktop and appdata files in build directory
by Philipp Hörist 22 Nov '17

22 Nov '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 8e8eff79 by André Apitzsch at 2017-11-22T20:30:13+01:00 Create desktop and appdata files in build directory - - - - - ae57d66a by Philipp Hörist at 2017-11-22T21:25:27+01:00 Merge branch 'build_location' into 'master' Create desktop and appdata files in build directory See merge request gajim/gajim!155 - - - - - 1 changed file: - setup.py Changes: ===================================== setup.py ===================================== --- a/setup.py +++ b/setup.py @@ -19,6 +19,7 @@ import gajim pos = [x for x in os.listdir('po') if x[-3:] == ".po"] ALL_LINGUAS = sorted([os.path.split(x)[-1][:-3] for x in pos]) cwd = os.path.dirname(os.path.realpath(__file__)) +build_dir = os.path.join(cwd, "build") def update_trans(): @@ -56,7 +57,7 @@ def build_trans(build_cmd): data_files = build_cmd.distribution.data_files for lang in ALL_LINGUAS: po_file = os.path.join('po', lang + '.po') - mo_file = os.path.join(cwd, 'build', 'mo', lang, 'LC_MESSAGES', 'gajim.mo') + mo_file = os.path.join(build_dir, 'mo', lang, 'LC_MESSAGES', 'gajim.mo') mo_dir = os.path.dirname(mo_file) if not (os.path.isdir(mo_dir) or os.path.islink(mo_dir)): os.makedirs(mo_dir) @@ -84,7 +85,7 @@ def build_man(build_cmd): data_files = build_cmd.distribution.data_files for man in ['gajim.1', 'gajim-history-manager.1', 'gajim-remote.1']: filename = os.path.join('data', man) - newdir = os.path.join(cwd, 'build', 'man') + newdir = os.path.join(build_dir, 'man') if not (os.path.isdir(newdir) or os.path.islink(newdir)): os.makedirs(newdir) @@ -112,7 +113,7 @@ def build_intl(build_cmd): Merge translation files into desktop and mime files ''' data_files = build_cmd.distribution.data_files - base = cwd + base = build_dir merge_files = (('data/org.gajim.Gajim.desktop', 'share/applications', '--desktop'), ('data/gajim-remote.desktop', 'share/applications', '--desktop'), View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/d86c7f47f5593ff3973be7e7f8327ff22… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/d86c7f47f5593ff3973be7e7f8327ff22… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_0.16] Fix showing normal message event
by Yann Leboulanger 22 Nov '17

22 Nov '17

Yann Leboulanger pushed to branch gajim_0.16 at gajim / gajim Commits: 81bf435b by Yann Leboulanger at 2017-11-22T15:58:42+01:00 Fix showing normal message event - - - - - 1 changed file: - src/session.py Changes: ===================================== src/session.py ===================================== --- a/src/session.py +++ b/src/session.py @@ -260,7 +260,7 @@ class ChatControlSession(stanza_session.EncryptedStanzaSession): self.conn.name, contact, self) obj.show_in_systray = notify.get_show_in_systray(event_type, self.conn.name, contact) - if obj.mtype == 'normal' and not obj.popup: + if obj.mtype == 'normal' and obj.popup: do_event = False else: do_event = True View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/81bf435b09ee70790e8aa5d7871ee87604… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/81bf435b09ee70790e8aa5d7871ee87604… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] lower debug level for unresolved host.
by Yann Leboulanger 22 Nov '17

22 Nov '17

Yann Leboulanger pushed to branch master at gajim / gajim Commits: d86c7f47 by Yann Leboulanger at 2017-11-22T14:57:08+01:00 lower debug level for unresolved host. - - - - - 1 changed file: - gajim/common/resolver.py Changes: ===================================== gajim/common/resolver.py ===================================== --- a/gajim/common/resolver.py +++ b/gajim/common/resolver.py @@ -109,7 +109,7 @@ class GioResolver(CommonResolver): except GLib.Error as e: if e.domain == 'g-resolver-error-quark': result_list = [] - log.warning("Could not resolve host: %s", e.message) + log.info("Could not resolve host: %s", e.message) else: raise else: View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/d86c7f47f5593ff3973be7e7f8327ff22b… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/d86c7f47f5593ff3973be7e7f8327ff22b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Lower debug level for malformed avatar stanzas
by Philipp Hörist 22 Nov '17

22 Nov '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 7ec57e4d by Philipp Hörist at 2017-11-22T14:53:32+01:00 Lower debug level for malformed avatar stanzas - - - - - 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 @@ -625,23 +625,23 @@ class PubsubAvatarReceivedEvent(nec.NetworkIncomingEvent): item = self.items_node.getTag('item') if not item: log.warning('Received malformed avatar data via pubsub') - log.warning(self.stanza) + log.debug(self.stanza) return self.sha = item.getAttr('id') data_tag = item.getTag('data', namespace='urn:xmpp:avatar:data') if self.sha is None or data_tag is None: log.warning('Received malformed avatar data via pubsub') - log.warning(self.stanza) + log.debug(self.stanza) return self.data = data_tag.getData() if self.data is None: log.warning('Received malformed avatar data via pubsub') - log.warning(self.stanza) + log.debug(self.stanza) return try: self.data = base64.b64decode(self.data.encode('utf-8')) except binascii.Error as err: - log.warning('Received malformed avatar data via pubsub: %s' % err) + log.debug('Received malformed avatar data via pubsub: %s' % err) return return True View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/7ec57e4daba98c19655fea73fab81354bb… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/7ec57e4daba98c19655fea73fab81354bb… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] prevent traceback
by Yann Leboulanger 20 Nov '17

20 Nov '17

Yann Leboulanger pushed to branch master at gajim / gajim Commits: 84af966a by Yann Leboulanger at 2017-11-20T21:18:32+01:00 prevent traceback - - - - - 1 changed file: - gajim/roster_window.py Changes: ===================================== gajim/roster_window.py ===================================== --- a/gajim/roster_window.py +++ b/gajim/roster_window.py @@ -1016,6 +1016,8 @@ class RosterWindow: self.draw_contact(jid, account) # Hide Group if all childs are hidden contact = app.contacts.get_contact(account, jid) + if not contact: + return for group in contact.get_shown_groups(): self.draw_group(group, account) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/84af966a87e4d56742af95bc7cf0c3fbcd… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/84af966a87e4d56742af95bc7cf0c3fbcd… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Persist resource across sessions
by Philipp Hörist 20 Nov '17

20 Nov '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 1c895e89 by Philipp Hörist at 2017-11-20T18:10:51+01:00 Persist resource across sessions This was somehow lost once we implemented random resource strings Although its good that initally a random resource is chosen, it still should persist across sessions. This helps to kill zombie client connections on the server because most servers kill the old session once a new with the same resource connects Also dont notify the user about resource conflicts if no custom resource is set. We should not expect users to know about resources and what they are used for as long as possible. - - - - - 2 changed files: - gajim/common/connection.py - gajim/gui_interface.py Changes: ===================================== gajim/common/connection.py ===================================== --- a/gajim/common/connection.py +++ b/gajim/common/connection.py @@ -191,6 +191,7 @@ class CommonConnection: 'hostname': socket.gethostname(), 'rand': rand }) + app.config.set_per('accounts', self.name, 'resource', resource) return resource def dispatch(self, event, data): ===================================== gajim/gui_interface.py ===================================== --- a/gajim/gui_interface.py +++ b/gajim/gui_interface.py @@ -1162,10 +1162,18 @@ class Interface: account = obj.conn.name conn = obj.conn self.roster.send_status(account, 'offline', conn.status) + def on_ok(new_resource): app.config.set_per('accounts', account, 'resource', new_resource) self.roster.send_status(account, conn.old_show, conn.status) + proposed_resource = conn.server_resource + if proposed_resource.startswith('gajim.'): + # Dont notify the user about resource change if he didnt set + # a custom resource + on_ok('gajim.$rand') + return + proposed_resource += app.config.get('gc_proposed_nick_char') dlg = dialogs.ResourceConflictDialog(_('Resource Conflict'), _('You are already connected to this account with the same ' View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/1c895e89835c2ef4a53275cdd59e3b668a… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/1c895e89835c2ef4a53275cdd59e3b668a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Query MUC archives with the correct namespace
by Philipp Hörist 19 Nov '17

19 Nov '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: c45d0f5b by Philipp Hörist at 2017-11-19T23:45:03+01:00 Query MUC archives with the correct namespace - - - - - 2 changed files: - gajim/common/caps_cache.py - gajim/common/message_archiving.py Changes: ===================================== gajim/common/caps_cache.py ===================================== --- a/gajim/common/caps_cache.py +++ b/gajim/common/caps_cache.py @@ -491,3 +491,12 @@ class MucCapsCache: return True except (KeyError, AttributeError): return False + + def get_mam_namespace(self, jid): + try: + if nbxmpp.NS_MAM_2 in self.cache[jid].features: + return nbxmpp.NS_MAM_2 + elif nbxmpp.NS_MAM_1 in self.cache[jid].features: + return nbxmpp.NS_MAM_1 + except (KeyError, AttributeError): + return ===================================== gajim/common/message_archiving.py ===================================== --- a/gajim/common/message_archiving.py +++ b/gajim/common/message_archiving.py @@ -27,6 +27,7 @@ from gajim.common import app from gajim.common import ged from gajim.common.logger import KindConstant, JIDConstant from gajim.common.const import ArchiveState +from gajim.common.caps_cache import muc_caps_cache import gajim.common.connection_handlers_events as ev log = logging.getLogger('gajim.c.message_archiving') @@ -296,7 +297,12 @@ class ConnectionArchive313: def get_archive_query(self, query_id, jid=None, start=None, end=None, with_=None, after=None, max_=30): - namespace = self.archiving_namespace + # Muc archive query? + namespace = muc_caps_cache.get_mam_namespace(jid) + if namespace is None: + # Query to our own archive + namespace = self.archiving_namespace + iq = nbxmpp.Iq('set', to=jid) query = iq.addChild('query', namespace=namespace) form = query.addChild(node=nbxmpp.DataForm(typ='submit')) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/c45d0f5b279a42488bd90b7524f6d66449… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/c45d0f5b279a42488bd90b7524f6d66449… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 13 commits: Add MAM for MUCs
by Philipp Hörist 19 Nov '17

19 Nov '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 75b1d54b by Philipp Hörist at 2017-11-19T19:36:20+01:00 Add MAM for MUCs - - - - - 536a504f by Philipp Hörist at 2017-11-19T19:36:25+01:00 Remove Support for mam:0 - - - - - 52827c6a by Philipp Hörist at 2017-11-19T19:36:25+01:00 Add new DB table last_archive_message - - - - - 9759dcf1 by Philipp Hörist at 2017-11-19T19:36:25+01:00 Add account_id column to logs table When we search for duplicated stanza-ids we have to do it in the context of an account - - - - - a07470a7 by Philipp Hörist at 2017-11-19T19:36:25+01:00 Add new DB methods - - - - - 95357361 by Philipp Hörist at 2017-11-19T19:36:25+01:00 Save account_id in logs table - - - - - 40f537cd by Philipp Hörist at 2017-11-19T19:36:26+01:00 Save last archive timestamps in DB - A Migration from last_mam_id config value is included - - - - - f57ec2fa by Philipp Hörist at 2017-11-19T19:36:26+01:00 Move common code out of HistoryWindow - move it into message_archiving.py - - - - - 51c0a05a by Philipp Hörist at 2017-11-19T19:36:26+01:00 Parse from jid correctly - - - - - 44bb8e37 by Philipp Hörist at 2017-11-19T19:36:26+01:00 Request one day history when first joining MUCs - - - - - cac1185a by Philipp Hörist at 2017-11-19T19:36:26+01:00 Remove log message - - - - - 7f1776ed by Philipp Hörist at 2017-11-19T19:36:26+01:00 Improve deduplication A stanza-id is only unique within a specific archive This adds the archive jid to the query - - - - - 3683f238 by Philipp Hörist at 2017-11-19T23:14:10+01:00 Merge branch 'master' into 'master' Add MAM for MUCs See merge request gajim/gajim!152 - - - - - 14 changed files: - gajim/__init__.py - gajim/common/caps_cache.py - gajim/common/check_paths.py - gajim/common/config.py - gajim/common/connection.py - gajim/common/connection_handlers.py - gajim/common/connection_handlers_events.py - gajim/common/const.py - gajim/common/logger.py - gajim/common/message_archiving.py - gajim/common/optparser.py - gajim/groupchat_control.py - gajim/history_sync.py - gajim/session.py Changes: ===================================== gajim/__init__.py ===================================== --- a/gajim/__init__.py +++ b/gajim/__init__.py @@ -1,6 +1,6 @@ import subprocess -__version__ = "0.16.11.1" +__version__ = "0.16.11.2" try: node = subprocess.Popen('git rev-parse --short=12 HEAD', shell=True, ===================================== gajim/common/caps_cache.py ===================================== --- a/gajim/common/caps_cache.py +++ b/gajim/common/caps_cache.py @@ -33,10 +33,12 @@ through ClientCaps objects which are hold by contact instances. import base64 import hashlib +from collections import namedtuple import logging log = logging.getLogger('gajim.c.caps_cache') +import nbxmpp from nbxmpp import (NS_XHTML_IM, NS_ESESSION, NS_CHATSTATES, NS_JINGLE_ICE_UDP, NS_JINGLE_RTP_AUDIO, NS_JINGLE_RTP_VIDEO, NS_JINGLE_FILE_TRANSFER_5) @@ -44,7 +46,7 @@ from nbxmpp import (NS_XHTML_IM, NS_ESESSION, NS_CHATSTATES, FEATURE_BLACKLIST = [NS_CHATSTATES, NS_XHTML_IM, NS_ESESSION, NS_JINGLE_ICE_UDP, NS_JINGLE_RTP_AUDIO, NS_JINGLE_RTP_VIDEO, NS_JINGLE_FILE_TRANSFER_5] - +from gajim.common import app # Query entry status codes NEW = 0 QUERIED = 1 @@ -56,12 +58,15 @@ FAKED = 3 # allow NullClientCaps to behave as it has a cached item ################################################################################ capscache = None +muc_caps_cache = None def initialize(logger): """ Initialize this module """ global capscache + global muc_caps_cache capscache = CapsCache(logger) + muc_caps_cache = MucCapsCache() def client_supports(client_caps, requested_feature): lookup_item = client_caps.get_cache_lookup_strategy() @@ -438,3 +443,51 @@ class CapsCache(object): key = (hash_method, hash) if key in self.__cache: del self.__cache[key] + + +class MucCapsCache: + + DiscoInfo = namedtuple('DiscoInfo', ['identities', 'features', 'data']) + + def __init__(self): + self.cache = {} + + def append(self, stanza): + jid = stanza.getFrom() + identities, features, data = [], [], [] + query_childs = stanza.getQueryChildren() + if not query_childs: + app.log('gajim.muc').warning('%s returned empty disco info', jid) + return + + for child in query_childs: + if child.getName() == 'identity': + attr = {} + for key in child.getAttrs().keys(): + attr[key] = child.getAttr(key) + identities.append(attr) + elif child.getName() == 'feature': + features.append(child.getAttr('var')) + elif child.getName() == 'x': + if child.getNamespace() == nbxmpp.NS_DATA: + data.append(nbxmpp.DataForm(node=child)) + + self.cache[jid] = self.DiscoInfo(identities, features, data) + + def is_cached(self, jid): + return jid in self.cache + + def supports(self, jid, feature): + if jid in self.cache: + if feature in self.cache[jid].features: + return True + return False + + def has_mam(self, jid): + try: + if nbxmpp.NS_MAM_2 in self.cache[jid].features: + return True + if nbxmpp.NS_MAM_1 in self.cache[jid].features: + return True + except (KeyError, AttributeError): + return False ===================================== gajim/common/check_paths.py ===================================== --- a/gajim/common/check_paths.py +++ b/gajim/common/check_paths.py @@ -65,6 +65,7 @@ def create_log_db(): CREATE TABLE logs( log_line_id INTEGER PRIMARY KEY AUTOINCREMENT UNIQUE, + account_id INTEGER, jid_id INTEGER, contact_name TEXT, time INTEGER, @@ -80,6 +81,13 @@ def create_log_db(): marker INTEGER ); + CREATE TABLE last_archive_message( + jid_id INTEGER PRIMARY KEY UNIQUE, + last_mam_id TEXT, + oldest_mam_timestamp TEXT, + last_muc_timestamp TEXT + ); + CREATE INDEX idx_logs_jid_id_time ON logs (jid_id, time DESC); ''' ) ===================================== gajim/common/config.py ===================================== --- a/gajim/common/config.py +++ b/gajim/common/config.py @@ -409,8 +409,6 @@ class Config: 'oauth2_client_id': [ opt_str, '0000000044077801', _('client_id for OAuth 2.0 authentication.')], 'oauth2_redirect_url': [ opt_str, 'https%3A%2F%2Fgajim.org%2Fmsnauth%2Findex.cgi', _('redirect_url for OAuth 2.0 authentication.')], 'opened_chat_controls': [opt_str, '', _('Space separated list of JIDs for which we want to re-open a chat window on next startup.')], - 'last_mam_id': [opt_str, '', _('Last MAM id we are syncronized with')], - 'mam_start_date': [opt_int, 0, _('The earliest date we requested MAM history for')], }, {}), 'statusmsg': ({ 'message': [ opt_str, '' ], ===================================== gajim/common/connection.py ===================================== --- a/gajim/common/connection.py +++ b/gajim/common/connection.py @@ -42,6 +42,7 @@ import locale import hmac import hashlib import json +from functools import partial try: randomsource = random.SystemRandom() @@ -432,7 +433,7 @@ class CommonConnection: if obj.message is None: return - app.logger.insert_into_logs(jid, obj.timestamp, obj.kind, + app.logger.insert_into_logs(self.name, jid, obj.timestamp, obj.kind, message=obj.message, subject=obj.subject, additional_data=obj.additional_data, @@ -1913,8 +1914,6 @@ class Connection(CommonConnection, ConnectionHandlers): self.archiving_namespace = nbxmpp.NS_MAM_2 elif nbxmpp.NS_MAM_1 in obj.features: self.archiving_namespace = nbxmpp.NS_MAM_1 - elif nbxmpp.NS_MAM in obj.features: - self.archiving_namespace = nbxmpp.NS_MAM if self.archiving_namespace: self.archiving_supported = True self.archiving_313_supported = True @@ -2583,6 +2582,11 @@ class Connection(CommonConnection, ConnectionHandlers): # Never join a room when invisible return + self.discoverMUC( + room_jid, partial(self._join_gc, nick, show, room_jid, + 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) @@ -2599,11 +2603,19 @@ class Connection(CommonConnection, ConnectionHandlers): if app.config.get('send_sha_in_gc_presence'): p = self.add_sha(p) self.add_lang(p) - if not change_nick: - t = p.setTag(nbxmpp.NS_MUC + ' x') + 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'}) + else: + # Request MUC History (not MAM) tags = {} timeout = app.config.get_per('rooms', room_jid, - 'muc_restore_timeout') + 'muc_restore_timeout') if timeout is None or timeout == -2: timeout = app.config.get('muc_restore_timeout') if last_date == 0 and timeout >= 0: @@ -2621,8 +2633,9 @@ class Connection(CommonConnection, ConnectionHandlers): tags['maxstanzas'] = nb if tags: t.setTag('history', tags) - if password: - t.setTagData('password', password) + + if password: + t.setTagData('password', password) self.connection.send(p) def _nec_gc_message_outgoing(self, obj): ===================================== gajim/common/connection_handlers.py ===================================== --- a/gajim/common/connection_handlers.py +++ b/gajim/common/connection_handlers.py @@ -47,6 +47,7 @@ from gajim.common import helpers from gajim.common import app from gajim.common import dataforms from gajim.common import jingle_xtls +from gajim.common.caps_cache import muc_caps_cache from gajim.common.commands import ConnectionCommands from gajim.common.pubsub import ConnectionPubSub from gajim.common.protocol.caps import ConnectionCaps @@ -96,6 +97,29 @@ class ConnectionDisco: id_ = self._discover(nbxmpp.NS_DISCO_INFO, jid, node, id_prefix) self.disco_info_ids.append(id_) + def discoverMUC(self, jid, callback): + disco_info = nbxmpp.Iq(typ='get', to=jid, queryNS=nbxmpp.NS_DISCO_INFO) + self.connection.SendAndCallForResponse( + disco_info, self.received_muc_info, {'callback': callback}) + + def received_muc_info(self, conn, stanza, callback): + if nbxmpp.isResultNode(stanza): + app.log('gajim.muc').info( + 'Received MUC DiscoInfo for %s', stanza.getFrom()) + muc_caps_cache.append(stanza) + callback() + else: + error = stanza.getError() + if error == 'item-not-found': + # Groupchat does not exist + callback() + return + app.nec.push_incoming_event( + InformationEvent(None, conn=self, + level='error', + pri_txt=_('Unable to join Groupchat'), + sec_txt=error)) + def request_register_agent_info(self, agent): if not self.connection or self.connected < 2: return None @@ -760,6 +784,8 @@ class ConnectionHandlersBase: self._nec_message_received) app.ged.register_event_handler('mam-message-received', ged.CORE, self._nec_message_received) + app.ged.register_event_handler('mam-gc-message-received', ged.CORE, + self._nec_message_received) app.ged.register_event_handler('decrypted-message-received', ged.CORE, self._nec_decrypted_message_received) app.ged.register_event_handler('gc-message-received', ged.CORE, @@ -776,6 +802,8 @@ class ConnectionHandlersBase: self._nec_message_received) app.ged.remove_event_handler('mam-message-received', ged.CORE, self._nec_message_received) + app.ged.remove_event_handler('mam-gc-message-received', ged.CORE, + self._nec_message_received) app.ged.remove_event_handler('decrypted-message-received', ged.CORE, self._nec_decrypted_message_received) app.ged.remove_event_handler('gc-message-received', ged.CORE, @@ -918,7 +946,8 @@ class ConnectionHandlersBase: app.config.should_log(self.name, obj.jid): show = app.logger.convert_show_values_to_db_api_values(obj.show) if show is not None: - app.logger.insert_into_logs(nbxmpp.JID(obj.jid).getStripped(), + app.logger.insert_into_logs(self.name, + nbxmpp.JID(obj.jid).getStripped(), time_time(), KindConstant.STATUS, message=obj.status, @@ -1044,7 +1073,8 @@ class ConnectionHandlersBase: # if not obj.nick, it means message comes from room itself # usually it hold description and can be send at each connection # so don't store it in logs - app.logger.insert_into_logs(obj.jid, + app.logger.insert_into_logs(self.name, + obj.jid, obj.timestamp, KindConstant.GC_MSG, message=obj.msgtxt, @@ -1064,7 +1094,8 @@ class ConnectionHandlersBase: subject = msg.getSubject() if session.is_loggable(): - app.logger.insert_into_logs(nbxmpp.JID(frm).getStripped(), + app.logger.insert_into_logs(self.name, + nbxmpp.JID(frm).getStripped(), tim, KindConstant.ERROR, message=error_msg, @@ -1266,10 +1297,6 @@ ConnectionHandlersBase, ConnectionJingle, ConnectionIBBytestream): app.nec.register_incoming_event(ArchivingErrorReceivedEvent) app.nec.register_incoming_event( Archiving313PreferencesChangedReceivedEvent) - app.nec.register_incoming_event( - ArchivingFinishedLegacyReceivedEvent) - app.nec.register_incoming_event( - ArchivingFinishedReceivedEvent) app.nec.register_incoming_event(NotificationEvent) app.ged.register_event_handler('http-auth-received', ged.CORE, @@ -2210,7 +2237,6 @@ ConnectionHandlersBase, ConnectionJingle, ConnectionIBBytestream): con.RegisterHandler('iq', self._IqPingCB, 'get', nbxmpp.NS_PING) con.RegisterHandler('iq', self._SearchCB, 'result', nbxmpp.NS_SEARCH) con.RegisterHandler('iq', self._PrivacySetCB, 'set', nbxmpp.NS_PRIVACY) - con.RegisterHandler('iq', self._ArchiveCB, ns=nbxmpp.NS_MAM) con.RegisterHandler('iq', self._ArchiveCB, ns=nbxmpp.NS_MAM_1) con.RegisterHandler('iq', self._ArchiveCB, ns=nbxmpp.NS_MAM_2) con.RegisterHandler('iq', self._PubSubCB, 'result') ===================================== gajim/common/connection_handlers_events.py ===================================== --- a/gajim/common/connection_handlers_events.py +++ b/gajim/common/connection_handlers_events.py @@ -954,7 +954,8 @@ class GcPresenceReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): show = app.logger.convert_show_values_to_db_api_values(self.show) if show is not None: fjid = nbxmpp.JID(self.fjid) - app.logger.insert_into_logs(fjid.getStripped(), + app.logger.insert_into_logs(self.conn.name, + fjid.getStripped(), time_time(), KindConstant.GCSTATUS, contact_name=fjid.getResource(), @@ -1052,36 +1053,33 @@ class MamMessageReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): :stanza: Complete stanza Node :forwarded: Forwarded Node :result: Result Node - :unique_id: The unique stable id ''' self._set_base_event_vars_as_attributes(base_event) self.additional_data = {} self.encrypted = False self.groupchat = False + self.nick = None def generate(self): archive_jid = self.stanza.getFrom() - own_jid = self.conn.get_own_jid() + own_jid = self.conn.get_own_jid().getStripped() if archive_jid and not archive_jid.bareMatch(own_jid): # MAM Message not from our Archive - log.info('MAM message not from our user archive') return False self.msg_ = self.forwarded.getTag('message', protocol=True) if self.msg_.getType() == 'groupchat': - log.info('Received groupchat message from user archive') return False # use stanza-id as unique-id self.unique_id, origin_id = self.get_unique_id() # Check for duplicates - if app.logger.find_stanza_id(self.unique_id, origin_id): + if app.logger.find_stanza_id(own_jid, self.unique_id, origin_id): return self.msgtxt = self.msg_.getTagData('body') - self.query_id = self.result.getAttr('queryid') frm = self.msg_.getFrom() # Some servers dont set the 'to' attribute when @@ -1123,26 +1121,83 @@ class MamMessageReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): return True def get_unique_id(self): + stanza_id = self.get_stanza_id(self.result, query=True) if self.conn.get_own_jid().bareMatch(self.msg_.getFrom()): - # On our own Messages we have to check for both - # stanza-id and origin-id, because other resources - # maybe not support origin-id - stanza_id = None - if self.result.getNamespace() == nbxmpp.NS_MAM_2: - # Only mam:2 ensures valid stanza-id - stanza_id = self.get_stanza_id(self.result, query=True) - - # try always to get origin-id because its a message - # we sent. + # message we sent origin_id = self.msg_.getOriginID() - return stanza_id, origin_id # A message we received - elif self.result.getNamespace() == nbxmpp.NS_MAM_2: - # Only mam:2 ensures valid stanza-id - return self.get_stanza_id(self.result, query=True), None - return None, None + return stanza_id, None + +class MamGcMessageReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): + name = 'mam-gc-message-received' + base_network_events = ['raw-mam-message-received'] + + def __init__(self, name, base_event): + ''' + Pre-Generated attributes on self: + + :conn: Connection instance + :stanza: Complete stanza Node + :forwarded: Forwarded Node + :result: Result Node + ''' + self._set_base_event_vars_as_attributes(base_event) + self.additional_data = {} + self.encrypted = False + self.groupchat = True + self.kind = KindConstant.GC_MSG + + def generate(self): + self.msg_ = self.forwarded.getTag('message', protocol=True) + + if self.msg_.getType() != 'groupchat': + return False + + self.room_jid = self.stanza.getFrom().getStripped() + + self.unique_id = self.get_stanza_id(self.result, query=True) + + # Check for duplicates + if app.logger.find_stanza_id(self.room_jid, self.unique_id, + groupchat=True): + return + + self.msgtxt = self.msg_.getTagData('body') + self.with_ = self.msg_.getFrom().getStripped() + self.nick = self.msg_.getFrom().getResource() + + # Get the real jid if we have it + self.real_jid = None + muc_user = self.msg_.getTag('x', namespace=nbxmpp.NS_MUC_USER) + if muc_user is not None: + self.real_jid = muc_user.getTagAttr('item', 'jid') + + delay = self.forwarded.getTagAttr( + 'delay', 'stamp', namespace=nbxmpp.NS_DELAY2) + if delay is None: + log.error('Received MAM message without timestamp') + return + + self.timestamp = helpers.parse_datetime( + delay, check_utc=True, epoch=True) + if self.timestamp is None: + log.error('Received MAM message with invalid timestamp: %s', delay) + return + + # Save timestamp added by the user + user_delay = self.msg_.getTagAttr( + 'delay', 'stamp', namespace=nbxmpp.NS_DELAY2) + if user_delay is not None: + self.user_timestamp = helpers.parse_datetime( + user_delay, check_utc=True, epoch=True) + if self.user_timestamp is None: + log.warning('Received MAM message with ' + 'invalid user timestamp: %s', user_delay) + + log.debug('Received mam-gc-message: unique id: %s', self.unique_id) + return True class MamDecryptedMessageReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): name = 'mam-decrypted-message-received' @@ -1156,6 +1211,9 @@ class MamDecryptedMessageReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): self.get_oob_data(self.msg_) + if self.groupchat: + return True + self.is_pm = app.logger.jid_is_room_jid(self.with_.getStripped()) if self.is_pm is None: # Check if this event is triggered after a disco, so we dont @@ -1226,7 +1284,9 @@ class MessageReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): # Check groupchat messages for duplicates, # We do this because of MUC History messages if self.stanza.getType() == 'groupchat': - if app.logger.find_stanza_id(self.unique_id): + if app.logger.find_stanza_id(self.stanza.getFrom().getStripped(), + self.unique_id, + groupchat=True): return address_tag = self.stanza.getTag('addresses', @@ -1285,9 +1345,14 @@ class MessageReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): self.forwarded = True result = self.stanza.getTag('result', protocol=True) - if result and result.getNamespace() in (nbxmpp.NS_MAM, - nbxmpp.NS_MAM_1, + if result and result.getNamespace() in (nbxmpp.NS_MAM_1, nbxmpp.NS_MAM_2): + + if result.getAttr('queryid') not in self.conn.mam_query_ids: + log.warning('Invalid MAM Message: unknown query id') + log.debug(self.stanza) + return + forwarded = result.getTag('forwarded', namespace=nbxmpp.NS_FORWARD, protocol=True) @@ -1300,8 +1365,7 @@ class MessageReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): conn=self.conn, stanza=self.stanza, forwarded=forwarded, - result=result, - stanza_id=self.unique_id)) + result=result)) return # Mediated invitation? @@ -1799,6 +1863,27 @@ class ArchivingErrorReceivedEvent(nec.NetworkIncomingEvent): self.error_msg = self.stanza.getErrorMsg() return True +class ArchivingCountReceived(nec.NetworkIncomingEvent): + name = 'archiving-count-received' + base_network_events = [] + + def generate(self): + return True + +class ArchivingIntervalFinished(nec.NetworkIncomingEvent): + name = 'archiving-interval-finished' + base_network_events = [] + + def generate(self): + return True + +class ArchivingQueryID(nec.NetworkIncomingEvent): + name = 'archiving-query-id' + base_network_events = [] + + def generate(self): + return True + class Archiving313PreferencesChangedReceivedEvent(nec.NetworkIncomingEvent): name = 'archiving-313-preferences-changed-received' base_network_events = ['archiving-received'] @@ -1826,43 +1911,6 @@ class Archiving313PreferencesChangedReceivedEvent(nec.NetworkIncomingEvent): return True -class ArchivingFinishedReceivedEvent(nec.NetworkIncomingEvent): - name = 'archiving-finished' - base_network_events = ['archiving-received'] - - def generate(self): - self.conn = self.base_event.conn - self.stanza = self.base_event.stanza - self.type_ = self.base_event.type_ - self.fin = self.stanza.getTag('fin') - - if self.type_ != 'result' or not self.fin: - return - - self.query_id = self.fin.getAttr('queryid') - if not self.query_id: - return - - return True - -class ArchivingFinishedLegacyReceivedEvent(nec.NetworkIncomingEvent): - name = 'archiving-finished-legacy' - base_network_events = ['raw-message-received'] - - def generate(self): - self.conn = self.base_event.conn - self.stanza = self.base_event.stanza - self.fin = self.stanza.getTag('fin', namespace=nbxmpp.NS_MAM) - - if not self.fin: - return - - self.query_id = self.fin.getAttr('queryid') - if not self.query_id: - return - - return True - class AccountCreatedEvent(nec.NetworkIncomingEvent): name = 'account-created' base_network_events = [] ===================================== gajim/common/const.py ===================================== --- a/gajim/common/const.py +++ b/gajim/common/const.py @@ -36,6 +36,10 @@ class AvatarSize(IntEnum): TOOLTIP = 125 VCARD = 200 +class ArchiveState(IntEnum): + NEVER = 0 + ALL = 1 + THANKS = u"""\ Alexander Futász ===================================== gajim/common/logger.py ===================================== --- a/gajim/common/logger.py +++ b/gajim/common/logger.py @@ -282,6 +282,10 @@ class Logger: return [user['jid'] for user in family] return [jid] + def get_account_id(self, account): + jid = app.get_jid_from_account(account) + return self.get_jid_id(jid, type_=JIDConstant.NORMAL_TYPE) + def get_jid_id(self, jid, kind=None, type_=None): """ Get the jid id from a jid. @@ -1084,12 +1088,19 @@ class Logger: return True return False - def find_stanza_id(self, stanza_id, origin_id=None): + def find_stanza_id(self, archive_jid, stanza_id, origin_id=None, + groupchat=False): """ Checks if a stanza-id is already in the `logs` table + :param archive_jid: The jid of the archive the stanza-id belongs to + :param stanza_id: The stanza-id + :param origin_id: The origin-id + + :param groupchat: stanza-id is from a groupchat + return True if the stanza-id was found """ ids = [] @@ -1101,12 +1112,19 @@ class Logger: if not ids: return False + archive_id = self.get_jid_id(archive_jid) + if groupchat: + column = 'jid_id' + else: + column = 'account_id' + sql = ''' SELECT stanza_id FROM logs - WHERE stanza_id IN ({values}) LIMIT 1 - '''.format(values=', '.join('?' * len(ids))) + WHERE stanza_id IN ({values}) AND {archive} = ? LIMIT 1 + '''.format(values=', '.join('?' * len(ids)), + archive=column) - result = self.con.execute(sql, tuple(ids)).fetchone() + result = self.con.execute(sql, tuple(ids) + (archive_id,)).fetchone() if result is not None: log.info('Found duplicated message, stanza-id: %s, origin-id: %s', @@ -1127,7 +1145,8 @@ class Logger: """ return self.get_jid_id(jid, kind, type_) - def insert_into_logs(self, jid, time_, kind, unread=True, **kwargs): + def insert_into_logs(self, account, jid, time_, kind, + unread=True, **kwargs): """ Insert a new message into the `logs` table @@ -1144,20 +1163,22 @@ class Logger: a field in the `logs` table """ jid_id = self.get_jid_id(jid, kind=kind) - + account_id = self.get_account_id(account) + if 'additional_data' in kwargs: if not kwargs['additional_data']: del kwargs['additional_data'] else: kwargs['additional_data'] = json.dumps(kwargs["additional_data"]) - + sql = ''' - INSERT INTO logs (jid_id, time, kind, {columns}) - VALUES (?, ?, ?, {values}) + INSERT INTO logs (account_id, jid_id, time, kind, {columns}) + VALUES (?, ?, ?, ?, {values}) '''.format(columns=', '.join(kwargs.keys()), values=', '.join('?' * len(kwargs))) - lastrowid = self.con.execute(sql, (jid_id, time_, kind) + tuple(kwargs.values())).lastrowid + lastrowid = self.con.execute( + sql, (account_id, jid_id, time_, kind) + tuple(kwargs.values())).lastrowid log.info('Insert into DB: jid: %s, time: %s, kind: %s, stanza_id: %s', jid, time_, kind, kwargs.get('stanza_id', None)) @@ -1192,3 +1213,45 @@ class Logger: ''' self.con.execute(sql, (sha, account_jid_id, jid_id)) self._timeout_commit() + + def get_archive_timestamp(self, jid, type_=None): + """ + Get the last archive id/timestamp for a jid + + :param jid: The jid that belongs to the avatar + + """ + jid_id = self.get_jid_id(jid, type_=type_) + sql = '''SELECT * FROM last_archive_message WHERE jid_id = ?''' + return self.con.execute(sql, (jid_id,)).fetchone() + + def set_archive_timestamp(self, jid, **kwargs): + """ + Set the last archive id/timestamp + + :param jid: The jid that belongs to the avatar + + :param last_mam_id: The last MAM result id + + :param oldest_mam_timestamp: The oldest date we requested MAM + history for + + :param last_muc_timestamp: The timestamp of the last message we + received in a MUC + + """ + jid_id = self.get_jid_id(jid) + exists = self.get_archive_timestamp(jid) + if not exists: + sql = '''INSERT INTO last_archive_message VALUES (?, ?, ?, ?)''' + self.con.execute(sql, (jid_id, + kwargs.get('last_mam_id', None), + kwargs.get('oldest_mam_timestamp', None), + kwargs.get('last_muc_timestamp', None))) + else: + args = ' = ?, '.join(kwargs.keys()) + ' = ?' + sql = '''UPDATE last_archive_message SET {} + WHERE jid_id = ?'''.format(args) + self.con.execute(sql, tuple(kwargs.values()) + (jid_id,)) + log.info('Save archive timestamps: %s', kwargs) + self._timeout_commit() ===================================== gajim/common/message_archiving.py ===================================== --- a/gajim/common/message_archiving.py +++ b/gajim/common/message_archiving.py @@ -26,6 +26,7 @@ import nbxmpp from gajim.common import app from gajim.common import ged from gajim.common.logger import KindConstant, JIDConstant +from gajim.common.const import ArchiveState import gajim.common.connection_handlers_events as ev log = logging.getLogger('gajim.c.message_archiving') @@ -36,13 +37,9 @@ class ConnectionArchive313: self.archiving_313_supported = False self.mam_awaiting_disco_result = {} self.iq_answer = [] - self.mam_query_date = None - self.mam_query_id = None + self.mam_query_ids = [] app.nec.register_incoming_event(ev.MamMessageReceivedEvent) - app.ged.register_event_handler('archiving-finished-legacy', ged.CORE, - self._nec_result_finished) - app.ged.register_event_handler('archiving-finished', ged.CORE, - self._nec_result_finished) + app.nec.register_incoming_event(ev.MamGcMessageReceivedEvent) app.ged.register_event_handler('agent-info-error-received', ged.CORE, self._nec_agent_info_error) app.ged.register_event_handler('agent-info-received', ged.CORE, @@ -54,10 +51,6 @@ class ConnectionArchive313: self._nec_archiving_313_preferences_changed_received) def cleanup(self): - app.ged.remove_event_handler('archiving-finished-legacy', ged.CORE, - self._nec_result_finished) - app.ged.remove_event_handler('archiving-finished', ged.CORE, - self._nec_result_finished) app.ged.remove_event_handler('agent-info-error-received', ged.CORE, self._nec_agent_info_error) app.ged.remove_event_handler('agent-info-received', ged.CORE, @@ -101,28 +94,111 @@ class ConnectionArchive313: None, disco=True, **vars(msg_obj))) del self.mam_awaiting_disco_result[obj.jid] - def _nec_result_finished(self, obj): - if obj.conn.name != self.name: + @staticmethod + def parse_iq(stanza, query_id): + if not nbxmpp.isResultNode(stanza): + log.error('Error on MAM query: %s', stanza.getError()) + raise InvalidMamIQ + + fin = stanza.getTag('fin') + if fin is None: + log.error('Malformed MAM query result received: %s', stanza) + raise InvalidMamIQ + + if fin.getAttr('queryid') != query_id: + log.error('Result with unknown query id received') + raise InvalidMamIQ + + set_ = fin.getTag('set', namespace=nbxmpp.NS_RSM) + if set_ is None: + log.error( + 'Malformed MAM query result received (no "set" Node): %s', + stanza) + raise InvalidMamIQ + return fin, set_ + + def parse_from_jid(self, stanza): + jid = stanza.getFrom() + if jid is None: + # No from means, iq from our own archive + jid = self.get_own_jid().getStripped() + else: + jid = jid.getStripped() + return jid + + def _result_finished(self, conn, stanza, query_id, start_date, groupchat): + try: + fin, set_ = self.parse_iq(stanza, query_id) + except InvalidMamIQ: return - if obj.query_id != self.mam_query_id: + last = set_.getTagData('last') + if last is None: + log.info('End of MAM query, no items retrieved') + return + + jid = self.parse_from_jid(stanza) + complete = fin.getAttr('complete') + app.logger.set_archive_timestamp(jid, last_mam_id=last) + if complete != 'true': + self.mam_query_ids.remove(query_id) + query_id = self.get_query_id() + query = self.get_archive_query(query_id, jid=jid, after=last) + self._send_archive_query(query, query_id, groupchat=groupchat) + else: + self.mam_query_ids.remove(query_id) + if start_date is not None: + app.logger.set_archive_timestamp( + jid, + last_mam_id=last, + oldest_mam_timestamp=start_date.timestamp()) + log.info('End of MAM query, last mam id: %s', last) + + def _intervall_result_finished(self, conn, stanza, query_id, + start_date, end_date, event_id): + try: + fin, set_ = self.parse_iq(stanza, query_id) + except InvalidMamIQ: + return + + self.mam_query_ids.remove(query_id) + jid = self.parse_from_jid(stanza) + if start_date: + timestamp = start_date.timestamp() + else: + timestamp = ArchiveState.ALL + + last = set_.getTagData('last') + if last is None: + app.nec.push_incoming_event(ev.ArchivingIntervalFinished( + None, event_id=event_id)) + app.logger.set_archive_timestamp( + jid, oldest_mam_timestamp=timestamp) + log.info('End of MAM query, no items retrieved') + return + + complete = fin.getAttr('complete') + if complete != 'true': + self.request_archive_interval(event_id, start_date, end_date, last) + else: + log.info('query finished') + app.logger.set_archive_timestamp( + jid, oldest_mam_timestamp=timestamp) + app.nec.push_incoming_event(ev.ArchivingIntervalFinished( + None, event_id=event_id, stanza=stanza)) + + def _received_count(self, conn, stanza, query_id, event_id): + try: + _, set_ = self.parse_iq(stanza, query_id) + except InvalidMamIQ: return - set_ = obj.fin.getTag('set', namespace=nbxmpp.NS_RSM) - if set_: - last = set_.getTagData('last') - complete = obj.fin.getAttr('complete') - if last: - app.config.set_per('accounts', self.name, 'last_mam_id', last) - if complete != 'true': - self.request_archive(self.get_query_id(), after=last) - if complete == 'true': - self.mam_query_id = None - if self.mam_query_date: - app.config.set_per( - 'accounts', self.name, - 'mam_start_date', self.mam_query_date.timestamp()) - self.mam_query_date = None + self.mam_query_ids.remove(query_id) + + count = set_.getTagData('count') + log.info('message count received: %s', count) + app.nec.push_incoming_event(ev.ArchivingCountReceived( + None, event_id=event_id, count=count)) def _nec_mam_decrypted_message_received(self, obj): if obj.conn.name != self.name: @@ -132,33 +208,96 @@ class ConnectionArchive313: duplicate = app.logger.search_for_duplicate( obj.with_, obj.timestamp, obj.msgtxt) if duplicate: - return - app.logger.insert_into_logs( - obj.with_, obj.timestamp, obj.kind, - unread=False, - message=obj.msgtxt, - additional_data=obj.additional_data, - stanza_id=obj.unique_id) + # dont propagate the event further + return True + app.logger.insert_into_logs(self.name, + obj.with_, + obj.timestamp, + obj.kind, + unread=False, + message=obj.msgtxt, + contact_name=obj.nick, + additional_data=obj.additional_data, + stanza_id=obj.unique_id) def get_query_id(self): - self.mam_query_id = self.connection.getAnID() - return self.mam_query_id + query_id = self.connection.getAnID() + self.mam_query_ids.append(query_id) + return query_id def request_archive_on_signin(self): - mam_id = app.config.get_per('accounts', self.name, 'last_mam_id') + own_jid = self.get_own_jid().getStripped() + archive = app.logger.get_archive_timestamp(own_jid) + + # Migration of last_mam_id from config to DB + if archive is not None: + mam_id = archive.last_mam_id + else: + mam_id = app.config.get_per('accounts', self.name, 'last_mam_id') + + start_date = None query_id = self.get_query_id() if mam_id: - self.request_archive(query_id, after=mam_id) + log.info('MAM query after: %s', mam_id) + query = self.get_archive_query(query_id, after=mam_id) else: # First Start, we request the last week - self.mam_query_date = datetime.utcnow() - timedelta(days=7) - log.info('First start: query archive start: %s', self.mam_query_date) - self.request_archive(query_id, start=self.mam_query_date) + start_date = datetime.utcnow() - timedelta(days=7) + log.info('First start: query archive start: %s', start_date) + query = self.get_archive_query(query_id, start=start_date) + self._send_archive_query(query, query_id, start_date) + + def request_archive_on_muc_join(self, jid): + archive = app.logger.get_archive_timestamp( + jid, type_=JIDConstant.ROOM_TYPE) + query_id = self.get_query_id() + start_date = None + if archive is not None: + log.info('Query Groupchat MAM Archive %s after %s:', + jid, archive.last_mam_id) + query = self.get_archive_query( + query_id, jid=jid, after=archive.last_mam_id) + else: + # First Start, we dont request history + # Depending on what a MUC saves, there could be thousands + # of Messages even in just one day. + start_date = datetime.utcnow() - timedelta(days=1) + log.info('First join: query archive %s from: %s', jid, start_date) + query = self.get_archive_query(query_id, jid=jid, start=start_date) + self._send_archive_query(query, query_id, start_date, groupchat=True) + + def request_archive_count(self, event_id, start_date, end_date): + query_id = self.get_query_id() + query = self.get_archive_query( + query_id, start=start_date, end=end_date, max_=0) + self.connection.SendAndCallForResponse( + query, self._received_count, {'query_id': query_id, + 'event_id': event_id}) + + def request_archive_interval(self, event_id, start_date, + end_date, after=None): + query_id = self.get_query_id() + query = self.get_archive_query(query_id, start=start_date, + end=end_date, after=after, max_=30) + app.nec.push_incoming_event(ev.ArchivingQueryID( + None, event_id=event_id, query_id=query_id)) + self.connection.SendAndCallForResponse( + query, self._intervall_result_finished, {'query_id': query_id, + 'start_date': start_date, + 'end_date': end_date, + 'event_id': event_id}) - def request_archive(self, query_id, start=None, end=None, with_=None, - after=None, max_=30): + def _send_archive_query(self, query, query_id, start_date=None, + groupchat=False): + self.connection.SendAndCallForResponse( + query, self._result_finished, {'query_id': query_id, + 'start_date': start_date, + 'groupchat': groupchat}) + + def get_archive_query(self, query_id, jid=None, start=None, end=None, with_=None, + after=None, max_=30): namespace = self.archiving_namespace - iq = nbxmpp.Iq('set') + iq = nbxmpp.Iq('set', to=jid) query = iq.addChild('query', namespace=namespace) form = query.addChild(node=nbxmpp.DataForm(typ='submit')) field = nbxmpp.DataField(typ='hidden', @@ -184,9 +323,7 @@ class ConnectionArchive313: if after: set_.setTagData('after', after) query.setAttr('queryid', query_id) - id_ = self.connection.getAnID() - iq.setID(id_) - self.connection.send(iq) + return iq def request_archive_preferences(self): if not app.account_is_connected(self.name): @@ -219,3 +356,7 @@ class ConnectionArchive313: app.nec.push_incoming_event(ev.ArchivingReceivedEvent(None, conn=self, stanza=iq_obj)) raise nbxmpp.NodeProcessed + + +class InvalidMamIQ(Exception): + pass ===================================== gajim/common/optparser.py ===================================== --- a/gajim/common/optparser.py +++ b/gajim/common/optparser.py @@ -242,6 +242,8 @@ class OptionsParser: self.update_config_to_016105() if old < [0, 16, 11, 1] and new >= [0, 16, 11, 1]: self.update_config_to_016111() + if old < [0, 16, 11, 2] and new >= [0, 16, 11, 2]: + self.update_config_to_016112() app.logger.init_vars() app.logger.attach_cache_database() @@ -1029,3 +1031,24 @@ class OptionsParser: log.exception('Error') con.close() app.config.set('version', '0.16.11.1') + + def update_config_to_016112(self): + con = sqlite.connect(logger.LOG_DB_PATH) + cur = con.cursor() + try: + cur.executescript( + ''' + CREATE TABLE IF NOT EXISTS last_archive_message( + jid_id INTEGER PRIMARY KEY UNIQUE, + last_mam_id TEXT, + oldest_mam_timestamp TEXT, + last_muc_timestamp TEXT + ); + ALTER TABLE logs ADD COLUMN 'account_id' INTEGER; + ''' + ) + con.commit() + except sqlite.OperationalError: + log.exception('Error') + con.close() + app.config.set('version', '0.16.11.2') ===================================== gajim/groupchat_control.py ===================================== --- a/gajim/groupchat_control.py +++ b/gajim/groupchat_control.py @@ -47,6 +47,7 @@ from gajim import vcard from gajim import cell_renderer_image from gajim import dataforms_widget from gajim.common.const import AvatarSize +from gajim.common.caps_cache import muc_caps_cache import nbxmpp from enum import IntEnum, unique @@ -478,6 +479,8 @@ class GroupchatControl(ChatControlBase): self._nec_gc_presence_received) app.ged.register_event_handler('gc-message-received', ged.GUI1, self._nec_gc_message_received) + app.ged.register_event_handler('mam-decrypted-message-received', + ged.GUI1, self._nec_mam_decrypted_message_received) app.ged.register_event_handler('vcard-published', ged.GUI1, self._nec_vcard_published) app.ged.register_event_handler('update-gc-avatar', ged.GUI1, @@ -1053,6 +1056,17 @@ class GroupchatControl(ChatControlBase): obj.contact.name, obj.contact.avatar_sha) self.draw_avatar(obj.contact) + def _nec_mam_decrypted_message_received(self, obj): + if not obj.groupchat: + return + if obj.room_jid != self.room_jid: + return + self.print_conversation( + obj.msgtxt, contact=obj.nick, + tim=obj.timestamp, encrypted=obj.encrypted, + msg_stanza_id=obj.unique_id, + additional_data=obj.additional_data) + def _nec_gc_message_received(self, obj): if obj.room_jid != self.room_jid or obj.conn.name != self.account: return @@ -1455,6 +1469,11 @@ class GroupchatControl(ChatControlBase): GLib.source_remove(self.autorejoin) self.autorejoin = None + if muc_caps_cache.has_mam(self.room_jid): + # Request MAM + app.connections[self.account].request_archive_on_muc_join( + self.room_jid) + app.gc_connected[self.account][self.room_jid] = True ChatControlBase.got_connected(self) self.list_treeview.set_model(self.model) ===================================== gajim/history_sync.py ===================================== --- a/gajim/history_sync.py +++ b/gajim/history_sync.py @@ -19,7 +19,7 @@ import logging from enum import IntEnum -from datetime import datetime, timedelta, timezone +from datetime import datetime, timedelta import nbxmpp from gi.repository import Gtk, GLib @@ -27,17 +27,16 @@ from gi.repository import Gtk, GLib from gajim.common import app from gajim.common import ged from gajim.gtkgui_helpers import get_icon_pixmap +from gajim.common.const import ArchiveState log = logging.getLogger('gajim.c.message_archiving') + class Pages(IntEnum): TIME = 0 SYNC = 1 SUMMARY = 2 -class ArchiveState(IntEnum): - NEVER = 0 - ALL = 1 class HistorySyncAssistant(Gtk.Assistant): def __init__(self, account, parent): @@ -52,13 +51,22 @@ class HistorySyncAssistant(Gtk.Assistant): self.timedelta = None self.now = datetime.utcnow() self.query_id = None - self.count_query_id = None self.start = None self.end = None self.next = None self.hide_buttons() + self.event_id = id(self) + + own_jid = self.con.get_own_jid().getStripped() + archive = app.logger.get_archive_timestamp(own_jid) + + if archive is not None: + mam_start = float(archive.oldest_mam_timestamp) + else: + # Migration from old config value + mam_start = app.config.get_per( + 'accounts', account, 'mam_start_date') - mam_start = app.config.get_per('accounts', account, 'mam_start_date') if not mam_start or mam_start == ArchiveState.NEVER: self.current_start = self.now elif mam_start == ArchiveState.ALL: @@ -72,7 +80,8 @@ class HistorySyncAssistant(Gtk.Assistant): self.download_history = DownloadHistoryPage(self) self.append_page(self.download_history) - self.set_page_type(self.download_history, Gtk.AssistantPageType.PROGRESS) + self.set_page_type(self.download_history, + Gtk.AssistantPageType.PROGRESS) self.set_page_complete(self.download_history, True) self.summary = SummaryPage(self) @@ -80,12 +89,18 @@ class HistorySyncAssistant(Gtk.Assistant): self.set_page_type(self.summary, Gtk.AssistantPageType.SUMMARY) self.set_page_complete(self.summary, True) - app.ged.register_event_handler('archiving-finished', - ged.PRECORE, - self._nec_archiving_finished) + app.ged.register_event_handler('archiving-count-received', + ged.GUI1, + self._received_count) + app.ged.register_event_handler('archiving-query-id', + ged.GUI1, + self._new_query_id) + app.ged.register_event_handler('archiving-interval-finished', + ged.GUI1, + self._received_finished) app.ged.register_event_handler('raw-mam-message-received', - ged.PRECORE, - self._nec_mam_message_received) + ged.PRECORE, + self._nec_mam_message_received) self.connect('prepare', self.on_page_change) self.connect('destroy', self.on_destroy) @@ -96,9 +111,9 @@ class HistorySyncAssistant(Gtk.Assistant): self.set_current_page(Pages.SUMMARY) self.summary.nothing_to_do() - if self.con.mam_query_id: - self.set_current_page(Pages.SUMMARY) - self.summary.query_already_running() + # if self.con.mam_query_ids: + # self.set_current_page(Pages.SUMMARY) + # self.summary.query_already_running() self.show_all() @@ -129,27 +144,42 @@ class HistorySyncAssistant(Gtk.Assistant): self.start = self.now - self.timedelta self.end = self.current_start - log.info('config: get mam_start_date: %s', self.current_start) + log.info('get mam_start_date: %s', self.current_start) log.info('now: %s', self.now) log.info('start: %s', self.start) log.info('end: %s', self.end) - self.query_count() + self.con.request_archive_count(self.event_id, self.start, self.end) + + def _received_count(self, event): + if event.event_id != self.event_id: + return + if event.count is not None: + self.download_history.count = int(event.count) + self.con.request_archive_interval(self.event_id, self.start, self.end) + + def _received_finished(self, event): + if event.event_id != self.event_id: + return + log.info('query finished') + GLib.idle_add(self.download_history.finished) + self.set_current_page(Pages.SUMMARY) + self.summary.finished() + + def _new_query_id(self, event): + if event.event_id != self.event_id: + return + self.query_id = event.query_id + + def _nec_mam_message_received(self, obj): + if obj.conn.name != self.account: + return - def query_count(self): - self.count_query_id = self.con.connection.getAnID() - self.con.request_archive(self.count_query_id, - start=self.start, - end=self.end, - max_=0) + if obj.result.getAttr('queryid') != self.query_id: + return - def query_messages(self, last=None): - self.query_id = self.con.connection.getAnID() - self.con.request_archive(self.query_id, - start=self.start, - end=self.end, - after=last, - max_=30) + log.debug('received message') + GLib.idle_add(self.download_history.set_fraction) def on_row_selected(self, listbox, row): self.timedelta = row.get_child().get_delta() @@ -164,71 +194,23 @@ class HistorySyncAssistant(Gtk.Assistant): self.prepare_query() def on_destroy(self, *args): - app.ged.remove_event_handler('archiving-finished', - ged.PRECORE, - self._nec_archiving_finished) + app.ged.remove_event_handler('archiving-count-received', + ged.GUI1, + self._received_count) + app.ged.remove_event_handler('archiving-query-id', + ged.GUI1, + self._new_query_id) + app.ged.remove_event_handler('archiving-interval-finished', + ged.GUI1, + self._received_finished) app.ged.remove_event_handler('raw-mam-message-received', - ged.PRECORE, - self._nec_mam_message_received) + ged.PRECORE, + self._nec_mam_message_received) del app.interface.instances[self.account]['history_sync'] def on_close_clicked(self, *args): self.destroy() - def _nec_mam_message_received(self, obj): - if obj.conn.name != self.account: - return - - if obj.result.getAttr('queryid') != self.query_id: - return - - log.debug('received message') - GLib.idle_add(self.download_history.set_fraction) - - def _nec_archiving_finished(self, obj): - if obj.conn.name != self.account: - return - - if obj.query_id not in (self.query_id, self.count_query_id): - return - - set_ = obj.fin.getTag('set', namespace=nbxmpp.NS_RSM) - if not set_: - log.error('invalid result') - log.error(obj.fin) - return - - if obj.query_id == self.count_query_id: - count = set_.getTagData('count') - log.info('message count received: %s', count) - if count: - self.download_history.count = int(count) - self.query_messages() - return - - if obj.query_id == self.query_id: - last = set_.getTagData('last') - complete = obj.fin.getAttr('complete') - if not last and complete != 'true': - log.error('invalid result') - log.error(obj.fin) - return - - if complete != 'true': - self.query_messages(last) - else: - log.info('query finished') - GLib.idle_add(self.download_history.finished) - if self.start: - timestamp = self.start.timestamp() - else: - timestamp = ArchiveState.ALL - app.config.set_per('accounts', self.account, - 'mam_start_date', timestamp) - log.debug('config: set mam_start_date: %s', timestamp) - self.set_current_page(Pages.SUMMARY) - self.summary.finished() - class SelectTimePage(Gtk.Box): def __init__(self, assistant): @@ -257,6 +239,7 @@ class SelectTimePage(Gtk.Box): self.pack_start(label, True, True, 0) self.pack_start(listbox, False, False, 0) + class DownloadHistoryPage(Gtk.Box): def __init__(self, assistant): super().__init__(orientation=Gtk.Orientation.VERTICAL) @@ -292,6 +275,7 @@ class DownloadHistoryPage(Gtk.Box): def finished(self): self.progress.set_fraction(1) + class SummaryPage(Gtk.Box): def __init__(self, assistant): super().__init__(orientation=Gtk.Orientation.VERTICAL) @@ -307,25 +291,26 @@ class SummaryPage(Gtk.Box): def finished(self): received = self.assistant.download_history.received finished = _(''' - Finshed synchronising your History. + Finshed synchronising your History. {received} Messages downloaded. '''.format(received=received)) self.label.set_text(finished) def nothing_to_do(self): nothing_to_do = _(''' - Gajim is fully synchronised + Gajim is fully synchronised with the Archive. ''') self.label.set_text(nothing_to_do) def query_already_running(self): already_running = _(''' - There is already a synchronisation in + There is already a synchronisation in progress. Please try later. ''') self.label.set_text(already_running) + class TimeOption(Gtk.Label): def __init__(self, label, months=None): super().__init__(label=label) ===================================== gajim/session.py ===================================== --- a/gajim/session.py +++ b/gajim/session.py @@ -117,7 +117,7 @@ class ChatControlSession(stanza_session.EncryptedStanzaSession): jid = obj.jid obj.msg_log_id = app.logger.insert_into_logs( - jid, obj.timestamp, log_type, + self.conn.name, jid, obj.timestamp, log_type, message=msg_to_log, subject=obj.subject, additional_data=obj.additional_data, View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/b66311532f4d1aca06e5c30b84900ada6… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/b66311532f4d1aca06e5c30b84900ada6… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: New visible func faster and cleaner. Fixes #8670
by Yann Leboulanger 19 Nov '17

19 Nov '17

Yann Leboulanger pushed to branch master at gajim / gajim Commits: 7724dd18 by Yann Leboulanger at 2017-11-19T17:54:33+01:00 New visible func faster and cleaner. Fixes #8670 - - - - - 0b2e5588 by Yann Leboulanger at 2017-11-19T17:56:13+01:00 Take into account show_transports_group option to show transports - - - - - b6631153 by Yann Leboulanger at 2017-11-19T18:00:26+01:00 Merge branch 'new_visible_func' into 'master' New visible func Closes #8670 See merge request gajim/gajim!153 - - - - - 1 changed file: - gajim/roster_window.py Changes: ===================================== gajim/roster_window.py ===================================== --- a/gajim/roster_window.py +++ b/gajim/roster_window.py @@ -84,6 +84,7 @@ class Column(IntEnum): LOCATION_PIXBUF = 8 AVATAR_PIXBUF = 9 # avatar_pixbuf PADLOCK_PIXBUF = 10 # use for account row only + VISIBLE = 11 empty_pixbuf = GdkPixbuf.Pixbuf.new(GdkPixbuf.Colorspace.RGB, True, 8, 1, 1) empty_pixbuf.fill(0xffffff00) @@ -251,7 +252,7 @@ class RosterWindow: it = self.model.append(None, [ app.interface.jabber_state_images['16'][show], _('Merged accounts'), 'account', '', 'all', None, None, None, - None, None, None] + [None] * self.nb_ext_renderers) + None, None, None, True] + [None] * self.nb_ext_renderers) self._iters['MERGED']['account'] = it else: show = app.SHOW_LIST[app.connections[account].connected] @@ -267,7 +268,7 @@ class RosterWindow: it = self.model.append(None, [ app.interface.jabber_state_images['16'][show], GLib.markup_escape_text(account), 'account', our_jid, - account, None, None, None, None, None, tls_pixbuf] + + account, None, None, None, None, None, tls_pixbuf, True] + [None] * self.nb_ext_renderers) self._iters[account]['account'] = it @@ -327,7 +328,7 @@ class RosterWindow: iter_group = self.model.append(iter_parent, [app.interface.jabber_state_images['16']['closed'], GLib.markup_escape_text(group), 'group', group, account, None, - None, None, None, None, None] + [None] * self.nb_ext_renderers) + None, None, None, None, None, False] + [None] * self.nb_ext_renderers) self.draw_group(group, account) self._iters[account_group]['groups'][group] = iter_group return iter_group @@ -350,6 +351,7 @@ class RosterWindow: big_brother_contact. (default None) """ added_iters = [] + visible = self.contact_is_visible(contact, account) if big_brother_contact: # Add contact under big brother @@ -364,7 +366,7 @@ class RosterWindow: for child_iter in parent_iters: it = self.model.append(child_iter, [None, contact.get_shown_name(), 'contact', contact.jid, account, - None, None, None, None, None, None] + \ + None, None, None, None, None, None, visible] + \ [None] * self.nb_ext_renderers) added_iters.append(it) if contact.jid in self._iters[account]['contacts']: @@ -393,7 +395,7 @@ class RosterWindow: # for more i_ = self.model.append(child_iterG, [None, contact.get_shown_name(), typestr, contact.jid, account, - None, None, None, None, None, None] + \ + None, None, None, None, None, None, visible] + \ [None] * self.nb_ext_renderers) added_iters.append(i_) if contact.jid in self._iters[account]['contacts']: @@ -653,7 +655,7 @@ class RosterWindow: child_iterA = self._get_account_iter(account, self.model) self._iters[account]['contacts'][jid] = [self.model.append(child_iterA, [None, app.nicks[account], 'self_contact', jid, account, None, - None, None, None, None, None] + [None] * self.nb_ext_renderers)] + None, None, None, None, None, True] + [None] * self.nb_ext_renderers)] self.draw_completely(jid, account) self.draw_account(account) @@ -1012,6 +1014,10 @@ class RosterWindow: # Peform delayed recalibration self._recalibrate_metacontact_family(family, account) self.draw_contact(jid, account) + # Hide Group if all childs are hidden + contact = app.contacts.get_contact(account, jid) + for group in contact.get_shown_groups(): + self.draw_group(group, account) # FIXME: integrate into add_contact() def add_to_not_in_the_roster(self, account, jid, nick='', resource=''): @@ -1131,6 +1137,24 @@ class RosterWindow: self.model[child_iter][Column.NAME] = text + # Hide group if no more contacts + iterG = self._get_group_iter(group, account, model=self.modelfilter) + to_hide = [] + while(iterG): + parent = self.modelfilter.iter_parent(iterG) + if (not self.modelfilter.iter_has_child(iterG)) or (len(to_hide) > \ + 0 and self.modelfilter.iter_n_children(iterG) == 1): + to_hide.append(iterG) + if not parent or self.modelfilter[parent][Column.TYPE] != \ + 'group': + iterG = None + else: + iterG = parent + else: + iterG = None + for iter_ in to_hide: + self.modelfilter[iter_][Column.VISIBLE] = False + def _really_draw_groups(self): for ag in self.groups_to_draw.values(): acct = ag['account'] @@ -1289,34 +1313,41 @@ class RosterWindow: img = state_images[icon_name] self.model[child_iter][Column.IMG] = img self.model[child_iter][Column.NAME] = name + #TODO: compute visible + visible = True + self.model[child_iter][Column.VISIBLE] = visible else: # A normal contact or little brother state_images = self.get_appropriate_state_images(jid, icon_name = icon_name) + visible = self.contact_is_visible(contact, account) # All iters have the same icon (no expand/collapse) img = state_images[icon_name] for child_iter in child_iters: self.model[child_iter][Column.IMG] = img self.model[child_iter][Column.NAME] = name + self.model[child_iter][Column.VISIBLE] = visible + if visible: + parent_iter = self.model.iter_parent(child_iter) + self.model[parent_iter][Column.VISIBLE] = True # We are a little brother if family and not is_big_brother and not self.starting: self.draw_parent_contact(jid, account) - delimiter = app.connections[account].nested_group_delimiter - for group in contact.get_shown_groups(): - # We need to make sure that _visible_func is called for - # our groups otherwise we might not be shown - group_splited = group.split(delimiter) - i = 1 - while i < len(group_splited) + 1: - g = delimiter.join(group_splited[:i]) - iterG = self._get_group_iter(g, account, model=self.model) - if iterG: - # it's not self contact - self.model[iterG][Column.JID] = self.model[iterG][Column.JID] - i += 1 + if visible: + delimiter = app.connections[account].nested_group_delimiter + for group in contact.get_shown_groups(): + group_splited = group.split(delimiter) + i = 1 + while i < len(group_splited) + 1: + g = delimiter.join(group_splited[:i]) + iterG = self._get_group_iter(g, account, model=self.model) + if iterG: + # it's not self contact + self.model[iterG][Column.VISIBLE] = True + i += 1 app.plugin_manager.gui_extension_point('roster_draw_contact', self, jid, account, contact) @@ -1582,7 +1613,9 @@ class RosterWindow: if self.filtering: return self.filtering = True - self.modelfilter.refilter() + for account in app.connections: + for jid in app.contacts.get_jid_list(account): + self.adjust_and_draw_contact_context(jid, account) self.filtering = False def contact_has_pending_roster_events(self, contact, account): @@ -1604,6 +1637,8 @@ class RosterWindow: return self.rfilter_string in contact.get_shown_name().lower() if self.contact_has_pending_roster_events(contact, account): return True + if app.config.get('showoffline'): + return True if contact.show in ('offline', 'error'): if contact.jid in app.to_be_removed[account]: @@ -1612,6 +1647,8 @@ class RosterWindow: if app.config.get('show_only_chat_and_online') and contact.show in ( 'away', 'xa', 'busy'): return False + if _('Transports') in contact.get_shown_groups(): + return app.config.get('show_transports_group') return True def _visible_func(self, model, titer, dummy): @@ -1620,6 +1657,9 @@ class RosterWindow: """ if self.starting_filtering: return False + + visible = model[titer][Column.VISIBLE] + type_ = model[titer][Column.TYPE] if not type_: return False @@ -1635,6 +1675,9 @@ class RosterWindow: if not jid: return False + if not self.rfilter_enabled: + return visible + if type_ == 'group': group = jid if group == _('Transports'): @@ -1645,84 +1688,31 @@ class RosterWindow: for _acc in accounts: for contact in app.contacts.iter_contacts(_acc): if group in contact.get_shown_groups(): - if self.rfilter_enabled: - if self.rfilter_string in \ - contact.get_shown_name().lower(): - return True - elif self.contact_has_pending_roster_events(contact, - _acc): + if self.rfilter_string in \ + contact.get_shown_name().lower(): return True - if self.rfilter_enabled: - # No transport has been found - return False - return app.config.get('show_transports_group') and \ - (app.account_is_connected(account) or \ - app.config.get('showoffline')) - if app.config.get('showoffline'): - return True + elif self.contact_has_pending_roster_events(contact, + _acc): + return True + # No transport has been found + return False - if self.regroup: - # Column.ACCOUNT for groups depends on the order - # accounts were connected - # Check all accounts for online group contacts - accounts = app.contacts.get_accounts() - else: - accounts = [account] - for _acc in accounts: - delimiter = app.connections[_acc].nested_group_delimiter - for contact in app.contacts.iter_contacts(_acc): - if not self.contact_is_visible(contact, _acc): - continue - # Is this contact in this group? - for grp in contact.get_shown_groups(): - while grp: - if group == grp: - return True - grp = delimiter.join(grp.split(delimiter)[:-1]) - return False if type_ == 'contact': - if self.rfilter_enabled: - if model.iter_has_child(titer): - iter_c = model.iter_children(titer) - while iter_c: - if self.rfilter_string in model[iter_c][Column.NAME].lower(): - return True - iter_c = model.iter_next(iter_c) - return self.rfilter_string in model[titer][Column.NAME].lower() - if app.config.get('showoffline'): - return True - bb_jid = None - bb_account = None - family = app.contacts.get_metacontacts_family(account, jid) - if family: - nearby_family, bb_jid, bb_account = \ - self._get_nearby_family_and_big_brother(family, account) - if (bb_jid, bb_account) == (jid, account): - # Show the big brother if a child has pending events - for data in nearby_family: - jid = data['jid'] - account = data['account'] - contact = app.contacts.get_contact_with_highest_priority( - account, jid) - if contact and self.contact_is_visible(contact, account): + if model.iter_has_child(titer): + iter_c = model.iter_children(titer) + while iter_c: + if self.rfilter_string in model[iter_c][Column.NAME].lower(): return True - return False - else: - contact = app.contacts.get_contact_with_highest_priority( - account, jid) - return self.contact_is_visible(contact, account) + iter_c = model.iter_next(iter_c) + return self.rfilter_string in model[titer][Column.NAME].lower() + if type_ == 'agent': - if self.rfilter_enabled: - return self.rfilter_string in model[titer][Column.NAME].lower() - contact = app.contacts.get_contact_with_highest_priority(account, - jid) - return self.contact_has_pending_roster_events(contact, account) or \ - (app.config.get('show_transports_group') and \ - (app.account_is_connected(account) or \ - app.config.get('showoffline'))) - if type_ == 'groupchat' and self.rfilter_enabled: return self.rfilter_string in model[titer][Column.NAME].lower() - return True + + if type_ == 'groupchat': + return self.rfilter_string in model[titer][Column.NAME].lower() + + return visible def _compareIters(self, model, iter1, iter2, data=None): """ @@ -1732,8 +1722,6 @@ class RosterWindow: name2 = model[iter2][Column.NAME] if not name1 or not name2: return 0 - name1 = name1 - name2 = name2 type1 = model[iter1][Column.TYPE] type2 = model[iter2][Column.TYPE] if type1 == 'self_contact': @@ -1742,11 +1730,7 @@ class RosterWindow: return 1 if type1 == 'group': name1 = model[iter1][Column.JID] - if name1: - name1 = name1 name2 = model[iter2][Column.JID] - if name2: - name2 = name2 if name1 == _('Transports'): return 1 if name2 == _('Transports'): @@ -1763,8 +1747,6 @@ class RosterWindow: account2 = model[iter2][Column.ACCOUNT] if not account1 or not account2: return 0 - account1 = account1 - account2 = account2 if type1 == 'account': return locale.strcoll(account1, account2) jid1 = model[iter1][Column.JID] @@ -4064,13 +4046,8 @@ class RosterWindow: action.set_state(param) app.config.set('showoffline', param.get_boolean()) self.refilter_shown_roster_items() - if param.get_boolean(): - # We need to filter twice to show groups with no contacts inside - # in the correct expand state - self.refilter_shown_roster_items() - self.window.lookup_action('show-active').set_enabled(False) - else: - self.window.lookup_action('show-active').set_enabled(True) + self.window.lookup_action('show-active').set_enabled( + not param.get_boolean()) def on_show_active_contacts_action(self, action, param): """ @@ -4079,14 +4056,8 @@ class RosterWindow: action.set_state(param) app.config.set('show_only_chat_and_online', param.get_boolean()) self.refilter_shown_roster_items() - - if param.get_boolean(): - # We need to filter twice to show groups with no contacts inside - # in the correct expand state - self.refilter_shown_roster_items() - self.window.lookup_action('show-offline').set_enabled(False) - else: - self.window.lookup_action('show-offline').set_enabled(True) + self.window.lookup_action('show-offline').set_enabled( + not param.get_boolean()) def on_show_roster_action(self, action, param): # when num controls is 0 this menuitem is hidden, but still need to @@ -5693,12 +5664,12 @@ class RosterWindow: self.nb_ext_renderers = 0 # When we quit, rememver if we already saved config once self.save_done = False - # [icon, name, type, jid, account, editable, mood_pixbuf, + # [icon, name, type, jid, account, mood_pixbuf, # activity_pixbuf, tune_pixbuf, location_pixbuf, avatar_pixbuf, - # padlock_pixbuf] + # padlock_pixbuf, visible] self.columns = [Gtk.Image, str, str, str, str, GdkPixbuf.Pixbuf, GdkPixbuf.Pixbuf, GdkPixbuf.Pixbuf, GdkPixbuf.Pixbuf, - GdkPixbuf.Pixbuf, GdkPixbuf.Pixbuf] + GdkPixbuf.Pixbuf, GdkPixbuf.Pixbuf, bool] self.xml = gtkgui_helpers.get_gtk_builder('roster_window.ui') self.window = self.xml.get_object('roster_window') application.add_window(self.window) View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/24320c894caf8ee05a8fb27d804fb503b… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/24320c894caf8ee05a8fb27d804fb503b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Remove unused code
by Philipp Hörist 19 Nov '17

19 Nov '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 24320c89 by Philipp Hörist at 2017-11-19T14:34:04+01:00 Remove unused code - - - - - 2 changed files: - gajim/chat_control_base.py - gajim/groupchat_control.py Changes: ===================================== gajim/chat_control_base.py ===================================== --- a/gajim/chat_control_base.py +++ b/gajim/chat_control_base.py @@ -313,8 +313,6 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): self.was_at_the_end = True self.correcting = False self.last_sent_msg = None - self.last_received_txt = {} # one per name - self.last_received_id = {} # one per name # add MessageTextView to UI and connect signals self.msg_textview = MessageTextView() @@ -970,10 +968,6 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): if not count_as_new: return - if kind in ('incoming', 'incoming_queue', 'outgoing'): - self.last_received_txt[name] = text - if correct_id: - self.last_received_id[name] = correct_id[0] if kind == 'incoming': if not self.type_id == message_control.TYPE_GC or \ app.config.get('notify_on_all_muc_messages') or \ ===================================== gajim/groupchat_control.py ===================================== --- a/gajim/groupchat_control.py +++ b/gajim/groupchat_control.py @@ -1743,13 +1743,6 @@ class GroupchatControl(ChatControlBase): tv.last_received_message_id[obj.new_nick] = \ tv.last_received_message_id[obj.nick] del tv.last_received_message_id[obj.nick] - if obj.nick in self.last_received_txt: - self.last_received_txt[obj.new_nick] = \ - self.last_received_txt[obj.nick] - del self.last_received_txt[obj.nick] - self.last_received_id[obj.new_nick] = \ - self.last_received_id[obj.nick] - del self.last_received_id[obj.nick] # We add new nick to muc roster here, so we don't see # that "new_nick has joined the room" when he just changed # nick. View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/24320c894caf8ee05a8fb27d804fb503bc… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/24320c894caf8ee05a8fb27d804fb503bc… 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