Commits July 2017

commits@gajim.org

1 participants
66 discussions

[Git][gajim/gajim][master] Refactor MamDecryptedMessageReceivedEvent
by Philipp Hörist 27 Jul '17

27 Jul '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: f449acd8 by Philipp Hörist at 2017-07-27T21:46:19+02:00 Refactor MamDecryptedMessageReceivedEvent - Condition type = groupchat is not needed because we drop messages type groupchat that come from the user archive. To get these messages we will query the MUC. - Because of this the logging method save_if_not_exists() can be much simpler - - - - - 4 changed files: - gajim/common/connection_handlers.py - gajim/common/connection_handlers_events.py - gajim/common/logger.py - gajim/common/message_archiving.py Changes: ===================================== gajim/common/connection_handlers.py ===================================== --- a/gajim/common/connection_handlers.py +++ b/gajim/common/connection_handlers.py @@ -1095,7 +1095,7 @@ class ConnectionHandlersBase: DecryptedMessageReceivedEvent(None, conn=self, msg_obj=obj)) else: gajim.nec.push_incoming_event( - MamDecryptedMessageReceivedEvent(None, conn=self, msg_obj=obj)) + MamDecryptedMessageReceivedEvent(None, **vars(obj))) def _nec_decrypted_message_received(self, obj): if obj.conn.name != self.name: ===================================== gajim/common/connection_handlers_events.py ===================================== --- a/gajim/common/connection_handlers_events.py +++ b/gajim/common/connection_handlers_events.py @@ -1082,18 +1082,16 @@ class MamMessageReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): else: self.stanza_id = self.msg_.getID() - self.with_ = str(to) + self.with_ = to self.direction = 'to' - self.resource = to.getResource() else: if self.result.getNamespace() == nbxmpp.NS_MAM_2: self.stanza_id = self.result.getID() else: self.stanza_id = self.msg_.getID() - self.with_ = str(frm) + self.with_ = frm self.direction = 'from' - self.resource = frm.getResource() if not self.stanza_id: log.debug('Could not retrieve stanza-id') @@ -1118,38 +1116,18 @@ class MamDecryptedMessageReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): base_network_events = [] def generate(self): - self.nick = None - msg_ = self.msg_obj.msg_ - if not hasattr(self, 'additional_data'): - self.additional_data = self.msg_obj.additional_data - self.with_ = self.msg_obj.with_ - self.direction = self.msg_obj.direction - self.timestamp = self.msg_obj.timestamp - res = self.msg_obj.resource - self.msgtxt = self.msg_obj.msgtxt - is_pm = gajim.logger.jid_is_room_jid(self.with_) - if msg_.getAttr('type') == 'groupchat': - if is_pm == False: - log.warn('JID %s is marked as normal contact in database ' - 'but we got a groupchat message from it.', self.with_) - return - if is_pm == None: - gajim.logger.get_jid_id(self.with_, 'ROOM') - self.nick = res - else: - if is_pm == None: - # we don't know this JID, we need to disco it. - server = gajim.get_server_from_jid(self.with_) - if server not in self.conn.mam_awaiting_disco_result: - self.conn.mam_awaiting_disco_result[server] = [ - [self.with_, self.direction, self.timestamp, self.msgtxt, - res]] - self.conn.discoverInfo(server) - else: - self.conn.mam_awaiting_disco_result[server].append( - [self.with_, self.direction, self.timestamp, self.msgtxt, - res]) - return + is_pm = gajim.logger.jid_is_room_jid(self.with_.getStripped()) + if is_pm is None: + # we don't know this JID, we need to disco it. + server = self.with_.getDomain() + if server not in self.conn.mam_awaiting_disco_result: + self.conn.mam_awaiting_disco_result[server] = [ + [self.with_, self.direction, self.timestamp, self.msgtxt]] + self.conn.discoverInfo(server) + else: + self.conn.mam_awaiting_disco_result[server].append( + [self.with_, self.direction, self.timestamp, self.msgtxt]) + return return True class MessageReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): ===================================== gajim/common/logger.py ===================================== --- a/gajim/common/logger.py +++ b/gajim/common/logger.py @@ -1139,53 +1139,36 @@ class Logger: (account_jid_id,)) self._timeout_commit() - def save_if_not_exists(self, with_, direction, tim, msg='', nick=None, additional_data=None): + def save_if_not_exists(self, with_, direction, tim, msg='', is_pm=False, additional_data=None): if additional_data is None: additional_data = {} - if tim: - time_col = float(tim) - else: - time_col = float(time.time()) + if not msg: return - if self.jid_is_from_pm(with_) or nick: - # It's a groupchat message - if nick: - # It's a message from a groupchat occupent - type_ = 'gc_msg' - with_ = with_ + '/' + nick - else: - # It's a server message message, we don't log them - return + if is_pm: + type_ = 'gc_msg' else: if direction == 'from': type_ = 'chat_msg_recv' elif direction == 'to': type_ = 'chat_msg_sent' - jid_id = self.get_jid_id(with_) - where_sql = 'jid_id = %s AND message=?' % jid_id - if type_ == 'gc_msg': - # We cannot differentiate gc message and pm messages, so look in - # both logs - with_2 = gajim.get_jid_without_resource(with_) - if with_ != with_2: - jid_id2 = self.get_jid_id(with_2) - where_sql = 'jid_id in (%s, %s) AND message=?' % (jid_id, - jid_id2) - start_time = time_col - 300 # 5 minutes arrount given time - end_time = time_col + 300 # 5 minutes arrount given time - self.cur.execute(''' - SELECT log_line_id FROM logs - WHERE (%s) - AND time BETWEEN %d AND %d - ORDER BY time - ''' % (where_sql, start_time, end_time), (msg,)) - results = self.cur.fetchall() - if results: + + start_time = tim - 300 # 5 minutes arrount given time + end_time = tim + 300 # 5 minutes arrount given time + + sql = ''' + SELECT * FROM logs + NATURAL JOIN jids WHERE jid = ? AND message = ? + AND time BETWEEN ? AND ? + ''' + + result = self.con.execute(sql, (str(with_), msg, start_time, end_time)).fetchone() + + if result: log.debug('Log already in DB, ignoring it') return log.debug('New log received from server archives, storing it') - self.write(type_, with_, message=msg, tim=tim, + self.write(type_, str(with_), message=msg, tim=tim, additional_data=additional_data, mam_query=True) def _nec_gc_message_received(self, obj): ===================================== gajim/common/message_archiving.py ===================================== --- a/gajim/common/message_archiving.py +++ b/gajim/common/message_archiving.py @@ -92,15 +92,15 @@ class ConnectionArchive313(ConnectionArchive): for identity in obj.identities: if identity['category'] == 'conference': # it's a groupchat - for with_, direction, tim, msg_txt, res in \ + for with_, direction, tim, msg_txt in \ self.mam_awaiting_disco_result[obj.jid]: gajim.logger.get_jid_id(with_, 'ROOM') gajim.logger.save_if_not_exists(with_, direction, tim, - msg=msg_txt, nick=res) + msg=msg_txt, is_pm=True) del self.mam_awaiting_disco_result[obj.jid] return # it's not a groupchat - for with_, direction, tim, msg_txt, res in \ + for with_, direction, tim, msg_txt in \ self.mam_awaiting_disco_result[obj.jid]: gajim.logger.get_jid_id(with_) gajim.logger.save_if_not_exists(with_, direction, tim, @@ -134,7 +134,7 @@ class ConnectionArchive313(ConnectionArchive): if obj.conn.name != self.name: return gajim.logger.save_if_not_exists(obj.with_, obj.direction, obj.timestamp, - msg=obj.msgtxt, nick=obj.nick, additional_data=obj.additional_data) + msg=obj.msgtxt, additional_data=obj.additional_data) def get_query_id(self): self.mam_query_id = self.connection.getAnID() View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/f449acd8156c10fdba4f03b40f43431bb2…

1 0

[Git][gajim/gajim][xep-0319] Fix tooltip alignment
by Yann Leboulanger 27 Jul '17

27 Jul '17

Yann Leboulanger pushed to branch xep-0319 at gajim / gajim Commits: 1ce3dcbf by Yann Leboulanger at 2017-07-27T13:51:57+02:00 Fix tooltip alignment - - - - - 1 changed file: - data/gui/tooltip_roster_contact.ui Changes: ===================================== data/gui/tooltip_roster_contact.ui ===================================== --- a/data/gui/tooltip_roster_contact.ui +++ b/data/gui/tooltip_roster_contact.ui @@ -51,6 +51,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">start</property> + <property name="valign">start</property> <property name="label" translatable="yes">Resource:</property> </object> <packing> @@ -75,6 +76,8 @@ <object class="GtkLabel" id="resource"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="valign">start</property> <property name="hexpand">True</property> </object> <packing> @@ -86,6 +89,8 @@ <object class="GtkLabel" id="jid"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="valign">start</property> <property name="hexpand">True</property> <attributes> <attribute name="weight" value="bold"/> @@ -116,6 +121,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">start</property> + <property name="valign">start</property> <property name="label" translatable="yes">Idle since:</property> </object> <packing> @@ -127,6 +133,8 @@ <object class="GtkLabel" id="idle_since"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="valign">start</property> <property name="hexpand">True</property> </object> <packing> @@ -139,6 +147,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">start</property> + <property name="valign">start</property> <property name="label" translatable="yes">Mood:</property> </object> <packing> @@ -151,6 +160,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">start</property> + <property name="valign">start</property> <property name="label" translatable="yes">Activity:</property> <property name="lines">2</property> </object> @@ -164,6 +174,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">start</property> + <property name="valign">start</property> <property name="label" translatable="yes">Tune:</property> </object> <packing> @@ -176,6 +187,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">start</property> + <property name="valign">start</property> <property name="label" translatable="yes">Location:</property> </object> <packing> @@ -187,6 +199,8 @@ <object class="GtkLabel" id="mood"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="valign">start</property> <property name="hexpand">True</property> </object> <packing> @@ -198,6 +212,7 @@ <object class="GtkLabel" id="activity"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="valign">start</property> <property name="hexpand">True</property> </object> <packing> @@ -209,6 +224,8 @@ <object class="GtkLabel" id="tune"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="valign">start</property> <property name="hexpand">True</property> </object> <packing> @@ -220,6 +237,8 @@ <object class="GtkLabel" id="location"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="valign">start</property> <property name="hexpand">True</property> </object> <packing> @@ -232,6 +251,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">start</property> + <property name="valign">start</property> <property name="label" translatable="yes">OpenPGP:</property> </object> <packing> @@ -243,6 +263,8 @@ <object class="GtkLabel" id="pgp"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="valign">start</property> <property name="hexpand">True</property> </object> <packing> @@ -255,6 +277,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">start</property> + <property name="valign">start</property> <property name="label" translatable="yes">Subscription:</property> </object> <packing> @@ -266,6 +289,8 @@ <object class="GtkLabel" id="sub"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="valign">start</property> <property name="hexpand">True</property> </object> <packing> @@ -277,6 +302,8 @@ <object class="GtkLabel" id="status"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="valign">start</property> <property name="hexpand">True</property> <property name="wrap">True</property> <property name="max_width_chars">30</property> View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/1ce3dcbff4c6e8327f6fbc714782e19645…

1 0

[Git][gajim/gajim][master] 7 commits: Refactor get_last_conversation_lines()
by Philipp Hörist 27 Jul '17

27 Jul '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 40ba449f by Philipp Hörist at 2017-07-21T16:58:04+02:00 Refactor get_last_conversation_lines() - use NATURAL JOIN in SQL query instead of multiple SELECT via _build_contact_where - make code more concise - update method documentation - - - - - 950f7632 by Philipp Hörist at 2017-07-21T16:58:04+02:00 Refactor get_conversation_for_date() - use NATURAL JOIN in SQL query instead of multiple SELECT via _build_contact_where - make code more concise - update method documentation - Fix a bug where messages were displayed in wrong order when they had the same timestamp - - - - - fb7eb071 by Philipp Hörist at 2017-07-21T16:58:04+02:00 Refactor search_log() - use NATURAL JOIN in SQL query instead of multiple SELECT via _build_contact_where - make code more concise - update method documentation - - - - - 1e380473 by Philipp Hörist at 2017-07-21T16:58:04+02:00 Refactor get_days_with_logs() - use NATURAL JOIN in SQL query instead of multiple SELECT via _build_contact_where - make code more concise - update method documentation - - - - - 9feee7d9 by Philipp Hörist at 2017-07-21T16:58:04+02:00 Refactor get_room_last_message_time() - Refactor get_last_date_that_has_logs() - use NATURAL JOIN in SQL query instead of multiple SELECT via _build_contact_where - make code more concise - update method documentation - - - - - 9046797e by Philipp Hörist at 2017-07-21T16:58:04+02:00 Remove _build_contact_where() We dont need it anymore - - - - - cb90f9de by Philipp Hörist at 2017-07-27T11:57:09+02:00 Merge branch 'logger' into 'master' Refactor Logger See merge request !108 - - - - - 5 changed files: - gajim/chat_control.py - gajim/command_system/implementation/standard.py - gajim/common/connection.py - gajim/common/logger.py - gajim/history_window.py Changes: ===================================== gajim/chat_control.py ===================================== --- a/gajim/chat_control.py +++ b/gajim/chat_control.py @@ -1411,14 +1411,14 @@ class ChatControl(ChatControlBase): # number of messages that are in queue and are already logged, we want # to avoid duplication - pending_how_many = len(gajim.events.get_events(self.account, jid, + pending = len(gajim.events.get_events(self.account, jid, ['chat', 'pm'])) if self.resource: - pending_how_many += len(gajim.events.get_events(self.account, + pending += len(gajim.events.get_events(self.account, self.contact.get_full_jid(), ['chat', 'pm'])) rows = gajim.logger.get_last_conversation_lines( - jid, pending_how_many, self.account) + self.account, jid, pending) local_old_kind = None self.conv_textview.just_cleared = True ===================================== gajim/command_system/implementation/standard.py ===================================== --- a/gajim/command_system/implementation/standard.py +++ b/gajim/command_system/implementation/standard.py @@ -87,7 +87,7 @@ class StandardCommonCommands(CommandContainer): @command('lastlog', overlap=True) @doc(_("Show logged messages which mention given text")) def grep(self, text, limit=None): - results = gajim.logger.search_log(self.contact.jid, text, self.account) + results = gajim.logger.search_log(self.account, self.contact.jid, text) if not results: raise CommandError(_("%s: Nothing found") % text) ===================================== gajim/common/connection.py ===================================== --- a/gajim/common/connection.py +++ b/gajim/common/connection.py @@ -2580,19 +2580,16 @@ class Connection(CommonConnection, ConnectionHandlers): # last date/time in history to avoid duplicate if room_jid not in self.last_history_time: # Not in memory, get it from DB - last_log = None - # Do not check if we are not logging for this room + last_log = 0 if gajim.config.should_log(self.name, room_jid): # Check time first in the FAST table - last_log = gajim.logger.get_room_last_message_time(room_jid) - if last_log is None: - # Not in special table, get it from messages DB - last_log = gajim.logger.get_last_date_that_has_logs(room_jid, - is_room=True) + last_log = gajim.logger.get_room_last_message_time( + self.name, room_jid) + if not last_log: + last_log = 0 + # Create self.last_history_time[room_jid] even if not logging, # could be used in connection_handlers - if last_log is None: - last_log = 0 self.last_history_time[room_jid] = last_log p = nbxmpp.Presence(to='%s/%s' % (room_jid, nick), ===================================== gajim/common/logger.py ===================================== --- a/gajim/common/logger.py +++ b/gajim/common/logger.py @@ -32,6 +32,7 @@ import os import sys import time import datetime +import calendar import json from collections import namedtuple from gzip import GzipFile @@ -68,6 +69,9 @@ class KindConstant(IntEnum): CHAT_MSG_SENT = 6 ERROR = 7 + def __str__(self): + return str(self.value) + @unique class ShowConstant(IntEnum): ONLINE = 0 @@ -160,6 +164,11 @@ class Logger: isolation_level='IMMEDIATE') os.chdir(back) self.con.row_factory = self.namedtuple_factory + + # DB functions + self.con.create_function("like", 1, self._like) + self.con.create_function("get_timeout", 0, self._get_timeout) + self.cur = self.con.cursor() self.set_synchronous(False) @@ -183,6 +192,22 @@ class Logger: self.open_db() self.get_jids_already_in_db() + @staticmethod + def _get_timeout(): + """ + returns the timeout in epoch + """ + timeout = gajim.config.get('restore_timeout') + + now = int(time.time()) + if timeout > 0: + timeout = now - (timeout * 60) + return timeout + + @staticmethod + def _like(search_str): + return '%{}%'.format(search_str) + def commit(self): try: self.con.commit() @@ -249,6 +274,22 @@ class Logger: return True return False + @staticmethod + def _get_family_jids(account, jid): + """ + Get all jids of the metacontacts family + + :param account: The account + + :param jid: The JID + + returns a list of JIDs' + """ + family = gajim.contacts.get_metacontacts_family(account, jid) + if family: + return [user['jid'] for user in family] + return [jid] + def get_jid_id(self, jid, typestr=None): """ jids table has jid and jid_id logs table has log_id, jid_id, @@ -593,44 +634,49 @@ class Logger: exceptions.PysqliteOperationalError) as error: self.dispatch('DB_ERROR', error) - def get_last_conversation_lines(self, jid, pending_how_many, account): + def get_last_conversation_lines(self, account, jid, pending): """ - Accept how many rows to restore and when to time them out (in minutes) - (mark them as too old) and number of messages that are in queue and are - already logged but pending to be viewed, returns a list of tuples - containg time, kind, message, subject list with empty tuple if nothing - found to meet our demands + Get recent messages + + Pending messages are already in queue to be printed when the + ChatControl is opened, so we dont want to request those messages. + How many messages are requested depends on the 'restore_lines' + config value. How far back in time messages are requested depends on + _get_timeout(). + + :param account: The account + + :param jid: The jid from which we request the conversation lines + + :param pending: How many messages are currently pending so we dont + request those messages + + returns a list of namedtuples """ - try: - self.get_jid_id(jid) - except exceptions.PysqliteOperationalError: - # Error trying to create a new jid_id. This means there is no log - return [] - where_sql, jid_tuple = self._build_contact_where(account, jid) - # How many lines to restore and when to time them out - restore_how_many = gajim.config.get('restore_lines') - if restore_how_many <= 0: + restore = gajim.config.get('restore_lines') + if restore <= 0: return [] - timeout = gajim.config.get('restore_timeout') # in minutes - now = int(float(time.time())) - if timeout > 0: - timeout = now - (timeout * 60) # before that they are too old + kinds = map(str, [KindConstant.SINGLE_MSG_RECV, + KindConstant.SINGLE_MSG_SENT, + KindConstant.CHAT_MSG_RECV, + KindConstant.CHAT_MSG_SENT, + KindConstant.ERROR]) + + jids = self._get_family_jids(account, jid) + + sql = ''' + SELECT time, kind, message, subject, additional_data + FROM logs NATURAL JOIN jids WHERE jid IN ({jids}) AND + kind IN ({kinds}) AND time > get_timeout() + ORDER BY time DESC, log_line_id DESC LIMIT ? OFFSET ? + '''.format(jids=', '.join('?' * len(jids)), + kinds=', '.join(kinds)) - # so if we ask last 5 lines and we have 2 pending we get - # 3 - 8 (we avoid the last 2 lines but we still return 5 asked) try: - self.cur.execute(''' - SELECT time, kind, message, subject, additional_data FROM logs - WHERE (%s) AND kind IN (%d, %d, %d, %d, %d) AND time > %d - ORDER BY time DESC LIMIT %d OFFSET %d - ''' % (where_sql, KindConstant.SINGLE_MSG_RECV, - KindConstant.CHAT_MSG_RECV, KindConstant.SINGLE_MSG_SENT, - KindConstant.CHAT_MSG_SENT, KindConstant.ERROR, timeout, - restore_how_many, pending_how_many), jid_tuple) - - messages = self.cur.fetchall() + messages = self.con.execute( + sql, (*jids, restore, pending)).fetchall() except sqlite.DatabaseError: self.dispatch('DB_ERROR', exceptions.DatabaseMalformed(LOG_DB_PATH)) @@ -649,174 +695,163 @@ class Logger: start_of_day = int(time.mktime(local_time)) return start_of_day - def get_conversation_for_date(self, jid, year, month, day, account): + def get_conversation_for_date(self, account, jid, date): """ Load the complete conversation with a given jid on a specific date - The conversation contains all messages that were exchanged between - `account` and `jid` on the day specified by `year`, `month` and `day`, - where `month` and `day` are 1-based. + :param account: The account - The conversation will be returned as a list of single messages of type - `Logger.Message`. Messages in the list are sorted chronologically. An - empty list will be returned if there are no messages in the log database - for the requested combination of `jid` and `account` on the given date. + :param jid: The jid for which we request the conversation + + :param date: datetime.datetime instance + example: datetime.datetime(year, month, day) + + returns a list of namedtuples """ - try: - self.get_jid_id(jid) - except exceptions.PysqliteOperationalError: - # Error trying to create a new jid_id. This means there is no log - return [] - where_sql, jid_tuple = self._build_contact_where(account, jid) - start_of_day = self.get_unix_time_from_date(year, month, day) - seconds_in_a_day = 86400 # 60 * 60 * 24 - last_second_of_day = start_of_day + seconds_in_a_day - 1 + jids = self._get_family_jids(account, jid) - self.cur.execute(''' + delta = datetime.timedelta( + hours=23, minutes=59, seconds=59, microseconds=999999) + + sql = ''' SELECT contact_name, time, kind, show, message, subject, additional_data, log_line_id - FROM logs - WHERE (%s) - AND time BETWEEN %d AND %d - ORDER BY time - ''' % (where_sql, start_of_day, last_second_of_day), jid_tuple) + FROM logs NATURAL JOIN jids WHERE jid IN ({jids}) + AND time BETWEEN ? AND ? + ORDER BY time, log_line_id + '''.format(jids=', '.join('?' * len(jids))) - return self.cur.fetchall() + return self.con.execute(sql, (*jids, + date.timestamp(), + (date + delta).timestamp())).fetchall() - def search_log(self, jid, query, account, year=None, month=None, day=None): + def search_log(self, account, jid, query, date=None): """ Search the conversation log for messages containing the `query` string. - The search can either span the complete log for the given `account` and - `jid` or be restriced to a single day by specifying `year`, `month` and - `day`, where `month` and `day` are 1-based. + The search can either span the complete log for the given + `account` and `jid` or be restriced to a single day by + specifying `date`. + + :param account: The account + + :param jid: The jid for which we request the conversation + + :param query: A search string - All messages matching the specified criteria will be returned in a list - containing tuples of type `Logger.Message`. If no messages match the - criteria, an empty list will be returned. + :param date: datetime.datetime instance + example: datetime.datetime(year, month, day) + + returns a list of namedtuples """ - try: - self.get_jid_id(jid) - except exceptions.PysqliteOperationalError: - # Error trying to create a new jid_id. This means there is no log - return [] + jids = self._get_family_jids(account, jid) - where_sql, jid_tuple = self._build_contact_where(account, jid) - like_sql = '%' + query.replace("'", "''") + '%' - if year and month and day: - start_of_day = self.get_unix_time_from_date(year, month, day) - seconds_in_a_day = 86400 # 60 * 60 * 24 - last_second_of_day = start_of_day + seconds_in_a_day - 1 - self.cur.execute(''' - SELECT contact_name, time, kind, show, message, subject, - additional_data, log_line_id - FROM logs - WHERE (%s) AND message LIKE '%s' - AND time BETWEEN %d AND %d - ORDER BY time - ''' % (where_sql, like_sql, start_of_day, last_second_of_day), - jid_tuple) - else: - self.cur.execute(''' - SELECT contact_name, time, kind, show, message, subject, - additional_data, log_line_id - FROM logs - WHERE (%s) AND message LIKE '%s' - ORDER BY time - ''' % (where_sql, like_sql), jid_tuple) + if date: + delta = datetime.timedelta( + hours=23, minutes=59, seconds=59, microseconds=999999) - return self.cur.fetchall() + between = ''' + AND time BETWEEN {start} AND {end} + '''.format(start=date.timestamp(), + end=(date + delta).timestamp()) - def get_days_with_logs(self, jid, year, month, max_day, account): + sql = ''' + SELECT contact_name, time, kind, show, message, subject, + additional_data, log_line_id + FROM logs NATURAL JOIN jids WHERE jid IN ({jids}) + AND message LIKE like(?) {date_search} + ORDER BY time, log_line_id + '''.format(jids=', '.join('?' * len(jids)), + date_search=between if date else '') + + return self.con.execute(sql, (*jids, query)).fetchall() + + def get_days_with_logs(self, account, jid, year, month): """ - Return the list of days that have logs (not status messages) + Request the days in a month where we received messages + for a given `jid`. + + :param account: The account + + :param jid: The jid for which we request the days + + :param year: The year + + :param month: The month + + returns a list of namedtuples """ - try: - self.get_jid_id(jid) - except exceptions.PysqliteOperationalError: - # Error trying to create a new jid_id. This means there is no log - return [] - days_with_logs = [] - where_sql, jid_tuple = self._build_contact_where(account, jid) - - # First select all date of month whith logs we want - start_of_month = self.get_unix_time_from_date(year, month, 1) - seconds_in_a_day = 86400 # 60 * 60 * 24 - last_second_of_month = start_of_month + (seconds_in_a_day * max_day) - 1 - - # Select times and 'floor' them to time 0:00 - # (by dividing, they are integers) - # and take only one of the same values (distinct) - # Now we have timestamps of time 0:00 of every day with logs - self.cur.execute(''' - SELECT DISTINCT time/(86400)*86400 as time FROM logs - WHERE (%s) - AND time BETWEEN %d AND %d - AND kind NOT IN (%d, %d) - ORDER BY time - ''' % (where_sql, start_of_month, last_second_of_month, - KindConstant.STATUS, KindConstant.GCSTATUS), jid_tuple) - result = self.cur.fetchall() + jids = self._get_family_jids(account, jid) + + kinds = map(str, [KindConstant.STATUS, + KindConstant.GCSTATUS]) + + # Calculate the start and end datetime of the month + date = datetime.datetime(year, month, 1) + days = calendar.monthrange(year, month)[1] - 1 + delta = datetime.timedelta( + days=days, hours=23, minutes=59, seconds=59, microseconds=999999) - # convert timestamps to day of month - for line in result: - days_with_logs[0:0]=[time.gmtime(line.time)[2]] + sql = """ + SELECT DISTINCT + CAST(strftime('%d', time, 'unixepoch', 'localtime') AS INTEGER) + AS day FROM logs NATURAL JOIN jids WHERE jid IN ({jids}) + AND time BETWEEN ? AND ? + AND kind NOT IN ({kinds}) + ORDER BY time + """.format(jids=', '.join('?' * len(jids)), + kinds=', '.join(kinds)) - return days_with_logs + return self.con.execute(sql, (*jids, + date.timestamp(), + (date + delta).timestamp())).fetchall() - def get_last_date_that_has_logs(self, jid, account=None, is_room=False): + def get_last_date_that_has_logs(self, account, jid): """ - Return last time (in seconds since EPOCH) for which we had logs - (excluding statuses) + Get the timestamp of the last message we received for the jid. + + :param account: The account + + :param jid: The jid for which we request the last timestamp + + returns a timestamp or None """ - where_sql = '' - if not is_room: - where_sql, jid_tuple = self._build_contact_where(account, jid) - else: - try: - jid_id = self.get_jid_id(jid, 'ROOM') - except exceptions.PysqliteOperationalError: - # Error trying to create a new jid_id. This means there is no log - return None - where_sql = 'jid_id = ?' - jid_tuple = (jid_id,) - self.cur.execute(''' + jids = self._get_family_jids(account, jid) + + kinds = map(str, [KindConstant.STATUS, + KindConstant.GCSTATUS]) + + sql = ''' SELECT MAX(time) as time FROM logs - WHERE (%s) - AND kind NOT IN (%d, %d) - ''' % (where_sql, KindConstant.STATUS, KindConstant.GCSTATUS), - jid_tuple) + NATURAL JOIN jids WHERE jid IN ({jids}) + AND kind NOT IN ({kinds}) + '''.format(jids=', '.join('?' * len(jids)), + kinds=', '.join(kinds)) - results = self.cur.fetchone() - if results is not None: - result = results.time - else: - result = None - return result + # fetchone() returns always at least one Row with all + # attributes set to None because of the MAX() function + return self.con.execute(sql, (*jids,)).fetchone().time - def get_room_last_message_time(self, jid): + def get_room_last_message_time(self, account, jid): """ - Return FASTLY last time (in seconds since EPOCH) for which we had logs - for that room from rooms_last_message_time table + Get the timestamp of the last message we received in a room. + + :param account: The account + + :param jid: The jid for which we request the last timestamp + + returns a timestamp or None """ - try: - jid_id = self.get_jid_id(jid, 'ROOM') - except exceptions.PysqliteOperationalError: - # Error trying to create a new jid_id. This means there is no log - return None - where_sql = 'jid_id = %s' % jid_id - self.cur.execute(''' - SELECT time FROM rooms_last_message_time - WHERE (%s) - ''' % (where_sql)) + sql = ''' + SELECT time FROM rooms_last_message_time + NATURAL JOIN jids WHERE jid = ? + ''' - results = self.cur.fetchone() - if results is not None: - result = results.time - else: - result = None - return result + row = self.con.execute(sql, (jid,)).fetchone() + if not row: + return self.get_last_date_that_has_logs(account, jid) + return row.time def set_room_last_message_time(self, jid, time): """ @@ -829,31 +864,6 @@ class Logger: (jid_id, time) self.simple_commit(sql) - def _build_contact_where(self, account, jid): - """ - Build the where clause for a jid, including metacontacts jid(s) if any - """ - where_sql = '' - jid_tuple = () - # will return empty list if jid is not associated with - # any metacontacts - family = gajim.contacts.get_metacontacts_family(account, jid) - if family: - for user in family: - try: - jid_id = self.get_jid_id(user['jid']) - except exceptions.PysqliteOperationalError: - continue - where_sql += 'jid_id = ?' - jid_tuple += (jid_id,) - if user != family[-1]: - where_sql += ' OR ' - else: # if jid was not associated with metacontacts - jid_id = self.get_jid_id(jid) - where_sql = 'jid_id = ?' - jid_tuple += (jid_id,) - return where_sql, jid_tuple - def save_transport_type(self, jid, type_): """ Save the type of the transport in DB ===================================== gajim/history_window.py ===================================== --- a/gajim/history_window.py +++ b/gajim/history_window.py @@ -30,6 +30,7 @@ from gi.repository import Gdk from gi.repository import GLib import time import calendar +import datetime from enum import IntEnum, unique @@ -304,7 +305,7 @@ class HistoryWindow: # select logs for last date we have logs with contact self.calendar.set_sensitive(True) last_log = \ - gajim.logger.get_last_date_that_has_logs(self.jid, self.account) + gajim.logger.get_last_date_that_has_logs(self.account, self.jid) date = time.localtime(last_log) @@ -356,20 +357,18 @@ class HistoryWindow: widget.select_day(1) return - # in gtk January is 1, in python January is 0, - # I want the second - # first day of month is 1 not 0 widget.clear_marks() month = gtkgui_helpers.make_gtk_month_python_month(month) - days_in_this_month = calendar.monthrange(year, month)[1] + try: - log_days = gajim.logger.get_days_with_logs(self.jid, year, month, - days_in_this_month, self.account) + log_days = gajim.logger.get_days_with_logs( + self.account, self.jid, year, month) except exceptions.PysqliteOperationalError as e: dialogs.ErrorDialog(_('Disk Error'), str(e)) return - for day in log_days: - widget.mark_day(day) + + for date in log_days: + widget.mark_day(date.day) def _get_string_show_from_constant_int(self, show): if show == ShowConstant.ONLINE: @@ -397,8 +396,11 @@ class HistoryWindow: self.last_time_printout = 0 show_status = self.show_status_checkbutton.get_active() + date = datetime.datetime(year, month, day) + conversation = gajim.logger.get_conversation_for_date( - self.jid, year, month, day, self.account) + self.account, self.jid, date) + for message in conversation: if not show_status and message.kind in (KindConstant.GCSTATUS, KindConstant.STATUS): @@ -537,13 +539,15 @@ class HistoryWindow: # This may leed to wrong self nick in the displayed history (Uggh!) account = list(gajim.contacts.get_accounts())[0] - year, month, day = False, False, False + date = None if self.search_in_date.get_active(): year, month, day = self.calendar.get_date() # integers month = gtkgui_helpers.make_gtk_month_python_month(month) + date = datetime.datetime(year, month, day) show_status = self.show_status_checkbutton.get_active() - results = gajim.logger.search_log(jid, text, account, year, month, day) + + results = gajim.logger.search_log(account, jid, text, date) #FIXME: # add "subject: | message: " in message column if kind is single # also do we need show at all? (we do not search on subject) View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/fe1f2c010383e10496bde4eebc2195557…

1 0

[Git][gajim/gajim][master] Dont drop MAM Message on missing stanza-id
by Philipp Hörist 27 Jul '17

27 Jul '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: fe1f2c01 by Philipp Hörist at 2017-07-27T03:33:19+02:00 Dont drop MAM Message on missing stanza-id A missing stanza ID means, we will have to take some measures to make sure we get no duplicates in the Database later on. Also fix getting the origin-id. Third time is a charm. - - - - - 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 @@ -1078,7 +1078,7 @@ class MamMessageReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): self.stanza_id = self.msg_.getTag('origin-id', namespace=nbxmpp.NS_SID) if self.stanza_id: - self.stanza_id.getID() + self.stanza_id = self.stanza_id.getID() else: self.stanza_id = self.msg_.getID() @@ -1096,8 +1096,7 @@ class MamMessageReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): self.resource = frm.getResource() if not self.stanza_id: - log.error('Could not retrieve stanza-id') - return False + log.debug('Could not retrieve stanza-id') # Use timestamp provided by archive, # Fallback: Use timestamp provided by user and issue a warning View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/fe1f2c010383e10496bde4eebc2195557e…

1 0

[Git][gajim/gajim] Pushed new branch xep-0319
by Yann Leboulanger 26 Jul '17

26 Jul '17

Yann Leboulanger pushed new branch xep-0319 at gajim / gajim

1 0

[Git][gajim/python-nbxmpp][master] add XEP-0319 namespace
by Yann Leboulanger 26 Jul '17

26 Jul '17

Yann Leboulanger pushed to branch master at gajim / python-nbxmpp Commits: d927f8df by Yann Leboulanger at 2017-07-26T22:21:19+02:00 add XEP-0319 namespace - - - - - 1 changed file: - nbxmpp/protocol.py Changes: ===================================== nbxmpp/protocol.py ===================================== --- a/nbxmpp/protocol.py +++ b/nbxmpp/protocol.py @@ -89,6 +89,7 @@ NS_HTTP_AUTH = 'http://jabber.org/protocol/http-auth' # XEP-0070 NS_HTTP_BIND = 'http://jabber.org/protocol/httpbind' # XEP-0124 NS_HTTPUPLOAD = 'urn:xmpp:http:upload' # XEP-0363 NS_IBB = 'http://jabber.org/protocol/ibb' +NS_IDLE = 'urn:xmpp:idle:1' # XEP-0319 NS_INVISIBLE = 'presence-invisible' # Jabberd2 NS_IQ = 'iq' # Jabberd2 NS_JINGLE ='urn:xmpp:jingle:1' # XEP-0166 View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/d927f8dfb20d9ed679dde0b05d…

1 0

[Git][gajim/python-nbxmpp][master] Prepare 0.5.7 release
by Philipp Hörist 26 Jul '17

26 Jul '17

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 9a9feb44 by Philipp Hörist at 2017-07-26T21:55:32+02:00 Prepare 0.5.7 release - - - - - 3 changed files: - ChangeLog - nbxmpp/__init__.py - setup.py Changes: ===================================== ChangeLog ===================================== --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,6 @@ -python-nbxmpp 0.x.x (tbd) +python-nbxmpp 0.5.7 (26 Juli 2017) + * Add new getJid() method for Protocol * Return Protocol instances when using certain Node methods * Add new XEP Namespaces ===================================== nbxmpp/__init__.py ===================================== --- a/nbxmpp/__init__.py +++ b/nbxmpp/__init__.py @@ -17,4 +17,4 @@ from .client_nb import NonBlockingClient from .plugin import PlugIn from .smacks import Smacks -__version__ = "0.5.6" +__version__ = "0.5.7" ===================================== setup.py ===================================== --- a/setup.py +++ b/setup.py @@ -3,7 +3,7 @@ from distutils.core import setup setup(name='nbxmpp', - version='0.5.6', + version='0.5.7', description='Non blocking Jabber/XMPP module', author='Yann Leboulanger', author_email='asterix(a)lagaule.org', View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/9a9feb44e96d7fee243b6a7b41…

1 0

[Git][gajim/python-nbxmpp][master] Update ChangeLog
by Philipp Hörist 26 Jul '17

26 Jul '17

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 2eddb1b2 by Philipp Hörist at 2017-07-26T21:08:20+02:00 Update ChangeLog - - - - - 1 changed file: - ChangeLog Changes: ===================================== ChangeLog ===================================== --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,7 @@ python-nbxmpp 0.x.x (tbd) - * Add new XEP Namespaces for Jingle and Hashes + * Return Protocol instances when using certain Node methods + * Add new XEP Namespaces python-nbxmpp 0.5.6 (03 June 2017) View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/2eddb1b22464704208a06da8d7…

1 0

[Git][gajim/gajim][master] Get the ID attr of origin-id instead of the Node
by Philipp Hörist 26 Jul '17

26 Jul '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 9d6e3f43 by Philipp Hörist at 2017-07-26T02:41:08+02:00 Get the ID attr of origin-id instead of the Node - - - - - 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 @@ -1077,7 +1077,9 @@ class MamMessageReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): if frm.bareMatch(own_jid): self.stanza_id = self.msg_.getTag('origin-id', namespace=nbxmpp.NS_SID) - if not self.stanza_id: + if self.stanza_id: + self.stanza_id.getID() + else: self.stanza_id = self.msg_.getID() self.with_ = str(to) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/9d6e3f432307dc3a250cb97640bf04b5b7…

1 0

[Git][gajim/gajim][master] Correctly set stanza-id for received MAM messages
by Philipp Hörist 26 Jul '17

26 Jul '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 7f0bcbb5 by Philipp Hörist at 2017-07-26T02:35:34+02:00 Correctly set stanza-id for received MAM messages The gaol why we need to determine what ID should be used as stanza-id, is so we can use the stanza-id in the future for deduplication. Case we are the sender: Either we look for a origin-id element, which we will include in the Future in all messages we send, or until then the ID we set on the message as attr. Case we are the receiver: If our server supports mam:2 we take the ID of the result element, because mam:2 injects the archive ID live into every message we receive. If we dont have mam:2 we fall back to the ID of the message attr. - - - - - 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 @@ -1069,10 +1069,34 @@ class MamMessageReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): return False self.msgtxt = self.msg_.getTagData('body') - self.stanza_id = self.msg_.getID() - self.mam_id = self.result.getID() self.query_id = self.result.getAttr('queryid') + frm = self.msg_.getFrom() + to = self.msg_.getTo() + + if frm.bareMatch(own_jid): + self.stanza_id = self.msg_.getTag('origin-id', + namespace=nbxmpp.NS_SID) + if not self.stanza_id: + self.stanza_id = self.msg_.getID() + + self.with_ = str(to) + self.direction = 'to' + self.resource = to.getResource() + else: + if self.result.getNamespace() == nbxmpp.NS_MAM_2: + self.stanza_id = self.result.getID() + else: + self.stanza_id = self.msg_.getID() + + self.with_ = str(frm) + self.direction = 'from' + self.resource = frm.getResource() + + if not self.stanza_id: + log.error('Could not retrieve stanza-id') + return False + # Use timestamp provided by archive, # Fallback: Use timestamp provided by user and issue a warning delay = self.forwarded.getTag('delay', namespace=nbxmpp.NS_DELAY2) @@ -1085,23 +1109,7 @@ class MamMessageReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): self.timestamp = helpers.parse_delay(delay) - frm = self.msg_.getFrom() - to = self.msg_.getTo() - - if not to or to.bareMatch(own_jid): - self.with_ = str(frm) - self.direction = 'from' - self.resource = frm.getResource() - else: - self.with_ = str(to) - self.direction = 'to' - self.resource = to.getResource() - - log_message = \ - 'received: mam-message: ' \ - 'stanza id: {:15} - mam id: {:15} - query id: {}'.format( - self.stanza_id, self.mam_id, self.query_id) - log.debug(log_message) + log.debug('Received mam-message: stanza id: %s', self.stanza_id) return True class MamDecryptedMessageReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/7f0bcbb5bf2e8faf4136767714d8d08912…

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits July 2017