Commits October 2019

commits@gajim.org

1 participants
53 discussions

[Git][gajim/gajim][master] MAM: Correctly detect if we sent a message
by Philipp Hörist 18 Oct '19

18 Oct '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 0acfc4c8 by Philipp Hörist at 2019-10-18T21:01:28Z MAM: Correctly detect if we sent a message properties.jid always yields the remote JID now after nbxmpp changes - - - - - 1 changed file: - gajim/common/modules/mam.py Changes: ===================================== gajim/common/modules/mam.py ===================================== @@ -96,7 +96,7 @@ class MAM(BaseModule): if properties.is_muc_pm: return properties.mam.id, properties.id - if self._con.get_own_jid().bareMatch(properties.jid): + if self._con.get_own_jid().bareMatch(properties.from_): # message we sent return properties.mam.id, properties.id View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/0acfc4c8087c731296a49e3cd4c489ee09… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/0acfc4c8087c731296a49e3cd4c489ee09… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Remove unused import
by Philipp Hörist 17 Oct '19

17 Oct '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 44630205 by Philipp Hörist at 2019-10-16T19:03:07Z Remove unused import - - - - - a4945d26 by Philipp Hörist at 2019-10-17T19:10:25Z Refactor message handlers - Remove 'decrypt' extension point, its not needed anymore - Remove decryption finished methods - Remove MessageReceived Events, DecryptedMessageReceived servs the same purpose now Plugins decrypt messages before we execute this handler - - - - - 5 changed files: - gajim/common/modules/mam.py - gajim/common/modules/message.py - gajim/common/zeroconf/connection_handlers_zeroconf.py - gajim/gajim.py - test/broken/unit/test_sessions.py Changes: ===================================== gajim/common/modules/mam.py ===================================== @@ -197,6 +197,37 @@ class MAM(BaseModule): parse_oob(properties, additional_data) + msgtxt = properties.body + + if properties.is_encrypted: + additional_data['encrypted'] = properties.encrypted.additional_data + else: + if properties.eme is not None: + msgtxt = get_eme_message(properties.eme) + + if not msgtxt: + # For example Chatstates, Receipts, Chatmarkers + self._log.debug(stanza.getProperties()) + return + + with_ = properties.jid.getStripped() + if properties.is_muc_pm: + # we store the message with the full JID + with_ = str(with_) + + if properties.is_self_message: + # Self messages can only be deduped with origin-id + if message_id is None: + self._log.warning('Self message without origin-id found') + return + stanza_id = message_id + + if properties.mam.namespace == nbxmpp.NS_MAM_1: + if app.logger.search_for_duplicate( + self._account, with_, properties.mam.timestamp, msgtxt): + self._log.info('Found duplicate with fallback for mam:1') + return + event_attrs.update( {'conn': self._con, 'account': self._account, @@ -217,23 +248,19 @@ class MAM(BaseModule): 'namespace': properties.mam.namespace, }) - if groupchat: - event = MamGcMessageReceivedEvent(None, **event_attrs) - else: - event = MamMessageReceivedEvent(None, **event_attrs) - - if properties.is_encrypted: - event.additional_data['encrypted'] = properties.encrypted.additional_data - self._decryption_finished(event) - else: - app.plugin_manager.extension_point( - 'decrypt', self._con, event, self._decryption_finished) - if not event.encrypted: - if properties.eme is not None: - event.msgtxt = get_eme_message(properties.eme) - self._decryption_finished(event) + app.logger.insert_into_logs(self._account, + with_, + properties.mam.timestamp, + event_attrs['kind'], + unread=False, + message=msgtxt, + contact_name=event_attrs['nick'], + additional_data=additional_data, + stanza_id=stanza_id, + message_id=properties.id) - raise nbxmpp.NodeProcessed + app.nec.push_incoming_event( + NetworkEvent('mam-decrypted-message-received', **event_attrs)) @staticmethod def _parse_gc_attrs(properties): @@ -255,45 +282,6 @@ class MAM(BaseModule): 'nick': None, 'kind': kind} - def _decryption_finished(self, event): - if not event.msgtxt: - # For example Chatstates, Receipts, Chatmarkers - self._log.debug(event.message.getProperties()) - return - - with_ = event.with_.getStripped() - if event.muc_pm: - # we store the message with the full JID - with_ = str(event.with_) - - stanza_id = event.stanza_id - if event.self_message: - # Self messages can only be deduped with origin-id - if event.origin_id is None: - self._log.warning('Self message without origin-id found') - return - stanza_id = event.origin_id - - if event.namespace == nbxmpp.NS_MAM_1: - if app.logger.search_for_duplicate( - self._account, with_, event.timestamp, event.msgtxt): - self._log.info('Found duplicate with fallback for mam:1') - return - - app.logger.insert_into_logs(self._account, - with_, - event.timestamp, - event.kind, - unread=False, - message=event.msgtxt, - contact_name=event.nick, - additional_data=event.additional_data, - stanza_id=stanza_id, - message_id=event.message_id) - - app.nec.push_incoming_event( - MamDecryptedMessageReceived(None, **vars(event))) - def _is_valid_request(self, properties): valid_id = self._mam_query_ids.get(str(properties.mam.archive), None) return valid_id == properties.mam.query_id @@ -634,18 +622,6 @@ class MAM(BaseModule): MAMPreferenceSaved(None, conn=self._con)) -class MamMessageReceivedEvent(NetworkIncomingEvent): - name = 'mam-message-received' - - -class MamGcMessageReceivedEvent(NetworkIncomingEvent): - name = 'mam-gc-message-received' - - -class MamDecryptedMessageReceived(NetworkIncomingEvent): - name = 'mam-decrypted-message-received' - - class MAMPreferenceError(NetworkIncomingEvent): name = 'mam-prefs-error' ===================================== gajim/common/modules/message.py ===================================== @@ -22,7 +22,6 @@ from nbxmpp.const import MessageType from gajim.common import app from gajim.common.i18n import _ -from gajim.common.nec import NetworkIncomingEvent from gajim.common.nec import NetworkEvent from gajim.common.helpers import AdditionalDataDict from gajim.common.const import KindConstant @@ -146,6 +145,41 @@ class Message(BaseModule): 'gajim', 'user_timestamp', properties.user_timestamp) parse_oob(properties, additional_data) + xhtml = parse_xhtml(properties) + + app.nec.push_incoming_event(NetworkEvent('update-client-info', + account=self._account, + jid=jid, + resource=resource)) + + if properties.is_encrypted: + additional_data['encrypted'] = properties.encrypted.additional_data + else: + if properties.eme is not None: + msgtxt = get_eme_message(properties.eme) + + if type_.is_error: + if not msgtxt: + msgtxt = _('message') + if gc_control: + gc_control.add_info_message(msgtxt) + else: + error_msg = stanza.getErrorMsg() or msgtxt + msgtxt = None if error_msg == msgtxt else msgtxt + self._log_error_message(error_msg, + jid, + properties.timestamp) + app.nec.push_incoming_event( + MessageErrorEvent(None, + conn=self._con, + fjid=fjid, + error_code=stanza.getErrorCode(), + error_msg=error_msg, + msg=msgtxt, + time_=properties.timestamp, + session=session, + stanza=stanza)) + return event_attr = { 'conn': self._con, @@ -173,90 +207,40 @@ class Message(BaseModule): 'muc_pm': properties.is_muc_pm, 'gc_control': gc_control, 'attention': properties.attention, - 'xhtml': parse_xhtml(properties), + 'xhtml': xhtml, 'user_nick': properties.nickname, 'subject': properties.subject, - } - - app.nec.push_incoming_event(NetworkEvent('update-client-info', - account=self._account, - jid=jid, - resource=resource)) - - event = MessageReceivedEvent(None, **event_attr) - app.nec.push_incoming_event(event) - - if properties.is_encrypted: - event.additional_data['encrypted'] = properties.encrypted.additional_data - self._on_message_decrypted(event) - else: - app.plugin_manager.extension_point( - 'decrypt', self._con, event, self._on_message_decrypted) - if not event.encrypted: - if properties.eme is not None: - event.msgtxt = get_eme_message(properties.eme) - self._on_message_decrypted(event) - - def _on_message_decrypted(self, event): - groupchat = event.mtype == 'groupchat' - - event_attr = { 'popup': False, 'msg_log_id': None, - 'displaymarking': parse_securitylabel(event.stanza), + 'displaymarking': parse_securitylabel(stanza), } - for name, value in event_attr.items(): - setattr(event, name, value) - - if event.mtype == 'error': - if not event.msgtxt: - event.msgtxt = _('message') - if event.gc_control: - event.gc_control.add_info_message(event.msgtxt) - else: - self._log_error_message(event) - error_msg = event.stanza.getErrorMsg() or event.msgtxt - msgtxt = None if error_msg == event.msgtxt else event.msgtxt - app.nec.push_incoming_event( - MessageErrorEvent(None, - conn=self._con, - fjid=event.fjid, - error_code=event.stanza.getErrorCode(), - error_msg=error_msg, - msg=msgtxt, - time_=event.timestamp, - session=event.session, - stanza=event.stanza)) - return - - if groupchat: - if not event.msgtxt: + if type_.is_groupchat: + if not msgtxt: return - event.room_jid = event.jid - event.nickname = event.resource - event.xhtml_msgtxt = event.xhtml - event.nick = event.resource or '' - app.nec.push_incoming_event(NetworkEvent('gc-message-received', - **vars(event))) + event_attr.update({ + 'room_jid': jid, + 'nickname': resource, + 'xhtml_msgtxt': xhtml, + 'nick': resource or '', + }) + event = NetworkEvent('gc-message-received', **event_attr) + app.nec.push_incoming_event(event) # TODO: Some plugins modify msgtxt in the GUI event self._log_muc_message(event) return app.nec.push_incoming_event( - DecryptedMessageReceivedEvent( - None, **vars(event))) + NetworkEvent('decrypted-message-received', **event_attr)) - def _log_error_message(self, event): - error_msg = event.stanza.getErrorMsg() or event.msgtxt - if app.config.should_log(self._account, event.jid): + def _log_error_message(self, error_msg, jid, timestamp): + if app.config.should_log(self._account, jid): app.logger.insert_into_logs(self._account, - event.jid, - event.timestamp, + jid, + timestamp, KindConstant.ERROR, - message=error_msg, - subject=event.subject) + message=error_msg) def _log_muc_message(self, event): if event.mtype == 'error': @@ -311,13 +295,5 @@ class Message(BaseModule): return None, None -class MessageReceivedEvent(NetworkIncomingEvent): - name = 'message-received' - - -class DecryptedMessageReceivedEvent(NetworkIncomingEvent): - name = 'decrypted-message-received' - - def get_instance(*args, **kwargs): return Message(*args, **kwargs), 'Message' ===================================== gajim/common/zeroconf/connection_handlers_zeroconf.py ===================================== @@ -27,7 +27,7 @@ from gajim.common import app from gajim.common import connection_handlers from gajim.common.i18n import _ from gajim.common.helpers import AdditionalDataDict -from gajim.common.nec import NetworkIncomingEvent, NetworkEvent +from gajim.common.nec import NetworkEvent from gajim.common.const import KindConstant from gajim.common.modules.util import get_eme_message from gajim.common.modules.misc import parse_correction @@ -42,15 +42,6 @@ STATUS_LIST = ['offline', 'connecting', 'online', 'chat', 'away', 'xa', 'dnd', 'invisible'] -class ZeroconfMessageReceivedEvent(NetworkIncomingEvent): - name = 'message-received' - - -class DecryptedMessageReceivedEvent(NetworkIncomingEvent): - name = 'decrypted-message-received' - - - class ConnectionHandlersZeroconf(connection_handlers.ConnectionHandlersBase): def __init__(self): connection_handlers.ConnectionHandlersBase.__init__(self) @@ -88,11 +79,37 @@ class ConnectionHandlersZeroconf(connection_handlers.ConnectionHandlersBase): if thread_id and not session.received_thread_id: session.received_thread_id = True - session.last_receive = time.time() + timestamp = time.time() + session.last_receive = timestamp additional_data = AdditionalDataDict() parse_oob(properties, additional_data) + if properties.is_encrypted: + additional_data['encrypted'] = properties.encrypted.additional_data + else: + if properties.eme is not None: + msgtxt = get_eme_message(properties.eme) + + if type_ == 'error': + if not msgtxt: + msgtxt = _('message') + self._log_error_message(stanza, msgtxt, jid, timestamp) + error_msg = stanza.getErrorMsg() or msgtxt + msgtxt = None if error_msg == msgtxt else msgtxt + app.nec.push_incoming_event( + MessageErrorEvent(None, + conn=self, + fjid=fjid, + error_code=stanza.getErrorCode(), + error_msg=error_msg, + msg=msgtxt, + time_=timestamp, + session=session, + stanza=stanza)) + + return + event_attr = { 'conn': self, 'stanza': stanza, @@ -120,57 +137,20 @@ class ConnectionHandlersZeroconf(connection_handlers.ConnectionHandlersBase): 'xhtml': parse_xhtml(properties), 'user_nick': properties.nickname, 'subject': None, - } - - event = ZeroconfMessageReceivedEvent(None, **event_attr) - app.nec.push_incoming_event(event) - - app.plugin_manager.extension_point( - 'decrypt', self, event, self._on_message_decrypted) - if not event.encrypted: - if properties.eme is not None: - event.msgtxt = get_eme_message(properties.eme) - self._on_message_decrypted(event) - - def _on_message_decrypted(self, event): - event_attr = { 'popup': False, 'msg_log_id': None, 'displaymarking': None, - 'stanza_id': event.unique_id + 'stanza_id': id_, } - for name, value in event_attr.items(): - setattr(event, name, value) - - if event.mtype == 'error': - if not event.msgtxt: - event.msgtxt = _('message') - self._log_error_message(event) - error_msg = event.stanza.getErrorMsg() or event.msgtxt - msgtxt = None if error_msg == event.msgtxt else event.msgtxt - app.nec.push_incoming_event( - MessageErrorEvent(None, - conn=self, - fjid=event.fjid, - error_code=event.stanza.getErrorCode(), - error_msg=error_msg, - msg=msgtxt, - time_=event.timestamp, - session=event.session, - stanza=event.stanza)) - - return - app.nec.push_incoming_event( - DecryptedMessageReceivedEvent(None, **vars(event))) + NetworkEvent('decrypted-message-received', **event_attr)) - def _log_error_message(self, event): - error_msg = event.stanza.getErrorMsg() or event.msgtxt - if app.config.should_log(self.name, event.jid): + def _log_error_message(self, stanza, msgtxt, jid, timestamp): + error_msg = stanza.getErrorMsg() or msgtxt + if app.config.should_log(self.name, jid): app.logger.insert_into_logs(self.name, - event.jid, - event.timestamp, + jid, + timestamp, KindConstant.ERROR, - message=error_msg, - subject=event.subject) + message=error_msg) ===================================== gajim/gajim.py ===================================== @@ -95,7 +95,6 @@ def _disable_csd(): def _init_gtk(): - from gi.repository import Gtk from gajim.gtk import exception exception.init() ===================================== test/broken/unit/test_sessions.py ===================================== @@ -10,8 +10,6 @@ from gajim.common import app from gajim.common import nec from gajim.common import ged from gajim.common.nec import NetworkEvent -from gajim.common.modules.message import MessageReceivedEvent -from gajim.common.modules.message import DecryptedMessageReceivedEvent from gajim.session import ChatControlSession from gajim.roster_window import RosterWindow View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/b2330c57cdd30ce2f1fad00242e033d2b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/b2330c57cdd30ce2f1fad00242e033d2b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 5 commits: Check for required pygobject version
by Philipp Hörist 16 Oct '19

16 Oct '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 7599a37d by Philipp Hörist at 2019-10-16T17:07:02Z Check for required pygobject version - - - - - 8c6e8ea9 by Philipp Hörist at 2019-10-16T17:26:57Z Refactor dependency checks - - - - - c54c1097 by Philipp Hörist at 2019-10-16T17:29:28Z Use single quotes - - - - - 39df77a6 by Philipp Hörist at 2019-10-16T17:30:37Z Use sys.platform instead of os.name - - - - - b2330c57 by Philipp Hörist at 2019-10-16T17:31:29Z Remove tooltip bug workaround for Gtk 3.24.1 Newer Gtk versions are available for Windows and Mac - - - - - 1 changed file: - gajim/gajim.py Changes: ===================================== gajim/gajim.py ===================================== @@ -26,38 +26,56 @@ from distutils.version import LooseVersion as V from gajim.common import i18n -_MIN_NBXMPP_VER = "0.9.92" -_MIN_GTK_VER = "3.22.0" -_MIN_CAIRO_VER = "1.14.0" +_MIN_NBXMPP_VER = '0.9.92' +_MIN_GTK_VER = '3.22.0' +_MIN_CAIRO_VER = '1.14.0' +_MIN_PYGOBJECT_VER = '3.32.0' + + +def check_version(dep_name, current_ver, min_ver): + if V(current_ver) < V(min_ver): + sys.exit('Gajim needs %s >= %s to run. ' + 'Quitting...' % (dep_name, min_ver)) def _check_required_deps(): + error_message = 'Gajim needs %s to run. Quitting…' + try: import nbxmpp except ImportError: - print('Gajim needs python-nbxmpp to run. Quitting…') - sys.exit(1) + sys.exit(error_message % 'python-nbxmpp') + + try: + import gi + except ImportError: + sys.exit(error_message % 'pygobject') - if V(nbxmpp.__version__) < V(_MIN_NBXMPP_VER): - print('Gajim needs python-nbxmpp >= %s to run. ' - 'Quitting...' % _MIN_NBXMPP_VER) - sys.exit(1) + try: + gi.require_versions({'GLib': '2.0', + 'Gio': '2.0', + 'Gtk': '3.0', + 'GObject': '2.0', + 'Pango': '1.0', + 'Soup': '2.4'}) + except ValueError as error: + sys.exit('Missing dependency: %s' % error) try: import cairo except ImportError: - print('Gajim needs python-cairo to run. Quitting…') - sys.exit(1) + sys.exit(error_message % 'python-cairo') - if V(cairo.cairo_version_string()) < V(_MIN_CAIRO_VER): - print('Gajim needs libcairo >= %s to run. ' - 'Quitting...' % _MIN_CAIRO_VER) - sys.exit(1) + from gi.repository import Gtk + gtk_ver = '%s.%s.%s' % (Gtk.get_major_version(), + Gtk.get_minor_version(), + Gtk.get_micro_version()) - if V(cairo.version) < V(_MIN_CAIRO_VER): - print('Gajim needs python-cairo >= %s to run. ' - 'Quitting...' % _MIN_CAIRO_VER) - sys.exit(1) + check_version('python-nbxmpp', nbxmpp.__version__, _MIN_NBXMPP_VER) + check_version('pygobject', gi.__version__, _MIN_PYGOBJECT_VER) + check_version('libcairo', cairo.cairo_version_string(), _MIN_CAIRO_VER) + check_version('python-cairo', cairo.version, _MIN_CAIRO_VER) + check_version('gtk3', gtk_ver, _MIN_GTK_VER) def _init_gui(gui): @@ -66,38 +84,18 @@ def _init_gui(gui): def _disable_csd(): - if os.name != 'nt': + if sys.platform != 'win32': return if 'GTK_OSD' in os.environ: # Respect user settings return - os.environ['GTK_CSD'] = "0" + os.environ['GTK_CSD'] = '0' def _init_gtk(): - import gi - try: - gi.require_version('GLib', '2.0') - gi.require_version('Gio', '2.0') - gi.require_version('Gtk', '3.0') - gi.require_version('Gdk', '3.0') - gi.require_version('GObject', '2.0') - gi.require_version('Pango', '1.0') - gi.require_version('Soup', '2.4') - except ValueError as error: - sys.exit('Missing dependency: %s' % error) - from gi.repository import Gtk - gtk_ver = '%s.%s.%s' % (Gtk.get_major_version(), - Gtk.get_minor_version(), - Gtk.get_micro_version()) - if V(gtk_ver) < V(_MIN_GTK_VER): - print('Gajim needs GTK >= %s to run. ' - 'Quitting...' % _MIN_GTK_VER) - sys.exit(1) - from gajim.gtk import exception exception.init() @@ -105,11 +103,6 @@ def _init_gtk(): from gajim.application import GajimApplication - # Fix bug in 3.24.1 with flickering tooltips - if sys.platform in ('darwin', 'win32'): - settings = Gtk.Settings.get_default() - settings.set_property('gtk-cursor-theme-size', 16) - application = GajimApplication() _install_sginal_handlers(application) application.run(sys.argv) @@ -140,14 +133,14 @@ def _install_sginal_handlers(application): # ^C exits the application normally signal.signal(signal.SIGINT, sigint_cb) signal.signal(signal.SIGTERM, sigint_cb) - if os.name != 'nt': + if sys.platform != 'win32': signal.signal(signal.SIGPIPE, signal.SIG_DFL) def main(): if sys.platform != 'win32': if os.geteuid() == 0: - sys.exit("You must not launch gajim as root, it is insecure.") + sys.exit('You must not launch gajim as root, it is insecure.') _check_required_deps() _set_proc_title() View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/7b9278ae996ff3d185f5b174f20f27337… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/7b9278ae996ff3d185f5b174f20f27337… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Use monotonic time for timeouts
by Philipp Hörist 16 Oct '19

16 Oct '19

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 8fb372a5 by Philipp Hörist at 2019-10-16T17:42:10Z Use monotonic time for timeouts Fixes #87 - - - - - 1 changed file: - nbxmpp/idlequeue.py Changes: ===================================== nbxmpp/idlequeue.py ===================================== @@ -22,6 +22,7 @@ import os import errno import select import logging +import time log = logging.getLogger('nbxmpp.idlequeue') # needed for get_idleqeue @@ -174,8 +175,7 @@ class IdleCommand(IdleObject): self.pipe = Popen(self._compose_command_args(), stdout=PIPE, bufsize=1024, shell=True, stderr=STDOUT, stdin=PIPE) if self.commandtimeout >= 0: - self.endtime = self.idlequeue.current_time() + \ - (self.commandtimeout * 1e6) + self.endtime = self.idlequeue.current_time() + self.commandtimeout self.idlequeue.set_alarm(self.wait_child, 0.1) def _start_posix(self): @@ -253,7 +253,7 @@ class IdleQueue: """ Set up a new alarm. alarm_cb will be called after specified seconds. """ - alarm_time = self.current_time() + (seconds * 1e6) + alarm_time = self.current_time() + seconds # almost impossible, but in case we have another alarm_cb at this time if alarm_time in self.alarms: self.alarms[alarm_time].append(alarm_cb) @@ -306,7 +306,7 @@ class IdleQueue: if func: log_txt += ' with function ' + str(func) log.info(log_txt) - timeout = self.current_time() + (seconds * 1e6) + timeout = self.current_time() + seconds if fd in self.read_timeouts: self.read_timeouts[fd][timeout] = func else: @@ -385,8 +385,7 @@ class IdleQueue: self._remove_idle(fd) def current_time(self): - from time import time - return time() * 1e6 + return time.monotonic() def _remove_idle(self, fd): """ @@ -571,5 +570,3 @@ class GlibIdleQueue(IdleQueue): def process(self): self._check_time_events() - - current_time = GLib.get_real_time View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/8fb372a55962a47e4ddf8bb35a… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/8fb372a55962a47e4ddf8bb35a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Don't import version from package
by Philipp Hörist 16 Oct '19

16 Oct '19

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: bf53ae00 by Philipp Hörist at 2019-10-16T11:14:46Z Don't import version from package __init__.py has too many other imports, this leads to all dependencys beeing imported in the install process before they are downloaded - - - - - 1 changed file: - setup.cfg Changes: ===================================== setup.cfg ===================================== @@ -1,6 +1,6 @@ [metadata] name = nbxmpp -version = attr: nbxmpp.__version__ +version = 0.9.92 description = Non blocking Jabber/XMPP module author = Yann Leboulanger, Philipp Hoerist author_email = gajim-devel(a)gajim.org View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/bf53ae006052d0a3265a1969d9… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/bf53ae006052d0a3265a1969d9… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 4 commits: Refactor parsing xhtml
by Philipp Hörist 14 Oct '19

14 Oct '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 3ffa37f2 by Philipp Hörist at 2019-10-14T15:31:43Z Refactor parsing xhtml Adapt to nbxmpp changes - - - - - 61873094 by Philipp Hörist at 2019-10-14T15:57:22Z Refactor parsing nickname - - - - - 1af5612d by Philipp Hörist at 2019-10-14T20:09:43Z Refactor parsing subject - - - - - 7b9278ae by Philipp Hörist at 2019-10-14T20:34:50Z Chatstate: Use StanzaHandler instead of delegate() - - - - - 5 changed files: - gajim/common/modules/chatstates.py - gajim/common/modules/message.py - gajim/common/modules/misc.py - gajim/common/modules/user_nickname.py - gajim/common/zeroconf/connection_handlers_zeroconf.py Changes: ===================================== gajim/common/modules/chatstates.py ===================================== @@ -51,17 +51,6 @@ def ensure_enabled(func): return func_wrapper -def parse_chatstate(stanza: nbxmpp.Message) -> Optional[str]: - if stanza.getTag('delay', namespace=nbxmpp.NS_DELAY2) is not None: - return None - - children = stanza.getChildren() - for child in children: - if child.getNamespace() == nbxmpp.NS_CHATSTATES: - return child.getName() - return None - - class Chatstate(BaseModule): def __init__(self, con: ConnectionT) -> None: BaseModule.__init__(self, con) @@ -69,6 +58,10 @@ class Chatstate(BaseModule): self.handlers = [ StanzaHandler(name='presence', callback=self._presence_received), + StanzaHandler(name='message', + callback=self._process_chatstate, + ns=nbxmpp.NS_CHATSTATES, + priority=46), ] # Our current chatstate with a specific contact @@ -144,35 +137,39 @@ class Chatstate(BaseModule): account=self._account, contact=contact)) - def delegate(self, event: Any) -> None: - if self._con.get_own_jid().bareMatch(event.jid) or event.sent: - # Dont show chatstates from our own resources + def _process_chatstate(self, _con, _stanza, properties): + if not properties.has_chatstate: return - if event.mtype == 'groupchat': - # Not implemented yet + if (properties.is_self_message or + properties.type.is_groupchat or + properties.is_carbon_message and properties.carbon.is_sent): + if properties.chatstate in ('inactive', 'gone', + 'composing', 'paused'): + raise nbxmpp.NodeProcessed return - chatstate = parse_chatstate(event.stanza) - if chatstate is None: - return - - if event.muc_pm: + if properties.is_muc_pm: contact = app.contacts.get_gc_contact( - self._account, event.jid, event.resource) + self._account, + properties.jid.getBare(), + properties.jid.getResource()) else: contact = app.contacts.get_contact_from_full_jid( - self._account, event.fjid) + self._account, str(properties.jid)) if contact is None: return - contact.chatstate = chatstate - self._log.info('Recv: %-10s - %s', chatstate, event.fjid) + contact.chatstate = properties.chatstate + self._log.info('Recv: %-10s - %s', properties.chatstate, properties.jid) app.nec.push_outgoing_event( NetworkEvent('chatstate-received', account=self._account, contact=contact)) + if properties.chatstate in ('inactive', 'gone', 'composing', 'paused'): + raise nbxmpp.NodeProcessed + @ensure_enabled def _check_last_interaction(self) -> GLib.SOURCE_CONTINUE: now = time.time() ===================================== gajim/common/modules/message.py ===================================== @@ -29,7 +29,6 @@ from gajim.common.const import KindConstant from gajim.common.modules.base import BaseModule 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_oob from gajim.common.modules.misc import parse_xhtml @@ -174,6 +173,9 @@ class Message(BaseModule): 'muc_pm': properties.is_muc_pm, 'gc_control': gc_control, 'attention': properties.attention, + 'xhtml': parse_xhtml(properties), + 'user_nick': properties.nickname, + 'subject': properties.subject, } app.nec.push_incoming_event(NetworkEvent('update-client-info', @@ -196,21 +198,12 @@ class Message(BaseModule): self._on_message_decrypted(event) def _on_message_decrypted(self, event): - try: - self._con.get_module('Chatstate').delegate(event) - except nbxmpp.NodeProcessed: - return - - subject = event.stanza.getSubject() groupchat = event.mtype == 'groupchat' event_attr = { 'popup': False, 'msg_log_id': None, - 'subject': subject, 'displaymarking': parse_securitylabel(event.stanza), - 'user_nick': '' if event.sent else parse_nickname(event.stanza), - 'xhtml': parse_xhtml(event.stanza), } for name, value in event_attr.items(): ===================================== gajim/common/modules/misc.py ===================================== @@ -43,7 +43,7 @@ def parse_correction(properties): # XEP-0071: XHTML-IM -def parse_xhtml(stanza): +def parse_xhtml(properties): if app.config.get('ignore_incoming_xhtml'): return None - return stanza.getXHTML() + return properties.xhtml ===================================== gajim/common/modules/user_nickname.py ===================================== @@ -57,12 +57,5 @@ class UserNickname(BaseModule): nickname=nick)) -def parse_nickname(stanza: nbxmpp.Node) -> str: - nick = stanza.getTag('nick', namespace=nbxmpp.NS_NICK) - if nick is None: - return '' - return nick.getData() - - def get_instance(*args: Any, **kwargs: Any) -> Tuple[UserNickname, str]: return UserNickname(*args, **kwargs), 'UserNickname' ===================================== gajim/common/zeroconf/connection_handlers_zeroconf.py ===================================== @@ -22,8 +22,6 @@ import time import logging -import nbxmpp - from gajim.common import app from gajim.common import connection_handlers @@ -31,7 +29,6 @@ from gajim.common.i18n import _ from gajim.common.helpers import AdditionalDataDict from gajim.common.nec import NetworkIncomingEvent, NetworkEvent 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_oob @@ -120,6 +117,9 @@ class ConnectionHandlersZeroconf(connection_handlers.ConnectionHandlersBase): 'muc_pm': False, 'gc_control': None, 'attention': properties.attention, + 'xhtml': parse_xhtml(properties), + 'user_nick': properties.nickname, + 'subject': None, } event = ZeroconfMessageReceivedEvent(None, **event_attr) @@ -133,18 +133,10 @@ class ConnectionHandlersZeroconf(connection_handlers.ConnectionHandlersBase): self._on_message_decrypted(event) def _on_message_decrypted(self, event): - try: - self.get_module('Chatstate').delegate(event) - except nbxmpp.NodeProcessed: - return - event_attr = { 'popup': False, 'msg_log_id': None, - 'subject': None, 'displaymarking': None, - 'user_nick': parse_nickname(event.stanza), - 'xhtml': parse_xhtml(event.stanza), 'stanza_id': event.unique_id } View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/9225b79dc8865b18294784d70be466dc9… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/9225b79dc8865b18294784d70be466dc9… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] 4 commits: Add xhtml message attribute
by Philipp Hörist 14 Oct '19

14 Oct '19

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 8cc2f1d3 by Philipp Hörist at 2019-10-14T15:06:06Z Add xhtml message attribute - - - - - bae3cfd1 by Philipp Hörist at 2019-10-14T16:20:19Z Add Security Labels (XEP-0258) support - - - - - 16305759 by Philipp Hörist at 2019-10-14T18:53:27Z Add Chat State Notifications (XEP-0085) support - - - - - 6705a89b by Philipp Hörist at 2019-10-14T18:53:31Z Attention: Don't parse legacy delay tags - - - - - 8 changed files: - nbxmpp/const.py - nbxmpp/dispatcher.py - nbxmpp/modules/attention.py - + nbxmpp/modules/chatstates.py - nbxmpp/modules/message.py - + nbxmpp/modules/security_labels.py - nbxmpp/protocol.py - nbxmpp/structs.py Changes: ===================================== nbxmpp/const.py ===================================== @@ -545,3 +545,12 @@ TUNE_DATA = [ 'title', 'track', 'uri'] + + +CHATSTATES = [ + 'active', + 'inactive', + 'gone', + 'composing', + 'paused' +] \ No newline at end of file ===================================== nbxmpp/dispatcher.py ===================================== @@ -76,6 +76,8 @@ 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.security_labels import SecurityLabels +from nbxmpp.modules.chatstates import Chatstates from nbxmpp.modules.misc import unwrap_carbon from nbxmpp.modules.misc import unwrap_mam from nbxmpp.util import get_properties_struct @@ -219,6 +221,8 @@ class XMPPDispatcher(PlugIn): self._modules['OOB'] = OOB(self._owner) self._modules['Correction'] = Correction(self._owner) self._modules['Attention'] = Attention(self._owner) + self._modules['SecurityLabels'] = SecurityLabels(self._owner) + self._modules['Chatstates'] = Chatstates(self._owner) for instance in self._modules.values(): for handler in instance.handlers: ===================================== nbxmpp/modules/attention.py ===================================== @@ -45,7 +45,7 @@ class Attention: if properties.is_carbon_message and properties.carbon.is_sent: return - if stanza.getTag('x', namespace=NS_DELAY2) is not None: + if stanza.getTag('delay', namespace=NS_DELAY2) is not None: return properties.attention = True ===================================== nbxmpp/modules/chatstates.py ===================================== @@ -0,0 +1,62 @@ +# 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_CHATSTATES +from nbxmpp.protocol import NS_DELAY2 +from nbxmpp.structs import StanzaHandler +from nbxmpp.const import CHATSTATES + +log = logging.getLogger('nbxmpp.m.chatstates') + + +class Chatstates: + def __init__(self, client): + self._client = client + self.handlers = [ + StanzaHandler(name='message', + callback=self._process_message_chatstate, + ns=NS_CHATSTATES, + priority=15), + ] + + def _process_message_chatstate(self, _con, stanza, properties): + chatstate = parse_chatstate(stanza) + if chatstate is None: + return + + if properties.is_mam_message: + return + + if stanza.getTag('delay', namespace=NS_DELAY2) is not None: + return + + if chatstate not in CHATSTATES: + log.warning('Invalid chatstate: %s', chatstate) + log.warning(stanza) + return + + properties.chatstate = chatstate + + +def parse_chatstate(stanza): + children = stanza.getChildren() + for child in children: + if child.getNamespace() == NS_CHATSTATES: + return child.getName() + return None ===================================== nbxmpp/modules/message.py ===================================== @@ -79,6 +79,7 @@ class BaseMessage: forms = stanza.getTags('x', namespace=NS_DATA) if forms: properties.forms = forms + properties.xhtml = stanza.getXHTML() @staticmethod def _parse_type(stanza): ===================================== nbxmpp/modules/security_labels.py ===================================== @@ -0,0 +1,57 @@ +# 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_SECLABEL +from nbxmpp.structs import StanzaHandler +from nbxmpp.structs import SecurityLabel +from nbxmpp.structs import DisplayMarking + +log = logging.getLogger('nbxmpp.m.security_labels') + + +class SecurityLabels: + def __init__(self, client): + self._client = client + self.handlers = [ + StanzaHandler(name='message', + callback=self._process_message_security_label, + ns=NS_SECLABEL, + priority=15), + ] + + def _process_message_security_label(self, _con, stanza, properties): + security = stanza.getTag('securitylabel', namespace=NS_SECLABEL) + if security is None: + return + + displaymarking = security.getTag('displaymarking') + if displaymarking is None: + return + + label = displaymarking.getData() + if not label: + log.warning('No label found') + log.warning(stanza) + return + + fgcolor = displaymarking.getAttr('fgcolor') + bgcolor = displaymarking.getAttr('bgcolor') + + properties.security_label = SecurityLabel( + DisplayMarking(label, fgcolor, bgcolor)) ===================================== nbxmpp/protocol.py ===================================== @@ -1243,12 +1243,14 @@ class Message(Protocol): TODO: Returning a DOM could make rendering faster. """ - xhtml = self.getTag('html') + xhtml = self.getTag('html', namespace=NS_XHTML_IM) if xhtml: if xmllang: - body = xhtml.getTag('body', attrs={'xml:lang': xmllang}) + body = xhtml.getTag('body', + namespace=NS_XHTML, + attrs={'xml:lang': xmllang}) else: - body = xhtml.getTag('body') + body = xhtml.getTag('body', namespace=NS_XHTML) return str(body) return None ===================================== nbxmpp/structs.py ===================================== @@ -125,6 +125,9 @@ OOBData = namedtuple('OOBData', 'url desc') CorrectionData = namedtuple('CorrectionData', 'id') +DisplayMarking = namedtuple('DisplayMarking', 'label fgcolor bgcolor') +SecurityLabel = namedtuple('SecurityLabel', 'displaymarking') + class DiscoInfo(namedtuple('DiscoInfo', 'stanza identities features dataforms timestamp')): @@ -553,6 +556,9 @@ class MessageProperties: self.correction = None self.attention = False self.forms = None + self.xhtml = None + self.security_label = None + self.chatstate = None @property def has_user_delay(self): @@ -649,6 +655,18 @@ class MessageProperties: def has_forms(self): return self.forms is not None + @property + def has_xhtml(self): + return self.xhtml is not None + + @property + def has_security_label(self): + return self.security_label is not None + + @property + def has_chatstate(self): + return self.chatstate is not None + class IqProperties: def __init__(self): View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/22ddb4b89a8bdd94d96c7b4b0… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/22ddb4b89a8bdd94d96c7b4b0… You're receiving this email because of your account on dev.gajim.org.

1 0

[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

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits October 2019