Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] 2 commits: Implement XEP-0359 Stable Stanza IDs
by Philipp Hörist 28 Jul '17

28 Jul '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 9bca51eb by Philipp Hörist at 2017-07-28T14:03:14+02:00 Implement XEP-0359 Stable Stanza IDs - This allows us to better deduplicate Messages on MAM syncs - - - - - 766458f3 by Philipp Hörist at 2017-07-28T14:51:54+02:00 HistorySync: Connect to different event for counting This lets us better count how many messages we retrieved - - - - - 7 changed files: - gajim/chat_control.py - gajim/chat_control_base.py - gajim/common/connection.py - gajim/common/connection_handlers_events.py - gajim/common/zeroconf/connection_zeroconf.py - gajim/groupchat_control.py - gajim/history_sync.py Changes: ===================================== gajim/chat_control.py ===================================== --- a/gajim/chat_control.py +++ b/gajim/chat_control.py @@ -1187,7 +1187,7 @@ class ChatControl(ChatControlBase): gajim.nec.push_outgoing_event(MessageOutgoingEvent(None, account=self.account, jid=self.contact.jid, chatstate=state, - msg_id=contact.msg_log_id, control=self)) + control=self)) contact.our_chatstate = state if state == 'active': ===================================== gajim/chat_control_base.py ===================================== --- a/gajim/chat_control_base.py +++ b/gajim/chat_control_base.py @@ -732,7 +732,7 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): return label def send_message(self, message, keyID='', type_='chat', chatstate=None, - msg_id=None, resource=None, xhtml=None, callback=None, callback_args=None, + resource=None, xhtml=None, callback=None, callback_args=None, process_commands=True, attention=False): """ Send the given message to the active tab. Doesn't return None if error @@ -757,7 +757,7 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): label = self.get_seclabel() def _cb(obj, msg, cb, *cb_args): - self.last_sent_msg = obj.msg_id + self.last_sent_msg = obj.stanza_id if cb: cb(obj, msg, *cb_args) @@ -768,7 +768,7 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): gajim.nec.push_outgoing_event(MessageOutgoingEvent(None, account=self.account, jid=self.contact.jid, message=message, - keyID=keyID, type_=type_, chatstate=chatstate, msg_id=msg_id, + keyID=keyID, type_=type_, chatstate=chatstate, resource=resource, user_nick=self.user_nick, xhtml=xhtml, label=label, callback=_cb, callback_args=[callback] + callback_args, control=self, attention=attention, correct_id=correct_id, ===================================== gajim/common/connection.py ===================================== --- a/gajim/common/connection.py +++ b/gajim/common/connection.py @@ -317,8 +317,11 @@ class CommonConnection: msg_iq.setTag('replace', attrs={'id': obj.correct_id}, namespace=nbxmpp.NS_CORRECT) - if obj.msg_id: - msg_iq.setID(obj.msg_id) + # XEP-0359 + obj.stanza_id = self.connection.getAnID() + msg_iq.setID(obj.stanza_id) + if obj.message: + msg_iq.setOriginID(obj.stanza_id) if obj.form_node: msg_iq.addChild(node=obj.form_node) @@ -2056,12 +2059,12 @@ class Connection(CommonConnection, ConnectionHandlers): self.send_message(obj) def send_message(self, obj): - obj.msg_id = self.connection.send(obj.msg_iq, now=obj.now) + obj.stanza_id = self.connection.send(obj.msg_iq, now=obj.now) gajim.nec.push_incoming_event(MessageSentEvent( None, conn=self, jid=obj.jid, message=obj.message, keyID=obj.keyID, chatstate=obj.chatstate, automatic_message=obj.automatic_message, - msg_id=obj.msg_id, additional_data=obj.additional_data)) + stanza_id=obj.stanza_id, additional_data=obj.additional_data)) if obj.callback: obj.callback(obj, obj.msg_iq, *obj.callback_args) @@ -2628,6 +2631,11 @@ class Connection(CommonConnection, ConnectionHandlers): msg_iq = nbxmpp.Message(obj.jid, obj.message, typ='groupchat', xhtml=obj.xhtml) + obj.stanza_id = self.connection.getAnID() + msg_iq.setID(obj.stanza_id) + if obj.message: + msg_iq.setOriginID(obj.stanza_id) + if obj.correct_id: msg_iq.setTag('replace', attrs={'id': obj.correct_id}, namespace=nbxmpp.NS_CORRECT) @@ -2654,11 +2662,11 @@ class Connection(CommonConnection, ConnectionHandlers): self.send_gc_message(obj) def send_gc_message(self, obj): - obj.msg_id = self.connection.send(obj.msg_iq) + obj.stanza_id = self.connection.send(obj.msg_iq) gajim.nec.push_incoming_event(MessageSentEvent( None, conn=self, jid=obj.jid, message=obj.message, keyID=None, chatstate=None, automatic_message=obj.automatic_message, - msg_id=obj.msg_id, additional_data=obj.additional_data)) + stanza_id=obj.stanza_id, additional_data=obj.additional_data)) if obj.callback: obj.callback(obj) ===================================== gajim/common/connection_handlers_events.py ===================================== --- a/gajim/common/connection_handlers_events.py +++ b/gajim/common/connection_handlers_events.py @@ -1637,7 +1637,7 @@ class MessageSentEvent(nec.NetworkIncomingEvent): def generate(self): if not self.automatic_message: - self.conn.sent_message_ids.append(self.msg_id) + self.conn.sent_message_ids.append(self.stanza_id) # only record the last 20000 message ids (should be about 1MB [36 byte per uuid] # and about 24 hours if you send out a message every 5 seconds) self.conn.sent_message_ids = self.conn.sent_message_ids[-20000:] @@ -2709,7 +2709,7 @@ class MessageOutgoingEvent(nec.NetworkOutgoingEvent): self.type_ = 'chat' self.subject = '' self.chatstate = None - self.msg_id = None + self.stanza_id = None self.resource = None self.user_nick = None self.xhtml = None @@ -2762,6 +2762,7 @@ class GcMessageOutgoingEvent(nec.NetworkOutgoingEvent): self.message = '' self.chatstate = None self.xhtml = None + self.stanza_id = None self.label = None self.callback = None self.callback_args = [] ===================================== gajim/common/zeroconf/connection_zeroconf.py ===================================== --- a/gajim/common/zeroconf/connection_zeroconf.py +++ b/gajim/common/zeroconf/connection_zeroconf.py @@ -334,11 +334,11 @@ class ConnectionZeroconf(CommonConnection, ConnectionHandlersZeroconf): def _nec_stanza_message_outgoing(self, obj): - def on_send_ok(msg_id): + def on_send_ok(stanza_id): gajim.nec.push_incoming_event(MessageSentEvent(None, conn=self, jid=obj.jid, message=obj.message, keyID=obj.keyID, automatic_message=obj.automatic_message, chatstate=None, - msg_id=msg_id)) + stanza_id=stanza_id)) if obj.callback: obj.callback(obj.msg_iq, *obj.callback_args) ===================================== gajim/groupchat_control.py ===================================== --- a/gajim/groupchat_control.py +++ b/gajim/groupchat_control.py @@ -2042,7 +2042,7 @@ class GroupchatControl(ChatControlBase): def _cb(obj): # we'll save sent message text when we'll receive it in # _nec_gc_message_received - self.last_sent_msg = obj.msg_id + self.last_sent_msg = obj.stanza_id if self.correcting: self.correcting = False gtkgui_helpers.remove_css_class( ===================================== gajim/history_sync.py ===================================== --- a/gajim/history_sync.py +++ b/gajim/history_sync.py @@ -83,7 +83,7 @@ class HistorySyncAssistant(Gtk.Assistant): gajim.ged.register_event_handler('archiving-finished', ged.PRECORE, self._nec_archiving_finished) - gajim.ged.register_event_handler('mam-decrypted-message-received', + gajim.ged.register_event_handler('raw-mam-message-received', ged.PRECORE, self._nec_mam_message_received) @@ -167,7 +167,7 @@ class HistorySyncAssistant(Gtk.Assistant): gajim.ged.remove_event_handler('archiving-finished', ged.PRECORE, self._nec_archiving_finished) - gajim.ged.remove_event_handler('mam-decrypted-message-received', + gajim.ged.remove_event_handler('raw-mam-message-received', ged.PRECORE, self._nec_mam_message_received) del gajim.interface.instances[self.account]['history_sync'] @@ -179,7 +179,7 @@ class HistorySyncAssistant(Gtk.Assistant): if obj.conn.name != self.account: return - if obj.msg_obj.query_id != self.query_id: + if obj.result.getAttr('queryid') != self.query_id: return log.debug('received message') View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/8558a4365197ac582842c8a54c8500139…

1 0

[Git][gajim/gajim][xep-0319] correctly get autoaway config value
by Yann Leboulanger 28 Jul '17

28 Jul '17

Yann Leboulanger pushed to branch xep-0319 at gajim / gajim Commits: a5fa072f by Yann Leboulanger at 2017-07-28T14:42:23+02:00 correctly get autoaway config value send XEP-0319 idle tag to groupchat presences fix coming back from autoaway - - - - - 3 changed files: - gajim/common/connection.py - gajim/gui_interface.py - gajim/roster_window.py Changes: ===================================== gajim/common/connection.py ===================================== --- a/gajim/common/connection.py +++ b/gajim/common/connection.py @@ -634,10 +634,10 @@ class CommonConnection: idle_time = None if auto: global HAS_IDLE - if HAS_IDLE and gajim.config.get_per('accounts', self.name, - 'autoaway'): + if HAS_IDLE and gajim.config.get('autoaway'): idle_sec = int(self.sleeper.getIdleSec()) - idle_time = time.strftime('%Y-%m-%dT%H:%M:%SZ', time.gmtime(time.time() - idle_sec)) + idle_time = time.strftime('%Y-%m-%dT%H:%M:%SZ', + time.gmtime(time.time() - idle_sec)) gajim.nec.push_incoming_event(BeforeChangeShowEvent(None, conn=self, show=show, message=msg)) if was_invisible: @@ -2697,7 +2697,7 @@ class Connection(CommonConnection, ConnectionHandlers): destroy.setAttr('jid', jid) self.connection.send(iq) - def send_gc_status(self, nick, jid, show, status): + def send_gc_status(self, nick, jid, show, status, auto=False): if not gajim.account_is_connected(self.name): return if show == 'invisible': @@ -2716,6 +2716,14 @@ class Connection(CommonConnection, ConnectionHandlers): if gajim.config.get('send_sha_in_gc_presence') and show != 'offline': p = self.add_sha(p, ptype != 'unavailable') self.add_lang(p) + if auto: + global HAS_IDLE + if HAS_IDLE and gajim.config.get('autoaway'): + idle_sec = int(self.sleeper.getIdleSec()) + idle_time = time.strftime('%Y-%m-%dT%H:%M:%SZ', + time.gmtime(time.time() - idle_sec)) + idle = p.setTag('idle', namespace=nbxmpp.NS_IDLE) + idle.setAttr('since', idle_time) # send instantly so when we go offline, status is sent to gc before we # disconnect from jabber server self.connection.send(p) ===================================== gajim/gui_interface.py ===================================== --- a/gajim/gui_interface.py +++ b/gajim/gui_interface.py @@ -2262,10 +2262,10 @@ class Interface: gajim.status_before_autoaway[account] = '' gajim.sleeper_state[account] = 'off' elif state == sleepy.STATE_AWAY and gajim.config.get('autoaway'): - # we save out online status - gajim.status_before_autoaway[account] = \ - gajim.connections[account].status if gajim.sleeper_state[account] == 'online': + # we save out online status + gajim.status_before_autoaway[account] = \ + gajim.connections[account].status # we go away (no auto status) [we pass True to auto param] auto_message = gajim.config.get('autoaway_message') if not auto_message: @@ -2279,11 +2279,15 @@ class Interface: } self.roster.send_status(account, 'away', auto_message, auto=True) - if gajim.sleeper_state[account] == 'off': + gajim.sleeper_state[account] = 'autoaway' + elif gajim.sleeper_state[account] == 'off': + # we save out online status + gajim.status_before_autoaway[account] = \ + gajim.connections[account].status connected = gajim.connections[account].connected self.roster.send_status(account, gajim.SHOW_LIST[connected], gajim.status_before_autoaway[account], auto=True) - gajim.sleeper_state[account] = 'idle' + gajim.sleeper_state[account] = 'idle' elif state == sleepy.STATE_XA and \ gajim.sleeper_state[account] in ('online', 'autoaway', 'autoaway-forced') and gajim.config.get('autoxa'): ===================================== gajim/roster_window.py ===================================== --- a/gajim/roster_window.py +++ b/gajim/roster_window.py @@ -2191,7 +2191,8 @@ class RosterWindow: if gc_control.account == account: if gajim.gc_connected[account][gc_control.room_jid]: gajim.connections[account].send_gc_status( - gc_control.nick, gc_control.room_jid, status, txt) + gc_control.nick, gc_control.room_jid, status, txt, + auto=auto) if was_invisible and status != 'offline': # We come back from invisible, join bookmarks gajim.interface.auto_join_bookmarks(account) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/a5fa072f2b04fa834112ed468ad283cd3e…

1 0

[Git][gajim/python-nbxmpp][master] 2 commits: Update ChangeLog
by Philipp Hörist 28 Jul '17

28 Jul '17

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: ce2be452 by Philipp Hörist at 2017-07-28T14:32:00+02:00 Update ChangeLog - - - - - 958c4ff1 by Philipp Hörist at 2017-07-28T14:32:10+02:00 Add .gitignore - - - - - 2 changed files: - + .gitignore - ChangeLog Changes: ===================================== .gitignore ===================================== --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +build/ \ No newline at end of file ===================================== ChangeLog ===================================== --- a/ChangeLog +++ b/ChangeLog @@ -1,9 +1,14 @@ -python-nbxmpp 0.5.7 (26 Juli 2017) +python-nbxmpp 0.6.0 (tba) + * Add new getOriginID/SetOriginID method for Messages * Add new getJid() method for Protocol - * Return Protocol instances when using certain Node methods + * getTagAttr() accepts now a Namespace to filter + * Return Protocol/Message instance when using getTag() * Add new XEP Namespaces + Attention: + The API for getTag() changed in the way that it always returns a Protocol or Message instance now instead of a Node instance before. This means 'to' and 'from' attributes return now a JID instance instead of a string + python-nbxmpp 0.5.6 (03 June 2017) * Support XEP-0198 Version 1.5.2 View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/21b06c5d677f9fe61749fd34b…

1 0

[Git][gajim/python-nbxmpp][master] 2 commits: Improve setTagAttr/getTagAttr
by Philipp Hörist 28 Jul '17

28 Jul '17

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 7d4efe25 by Philipp Hörist at 2017-07-28T13:56:43+02:00 Improve setTagAttr/getTagAttr Make them except a namespace named argument - - - - - 21b06c5d by Philipp Hörist at 2017-07-28T13:56:53+02:00 Add setOriginID/getOriginID methods - - - - - 2 changed files: - nbxmpp/protocol.py - nbxmpp/simplexml.py Changes: ===================================== nbxmpp/protocol.py ===================================== --- a/nbxmpp/protocol.py +++ b/nbxmpp/protocol.py @@ -1034,6 +1034,12 @@ class Message(Protocol): """ return self.getTagData('thread') + def getOriginID(self): + """ + Return origin-id of the message + """ + return self.getTagAttr('origin-id', namespace=NS_SID, attr='id') + def setBody(self, val): """ Set the text of the message""" @@ -1071,6 +1077,12 @@ class Message(Protocol): """ self.setTagData('thread', val) + def setOriginID(self, val): + """ + Sets the origin-id of the message + """ + self.setTag('origin-id', namespace=NS_SID, attrs={'id': val}) + def buildReply(self, text=None): """ Builds and returns another message object with specified text. The to, ===================================== nbxmpp/simplexml.py ===================================== --- a/nbxmpp/simplexml.py +++ b/nbxmpp/simplexml.py @@ -331,13 +331,13 @@ class Node(object): """ return self.getTags(name, attrs, namespace, one=1) - def getTagAttr(self, tag, attr): + def getTagAttr(self, tag, attr, namespace=None): """ Return attribute value of the child with specified name (or None if no such attribute) """ try: - return self.getTag(tag).attrs[attr] + return self.getTag(tag, namespace=namespace).attrs[attr] except: return None @@ -445,15 +445,15 @@ class Node(object): else: return self.addChild(name, attrs, namespace=namespace) - def setTagAttr(self, tag, attr, val): + def setTagAttr(self, tag, attr, val, namespace=None): """ Create new node (if not already present) with name "tag" and set it's attribute "attr" to value "val" """ try: - self.getTag(tag).attrs[attr] = val + self.getTag(tag, namespace=namespace).attrs[attr] = val except Exception: - self.addChild(tag, attrs={attr: val}) + self.addChild(tag, namespace=namespace, attrs={attr: val}) def setTagData(self, tag, val, attrs=None): """ View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/d8e4ed3e7f198a03279f47aa0…

1 0

[Git][gajim/gajim][gajim_0.16] Stay compatible with future nbxmpp versions
by Philipp Hörist 28 Jul '17

28 Jul '17

Philipp Hörist pushed to branch gajim_0.16 at gajim / gajim Commits: 1c7fb74f by Philipp Hörist at 2017-07-28T13:41:51+02:00 Stay compatible with future nbxmpp versions - - - - - 2 changed files: - src/common/connection_handlers_events.py - src/common/helpers.py Changes: ===================================== src/common/connection_handlers_events.py ===================================== --- a/src/common/connection_handlers_events.py +++ b/src/common/connection_handlers_events.py @@ -1062,20 +1062,21 @@ class MamMessageReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): self.tim = localtime(timegm(tim)) to_ = self.msg_.getAttr('to') if to_: + to_ = str(to_) to_ = gajim.get_jid_without_resource(to_) else: to_ = gajim.get_jid_from_account(account) - frm_ = gajim.get_jid_without_resource(self.msg_.getAttr('from')) + frm_ = gajim.get_jid_without_resource(str(self.msg_.getAttr('from'))) self.msgtxt = self.msg_.getTagData('body') if to_ == gajim.get_jid_from_account(account): self.with_ = frm_ self.direction = 'from' self.resource = gajim.get_resource_from_jid( - self.msg_.getAttr('from')) + str(self.msg_.getAttr('from'))) else: self.with_ = to_ self.direction = 'to' - self.resource = gajim.get_resource_from_jid(self.msg_.getAttr('to')) + self.resource = gajim.get_resource_from_jid(to_) self.enc_tag = self.msg_.getTag('x', namespace=nbxmpp.NS_ENCRYPTED) return True ===================================== src/common/helpers.py ===================================== --- a/src/common/helpers.py +++ b/src/common/helpers.py @@ -112,7 +112,7 @@ def parse_jid(jidstring): """ # This function comes from http://svn.twistedmatrix.com/cvs/trunk/twisted/words/protocols/jabber/jid.py - return prep(*decompose_jid(jidstring)) + return prep(*decompose_jid(str(jidstring))) def idn_to_ascii(host): """ View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/1c7fb74f1080c64520ab9c9b6ec93f58c8…

1 0

[Git][gajim/python-nbxmpp][master] Fix new getTag method working with Python 2
by Philipp Hörist 28 Jul '17

28 Jul '17

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: d8e4ed3e by Philipp Hörist at 2017-07-28T11:17:14+02:00 Fix new getTag method working with Python 2 - - - - - 1 changed file: - nbxmpp/protocol.py Changes: ===================================== nbxmpp/protocol.py ===================================== --- a/nbxmpp/protocol.py +++ b/nbxmpp/protocol.py @@ -961,7 +961,7 @@ class Protocol(Node): """ Return at least a Protocol instance, so we dont fall back to simplexml level """ - tag = super().getTag(name, attrs, namespace) + tag = super(Protocol, self).getTag(name, attrs, namespace) if not tag: return None @@ -1098,7 +1098,7 @@ class Message(Protocol): """ Return Message instance, fallback to Protocol """ - tag = super().getTag(name, attrs, namespace) + tag = super(Message, self).getTag(name, attrs, namespace) if not tag: return tag View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/d8e4ed3e7f198a03279f47aa0b…

1 0

[Git][gajim/gajim][master] Update config setting description
by Philipp Hörist 27 Jul '17

27 Jul '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 8558a436 by Philipp Hörist at 2017-07-28T00:34:18+02:00 Update config setting description We dont use 0136 anymore - - - - - 1 changed file: - gajim/common/config.py Changes: ===================================== gajim/common/config.py ===================================== --- a/gajim/common/config.py +++ b/gajim/common/config.py @@ -365,7 +365,7 @@ class Config: 'custom_host': [ opt_str, '', '', True ], 'sync_with_global_status': [ opt_bool, False, ], 'no_log_for': [ opt_str, '', _('Space separated list of JIDs for which you do not want to store logs. You can also add account name to log nothing for this account.')], - 'sync_logs_with_server': [ opt_bool, True, _('On startup, Gajim will download logs stored on server, provided it supports XEP-0136 or XEP-0313')], + 'sync_logs_with_server': [ opt_bool, True, _('On startup, Gajim will download logs stored on server, provided the server supports XEP-0313')], 'allow_no_log_for': [ opt_str, '', _('Space separated list of JIDs for which you accept to not log conversations if he does not want to.')], 'non_minimized_gc': [ opt_str, '' ], 'attached_gpg_keys': [ opt_str, '' ], View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/8558a4365197ac582842c8a54c85001393…

1 0

[Git][gajim/gajim][master] Remove XEP-0136 support
by Philipp Hörist 27 Jul '17

27 Jul '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 9ff601d0 by Philipp Hörist at 2017-07-28T00:07:49+02:00 Remove XEP-0136 support - - - - - 12 changed files: - − data/gui/archiving_preferences_window.ui - − data/gui/item_archiving_preferences_window.ui - gajim/app_actions.py - gajim/chat_control.py - gajim/common/config.py - gajim/common/connection.py - gajim/common/connection_handlers.py - gajim/common/connection_handlers_events.py - gajim/common/message_archiving.py - gajim/dialogs.py - gajim/gui_interface.py - gajim/roster_window.py Changes: ===================================== data/gui/archiving_preferences_window.ui deleted ===================================== --- a/data/gui/archiving_preferences_window.ui +++ /dev/null @@ -1,322 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<interface> - <requires lib="gtk+" version="3.12"/> - <object class="GtkListStore" id="liststore1"> - <columns> -  - <column type="gchararray"/> - </columns> - <data> - <row> - <col id="0" translatable="yes">No</col> - </row> - <row> - <col id="0" translatable="yes">Yes</col> - </row> - </data> - </object> - <object class="GtkListStore" id="liststore2"> - <columns> -  - <column type="gchararray"/> - </columns> - <data> - <row> - <col id="0" translatable="yes">Prefer</col> - </row> - <row> - <col id="0" translatable="yes">Concede</col> - </row> - <row> - <col id="0" translatable="yes">Forbid</col> - </row> - </data> - </object> - <object class="GtkListStore" id="liststore3"> - <columns> -  - <column type="gchararray"/> - </columns> - <data> - <row> - <col id="0" translatable="yes">Prefer</col> - </row> - <row> - <col id="0" translatable="yes">Concede</col> - </row> - <row> - <col id="0" translatable="yes">Forbid</col> - </row> - </data> - </object> - <object class="GtkListStore" id="liststore4"> - <columns> -  - <column type="gchararray"/> - </columns> - <data> - <row> - <col id="0" translatable="yes">Prefer</col> - </row> - <row> - <col id="0" translatable="yes">Concede</col> - </row> - <row> - <col id="0" translatable="yes">Forbid</col> - </row> - </data> - </object> - <object class="GtkWindow" id="archiving_preferences_window"> - <property name="can_focus">False</property> - <property name="border_width">12</property> - <property name="type_hint">dialog</property> - <signal name="destroy" handler="on_archiving_preferences_window_destroy" swapped="no"/> - <child> - <object class="GtkBox" id="vbox1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <property name="spacing">6</property> - <child> - <object class="GtkGrid" id="grid1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="row_spacing">6</property> - <property name="column_spacing">6</property> - <child> - <object class="GtkLabel" id="label5"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Auto</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Method Auto</property> - <property name="use_markup">True</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label3"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Method Local</property> - <property name="use_markup">True</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label4"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Method Manual</property> - <property name="use_markup">True</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">3</property> - </packing> - </child> - <child> - <object class="GtkComboBox" id="auto_combobox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="model">liststore1</property> - <signal name="changed" handler="on_auto_combobox_changed" swapped="no"/> - <child> - <object class="GtkCellRendererText" id="cellrenderertext1"/> - <attributes> - <attribute name="text">0</attribute> - </attributes> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkComboBox" id="method_auto_combobox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="model">liststore2</property> - <signal name="changed" handler="on_method_foo_combobox_changed" swapped="no"/> - <child> - <object class="GtkCellRendererText" id="cellrenderertext2"/> - <attributes> - <attribute name="text">0</attribute> - </attributes> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkComboBox" id="method_local_combobox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="model">liststore3</property> - <signal name="changed" handler="on_method_foo_combobox_changed" swapped="no"/> - <child> - <object class="GtkCellRendererText" id="cellrenderertext3"/> - <attributes> - <attribute name="text">0</attribute> - </attributes> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> - <object class="GtkComboBox" id="method_manual_combobox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="model">liststore4</property> - <signal name="changed" handler="on_method_foo_combobox_changed" swapped="no"/> - <child> - <object class="GtkCellRendererText" id="cellrenderertext4"/> - <attributes> - <attribute name="text">0</attribute> - </attributes> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">3</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkScrolledWindow" id="scrolledwindow1"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <child> - <object class="GtkTreeView" id="item_treeview"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <signal name="cursor-changed" handler="on_item_treeview_cursor_changed" swapped="no"/> - <child internal-child="selection"> - <object class="GtkTreeSelection" id="treeview-selection"/> - </child> - </object> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkButtonBox" id="hbuttonbox2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="layout_style">spread</property> - <child> - <object class="GtkButton" id="add_button"> - <property name="label">gtk-add</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="use_stock">True</property> - <signal name="clicked" handler="on_add_item_button_clicked" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="remove_button"> - <property name="label">gtk-remove</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="use_stock">True</property> - <signal name="clicked" handler="on_remove_item_button_clicked" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkButton" id="edit_button"> - <property name="label">gtk-edit</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="use_stock">True</property> - <signal name="clicked" handler="on_edit_item_button_clicked" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">2</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> - <child> - <object class="GtkButtonBox" id="hbuttonbox1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="layout_style">end</property> - <child> - <object class="GtkButton" id="close_button"> - <property name="label">gtk-close</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="receives_default">False</property> - <property name="use_stock">True</property> - <signal name="clicked" handler="on_close_button_clicked" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">3</property> - </packing> - </child> - </object> - </child> - </object> -</interface> ===================================== data/gui/item_archiving_preferences_window.ui deleted ===================================== --- a/data/gui/item_archiving_preferences_window.ui +++ /dev/null @@ -1,244 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<interface> - <requires lib="gtk+" version="3.12"/> - <object class="GtkListStore" id="liststore1"> - <columns> -  - <column type="gchararray"/> - </columns> - <data> - <row> - <col id="0" translatable="yes">body</col> - </row> - <row> - <col id="0" translatable="yes">false</col> - </row> - <row> - <col id="0" translatable="yes">message</col> - </row> - <row> - <col id="0" translatable="yes">stream</col> - </row> - </data> - </object> - <object class="GtkListStore" id="liststore2"> - <columns> -  - <column type="gchararray"/> - </columns> - <data> - <row> - <col id="0" translatable="yes">approve</col> - </row> - <row> - <col id="0" translatable="yes">concede</col> - </row> - <row> - <col id="0" translatable="yes">forbid</col> - </row> - <row> - <col id="0" translatable="yes">oppose</col> - </row> - <row> - <col id="0" translatable="yes">prefer</col> - </row> - <row> - <col id="0" translatable="yes">require</col> - </row> - </data> - </object> - <object class="GtkWindow" id="item_archiving_preferences_window"> - <property name="can_focus">False</property> - <property name="border_width">12</property> - <property name="type_hint">dialog</property> - <signal name="destroy" handler="on_item_archiving_preferences_window_destroy" swapped="no"/> - <child> - <object class="GtkBox" id="vbox1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <property name="spacing">12</property> - <child> - <object class="GtkGrid" id="grid1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="row_spacing">6</property> - <property name="column_spacing">6</property> - <child> - <object class="GtkLabel" id="label1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">jid</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label8"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">expire</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label9"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">otr</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label10"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">save</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">3</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="jid_entry"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="invisible_char">•</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="expire_entry"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="invisible_char">•</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkComboBox" id="otr_combobox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="model">liststore2</property> - <signal name="changed" handler="on_otr_combobox_changed" swapped="no"/> - <child> - <object class="GtkCellRendererText" id="cellrenderertext2"/> - <attributes> - <attribute name="text">0</attribute> - </attributes> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> - <object class="GtkComboBox" id="save_combobox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="model">liststore1</property> - <child> - <object class="GtkCellRendererText" id="cellrenderertext1"/> - <attributes> - <attribute name="text">0</attribute> - </attributes> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">3</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkBox" id="hbox1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="GtkProgressBar" id="progressbar"> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkButtonBox" id="hbuttonbox1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="layout_style">end</property> - <child> - <object class="GtkButton" id="cancel_button"> - <property name="label">gtk-cancel</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="use_stock">True</property> - <signal name="clicked" handler="on_cancel_button_clicked" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="ok_button"> - <property name="label">gtk-ok</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="use_stock">True</property> - <signal name="clicked" handler="on_ok_button_clicked" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - </child> - </object> -</interface> ===================================== gajim/app_actions.py ===================================== --- a/gajim/app_actions.py +++ b/gajim/app_actions.py @@ -145,12 +145,8 @@ class AppActions(): gajim.interface.instances[account]['archiving_preferences'].window.\ present() else: - if gajim.connections[account].archiving_313_supported: - gajim.interface.instances[account]['archiving_preferences'] = \ - dialogs.Archiving313PreferencesWindow(account) - else: - gajim.interface.instances[account]['archiving_preferences'] = \ - dialogs.ArchivingPreferencesWindow(account) + gajim.interface.instances[account]['archiving_preferences'] = \ + dialogs.Archiving313PreferencesWindow(account) def on_history_sync(self, action, param): account = param.get_string() ===================================== gajim/chat_control.py ===================================== --- a/gajim/chat_control.py +++ b/gajim/chat_control.py @@ -1399,9 +1399,6 @@ class ChatControl(ChatControlBase): if textbuffer.get_char_count() and self.encryption: gajim.plugin_manager.extension_point( 'typing' + self.encryption, self) - if (not self.session or not self.session.status) and \ - gajim.connections[self.account].archiving_136_supported: - self.begin_archiving_negotiation() def restore_conversation(self): jid = self.contact.jid @@ -1622,10 +1619,6 @@ class ChatControl(ChatControlBase): self.session.resource = self.contact.resource self.session.negotiate_e2e(False) - def begin_archiving_negotiation(self): - self.begin_negotiation() - self.session.negotiate_archiving() - def _nec_failed_decrypt(self, obj): if obj.session != self.session: return ===================================== gajim/common/config.py ===================================== --- a/gajim/common/config.py +++ b/gajim/common/config.py @@ -411,7 +411,6 @@ class Config: 'send_idle_time': [ opt_bool, True ], 'roster_version': [opt_str, ''], 'subscription_request_msg': [opt_str, '', _('Message that is sent to contacts you want to add')], - 'last_archiving_time': [opt_str, '1970-01-01T00:00:00Z', _('Last time we syncronized with logs from server.')], 'enable_message_carbons': [ opt_bool, True, _('If enabled and if server supports this feature, Gajim will receive messages sent and received by other resources.')], 'ft_send_local_ips': [ opt_bool, True, _('If enabled, Gajim will send your local IPs so your contact can connect to your machine to transfer files.')], 'oauth2_refresh_token': [ opt_str, '', _('Latest token for OAuth 2.0 authentication.')], ===================================== gajim/common/connection.py ===================================== --- a/gajim/common/connection.py +++ b/gajim/common/connection.py @@ -166,8 +166,6 @@ class CommonConnection: self.archiving_namespace = None self.archiving_supported = False self.archiving_313_supported = False - self.archiving_136_supported = False - self.archive_pref_supported = False self.roster_supported = True self.blocking_supported = False self.addressing_supported = False @@ -1947,18 +1945,6 @@ class Connection(CommonConnection, ConnectionHandlers): # Remove stored bookmarks accessible to everyone. self.send_pb_purge(our_jid, 'storage:bookmarks') self.send_pb_delete(our_jid, 'storage:bookmarks') - if nbxmpp.NS_ARCHIVE in obj.features: - self.archiving_supported = True - self.archiving_136_supported = True - self.request_message_archiving_preferences() - if nbxmpp.NS_ARCHIVE_AUTO in obj.features: - self.archive_auto_supported = True - if nbxmpp.NS_ARCHIVE_MANAGE in obj.features: - self.archive_manage_supported = True - if nbxmpp.NS_ARCHIVE_MANUAL in obj.features: - self.archive_manual_supported = True - if nbxmpp.NS_ARCHIVE_PREF in obj.features: - self.archive_pref_supported = True if nbxmpp.NS_BLOCKING in obj.features: self.blocking_supported = True if nbxmpp.NS_ADDRESS in obj.features: ===================================== gajim/common/connection_handlers.py ===================================== --- a/gajim/common/connection_handlers.py +++ b/gajim/common/connection_handlers.py @@ -52,7 +52,6 @@ from common.pubsub import ConnectionPubSub from common.protocol.caps import ConnectionCaps from common.protocol.bytestream import ConnectionSocks5Bytestream from common.protocol.bytestream import ConnectionIBBytestream -from common.message_archiving import ConnectionArchive136 from common.message_archiving import ConnectionArchive313 from common.connection_handlers_events import * @@ -1324,13 +1323,12 @@ class ConnectionHandlersBase: return sess -class ConnectionHandlers(ConnectionArchive136, ConnectionArchive313, +class ConnectionHandlers(ConnectionArchive313, ConnectionVcard, ConnectionSocks5Bytestream, ConnectionDisco, ConnectionCommands, ConnectionPubSub, ConnectionPEP, ConnectionCaps, ConnectionHandlersBase, ConnectionJingle, ConnectionIBBytestream): def __init__(self): global HAS_IDLE - ConnectionArchive136.__init__(self) ConnectionArchive313.__init__(self) ConnectionVcard.__init__(self) ConnectionSocks5Bytestream.__init__(self) @@ -1386,8 +1384,6 @@ ConnectionHandlersBase, ConnectionJingle, ConnectionIBBytestream): gajim.nec.register_incoming_event(MessageReceivedEvent) gajim.nec.register_incoming_event(ArchivingErrorReceivedEvent) gajim.nec.register_incoming_event( - ArchivingPreferencesChangedReceivedEvent) - gajim.nec.register_incoming_event( Archiving313PreferencesChangedReceivedEvent) gajim.nec.register_incoming_event( ArchivingFinishedLegacyReceivedEvent) @@ -1439,7 +1435,6 @@ ConnectionHandlersBase, ConnectionJingle, ConnectionIBBytestream): def cleanup(self): ConnectionHandlersBase.cleanup(self) ConnectionCaps.cleanup(self) - ConnectionArchive136.cleanup(self) ConnectionArchive313.cleanup(self) ConnectionPubSub.cleanup(self) gajim.ged.remove_event_handler('http-auth-received', ged.CORE, @@ -2272,7 +2267,6 @@ ConnectionHandlersBase, ConnectionJingle, ConnectionIBBytestream): con.RegisterHandler('iq', self._IqPingCB, 'get', nbxmpp.NS_PING) con.RegisterHandler('iq', self._SearchCB, 'result', nbxmpp.NS_SEARCH) con.RegisterHandler('iq', self._PrivacySetCB, 'set', nbxmpp.NS_PRIVACY) - con.RegisterHandler('iq', self._ArchiveCB, ns=nbxmpp.NS_ARCHIVE) con.RegisterHandler('iq', self._ArchiveCB, ns=nbxmpp.NS_MAM) con.RegisterHandler('iq', self._ArchiveCB, ns=nbxmpp.NS_MAM_1) con.RegisterHandler('iq', self._ArchiveCB, ns=nbxmpp.NS_MAM_2) ===================================== gajim/common/connection_handlers_events.py ===================================== --- a/gajim/common/connection_handlers_events.py +++ b/gajim/common/connection_handlers_events.py @@ -1736,59 +1736,6 @@ class ArchivingErrorReceivedEvent(nec.NetworkIncomingEvent): self.error_msg = self.stanza.getErrorMsg() return True -class ArchivingPreferencesChangedReceivedEvent(nec.NetworkIncomingEvent): - name = 'archiving-preferences-changed-received' - base_network_events = ['archiving-received'] - - def generate(self): - self.conn = self.base_event.conn - self.stanza = self.base_event.stanza - self.type_ = self.base_event.type_ - - if self.type_ not in ('result', 'set'): - return - - self.conf = {} - self.new_items = {} - self.removed_items = [] - pref = self.stanza.getTag('pref', namespace=nbxmpp.NS_ARCHIVE) - if pref: - if pref.getTag('auto'): - self.conf['auto'] = pref.getTagAttr('auto', 'save') - - method_auto = pref.getTag('method', attrs={'type': 'auto'}) - if method_auto: - self.conf['method_auto'] = method_auto.getAttr('use') - - method_local = pref.getTag('method', attrs={'type': 'local'}) - if method_local: - self.conf['method_local'] = method_local.getAttr('use') - - method_manual = pref.getTag('method', attrs={'type': 'manual'}) - if method_manual: - self.conf['method_manual'] = method_manual.getAttr('use') - - default = pref.getTag('default') - if default: - self.conf['default'] = { - 'expire': default.getAttr('expire'), - 'otr': default.getAttr('otr'), - 'save': default.getAttr('save'), - 'unset': default.getAttr('unset')} - - for item in pref.getTags('item'): - self.new_items[item.getAttr('jid')] = { - 'expire': item.getAttr('expire'), - 'otr': item.getAttr('otr'), - 'save': item.getAttr('save')} - - elif self.stanza.getTag('itemremove'): - for item in pref.getTags('item'): - self.removed_items.append(item.getAttr('jid')) - else: - return - return True - class Archiving313PreferencesChangedReceivedEvent(nec.NetworkIncomingEvent): name = 'archiving-313-preferences-changed-received' base_network_events = ['archiving-received'] ===================================== gajim/common/message_archiving.py ===================================== --- a/gajim/common/message_archiving.py +++ b/gajim/common/message_archiving.py @@ -18,31 +18,20 @@ ## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## +import logging +from datetime import datetime, timedelta + import nbxmpp + from common import gajim from common import ged -from common import helpers import common.connection_handlers_events as ev -from calendar import timegm -from time import localtime -from datetime import datetime, timedelta - -import logging log = logging.getLogger('gajim.c.message_archiving') -ARCHIVING_COLLECTIONS_ARRIVED = 'archiving_collections_arrived' -ARCHIVING_COLLECTION_ARRIVED = 'archiving_collection_arrived' -ARCHIVING_MODIFICATIONS_ARRIVED = 'archiving_modifications_arrived' -class ConnectionArchive: +class ConnectionArchive313: def __init__(self): - pass - - -class ConnectionArchive313(ConnectionArchive): - def __init__(self): - ConnectionArchive.__init__(self) self.archiving_313_supported = False self.mam_awaiting_disco_result = {} self.iq_answer = [] @@ -211,281 +200,7 @@ class ConnectionArchive313(ConnectionArchive): never.addChild(name='jid').setData(jid) self.connection.send(iq) -class ConnectionArchive136(ConnectionArchive): - def __init__(self): - ConnectionArchive.__init__(self) - self.archiving_136_supported = False - self.archive_auto_supported = False - self.archive_manage_supported = False - self.archive_manual_supported = False - self.archive_pref_supported = False - self.auto = None - self.method_auto = None - self.method_local = None - self.method_manual = None - self.default = None - self.items = {} - gajim.ged.register_event_handler( - 'archiving-preferences-changed-received', ged.CORE, - self._nec_archiving_changed_received) - gajim.ged.register_event_handler('raw-iq-received', ged.CORE, - self._nec_raw_iq_136_received) - - def cleanup(self): - gajim.ged.remove_event_handler( - 'archiving-preferences-changed-received', ged.CORE, - self._nec_archiving_changed_received) - gajim.ged.remove_event_handler('raw-iq-received', ged.CORE, - self._nec_raw_iq_136_received) - - def _nec_raw_iq_136_received(self, obj): - if obj.conn.name != self.name: - return - - id_ = obj.stanza.getID() - if id_ not in self.awaiting_answers: - return - - if self.awaiting_answers[id_][0] == ARCHIVING_COLLECTIONS_ARRIVED: - del self.awaiting_answers[id_] - # TODO - print('ARCHIVING_COLLECTIONS_ARRIVED') - - elif self.awaiting_answers[id_][0] == ARCHIVING_COLLECTION_ARRIVED: - def save_if_not_exists(with_, nick, direction, tim, payload): - assert len(payload) == 1, 'got several archiving messages in' +\ - ' the same time %s' % ''.join(payload) - if payload[0].getName() == 'body': - gajim.logger.save_if_not_exists(with_, direction, tim, - msg=payload[0].getData(), nick=nick) - elif payload[0].getName() == 'message': - print('Not implemented') - chat = obj.stanza.getTag('chat') - if chat: - with_ = chat.getAttr('with') - start_ = chat.getAttr('start') - tim = helpers.datetime_tuple(start_) - tim = timegm(tim) - nb = 0 - for element in chat.getChildren(): - try: - secs = int(element.getAttr('secs')) - except TypeError: - secs = 0 - if secs: - tim += secs - nick = element.getAttr('name') - if element.getName() == 'from': - save_if_not_exists(with_, nick, 'from', localtime(tim), - element.getPayload()) - nb += 1 - if element.getName() == 'to': - save_if_not_exists(with_, nick, 'to', localtime(tim), - element.getPayload()) - nb += 1 - set_ = chat.getTag('set') - first = set_.getTag('first') - if first: - try: - index = int(first.getAttr('index')) - except TypeError: - index = 0 - try: - count = int(set_.getTagData('count')) - except TypeError: - count = 0 - if count > index + nb: - # Request the next page - after = element.getTagData('last') - self.request_collection_page(with_, start_, after=after) - del self.awaiting_answers[id_] - - elif self.awaiting_answers[id_][0] == ARCHIVING_MODIFICATIONS_ARRIVED: - modified = obj.stanza.getTag('modified') - if modified: - for element in modified.getChildren(): - if element.getName() == 'changed': - with_ = element.getAttr('with') - start_ = element.getAttr('start') - self.request_collection_page(with_, start_) - #elif element.getName() == 'removed': - # do nothing - del self.awaiting_answers[id_] - - def request_message_archiving_preferences(self): - iq_ = nbxmpp.Iq('get') - iq_.setTag('pref', namespace=nbxmpp.NS_ARCHIVE) - self.connection.send(iq_) - - def set_pref(self, name, **data): - ''' - data contains names and values of pref name attributes. - ''' - iq_ = nbxmpp.Iq('set') - pref = iq_.setTag('pref', namespace=nbxmpp.NS_ARCHIVE) - tag = pref.setTag(name) - for key, value in data.items(): - if value is not None: - tag.setAttr(key, value) - self.connection.send(iq_) - - def set_auto(self, save): - self.set_pref('auto', save=save) - - def set_method(self, type, use): - self.set_pref('method', type=type, use=use) - - def set_default(self, otr, save, expire=None): - self.set_pref('default', otr=otr, save=save, expire=expire) - - def append_or_update_item(self, jid, otr, save, expire): - self.set_pref('item', jid=jid, otr=otr, save=save) - - def remove_item(self, jid): - iq_ = nbxmpp.Iq('set') - itemremove = iq_.setTag('itemremove', namespace=nbxmpp.NS_ARCHIVE) - item = itemremove.setTag('item') - item.setAttr('jid', jid) - self.connection.send(iq_) - - def stop_archiving_session(self, thread_id): - iq_ = nbxmpp.Iq('set') - pref = iq_.setTag('pref', namespace=nbxmpp.NS_ARCHIVE) - session = pref.setTag('session', attrs={'thread': thread_id, - 'save': 'false', 'otr': 'concede'}) - self.connection.send(iq_) - - def get_item_pref(self, jid): - jid = nbxmpp.JID(jid) - if str(jid) in self.items: - return self.items[jid] - - if jid.getStripped() in self.items: - return self.items[jid.getStripped()] - - if jid.getDomain() in self.items: - return self.items[jid.getDomain()] - - return self.default - - def logging_preference(self, jid, initiator_options=None): - otr = self.get_item_pref(jid) - if not otr: - return - otr = otr['otr'] - if initiator_options: - if ((initiator_options == ['mustnot'] and otr == 'forbid') or - (initiator_options == ['may'] and otr == 'require')): - return None - - if (initiator_options == ['mustnot'] or - (initiator_options[0] == 'mustnot' and - otr not in ('opppose', 'forbid')) or - (initiator_options == ['may', 'mustnot'] and - otr in ('require', 'prefer'))): - return 'mustnot' - - return 'may' - - if otr == 'require': - return ['mustnot'] - - if otr in ('prefer', 'approve'): - return ['mustnot', 'may'] - - if otr in ('concede', 'oppose'): - return ['may', 'mustnot'] - - # otr == 'forbid' - return ['may'] - def _ArchiveCB(self, con, iq_obj): gajim.nec.push_incoming_event(ev.ArchivingReceivedEvent(None, conn=self, stanza=iq_obj)) raise nbxmpp.NodeProcessed - - def _nec_archiving_changed_received(self, obj): - if obj.conn.name != self.name: - return - for key in ('auto', 'default'): - if key not in obj.conf: - self.archiving_136_supported = False - self.archive_auto_supported = False - self.archive_manage_supported = False - self.archive_manual_supported = False - self.archive_pref_supported = False - return True - for key in ('auto', 'method_auto', 'method_local', 'method_manual', - 'default'): - if key in obj.conf: - self.__dict__[key] = obj.conf[key] - - for jid, pref in obj.new_items.items(): - self.items[jid] = pref - - for jid in obj.removed_items: - del self.items[jid] - - def request_collections_list_page(self, with_='', start=None, end=None, - after=None, max=30, exact_match=False): - iq_ = nbxmpp.Iq('get') - list_ = iq_.setTag('list', namespace=nbxmpp.NS_ARCHIVE) - if with_: - list_.setAttr('with', with_) - if exact_match: - list_.setAttr('exactmatch', 'true') - if start: - list_.setAttr('start', start) - if end: - list_.setAttr('end', end) - set_ = list_.setTag('set', namespace=nbxmpp.NS_RSM) - set_.setTagData('max', max) - if after: - set_.setTagData('after', after) - id_ = self.connection.getAnID() - iq_.setID(id_) - self.awaiting_answers[id_] = (ARCHIVING_COLLECTIONS_ARRIVED, ) - self.connection.send(iq_) - - def request_collection_page(self, with_, start, end=None, after=None, - max=30, exact_match=False): - iq_ = nbxmpp.Iq('get') - retrieve = iq_.setTag('retrieve', namespace=nbxmpp.NS_ARCHIVE, - attrs={'with': with_, 'start': start}) - if exact_match: - retrieve.setAttr('exactmatch', 'true') - set_ = retrieve.setTag('set', namespace=nbxmpp.NS_RSM) - set_.setTagData('max', max) - if after: - set_.setTagData('after', after) - id_ = self.connection.getAnID() - iq_.setID(id_) - self.awaiting_answers[id_] = (ARCHIVING_COLLECTION_ARRIVED, ) - self.connection.send(iq_) - - def remove_collection(self, with_='', start=None, end=None, - exact_match=False, open=False): - iq_ = nbxmpp.Iq('set') - remove = iq_.setTag('remove', namespace=nbxmpp.NS_ARCHIVE) - if with_: - remove.setAttr('with', with_) - if exact_match: - remove.setAttr('exactmatch', 'true') - if start: - remove.setAttr('start', start) - if end: - remove.setAttr('end', end) - if open: - remove.setAttr('open', 'true') - self.connection.send(iq_) - - def request_modifications_page(self, start, max=30): - iq_ = nbxmpp.Iq('get') - moified = iq_.setTag('modified', namespace=nbxmpp.NS_ARCHIVE, - attrs={'start': start}) - set_ = moified.setTag('set', namespace=nbxmpp.NS_RSM) - set_.setTagData('max', max) - id_ = self.connection.getAnID() - iq_.setID(id_) - self.awaiting_answers[id_] = (ARCHIVING_MODIFICATIONS_ARRIVED, ) - self.connection.send(iq_) ===================================== gajim/dialogs.py ===================================== --- a/gajim/dialogs.py +++ b/gajim/dialogs.py @@ -3751,369 +3751,6 @@ class RosterItemExchangeWindow: self.window.destroy() -class ItemArchivingPreferencesWindow: - otr_name = ('approve', 'concede', 'forbid', 'oppose', 'prefer', 'require') - otr_index = dict([(j, i) for i, j in enumerate(otr_name)]) - save_name = ('body', 'false', 'message', 'stream') - save_index = dict([(j, i) for i, j in enumerate(save_name)]) - - def __init__(self, account, item): - self.account = account - self.item = item - if self.item and self.item != 'Default': - self.item_config = gajim.connections[self.account].items[self.item] - else: - self.item_config = gajim.connections[self.account].default - self.waiting = None - - # Connect to gtk builder - self.xml = gtkgui_helpers.get_gtk_builder( - 'item_archiving_preferences_window.ui') - self.window = self.xml.get_object('item_archiving_preferences_window') - - # Add Widgets - for widget_to_add in ('jid_entry', 'expire_entry', 'otr_combobox', - 'save_combobox', 'cancel_button', 'ok_button', 'progressbar'): - self.__dict__[widget_to_add] = self.xml.get_object(widget_to_add) - - if self.item: - self.jid_entry.set_text(self.item) - expire_value = self.item_config['expire'] or '' - self.otr_combobox.set_active(self.otr_index[self.item_config['otr']]) - self.save_combobox.set_active( - self.save_index[self.item_config['save']]) - self.expire_entry.set_text(expire_value) - - self.window.set_title(_('Archiving Preferences for %s') % self.account) - - self.window.show_all() - self.progressbar.hide() - self.xml.connect_signals(self) - - def update_progressbar(self): - if self.waiting: - self.progressbar.pulse() - return True - return False - - def on_otr_combobox_changed(self, widget): - otr = self.otr_name[self.otr_combobox.get_active()] - if otr == 'require': - self.save_combobox.set_active(self.save_index['false']) - - def on_ok_button_clicked(self, widget): - # Return directly if operation in progress - if self.waiting: - return - - item = self.jid_entry.get_text() - otr = self.otr_name[self.otr_combobox.get_active()] - save = self.save_name[self.save_combobox.get_active()] - expire = self.expire_entry.get_text() - - if self.item != 'Default': - try: - item = helpers.parse_jid(item) - except helpers.InvalidFormat as s: - pritext = _('Invalid User ID') - ErrorDialog(pritext, str(s)) - return - - if expire: - try: - if int(expire) < 0 or str(int(expire)) != expire: - raise ValueError - except ValueError: - pritext = _('Invalid expire value') - sectext = _('Expire must be a valid positive integer.') - ErrorDialog(pritext, sectext) - return - - if not (item == self.item and expire == self.item_config['expire'] and - otr == self.item_config['otr'] and save == self.item_config['save']): - if not self.item or self.item == item: - if self.item == 'Default': - self.waiting = 'default' - gajim.connections[self.account].set_default( - otr, save, expire) - else: - self.waiting = 'item' - gajim.connections[self.account].append_or_update_item( - item, otr, save, expire) - else: - self.waiting = 'item' - gajim.connections[self.account].append_or_update_item( - item, otr, save, expire) - gajim.connections[self.account].remove_item(self.item) - self.launch_progressbar() - #self.window.destroy() - - def on_cancel_button_clicked(self, widget): - self.window.destroy() - - def on_item_archiving_preferences_window_destroy(self, widget): - if self.item: - key_name = 'edit_item_archiving_preferences_%s' % self.item - else: - key_name = 'new_item_archiving_preferences' - if key_name in gajim.interface.instances[self.account]: - del gajim.interface.instances[self.account][key_name] - - def launch_progressbar(self): - self.progressbar.show() - self.update_progressbar_timeout_id = GLib.timeout_add(100, - self.update_progressbar) - - def response_arrived(self, data): - if self.waiting: - self.window.destroy() - - def error_arrived(self, error): - if self.waiting: - self.waiting = None - self.progressbar.hide() - pritext = _('There is an error with the form') - sectext = error - ErrorDialog(pritext, sectext) - - -class ArchivingPreferencesWindow: - auto_name = ('false', 'true') - auto_index = dict([(j, i) for i, j in enumerate(auto_name)]) - method_foo_name = ('prefer', 'concede', 'forbid') - method_foo_index = dict([(j, i) for i, j in enumerate(method_foo_name)]) - - def __init__(self, account): - self.account = account - self.waiting = [] - - # Connect to glade - self.xml = gtkgui_helpers.get_gtk_builder( - 'archiving_preferences_window.ui') - self.window = self.xml.get_object('archiving_preferences_window') - - # Add Widgets - for widget_to_add in ('auto_combobox', 'method_auto_combobox', - 'method_local_combobox', 'method_manual_combobox', 'close_button', - 'item_treeview', 'item_notebook', 'otr_combobox', 'save_combobox', - 'expire_entry', 'remove_button', 'edit_button'): - self.__dict__[widget_to_add] = self.xml.get_object(widget_to_add) - - self.auto_combobox.set_active( - self.auto_index[gajim.connections[self.account].auto]) - self.method_auto_combobox.set_active( - self.method_foo_index[gajim.connections[self.account].method_auto]) - self.method_local_combobox.set_active( - self.method_foo_index[gajim.connections[self.account].method_local]) - self.method_manual_combobox.set_active( - self.method_foo_index[gajim.connections[self.account].\ - method_manual]) - - model = Gtk.ListStore(str, str, str, str) - self.item_treeview.set_model(model) - col = Gtk.TreeViewColumn('jid') - self.item_treeview.append_column(col) - renderer = Gtk.CellRendererText() - col.pack_start(renderer, True, True, 0) - col.set_attributes(renderer, text=0) - - col = Gtk.TreeViewColumn('expire') - col.pack_start(renderer, True, True, 0) - col.set_attributes(renderer, text=1) - self.item_treeview.append_column(col) - - col = Gtk.TreeViewColumn('otr') - col.pack_start(renderer, True, True, 0) - col.set_attributes(renderer, text=2) - self.item_treeview.append_column(col) - - col = Gtk.TreeViewColumn('save') - col.pack_start(renderer, True, True, 0) - col.set_attributes(renderer, text=3) - self.item_treeview.append_column(col) - - self.fill_items() - - self.current_item = None - - def sort_items(model, iter1, iter2, data=None): - item1 = model.get_value(iter1, 0) - item2 = model.get_value(iter2, 0) - if item1 == 'Default': - return -1 - if item2 == 'Default': - return 1 - if '@' in item1: - if '@' not in item2: - return 1 - elif '@' in item2: - return -1 - if item1 < item2: - return -1 - if item1 > item2: - return 1 - # item1 == item2 ? WTF? - return 0 - - model.set_sort_column_id(0, Gtk.SortType.ASCENDING) - model.set_sort_func(0, sort_items) - - self.remove_button.set_sensitive(False) - self.edit_button.set_sensitive(False) - - self.window.set_title(_('Archiving Preferences for %s') % self.account) - - gajim.ged.register_event_handler( - 'archiving-preferences-changed-received', ged.GUI1, - self._nec_archiving_changed_received) - gajim.ged.register_event_handler('archiving-error-received', ged.GUI1, - self._nec_archiving_error) - - self.window.show_all() - - self.xml.connect_signals(self) - - def on_add_item_button_clicked(self, widget): - key_name = 'new_item_archiving_preferences' - if key_name in gajim.interface.instances[self.account]: - gajim.interface.instances[self.account][key_name].window.present() - else: - gajim.interface.instances[self.account][key_name] = \ - ItemArchivingPreferencesWindow(self.account, '') - - def on_remove_item_button_clicked(self, widget): - if not self.current_item: - return - - self.waiting.append('itemremove') - sel = self.item_treeview.get_selection() - (model, iter_) = sel.get_selected() - gajim.connections[self.account].remove_item(model[iter_][0]) - model.remove(iter_) - self.remove_button.set_sensitive(False) - self.edit_button.set_sensitive(False) - - def on_edit_item_button_clicked(self, widget): - if not self.current_item: - return - - key_name = 'edit_item_archiving_preferences_%s' % self.current_item - if key_name in gajim.interface.instances[self.account]: - gajim.interface.instances[self.account][key_name].window.present() - else: - gajim.interface.instances[self.account][key_name] = \ - ItemArchivingPreferencesWindow(self.account, self.current_item) - - def on_item_treeview_cursor_changed(self, widget): - sel = self.item_treeview.get_selection() - (model, iter_) = sel.get_selected() - item = None - if iter_: - item = model[iter_][0] - if self.current_item and self.current_item == item: - return - - self.current_item = item - if self.current_item == 'Default': - self.remove_button.set_sensitive(False) - self.edit_button.set_sensitive(True) - elif self.current_item: - self.remove_button.set_sensitive(True) - self.edit_button.set_sensitive(True) - else: - self.remove_button.set_sensitive(False) - self.edit_button.set_sensitive(False) - - def on_auto_combobox_changed(self, widget): - save = self.auto_name[widget.get_active()] - gajim.connections[self.account].set_auto(save) - - def on_method_foo_combobox_changed(self, widget): - # We retrieve method type from widget name - # ('foo' in 'method_foo_combobox') - method_type = widget.name.split('_')[1] - use = self.method_foo_name[widget.get_active()] - self.waiting.append('method_%s' % method_type) - gajim.connections[self.account].set_method(method_type, use) - - def get_child_window(self): - edit_key_name = 'edit_item_archiving_preferences_%s' % self.current_item - new_key_name = 'new_item_archiving_preferences' - - if edit_key_name in gajim.interface.instances[self.account]: - return gajim.interface.instances[self.account][edit_key_name] - - if new_key_name in gajim.interface.instances[self.account]: - return gajim.interface.instances[self.account][new_key_name] - - def _nec_archiving_changed_received(self, obj): - if obj.conn.name != self.account: - return - for key in ('auto', 'method_auto', 'method_local', 'method_manual'): - if key in obj.conf and key in self.waiting: - self.waiting.remove(key) - if 'default' in obj.conf: - key_name = 'edit_item_archiving_preferences_%s' % \ - self.current_item - if key_name in gajim.interface.instances[self.account]: - gajim.interface.instances[self.account][key_name].\ - response_arrived(obj.conf['default']) - self.fill_items(True) - for jid, pref in obj.new_items.items(): - child = self.get_child_window() - if child: - is_new = not child.item - child.response_arrived(pref) - if is_new: - model = self.item_treeview.get_model() - model.append((jid, pref['expire'], pref['otr'], - pref['save'])) - continue - self.fill_items(True) - if 'itemremove' in self.waiting and obj.removed_items: - self.waiting.remove('itemremove') - self.fill_items(True) - - def fill_items(self, clear=False): - model = self.item_treeview.get_model() - if clear: - model.clear() - default_config = gajim.connections[self.account].default - expire_value = default_config['expire'] or '' - model.append(('Default', expire_value, - default_config['otr'], default_config['save'])) - for item, item_config in \ - gajim.connections[self.account].items.items(): - expire_value = item_config['expire'] or '' - model.append((item, expire_value, item_config['otr'], - item_config['save'])) - - def _nec_archiving_error(self, obj): - if obj.conn.name != self.account: - return - if self.waiting: - pritext = _('There is an error') - sectext = obj.error_msg - ErrorDialog(pritext, sectext) - self.waiting.pop() - else: - child = self.get_child_window() - if child: - child.error_arrived(obj.error_msg) - - def on_close_button_clicked(self, widget): - self.window.destroy() - - def on_archiving_preferences_window_destroy(self, widget): - gajim.ged.remove_event_handler( - 'archiving-preferences-changed-received', ged.GUI1, - self._nec_archiving_changed_received) - gajim.ged.remove_event_handler('archiving-error-received', ged.GUI1, - self._nec_archiving_error) - if 'archiving_preferences' in gajim.interface.instances[self.account]: - del gajim.interface.instances[self.account]['archiving_preferences'] - - class Archiving313PreferencesWindow: default_dict = {'always': 0, 'roster': 1, 'never': 2} ===================================== gajim/gui_interface.py ===================================== --- a/gajim/gui_interface.py +++ b/gajim/gui_interface.py @@ -1178,13 +1178,6 @@ class Interface: # Else disable autoaway gajim.sleeper_state[account] = 'off' - if obj.conn.archiving_136_supported and gajim.config.get_per('accounts', - account, 'sync_logs_with_server'): - # Start merging logs from server - obj.conn.request_modifications_page(gajim.config.get_per('accounts', - account, 'last_archiving_time')) - gajim.config.set_per('accounts', account, 'last_archiving_time', - time.strftime('%Y-%m-%dT%H:%M:%SZ', time.gmtime())) if obj.conn.archiving_313_supported and gajim.config.get_per('accounts', account, 'sync_logs_with_server'): obj.conn.request_archive_on_signin() ===================================== gajim/roster_window.py ===================================== --- a/gajim/roster_window.py +++ b/gajim/roster_window.py @@ -5544,8 +5544,7 @@ class RosterWindow: self.on_privacy_lists_menuitem_activate, account) else: privacy_lists_menuitem.set_sensitive(False) - if gajim.connections[account].archive_pref_supported or \ - gajim.connections[account].archiving_313_supported: + if gajim.connections[account].archiving_313_supported: archiving_preferences_menuitem.connect( 'activate', self.on_archiving_preferences_menuitem_activate, account) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/9ff601d03b286a426ef39f14d6937d9fbe…

1 0

[Git][gajim/gajim][xep-0319] 2 commits: send idle info even when we manually set a non-online presence.
by Yann Leboulanger 27 Jul '17

27 Jul '17

Yann Leboulanger pushed to branch xep-0319 at gajim / gajim Commits: 2eed7a63 by Yann Leboulanger at 2017-07-27T22:02:59+02:00 send idle info even when we manually set a non-online presence. - - - - - 22903cac by Yann Leboulanger at 2017-07-27T23:17:43+02:00 use autoaway config option instead of send_idle_time to attache idle element to presence - - - - - 3 changed files: - gajim/common/connection.py - gajim/gui_interface.py - gajim/roster_window.py Changes: ===================================== gajim/common/connection.py ===================================== --- a/gajim/common/connection.py +++ b/gajim/common/connection.py @@ -635,7 +635,7 @@ class CommonConnection: if auto: global HAS_IDLE if HAS_IDLE and gajim.config.get_per('accounts', self.name, - 'send_idle_time'): + 'autoaway'): idle_sec = int(self.sleeper.getIdleSec()) idle_time = time.strftime('%Y-%m-%dT%H:%M:%SZ', time.gmtime(time.time() - idle_sec)) gajim.nec.push_incoming_event(BeforeChangeShowEvent(None, ===================================== gajim/gui_interface.py ===================================== --- a/gajim/gui_interface.py +++ b/gajim/gui_interface.py @@ -2247,33 +2247,43 @@ class Interface: if account not in gajim.sleeper_state or \ not gajim.sleeper_state[account]: continue - if state == sleepy.STATE_AWAKE and \ - gajim.sleeper_state[account] in ('autoaway', 'autoxa'): - # we go online - self.roster.send_status(account, 'online', + if state == sleepy.STATE_AWAKE: + if gajim.sleeper_state[account] in ('autoaway', 'autoxa'): + # we go online + self.roster.send_status(account, 'online', gajim.status_before_autoaway[account]) - gajim.status_before_autoaway[account] = '' - gajim.sleeper_state[account] = 'online' - elif state == sleepy.STATE_AWAY and \ - gajim.sleeper_state[account] == 'online' and \ - gajim.config.get('autoaway'): + gajim.status_before_autoaway[account] = '' + gajim.sleeper_state[account] = 'online' + if gajim.sleeper_state[account] == 'idle': + # we go to the previous state + connected = gajim.connections[account].connected + self.roster.send_status(account, gajim.SHOW_LIST[connected], + gajim.status_before_autoaway[account]) + gajim.status_before_autoaway[account] = '' + gajim.sleeper_state[account] = 'off' + elif state == sleepy.STATE_AWAY and gajim.config.get('autoaway'): # we save out online status gajim.status_before_autoaway[account] = \ - gajim.connections[account].status - # we go away (no auto status) [we pass True to auto param] - auto_message = gajim.config.get('autoaway_message') - if not auto_message: - auto_message = gajim.connections[account].status - else: - auto_message = auto_message.replace('$S', '%(status)s') - auto_message = auto_message.replace('$T', '%(time)s') - auto_message = auto_message % { + gajim.connections[account].status + if gajim.sleeper_state[account] == 'online': + # we go away (no auto status) [we pass True to auto param] + auto_message = gajim.config.get('autoaway_message') + if not auto_message: + auto_message = gajim.connections[account].status + else: + auto_message = auto_message.replace('$S', '%(status)s') + auto_message = auto_message.replace('$T', '%(time)s') + auto_message = auto_message % { 'status': gajim.status_before_autoaway[account], 'time': gajim.config.get('autoawaytime') - } - self.roster.send_status(account, 'away', auto_message, - auto=True) - gajim.sleeper_state[account] = 'autoaway' + } + self.roster.send_status(account, 'away', auto_message, + auto=True) + if gajim.sleeper_state[account] == 'off': + connected = gajim.connections[account].connected + self.roster.send_status(account, gajim.SHOW_LIST[connected], + gajim.status_before_autoaway[account], auto=True) + gajim.sleeper_state[account] = 'idle' elif state == sleepy.STATE_XA and \ gajim.sleeper_state[account] in ('online', 'autoaway', 'autoaway-forced') and gajim.config.get('autoxa'): ===================================== gajim/roster_window.py ===================================== --- a/gajim/roster_window.py +++ b/gajim/roster_window.py @@ -2117,9 +2117,6 @@ class RosterWindow: def send_status(self, account, status, txt, auto=False, to=None): if status != 'offline': if to is None: - if status == gajim.connections[account].get_status() and \ - txt == gajim.connections[account].status: - return gajim.config.set_per('accounts', account, 'last_status', status) gajim.config.set_per('accounts', account, 'last_status_msg', helpers.to_one_line(txt)) View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/1ce3dcbff4c6e8327f6fbc714782e1964…

1 0

[Git][gajim/gajim][master] Improve getting own jid
by Philipp Hörist 27 Jul '17

27 Jul '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 1e313cc7 by Philipp Hörist at 2017-07-27T22:14:29+02:00 Improve getting own jid We get our full JID on the bind event. After that it is saved in the `registered_name` attr on the Connection Object. In case the bind never occured we get the bare JID from config. - - - - - 2 changed files: - gajim/common/connection.py - gajim/common/connection_handlers_events.py Changes: ===================================== gajim/common/connection.py ===================================== --- a/gajim/common/connection.py +++ b/gajim/common/connection.py @@ -671,6 +671,8 @@ class Connection(CommonConnection, ConnectionHandlers): self.try_connecting_for_foo_secs = 45 # holds the actual hostname to which we are connected self.connected_hostname = None + # Holds the full jid we received on the bind event + self.registered_name = None self.redirected = None self.last_time_to_reconnect = None self.new_account_info = None @@ -754,19 +756,16 @@ class Connection(CommonConnection, ConnectionHandlers): def check_jid(self, jid): return helpers.parse_jid(jid) - def get_own_jid(self, full=False): + def get_own_jid(self): """ - Return our own jid as JID - If full = True, this raises an exception if we cant provide - the full JID + Return the last full JID we received on a bind event. + In case we were never connected it returns the bare JID from config. """ - if self.connection: - full_jid = self.connection._registered_name - return nbxmpp.JID(full_jid) + if self.registered_name: + # This returns the full jid we received on the bind event + return self.registered_name else: - if full: - raise exceptions.GajimGeneralException( - 'We are not connected, full JID unknown.') + # This returns the bare jid return nbxmpp.JID(gajim.get_jid_from_account(self.name)) def reconnect(self): @@ -1465,6 +1464,7 @@ class Connection(CommonConnection, ConnectionHandlers): return if hasattr(con, 'Resource'): self.server_resource = con.Resource + self.registered_name = con._registered_name if gajim.config.get_per('accounts', self.name, 'anonymous_auth'): # Get jid given by server old_jid = gajim.get_jid_from_account(self.name) ===================================== gajim/common/connection_handlers_events.py ===================================== --- a/gajim/common/connection_handlers_events.py +++ b/gajim/common/connection_handlers_events.py @@ -1146,7 +1146,7 @@ class MessageReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): self.encrypted = False account = self.conn.name - if self.stanza.getFrom() == self.conn.get_own_jid(full=True): + if self.stanza.getFrom() == self.conn.get_own_jid(): # Drop messages sent from our own full jid # It can happen that when we sent message to our own bare jid # that the server routes that message back to us View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/1e313cc7e286cf20ee589e6856a0be8a89…

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits