Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] 2 commits: Update pylintrc
by Philipp Hörist 05 Aug '19

05 Aug '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: a8cc630d by Philipp Hörist at 2019-08-05T09:33:14Z Update pylintrc - - - - - 8db35fdb by Philipp Hörist at 2019-08-05T09:47:26Z StartChat: Fix removing new contact rows - - - - - 2 changed files: - gajim/gtk/start_chat.py - pylintrc Changes: ===================================== gajim/gtk/start_chat.py ===================================== @@ -389,9 +389,9 @@ class StartChatDialog(Gtk.ApplicationWindow): return for account in self.new_contact_rows: self._ui.listbox.remove( - self.new_contact_rows[account].get_parent()) + self.new_contact_rows[account]) self._ui.listbox.remove( - self.new_groupchat_rows[account].get_parent()) + self.new_groupchat_rows[account]) self.new_contact_row_visible = False def _update_new_jid_rows(self, search_text): ===================================== pylintrc ===================================== @@ -368,7 +368,7 @@ max-attributes=9999 max-bool-expr=5 # Maximum number of branch for function / method body -max-branches=20 +max-branches=50 # Maximum number of locals for function / method body max-locals=50 View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/4fa36ef22b66528cbd7fe6226badab73d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/4fa36ef22b66528cbd7fe6226badab73d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Handle multi language error results
by Philipp Hörist 05 Aug '19

05 Aug '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 4fa36ef2 by Philipp Hörist at 2019-08-05T09:30:03Z Handle multi language error results - - - - - 15 changed files: - gajim/common/helpers.py - gajim/common/modules/blocking.py - gajim/common/modules/bookmarks.py - gajim/common/modules/discovery.py - gajim/common/modules/ibb.py - gajim/common/modules/muc.py - gajim/common/modules/user_avatar.py - gajim/groupchat_control.py - gajim/gtk/adhoc.py - gajim/gtk/blocking.py - gajim/gtk/groupchat_config.py - gajim/gtk/groupchat_creation.py - gajim/gtk/groupchat_join.py - gajim/gtk/pep_config.py - gajim/gtk/start_chat.py Changes: ===================================== gajim/common/helpers.py ===================================== @@ -70,6 +70,7 @@ from gajim.common import configpaths from gajim.common.i18n import Q_ from gajim.common.i18n import _ from gajim.common.i18n import ngettext +from gajim.common.i18n import get_rfc5646_lang from gajim.common.const import ShowConstant from gajim.common.const import Display from gajim.common.const import URIType @@ -1613,3 +1614,14 @@ def validate_jid(jid): return JID(str(jid)) except InvalidJid as error: raise ValueError(error) + + +def to_user_string(error): + text = error.get_text(get_rfc5646_lang()) + if text: + return text + + condition = error.condition + if error.app_condition is not None: + return '%s (%s)' % (condition, error.app_condition) + return condition ===================================== gajim/common/modules/blocking.py ===================================== @@ -64,7 +64,7 @@ class Blocking(BaseModule): def _blocking_list_received(self, result): if is_error_result(result): - self._log.info('Error: %s', result) + self._log.info(result) return self.blocked = result.blocking_list ===================================== gajim/common/modules/bookmarks.py ===================================== @@ -161,7 +161,7 @@ class Bookmarks(BaseModule): def _bookmarks_received(self, bookmarks): if is_error_result(bookmarks): - self._log.info('Error: %s', bookmarks) + self._log.info(bookmarks) bookmarks = [] self._request_in_progress = False ===================================== gajim/common/modules/discovery.py ===================================== @@ -212,7 +212,7 @@ class Discovery(BaseModule): def _muc_info_response(self, result, callback): if is_error_result(result): - if result.type == 'item-not-found': + if result.condition == 'item-not-found': # Groupchat does not exist self._log.info('MUC does not exist: %s', result.jid) callback() ===================================== gajim/common/modules/ibb.py ===================================== @@ -22,6 +22,7 @@ from nbxmpp.structs import StanzaHandler from nbxmpp.util import is_error_result from gajim.common import app +from gajim.common.helpers import to_user_string from gajim.common.modules.base import BaseModule from gajim.common.file_props import FilesProp @@ -149,8 +150,8 @@ class IBB(BaseModule): def _on_open_result(self, result, file_props): if is_error_result(result): - app.socks5queue.error_cb('Error', str(result)) - self._log.warning('Error: %s', result) + app.socks5queue.error_cb('Error', to_user_string(result)) + self._log.warning(result) return self.send_data(file_props) @@ -183,8 +184,8 @@ class IBB(BaseModule): def _on_close_result(self, result): if is_error_result(result): - app.socks5queue.error_cb('Error', str(result)) - self._log.warning('Error: %s', result) + app.socks5queue.error_cb('Error', to_user_string(result)) + self._log.warning(result) return def send_data(self, file_props): @@ -217,8 +218,8 @@ class IBB(BaseModule): def _on_data_result(self, result, file_props): if is_error_result(result): - app.socks5queue.error_cb('Error', str(result)) - self._log.warning('Error: %s', result) + app.socks5queue.error_cb('Error', to_user_string(result)) + self._log.warning(result) return self.send_data(file_props) ===================================== gajim/common/modules/muc.py ===================================== @@ -38,6 +38,7 @@ from gajim.common.const import SyncThreshold from gajim.common.helpers import AdditionalDataDict from gajim.common.helpers import get_default_muc_config from gajim.common.helpers import get_sync_threshold +from gajim.common.helpers import to_user_string from gajim.common import idle from gajim.common.caps_cache import muc_caps_cache from gajim.common.nec import NetworkEvent @@ -181,7 +182,7 @@ class MUC(BaseModule): def _on_room_config(self, result): if is_error_result(result): - self._log.info('Error: %s', result) + self._log.info(result) app.nec.push_incoming_event(NetworkEvent( 'muc-configuration-failed', account=self._account, @@ -212,7 +213,7 @@ class MUC(BaseModule): def _on_config_result(self, result): if is_error_result(result): - self._log.info('Error: %s', result) + self._log.info(result) app.nec.push_incoming_event(NetworkEvent( 'muc-configuration-failed', account=self._account, @@ -657,7 +658,7 @@ class MUC(BaseModule): NetworkEvent('muc-captcha-error', account=self._account, room_jid=str(result.jid), - error_text=result.message)) + error_text=to_user_string(result))) def _on_config_change(self, _con, _stanza, properties): if not properties.is_muc_config_change: ===================================== gajim/common/modules/user_avatar.py ===================================== @@ -63,7 +63,7 @@ class UserAvatar(BaseModule): def _avatar_received(self, result): if is_error_result(result): - self._log.info('Error: %s', result) + self._log.info(result) return self._log.info('Received Avatar: %s %s', result.jid, result.sha) ===================================== gajim/groupchat_control.py ===================================== @@ -671,7 +671,7 @@ class GroupchatControl(ChatControlBase): def _on_configure_form_received(self, result): if is_error_result(result): - log.info('Error %s %s', result.jid, result) + log.info(result) return GroupchatConfig(self.account, result.jid, 'owner', result.form) ===================================== gajim/gtk/adhoc.py ===================================== @@ -23,6 +23,7 @@ from nbxmpp.modules import dataforms from gajim.common import app from gajim.common.i18n import _ +from gajim.common.helpers import to_user_string from gajim.gtk.dataform import DataFormWidget from gajim.gtk.util import ensure_not_destroyed @@ -189,7 +190,7 @@ class AdHocCommand(Gtk.Assistant): def _received_command_list(self, commands): error_text = None if is_error_result(commands): - error_text = str(commands) + error_text = to_user_string(commands) elif not commands: error_text = _('No commands available') @@ -206,7 +207,7 @@ class AdHocCommand(Gtk.Assistant): @ensure_not_destroyed def _received_stage(self, stage): if is_error_result(stage): - self.get_nth_page(Page.ERROR).set_text(str(stage)) + self.get_nth_page(Page.ERROR).set_text(to_user_string(stage)) self.get_nth_page(Page.ERROR).show_command_button = True self.set_current_page(Page.ERROR) return ===================================== gajim/gtk/blocking.py ===================================== @@ -21,6 +21,7 @@ from gi.repository import GLib from gajim.common import app from gajim.common.i18n import _ +from gajim.common.helpers import to_user_string from gajim.gtk.util import get_builder from gajim.gtk.dialogs import HigDialog @@ -69,7 +70,7 @@ class BlockingList(Gtk.ApplicationWindow): dialog = HigDialog( self, Gtk.MessageType.INFO, Gtk.ButtonsType.OK, _('Error!'), - GLib.markup_escape_text(str(error))) + GLib.markup_escape_text(error)) dialog.popup() def _on_blocking_list_received(self, result): @@ -78,7 +79,7 @@ class BlockingList(Gtk.ApplicationWindow): self._set_grid_state(not is_error) if is_error: - self._show_error(result) + self._show_error(to_user_string(result)) else: self._prev_blocked_jids = set(result.blocking_list) @@ -89,7 +90,7 @@ class BlockingList(Gtk.ApplicationWindow): def _on_save_result(self, result): self._await_results -= 1 if is_error_result(result) and not self._received_errors: - self._show_error(result) + self._show_error(to_user_string(result)) self._received_errors = True if not self._await_results: ===================================== gajim/gtk/groupchat_config.py ===================================== @@ -357,7 +357,7 @@ class GroupchatConfig(Gtk.ApplicationWindow): def _on_affiliations_received(self, result, affiliation): if is_error_result(result): log.info('Error while requesting %s affiliations: %s', - affiliation, result) + affiliation, result.condition) return if affiliation == 'outcast': ===================================== gajim/gtk/groupchat_creation.py ===================================== @@ -25,6 +25,7 @@ from gajim.common.const import MUC_CREATION_EXAMPLES from gajim.common.const import MUC_DISCO_ERRORS from gajim.common.i18n import _ from gajim.common.helpers import validate_jid +from gajim.common.helpers import to_user_string from gajim.gtk.dialogs import ErrorDialog from gajim.gtk.util import get_builder @@ -158,7 +159,7 @@ class CreateGroupchatWindow(Gtk.ApplicationWindow): self._ui.create_button.set_sensitive(False) def _set_warning_from_error(self, error): - text = MUC_DISCO_ERRORS.get(error.type, str(error)) + text = MUC_DISCO_ERRORS.get(error.condition, to_user_string(error)) self._set_warning(text) def _set_warning_from_error_code(self, error_code): @@ -192,7 +193,7 @@ class CreateGroupchatWindow(Gtk.ApplicationWindow): @ensure_not_destroyed def _disco_info_received(self, result): if is_error_result(result): - if result.type == 'item-not-found': + if result.condition == 'item-not-found': self._create_muc(result.jid) return self._set_warning_from_error(result) ===================================== gajim/gtk/groupchat_join.py ===================================== @@ -20,6 +20,7 @@ from nbxmpp.util import is_error_result from gajim.common import app from gajim.common.i18n import _ +from gajim.common.helpers import to_user_string from gajim.common.const import MUC_DISCO_ERRORS from gajim.gtk.groupchat_info import GroupChatInfoScrolled @@ -100,7 +101,7 @@ class GroupchatJoin(Gtk.ApplicationWindow): self._stack.set_visible_child_name('error') def _set_error(self, error): - text = MUC_DISCO_ERRORS.get(error.type, str(error)) + text = MUC_DISCO_ERRORS.get(error.condition, to_user_string(error)) self._show_error_page(text) def _set_error_from_code(self, error_code): ===================================== gajim/gtk/pep_config.py ===================================== @@ -19,6 +19,7 @@ from nbxmpp.util import is_error_result from gajim.common import app from gajim.common import ged from gajim.common.i18n import _ +from gajim.common.helpers import to_user_string from gajim.gtk.dialogs import ErrorDialog from gajim.gtk.dialogs import WarningDialog @@ -88,7 +89,7 @@ class ManagePEPServicesWindow(Gtk.ApplicationWindow): def _items_received(self, result): if is_error_result(result): - ErrorDialog('Error', str(result)) + ErrorDialog('Error', to_user_string(result)) return jid = result.jid.getBare() ===================================== gajim/gtk/start_chat.py ===================================== @@ -25,6 +25,7 @@ from nbxmpp.util import is_error_result from gajim.common import app from gajim.common import helpers from gajim.common.helpers import validate_jid +from gajim.common.helpers import to_user_string from gajim.common.i18n import _ from gajim.common.const import AvatarSize from gajim.common.const import MUC_DISCO_ERRORS @@ -291,7 +292,7 @@ class StartChatDialog(Gtk.ApplicationWindow): self._set_error_from_code('not-muc-service') def _set_error(self, error): - text = MUC_DISCO_ERRORS.get(error.type, str(error)) + text = MUC_DISCO_ERRORS.get(error.condition, to_user_string(error)) self._show_error_page(text) def _set_error_from_code(self, error_code): @@ -506,7 +507,7 @@ class StartChatDialog(Gtk.ApplicationWindow): def _parameters_received(self, result, user_data): if is_error_result(result): self._global_search_listbox.remove_progress() - self._show_error_page(result.message) + self._show_error_page(to_user_string(result)) return con, text = user_data @@ -521,7 +522,7 @@ class StartChatDialog(Gtk.ApplicationWindow): if is_error_result(result): self._global_search_listbox.remove_progress() - self._show_error_page(result.message) + self._show_error_page(to_user_string(result)) return for item in result.items: View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/4fa36ef22b66528cbd7fe6226badab73d1… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/4fa36ef22b66528cbd7fe6226badab73d1… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] 3 commits: Add Node.getXmlLang()
by Philipp Hörist 05 Aug '19

05 Aug '19

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 30f65e21 by Philipp Hörist at 2019-08-05T08:09:30Z Add Node.getXmlLang() Get the xml:lang attr, if not found traverse all parents - - - - - d1e511bf by Philipp Hörist at 2019-08-05T08:58:16Z Refactor CommonError - Parse application errors - Parse text elements in all languages - - - - - d33c50ad by Philipp Hörist at 2019-08-05T09:01:43Z Add test for parsing errors - - - - - 5 changed files: - nbxmpp/protocol.py - nbxmpp/simplexml.py - nbxmpp/structs.py - nbxmpp/util.py - + test/unit/test_error_parsing.py Changes: ===================================== nbxmpp/protocol.py ===================================== @@ -1084,11 +1084,27 @@ class Protocol(Node): of the error (otherwise) """ errtag = self.getTag('error') - if errtag: - for tag in errtag.getChildren(): - if tag.getName() != 'text': - return tag.getName() - return errtag.getData() + if errtag is None: + return + for tag in errtag.getChildren(): + if tag.getName() != 'text' and tag.getNamespace() == NS_STANZAS: + return tag.getName() + + def getAppError(self): + errtag = self.getTag('error') + if errtag is None: + return + for tag in errtag.getChildren(): + if tag.getName() != 'text' and tag.getNamespace() != NS_STANZAS: + return tag.getName() + + def getAppErrorNamespace(self): + errtag = self.getTag('error') + if errtag is None: + return + for tag in errtag.getChildren(): + if tag.getName() != 'text' and tag.getNamespace() != NS_STANZAS: + return tag.getNamespace() def getErrorMsg(self): """ ===================================== nbxmpp/simplexml.py ===================================== @@ -431,6 +431,14 @@ class Node: except Exception: self.addChild(tag, attrs, payload = [str(val)]) + def getXmlLang(self): + lang = self.attrs.get('xml:lang') + if lang is not None: + return lang + + if self.parent is not None: + return self.parent.getXmlLang() + def has_attr(self, key): """ Check if node have attribute "key" ===================================== nbxmpp/structs.py ===================================== @@ -309,11 +309,52 @@ class OMEMOBundle(namedtuple('OMEMOBundle', 'spk spk_signature ik otpks')): return random.SystemRandom().choice(self.otpks) -class CommonError(namedtuple('CommonError', 'type message jid')): +class CommonError: + def __init__(self, stanza): + self._error_node = stanza.getTag('error') + self.condition = stanza.getError() + self.app_condition = stanza.getAppError() + self.type = stanza.getErrorType() + self.jid = stanza.getFrom() + 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 + + def get_text(self, pref_lang=None): + if pref_lang is not None: + text = self._text.get(pref_lang) + if text is not None: + return text + + if self._text: + text = self._text.get('en') + if text is not None: + return text + + text = self._text.get(None) + if text is not None: + return text + return self._text.popitem()[1] + return '' + + def set_text(self, lang, text): + self._text[lang] = text + def __str__(self): - if self.message is not None: - return 'Error from %s %s: %s' % (self.jid, self.type, self.message) - return 'Error from %s: %s' % (self.jid, self.type) + condition = self.condition + if self.app_condition is not None: + condition = '%s (%s)' % (self.condition, self.app_condition) + text = self.get_text('en') or '' + if text: + text = ' - %s' % text + return 'Error from %s: %s%s' % (self.jid, condition, text) class TuneData(namedtuple('TuneData', 'artist length rating source title track uri')): ===================================== nbxmpp/util.py ===================================== @@ -138,14 +138,19 @@ def to_xs_boolean(value): 'Cant convert %s to xs:boolean' % value) -def raise_error(log_method, stanza, type_=None, message=None): - if message is not None: - message = str(message) - if type_ is None: - type_ = stanza.getError() - message = stanza.getErrorMsg() - jid = stanza.getFrom() - error = CommonError(type_, message, jid) +error_classes = {} + +def error_factory(stanza): + 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) log_method(error) if log_method.__name__ in ('warning', 'error'): log_method(stanza) ===================================== test/unit/test_error_parsing.py ===================================== @@ -0,0 +1,32 @@ +import unittest + +from nbxmpp.protocol import Iq +from nbxmpp.util import error_factory + + +class TestErrorParsing(unittest.TestCase): + + def test_error_parsing(self): + stanza = ''' + <iq from='upload.montague.tld' + id='step_03' + to='romeo(a)montague.tld/garden' + type='error'> + <error type='modify'> + <not-acceptable xmlns='urn:ietf:params:xml:ns:xmpp-stanzas' /> + <text xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'>File too large. The maximum file size is 20000 bytes</text> + <text xml:lang='de' xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'>File zu groß. Erlaubt sind 20000 bytes</text> + <file-too-large xmlns='urn:xmpp:http:upload:0'> + <max-file-size>20000</max-file-size> + </file-too-large> + </error> + </iq>''' + + error = error_factory(Iq(node=stanza)) + self.assertEqual(error.condition, 'not-acceptable') + self.assertEqual(error.app_condition, 'file-too-large') + self.assertEqual(error.get_text(), 'File too large. The maximum file size is 20000 bytes') + self.assertEqual(error.get_text('de'), 'File zu groß. Erlaubt sind 20000 bytes') + self.assertEqual(error.type, 'modify') + self.assertEqual(error.id, 'step_03') + self.assertEqual(error.jid, 'upload.montague.tld') View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/b1f664db25f4729b36899bdaf… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/b1f664db25f4729b36899bdaf… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: StartChat: Use better icon for muclumbus search
by Philipp Hörist 03 Aug '19

03 Aug '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 2013e4d2 by Philipp Hörist at 2019-08-03T11:41:57Z StartChat: Use better icon for muclumbus search - - - - - 32b7b9db by Philipp Hörist at 2019-08-03T11:45:28Z StartChat: Select account on double click - - - - - 40b0b524 by Philipp Hörist at 2019-08-03T13:48:51Z StartChat: Fix multi page results when searching global - - - - - 3 changed files: - gajim/data/gui/start_chat_dialog.ui - gajim/data/style/gajim.css - gajim/gtk/start_chat.py Changes: ===================================== gajim/data/gui/start_chat_dialog.ui ===================================== @@ -58,7 +58,7 @@ <object class="GtkImage"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="icon_name">content-loading-symbolic</property> + <property name="icon_name">feather-globe-symbolic</property> </object> </child> </object> @@ -315,6 +315,7 @@ <property name="headers_visible">False</property> <property name="enable_search">False</property> <property name="show_expanders">False</property> + <signal name="row-activated" handler="_on_select_clicked" swapped="no"/> <child internal-child="selection"> <object class="GtkTreeSelection"/> </child> ===================================== gajim/data/style/gajim.css ===================================== @@ -241,6 +241,7 @@ button.flat.link { padding: 0; border: 0; } .success-color { color: @success_color; } .error-color { color: @error_color; } .warning-color { color: @warning_color; } +.selected-color { color: @theme_selected_bg_color; } /*Encryption*/ .encrypted-color { color: rgb(75, 181, 67) } ===================================== gajim/gtk/start_chat.py ===================================== @@ -310,7 +310,7 @@ class StartChatDialog(Gtk.ApplicationWindow): def _on_back_clicked(self, _button=None): self._ui.stack.set_visible_child_name('search') - def _on_select_clicked(self, _button=None): + def _on_select_clicked(self, *args): model, iter_ = self._ui.account_view.get_selection().get_selected() if iter_ is not None: account = model[iter_][1] @@ -346,11 +346,14 @@ class StartChatDialog(Gtk.ApplicationWindow): def _on_global_search_toggle(self, button): self._ui.search_entry.set_text('') self._ui.search_entry.grab_focus() + image_style_context = button.get_children()[0].get_style_context() if button.get_active(): + image_style_context.add_class('selected-color') self._set_listbox(self._global_search_listbox) self._remove_new_jid_row() self._ui.listbox.invalidate_filter() else: + image_style_context.remove_class('selected-color') self._set_listbox(self._ui.listbox) self._global_search_listbox.remove_all() @@ -541,7 +544,7 @@ class StartChatDialog(Gtk.ApplicationWindow): items_per_page=result.max, after=result.last, callback=self._on_search_result, - user_data=con) + user_data=(con, False)) def _continue_http_search(self, result, con): con.get_module('Muclumbus').set_http_search( @@ -549,7 +552,7 @@ class StartChatDialog(Gtk.ApplicationWindow): self._keywords, after=result.last, callback=self._on_search_result, - user_data=con) + user_data=(con, True)) def _destroy(self, *args): self._destroyed = True View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/6a11667681b40f09eedecbe0cff3b5c91… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/6a11667681b40f09eedecbe0cff3b5c91… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Muclumbus: Use HTTP API for requests
by Philipp Hörist 03 Aug '19

03 Aug '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 6a116676 by Philipp Hörist at 2019-08-03T10:58:05Z Muclumbus: Use HTTP API for requests - HTTP is anonymous - Works with servers that have s2s disabled - Add ACE setting to switch between http and iq API - - - - - 2 changed files: - gajim/common/config.py - gajim/gtk/start_chat.py Changes: ===================================== gajim/common/config.py ===================================== @@ -293,6 +293,8 @@ class Config: 'send_chatstate_default': [opt_str, 'composing_only', _('Chat state notifications that are sent to contacts. Possible values: all, composing_only, disabled')], 'send_chatstate_muc_default': [opt_str, 'composing_only', _('Chat state notifications that are sent to the group chat. Possible values: \'all\', \'composing_only\', \'disabled\'')], 'muclumbus_api_jid': [opt_str, 'rodrigo.de.mucobedo(a)dreckshal.de'], + 'muclumbus_api_http_uri': [opt_str, 'https://search.jabbercat.org/api/1.0/search'], + 'muclumbus_api_pref': [opt_str, 'http', _('API Preferences. Possible values: \'http\', \'iq\'')], }, {}) # type: Tuple[Dict[str, List[Any]], Dict[Any, Any]] __options_per_key = { ===================================== gajim/gtk/start_chat.py ===================================== @@ -51,6 +51,7 @@ class StartChatDialog(Gtk.ApplicationWindow): self.set_default_size(-1, 400) self.ready_to_destroy = False self._parameter_form = None + self._keywords = [] self._destroyed = False self._search_stopped = False @@ -470,6 +471,12 @@ class StartChatDialog(Gtk.ApplicationWindow): text = self._ui.search_entry.get_text().strip() self._global_search_listbox.start_search() + if app.config.get('muclumbus_api_pref') == 'http': + self._start_http_search(con, text) + else: + self._start_iq_search(con, text) + + def _start_iq_search(self, con, text): if self._parameter_form is None: con.get_module('Muclumbus').request_parameters( app.config.get('muclumbus_api_jid'), @@ -482,7 +489,15 @@ class StartChatDialog(Gtk.ApplicationWindow): app.config.get('muclumbus_api_jid'), self._parameter_form, callback=self._on_search_result, - user_data=con) + user_data=(con, False)) + + def _start_http_search(self, con, text): + self._keywords = text.split(' ') + con.get_module('Muclumbus').set_http_search( + app.config.get('muclumbus_api_http_uri'), + self._keywords, + callback=self._on_search_result, + user_data=(con, True)) @ensure_not_destroyed def _parameters_received(self, result, user_data): @@ -494,16 +509,10 @@ class StartChatDialog(Gtk.ApplicationWindow): con, text = user_data self._parameter_form = result self._parameter_form.type_ = 'submit' - self._parameter_form.vars['q'].value = text - - con.get_module('Muclumbus').set_search( - app.config.get('muclumbus_api_jid'), - self._parameter_form, - callback=self._on_search_result, - user_data=con) + self._start_iq_search(con, text) @ensure_not_destroyed - def _on_search_result(self, result, con): + def _on_search_result(self, result, user_data): if self._search_stopped: return @@ -519,6 +528,13 @@ class StartChatDialog(Gtk.ApplicationWindow): self._global_search_listbox.end_search() return + con, http = user_data + if http: + self._continue_http_search(result, con) + else: + self._continue_iq_search(result, con) + + def _continue_iq_search(self, result, con): con.get_module('Muclumbus').set_search( app.config.get('muclumbus_api_jid'), self._parameter_form, @@ -527,6 +543,14 @@ class StartChatDialog(Gtk.ApplicationWindow): callback=self._on_search_result, user_data=con) + def _continue_http_search(self, result, con): + con.get_module('Muclumbus').set_http_search( + app.config.get('muclumbus_api_http_uri'), + self._keywords, + after=result.last, + callback=self._on_search_result, + user_data=con) + def _destroy(self, *args): self._destroyed = True View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/6a11667681b40f09eedecbe0cff3b5c913… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/6a11667681b40f09eedecbe0cff3b5c913… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Muclumbus: Add support for HTTP API
by Philipp Hörist 03 Aug '19

03 Aug '19

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: b1f664db by Philipp Hörist at 2019-08-03T09:20:07Z Muclumbus: Add support for HTTP API - - - - - 1 changed file: - nbxmpp/modules/muclumbus.py Changes: ===================================== nbxmpp/modules/muclumbus.py ===================================== @@ -16,6 +16,7 @@ # along with this program; If not, see <http://www.gnu.org/licenses/>. import logging +import json from nbxmpp.protocol import NS_MUCLUMBUS from nbxmpp.protocol import NS_DATA @@ -31,6 +32,13 @@ from nbxmpp.util import call_on_response from nbxmpp.util import callback from nbxmpp.util import raise_error +try: + import gi + gi.require_version('Soup', '2.4') + from gi.repository import Soup + SOUP_AVAILABLE = True +except (ValueError, ImportError): + SOUP_AVAILABLE = False log = logging.getLogger('nbxmpp.m.muclumbus') @@ -42,6 +50,10 @@ class Muclumbus: self._client = client self.handlers = [] + self._soup_session = None + if SOUP_AVAILABLE: + self._soup_session = Soup.Session() + @call_on_response('_parameters_received') def request_parameters(self, jid): query = Iq(to=jid, typ='get') @@ -76,6 +88,25 @@ class Muclumbus: query.addChild(node=search) return query + def set_http_search(self, uri, keywords, after=None, + callback=None, user_data=None): + if not SOUP_AVAILABLE: + raise ImportError('Module Soup not found') + + search = {'keywords': keywords} + if after is not None: + search['after'] = after + + message = Soup.Message.new('POST', uri) + message.set_request('application/json', + Soup.MemoryUse.COPY, + json.dumps(search).encode()) + + self._soup_session.queue_message(message, + self._http_search_received, + callback, + user_data) + @callback def _search_received(self, stanza): if not isResultNode(stanza): @@ -118,10 +149,10 @@ class Muclumbus: except ValueError: anonymity_mode = AnonymityMode.UNKNOWN results.append(MuclumbusItem(jid=jid, - name=name, - nusers=nusers, - description=description, - language=language, + name=name or '', + nusers=nusers or '', + description=description or '', + language=language or '', is_open=is_open, anonymity_mode=anonymity_mode)) return MuclumbusResult(first=first, @@ -129,3 +160,53 @@ class Muclumbus: max=max_, end=len(items) < max_, items=results) + + def _http_search_received(self, _session, message, callback, user_data): + soup_body = message.get_property('response-body') + + if message.status_code != 200: + log.warning(soup_body.data) + return MuclumbusResult(first=None, + last=None, + max=None, + end=True, + items=[]) + + + response = json.loads(soup_body.data) + + result = response['result'] + items = result.get('items') + if items is None: + return MuclumbusResult(first=None, + last=None, + max=None, + end=True, + items=[]) + + results = [] + for item in items: + try: + anonymity_mode = AnonymityMode(item['anonymity_mode']) + except ValueError: + anonymity_mode = AnonymityMode.UNKNOWN + + results.append( + MuclumbusItem(jid=item['address'], + name=item['name'] or '', + nusers=str(item['nusers'] or ''), + description=item['description'] or '', + language=item['language'] or '', + is_open=item['is_open'], + anonymity_mode=anonymity_mode)) + + muclumbus_result = MuclumbusResult(first=None, + last=result['last'], + max=None, + end=not result['more'], + items=results) + + if user_data is None: + callback(muclumbus_result) + else: + callback(muclumbus_result, user_data) View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/b1f664db25f4729b36899bdafd… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/b1f664db25f4729b36899bdafd… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Groupchat: Fix invite dialog
by Philipp Hörist 02 Aug '19

02 Aug '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: da6d923c by Philipp Hörist at 2019-08-02T13:35:23Z Groupchat: Fix invite dialog - - - - - 1 changed file: - gajim/gtk/dialogs.py Changes: ===================================== gajim/gtk/dialogs.py ===================================== @@ -792,7 +792,7 @@ class InvitationReceivedDialog(Gtk.ApplicationWindow): def on_accept_button_clicked(self, widget): app.interface.show_or_join_groupchat(self.account, - self.jid, + self.room_jid, password=self.password) self.destroy() View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/da6d923ccd63f17a807a0a4cfbe2572198… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/da6d923ccd63f17a807a0a4cfbe2572198… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Preferences: Show debug option on all platforms
by Philipp Hörist 02 Aug '19

02 Aug '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 6424a64a by Philipp Hörist at 2019-08-02T10:34:03Z Preferences: Show debug option on all platforms - - - - - 13078dfd by Philipp Hörist at 2019-08-02T11:10:56Z Delete debug logs older than 3 days - - - - - 3 changed files: - gajim/application.py - gajim/common/app.py - gajim/gtk/preferences.py Changes: ===================================== gajim/application.py ===================================== @@ -33,6 +33,7 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. +import time import sys from datetime import datetime from pathlib import Path @@ -357,8 +358,9 @@ class GajimApplication(Gtk.Application): configpaths.init() - if app.get_win_debug_mode(): + if app.get_debug_mode(): # Redirect has to happen before logging init + self._cleanup_debug_logs() self._redirect_output() logging_helpers.init() logging_helpers.set_verbose() @@ -393,11 +395,21 @@ class GajimApplication(Gtk.Application): @staticmethod def _redirect_output(): debug_folder = Path(configpaths.get('DEBUG')) - date = datetime.today().strftime('%Y-%m-%d') + date = datetime.today().strftime('%d%m%Y-%H%M%S') filename = '%s-debug.log' % date fd = open(debug_folder / filename, 'a') sys.stderr = sys.stdout = fd + @staticmethod + def _cleanup_debug_logs(): + debug_folder = Path(configpaths.get('DEBUG')) + debug_files = list(debug_folder.glob('*-debug.log*')) + now = time.time() + for file in debug_files: + # Delete everything older than 3 days + if file.stat().st_ctime < now - 259200: + file.unlink() + def add_actions(self): ''' Build Application Actions ''' from gajim import app_actions ===================================== gajim/common/app.py ===================================== @@ -680,7 +680,7 @@ def load_css_config(): from gajim.gtk.css_config import CSSConfig css_config = CSSConfig() -def set_win_debug_mode(enable: bool) -> None: +def set_debug_mode(enable: bool) -> None: debug_folder = Path(configpaths.get('DEBUG')) debug_enabled = debug_folder / 'debug-enabled' if enable: @@ -689,9 +689,7 @@ def set_win_debug_mode(enable: bool) -> None: if debug_enabled.exists(): debug_enabled.unlink() -def get_win_debug_mode() -> bool: - if sys.platform != 'win32': - return False +def get_debug_mode() -> bool: debug_folder = Path(configpaths.get('DEBUG')) debug_enabled = debug_folder / 'debug-enabled' return debug_enabled.exists() ===================================== gajim/gtk/preferences.py ===================================== @@ -13,7 +13,6 @@ # along with Gajim. If not, see <http://www.gnu.org/licenses/>. import os -import sys from gi.repository import Gtk from gi.repository import Gdk @@ -410,10 +409,8 @@ class Preferences(Gtk.ApplicationWindow): st = app.config.get('log_contact_status_changes') self._ui.log_show_changes_checkbutton.set_active(st) - # Enable debug logging - if sys.platform == 'win32': - self._ui.enable_logging.set_active(app.get_win_debug_mode()) - self._ui.enable_logging.show() + self._ui.enable_logging.set_active(app.get_debug_mode()) + self._ui.enable_logging.show() self._ui.connect_signals(self) self.connect('key-press-event', self._on_key_press) @@ -1000,7 +997,7 @@ class Preferences(Gtk.ApplicationWindow): # Enable debug logging def on_enable_logging_toggled(self, widget): - app.set_win_debug_mode(widget.get_active()) + app.set_debug_mode(widget.get_active()) # Advanced Config Editor (ACE) def on_open_advanced_editor_button_clicked(self, _widget): View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/298adcf072d69893949e51d32fc6bc16d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/298adcf072d69893949e51d32fc6bc16d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Commands: Fix giving a reason when executing /leave
by Philipp Hörist 02 Aug '19

02 Aug '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 298adcf0 by Philipp Hörist at 2019-08-02T09:55:24Z Commands: Fix giving a reason when executing /leave - - - - - 3 changed files: - gajim/command_system/implementation/standard.py - gajim/common/modules/muc.py - gajim/groupchat_control.py Changes: ===================================== gajim/command_system/implementation/standard.py ===================================== @@ -312,7 +312,7 @@ class StandardGroupChatCommands(CommandContainer): @command('part', 'close', raw=True, empty=True) @doc(_("Leave the group chat, optionally giving a reason, and close tab or window")) def leave(self, reason): - self.leave() + self.leave(reason=reason) @command(raw=True, empty=True) @doc(_(""" ===================================== gajim/common/modules/muc.py ===================================== @@ -163,14 +163,15 @@ class MUC(BaseModule): self._set_muc_state(muc_data.jid, MUCJoinedState.JOINING) self._con.connection.send(presence) - def leave(self, room_jid): + def leave(self, room_jid, reason=None): self._log.info('Leave MUC: %s', room_jid) self._remove_join_timeout(room_jid) self._set_muc_state(room_jid, MUCJoinedState.NOT_JOINED) muc_data = self._get_muc_data(room_jid) self._con.get_module('Presence').send_presence( muc_data.occupant_jid, - typ='unavailable') + typ='unavailable', + status=reason) # We leave a group chat, disable bookmark autojoin self._con.get_module('Bookmarks').set_autojoin(room_jid, False) ===================================== gajim/groupchat_control.py ===================================== @@ -1544,8 +1544,9 @@ class GroupchatControl(ChatControlBase): self.update_actions() - def leave(self): - app.connections[self.account].get_module('MUC').leave(self.room_jid) + def leave(self, reason=None): + app.connections[self.account].get_module('MUC').leave(self.room_jid, + reason=reason) self.got_disconnected() self._close_control() View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/298adcf072d69893949e51d32fc6bc16d4… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/298adcf072d69893949e51d32fc6bc16d4… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: Validate parsed xmpp: URIs
by Philipp Hörist 02 Aug '19

02 Aug '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: a2f2028b by Philipp Hörist at 2019-08-01T12:46:13Z Validate parsed xmpp: URIs - - - - - 2b3e1048 by Philipp Hörist at 2019-08-01T20:27:41Z Use validate_jid in more places - - - - - 91f82a8f by Philipp Hörist at 2019-08-02T07:32:48Z Groupchat: Add and use leave() method - - - - - 6 changed files: - gajim/command_system/implementation/standard.py - gajim/common/helpers.py - gajim/groupchat_control.py - gajim/gtk/groupchat_creation.py - gajim/gtk/start_chat.py - gajim/roster_window.py Changes: ===================================== gajim/command_system/implementation/standard.py ===================================== @@ -312,8 +312,7 @@ class StandardGroupChatCommands(CommandContainer): @command('part', 'close', raw=True, empty=True) @doc(_("Leave the group chat, optionally giving a reason, and close tab or window")) def leave(self, reason): - self.connection.get_module('MUC').leave(self.room_jid) - self.parent_win.remove_tab(self, self.parent_win.CLOSE_COMMAND, reason) + self.leave() @command(raw=True, empty=True) @doc(_(""" ===================================== gajim/common/helpers.py ===================================== @@ -59,6 +59,8 @@ import nbxmpp from nbxmpp.util import compute_caps_hash from nbxmpp.stringprepare import nameprep from nbxmpp.structs import DiscoInfo +from nbxmpp.protocol import JID +from nbxmpp.protocol import InvalidJid from gi.repository import GLib import precis_i18n.codec # pylint: disable=unused-import @@ -1484,6 +1486,7 @@ def parse_uri(uri): if uri.startswith('xmpp:'): action, data = parse_uri_actions(uri) try: + validate_jid(data['jid']) return URI(type=URIType.XMPP, action=URIAction(action), data=data) @@ -1603,3 +1606,10 @@ def get_default_muc_config(): '{http://prosody.im/protocol/muc}roomconfig_allowmemberinvites': True, 'muc#roomconfig_enablearchiving': True, } + + +def validate_jid(jid): + try: + return JID(str(jid)) + except InvalidJid as error: + raise ValueError(error) ===================================== gajim/groupchat_control.py ===================================== @@ -631,8 +631,7 @@ class GroupchatControl(ChatControlBase): # Actions def _on_disconnect(self, action, param): - app.connections[self.account].get_module('MUC').leave(self.room_jid) - self._close_control() + self.leave() def _on_destroy_room(self, action, param): def _on_confirm(reason, jid): @@ -1545,6 +1544,11 @@ class GroupchatControl(ChatControlBase): self.update_actions() + def leave(self): + app.connections[self.account].get_module('MUC').leave(self.room_jid) + self.got_disconnected() + self._close_control() + def rejoin(self): if not self.autorejoin: return False @@ -2227,7 +2231,10 @@ class GroupchatControl(ChatControlBase): on_yes(self) def _close_control(self): - self.parent_win.remove_tab(self, None, force=True) + if self.parent_win is None: + self.shutdown() + else: + self.parent_win.remove_tab(self, None, force=True) def set_control_active(self, state): self.conv_textview.allow_focus_out_line = True ===================================== gajim/gtk/groupchat_creation.py ===================================== @@ -18,14 +18,13 @@ import random from gi.repository import Gtk from gi.repository import Gdk -from nbxmpp.protocol import InvalidJid -from nbxmpp.protocol import JID from nbxmpp.util import is_error_result from gajim.common import app from gajim.common.const import MUC_CREATION_EXAMPLES from gajim.common.const import MUC_DISCO_ERRORS from gajim.common.i18n import _ +from gajim.common.helpers import validate_jid from gajim.gtk.dialogs import ErrorDialog from gajim.gtk.util import get_builder @@ -126,11 +125,11 @@ class CreateGroupchatWindow(Gtk.ApplicationWindow): return try: - jid = JID(text) + jid = validate_jid(text) if jid.getResource(): - raise InvalidJid + raise ValueError - except InvalidJid: + except ValueError: self._set_warning(_('Invalid Address')) else: self._set_warning_icon(False) ===================================== gajim/gtk/start_chat.py ===================================== @@ -20,12 +20,11 @@ from gi.repository import Gtk from gi.repository import GLib from gi.repository import Pango -from nbxmpp.protocol import InvalidJid -from nbxmpp.protocol import JID from nbxmpp.util import is_error_result from gajim.common import app from gajim.common import helpers +from gajim.common.helpers import validate_jid from gajim.common.i18n import _ from gajim.common.const import AvatarSize from gajim.common.const import MUC_DISCO_ERRORS @@ -249,8 +248,8 @@ class StartChatDialog(Gtk.ApplicationWindow): def _start_new_chat(self, row): if row.new: try: - JID(row.jid) - except InvalidJid as error: + validate_jid(row.jid) + except ValueError as error: self._show_error_page(error) return ===================================== gajim/roster_window.py ===================================== @@ -2960,11 +2960,9 @@ class RosterWindow: """ When disconnect menuitem is activated: disconnect from room """ - app.connections[account].get_module('MUC').leave(jid) if jid in app.interface.minimized_controls[account]: ctrl = app.interface.minimized_controls[account][jid] - ctrl.shutdown() - ctrl.got_disconnected() + ctrl.leave() self.remove_groupchat(jid, account) def on_reconnect(self, widget, jid, account): View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/5a8289b690cf700d414b4b6264c27e1b5… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/5a8289b690cf700d414b4b6264c27e1b5… You're receiving this email because of your account on dev.gajim.org.

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits