Commits

commits@gajim.org

17632 discussions

[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

[Git][gajim/gajim][master] Fix typo
by Philipp Hörist 27 Aug '19

27 Aug '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 34e50ce9 by Philipp Hörist at 2019-08-27T20:10:30Z Fix typo - - - - - 1 changed file: - gajim/common/modules/muc.py Changes: ===================================== gajim/common/modules/muc.py ===================================== @@ -787,7 +787,7 @@ class MUC(BaseModule): type_ = InviteType.DIRECT password = app.gc_passwords.get(room, None) - self._log.info('Inivte %s to %s', to, room) + self._log.info('Invite %s to %s', to, room) self._nbxmpp('MUC').invite(room, to, reason, password, continue_, type_) def cleanup(self): View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/34e50ce9d481b71e1ffbac6d4b20deccfe… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/34e50ce9d481b71e1ffbac6d4b20deccfe… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Groupchat: Remove include/exclude list when closing the tab
by Philipp Hörist 26 Aug '19

26 Aug '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 1b7f3f51 by Philipp Hörist at 2019-08-26T20:11:17Z Groupchat: Remove include/exclude list when closing the tab The available options regarding closing tabs should be enough - - - - - 0de8c8ac by Philipp Hörist at 2019-08-26T21:08:51Z AdHoc: Remove obsolete LeaveGroupchatsCommand This can be easier done by just removing the autojoin flag - - - - - 3 changed files: - gajim/common/config.py - gajim/common/modules/adhoc_commands.py - gajim/groupchat_control.py Changes: ===================================== gajim/common/config.py ===================================== @@ -184,8 +184,6 @@ class Config: 'print_ichat_every_foo_minutes': [opt_int, 5, _('When not printing time for every message (\'print_time\'==sometimes), print it every x minutes.')], 'confirm_paste_image': [opt_bool, True, _('Ask before pasting an image.')], 'confirm_close_muc': [opt_bool, True, _('Ask before closing a group chat tab/window.')], - 'confirm_close_muc_rooms': [opt_str, '', _('Always ask for confirmation before closing group chats with any of the XMPP Addresses on this list (space separated).')], - 'noconfirm_close_muc_rooms': [opt_str, '', _('Never ask for confirmation before closing group chats with any of the XMPP Addresses on this list (space separated).')], 'confirm_close_multiple_tabs': [opt_bool, True, _('Ask before closing tabbed chat window if there are chats that can lose data (chat, private chat, group chat that will not be minimized).')], 'notify_on_file_complete': [opt_bool, True], 'file_transfers_port': [opt_int, 28011], ===================================== gajim/common/modules/adhoc_commands.py ===================================== @@ -197,104 +197,6 @@ def find_current_groupchats(account): return rooms -class LeaveGroupchatsCommand(AdHocCommand): - commandnode = 'leave-groupchats' - commandname = _('Leave Group Chats') - - def __init__(self, conn, jid, sessionid): - AdHocCommand.__init__(self, conn, jid, sessionid) - self._callback = self.first_step - - @staticmethod - def is_visible_for(samejid): - """ - Leave groupchats is visible only if the entity has the same bare jid - """ - return samejid - - def execute(self, request): - return self._callback(request) - - def first_step(self, request): - # first query... - response, cmd = self.build_response(request, - defaultaction='execute', - actions=['execute']) - options = [] - account = self.connection.name - for gc in find_current_groupchats(account): - options.append( - ('%s' % gc[0], - _('%(nickname)s on %(room_jid)s') % {'nickname': gc[1], - 'room_jid': gc[0]})) - if not options: - response, cmd = self.build_response(request, status='completed') - cmd.addChild('note', {}, _('You have not joined a group chat.')) - - self.connection.connection.send(response) - return False - - cmd.addChild( - node=dataforms.SimpleDataForm( - title=_('Leave Group Chats'), - instructions=_('Choose the group chats you want to leave'), - fields=[ - dataforms.create_field( - 'list-multi', - var='groupchats', - label=_('Group chats'), - options=options, - required=True) - ] - ) - ) - - self.connection.connection.send(response) - - # for next invocation - self._callback = self.second_step - - return True # keep the session - - def second_step(self, request): - # check if the data is correct - try: - form = dataforms.SimpleDataForm( - extend=request.getTag('command').getTag('x')) - except Exception: - self.bad_request(request) - return False - - try: - gc = form['groupchats'].values - except Exception: # KeyError if there's no groupchats in form - self.bad_request(request) - return False - account = self.connection.name - try: - for room_jid in gc: - gc_control = app.interface.msg_win_mgr.get_gc_control( - room_jid, account) - if not gc_control: - minimized_controls = app.interface.minimized_controls - gc_control = minimized_controls[account][room_jid] - gc_control.shutdown() - app.interface.roster.remove_groupchat(room_jid, account) - continue - gc_control.parent_win.remove_tab(gc_control, None, force=True) - except Exception: # KeyError if there's no such room opened - self.bad_request(request) - return False - response, cmd = self.build_response(request, status='completed') - note = _('You left the following group chats:') - for room_jid in gc: - note += '\n\t' + room_jid - cmd.addChild('note', {}, note) - - self.connection.connection.send(response) - return False - - class AdHocCommands(BaseModule): _nbxmpp_extends = 'AdHoc' @@ -316,7 +218,7 @@ class AdHocCommands(BaseModule): # a list of all commands exposed: node -> command class self._commands = {} if app.config.get('remote_commands'): - for cmdobj in (ChangeStatusCommand, LeaveGroupchatsCommand): + for cmdobj in (ChangeStatusCommand,): self._commands[cmdobj.commandnode] = cmdobj # a list of sessions; keys are tuples (jid, sessionid, node) ===================================== gajim/groupchat_control.py ===================================== @@ -2215,11 +2215,8 @@ class GroupchatControl(ChatControlBase): def safe_shutdown(self): if self.minimizable(): return True - includes = app.config.get('confirm_close_muc_rooms').split(' ') - excludes = app.config.get('noconfirm_close_muc_rooms').split(' ') # whether to ask for confirmation before closing muc - if (app.config.get('confirm_close_muc') or self.room_jid in includes)\ - and self.is_connected and self.room_jid not in excludes: + if app.config.get('confirm_close_muc') and self.is_connected: return False return True @@ -2233,13 +2230,9 @@ class GroupchatControl(ChatControlBase): self.list_treeview.get_selection().unselect_all() on_no(self) return - includes = app.config.get('confirm_close_muc_rooms').split(' ') - excludes = app.config.get('noconfirm_close_muc_rooms').split(' ') - # whether to ask for confirmation before closing muc - if (app.config.get('confirm_close_muc') or self.room_jid in includes)\ - and self.is_connected and self.room_jid \ - not in excludes: + # whether to ask for confirmation before closing muc + if app.config.get('confirm_close_muc') and self.is_connected: def on_ok(is_checked): if is_checked: # User does not want to be asked again View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/80c1c1f5acabf85b577230d35d532db51… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/80c1c1f5acabf85b577230d35d532db51… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Groupchat: Update name on bookmark name change
by Philipp Hörist 26 Aug '19

26 Aug '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 80c1c1f5 by Philipp Hörist at 2019-08-26T17:24:31Z Groupchat: Update name on bookmark name change - - - - - 2 changed files: - gajim/groupchat_control.py - gajim/roster_window.py Changes: ===================================== gajim/groupchat_control.py ===================================== @@ -334,6 +334,7 @@ class GroupchatControl(ChatControlBase): ('signed-in', ged.GUI1, self._nec_signed_in), ('decrypted-message-received', ged.GUI2, self._nec_decrypted_message_received), ('gc-stanza-message-outgoing', ged.OUT_POSTCORE, self._message_sent), + ('bookmarks-received', ged.GUI2, self._on_bookmarks_received), ] for handler in self._event_handlers: @@ -799,6 +800,7 @@ class GroupchatControl(ChatControlBase): self.update_actions() self.set_lock_image() self._connect_window_state_change(self.parent_win) + self.draw_banner_text() def set_tooltip(self): widget = self.xml.get_object('list_treeview') @@ -1142,6 +1144,13 @@ class GroupchatControl(ChatControlBase): return self._update_banner_state_image() + @event_filter(['account']) + def _on_bookmarks_received(self, _event): + if self.parent_win is None: + return + self.parent_win.redraw_tab(self) + self.draw_banner_text() + @event_filter(['account', 'room_jid']) def _on_voice_approval(self, event): SingleMessageWindow(self.account, ===================================== gajim/roster_window.py ===================================== @@ -2638,6 +2638,11 @@ class RosterWindow: def _on_muc_disco_update(self, event): self.draw_contact(str(event.room_jid), event.account) + def _on_bookmarks_received(self, event): + con = app.connections[event.account] + for bookmark in con.get_module('Bookmarks').bookmarks: + self.draw_contact(str(bookmark.jid), event.account) + def _nec_metacontacts_received(self, obj): self.redraw_metacontacts(obj.conn.name) @@ -5684,3 +5689,5 @@ class RosterWindow: self._nec_chatstate_received) app.ged.register_event_handler('muc-disco-update', ged.GUI1, self._on_muc_disco_update) + app.ged.register_event_handler('bookmarks-received', ged.GUI2, + self._on_bookmarks_received) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/80c1c1f5acabf85b577230d35d532db51f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/80c1c1f5acabf85b577230d35d532db51f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Logger: Pass args in correct order
by Philipp Hörist 25 Aug '19

25 Aug '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: a1e2041e by Philipp Hörist at 2019-08-25T20:37:22Z Logger: Pass args in correct order - - - - - e9811609 by Philipp Hörist at 2019-08-25T20:38:22Z Avatar: Pass JID as string - - - - - 2 changed files: - gajim/common/logger.py - gajim/common/modules/vcard_avatars.py Changes: ===================================== gajim/common/logger.py ===================================== @@ -1473,7 +1473,7 @@ class Logger: self._con.execute(sql, (jid, sha)) except sqlite.IntegrityError: sql = 'UPDATE muc_avatars SET avatar_sha = ? WHERE jid = ?' - self._con.execute(sql, (jid, sha)) + self._con.execute(sql, (sha, jid)) self._timeout_commit() ===================================== gajim/common/modules/vcard_avatars.py ===================================== @@ -123,7 +123,7 @@ class VCardAvatars(BaseModule): avatar_sha = disco_info.get_field_value(nbxmpp.NS_MUC_INFO, field_var) state = AvatarState.EMPTY if not avatar_sha else AvatarState.ADVERTISED - self._process_update(disco_info.jid, state, avatar_sha, True) + self._process_update(str(disco_info.jid), state, avatar_sha, True) def _update_received(self, properties, room=False): self._process_update(properties.jid.getBare(), View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/3e020ef456cdf57447ef58b69d0f8981d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/3e020ef456cdf57447ef58b69d0f8981d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: StartChat: Dont create default avatar for new JID rows
by Philipp Hörist 25 Aug '19

25 Aug '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 3e1c4791 by Philipp Hörist at 2019-08-25T20:21:58Z StartChat: Dont create default avatar for new JID rows - - - - - 3e020ef4 by Philipp Hörist at 2019-08-25T20:28:10Z Avatar: Support avatar sha via disco info in MUCs - - - - - 3 changed files: - gajim/common/modules/discovery.py - gajim/common/modules/vcard_avatars.py - gajim/gtk/start_chat.py Changes: ===================================== gajim/common/modules/discovery.py ===================================== @@ -210,6 +210,7 @@ class Discovery(BaseModule): self._log.info('MUC info received: %s', result.jid) if not is_error_result(result): app.logger.set_last_disco_info(result.jid, result) + self._con.get_module('VCardAvatars').muc_disco_info_update(result) app.nec.push_incoming_event(NetworkEvent( 'muc-disco-update', account=self._account, ===================================== gajim/common/modules/vcard_avatars.py ===================================== @@ -110,12 +110,32 @@ class VCardAvatars(BaseModule): self._log.info('Avatar already known: %s %s', jid, properties.avatar_sha) + def muc_disco_info_update(self, disco_info): + if not disco_info.supports(nbxmpp.NS_VCARD): + return + + field_var = '{http://modules.prosody.im/mod_vcard_muc}avatar#sha1' + if not disco_info.has_field(nbxmpp.NS_MUC_INFO, field_var): + # Workaround so we dont delete the avatar for servers that dont + # support sha in disco info. Once there is a accepted XEP this + # can be removed + return + + avatar_sha = disco_info.get_field_value(nbxmpp.NS_MUC_INFO, field_var) + state = AvatarState.EMPTY if not avatar_sha else AvatarState.ADVERTISED + self._process_update(disco_info.jid, state, avatar_sha, True) + def _update_received(self, properties, room=False): - jid = properties.jid.getBare() + self._process_update(properties.jid.getBare(), + properties.avatar_state, + properties.avatar_sha, + room) + + def _process_update(self, jid, state, avatar_sha, room): acc_jid = self._con.get_own_jid().getStripped() - if properties.avatar_state == AvatarState.EMPTY: + if state == AvatarState.EMPTY: # Empty <photo/> tag, means no avatar is advertised - self._log.info('%s has no avatar published', properties.jid) + self._log.info('%s has no avatar published', jid) # Remove avatar self._log.debug('Remove: %s', jid) @@ -125,42 +145,35 @@ class VCardAvatars(BaseModule): app.logger.set_muc_avatar_sha(jid, None) else: app.logger.set_avatar_sha(acc_jid, jid, None) - app.interface.update_avatar( - self._account, jid, room_avatar=room) + app.interface.update_avatar(self._account, jid, room_avatar=room) else: - self._log.info('Update: %s %s', - properties.jid, properties.avatar_sha) + self._log.info('Update: %s %s', jid, avatar_sha) current_sha = app.contacts.get_avatar_sha(self._account, jid) - if properties.avatar_sha == current_sha: - self._log.info('Avatar already known: %s %s', - jid, properties.avatar_sha) + if avatar_sha == current_sha: + self._log.info('Avatar already known: %s %s', jid, avatar_sha) return - if app.interface.avatar_exists(properties.avatar_sha): + if app.interface.avatar_exists(avatar_sha): # Check if the avatar is already in storage self._log.info('Found avatar in storage') if room: - app.logger.set_muc_avatar_sha(jid, properties.avatar_sha) + app.logger.set_muc_avatar_sha(jid, avatar_sha) else: - app.logger.set_avatar_sha(acc_jid, - jid, - properties.avatar_sha) - app.contacts.set_avatar(self._account, - jid, - properties.avatar_sha) + app.logger.set_avatar_sha(acc_jid, jid, avatar_sha) + app.contacts.set_avatar(self._account, jid, avatar_sha) app.interface.update_avatar( self._account, jid, room_avatar=room) return - if properties.avatar_sha not in self._requested_shas: - self._requested_shas.append(properties.avatar_sha) + if avatar_sha not in self._requested_shas: + self._requested_shas.append(avatar_sha) if room: self._con.get_module('VCardTemp').request_vcard( - RequestAvatar.ROOM, jid, sha=properties.avatar_sha) + RequestAvatar.ROOM, jid, sha=avatar_sha) else: self._con.get_module('VCardTemp').request_vcard( - RequestAvatar.USER, jid, sha=properties.avatar_sha) + RequestAvatar.USER, jid, sha=avatar_sha) def _gc_update_received(self, properties): nick = properties.jid.getResource() ===================================== gajim/gtk/start_chat.py ===================================== @@ -35,6 +35,7 @@ from gajim.common.const import MUC_DISCO_ERRORS from gajim.gtk.groupchat_info import GroupChatInfoScrolled from gajim.gtk.util import get_builder from gajim.gtk.util import ensure_not_destroyed +from gajim.gtk.util import get_icon_name class Search(IntEnum): @@ -618,8 +619,13 @@ class ContactRow(Gtk.ListBoxRow): self.show_all() def _get_avatar_image(self, account, jid): - scale = self.get_scale_factor() + if self.new: + icon_name = 'avatar-default' + if self.groupchat: + icon_name = get_icon_name('muc-inactive') + return Gtk.Image.new_from_icon_name(icon_name, Gtk.IconSize.DND) + scale = self.get_scale_factor() if self.groupchat: surface = app.interface.avatar_storage.get_muc_surface( account, jid, AvatarSize.CHAT, scale) View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/a3e63057ece9a6e12f3e072adda0b9f01… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/a3e63057ece9a6e12f3e072adda0b9f01… 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