Commits August 2019

commits@gajim.org

1 participants
78 discussions

[Git][gajim/gajim][master] CSSConfig: Cache missing values
by Philipp Hörist 31 Aug '19

31 Aug '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 21438499 by Philipp Hörist at 2019-08-31T20:58:32Z CSSConfig: Cache missing values Iterating over the css data causes performance issues on older machines Fixes #9820 - - - - - 1 changed file: - gajim/gtk/css_config.py Changes: ===================================== gajim/gtk/css_config.py ===================================== @@ -334,6 +334,8 @@ class CSSConfig(): self._add_to_cache(selector, 'fontdescription', desc) return desc + self._add_to_cache(selector, 'fontdescription', None) + def _get_description_from_css(self, family, size, style, weight): if family is None: return @@ -398,9 +400,9 @@ class CSSConfig(): # search in default theme if not pre: rule = self._get_default_rule(selector, attr) - if rule is not None: - self._add_to_cache(selector, attr, rule.style[attr]) - return rule.style[attr] + value = rule if rule is None else rule.style[attr] + self._add_to_cache(selector, attr, value) + return value def remove_value(self, selector, attr, pre=False): if attr == StyleAttr.FONT: View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/2143849981a79c65d0f8629820d9005078… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/2143849981a79c65d0f8629820d9005078… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Replace css-utils with css-parser
by Philipp Hörist 31 Aug '19

31 Aug '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: afbfb63a by Eli Schwartz at 2019-08-31T19:53:56Z Replace css-utils with css-parser The latter is a maintained fork that runs natively on python2/python3 (without using the fragile 2to3), fixes deprecations, and has a passing testsuite. - - - - - 7 changed files: - README.md - flatpak/org.gajim.Gajim.yaml - gajim/gtk/css_config.py - mypy.ini - setup.cfg - win/_base.sh - win/dev_env.sh Changes: ===================================== README.md ===================================== @@ -9,7 +9,7 @@ - gir1.2-gtk-3.0 (>=3.22) - python3-nbxmpp (>=0.9.90.4) - python3-openssl (>=16.2) -- python3-cssutils (>=1.0.2) +- python3-css-parser - python3-keyring - python3-precis-i18n ===================================== flatpak/org.gajim.Gajim.yaml ===================================== @@ -147,16 +147,14 @@ modules: url: https://files.pythonhosted.org/packages/6e/b3/b4d443d2e30c00cdb736124262221… sha256: afbfe7bc9bdba69d25c551b0c738adde533d87e0b51ad6bbe332cbea19ad8476 - - name: python3-cssutils + - name: python3-css-parser buildsystem: simple build-commands: - - pip3 install --prefix=/app cssutils-1.0.2-py3-none-any.whl - cleanup: - - /bin + - pip3 install --prefix=/app css-parser-1.0.4-py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/6b/15/a9fb9010f58d1c55dd0b7779db233… - sha256: c74dbe19c92f5052774eadb15136263548dd013250f1ed1027988e7fef125c8d + url: https://files.pythonhosted.org/packages/py3/c/css_parser/css_parser-1.0.4-p… + sha256: 49d6906416569e715b144df97ed81a94b6dc663fbcae6d1dbf4807e7fb8367ae - name: python3-precis_i18n buildsystem: simple ===================================== gajim/gtk/css_config.py ===================================== @@ -19,10 +19,10 @@ import os import math import logging -import cssutils from gi.repository import Gtk from gi.repository import Gdk from gi.repository import Pango +import css_parser from gajim.common import app from gajim.common import configpaths @@ -66,7 +66,7 @@ class CSSConfig(): css here.""" # Delete empty rules - cssutils.ser.prefs.keepEmptyRules = False + css_parser.ser.prefs.keepEmptyRules = False # Holds the currently selected theme in the Theme Editor self._pre_css = None @@ -202,16 +202,16 @@ class CSSConfig(): self._css_path = self._determine_theme_path() else: self._css_path = new_path - self._css = cssutils.parseFile(self._css_path) + self._css = css_parser.parseFile(self._css_path) def _load_default(self): self._default_css_path = self.get_theme_path('default', user=False) - self._default_css = cssutils.parseFile(self._default_css_path) + self._default_css = css_parser.parseFile(self._default_css_path) def _load_pre(self, theme): log.info('Preload theme %s', theme) self._pre_css_path = self.get_theme_path(theme) - self._pre_css = cssutils.parseFile(self._pre_css_path) + self._pre_css = css_parser.parseFile(self._pre_css_path) def _write(self, pre): path = self._css_path @@ -251,7 +251,7 @@ class CSSConfig(): # The rule was not found, so we add it to this theme log.info('Set %s %s %s', selector, attr, value) - rule = cssutils.css.CSSStyleRule(selectorText=selector) + rule = css_parser.css.CSSStyleRule(selectorText=selector) rule.style[attr] = value css.add(rule) self._write(pre) @@ -282,7 +282,7 @@ class CSSConfig(): # The rule was not found, so we add it to this theme log.info('Set Font for: %s %s %s %s %s', selector, family, size, style, weight) - rule = cssutils.css.CSSStyleRule(selectorText=selector) + rule = css_parser.css.CSSStyleRule(selectorText=selector) rule.style['font-family'] = family rule.style['font-style'] = style rule.style['font-size'] = '%spt' % size ===================================== mypy.ini ===================================== @@ -51,7 +51,7 @@ ignore_missing_imports = True [mypy-ossaudiodev.*] ignore_missing_imports = True -[mypy-cssutils.*] +[mypy-css_parser.*] ignore_missing_imports = True [mypy-distro.*] @@ -70,4 +70,4 @@ ignore_missing_imports = True ignore_missing_imports = True [mypy-cairo.*] -ignore_missing_imports = True \ No newline at end of file +ignore_missing_imports = True ===================================== setup.cfg ===================================== @@ -1,5 +1,5 @@ [flake8] -ignore = +ignore = exclude = .git,__pycache__,.gitlab max-complexity = 15 builtins=_ @@ -20,7 +20,7 @@ python_requires = >=3.5 packages = find: test_suite = test install_requires = - cssutils>=1.0.2 + css-parser keyring nbxmpp>=0.9.92 precis-i18n>=1.0.0 @@ -45,4 +45,3 @@ gajim = exclude = gajim.dev test* - ===================================== win/_base.sh ===================================== @@ -105,7 +105,7 @@ keyring python-gnupg python-axolotl qrcode -cssutils +css_parser " build_pip install $(echo "$PIP_REQUIREMENTS" | tr ["\\n"] [" "]) ===================================== win/dev_env.sh ===================================== @@ -25,7 +25,7 @@ git+https://github.com/enthought/pywin32-ctypes.git python-axolotl python-gnupg keyring -cssutils +css_parser qrcode " pip3 install precis-i18n View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/afbfb63a000b6c1baf2445ac5d794d5b39… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/afbfb63a000b6c1baf2445ac5d794d5b39… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: GroupchatJoin: Handle <gone> error better
by Philipp Hörist 31 Aug '19

31 Aug '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 674e5ab2 by Philipp Hörist at 2019-08-31T19:30:13Z GroupchatJoin: Handle <gone> error better - Show reason when group chat is gone - Follow redirect if one exists - - - - - 20cb0f09 by Philipp Hörist at 2019-08-31T19:30:13Z StartChat: Handle <gone> error better - Show reason when group chat is gone - Follow redirect if one exists - - - - - 4 changed files: - gajim/common/const.py - gajim/common/helpers.py - gajim/gtk/groupchat_join.py - gajim/gtk/start_chat.py Changes: ===================================== gajim/common/const.py ===================================== @@ -240,6 +240,7 @@ MUC_DISCO_ERRORS = { 'not-muc-service': _('Address does not belong to a group chat server'), 'already-exists': _('Group chat already exists'), 'item-not-found': _('Group chat does not exist'), + 'gone': _('Group chat is closed'), } ===================================== gajim/common/helpers.py ===================================== @@ -1641,3 +1641,10 @@ def get_groupchat_name(con, jid): return disco_info.muc_name return jid.split('@')[0] + + +def get_alternative_venue(error): + if error.condition == 'gone' and error.condition_data is not None: + uri = parse_uri(error.condition_data) + if uri.type == URIType.XMPP and uri.action == URIAction.JOIN: + return uri.data['jid'] ===================================== gajim/gtk/groupchat_join.py ===================================== @@ -20,7 +20,9 @@ from nbxmpp.util import is_error_result from gajim.common import app from gajim.common.i18n import _ +from gajim.common.i18n import get_rfc5646_lang from gajim.common.helpers import to_user_string +from gajim.common.helpers import get_alternative_venue from gajim.common.const import MUC_DISCO_ERRORS from gajim.gtk.groupchat_info import GroupChatInfoScrolled @@ -40,6 +42,7 @@ class GroupchatJoin(Gtk.ApplicationWindow): self._destroyed = False self.account = account self.jid = jid + self._redirected = False self._main_box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=18) @@ -84,7 +87,16 @@ class GroupchatJoin(Gtk.ApplicationWindow): @ensure_not_destroyed def _disco_info_received(self, result): if is_error_result(result): - self._set_error(result) + jid = get_alternative_venue(result) + if jid is None or self._redirected: + self._set_error(result) + return + + self.jid = jid + self._redirected = True + con = app.connections[self.account] + con.get_module('Discovery').disco_muc( + jid, callback=self._disco_info_received) elif result.is_muc: self._muc_info_box.set_from_disco_info(result) @@ -99,6 +111,10 @@ class GroupchatJoin(Gtk.ApplicationWindow): def _set_error(self, error): text = MUC_DISCO_ERRORS.get(error.condition, to_user_string(error)) + if error.condition == 'gone': + reason = error.get_text(get_rfc5646_lang()) + if reason: + text = '%s:\n%s' % (text, reason) self._show_error_page(text) def _set_error_from_code(self, error_code): @@ -128,6 +144,7 @@ class ErrorPage(Gtk.Box): error_icon.set_valign(Gtk.Align.END) self._error_label = Gtk.Label() + self._error_label.set_justify(Gtk.Justification.CENTER) self._error_label.set_valign(Gtk.Align.START) self._error_label.get_style_context().add_class('bold16') self._error_label.set_line_wrap(True) ===================================== gajim/gtk/start_chat.py ===================================== @@ -28,7 +28,9 @@ from gajim.common import helpers from gajim.common.helpers import validate_jid from gajim.common.helpers import to_user_string from gajim.common.helpers import get_groupchat_name +from gajim.common.helpers import get_alternative_venue from gajim.common.i18n import _ +from gajim.common.i18n import get_rfc5646_lang from gajim.common.const import AvatarSize from gajim.common.const import MUC_DISCO_ERRORS @@ -57,6 +59,7 @@ class StartChatDialog(Gtk.ApplicationWindow): self._keywords = [] self._destroyed = False self._search_stopped = False + self._redirected = False self._ui = get_builder('start_chat_dialog.ui') self.add(self._ui.stack) @@ -257,6 +260,7 @@ class StartChatDialog(Gtk.ApplicationWindow): return self.ready_to_destroy = False + self._redirected = False self._disco_muc(row.account, row.jid) else: @@ -272,7 +276,13 @@ class StartChatDialog(Gtk.ApplicationWindow): @ensure_not_destroyed def _disco_info_received(self, account, result): if is_error_result(result): - self._set_error(result) + jid = get_alternative_venue(result) + if jid is None or self._redirected: + self._set_error(result) + return + + self._redirected = True + self._disco_muc(account, jid) elif result.is_muc: self._muc_info_box.set_account(account) @@ -284,6 +294,10 @@ class StartChatDialog(Gtk.ApplicationWindow): def _set_error(self, error): text = MUC_DISCO_ERRORS.get(error.condition, to_user_string(error)) + if error.condition == 'gone': + reason = error.get_text(get_rfc5646_lang()) + if reason: + text = '%s:\n%s' % (text, reason) self._show_error_page(text) def _set_error_from_code(self, error_code): @@ -319,6 +333,8 @@ class StartChatDialog(Gtk.ApplicationWindow): self._show_error_page(_('You can not join a group chat ' 'unless you are connected.')) return + + self._redirected = False self._disco_muc(account, selected_row.jid) def _set_listbox(self, listbox): View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/5d6d21fcc0808d5427392e47591f065f5… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/5d6d21fcc0808d5427392e47591f065f5… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Flatpak: Update dependencies
by André 31 Aug '19

31 Aug '19

André pushed to branch master at gajim / gajim Commits: 79ffc3a1 by André Apitzsch at 2019-08-31T09:59:17Z Flatpak: Update dependencies - - - - - 5d6d21fc by André Apitzsch at 2019-08-31T10:22:40Z Flatpak: Remove dconf hole Gajim doesn't use GSettings, so data migration is not needed. https://blogs.gnome.org/mclasen/2019/07/12/settings-in-a-sandbox-world/ - - - - - 1 changed file: - flatpak/org.gajim.Gajim.yaml Changes: ===================================== flatpak/org.gajim.Gajim.yaml ===================================== @@ -1,6 +1,6 @@ app-id: org.gajim.Gajim runtime: org.gnome.Platform -runtime-version: 3.32 +runtime-version: '3.32' sdk: org.gnome.Sdk command: gajim tags: nightly @@ -19,11 +19,6 @@ finish-args: - --talk-name=org.freedesktop.portal.Fcitx # Keyring - --talk-name=org.freedesktop.secrets - # dconf - - --filesystem=xdg-run/dconf - - --filesystem=~/.config/dconf:ro - - --talk-name=ca.desrt.dconf - - --env=DCONF_USER_CONFIG_DIR=.config/dconf # GnuPG - --filesystem=~/.gnupg # extensions @@ -66,8 +61,8 @@ modules: - pip3 install --prefix=/app . sources: - type: archive - url: https://files.pythonhosted.org/packages/64/7c/27367b38e6cc3e1f49f193deb761f… - sha256: e113878a446c6228669144ae8a56e268c91b7f1fafae927adc4879d9849e0ea7 + url: https://files.pythonhosted.org/packages/93/1a/ab8c62b5838722f29f3daffcc8d4b… + sha256: 041c81822e9f84b1d9c401182e174996f0bae9991f33725d059b771744290774 - name: python3-asn1crypto buildsystem: simple @@ -93,8 +88,8 @@ modules: - python3 setup.py install --prefix=/app sources: - type: archive - url: https://files.pythonhosted.org/packages/07/ca/bc827c5e55918ad223d59d299fff9… - sha256: 26c821cbeb683facb966045e2064303029d572a87ee69ca5a1bf54bf55f93ca6 + url: https://files.pythonhosted.org/packages/c2/95/f43d02315f4ec074219c6e3124a87… + sha256: e6347742ac8f35ded4a46ff835c60e68c22a536a8ae5c4422966d06946b6d4c6 - name: python3-pyopenssl buildsystem: simple @@ -117,11 +112,11 @@ modules: - name: python3-jeepney buildsystem: simple build-commands: - - pip3 install --prefix=/app jeepney-0.4-py3-none-any.whl + - pip3 install --prefix=/app jeepney-0.4.1-py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/2b/f7/ff23b9b59534f501d47c327576aad… - sha256: f6f8b1428403b4afad04b6b82f9ab9fc426c253d7504c9031c41712a2c01dc74 + url: https://files.pythonhosted.org/packages/0a/4c/ef880713a6c6d628869596703167e… + sha256: f6a3f93464a0cf052f4e87da3c8b3ed1e27696758fb9739c63d3a74d9a1b6774 - name: python3-secretstorage buildsystem: simple @@ -144,13 +139,13 @@ modules: - name: python3-keyring buildsystem: simple build-commands: - - pip3 install --prefix=/app keyring-18.0.0-py2.py3-none-any.whl + - pip3 install --prefix=/app keyring-19.0.2-py2.py3-none-any.whl cleanup: - /bin sources: - type: file - url: https://files.pythonhosted.org/packages/a1/28/0058032477bfdf2003e605d175629… - sha256: ca33f5ccc542b9ffaa196ee9a33488069e5e7eac77d5b81969f8a3ce74d0230c + url: https://files.pythonhosted.org/packages/6e/b3/b4d443d2e30c00cdb736124262221… + sha256: afbfe7bc9bdba69d25c551b0c738adde533d87e0b51ad6bbe332cbea19ad8476 - name: python3-cssutils buildsystem: simple @@ -166,11 +161,11 @@ modules: - name: python3-precis_i18n buildsystem: simple build-commands: - - pip3 install --prefix=/app precis_i18n-1.0.0-py3-none-any.whl + - pip3 install --prefix=/app precis_i18n-1.0.1-py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/08/9d/d32f1b7c6d280c82a786b629ba89b… - sha256: f6942bbffec698d0d7e30c42f589f3f6da13e723d047997d0761a41facf2986f + url: https://files.pythonhosted.org/packages/b6/ec/9abe8377d9819fc0383992aaa1b8c… + sha256: dc9f9fb0c080af9454adce9cc1ddcd718309f3a99ca05186f65e9f6b0654dcd9 - name: gspell cleanup: View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/7e3d67e7ff68d8beb8d0868532b2193dc… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/7e3d67e7ff68d8beb8d0868532b2193dc… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Groupchat: Integrate Kick, Ban, and Destroy into GroupchatControl
by Philipp Hörist 29 Aug '19

29 Aug '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 7e3d67e7 by Daniel Brötzmann at 2019-08-29T21:52:06Z Groupchat: Integrate Kick, Ban, and Destroy into GroupchatControl - - - - - 4 changed files: - − gajim/data/gui/destroy_muc_dialog.ui - gajim/data/gui/groupchat_control.ui - gajim/groupchat_control.py - gajim/gtk/dialogs.py Changes: ===================================== gajim/data/gui/destroy_muc_dialog.ui deleted ===================================== @@ -1,194 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<interface> - <requires lib="gtk+" version="3.20"/> - <object class="GtkDialog" id="destroy_muc_dialog"> - <property name="width_request">250</property> - <property name="can_focus">False</property> - <property name="border_width">18</property> - <property name="resizable">False</property> - <property name="modal">True</property> - <property name="type_hint">dialog</property> - <child> - <placeholder/> - </child> - <child internal-child="vbox"> - <object class="GtkBox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <property name="spacing">12</property> - <child internal-child="action_area"> - <object class="GtkButtonBox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="layout_style">end</property> - <child> - <object class="GtkButton" id="cancel_button"> - <property name="label">_Cancel</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="destroy_button"> - <property name="label">_Destroy</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="has_default">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <style> - <class name="destructive-action"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="pack_type">end</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkGrid"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="row_spacing">6</property> - <property name="column_spacing">12</property> - <child> - <object class="GtkLabel" id="label_header"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="label" translatable="yes">Destroy this group chat permanently?</property> - <property name="use_markup">True</property> - <property name="wrap">True</property> - <property name="xalign">0</property> - <style> - <class name="large-header"/> - </style> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkExpander" id="reason_expander"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="margin_top">6</property> - <child> - <object class="GtkBox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <property name="spacing">6</property> - <child> - <object class="GtkEntry" id="reason_entry"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="margin_top">6</property> - <property name="activates_default">True</property> - <property name="placeholder_text" translatable="yes">Reason...</property> - <property name="show_emoji_icon">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="alt_venue_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="margin_top">6</property> - <property name="label" translatable="yes">Where participants should go (optional)</property> - <property name="wrap">True</property> - <property name="xalign">0</property> - <style> - <class name="dim-label"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">2</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="alt_venue_entry"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="placeholder_text" translatable="yes">Alternate venue...</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">3</property> - </packing> - </child> - </object> - </child> - <child type="label"> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">_Reason and alternate venue (optional)</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">reason_entry</property> - <signal name="mnemonic-activate" handler="_on_reason_mnemonic_activate" swapped="no"/> - <style> - <class name="dim-label"/> - </style> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkImage"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">start</property> - <property name="icon_name">user-trash-symbolic</property> - <property name="icon_size">6</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - <property name="height">2</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - </object> - </child> - </object> -</interface> ===================================== gajim/data/gui/groupchat_control.ui ===================================== @@ -1201,6 +1201,417 @@ <property name="position">8</property> </packing> </child> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkGrid"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">center</property> + <property name="valign">center</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="row_spacing">6</property> + <child> + <object class="GtkLabel" id="kick_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_bottom">6</property> + <property name="label" translatable="yes">Kick participant</property> + <property name="ellipsize">end</property> + <property name="single_line_mode">True</property> + <property name="max_width_chars">22</property> + <property name="xalign">0</property> + <style> + <class name="bold16"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="homogeneous">True</property> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">_Cancel</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="halign">start</property> + <property name="valign">start</property> + <property name="use_underline">True</property> + <signal name="clicked" handler="_on_page_cancel_clicked" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="kick_participant_button"> + <property name="label" translatable="yes">_Kick</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="receives_default">True</property> + <property name="halign">end</property> + <property name="valign">start</property> + <property name="use_underline">True</property> + <signal name="clicked" handler="_on_kick_participant_clicked" swapped="no"/> + <style> + <class name="destructive-action"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="kick_reason_entry"> + <property name="width_request">200</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="margin_bottom">6</property> + <property name="activates_default">True</property> + <property name="caps_lock_warning">False</property> + <property name="secondary_icon_tooltip_text" translatable="yes">Insert Emoji</property> + <property name="show_emoji_icon">True</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="label" translatable="yes">Reason (optional)</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + </object> + <packing> + <property name="name">kick</property> + <property name="position">9</property> + </packing> + </child> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkGrid"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">center</property> + <property name="valign">center</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="row_spacing">6</property> + <child> + <object class="GtkLabel" id="ban_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_bottom">6</property> + <property name="label" translatable="yes">Ban participant</property> + <property name="ellipsize">end</property> + <property name="single_line_mode">True</property> + <property name="max_width_chars">22</property> + <property name="xalign">0</property> + <style> + <class name="bold16"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="homogeneous">True</property> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">_Cancel</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="halign">start</property> + <property name="valign">start</property> + <property name="use_underline">True</property> + <signal name="clicked" handler="_on_page_cancel_clicked" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="ban_participant_button"> + <property name="label" translatable="yes">_Ban</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="receives_default">True</property> + <property name="halign">end</property> + <property name="valign">start</property> + <property name="use_underline">True</property> + <signal name="clicked" handler="_on_ban_participant_clicked" swapped="no"/> + <style> + <class name="destructive-action"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="ban_reason_entry"> + <property name="width_request">200</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="margin_bottom">6</property> + <property name="activates_default">True</property> + <property name="caps_lock_warning">False</property> + <property name="secondary_icon_tooltip_text" translatable="yes">Insert Emoji</property> + <property name="show_emoji_icon">True</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="label" translatable="yes">Reason (optional)</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + </object> + <packing> + <property name="name">ban</property> + <property name="position">10</property> + </packing> + </child> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkGrid"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">center</property> + <property name="valign">center</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="row_spacing">6</property> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_bottom">6</property> + <property name="label" translatable="yes">Destroy group chat</property> + <property name="ellipsize">end</property> + <property name="single_line_mode">True</property> + <property name="max_width_chars">22</property> + <property name="xalign">0</property> + <style> + <class name="bold16"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="homogeneous">True</property> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">_Cancel</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="halign">start</property> + <property name="valign">start</property> + <property name="use_underline">True</property> + <signal name="clicked" handler="_on_page_cancel_clicked" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="destroy_button"> + <property name="label" translatable="yes">_Destroy</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="receives_default">True</property> + <property name="halign">end</property> + <property name="valign">start</property> + <property name="use_underline">True</property> + <signal name="clicked" handler="_on_destroy_confirm" swapped="no"/> + <style> + <class name="destructive-action"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">5</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="destroy_alternate_entry"> + <property name="width_request">200</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="margin_bottom">6</property> + <property name="activates_default">True</property> + <property name="caps_lock_warning">False</property> + <property name="secondary_icon_tooltip_text" translatable="yes">Insert Emoji</property> + <property name="placeholder_text" translatable="yes">Alternate venue (optional)...</property> + <signal name="notify::text" handler="_on_destroy_alternate_changed" swapped="no"/> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">4</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="destroy_reason_entry"> + <property name="width_request">200</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="margin_bottom">6</property> + <property name="activates_default">True</property> + <property name="caps_lock_warning">False</property> + <property name="secondary_icon_tooltip_text" translatable="yes">Insert Emoji</property> + <property name="placeholder_text" translatable="yes">Reason (optional)...</property> + <property name="show_emoji_icon">True</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="label" translatable="yes">Reason for destruction</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="label" translatable="yes">Where participants should go</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">3</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + </object> + <packing> + <property name="name">destroy</property> + <property name="position">11</property> + </packing> + </child> </object> <packing> <property name="expand">True</property> ===================================== gajim/groupchat_control.py ===================================== @@ -74,8 +74,6 @@ from gajim.common.connection_handlers_events import GcMessageOutgoingEvent from gajim.gtk.dialogs import DialogButton from gajim.gtk.dialogs import NewConfirmationCheckDialog from gajim.gtk.dialogs import ErrorDialog -from gajim.gtk.dialogs import DestroyMucDialog -from gajim.gtk.dialogs import InputDialog from gajim.gtk.dialogs import NewConfirmationDialog from gajim.gtk.filechoosers import AvatarChooserDialog from gajim.gtk.add_contact import AddNewContactWindow @@ -676,24 +674,36 @@ class GroupchatControl(ChatControlBase): self._subject_data.user_timestamp) self._show_page('muc-info') - def _on_destroy_room(self, action, param): - def _on_confirm(reason, jid): - if jid: - # Test jid - try: - jid = helpers.parse_jid(jid) - except Exception: - ErrorDialog( - _('Invalid group chat XMPP Address'), - _('The group chat XMPP Address has not allowed characters.')) - return - - self._wait_for_destruction = True - con = app.connections[self.account] - con.get_module('MUC').destroy(self.room_jid, reason, jid) + def _on_destroy_room(self, _action, _param): + self.xml.destroy_reason_entry.grab_focus() + self.xml.destroy_button.grab_default() + self._show_page('destroy') - # Ask for a reason (and an alternate venue) - DestroyMucDialog(self.room_jid, destroy_handler=_on_confirm) + def _on_destroy_alternate_changed(self, entry, _param): + jid = entry.get_text() + if jid: + try: + jid = helpers.validate_jid(jid) + except Exception: + icon = 'dialog-warning-symbolic' + text = _('Invalid XMPP Address') + self.xml.destroy_alternate_entry.set_icon_from_icon_name( + Gtk.EntryIconPosition.SECONDARY, icon) + self.xml.destroy_alternate_entry.set_icon_tooltip_text( + Gtk.EntryIconPosition.SECONDARY, text) + self.xml.destroy_button.set_sensitive(False) + return + self.xml.destroy_alternate_entry.set_icon_from_icon_name( + Gtk.EntryIconPosition.SECONDARY, None) + self.xml.destroy_button.set_sensitive(True) + + def _on_destroy_confirm(self, _button): + reason = self.xml.destroy_reason_entry.get_text() + jid = self.xml.destroy_alternate_entry.get_text() + self._wait_for_destruction = True + con = app.connections[self.account] + con.get_module('MUC').destroy(self.room_jid, reason, jid) + self._show_page('groupchat') def _on_configure_room(self, _action, _param): win = app.get_app_window('GroupchatConfig', self.account, self.room_jid) @@ -2497,19 +2507,6 @@ class GroupchatControl(ChatControlBase): model = widget.get_model() model[iter_][Column.IMG] = get_icon_name('closed') - def kick(self, widget, nick): - """ - Kick a user - """ - def on_ok(reason): - con = app.connections[self.account] - con.get_module('MUC').set_role(self.room_jid, nick, 'none', reason) - - # ask for reason - InputDialog(_('Kicking %s') % nick, - _('You may specify a reason below:'), ok_handler=on_ok, - transient_for=self.parent_win.window) - def mk_menu(self, event, iter_): """ Make contact's popup menu @@ -2537,7 +2534,7 @@ class GroupchatControl(ChatControlBase): (user_affiliation.is_member and target_affiliation in (Affiliation.ADMIN, Affiliation.OWNER)) or (user_affiliation.is_none and not target_affiliation.is_none): item.set_sensitive(False) - id_ = item.connect('activate', self.kick, nick) + id_ = item.connect('activate', self._on_kick_participant, nick) self.handlers[id_] = item item = xml.get_object('voice_checkmenuitem') @@ -2565,7 +2562,7 @@ class GroupchatControl(ChatControlBase): (target_affiliation in (Affiliation.ADMIN, Affiliation.OWNER) and\ not user_affiliation.is_owner): item.set_sensitive(False) - id_ = item.connect('activate', self.ban, jid) + id_ = item.connect('activate', self._on_ban_participant, jid) self.handlers[id_] = item item = xml.get_object('member_checkmenuitem') @@ -2793,23 +2790,35 @@ class GroupchatControl(ChatControlBase): con = app.connections[self.account] con.get_module('MUC').set_role(self.room_jid, nick, 'participant') - def ban(self, widget, jid): - """ - Ban a user - """ - def on_ok(reason): - con = app.connections[self.account] - con.get_module('MUC').set_affiliation( - self.room_jid, - {jid: {'affiliation': 'outcast', - 'reason': reason}}) + def _on_kick_participant(self, _widget, nick): + self._kick_nick = nick + self.xml.kick_label.set_text(_('Kick %s' % nick)) + self.xml.kick_reason_entry.grab_focus() + self.xml.kick_participant_button.grab_default() + self._show_page('kick') + + def _on_kick_participant_clicked(self, _button): + reason = self.xml.kick_reason_entry.get_text() + con = app.connections[self.account] + con.get_module('MUC').set_role( + self.room_jid, self._kick_nick, 'none', reason) + self._show_page('groupchat') - # to ban we know the real jid. so jid is not fakejid + def _on_ban_participant(self, _widget, jid): + self._ban_jid = jid nick = app.get_nick_from_jid(jid) - # ask for reason - InputDialog(_('Banning %s') % nick, - _('You may specify a reason below:'), ok_handler=on_ok, - transient_for=self.parent_win.window) + self.xml.ban_label.set_text(_('Ban %s' % nick)) + self.xml.ban_reason_entry.grab_focus() + self.xml.ban_participant_button.grab_default() + self._show_page('ban') + + def _on_ban_participant_clicked(self, _button): + reason = self.xml.ban_reason_entry.get_text() + con = app.connections[self.account] + con.get_module('MUC').set_affiliation( + self.room_jid, + {self._ban_jid: {'affiliation': 'outcast', 'reason': reason}}) + self._show_page('groupchat') def grant_membership(self, widget, jid): """ ===================================== gajim/gtk/dialogs.py ===================================== @@ -547,50 +547,6 @@ class InputTextDialog(CommonInputDialog): return self.input_buffer.get_text(start_iter, end_iter, True) -class DestroyMucDialog: - """ - Class for Destroy MUC Dialog - """ - def __init__(self, room_jid, destroy_handler=None): - self._ui = get_builder('destroy_muc_dialog.ui') - self._ui.destroy_muc_dialog.set_transient_for( - app.app.get_active_window()) - - self.destroy_handler = destroy_handler - - title = _('Destroy %s') % room_jid - self._ui.destroy_muc_dialog.set_title(title) - label_header = _('Destroy this group chat permanently?') - self._ui.label_header.set_markup(label_header) - label_alt_venue = _('Where participants should go (optional)') - self._ui.alt_venue_label.set_markup(label_alt_venue) - - self._ui.reason_entry.connect('activate', self._on_entry_activate) - self._ui.alt_venue_entry.connect('activate', self._on_entry_activate) - - self._ui.destroy_button.connect( - 'clicked', self._on_destroy_button_clicked) - self._ui.cancel_button.connect( - 'clicked', self._on_cancel_button_clicked) - self._ui.connect_signals(self) - self._ui.destroy_muc_dialog.show_all() - - def _on_entry_activate(self, widget, *args): - self._ui.destroy_button.set_active(True) - - def _on_reason_mnemonic_activate(self, widget, group_cycling=False): - self._ui.reason_expander.set_expanded(True) - - def _on_destroy_button_clicked(self, widget): - user_input_reason = self._ui.reason_entry.get_text() - user_input_alt_venue = self._ui.alt_venue_entry.get_text() - self._ui.destroy_muc_dialog.destroy() - self.destroy_handler(user_input_reason, user_input_alt_venue) - - def _on_cancel_button_clicked(self, widget): - self._ui.destroy_muc_dialog.destroy() - - class CertificateDialog(Gtk.ApplicationWindow): def __init__(self, transient_for, account, cert): Gtk.ApplicationWindow.__init__(self) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/7e3d67e7ff68d8beb8d0868532b2193dc6… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/7e3d67e7ff68d8beb8d0868532b2193dc6… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] 4 commits: Annotations: Dont raise error on empty storage
by Philipp Hörist 29 Aug '19

29 Aug '19

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 193bbff1 by Philipp Hörist at 2019-08-29T17:02:48Z Annotations: Dont raise error on empty storage - - - - - 0fdbbd1f by Philipp Hörist at 2019-08-29T17:35:21Z Add StanzaMalformedError Before we raised CommonError even if the stanza was not an error node. Now we raise the dedicated StanzaMalformedError. - - - - - 33ca0042 by Philipp Hörist at 2019-08-29T17:35:26Z Remove unused imports - - - - - e57118fd by Philipp Hörist at 2019-08-29T17:41:34Z Cast exceptions to str - - - - - 5 changed files: - nbxmpp/modules/annotations.py - nbxmpp/modules/omemo.py - nbxmpp/modules/user_avatar.py - nbxmpp/structs.py - nbxmpp/util.py Changes: ===================================== nbxmpp/modules/annotations.py ===================================== @@ -58,13 +58,8 @@ class Annotations: return raise_error(log.warning, stanza, 'stanza-malformed', 'No annotations found') - nodes = storage.getTags('note') - if not nodes: - return raise_error(log.info, stanza, 'is-empty', - 'No annotations found') - notes = [] - for note in nodes: + for note in storage.getTags('note'): try: jid = JID(note.getAttr('jid')) except Exception as error: ===================================== nbxmpp/modules/omemo.py ===================================== @@ -221,7 +221,7 @@ class OMEMO: return self._parse_devicelist(item) except StanzaMalformed as error: return raise_error(log.warning, stanza, - 'stanza-malformed', error) + 'stanza-malformed', str(error)) def set_bundle(self, bundle, device_id): item = self._create_bundle(bundle) @@ -301,7 +301,7 @@ class OMEMO: return self._parse_bundle(item) except StanzaMalformed as error: return raise_error(log.warning, stanza, - 'stanza-malformed', error) + 'stanza-malformed', str(error)) @staticmethod def _parse_bundle(item): ===================================== nbxmpp/modules/user_avatar.py ===================================== @@ -112,7 +112,8 @@ class UserAvatar: try: data = base64.b64decode(data.encode('utf-8')) except Exception as error: - return raise_error(log.warning, stanza, 'stanza-malformed', error) + return raise_error(log.warning, stanza, + 'stanza-malformed', str(error)) log.info('Received avatar data: %s %s', jid, sha) return AvatarData(jid, sha, data) ===================================== nbxmpp/structs.py ===================================== @@ -368,13 +368,11 @@ class CommonError: self.id = stanza.getID() self._text = {} - error = stanza.getTag('error') - if error is not None: - text_elements = error.getTags('text', namespace=NS_STANZAS) - for element in text_elements: - lang = element.getXmlLang() - text = element.getData() - self._text[lang] = text + text_elements = self._error_node.getTags('text', namespace=NS_STANZAS) + for element in text_elements: + lang = element.getXmlLang() + text = element.getData() + self._text[lang] = text def get_text(self, pref_lang=None): if pref_lang is not None: @@ -406,6 +404,26 @@ class CommonError: return 'Error from %s: %s%s' % (self.jid, condition, text) +class StanzaMalformedError(CommonError): + def __init__(self, stanza, text): + self._error_node = None + self.condition = 'stanza-malformed' + self.condition_data = None + self.app_condition = None + self.type = None + self.jid = stanza.getFrom() + self.id = stanza.getID() + self._text = {} + if text: + self._text['en'] = text + + def __str__(self): + text = self.get_text('en') + if text: + text = ': %s' % text + return 'Received malformed stanza from %s%s' % (self.jid, text) + + class TuneData(namedtuple('TuneData', 'artist length rating source title track uri')): __slots__ = [] ===================================== nbxmpp/util.py ===================================== @@ -16,7 +16,6 @@ # along with this program; If not, see <http://www.gnu.org/licenses/>. import logging -import socket import base64 import weakref import hashlib @@ -25,15 +24,14 @@ from functools import lru_cache import precis_i18n.codec -from nbxmpp.protocol import JID -from nbxmpp.protocol import InvalidJid from nbxmpp.protocol import DiscoInfoMalformed -from nbxmpp.stringprepare import nameprep +from nbxmpp.protocol import isErrorNode from nbxmpp.structs import Properties from nbxmpp.structs import IqProperties from nbxmpp.structs import MessageProperties from nbxmpp.structs import PresenceProperties from nbxmpp.structs import CommonError +from nbxmpp.structs import StanzaMalformedError from nbxmpp.third_party.hsluv import hsluv_to_rgb log = logging.getLogger('nbxmpp.util') @@ -140,18 +138,22 @@ def to_xs_boolean(value): error_classes = {} -def error_factory(stanza): +def error_factory(stanza, condition=None, text=None): + if condition == 'stanza-malformed': + return StanzaMalformedError(stanza, text) app_namespace = stanza.getAppErrorNamespace() return error_classes.get(app_namespace, CommonError)(stanza) def raise_error(log_method, stanza, condition=None, text=None): - error = error_factory(stanza) - if text is not None: - error.set_text('en', str(text)) - if condition is not None: - error.condition = str(condition) + if not isErrorNode(stanza) and condition != 'stanza-malformed': + condition = 'stanza-malformed' + if log_method.__name__ not in ('warning', 'error'): + log_method = log_method.__self__.warning + + error = error_factory(stanza, condition, text) log_method(error) + if log_method.__name__ in ('warning', 'error'): log_method(stanza) return error View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/c72b4fbdbda1a8f954ad9c286… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/c72b4fbdbda1a8f954ad9c286… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] CommonError: Add support for condition data
by Philipp Hörist 28 Aug '19

28 Aug '19

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: c72b4fbd by Philipp Hörist at 2019-08-28T21:05:21Z CommonError: Add support for condition data This is used for example to advertise a new MUC after destruction <gone>xmpp:new@chat.example.org?join</gone> - - - - - 1 changed file: - nbxmpp/structs.py Changes: ===================================== nbxmpp/structs.py ===================================== @@ -361,6 +361,7 @@ class CommonError: def __init__(self, stanza): self._error_node = stanza.getTag('error') self.condition = stanza.getError() + self.condition_data = self._error_node.getTagData(self.condition) self.app_condition = stanza.getAppError() self.type = stanza.getErrorType() self.jid = stanza.getFrom() View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/c72b4fbdbda1a8f954ad9c2865… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/c72b4fbdbda1a8f954ad9c2865… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] GroupchatCreation: Handle <gone> error better
by Philipp Hörist 28 Aug '19

28 Aug '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 3745f883 by Philipp Hörist at 2019-08-28T20:52:10Z GroupchatCreation: Handle <gone> error better - - - - - 1 changed file: - gajim/gtk/groupchat_creation.py Changes: ===================================== gajim/gtk/groupchat_creation.py ===================================== @@ -159,7 +159,10 @@ class CreateGroupchatWindow(Gtk.ApplicationWindow): self._ui.create_button.set_sensitive(False) def _set_warning_from_error(self, error): - text = MUC_DISCO_ERRORS.get(error.condition, to_user_string(error)) + condition = error.condition + if condition == 'gone': + condition = 'already-exists' + text = MUC_DISCO_ERRORS.get(condition, to_user_string(error)) self._set_warning(text) def _set_warning_from_error_code(self, error_code): View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/3745f88313a17a8613d618a3e71571707a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/3745f88313a17a8613d618a3e71571707a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Groupchat: Use NewConfirmationDialog for voice request
by Philipp Hörist 28 Aug '19

28 Aug '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 51b176b7 by Philipp Hörist at 2019-08-28T20:42:27Z Groupchat: Use NewConfirmationDialog for voice request - - - - - 2 changed files: - gajim/common/modules/muc.py - gajim/groupchat_control.py Changes: ===================================== gajim/common/modules/muc.py ===================================== @@ -63,6 +63,7 @@ class MUC(BaseModule): 'invite', 'request_config', 'request_voice', + 'approve_voice_request', 'destroy', ] @@ -659,10 +660,10 @@ class MUC(BaseModule): return app.nec.push_incoming_event( - NetworkEvent('muc-voice-approval', + NetworkEvent('muc-voice-request', account=self._account, room_jid=str(properties.muc_jid), - form=properties.voice_request.form)) + voice_request=properties.voice_request)) raise nbxmpp.NodeProcessed def _on_captcha_challenge(self, _con, _stanza, properties): ===================================== gajim/groupchat_control.py ===================================== @@ -64,6 +64,7 @@ from gajim.common import contacts from gajim.common.const import StyleAttr from gajim.common.const import Chatstate from gajim.common.const import MUCJoinedState +from gajim.common.const import ButtonAction from gajim.chat_control_base import ChatControlBase @@ -75,7 +76,7 @@ from gajim.gtk.dialogs import NewConfirmationCheckDialog from gajim.gtk.dialogs import ErrorDialog from gajim.gtk.dialogs import DestroyMucDialog from gajim.gtk.dialogs import InputDialog -from gajim.gtk.single_message import SingleMessageWindow +from gajim.gtk.dialogs import NewConfirmationDialog from gajim.gtk.filechoosers import AvatarChooserDialog from gajim.gtk.add_contact import AddNewContactWindow from gajim.gtk.tooltips import GCTooltip @@ -323,7 +324,7 @@ class GroupchatControl(ChatControlBase): ('muc-subject', ged.GUI1, self._on_subject), ('muc-captcha-challenge', ged.GUI1, self._on_captcha_challenge), ('muc-captcha-error', ged.GUI1, self._on_captcha_error), - ('muc-voice-approval', ged.GUI1, self._on_voice_approval), + ('muc-voice-request', ged.GUI1, self._on_voice_request), ('muc-disco-update', ged.GUI1, self._on_disco_update), ('muc-configuration-finished', ged.GUI1, self._on_configuration_finished), ('muc-configuration-failed', ged.GUI1, self._on_configuration_failed), @@ -1152,12 +1153,22 @@ class GroupchatControl(ChatControlBase): self.draw_banner_text() @event_filter(['account', 'room_jid']) - def _on_voice_approval(self, event): - SingleMessageWindow(self.account, - self.room_jid, - action='receive', - from_whom=self.room_jid, - form_node=event.form) + def _on_voice_request(self, event): + def on_approve(): + con = app.connections[self.account] + con.get_module('MUC').approve_voice_request(self.room_jid, + event.voice_request) + NewConfirmationDialog( + _('Voice Request'), + _('Voice Request'), + _('<b>%s</b> from <b>%s</b> requests voice') % ( + event.voice_request.nick, self.room_name), + [DialogButton.make('Cancel'), + DialogButton.make('OK', + text=_('Approve'), + action=ButtonAction.SUGGESTED, + callback=on_approve)], + modal=False).show() @event_filter(['account']) def _nec_mam_decrypted_message_received(self, obj): View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/51b176b7b795d4753427d8717a3ae52aaf… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/51b176b7b795d4753427d8717a3ae52aaf… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] MUC: Improve voice request
by Philipp Hörist 28 Aug '19

28 Aug '19

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 3d567111 by Philipp Hörist at 2019-08-28T20:33:18Z MUC: Improve voice request - Validate JID on incoming voice requests - Add more data to VoiceRequest - Add approve_voice_request() - - - - - 2 changed files: - nbxmpp/modules/muc.py - nbxmpp/structs.py Changes: ===================================== nbxmpp/modules/muc.py ===================================== @@ -33,6 +33,7 @@ from nbxmpp.protocol import Message from nbxmpp.protocol import DataForm from nbxmpp.protocol import DataField from nbxmpp.protocol import isResultNode +from nbxmpp.protocol import NodeProcessed from nbxmpp.simplexml import Node from nbxmpp.structs import StanzaHandler from nbxmpp.const import InviteType @@ -301,11 +302,28 @@ class MUC: except KeyError: return - properties.voice_request = VoiceRequest(form=data_form) + nick = data_form['muc#roomnick'].value + + try: + jid = JID(data_form['muc#jid'].value) + except Exception: + log.warning('Invalid JID on voice request') + log.warning(stanza) + raise NodeProcessed + + properties.voice_request = VoiceRequest(jid=jid, + nick=nick, + form=data_form) properties.from_muc = True properties.muc_jid = properties.jid.copy() properties.muc_jid.setBare() + def approve_voice_request(self, muc_jid, voice_request): + form = voice_request.form + form.type_ = 'submit' + form['muc#request_allow'].value = True + self._client.send(Message(to=muc_jid, payload=form)) + @call_on_response('_affiliation_received') def get_affiliation(self, jid, affiliation): iq = Iq(typ='get', to=jid, queryNS=NS_MUC_ADMIN) ===================================== nbxmpp/structs.py ===================================== @@ -48,7 +48,7 @@ CaptchaData = namedtuple('CaptchaData', 'form bob_data') BobData = namedtuple('BobData', 'algo hash_ max_age data cid type') -VoiceRequest = namedtuple('VoiceRequest', 'form') +VoiceRequest = namedtuple('VoiceRequest', 'form jid nick') MucUserData = namedtuple('MucUserData', 'affiliation jid nick role actor reason') MucUserData.__new__.__defaults__ = (None, None, None, None, None) View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/3d567111ee1d27b01096fbf472… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/3d567111ee1d27b01096fbf472… 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 August 2019