Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] 3 commits: Refactor parsing correction data
by Philipp Hörist 13 Oct '19

13 Oct '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: b443a39f by Philipp Hörist at 2019-10-13T18:02:18Z Refactor parsing correction data Adapt to nbxmpp changes - - - - - 5ea40d75 by Philipp Hörist at 2019-10-13T18:22:48Z Refactor parsing attention Adapt to nbxmpp changes - - - - - 9225b79d by Philipp Hörist at 2019-10-13T20:10:52Z SingleMessage: Remove displaying forms - - - - - 12 changed files: - gajim/common/connection.py - gajim/common/connection_handlers_events.py - gajim/common/events.py - gajim/common/modules/mam.py - gajim/common/modules/message.py - gajim/common/modules/misc.py - gajim/common/zeroconf/connection_handlers_zeroconf.py - gajim/groupchat_control.py - gajim/gtk/single_message.py - gajim/remote_control.py - gajim/roster_window.py - gajim/session.py Changes: ===================================== gajim/common/connection.py ===================================== @@ -203,7 +203,7 @@ class CommonConnection: 'rst_formatting_outgoing_messages'): from gajim.common.rst_xhtml_generator import create_xhtml obj.xhtml = create_xhtml(obj.message) - if not obj.message and obj.chatstate is None and obj.form_node is None: + if not obj.message and obj.chatstate is None: return self._build_message_stanza(obj) @@ -235,8 +235,6 @@ class CommonConnection: if obj.message: msg_iq.setOriginID(obj.stanza_id) - if obj.form_node: - msg_iq.addChild(node=obj.form_node) if obj.label: msg_iq.addChild(node=obj.label) ===================================== gajim/common/connection_handlers_events.py ===================================== @@ -605,7 +605,6 @@ class MessageOutgoingEvent(nec.NetworkOutgoingEvent): self.xhtml = None self.label = None self.session = None - self.form_node = None self.delayed = None self.callback = None self.callback_args = [] ===================================== gajim/common/events.py ===================================== @@ -62,7 +62,7 @@ class Event: class ChatEvent(Event): type_ = 'chat' def __init__(self, message, subject, kind, time_, encrypted, resource, - msg_log_id, correct_id=None, message_id=None, xhtml=None, session=None, form_node=None, + msg_log_id, correct_id=None, message_id=None, xhtml=None, session=None, displaymarking=None, sent_forwarded=False, show_in_roster=False, show_in_systray=True, additional_data=None): Event.__init__(self, time_, show_in_roster=show_in_roster, @@ -78,7 +78,6 @@ class ChatEvent(Event): self.correct_id = correct_id self.xhtml = xhtml self.session = session - self.form_node = form_node self.displaymarking = displaymarking self.sent_forwarded = sent_forwarded if additional_data is None: ===================================== gajim/common/modules/mam.py ===================================== @@ -209,7 +209,7 @@ class MAM(BaseModule): 'stanza_id': stanza_id, 'origin_id': message_id, 'message_id': properties.id, - 'correct_id': None, + 'correct_id': parse_correction(properties), 'archive_jid': properties.mam.archive, 'msgtxt': properties.body, 'message': stanza, @@ -261,8 +261,6 @@ class MAM(BaseModule): self._log.debug(event.message.getProperties()) return - event.correct_id = parse_correction(event.message) - with_ = event.with_.getStripped() if event.muc_pm: # we store the message with the full JID ===================================== gajim/common/modules/message.py ===================================== @@ -31,8 +31,6 @@ from gajim.common.modules.util import get_eme_message from gajim.common.modules.security_labels import parse_securitylabel from gajim.common.modules.user_nickname import parse_nickname from gajim.common.modules.misc import parse_correction -from gajim.common.modules.misc import parse_attention -from gajim.common.modules.misc import parse_form from gajim.common.modules.misc import parse_oob from gajim.common.modules.misc import parse_xhtml from gajim.common.connection_handlers_events import MessageErrorEvent @@ -165,6 +163,7 @@ class Message(BaseModule): 'stanza_id': stanza_id, 'unique_id': stanza_id or message_id, 'message_id': properties.id, + 'correct_id': parse_correction(properties), 'mtype': type_.value, 'msgtxt': msgtxt, 'thread_id': thread_id, @@ -173,7 +172,8 @@ class Message(BaseModule): 'timestamp': properties.timestamp, 'delayed': properties.user_timestamp is not None, 'muc_pm': properties.is_muc_pm, - 'gc_control': gc_control + 'gc_control': gc_control, + 'attention': properties.attention, } app.nec.push_incoming_event(NetworkEvent('update-client-info', @@ -209,10 +209,7 @@ class Message(BaseModule): 'msg_log_id': None, 'subject': subject, 'displaymarking': parse_securitylabel(event.stanza), - 'attention': parse_attention(event.stanza), - 'correct_id': parse_correction(event.stanza), 'user_nick': '' if event.sent else parse_nickname(event.stanza), - 'form_node': parse_form(event.stanza), 'xhtml': parse_xhtml(event.stanza), } ===================================== gajim/common/modules/misc.py ===================================== @@ -16,8 +16,6 @@ import logging -import nbxmpp - from gajim.common import app log = logging.getLogger('gajim.c.m.misc') @@ -37,32 +35,10 @@ def parse_oob(properties, additional_data): # XEP-0308: Last Message Correction -def parse_correction(stanza): - replace = stanza.getTag('replace', namespace=nbxmpp.NS_CORRECT) - if replace is not None: - id_ = replace.getAttr('id') - if id_ is not None: - return id_ - log.warning('No id attr found: %s', stanza) - return None - - -# XEP-0224: Attention - -def parse_attention(stanza): - attention = stanza.getTag('attention', namespace=nbxmpp.NS_ATTENTION) - if attention is None: - return False - delayed = stanza.getTag('x', namespace=nbxmpp.NS_DELAY2) - if delayed is not None: - return False - return True - - -# XEP-0004: Data Forms - -def parse_form(stanza): - return stanza.getTag('x', namespace=nbxmpp.NS_DATA) +def parse_correction(properties): + if not properties.is_correction: + return + return properties.correction.id # XEP-0071: XHTML-IM ===================================== gajim/common/zeroconf/connection_handlers_zeroconf.py ===================================== @@ -34,7 +34,6 @@ from gajim.common.const import KindConstant from gajim.common.modules.user_nickname import parse_nickname from gajim.common.modules.util import get_eme_message from gajim.common.modules.misc import parse_correction -from gajim.common.modules.misc import parse_attention from gajim.common.modules.misc import parse_oob from gajim.common.modules.misc import parse_xhtml from gajim.common.connection_handlers_events import MessageErrorEvent @@ -112,13 +111,16 @@ class ConnectionHandlersZeroconf(connection_handlers.ConnectionHandlersBase): 'resource': resource, 'unique_id': id_, 'message_id': properties.id, + 'correct_id': parse_correction(properties), 'mtype': type_, 'msgtxt': msgtxt, 'thread_id': thread_id, 'session': session, 'self_message': False, 'muc_pm': False, - 'gc_control': None} + 'gc_control': None, + 'attention': properties.attention, + } event = ZeroconfMessageReceivedEvent(None, **event_attr) app.nec.push_incoming_event(event) @@ -141,9 +143,6 @@ class ConnectionHandlersZeroconf(connection_handlers.ConnectionHandlersBase): 'msg_log_id': None, 'subject': None, 'displaymarking': None, - 'form_node': None, - 'attention': parse_attention(event.stanza), - 'correct_id': parse_correction(event.stanza), 'user_nick': parse_nickname(event.stanza), 'xhtml': parse_xhtml(event.stanza), 'stanza_id': event.unique_id ===================================== gajim/groupchat_control.py ===================================== @@ -860,7 +860,6 @@ class GroupchatControl(ChatControlBase): msg_log_id, xhtml=xhtml, session=session, - form_node=None, displaymarking=displaymarking, sent_forwarded=sent) app.events.add_event(self.account, fjid, event) ===================================== gajim/gtk/single_message.py ===================================== @@ -26,7 +26,6 @@ from gajim.common.connection_handlers_events import MessageOutgoingEvent from gajim.conversation_textview import ConversationTextview -from gajim.gtk.dataform import DataFormWidget from gajim.gtk.dialogs import ErrorDialog from gajim.gtk.dialogs import AspellDictError from gajim.gtk.util import get_builder @@ -45,7 +44,7 @@ class SingleMessageWindow(Gtk.ApplicationWindow): action argument which can be 'send' or 'receive' """ def __init__(self, account, to='', action='', from_whom='', subject='', - message='', resource='', session=None, form_node=None): + message='', resource='', session=None): Gtk.ApplicationWindow.__init__(self) self.set_application(app.app) self.set_title(_('Send Single Message')) @@ -73,19 +72,6 @@ class SingleMessageWindow(Gtk.ApplicationWindow): self._ui.conversation_scrolledwindow.add( self.conversation_textview.tv) - self.form_widget = None - parent_box = self._ui.conversation_scrolledwindow.get_parent() - if form_node: - self.form_widget = DataFormWidget(form_node) - self.form_widget.show_all() - self._ui.conversation_scrolledwindow.hide() - self._ui.message_label_received.hide() - parent_box.add(self.form_widget) - parent_box.child_set_property(self.form_widget, 'top-attach', 2) - parent_box.child_set_property(self.form_widget, 'left-attach', 0) - parent_box.child_set_property(self.form_widget, 'width', 2) - self.action = 'form' - self.message_tv_buffer.connect('changed', self.update_char_counter) if isinstance(to, list): jid = ', '.join([i[0].get_full_jid() for i in to]) @@ -241,22 +227,6 @@ class SingleMessageWindow(Gtk.ApplicationWindow): fjid += '/' + self.resource # Full jid of sender (with resource) self._ui.from_entry_label.set_text(fjid) - elif action == 'form': # prepare UI for Receiving - title = self.form_widget.title - title = _('Form: %s') % title - self._ui.send_button.hide() - self._ui.send_and_close_button.hide() - self._ui.reply_button.show() - self._ui.close_button.show() - - self._ui.send_grid.hide() - self._ui.received_grid.show() - - fjid = self.from_whom - if self.resource: - fjid += '/' + self.resource # Full jid of sender (with resource) - self._ui.from_entry_label.set_text(fjid) - self._ui.single_message_window.set_title(title) def on_close_button_clicked(self, widget): @@ -289,11 +259,6 @@ class SingleMessageWindow(Gtk.ApplicationWindow): begin, end = self.message_tv_buffer.get_bounds() message = self.message_tv_buffer.get_text(begin, end, True) - if self.form_widget: - form_node = self.form_widget.get_submit_form() - else: - form_node = None - recipient_list = [] for to_whom_jid in sender_list: @@ -317,7 +282,7 @@ class SingleMessageWindow(Gtk.ApplicationWindow): app.nec.push_outgoing_event(MessageOutgoingEvent(None, account=self.account, jid=recipient_list, message=message, - type_='normal', subject=subject, form_node=form_node)) + type_='normal', subject=subject)) self._ui.subject_entry.set_text('') # we sent ok, clear the subject self.message_tv_buffer.set_text('') # we sent ok, clear the textview ===================================== gajim/remote_control.py ===================================== @@ -376,7 +376,7 @@ class GajimRemote(Server): self.raise_signal('NewMessage', ( obj.conn.name, [obj.fjid, obj.msgtxt, obj.timestamp, obj.encrypted, obj.mtype, obj.subject, - obj.msg_log_id, obj.user_nick, obj.xhtml, obj.form_node])) + obj.msg_log_id, obj.user_nick, obj.xhtml])) def on_our_status(self, obj): self.raise_signal('AccountPresence', (obj.show, obj.conn.name)) ===================================== gajim/roster_window.py ===================================== @@ -1928,8 +1928,7 @@ class RosterWindow: if event.type_ == 'normal': SingleMessageWindow(account, jid, action='receive', from_whom=jid, subject=event.subject, - message=event.message, resource=event.resource, - session=event.session, form_node=event.form_node) + message=event.message, resource=event.resource) app.events.remove_events(account, jid, event) return True @@ -2659,8 +2658,7 @@ class RosterWindow: # it's single message to be autopopuped SingleMessageWindow(obj.conn.name, obj.jid, action='receive', from_whom=obj.jid, subject=obj.subject, - message=obj.msgtxt, resource=obj.resource, session=obj.session, - form_node=obj.form_node) + message=obj.msgtxt, resource=obj.resource, session=obj.session) return if obj.popup and obj.mtype == 'chat' and not obj.session.control: ===================================== gajim/session.py ===================================== @@ -256,7 +256,7 @@ class ChatControlSession: correct_id=obj.correct_id, message_id=obj.message_id, xhtml=obj.xhtml, - session=self, form_node=obj.form_node, + session=self, displaymarking=obj.displaymarking, sent_forwarded=obj.forwarded and obj.sent, show_in_roster=obj.show_in_roster, @@ -267,7 +267,7 @@ class ChatControlSession: def roster_message(self, jid, msg, tim, encrypted=False, msg_type='', subject=None, resource='', msg_log_id=None, user_nick='', xhtml=None, - form_node=None, displaymarking=None, additional_data=None): + displaymarking=None, additional_data=None): """ Display the message or show notification in the roster """ @@ -325,7 +325,7 @@ class ChatControlSession: if msg_type == 'normal' and popup: # it's single message to be autopopuped SingleMessageWindow(self.conn.name, contact.jid, action='receive', from_whom=jid, subject=subject, message=msg, - resource=resource, session=self, form_node=form_node) + resource=resource, session=self) return # We print if window is opened and it's not a single message @@ -356,7 +356,7 @@ class ChatControlSession: show_in_systray = get_show_in_systray(event_type, contact.jid) event = event_t(msg, subject, msg_type, tim, encrypted, resource, - msg_log_id, xhtml=xhtml, session=self, form_node=form_node, + msg_log_id, xhtml=xhtml, session=self, displaymarking=displaymarking, sent_forwarded=False, show_in_roster=show_in_roster, show_in_systray=show_in_systray, additional_data=additional_data) View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/1ec850cd49164c3c8e562d19b53f88c14… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/1ec850cd49164c3c8e562d19b53f88c14… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] 3 commits: Add Correction (XEP-0308) support
by Philipp Hörist 13 Oct '19

13 Oct '19

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 9ccb310e by Philipp Hörist at 2019-10-13T17:56:50Z Add Correction (XEP-0308) support - - - - - 91c6dd86 by Philipp Hörist at 2019-10-13T18:16:58Z Add Attention (XEP-0224) support - - - - - 22ddb4b8 by Philipp Hörist at 2019-10-13T19:36:17Z Add forms message attribute - - - - - 6 changed files: - nbxmpp/dispatcher.py - + nbxmpp/modules/attention.py - + nbxmpp/modules/correction.py - nbxmpp/modules/message.py - nbxmpp/protocol.py - nbxmpp/structs.py Changes: ===================================== nbxmpp/dispatcher.py ===================================== @@ -74,6 +74,8 @@ from nbxmpp.modules.discovery import Discovery from nbxmpp.modules.chat_markers import ChatMarkers from nbxmpp.modules.receipts import Receipts from nbxmpp.modules.oob import OOB +from nbxmpp.modules.correction import Correction +from nbxmpp.modules.attention import Attention from nbxmpp.modules.misc import unwrap_carbon from nbxmpp.modules.misc import unwrap_mam from nbxmpp.util import get_properties_struct @@ -215,6 +217,8 @@ class XMPPDispatcher(PlugIn): self._modules['ChatMarkers'] = ChatMarkers(self._owner) self._modules['Receipts'] = Receipts(self._owner) self._modules['OOB'] = OOB(self._owner) + self._modules['Correction'] = Correction(self._owner) + self._modules['Attention'] = Attention(self._owner) for instance in self._modules.values(): for handler in instance.handlers: ===================================== nbxmpp/modules/attention.py ===================================== @@ -0,0 +1,51 @@ +# Copyright (C) 2018 Philipp Hörist <philipp AT hoerist.com> +# +# This file is part of nbxmpp. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 3 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; If not, see <http://www.gnu.org/licenses/>. + +import logging + +from nbxmpp.protocol import NS_ATTENTION +from nbxmpp.protocol import NS_DELAY2 +from nbxmpp.structs import StanzaHandler + +log = logging.getLogger('nbxmpp.m.attention') + + +class Attention: + def __init__(self, client): + self._client = client + self.handlers = [ + StanzaHandler(name='message', + callback=self._process_message_attention, + ns=NS_ATTENTION, + priority=15), + ] + + def _process_message_attention(self, _con, stanza, properties): + attention = stanza.getTag('attention', namespace=NS_ATTENTION) + if attention is None: + return + + if properties.is_mam_message: + return + + if properties.is_carbon_message and properties.carbon.is_sent: + return + + if stanza.getTag('x', namespace=NS_DELAY2) is not None: + return + + properties.attention = True ===================================== nbxmpp/modules/correction.py ===================================== @@ -0,0 +1,48 @@ +# Copyright (C) 2018 Philipp Hörist <philipp AT hoerist.com> +# +# This file is part of nbxmpp. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 3 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; If not, see <http://www.gnu.org/licenses/>. + +import logging + +from nbxmpp.protocol import NS_CORRECT +from nbxmpp.structs import StanzaHandler +from nbxmpp.structs import CorrectionData + +log = logging.getLogger('nbxmpp.m.correction') + + +class Correction: + def __init__(self, client): + self._client = client + self.handlers = [ + StanzaHandler(name='message', + callback=self._process_message_correction, + ns=NS_CORRECT, + priority=15), + ] + + def _process_message_correction(self, _con, stanza, properties): + replace = stanza.getTag('replace', namespace=NS_CORRECT) + if replace is None: + return + + id_ = replace.getAttr('id') + if id_ is None: + log.warning('Correcton without id attribute') + log.warning(stanza) + return + + properties.correction = CorrectionData(id_) ===================================== nbxmpp/modules/message.py ===================================== @@ -18,6 +18,7 @@ import logging from nbxmpp.protocol import NodeProcessed +from nbxmpp.protocol import NS_DATA from nbxmpp.structs import StanzaHandler from nbxmpp.structs import StanzaIDData from nbxmpp.util import error_factory @@ -75,6 +76,9 @@ class BaseMessage: properties.body = stanza.getBody() properties.thread = stanza.getThread() properties.subject = stanza.getSubject() + forms = stanza.getTags('x', namespace=NS_DATA) + if forms: + properties.forms = forms @staticmethod def _parse_type(stanza): ===================================== nbxmpp/protocol.py ===================================== @@ -1369,6 +1369,12 @@ class Message(Protocol): if desc is not None: oob.setTagData('desc', desc) + def setCorrection(self, id_): + self.setTag('replace', namespace=NS_CORRECT, attrs={'id': id_}) + + def setAttention(self): + self.setTag('attention', namespace=NS_ATTENTION) + class Presence(Protocol): ===================================== nbxmpp/structs.py ===================================== @@ -123,6 +123,8 @@ DiscoItem.__new__.__defaults__ = (None, None) OOBData = namedtuple('OOBData', 'url desc') +CorrectionData = namedtuple('CorrectionData', 'id') + class DiscoInfo(namedtuple('DiscoInfo', 'stanza identities features dataforms timestamp')): @@ -548,6 +550,9 @@ class MessageProperties: self.marker = None self.receipt = None self.oob = None + self.correction = None + self.attention = False + self.forms = None @property def has_user_delay(self): @@ -632,6 +637,18 @@ class MessageProperties: def is_oob(self): return self.oob is not None + @property + def is_correction(self): + return self.correction is not None + + @property + def has_attention(self): + return self.attention + + @property + def has_forms(self): + return self.forms is not None + class IqProperties: def __init__(self): View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/af360130ec8655f9c947fc97b… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/af360130ec8655f9c947fc97b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 5 commits: XMLConsole: Move UI code into glade file
by Philipp Hörist 13 Oct '19

13 Oct '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: bcb3f8ac by Philipp Hörist at 2019-10-13T09:17:05Z XMLConsole: Move UI code into glade file - - - - - 03ea193e by Philipp Hörist at 2019-10-13T09:18:19Z XMLConsole: Fix pylint errors - - - - - 5b220281 by Philipp Hörist at 2019-10-13T09:21:33Z Settings: Don't act on ComboSetting row click - - - - - cdf111c5 by Philipp Hörist at 2019-10-13T09:49:07Z XMLConsole: Add account selector for sending xml - - - - - 1ec850cd by Philipp Hörist at 2019-10-13T16:46:21Z Refactor parsing oob data Adapt to nbxmpp changes - - - - - 7 changed files: - gajim/common/modules/mam.py - gajim/common/modules/message.py - gajim/common/modules/misc.py - gajim/common/zeroconf/connection_handlers_zeroconf.py - gajim/data/gui/xml_console.ui - gajim/gtk/settings.py - gajim/gtk/xml_console.py Changes: ===================================== gajim/common/modules/mam.py ===================================== @@ -195,6 +195,8 @@ class MAM(BaseModule): additional_data.set_value( 'gajim', 'user_timestamp', properties.user_timestamp) + parse_oob(properties, additional_data) + event_attrs.update( {'conn': self._con, 'account': self._account, @@ -260,7 +262,6 @@ class MAM(BaseModule): return event.correct_id = parse_correction(event.message) - parse_oob(event) with_ = event.with_.getStripped() if event.muc_pm: ===================================== gajim/common/modules/message.py ===================================== @@ -148,6 +148,8 @@ class Message(BaseModule): additional_data.set_value( 'gajim', 'user_timestamp', properties.user_timestamp) + parse_oob(properties, additional_data) + event_attr = { 'conn': self._con, 'stanza': stanza, @@ -213,7 +215,6 @@ class Message(BaseModule): 'form_node': parse_form(event.stanza), 'xhtml': parse_xhtml(event.stanza), } - parse_oob(event) for name, value in event_attr.items(): setattr(event, name, value) ===================================== gajim/common/modules/misc.py ===================================== @@ -25,18 +25,14 @@ log = logging.getLogger('gajim.c.m.misc') # XEP-0066: Out of Band Data -def parse_oob(event): - oob_node = event.stanza.getTag('x', namespace=nbxmpp.NS_X_OOB) - if oob_node is None: +def parse_oob(properties, additional_data): + if not properties.is_oob: return - url = oob_node.getTagData('url') - if url is not None: - event.additional_data.set_value('gajim', 'oob_url', url) - - desc = oob_node.getTagData('desc') - if desc is not None: - event.additional_data.set_value('gajim', 'oob_desc', desc) + additional_data.set_value('gajim', 'oob_url', properties.oob.url) + if properties.oob.desc is not None: + additional_data.set_value('gajim', 'oob_desc', + properties.oob.desc) # XEP-0308: Last Message Correction ===================================== gajim/common/zeroconf/connection_handlers_zeroconf.py ===================================== @@ -94,13 +94,16 @@ class ConnectionHandlersZeroconf(connection_handlers.ConnectionHandlersBase): session.last_receive = time.time() + additional_data = AdditionalDataDict() + parse_oob(properties, additional_data) + event_attr = { 'conn': self, 'stanza': stanza, 'account': self.name, 'id_': id_, 'encrypted': False, - 'additional_data': AdditionalDataDict(), + 'additional_data': additional_data, 'forwarded': False, 'sent': False, 'timestamp': time.time(), @@ -146,8 +149,6 @@ class ConnectionHandlersZeroconf(connection_handlers.ConnectionHandlersBase): 'stanza_id': event.unique_id } - parse_oob(event) - for name, value in event_attr.items(): setattr(event, name, value) ===================================== gajim/data/gui/xml_console.ui ===================================== @@ -2,6 +2,73 @@  <interface> <requires lib="gtk+" version="3.20"/> + <object class="GtkHeaderBar" id="headerbar"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="title" translatable="yes">XML Console</property> + <property name="show_close_button">True</property> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="icon_name">utilities-terminal-symbolic</property> + </object> + </child> + </object> + <object class="GtkPopover" id="popover"> + <property name="can_focus">False</property> + <property name="valign">start</property> + <child> + <object class="GtkListBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="selection_mode">none</property> + <signal name="row-activated" handler="_on_row_activated" swapped="no"/> + <child> + <object class="GtkListBoxRow"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label">Message</property> + </object> + </child> + </object> + </child> + <child> + <object class="GtkListBoxRow"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label">Presence</property> + </object> + </child> + </object> + </child> + <child> + <object class="GtkListBoxRow"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label">Iq</property> + </object> + </child> + </object> + </child> + </object> + </child> + <style> + <class name="PopoverButtonListbox"/> + </style> + </object> <object class="GtkBox" id="box"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -35,8 +102,8 @@ <child> <object class="GtkScrolledWindow" id="scrolled_input"> <property name="height_request">150</property> - <property name="visible">True</property> <property name="can_focus">True</property> + <property name="no_show_all">True</property> <property name="shadow_type">in</property> <child> <object class="GtkTextView" id="input_entry"> @@ -62,90 +129,123 @@ <property name="name">actionbar</property> <property name="visible">True</property> <property name="can_focus">False</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="pack_type">end</property> - <property name="position">1</property> - </packing> - </child> - </object> - <object class="GtkHeaderBar" id="headerbar"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="title" translatable="yes">XML Console</property> - <property name="show_close_button">True</property> - <child> - <object class="GtkImage"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">utilities-terminal-symbolic</property> - </object> - </child> - </object> - <object class="GtkPopover" id="popover"> - <property name="can_focus">False</property> - <property name="valign">start</property> - <child> - <object class="GtkListBox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="selection_mode">none</property> - <signal name="row-activated" handler="_on_row_activated" swapped="no"/> <child> - <object class="GtkListBoxRow"> + <object class="GtkButton"> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes">Filter</property> + <signal name="clicked" handler="_on_filter_options" swapped="no"/> <child> - <object class="GtkLabel"> + <object class="GtkImage"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label">Message</property> + <property name="icon_name">applications-system-symbolic</property> </object> </child> </object> + <packing> + <property name="position">0</property> + </packing> </child> <child> - <object class="GtkListBoxRow"> + <object class="GtkButton"> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes">Clear</property> + <signal name="clicked" handler="_on_clear" swapped="no"/> <child> - <object class="GtkLabel"> + <object class="GtkImage"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label">Presence</property> + <property name="icon_name">edit-clear-symbolic</property> </object> </child> </object> + <packing> + <property name="position">2</property> + </packing> </child> <child> - <object class="GtkListBoxRow"> + <object class="GtkToggleButton"> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="receives_default">True</property> + <signal name="toggled" handler="_on_input" swapped="no"/> <child> - <object class="GtkLabel"> + <object class="GtkImage"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label">Iq</property> + <property name="icon_name">document-edit-symbolic</property> + </object> + </child> + </object> + <packing> + <property name="position">3</property> + </packing> + </child> + <child> + <object class="GtkButton" id="paste"> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="no_show_all">True</property> + <signal name="clicked" handler="_on_paste_last" swapped="no"/> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="tooltip_text" translatable="yes">Paste Last Input</property> + <property name="icon_name">insert-text-symbolic</property> </object> </child> </object> + <packing> + <property name="position">3</property> + </packing> + </child> + <child> + <object class="GtkMenuButton" id="menubutton"> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="no_show_all">True</property> + <property name="tooltip_text" translatable="yes">Presets</property> + <property name="popover">popover</property> + <child> + <placeholder/> + </child> + </object> + <packing> + <property name="position">5</property> + </packing> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <object class="GtkButton" id="send"> + <property name="label" translatable="yes">_Send</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="no_show_all">True</property> + <property name="use_underline">True</property> + <signal name="clicked" handler="_on_send" swapped="no"/> + </object> + <packing> + <property name="pack_type">end</property> + <property name="position">0</property> + </packing> </child> </object> - </child> - <style> - <class name="PopoverButtonListbox"/> - </style> - </object> - <object class="GtkMenuButton" id="menubutton"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes">Presets</property> - <property name="popover">popover</property> - <child> - <placeholder/> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack_type">end</property> + <property name="position">1</property> + </packing> </child> </object> </interface> ===================================== gajim/gtk/settings.py ===================================== @@ -541,6 +541,9 @@ class ComboSetting(GenericSetting): def on_value_change(self, combo): self.set_value(combo.get_active_id()) + def on_row_activated(self): + pass + class ChatstateComboSetting(ComboSetting): def on_value_change(self, combo): ===================================== gajim/gtk/xml_console.py ===================================== @@ -26,7 +26,7 @@ from gajim.common.const import StyleAttr from gajim.gtk import util from gajim.gtk.util import get_builder -from gajim.gtk.util import get_image_button +from gajim.gtk.util import MaxWidthComboBoxText from gajim.gtk.dialogs import ErrorDialog from gajim.gtk.settings import SettingsDialog from gajim.gtk.const import Setting @@ -45,6 +45,7 @@ class XMLConsoleWindow(Gtk.ApplicationWindow): self.set_name('XMLConsoleWindow') self.selected_account = None + self._selected_send_account = None self.presence = True self.message = True self.iq = True @@ -61,37 +62,20 @@ class XMLConsoleWindow(Gtk.ApplicationWindow): self._ui.paned.set_position(self._ui.paned.get_property('max-position')) - button = get_image_button( - 'applications-system-symbolic', _('Filter')) - button.connect('clicked', self._on_filter_options) - self._ui.actionbar.pack_start(button) - - button = get_image_button( - 'edit-clear-symbolic', _('Clear')) - button.connect('clicked', self._on_clear) - self._ui.actionbar.pack_start(button) - - button = get_image_button( - 'document-edit-symbolic', _('XML Input'), toggle=True) - button.connect('toggled', self._on_input) - self._ui.actionbar.pack_start(button) - - button = get_image_button('insert-text-symbolic', _('Paste Last Input')) - button.connect('clicked', self._on_paste_last) - self._ui.actionbar.pack_start(button) - - button = Gtk.Button.new_with_mnemonic(_('_Send')) - button.connect('clicked', self._on_send) - self._ui.actionbar.pack_end(button) - - self._ui.actionbar.pack_start(self._ui.menubutton) + self._combo = MaxWidthComboBoxText() + self._combo.set_max_size(200) + self._combo.set_hexpand(False) + self._combo.set_halign(Gtk.Align.END) + self._combo.set_no_show_all(True) + self._combo.set_visible(False) + self._combo.connect('changed', self._on_value_change) + for account, label in self._get_accounts(): + self._combo.append(account, label) + self._ui.actionbar.pack_end(self._combo) self._create_tags() self.show_all() - self._ui.scrolled_input.hide() - self._ui.menubutton.hide() - self.connect('destroy', self._on_destroy) self.connect('key_press_event', self._on_key_press_event) self._ui.connect_signals(self) @@ -101,6 +85,9 @@ class XMLConsoleWindow(Gtk.ApplicationWindow): app.ged.register_event_handler( 'stanza-sent', ged.GUI1, self._nec_stanza_sent) + def _on_value_change(self, combo): + self._selected_send_account = combo.get_active_id() + def _set_titlebar(self): if self.selected_account is None: title = _('All Accounts') @@ -125,7 +112,7 @@ class XMLConsoleWindow(Gtk.ApplicationWindow): for tag_name in tags: buffer_.create_tag(tag_name) - def _on_key_press_event(self, widget, event): + def _on_key_press_event(self, _widget, event): if event.keyval == Gdk.KEY_Escape: self.destroy() if (event.get_state() & Gdk.ModifierType.CONTROL_MASK and @@ -136,7 +123,7 @@ class XMLConsoleWindow(Gtk.ApplicationWindow): event.keyval == Gdk.KEY_Up): self._on_paste_last() - def _on_row_activated(self, listbox, row): + def _on_row_activated(self, _listbox, row): text = row.get_child().get_text() input_text = None if text == 'Presence': @@ -163,12 +150,14 @@ class XMLConsoleWindow(Gtk.ApplicationWindow): self._ui.input_entry.grab_focus() def _on_send(self, *args): - if not app.account_is_connected(self.selected_account): + if not self._selected_send_account: + return + if not app.account_is_connected(self._selected_send_account): # If offline or connecting ErrorDialog( _('Connection not available'), _('Please make sure you are connected with \'%s\'.') % - self.selected_account) + self._selected_send_account) return buffer_ = self._ui.input_entry.get_buffer() begin_iter, end_iter = buffer_.get_bounds() @@ -187,7 +176,7 @@ class XMLConsoleWindow(Gtk.ApplicationWindow): # stream management node = nbxmpp.Protocol(node=stanza, attrs={'xmlns': 'jabber:client'}) - app.connections[self.selected_account].connection.send(node) + app.connections[self._selected_send_account].connection.send(node) self.last_stanza = stanza buffer_.set_text('') @@ -200,23 +189,33 @@ class XMLConsoleWindow(Gtk.ApplicationWindow): def _on_input(self, button, *args): if button.get_active(): self._ui.paned.get_child2().show() + self._ui.send.show() + self._ui.paste.show() + self._combo.show() self._ui.menubutton.show() self._ui.input_entry.grab_focus() else: self._ui.paned.get_child2().hide() + self._ui.send.hide() + self._ui.paste.hide() + self._combo.hide() self._ui.menubutton.hide() - def _on_filter_options(self, *args): - if self.filter_dialog: - self.filter_dialog.present() - return - - # Get all accounts for settings combobox + @staticmethod + def _get_accounts(): accounts = app.get_accounts_sorted() combo_accounts = [] for account in accounts: label = app.get_account_label(account) combo_accounts.append((account, label)) + return combo_accounts + + def _on_filter_options(self, *args): + if self.filter_dialog: + self.filter_dialog.present() + return + + combo_accounts = self._get_accounts() combo_accounts.insert(0, (None, _('All Accounts'))) settings = [ @@ -252,7 +251,7 @@ class XMLConsoleWindow(Gtk.ApplicationWindow): settings, self.selected_account) self.filter_dialog.connect('destroy', self._on_filter_destroyed) - def _on_filter_destroyed(self, win): + def _on_filter_destroyed(self, _win): self.filter_dialog = None def _on_clear(self, *args): @@ -264,7 +263,7 @@ class XMLConsoleWindow(Gtk.ApplicationWindow): app.ged.remove_event_handler( 'stanza-sent', ged.GUI1, self._nec_stanza_sent) - def _set_account(self, value, data): + def _set_account(self, value, _data): self.selected_account = value self._set_titlebar() View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/54d02088bc92c9ba78d2fce8fb41ed03c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/54d02088bc92c9ba78d2fce8fb41ed03c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Add OOB (XEP-0066) support
by Philipp Hörist 13 Oct '19

13 Oct '19

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: af360130 by Philipp Hörist at 2019-10-13T09:57:29Z Add OOB (XEP-0066) support - - - - - 4 changed files: - nbxmpp/dispatcher.py - + nbxmpp/modules/oob.py - nbxmpp/protocol.py - nbxmpp/structs.py Changes: ===================================== nbxmpp/dispatcher.py ===================================== @@ -73,6 +73,7 @@ from nbxmpp.modules.ibb import IBB from nbxmpp.modules.discovery import Discovery from nbxmpp.modules.chat_markers import ChatMarkers from nbxmpp.modules.receipts import Receipts +from nbxmpp.modules.oob import OOB from nbxmpp.modules.misc import unwrap_carbon from nbxmpp.modules.misc import unwrap_mam from nbxmpp.util import get_properties_struct @@ -213,6 +214,7 @@ class XMPPDispatcher(PlugIn): self._modules['Discovery'] = Discovery(self._owner) self._modules['ChatMarkers'] = ChatMarkers(self._owner) self._modules['Receipts'] = Receipts(self._owner) + self._modules['OOB'] = OOB(self._owner) for instance in self._modules.values(): for handler in instance.handlers: ===================================== nbxmpp/modules/oob.py ===================================== @@ -0,0 +1,49 @@ +# Copyright (C) 2018 Philipp Hörist <philipp AT hoerist.com> +# +# This file is part of nbxmpp. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 3 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; If not, see <http://www.gnu.org/licenses/>. + +import logging + +from nbxmpp.protocol import NS_X_OOB +from nbxmpp.structs import StanzaHandler +from nbxmpp.structs import OOBData + +log = logging.getLogger('nbxmpp.m.oob') + + +class OOB: + def __init__(self, client): + self._client = client + self.handlers = [ + StanzaHandler(name='message', + callback=self._process_message_oob, + ns=NS_X_OOB, + priority=15), + ] + + def _process_message_oob(self, _con, stanza, properties): + oob = stanza.getTag('x', namespace=NS_X_OOB) + if oob is None: + return + + url = oob.getTagData('url') + if url is None: + log.warning('OOB data without url') + log.warning(stanza) + return + + desc = oob.getTagData('desc') + properties.oob = OOBData(url, desc) ===================================== nbxmpp/protocol.py ===================================== @@ -1363,6 +1363,12 @@ class Message(Protocol): def setReceiptReceived(self, id_): self.setTag('received', namespace=NS_RECEIPTS, attrs={'id': id_}) + def setOOB(self, url, desc=None): + oob = self.setTag('x', namespace=NS_X_OOB) + oob.setTagData('url', url) + if desc is not None: + oob.setTagData('desc', desc) + class Presence(Protocol): ===================================== nbxmpp/structs.py ===================================== @@ -121,6 +121,8 @@ DiscoItems = namedtuple('DiscoItems', 'jid node items') DiscoItem = namedtuple('DiscoItem', 'jid name node') DiscoItem.__new__.__defaults__ = (None, None) +OOBData = namedtuple('OOBData', 'url desc') + class DiscoInfo(namedtuple('DiscoInfo', 'stanza identities features dataforms timestamp')): @@ -545,6 +547,7 @@ class MessageProperties: self.pgp_legacy = None self.marker = None self.receipt = None + self.oob = None @property def has_user_delay(self): @@ -625,6 +628,10 @@ class MessageProperties: def is_receipt(self): return self.receipt is not None + @property + def is_oob(self): + return self.oob is not None + class IqProperties: def __init__(self): View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/af360130ec8655f9c947fc97be… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/af360130ec8655f9c947fc97be… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: Receipts: Always request receipt
by Philipp Hörist 12 Oct '19

12 Oct '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: bafd729c by Philipp Hörist at 2019-10-12T13:50:00Z Receipts: Always request receipt - - - - - d62d5ba6 by Philipp Hörist at 2019-10-12T13:52:23Z Receipts: Always announce support for receipts - - - - - 54d02088 by Philipp Hörist at 2019-10-12T21:17:03Z Receipts: Refactor module Adapt to nbxmpp changes - - - - - 7 changed files: - gajim/common/app.py - gajim/common/config.py - gajim/common/connection.py - gajim/common/helpers.py - gajim/common/modules/message.py - gajim/common/modules/receipts.py - gajim/common/zeroconf/connection_handlers_zeroconf.py Changes: ===================================== gajim/common/app.py ===================================== @@ -159,6 +159,7 @@ gajim_common_features = [ nbxmpp.NS_ENCRYPTED, nbxmpp.NS_PING, nbxmpp.NS_CHATSTATES, + nbxmpp.NS_RECEIPTS, nbxmpp.NS_TIME_REVISED, nbxmpp.NS_VERSION, nbxmpp.NS_ROSTERX, ===================================== gajim/common/config.py ===================================== @@ -359,7 +359,6 @@ class Config: 'zeroconf_email': [opt_str, '', '', True], 'use_env_http_proxy': [opt_bool, False], 'answer_receipts': [opt_bool, True, _('If enabled, Gajim will answer to message receipt requests.')], - 'request_receipt': [opt_bool, True, _('If enabled, Gajim will send message receipt requests.')], 'publish_tune': [opt_bool, False], 'publish_location': [opt_bool, False], 'subscribe_mood': [opt_bool, True], ===================================== gajim/common/connection.py ===================================== @@ -298,10 +298,8 @@ class CommonConnection: # XEP-0184 if obj.jid != app.get_jid_from_account(self.name): - request = app.config.get_per('accounts', self.name, - 'request_receipt') - if obj.message and request: - msg_iq.setTag('request', namespace=nbxmpp.NS_RECEIPTS) + if obj.message: + msg_iq.setReceiptRequest() if obj.session: # XEP-0201 ===================================== gajim/common/helpers.py ===================================== @@ -1093,8 +1093,6 @@ def update_optional_features(account=None): features.append(nbxmpp.NS_BOOKMARKS + '+notify') if not app.config.get('ignore_incoming_xhtml'): features.append(nbxmpp.NS_XHTML_IM) - if app.config.get_per('accounts', account_, 'answer_receipts'): - features.append(nbxmpp.NS_RECEIPTS) if app.is_installed('FARSTREAM'): features.append(nbxmpp.NS_JINGLE_RTP) features.append(nbxmpp.NS_JINGLE_RTP_AUDIO) ===================================== gajim/common/modules/message.py ===================================== @@ -195,7 +195,6 @@ class Message(BaseModule): def _on_message_decrypted(self, event): try: - self._con.get_module('Receipts').delegate(event) self._con.get_module('Chatstate').delegate(event) except nbxmpp.NodeProcessed: return ===================================== gajim/common/modules/receipts.py ===================================== @@ -15,9 +15,10 @@ # XEP-0184: Message Delivery Receipts import nbxmpp +from nbxmpp.structs import StanzaHandler from gajim.common import app -from gajim.common.nec import NetworkIncomingEvent +from gajim.common.nec import NetworkEvent from gajim.common.modules.base import BaseModule @@ -25,82 +26,67 @@ class Receipts(BaseModule): def __init__(self, con): BaseModule.__init__(self, con) - def delegate(self, event): - request = event.stanza.getTag('request', - namespace=nbxmpp.NS_RECEIPTS) - if request is not None: - self._answer_request(event) - return - - received = event.stanza.getTag('received', - namespace=nbxmpp.NS_RECEIPTS) - if received is not None: - self._receipt_received(event, received) - raise nbxmpp.NodeProcessed + self.handlers = [ + StanzaHandler(name='message', + callback=self._process_message_receipt, + ns=nbxmpp.NS_RECEIPTS, + priority=46), + ] - def _answer_request(self, event): - if not app.config.get_per('accounts', self._account, - 'answer_receipts'): + def _process_message_receipt(self, _con, stanza, properties): + if not properties.is_receipt: return - if event.mtype not in ('chat', 'normal'): - return + if (properties.type.is_groupchat or + properties.is_self_message or + properties.is_mam_message or + properties.is_carbon_message and properties.carbon.is_sent): - if event.sent: - # Never answer messages that we sent from another device + if properties.receipt.is_received: + # Don't propagate this event further + raise nbxmpp.NodeProcessed return - from_ = event.stanza.getFrom() - if self._con.get_own_jid().bareMatch(from_): - # Dont answer receipts from our other resources + if properties.receipt.is_request: + if not app.config.get_per('accounts', self._account, + 'answer_receipts'): + return + contact = self._get_contact(properties) + if contact is None: + return + self._log.info('Send receipt: %s', properties.jid) + self._con.connection.send(stanza.buildReceipt()) return - receipt_id = event.stanza.getID() + if properties.receipt.is_received: + self._log.info('Receipt from %s %s', + properties.jid, + properties.receipt.id) - contact = self._get_contact(event) - if contact is None: - return + jid = properties.jid + if not properties.is_muc_pm: + jid = properties.jid.getBare() - receipt = self._build_answer_receipt(from_, receipt_id) - self._log.info('Answer %s', receipt_id) - self._con.connection.send(receipt) + app.nec.push_incoming_event( + NetworkEvent('receipt-received', + conn=self._con, + receipt_id=properties.receipt.id, + jid=jid)) - def _get_contact(self, event): - if event.muc_pm: + raise nbxmpp.NodeProcessed + + def _get_contact(self, properties): + if properties.is_muc_pm: return app.contacts.get_gc_contact(self._account, - event.jid, - event.resource) + properties.jid.getBare(), + properties.jid.getResource()) - contact = app.contacts.get_contact(self._account, event.jid) + contact = app.contacts.get_contact(self._account, + properties.jid.getBare()) if contact is not None and contact.sub not in ('to', 'none'): return contact return None - @staticmethod - def _build_answer_receipt(to, receipt_id): - receipt = nbxmpp.Message(to=to, typ='chat') - receipt.setTag('received', - namespace='urn:xmpp:receipts', - attrs={'id': receipt_id}) - return receipt - - def _receipt_received(self, event, received): - receipt_id = received.getAttr('id') - if receipt_id is None: - self._log.warning('Receipt without ID: %s', event.stanza) - return - self._log.info('Received %s', receipt_id) - - jid = event.jid - if event.muc_pm: - jid = event.fjid - - app.nec.push_incoming_event( - NetworkIncomingEvent('receipt-received', - conn=self._con, - receipt_id=receipt_id, - jid=jid)) - def get_instance(*args, **kwargs): return Receipts(*args, **kwargs), 'Receipts' ===================================== gajim/common/zeroconf/connection_handlers_zeroconf.py ===================================== @@ -129,7 +129,6 @@ class ConnectionHandlersZeroconf(connection_handlers.ConnectionHandlersBase): def _on_message_decrypted(self, event): try: - self.get_module('Receipts').delegate(event) self.get_module('Chatstate').delegate(event) except nbxmpp.NodeProcessed: return View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/3de7d8f64134ac703ea31a9337169a1d1… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/3de7d8f64134ac703ea31a9337169a1d1… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Add Receipts (XEP-0184) support
by Philipp Hörist 12 Oct '19

12 Oct '19

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: a15b98ae by Philipp Hörist at 2019-10-12T13:17:20Z Add Receipts (XEP-0184) support - - - - - 4 changed files: - nbxmpp/dispatcher.py - + nbxmpp/modules/receipts.py - nbxmpp/protocol.py - nbxmpp/structs.py Changes: ===================================== nbxmpp/dispatcher.py ===================================== @@ -72,6 +72,7 @@ from nbxmpp.modules.adhoc import AdHoc from nbxmpp.modules.ibb import IBB from nbxmpp.modules.discovery import Discovery from nbxmpp.modules.chat_markers import ChatMarkers +from nbxmpp.modules.receipts import Receipts from nbxmpp.modules.misc import unwrap_carbon from nbxmpp.modules.misc import unwrap_mam from nbxmpp.util import get_properties_struct @@ -211,6 +212,7 @@ class XMPPDispatcher(PlugIn): self._modules['IBB'] = IBB(self._owner) self._modules['Discovery'] = Discovery(self._owner) self._modules['ChatMarkers'] = ChatMarkers(self._owner) + self._modules['Receipts'] = Receipts(self._owner) for instance in self._modules.values(): for handler in instance.handlers: ===================================== nbxmpp/modules/receipts.py ===================================== @@ -0,0 +1,51 @@ +# Copyright (C) 2018 Philipp Hörist <philipp AT hoerist.com> +# +# This file is part of nbxmpp. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 3 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; If not, see <http://www.gnu.org/licenses/>. + +import logging + +from nbxmpp.protocol import NS_RECEIPTS +from nbxmpp.structs import StanzaHandler +from nbxmpp.structs import ReceiptData + +log = logging.getLogger('nbxmpp.m.receipts') + + +class Receipts: + def __init__(self, client): + self._client = client + self.handlers = [ + StanzaHandler(name='message', + callback=self._process_message_receipt, + ns=NS_RECEIPTS, + priority=15), + ] + + def _process_message_receipt(self, _con, stanza, properties): + request = stanza.getTag('request', namespace=NS_RECEIPTS) + if request is not None: + properties.receipt = ReceiptData(request.getName()) + return + + received = stanza.getTag('received', namespace=NS_RECEIPTS) + if received is not None: + id_ = received.getAttr('id') + if id_ is None: + log.warning('Receipt without id attr') + log.warning(stanza) + return + + properties.receipt = ReceiptData(received.getName(), id_) ===================================== nbxmpp/protocol.py ===================================== @@ -1323,6 +1323,11 @@ class Message(Protocol): """ self.setTag('origin-id', namespace=NS_SID, attrs={'id': val}) + def buildReceipt(self): + message = Message(to=self.getFrom().getBare(), typ=self.getType()) + message.setReceiptReceived(self.getID()) + return message + def buildReply(self, text=None): """ Builds and returns another message object with specified text. The to, @@ -1352,6 +1357,12 @@ class Message(Protocol): def setMarkable(self): self.setTag('markable', namespace=NS_CHATMARKERS) + def setReceiptRequest(self): + self.setTag('request', namespace=NS_RECEIPTS) + + def setReceiptReceived(self, id_): + self.setTag('received', namespace=NS_RECEIPTS, attrs={'id': id_}) + class Presence(Protocol): ===================================== nbxmpp/structs.py ===================================== @@ -485,6 +485,22 @@ class CarbonData(namedtuple('MAMData', 'type')): return self.type == 'received' +class ReceiptData(namedtuple('ReceiptData', 'type id')): + + __slots__ = [] + + def __new__(cls, type, id=None): + return super(ReceiptData, cls).__new__(cls, type, id) + + @property + def is_request(self): + return self.type == 'request' + + @property + def is_received(self): + return self.type == 'received' + + class Properties: pass @@ -528,6 +544,7 @@ class MessageProperties: self.encrypted = None self.pgp_legacy = None self.marker = None + self.receipt = None @property def has_user_delay(self): @@ -604,6 +621,10 @@ class MessageProperties: def is_marker(self): return self.marker is not None + @property + def is_receipt(self): + return self.receipt is not None + class IqProperties: def __init__(self): View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/a15b98aec870e0e6c8fac08f10… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/a15b98aec870e0e6c8fac08f10… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] 2 commits: Muclumbus: Catch additional exception on http result
by Philipp Hörist 11 Oct '19

11 Oct '19

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 92a9c5d9 by Philipp Hörist at 2019-10-11T16:45:00Z Muclumbus: Catch additional exception on http result - - - - - 64b8f9b7 by Philipp Hörist at 2019-10-11T20:19:05Z Don't fail on invalid JIDs Fixes #85 - - - - - 2 changed files: - nbxmpp/dispatcher.py - nbxmpp/modules/muclumbus.py Changes: ===================================== nbxmpp/dispatcher.py ===================================== @@ -33,6 +33,7 @@ from nbxmpp.protocol import NS_STREAMS from nbxmpp.protocol import NS_HTTP_BIND from nbxmpp.protocol import NodeProcessed from nbxmpp.protocol import InvalidFrom +from nbxmpp.protocol import InvalidJid from nbxmpp.protocol import InvalidStanza from nbxmpp.protocol import Iq from nbxmpp.protocol import Presence @@ -533,7 +534,12 @@ class XMPPDispatcher(PlugIn): log.debug('Got %s / %s stanza', xmlns, name) # Convert simplexml to Protocol object - stanza = self.handlers[xmlns][name]['type'](node=stanza) + try: + stanza = self.handlers[xmlns][name]['type'](node=stanza) + except InvalidJid: + log.warning('Invalid JID, ignoring stanza') + log.warning(stanza) + return own_jid = self._owner.get_bound_jid() properties = get_properties_struct(name) @@ -561,8 +567,9 @@ class XMPPDispatcher(PlugIn): # Unwrap carbon try: stanza, properties.carbon = unwrap_carbon(stanza, own_jid) - except InvalidFrom as exc: + except (InvalidFrom, InvalidJid) as exc: log.warning(exc) + log.warning(stanza) return except NodeProcessed as exc: log.info(exc) @@ -571,7 +578,9 @@ class XMPPDispatcher(PlugIn): # Unwrap mam try: stanza, properties.mam = unwrap_mam(stanza, own_jid) - except InvalidStanza: + except (InvalidStanza, InvalidJid) as exc: + log.warning(exc) + log.warning(stanza) return typ = stanza.getType() ===================================== nbxmpp/modules/muclumbus.py ===================================== @@ -188,7 +188,7 @@ class Muclumbus: for item in items: try: anonymity_mode = AnonymityMode(item['anonymity_mode']) - except ValueError: + except (ValueError, KeyError): anonymity_mode = AnonymityMode.UNKNOWN results.append( View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/9126550bdb60bee275c98c87a… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/9126550bdb60bee275c98c87a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Groupchat: Show subject timestamp in preferred format
by Philipp Hörist 10 Oct '19

10 Oct '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 3de7d8f6 by Philipp Hörist at 2019-10-10T19:11:03Z Groupchat: Show subject timestamp in preferred format %c uses the preferred format on the current system - - - - - 1 changed file: - gajim/groupchat_control.py Changes: ===================================== gajim/groupchat_control.py ===================================== @@ -1032,8 +1032,7 @@ class GroupchatControl(ChatControlBase): 'nick': event.nickname, 'subject': event.subject} if event.user_timestamp: - date = time.strftime('%d-%m-%Y %H:%M:%S', - time.localtime(event.user_timestamp)) + date = time.strftime('%c', time.localtime(event.user_timestamp)) text = '%s - %s' % (text, date) if (app.config.get('show_subject_on_join') or View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/3de7d8f64134ac703ea31a9337169a1d18… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/3de7d8f64134ac703ea31a9337169a1d18… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Windows: Disable CSD by default
by Philipp Hörist 10 Oct '19

10 Oct '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: c703dcf3 by Philipp Hörist at 2019-10-10T18:17:59Z Windows: Disable CSD by default - - - - - 1 changed file: - gajim/gajim.py Changes: ===================================== gajim/gajim.py ===================================== @@ -65,6 +65,17 @@ def _init_gui(gui): _init_gtk() +def _disable_csd(): + if os.name != 'nt': + return + + if 'GTK_OSD' in os.environ: + # Respect user settings + return + + os.environ['GTK_CSD'] = "0" + + def _init_gtk(): import gi try: @@ -140,4 +151,5 @@ def main(): _check_required_deps() _set_proc_title() + _disable_csd() _init_gui('GTK') View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/c703dcf31ad4c0bb84b61803eba5c4fc0e… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/c703dcf31ad4c0bb84b61803eba5c4fc0e… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Autoscroll correctly to the end after sending a message
by Philipp Hörist 09 Oct '19

09 Oct '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 22cb839e by Philipp Hörist at 2019-10-09T20:50:44Z Autoscroll correctly to the end after sending a message On some systems when an encrypted message was written and the lock icon was displayed, the textview did not scroll to the end. Fixes #9443 - - - - - 1 changed file: - gajim/conversation_textview.py Changes: ===================================== gajim/conversation_textview.py ===================================== @@ -368,7 +368,7 @@ class ConversationTextview(GObject.GObject): def scroll_to_end(self, force=False): if self.autoscroll or force: - util.scroll_to_end(self.tv.get_parent()) + GLib.idle_add(util.scroll_to_end, self.tv.get_parent()) def correct_message(self, correct_id, kind, name): allowed = True View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/22cb839ed8076dbc992b3d447b580d0cb1… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/22cb839ed8076dbc992b3d447b580d0cb1… You're receiving this email because of your account on dev.gajim.org.

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits