Commits December 2018

commits@gajim.org

1 participants
81 discussions

[Git][gajim/python-nbxmpp][master] Count outgoing stanzas after session resume
by Philipp Hörist 08 Dec '18

08 Dec '18

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: c58e9751 by Philipp Hörist at 2018-12-08T00:16:11Z Count outgoing stanzas after session resume - - - - - 1 changed file: - nbxmpp/smacks.py Changes: ===================================== nbxmpp/smacks.py ===================================== @@ -60,7 +60,6 @@ class Smacks(PlugIn): self._session_id = None self._location = None - self._enable_sent = False def get_resume_data(self): if self.resume_supported: @@ -128,7 +127,7 @@ class Smacks(PlugIn): self._in_h += 1 def save_in_queue(self, stanza): - if not self._enable_sent: + if not self._enable_sent and not self.resumed: # We did not yet sent 'enable' so the server # will not count our stanzas return View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/c58e9751d779d09cb3460db03d… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/c58e9751d779d09cb3460db03d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.1] Use custom dict for additional data
by Philipp Hörist 07 Dec '18

07 Dec '18

Philipp Hörist pushed to branch gajim_1.1 at gajim / gajim Commits: 1c09b507 by Philipp Hörist at 2018-12-07T22:31:00Z Use custom dict for additional data This makes it easier to retrive and store values - - - - - 14 changed files: - gajim/chat_control.py - gajim/chat_control_base.py - gajim/common/connection_handlers_events.py - gajim/common/events.py - gajim/common/helpers.py - gajim/common/logger.py - gajim/common/modules/httpupload.py - gajim/common/modules/mam.py - gajim/common/modules/message.py - gajim/common/modules/misc.py - gajim/common/zeroconf/connection_handlers_zeroconf.py - gajim/conversation_textview.py - gajim/groupchat_control.py - gajim/session.py Changes: ===================================== gajim/chat_control.py ===================================== @@ -42,6 +42,7 @@ from gajim.common import helpers from gajim.common import ged from gajim.common import i18n from gajim.common.i18n import _ +from gajim.common.helpers import AdditionalDataDict from gajim.common.contacts import GC_Contact from gajim.common.const import AvatarSize from gajim.common.const import KindConstant @@ -933,7 +934,7 @@ class ChatControl(ChatControlBase): contact = self.contact if additional_data is None: - additional_data = {} + additional_data = AdditionalDataDict() if frm == 'status': if not app.config.get('print_status_in_chats'): ===================================== gajim/chat_control_base.py ===================================== @@ -38,6 +38,7 @@ from gajim.common import helpers from gajim.common import ged from gajim.common import i18n from gajim.common.i18n import _ +from gajim.common.helpers import AdditionalDataDict from gajim.common.contacts import GC_Contact from gajim.common.connection_handlers_events import MessageOutgoingEvent from gajim.common.const import StyleAttr @@ -905,7 +906,7 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): if other_tags_for_text is None: other_tags_for_text = [] if additional_data is None: - additional_data = {} + additional_data = AdditionalDataDict() textview.print_conversation_line(text, jid, kind, name, tim, other_tags_for_name, other_tags_for_time, other_tags_for_text, ===================================== gajim/common/connection_handlers_events.py ===================================== @@ -28,6 +28,7 @@ from gajim.common import helpers from gajim.common import app from gajim.common import i18n from gajim.common.i18n import _ +from gajim.common.helpers import AdditionalDataDict from gajim.common.modules import dataforms from gajim.common.modules.misc import parse_idle from gajim.common.modules.misc import parse_delay @@ -91,14 +92,12 @@ class HelperEvent: def get_oob_data(self, stanza): oob_node = stanza.getTag('x', namespace=nbxmpp.NS_X_OOB) if oob_node is not None: - if 'gajim' not in self.additional_data: - self.additional_data['gajim'] = {} oob_url = oob_node.getTagData('url') if oob_url is not None: - self.additional_data['gajim']['oob_url'] = oob_url + self.additional_data.set_value('gajim', 'oob_url', oob_url) oob_desc = oob_node.getTagData('desc') if oob_desc is not None: - self.additional_data['gajim']['oob_desc'] = oob_desc + self.additional_data.set_value('gajim', 'oob_desc', oob_desc) def get_stanza_id(self, stanza, query=False): if query: @@ -407,7 +406,7 @@ class GcMessageReceivedEvent(nec.NetworkIncomingEvent): def generate(self): self.stanza = self.msg_obj.stanza if not hasattr(self.msg_obj, 'additional_data'): - self.additional_data = {} + self.additional_data = AdditionalDataDict() else: self.additional_data = self.msg_obj.additional_data self.id_ = self.msg_obj.stanza.getID() @@ -626,18 +625,9 @@ class ConnectionTypeEvent(nec.NetworkIncomingEvent): class StanzaReceivedEvent(nec.NetworkIncomingEvent): name = 'stanza-received' - def init(self): - self.additional_data = {} - - def generate(self): - return True - class StanzaSentEvent(nec.NetworkIncomingEvent): name = 'stanza-sent' - def init(self): - self.additional_data = {} - class AgentRemovedEvent(nec.NetworkIncomingEvent): name = 'agent-removed' @@ -1158,7 +1148,7 @@ class MessageOutgoingEvent(nec.NetworkOutgoingEvent): name = 'message-outgoing' def init(self): - self.additional_data = {} + self.additional_data = AdditionalDataDict() self.message = None self.keyID = None self.type_ = 'chat' @@ -1211,7 +1201,7 @@ class GcMessageOutgoingEvent(nec.NetworkOutgoingEvent): name = 'gc-message-outgoing' def init(self): - self.additional_data = {} + self.additional_data = AdditionalDataDict() self.message = '' self.chatstate = None self.xhtml = None ===================================== gajim/common/events.py ===================================== @@ -81,7 +81,8 @@ class ChatEvent(Event): self.displaymarking = displaymarking self.sent_forwarded = sent_forwarded if additional_data is None: - additional_data = {} + from gajim.common.helpers import AdditionalDataDict + additional_data = AdditionalDataDict() self.additional_data = additional_data class NormalEvent(ChatEvent): ===================================== gajim/common/helpers.py ===================================== @@ -41,6 +41,7 @@ import time import logging import json import shutil +import collections from datetime import datetime, timedelta from distutils.version import LooseVersion as V from encodings.punycode import punycode_encode @@ -1485,3 +1486,51 @@ def load_json(path, key=None, default=None): if key is None: return json_dict return json_dict.get(key, default) + +class AdditionalDataDict(collections.UserDict): + def __init__(self, initialdata=None): + collections.UserDict.__init__(self, initialdata) + + @staticmethod + def _get_path_childs(full_path): + path_childs = [full_path] + if ':' in full_path: + path_childs = full_path.split(':') + return path_childs + + def set_value(self, full_path, key, value): + path_childs = self._get_path_childs(full_path) + _dict = self.data + for path in path_childs: + try: + _dict = _dict[path] + except KeyError: + _dict[path] = {} + _dict = _dict[path] + _dict[key] = value + + def get_value(self, full_path, key, default=None): + path_childs = self._get_path_childs(full_path) + _dict = self.data + for path in path_childs: + try: + _dict = _dict[path] + except KeyError: + return default + try: + return _dict[key] + except KeyError: + return default + + def remove_value(self, full_path, key): + path_childs = self._get_path_childs(full_path) + _dict = self.data + for path in path_childs: + try: + _dict = _dict[path] + except KeyError: + return + try: + del _dict[key] + except KeyError: + return ===================================== gajim/common/logger.py ===================================== @@ -41,6 +41,7 @@ from gi.repository import GLib from gajim.common import exceptions from gajim.common import app from gajim.common import configpaths +from gajim.common.helpers import AdditionalDataDict from gajim.common.i18n import _ from gajim.common.const import ( JIDConstant, KindConstant, ShowConstant, TypeConstant, @@ -265,8 +266,9 @@ class Logger: Row = namedtuple("Row", fields) named_row = Row(*row) if 'additional_data' in fields: + _dict = json.loads(named_row.additional_data or '{}') named_row = named_row._replace( - additional_data=json.loads(named_row.additional_data or '{}')) + additional_data=AdditionalDataDict(_dict)) # if an alias `account` for the field `account_id` is used for the # query, the account_id is converted to the account jid @@ -1355,7 +1357,8 @@ class Logger: if not kwargs['additional_data']: del kwargs['additional_data'] else: - kwargs['additional_data'] = json.dumps(kwargs["additional_data"]) + serialized_dict = json.dumps(kwargs["additional_data"].data) + kwargs['additional_data'] = serialized_dict sql = ''' INSERT INTO logs (account_id, jid_id, time, kind, {columns}) ===================================== gajim/common/modules/httpupload.py ===================================== @@ -118,10 +118,7 @@ class HTTPUpload: # to distinguish HTTP File Upload Link from pasted URL oob = event.msg_iq.addChild('x', namespace=nbxmpp.NS_X_OOB) oob.addChild('url').setData(message) - if 'gajim' in event.additional_data: - event.additional_data['gajim']['oob_url'] = message - else: - event.additional_data['gajim'] = {'oob_url': message} + event.additional_data.set_value('gajim', 'oob_url', message) def check_file_before_transfer(self, path, encryption, contact, session, groupchat=False): ===================================== gajim/common/modules/mam.py ===================================== @@ -27,6 +27,7 @@ from gajim.common.const import KindConstant from gajim.common.const import SyncThreshold from gajim.common.caps_cache import muc_caps_cache from gajim.common.helpers import get_sync_threshold +from gajim.common.helpers import AdditionalDataDict from gajim.common.modules.misc import parse_delay from gajim.common.modules.misc import parse_oob from gajim.common.modules.misc import parse_correction @@ -179,7 +180,7 @@ class MAM: event_attrs.update( {'conn': self._con, - 'additional_data': {}, + 'additional_data': AdditionalDataDict(), 'encrypted': False, 'timestamp': delay_timestamp, 'self_message': self_message, @@ -192,6 +193,7 @@ class MAM: 'archive_jid': archive_jid, 'msgtxt': msgtxt, 'message': message, + 'stanza': message, 'namespace': namespace, }) @@ -256,7 +258,7 @@ class MAM: 'gajim', 'user_timestamp', user_timestamp) event.correct_id = parse_correction(event.message) - parse_oob(event.message, event.additional_data) + parse_oob(event) with_ = event.with_.getStripped() if event.muc_pm: ===================================== gajim/common/modules/message.py ===================================== @@ -22,7 +22,9 @@ import nbxmpp from gajim.common import app from gajim.common import helpers from gajim.common.i18n import _ -from gajim.common.nec import NetworkIncomingEvent, NetworkEvent +from gajim.common.nec import NetworkIncomingEvent +from gajim.common.nec import NetworkEvent +from gajim.common.helpers import AdditionalDataDict from gajim.common.modules.security_labels import parse_securitylabel from gajim.common.modules.user_nickname import parse_nickname from gajim.common.modules.carbons import parse_carbon @@ -188,7 +190,7 @@ class Message: 'account': self._account, 'id_': id_, 'encrypted': False, - 'additional_data': {}, + 'additional_data': AdditionalDataDict(), 'forwarded': forwarded, 'sent': sent, 'fjid': fjid, @@ -266,7 +268,7 @@ class Message: 'timestamp': timestamp, 'delayed': user_timestamp is not None, } - parse_oob(event.stanza, event.additional_data) + parse_oob(event) for name, value in event_attr.items(): setattr(event, name, value) ===================================== gajim/common/modules/misc.py ===================================== @@ -108,27 +108,18 @@ def parse_delay(stanza, epoch=True, convert='utc', from_=None, not_from=None): # XEP-0066: Out of Band Data -def parse_oob(stanza, dict_=None, key='gajim'): - oob_node = stanza.getTag('x', namespace=nbxmpp.NS_X_OOB) +def parse_oob(event): + oob_node = event.stanza.getTag('x', namespace=nbxmpp.NS_X_OOB) if oob_node is None: return - result = {} + url = oob_node.getTagData('url') if url is not None: - result['oob_url'] = url + event.additional_data.set_value('gajim', 'oob_url', url) + desc = oob_node.getTagData('desc') if desc is not None: - result['oob_desc'] = desc - - if dict_ is None: - return result - - if key in dict_: - dict_[key] += result - else: - dict_[key] = result - - return dict_ + event.additional_data.set_value('gajim', 'oob_desc', desc) # XEP-0308: Last Message Correction ===================================== gajim/common/zeroconf/connection_handlers_zeroconf.py ===================================== @@ -30,6 +30,7 @@ from gajim.common.protocol.bytestream import ConnectionSocks5BytestreamZeroconf from gajim.common.zeroconf.zeroconf import Constant from gajim.common import connection_handlers from gajim.common.i18n import _ +from gajim.common.helpers import AdditionalDataDict from gajim.common.nec import NetworkIncomingEvent, NetworkEvent from gajim.common.modules.user_nickname import parse_nickname from gajim.common.modules.misc import parse_eme @@ -118,7 +119,7 @@ connection_handlers.ConnectionJingle): 'account': self.name, 'id_': id_, 'encrypted': False, - 'additional_data': {}, + 'additional_data': AdditionalDataDict(), 'forwarded': False, 'sent': False, 'timestamp': time.time(), @@ -165,7 +166,7 @@ connection_handlers.ConnectionJingle): 'stanza_id': event.unique_id } - parse_oob(event.stanza, event.additional_data) + parse_oob(event) for name, value in event_attr.items(): setattr(event, name, value) ===================================== gajim/conversation_textview.py ===================================== @@ -39,6 +39,7 @@ from gajim.common import app from gajim.common import helpers from gajim.common import i18n from gajim.common.i18n import _ +from gajim.common.helpers import AdditionalDataDict from gajim.common.fuzzyclock import FuzzyClock from gajim.common.const import StyleAttr @@ -666,7 +667,7 @@ class ConversationTextview(GObject.GObject): if not otext: return if additional_data is None: - additional_data = {} + additional_data = AdditionalDataDict() buffer_ = self.tv.get_buffer() if other_tags: insert_tags_func = buffer_.insert_with_tags_by_name @@ -686,13 +687,10 @@ class ConversationTextview(GObject.GObject): specials_limit = 100 # add oob text to the end - try: - gajim_data = additional_data['gajim'] - oob_url = gajim_data['oob_url'] - except KeyError: - pass - else: - oob_desc = additional_data['gajim'].get('oob_desc', 'URL:') + + oob_url = additional_data.get_value('gajim', 'oob_url') + if oob_url is not None: + oob_desc = additional_data.get_value('gajim', 'oob_desc', 'URL:') if oob_url != otext: otext += '\n{} {}'.format(oob_desc, oob_url) @@ -739,7 +737,7 @@ class ConversationTextview(GObject.GObject): (emots, links, formatting) """ if additional_data is None: - additional_data = {} + additional_data = AdditionalDataDict() # PluginSystem: adding GUI extension point for ConversationTextview self.plugin_modified = False @@ -941,7 +939,7 @@ class ConversationTextview(GObject.GObject): Print 'chat' type messages """ if additional_data is None: - additional_data = {} + additional_data = AdditionalDataDict() buffer_ = self.tv.get_buffer() buffer_.begin_user_action() insert_mark = None @@ -1172,14 +1170,11 @@ class ConversationTextview(GObject.GObject): @staticmethod def _get_encryption_details(additional_data): - encrypted = additional_data.get('encrypted') - if encrypted is None: - return - - name = encrypted.get('name') + name = additional_data.get_value('encrypted', 'name') if name is None: return - fingerprint = encrypted.get('fingerprint') + + fingerprint = additional_data.get_value('encrypted', 'fingerprint') return name, fingerprint def print_time(self, text, kind, tim, simple, direction_mark, other_tags_for_time, iter_): @@ -1260,7 +1255,7 @@ class ConversationTextview(GObject.GObject): if text_tags is None: text_tags = [] if additional_data is None: - additional_data = {} + additional_data = AdditionalDataDict() buffer_ = self.tv.get_buffer() if not mark: iter_ = buffer_.get_end_iter() ===================================== gajim/groupchat_control.py ===================================== @@ -55,6 +55,7 @@ from gajim.common import events from gajim.common import app from gajim.common import helpers from gajim.common.helpers import launch_browser_mailer +from gajim.common.helpers import AdditionalDataDict from gajim.common.modules import dataforms from gajim.common import ged from gajim.common import i18n @@ -1353,7 +1354,7 @@ class GroupchatControl(ChatControlBase): def print_old_conversation(self, text, contact='', tim=None, xhtml=None, displaymarking=None, msg_stanza_id=None, encrypted=None, additional_data=None): if additional_data is None: - additional_data = {} + additional_data = AdditionalDataDict() if contact: if contact == self.nick: # it's us @@ -1384,7 +1385,7 @@ class GroupchatControl(ChatControlBase): If contact is not set: it's a message from the server or help. """ if additional_data is None: - additional_data = {} + additional_data = AdditionalDataDict() other_tags_for_name = [] other_tags_for_text = [] if contact: ===================================== gajim/session.py ===================================== @@ -27,6 +27,7 @@ from gajim.common import events from gajim.common import app from gajim.common import contacts from gajim.common import ged +from gajim.common.helpers import AdditionalDataDict from gajim.common.const import KindConstant from gajim.gtk.single_message import SingleMessageWindow @@ -277,7 +278,7 @@ class ChatControlSession: fjid = jid if additional_data is None: - additional_data = {} + additional_data = AdditionalDataDict() # Try to catch the contact with correct resource if resource: View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/1c09b50791eecd26c706a53d877912e1d3… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/1c09b50791eecd26c706a53d877912e1d3… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] DataFormWidget: Fix some UI issues
by Philipp Hörist 06 Dec '18

06 Dec '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: d129f555 by Philipp Hörist at 2018-12-06T22:06:10Z DataFormWidget: Fix some UI issues - Textview: Wrap text, set padding - ListMultiTreeView: Align checkboxes to the right - Add a adjustment element that sets default sizes on the columns - Allow two new options 'form-width' and 'left-width' to customize sizes - - - - - 3 changed files: - gajim/data/style/gajim.css - gajim/gtk/dataform.py - test/gtk/dataform.py Changes: ===================================== gajim/data/style/gajim.css ===================================== @@ -238,6 +238,7 @@ button.flat.link { padding: 0; border: 0; } .data-form-widget grid { margin: 18px; } .data-form-widget treeview { padding: 5px; } .data-form-widget scrolledwindow { border: 1px solid; border-color:@unfocused_borders; } +.data-form-widget textview { padding: 5px; } /*Image Preview*/ .preview-image { box-shadow: 0px 0px 3px 0px alpha(@theme_text_color, 0.2); } ===================================== gajim/gtk/dataform.py ===================================== @@ -66,6 +66,9 @@ class FormGrid(Gtk.Grid): self.row_count = 0 self.rows = [] + form_width = options.get('form-width', 435) + self.set_size_request(form_width, -1) + self._data_form = form_node self.title = None @@ -83,6 +86,8 @@ class FormGrid(Gtk.Grid): 'text-multi': TextMultiField } + self._add_row(SizeAdjustment(options)) + if form_node.title is not None: self.title = form_node.title self._add_row(Title(form_node.title)) @@ -149,6 +154,22 @@ class FormGrid(Gtk.Grid): self.get_parent().get_parent().emit('is-valid', value) +class SizeAdjustment: + def __init__(self, options): + self._left_box = Gtk.Box() + self._right_box = Gtk.Box() + + left_width = options.get('left-width', 100) + self._left_box.set_size_request(left_width, -1) + self._right_box.set_hexpand(True) + + def add(self, form_grid, row_number): + form_grid.attach(self._left_box, 0, row_number, 1, 1) + form_grid.attach_next_to(self._right_box, + self._left_box, + Gtk.PositionType.RIGHT, 1, 1) + + class Title: def __init__(self, title): self._label = Gtk.Label(label=title) @@ -179,7 +200,6 @@ class Field: self._label.set_line_wrap(True) self._label.set_line_wrap_mode(Pango.WrapMode.WORD) self._label.set_width_chars(15) - self._label.set_size_request(100, -1) self._label.set_xalign(bool(options.get('right_align'))) self._label.set_tooltip_text(field.description) @@ -318,6 +338,8 @@ class ListMutliTreeView(Gtk.TreeView): col = Gtk.TreeViewColumn() cell = Gtk.CellRendererToggle() cell.set_activatable(True) + cell.set_property('xalign', 1) + cell.set_property('xpad', 10) cell.connect('toggled', self._toggled) col.pack_start(cell, True) col.set_attributes(cell, active=2) @@ -470,11 +492,14 @@ class TextMultiField(Field): self._label.set_valign(Gtk.Align.START) self._widget = Gtk.ScrolledWindow() + self._widget.set_policy(Gtk.PolicyType.NEVER, + Gtk.PolicyType.AUTOMATIC) self._widget.set_propagate_natural_height(True) self._widget.set_min_content_height(100) self._widget.set_max_content_height(300) self._textview = Gtk.TextView() + self._textview.set_wrap_mode(Gtk.WrapMode.WORD_CHAR) self._textview.get_buffer().set_text(field.value) self._textview.get_buffer().connect('changed', self._changed) ===================================== test/gtk/dataform.py ===================================== @@ -112,7 +112,12 @@ class DataFormWindow(Gtk.Window): def __init__(self): Gtk.Window.__init__(self, title="Data Form Test") self.set_default_size(600, 600) - self._widget = DataFormWidget(extend_form(node=nbxmpp.Node(node=FORM))) + options = { + 'left-width': 100, + 'form-width': 435, + } + self._widget = DataFormWidget( + extend_form(node=nbxmpp.Node(node=FORM)), options) self.add(self._widget) self.show() View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/d129f5559a88249f350bc6a0665f87610f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/d129f5559a88249f350bc6a0665f87610f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.1] 2 commits: Determine delay timestamp correctly
by Philipp Hörist 06 Dec '18

06 Dec '18

Philipp Hörist pushed to branch gajim_1.1 at gajim / gajim Commits: 6c2df541 by Philipp Hörist at 2018-12-06T19:52:30Z Determine delay timestamp correctly - Check the from attr on the delay node to determine if its a user timestamp or from the server - Dont use user timestamp for sorting - Record the user timestamp in additional data so its saved to the database Fixes #9444 - - - - - b4f43acb by Philipp Hörist at 2018-12-06T19:52:51Z Encode resource with correct profile Fixes #9465 - - - - - 5 changed files: - gajim/common/helpers.py - gajim/common/modules/mam.py - gajim/common/modules/message.py - gajim/common/modules/misc.py - + test/no_gui/unit/test_helpers.py Changes: ===================================== gajim/common/helpers.py ===================================== @@ -153,7 +153,7 @@ def parse_resource(resource): """ if resource: try: - return resource.encode('Nickname').decode('utf-8') + return resource.encode('OpaqueString').decode('utf-8') except UnicodeError: raise InvalidFormat('Invalid character in resource.') ===================================== gajim/common/modules/mam.py ===================================== @@ -130,12 +130,13 @@ class MAM: raise nbxmpp.NodeProcessed # Timestamp parsing - timestamp = parse_delay(forwarded) - if timestamp is None: + # Most servers dont set the 'from' attr, so we cant check for it + delay_timestamp = parse_delay(forwarded) + if delay_timestamp is None: + log.warning('No timestamp on MAM message') + log.warning(stanza) raise nbxmpp.NodeProcessed - user_timestamp = parse_delay(message) - # Fix for self messaging if not groupchat: to = message.getTo() @@ -180,8 +181,7 @@ class MAM: {'conn': self._con, 'additional_data': {}, 'encrypted': False, - 'timestamp': timestamp, - 'user_timestamp': user_timestamp, + 'timestamp': delay_timestamp, 'self_message': self_message, 'groupchat': groupchat, 'muc_pm': muc_pm, @@ -248,7 +248,12 @@ class MAM: # For example Chatstates, Receipts, Chatmarkers log.debug(event.message.getProperties()) return - log.debug(event.msgtxt) + + user_timestamp = parse_delay(event.stanza) + if user_timestamp is not None: + # Record it as a user timestamp + event.additional_data.set_value( + 'gajim', 'user_timestamp', user_timestamp) event.correct_id = parse_correction(event.message) parse_oob(event.message, event.additional_data) ===================================== gajim/common/modules/message.py ===================================== @@ -223,15 +223,40 @@ class Message: except nbxmpp.NodeProcessed: return - timestamp, delayed = parse_delay(event.stanza), True - if timestamp is None: + subject = event.stanza.getSubject() + groupchat = event.mtype == 'groupchat' + muc_subject = subject and groupchat + + # Determine timestamps + if groupchat: + delay_entity_jid = event.jid + else: + delay_entity_jid = self._con.get_own_jid().getDomain() + + if muc_subject: + # MUC Subjects can have a delay timestamp + # to indicate when the user has set the subject, + # the 'from' attr on these delays is the MUC server + # but we treat it as user timestamp timestamp = time.time() - delayed = False + user_timestamp = parse_delay(event.stanza, from_=delay_entity_jid) + + else: + timestamp = parse_delay(event.stanza, from_=delay_entity_jid) + if timestamp is None: + timestamp = time.time() + + user_timestamp = parse_delay(event.stanza, + not_from=[delay_entity_jid]) + + if user_timestamp is not None: + event.additional_data.set_value( + 'gajim', 'user_timestamp', user_timestamp) event_attr = { 'popup': False, 'msg_log_id': None, - 'subject': event.stanza.getSubject(), + 'subject': subject, 'displaymarking': parse_securitylabel(event.stanza), 'attention': parse_attention(event.stanza), 'correct_id': parse_correction(event.stanza), @@ -239,7 +264,7 @@ class Message: 'form_node': parse_form(event.stanza), 'xhtml': parse_xhtml(event.stanza), 'timestamp': timestamp, - 'delayed': delayed, + 'delayed': user_timestamp is not None, } parse_oob(event.stanza, event.additional_data) @@ -257,7 +282,7 @@ class Message: event.session, event.fjid, timestamp) return - if event.mtype == 'groupchat': + if groupchat: app.nec.push_incoming_event(GcMessageReceivedEvent( None, conn=self._con, ===================================== gajim/common/modules/misc.py ===================================== @@ -65,18 +65,45 @@ def parse_eme(stanza): # XEP-0203: Delayed Delivery -def parse_delay(stanza, epoch=True, convert='utc'): - timestamp = None - delay = stanza.getTagAttr( - 'delay', 'stamp', namespace=nbxmpp.NS_DELAY2) - if delay is not None: - timestamp = parse_datetime(delay, check_utc=True, +def parse_delay(stanza, epoch=True, convert='utc', from_=None, not_from=None): + ''' + Returns the first valid delay timestamp that matches + + :param epoch: Returns the timestamp as epoch + + :param convert: Converts the timestamp to either utc or local + + :param from_: Matches only delays that have the according + from attr set + + :param not_from: Matches only delays that have the according + from attr not set + ''' + delays = stanza.getTags('delay', namespace=nbxmpp.NS_DELAY2) + + for delay in delays: + stamp = delay.getAttr('stamp') + if stamp is None: + log.warning('Invalid timestamp received: %s', stamp) + log.warning(stanza) + continue + + delay_from = delay.getAttr('from') + if from_ is not None: + if delay_from != from_: + continue + if not_from is not None: + if delay_from in not_from: + continue + + timestamp = parse_datetime(stamp, check_utc=True, epoch=epoch, convert=convert) if timestamp is None: - log.warning('Invalid timestamp received: %s', delay) + log.warning('Invalid timestamp received: %s', stamp) log.warning(stanza) + continue - return timestamp + return timestamp # XEP-0066: Out of Band Data ===================================== test/no_gui/unit/test_helpers.py ===================================== @@ -0,0 +1,30 @@ +import unittest + +import nbxmpp + +from gajim.common.modules.misc import parse_delay + +class TestHelpers(unittest.TestCase): + + def test_parse_delay(self): + + node = """ + <message> + <delay xmlns='urn:xmpp:delay' from='capulet.com' stamp='2002-09-10T23:08:25Z' /> + <delay xmlns='urn:xmpp:delay' from='romeo.com' stamp='2010-09-10T23:08:25Z' /> + <delay xmlns='urn:xmpp:delay' stamp='2015-09-10T23:08:25Z' /> + </message> + """ + message = nbxmpp.Node(node=node) + + timestamp = parse_delay(message) + self.assertEqual(timestamp, 1031699305.0) + + timestamp = parse_delay(message, from_='capulet.com') + self.assertEqual(timestamp, 1031699305.0) + + timestamp = parse_delay(message, from_='romeo.com') + self.assertEqual(timestamp, 1284160105.0) + + timestamp = parse_delay(message, not_from=['romeo.com']) + self.assertEqual(timestamp, 1031699305.0) \ No newline at end of file View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/b2ecc14cae3500507dda2361a437d8aa6… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/b2ecc14cae3500507dda2361a437d8aa6… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.1] 2 commits: Fix pylint errors
by Philipp Hörist 05 Dec '18

05 Dec '18

Philipp Hörist pushed to branch gajim_1.1 at gajim / gajim Commits: 59147efa by Philipp Hörist at 2018-12-05T20:43:21Z Fix pylint errors - - - - - b2ecc14c by Philipp Hörist at 2018-12-05T20:43:39Z Use virtualenv for CI tests - - - - - 2 changed files: - .gitlab-ci.yml - gajim/common/zeroconf/client_zeroconf.py Changes: ===================================== .gitlab-ci.yml ===================================== @@ -1,28 +1,25 @@ before_script: - - sudo apt-get update -qq && sudo apt-get install -y -qq libtool pkg-config python3-openssl gir1.2-gtk-3.0 python3-gi python3-nbxmpp-nightly python3-cairo python3-pip + - sudo apt-get update -qq && sudo apt-get install -y -qq libtool pkg-config gir1.2-gtk-3.0 python3-gi python3-cairo - sudo apt-get build-dep -y -qq gajim-default-nightly - - sudo pip3 install pylint==2.1.1 stages: - test - build -run-test: - stage: test - script: - - python3 setup.py test -s test.no_gui - -run-mypy: +run-tests: stage: test script: + - rm -rf civenv-master + - virtualenv --system-site-packages civenv + - . ./civenv/bin/activate + - pip3 install mypy + - pip3 install nbxmpp + - pip3 install pylint==2.1.1 - mypy gajim - -run-pylint: - stage: test - script: - - pylint3 --version - - pylint --version - scripts/dev/pylint-ci.sh --jobs=2 gajim + - python3 setup.py test -s test.no_gui + - deactivate + - rm -rf civenv-master run-appdata: stage: test @@ -57,4 +54,4 @@ run-build: name: "gajim-default-$CI_COMMIT_REF_NAME-$CI_COMMIT_SHA" expire_in: 1 week paths: - - gajim-default-2???-??-??.tar.gz + - gajim-default-$CI_COMMIT_REF_NAME-$CI_COMMIT_SHA.tar.gz ===================================== gajim/common/zeroconf/client_zeroconf.py ===================================== @@ -240,10 +240,10 @@ class P2PClient(IdleObject): self.send_stream_header() def send_stream_header(self): - self.Dispatcher._metastream = Node('stream:stream') + self.Dispatcher._metastream = nbxmpp.Node('stream:stream') self.Dispatcher._metastream.setNamespace(self.Namespace) self.Dispatcher._metastream.setAttr('version', '1.0') - self.Dispatcher._metastream.setAttr('xmlns:stream', NS_STREAMS) + self.Dispatcher._metastream.setAttr('xmlns:stream', nbxmpp.NS_STREAMS) self.Dispatcher._metastream.setAttr('from', self.conn_holder.zeroconf.name) if self.to: @@ -252,7 +252,7 @@ class P2PClient(IdleObject): self.Dispatcher._metastream)[:-2]) def _check_stream_start(self, ns, tag, attrs): - if ns != NS_STREAMS or tag != 'stream': + if ns != nbxmpp.NS_STREAMS or tag != 'stream': log.error('Incorrect stream start: (%s,%s).Terminating!', tag, ns) self.Connection.disconnect() @@ -266,7 +266,7 @@ class P2PClient(IdleObject): self.send_stream_header() if 'version' in attrs and attrs['version'] == '1.0': # other part supports stream features - features = Node('stream:features') + features = nbxmpp.Node('stream:features') self.Dispatcher.send(features) while self.stanzaqueue: stanza, is_message = self.stanzaqueue.pop(0) View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/bb81277c173c5b59df2db5b0ef137b1bd… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/bb81277c173c5b59df2db5b0ef137b1bd… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Fix pylint errors
by Philipp Hörist 05 Dec '18

05 Dec '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: ace1113d by Philipp Hörist at 2018-12-05T20:40:12Z Fix pylint errors - - - - - 31417ffb by Philipp Hörist at 2018-12-05T20:41:44Z Use virtualenv for CI tests - - - - - 3 changed files: - .gitlab-ci.yml - gajim/common/zeroconf/client_zeroconf.py - setup.cfg Changes: ===================================== .gitlab-ci.yml ===================================== @@ -1,28 +1,25 @@ before_script: - - sudo apt-get update -qq && sudo apt-get install -y -qq libtool pkg-config python3-openssl gir1.2-gtk-3.0 python3-gi python3-nbxmpp-nightly python3-cairo python3-pip + - sudo apt-get update -qq && sudo apt-get install -y -qq libtool pkg-config gir1.2-gtk-3.0 python3-gi python3-cairo - sudo apt-get build-dep -y -qq gajim-default-nightly - - sudo pip3 install pylint==2.1.1 stages: - test - build -run-test: - stage: test - script: - - python3 setup.py test -s test.no_gui - -run-mypy: +run-tests: stage: test script: + - rm -rf civenv-master + - virtualenv --system-site-packages civenv + - . ./civenv/bin/activate + - pip3 install mypy + - pip3 install git+https://dev.gajim.org/gajim/python-nbxmpp.git@master + - pip3 install pylint==2.1.1 - mypy gajim - -run-pylint: - stage: test - script: - - pylint3 --version - - pylint --version - scripts/dev/pylint-ci.sh --jobs=2 gajim + - python3 setup.py test -s test.no_gui + - deactivate + - rm -rf civenv-master run-appdata: stage: test @@ -57,4 +54,4 @@ run-build: name: "gajim-default-$CI_COMMIT_REF_NAME-$CI_COMMIT_SHA" expire_in: 1 week paths: - - gajim-default-2???-??-??.tar.gz + - gajim-default-$CI_COMMIT_SHA.tar.gz ===================================== gajim/common/zeroconf/client_zeroconf.py ===================================== @@ -240,10 +240,10 @@ class P2PClient(IdleObject): self.send_stream_header() def send_stream_header(self): - self.Dispatcher._metastream = Node('stream:stream') + self.Dispatcher._metastream = nbxmpp.Node('stream:stream') self.Dispatcher._metastream.setNamespace(self.Namespace) self.Dispatcher._metastream.setAttr('version', '1.0') - self.Dispatcher._metastream.setAttr('xmlns:stream', NS_STREAMS) + self.Dispatcher._metastream.setAttr('xmlns:stream', nbxmpp.NS_STREAMS) self.Dispatcher._metastream.setAttr('from', self.conn_holder.zeroconf.name) if self.to: @@ -252,7 +252,7 @@ class P2PClient(IdleObject): self.Dispatcher._metastream)[:-2]) def _check_stream_start(self, ns, tag, attrs): - if ns != NS_STREAMS or tag != 'stream': + if ns != nbxmpp.NS_STREAMS or tag != 'stream': log.error('Incorrect stream start: (%s,%s).Terminating!', tag, ns) self.Connection.disconnect() @@ -266,7 +266,7 @@ class P2PClient(IdleObject): self.send_stream_header() if 'version' in attrs and attrs['version'] == '1.0': # other part supports stream features - features = Node('stream:features') + features = nbxmpp.Node('stream:features') self.Dispatcher.send(features) while self.stanzaqueue: stanza, is_message = self.stanzaqueue.pop(0) ===================================== setup.cfg ===================================== @@ -19,8 +19,6 @@ classifiers = python_requires = >=3.5 packages = find: test_suite = test -dependency_links= - git+https://dev.gajim.org/gajim/python-nbxmpp.git#egg=nbxmpp-0.9.90 install_requires = cssutils>=1.0.2 keyring View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/a979874fa1fa3a2c0ef608bb81d1c04b6… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/a979874fa1fa3a2c0ef608bb81d1c04b6… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: Correctly remove ping timeout
by Philipp Hörist 05 Dec '18

05 Dec '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 4968fe39 by Philipp Hörist at 2018-12-05T16:03:34Z Correctly remove ping timeout Fixes #9481 - - - - - e419f752 by Philipp Hörist at 2018-12-05T16:05:10Z Remove unused imports - - - - - a979874f by Philipp Hörist at 2018-12-05T16:05:29Z Sort imports - - - - - 4 changed files: - gajim/common/connection.py - gajim/common/connection_handlers.py - gajim/common/modules/ping.py - gajim/common/zeroconf/connection_zeroconf.py Changes: ===================================== gajim/common/connection.py ===================================== @@ -595,6 +595,7 @@ class Connection(CommonConnection, ConnectionHandlers): self.retrycount = 0 def disconnect(self, reconnect=True, immediately=False): + self.get_module('Ping').remove_timeout() if self.connection is None: if not reconnect: self._sm_resume_data = {} ===================================== gajim/common/connection_handlers.py ===================================== @@ -24,27 +24,26 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. +import logging import operator -from time import time as time_time +import time import nbxmpp -from gajim.common import modules -from gajim.common import helpers from gajim.common import app +from gajim.common import ged +from gajim.common import helpers from gajim.common import jingle_xtls +from gajim.common import modules from gajim.common.caps_cache import muc_caps_cache -from gajim.common.protocol.bytestream import ConnectionSocks5Bytestream -from gajim.common.protocol.bytestream import ConnectionIBBytestream from gajim.common.connection_handlers_events import * - -from gajim.common import ged -from gajim.common.nec import NetworkEvent from gajim.common.const import KindConstant - from gajim.common.jingle import ConnectionJingle +from gajim.common.nec import NetworkEvent +from gajim.common.protocol.bytestream import ConnectionSocks5Bytestream +from gajim.common.protocol.bytestream import ConnectionIBBytestream + -import logging log = logging.getLogger('gajim.c.connection_handlers') # kind of events we can wait for an answer @@ -193,7 +192,7 @@ class ConnectionHandlersBase: if show is not None: app.logger.insert_into_logs(self.name, nbxmpp.JID(obj.jid).getStripped(), - time_time(), + time.time(), KindConstant.STATUS, message=obj.status, show=show) ===================================== gajim/common/modules/ping.py ===================================== @@ -21,6 +21,7 @@ import logging import time import nbxmpp +from gi.repository import GLib from gajim.common import app from gajim.common.nec import NetworkIncomingEvent @@ -34,7 +35,7 @@ class Ping: def __init__(self, con: ConnectionT) -> None: self._con = con self._account = con.name - self._alarm_time = None + self._timeout_id = None self.handlers = [ ('iq', self._answer_request, 'get', nbxmpp.NS_PING), @@ -50,19 +51,19 @@ class Ping: if not app.account_is_connected(self._account): return - to = app.config.get_per('accounts', self._account, 'hostname') - self._con.connection.SendAndCallForResponse(self._get_ping_iq(to), - self._keepalive_received) - log.info('Send keepalive') seconds = app.config.get_per('accounts', self._account, 'time_for_ping_alive_answer') - self._alarm_time = app.idlequeue.set_alarm(self._reconnect, seconds) + self._timeout_id = GLib.timeout_add_seconds(seconds, self._reconnect) + + to = app.config.get_per('accounts', self._account, 'hostname') + self._con.connection.SendAndCallForResponse(self._get_ping_iq(to), + self._keepalive_received) def _keepalive_received(self, _stanza: nbxmpp.Iq) -> None: log.info('Received keepalive') - app.idlequeue.remove_alarm(self._reconnect, self._alarm_time) + self.remove_timeout() def _reconnect(self) -> None: if not app.config.get_per('accounts', self._account, 'active'): @@ -118,6 +119,16 @@ class Ping: log.info('Send pong to %s', stanza.getFrom()) raise nbxmpp.NodeProcessed + def remove_timeout(self) -> None: + if self._timeout_id is None: + return + log.info('Remove ping timeout') + GLib.source_remove(self._timeout_id) + self._timeout_id = None + + def cleanup(self) -> None: + self.remove_timeout() + class PingSentEvent(NetworkIncomingEvent): name = 'ping-sent' ===================================== gajim/common/zeroconf/connection_zeroconf.py ===================================== @@ -27,24 +27,17 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. -import os import socket -import random -random.seed() +import getpass import nbxmpp - -import signal -if os.name != 'nt': - signal.signal(signal.SIGPIPE, signal.SIG_DFL) -import getpass from gi.repository import GLib -from gajim.common.connection import CommonConnection from gajim.common import app from gajim.common import ged from gajim.common import modules from gajim.common.i18n import _ +from gajim.common.connection import CommonConnection from gajim.common.zeroconf import client_zeroconf from gajim.common.zeroconf import zeroconf from gajim.common.zeroconf.connection_handlers_zeroconf import * @@ -52,6 +45,7 @@ from gajim.common.connection_handlers_events import * log = logging.getLogger('gajim.c.connection_zeroconf') + class ConnectionZeroconf(CommonConnection, ConnectionHandlersZeroconf): def __init__(self, name): ConnectionHandlersZeroconf.__init__(self) View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/62253c804ab7d0378ddf778f07a0923e4… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/62253c804ab7d0378ddf778f07a0923e4… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Discover the bookmarks conversion server feature
by Philipp Hörist 04 Dec '18

04 Dec '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 62253c80 by Philipp Hörist at 2018-12-04T19:41:44Z Discover the bookmarks conversion server feature - - - - - 3 changed files: - gajim/common/modules/bookmarks.py - gajim/common/modules/discovery.py - gajim/gtk/server_info.py Changes: ===================================== gajim/common/modules/bookmarks.py ===================================== @@ -37,10 +37,17 @@ class Bookmarks: self._con = con self._account = con.name self.bookmarks = {} + self.conversion = False self.available = False self.handlers = [] + def pass_disco(self, from_, _identities, features, _data, _node): + if nbxmpp.NS_BOOKMARK_CONVERSION not in features: + return + self.conversion = True + log.info('Discovered Bookmarks Conversion: %s', from_) + def get_sorted_bookmarks(self, short_name=False): # This returns a sorted by name copy of the bookmarks sorted_bookmarks = {} ===================================== gajim/common/modules/discovery.py ===================================== @@ -177,6 +177,7 @@ class Discovery: self._con.get_module('MAM').pass_disco(from_, *args) self._con.get_module('PEP').pass_disco(from_, *args) self._con.get_module('PubSub').pass_disco(from_, *args) + self._con.get_module('Bookmarks').pass_disco(from_, *args) features = args[1] if 'urn:xmpp:pep-vcard-conversion:0' in features: ===================================== gajim/gtk/server_info.py ===================================== @@ -191,7 +191,9 @@ class ServerInfoDialog(Gtk.Dialog): con.get_module('HTTPUpload').available, con.get_module('HTTPUpload').httpupload_namespace, None), Feature('XEP-0398: Avatar Conversion', - con.avatar_conversion, '', None) + con.avatar_conversion, '', None), + Feature('XEP-0411: Bookmarks Conversion', + con.get_module('Bookmarks').conversion, '', None) ] def add_info(self, info): View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/62253c804ab7d0378ddf778f07a0923e46… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/62253c804ab7d0378ddf778f07a0923e46… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Add new namespace
by Philipp Hörist 04 Dec '18

04 Dec '18

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 0aed4447 by Philipp Hörist at 2018-12-04T19:25:22Z Add new namespace - - - - - 1 changed file: - nbxmpp/protocol.py Changes: ===================================== nbxmpp/protocol.py ===================================== @@ -188,6 +188,7 @@ NS_HASHES_SHA3_512 = 'urn:xmpp:hash-function-text-names:sha3-512' NS_HASHES_BLAKE2B_256 = 'urn:xmpp:hash-function-text-names:id-blake2b256' NS_HASHES_BLAKE2B_512 = 'urn:xmpp:hash-function-text-names:id-blake2b512' NS_OPENPGP = 'urn:xmpp:openpgp:0' +NS_BOOKMARK_CONVERSION = 'urn:xmpp:bookmarks-conversion:0' #xmpp_stream_error_conditions = ''' #bad-format -- -- -- The entity has sent XML that cannot be processed. View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/0aed44470bac25c42e85de268c… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/0aed44470bac25c42e85de268c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Encode resource with correct profile
by Philipp Hörist 04 Dec '18

04 Dec '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 86bbdd21 by Philipp Hörist at 2018-12-04T18:43:13Z Encode resource with correct profile Fixes #9465 - - - - - c2e2dd9a by Philipp Hörist at 2018-12-04T18:43:55Z Fix MUC nick change - - - - - 2 changed files: - gajim/common/helpers.py - gajim/groupchat_control.py Changes: ===================================== gajim/common/helpers.py ===================================== @@ -154,7 +154,7 @@ def parse_resource(resource): """ if resource: try: - return resource.encode('Nickname').decode('utf-8') + return resource.encode('OpaqueString').decode('utf-8') except UnicodeError: raise InvalidFormat('Invalid character in resource.') ===================================== gajim/groupchat_control.py ===================================== @@ -1812,7 +1812,7 @@ class GroupchatControl(ChatControlBase): elif '303' in obj.status_code: # Someone changed their nick if obj.new_nick == self.new_nick or obj.nick == self.nick: # We changed our nick - self.change_nick(obj.new_nick) + self._change_nick(obj.new_nick) self.new_nick = '' s = _('You are now known as %s') % self.nick else: @@ -1882,7 +1882,7 @@ class GroupchatControl(ChatControlBase): if not iter_: if '210' in obj.status_code: # Server changed our nick - self.change_nick(obj.nick) + self._change_nick(obj.nick) s = _('You are now known as %s') % nick self.print_conversation(s, 'info', graphics=False) iter_ = self.add_contact_to_roster(obj.nick, obj.show, role, View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/932377f533a97d25aabf210b4fe52fb0a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/932377f533a97d25aabf210b4fe52fb0a… You're receiving this email because of your account on dev.gajim.org.

1 0

← Newer
1
2
3
4
5
6
7
8
9
Older →

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits December 2018