Commits August 2019

commits@gajim.org

1 participants
78 discussions

[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

[Git][gajim/python-nbxmpp][master] DiscoInfo: Add new methods
by Philipp Hörist 25 Aug '19

25 Aug '19

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 10fe8109 by Philipp Hörist at 2019-08-25T20:20:50Z DiscoInfo: Add new methods - Make get_field_value public - Add has_field() - - - - - 1 changed file: - nbxmpp/structs.py Changes: ===================================== nbxmpp/structs.py ===================================== @@ -132,11 +132,22 @@ class DiscoInfo(namedtuple('DiscoInfo', 'stanza identities features dataforms ti except Exception: return None - def _get_form_value(self, form_type, var): + def has_field(self, form_type, var): for dataform in self.dataforms: try: - is_info_form = dataform['FORM_TYPE'] != form_type - if not is_info_form: + if dataform['FORM_TYPE'].value != form_type: + continue + if var in dataform.vars: + return True + + except Exception: + continue + return False + + def get_field_value(self, form_type, var): + for dataform in self.dataforms: + try: + if dataform['FORM_TYPE'].value != form_type: continue if dataform[var].type_ == 'jid-multi': @@ -218,38 +229,38 @@ class DiscoInfo(namedtuple('DiscoInfo', 'stanza identities features dataforms ti @property def muc_room_name(self): - return self._get_form_value(NS_MUC_INFO, 'muc#roomconfig_roomname') + return self.get_field_value(NS_MUC_INFO, 'muc#roomconfig_roomname') @property def muc_description(self): - return self._get_form_value(NS_MUC_INFO, 'muc#roominfo_description') + return self.get_field_value(NS_MUC_INFO, 'muc#roominfo_description') @property def muc_log_uri(self): - return self._get_form_value(NS_MUC_INFO, 'muc#roominfo_logs') + return self.get_field_value(NS_MUC_INFO, 'muc#roominfo_logs') @property def muc_users(self): - return self._get_form_value(NS_MUC_INFO, 'muc#roominfo_occupants') + return self.get_field_value(NS_MUC_INFO, 'muc#roominfo_occupants') @property def muc_contacts(self): - return self._get_form_value(NS_MUC_INFO, 'muc#roominfo_contactjid') + return self.get_field_value(NS_MUC_INFO, 'muc#roominfo_contactjid') @property def muc_subject(self): - return self._get_form_value(NS_MUC_INFO, 'muc#roominfo_subject') + return self.get_field_value(NS_MUC_INFO, 'muc#roominfo_subject') @property def muc_subjectmod(self): # muc#roominfo_changesubject stems from a wrong example in the MUC XEP # Ejabberd and Prosody use this value - return (self._get_form_value(NS_MUC_INFO, 'muc#roominfo_subjectmod') or - self._get_form_value(NS_MUC_INFO, 'muc#roominfo_changesubject')) + return (self.get_field_value(NS_MUC_INFO, 'muc#roominfo_subjectmod') or + self.get_field_value(NS_MUC_INFO, 'muc#roominfo_changesubject')) @property def muc_lang(self): - return self._get_form_value(NS_MUC_INFO, 'muc#roominfo_lang') + return self.get_field_value(NS_MUC_INFO, 'muc#roominfo_lang') @property def muc_is_persistent(self): View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/10fe8109cf6681b58824ccbe9a… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/10fe8109cf6681b58824ccbe9a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Avatar: Check storage before vcard request
by Philipp Hörist 25 Aug '19

25 Aug '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: a3e63057 by Philipp Hörist at 2019-08-25T08:23:33Z Avatar: Check storage before vcard request - - - - - 1 changed file: - gajim/common/modules/vcard_avatars.py Changes: ===================================== gajim/common/modules/vcard_avatars.py ===================================== @@ -14,7 +14,6 @@ # XEP-0153: vCard-Based Avatars -import os from pathlib import Path import nbxmpp @@ -113,6 +112,7 @@ class VCardAvatars(BaseModule): def _update_received(self, properties, room=False): jid = properties.jid.getBare() + acc_jid = self._con.get_own_jid().getStripped() if properties.avatar_state == AvatarState.EMPTY: # Empty <photo/> tag, means no avatar is advertised self._log.info('%s has no avatar published', properties.jid) @@ -120,8 +120,10 @@ class VCardAvatars(BaseModule): # Remove avatar self._log.debug('Remove: %s', jid) app.contacts.set_avatar(self._account, jid, None) - acc_jid = self._con.get_own_jid().getStripped() - if not room: + + if room: + 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) @@ -135,16 +137,21 @@ class VCardAvatars(BaseModule): jid, properties.avatar_sha) return - if room: - # We dont save the room avatar hash in our DB, so check - # if we previously downloaded it - if app.interface.avatar_exists(properties.avatar_sha): - app.contacts.set_avatar(self._account, - jid, - properties.avatar_sha) - app.interface.update_avatar( - self._account, jid, room_avatar=room) - return + if app.interface.avatar_exists(properties.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) + else: + app.logger.set_avatar_sha(acc_jid, + jid, + properties.avatar_sha) + app.contacts.set_avatar(self._account, + jid, + properties.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) @@ -173,9 +180,7 @@ class VCardAvatars(BaseModule): app.interface.update_avatar(contact=gc_contact) else: self._log.info('Update: %s %s', nick, properties.avatar_sha) - path = os.path.join(configpaths.get('AVATAR'), - properties.avatar_sha) - if not os.path.isfile(path): + if not app.interface.avatar_exists(properties.avatar_sha): if properties.avatar_sha not in self._requested_shas: app.log('avatar').info('Request: %s', nick) self._requested_shas.append(properties.avatar_sha) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/a3e63057ece9a6e12f3e072adda0b9f010… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/a3e63057ece9a6e12f3e072adda0b9f010… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Logger: Fix syntax error
by Philipp Hörist 24 Aug '19

24 Aug '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: fb082ce7 by Philipp Hörist at 2019-08-24T22:24:56Z Logger: Fix syntax error - - - - - b71cdcdb by Philipp Hörist at 2019-08-24T22:24:56Z HistorySync: Fix error on raw-mam-message-received event - - - - - 3 changed files: - gajim/common/logger.py - gajim/common/modules/mam.py - gajim/gtk/history_sync.py Changes: ===================================== gajim/common/logger.py ===================================== @@ -129,7 +129,7 @@ CACHE_SQL_STATEMENT = ''' ); CREATE TABLE muc_avatars( jid TEXT PRIMARY KEY UNIQUE, - avatar_sha TEXT, + avatar_sha TEXT ); PRAGMA user_version=4; ''' ===================================== gajim/common/modules/mam.py ===================================== @@ -149,9 +149,10 @@ class MAM(BaseModule): return app.nec.push_incoming_event( - NetworkIncomingEvent('raw-mam-message-received', - conn=self._con, - stanza=stanza)) + NetworkIncomingEvent('mam-message-received', + account=self._account, + stanza=stanza, + properties=properties)) if not self._from_valid_archive(stanza, properties): self._log.warning('Message from invalid archive %s', ===================================== gajim/gtk/history_sync.py ===================================== @@ -23,6 +23,7 @@ from gajim.common import app from gajim.common import ged from gajim.common.i18n import _ from gajim.common.const import ArchiveState +from gajim.common.helpers import event_filter from gajim.gtk.util import load_icon @@ -91,7 +92,7 @@ class HistorySyncAssistant(Gtk.Assistant): app.ged.register_event_handler('archiving-interval-finished', ged.GUI1, self._received_finished) - app.ged.register_event_handler('raw-mam-message-received', + app.ged.register_event_handler('mam-message-received', ged.PRECORE, self._nec_mam_message_received) @@ -160,13 +161,9 @@ class HistorySyncAssistant(Gtk.Assistant): self.set_current_page(Pages.SUMMARY) self.summary.finished() + @event_filter(['account']) def _nec_mam_message_received(self, event): - if event.conn.name != self.account: - return - - result = event.stanza.getTag('result') - queryid = result.getAttr('queryid') - if queryid != self.query_id: + if self.query_id != event.properties.mam.query_id: return log.debug('Received message') @@ -192,7 +189,7 @@ class HistorySyncAssistant(Gtk.Assistant): app.ged.remove_event_handler('archiving-interval-finished', ged.GUI1, self._received_finished) - app.ged.remove_event_handler('raw-mam-message-received', + app.ged.remove_event_handler('mam-message-received', ged.PRECORE, self._nec_mam_message_received) View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/8416724b3a58792d3daa044084d31039b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/8416724b3a58792d3daa044084d31039b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] HistorySync: Fix some strings
by Philipp Hörist 24 Aug '19

24 Aug '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 8416724b by Daniel Brötzmann at 2019-08-24T21:53:33Z HistorySync: Fix some strings - - - - - 1 changed file: - gajim/gtk/history_sync.py Changes: ===================================== gajim/gtk/history_sync.py ===================================== @@ -206,7 +206,7 @@ class SelectTimePage(Gtk.Box): self.set_spacing(18) self.assistant = assistant label = Gtk.Label( - label=_('How far back do you want to synchronize chat history?')) + label=_('How far back should the chat history be synchronised?')) listbox = Gtk.ListBox() listbox.set_hexpand(False) @@ -258,7 +258,7 @@ class DownloadHistoryPage(Gtk.Box): 'received': self.received, 'max': self.count})) else: self.progress.pulse() - self.progress.set_text(_('Downloaded %s Messages' % self.received)) + self.progress.set_text(_('Downloaded %s messages' % self.received)) def finished(self): self.progress.set_fraction(1) @@ -278,25 +278,15 @@ class SummaryPage(Gtk.Box): def finished(self): received = self.assistant.download_history.received - finished = _(''' - Finished synchronising your History. - {received} Messages downloaded. - '''.format(received=received)) - self.label.set_text(finished) + self.label.set_text(_('Finished synchronising chat history:\n' + '%s messages downloaded' % received)) def nothing_to_do(self): - nothing_to_do = _(''' - Gajim is fully synchronised - with the Archive. - ''') - self.label.set_text(nothing_to_do) + self.label.set_text(_('Gajim is fully synchronised with the archive.')) def query_already_running(self): - already_running = _(''' - There is already a synchronisation in - progress. Please try later. - ''') - self.label.set_text(already_running) + self.label.set_text(_('There is already a synchronisation in ' + 'progress. Please try again later.')) class TimeOption(Gtk.Label): View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/8416724b3a58792d3daa044084d31039b8… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/8416724b3a58792d3daa044084d31039b8… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 5 commits: MUC: store MUC avatar sha in database
by Philipp Hörist 24 Aug '19

24 Aug '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 7f46ca56 by Philipp Hörist at 2019-08-24T21:29:46Z MUC: store MUC avatar sha in database - - - - - 86bb10c4 by Philipp Hörist at 2019-08-24T21:32:06Z Avatar: Add get_muc_surface() - - - - - e15aaa21 by Philipp Hörist at 2019-08-24T21:52:32Z StartChat: Display Avatar for MUCs - - - - - 1b4c3c9d by Philipp Hörist at 2019-08-24T21:52:38Z Contacts: Set avatar sha on groupchat contacts - - - - - e00ae564 by Philipp Hörist at 2019-08-24T21:52:38Z Groupchat: Use avatar storage for banner image - - - - - 6 changed files: - gajim/common/logger.py - gajim/common/modules/vcard_temp.py - gajim/groupchat_control.py - gajim/gtk/avatar.py - gajim/gtk/start_chat.py - gajim/gui_interface.py Changes: ===================================== gajim/common/logger.py ===================================== @@ -127,7 +127,11 @@ CACHE_SQL_STATEMENT = ''' group_name TEXT, PRIMARY KEY (account_jid_id, jid_id, group_name) ); - PRAGMA user_version=3; + CREATE TABLE muc_avatars( + jid TEXT PRIMARY KEY UNIQUE, + avatar_sha TEXT, + ); + PRAGMA user_version=4; ''' log = logging.getLogger('gajim.c.logger') @@ -329,6 +333,15 @@ class Logger: ] self._execute_multiple(con, statements) + if self._get_user_version(con) < 4: + statements = [ + '''CREATE TABLE muc_avatars( + jid TEXT PRIMARY KEY UNIQUE, + avatar_sha TEXT)''', + 'PRAGMA user_version=4' + ] + self._execute_multiple(con, statements) + @staticmethod def _execute_multiple(con, statements): """ @@ -1443,6 +1456,40 @@ class Logger: self._con.execute(sql, (sha, account_jid_id, jid_id)) self._timeout_commit() + def set_muc_avatar_sha(self, jid, sha=None): + """ + Set the avatar sha of a MUC + + :param jid: The MUC jid that belongs to the avatar + + :param sha: The sha of the avatar + + """ + + sql = '''INSERT INTO muc_avatars (jid, avatar_sha) + VALUES (?, ?)''' + + try: + 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._timeout_commit() + + def get_muc_avatar_sha(self, jid): + """ + Get the avatar sha of a MUC + + :param jid: The MUC jid that belongs to the avatar + + """ + + sql = '''SELECT avatar_sha FROM muc_avatars WHERE jid = ?''' + row = self._con.execute(sql, (jid,)).fetchone() + if row is not None: + return row.avatar_sha + def get_archive_infos(self, jid): """ Get the archive infos ===================================== gajim/common/modules/vcard_temp.py ===================================== @@ -265,6 +265,7 @@ class VCardTemp(BaseModule): app.interface.save_avatar(photo_decoded) self._log.info('Received: %s %s', jid, avatar_sha) + app.logger.set_muc_avatar_sha(jid, avatar_sha) app.contacts.set_avatar(self._account, jid, avatar_sha) app.interface.update_avatar(self._account, jid, room_avatar=True) ===================================== gajim/groupchat_control.py ===================================== @@ -1098,18 +1098,13 @@ class GroupchatControl(ChatControlBase): self.change_roster_style() def _update_banner_state_image(self): - banner_status_img = self.xml.get_object('gc_banner_status_image') - if self.is_connected: - if self.contact.avatar_sha: - surface = app.interface.get_avatar(self.contact, - AvatarSize.CHAT, - self.scale_factor) - banner_status_img.set_from_surface(surface) - return - icon = get_icon_name('muc-active') - else: - icon = get_icon_name('muc-inactive') - banner_status_img.set_from_icon_name(icon, Gtk.IconSize.DND) + surface = app.interface.avatar_storage.get_muc_surface( + self.account, + self.contact.jid, + AvatarSize.CHAT, + self.scale_factor) + + self.xml.gc_banner_status_image.set_from_surface(surface) def get_continued_conversation_name(self): """ ===================================== gajim/gtk/avatar.py ===================================== @@ -23,8 +23,10 @@ from gi.repository import Gdk from gi.repository import GdkPixbuf import cairo +from gajim.common import app from gajim.common import configpaths from gajim.common.helpers import Singleton +from gajim.common.helpers import get_groupchat_name from gajim.common.const import AvatarSize from gajim.gtk.util import load_pixbuf @@ -130,7 +132,34 @@ class AvatarStorage(metaclass=Singleton): self._cache[jid][(size, scale)] = surface return surface - surface = self._generate_default_avatar(contact, size, scale) + name = contact.get_shown_name() + # Use nickname for group chats and bare JID for single contacts + if contact.is_gc_contact: + color_string = contact.name + else: + color_string = contact.jid + + surface = self._generate_default_avatar(name, color_string, size, scale) + self._cache[jid][(size, scale)] = surface + return surface + + def get_muc_surface(self, account, jid, size, scale): + surface = self._cache[jid].get((size, scale)) + if surface is not None: + return surface + + avatar_sha = app.logger.get_muc_avatar_sha(jid) + if avatar_sha is not None: + surface = self.surface_from_filename(avatar_sha, size, scale) + if surface is None: + return None + surface = clip_circle(surface) + self._cache[jid][(size, scale)] = surface + return surface + + con = app.connections[account] + name = get_groupchat_name(con, jid) + surface = self._generate_default_avatar(name, jid, size, scale) self._cache[jid][(size, scale)] = surface return surface @@ -230,16 +259,14 @@ class AvatarStorage(metaclass=Singleton): return clip_circle(surface) @staticmethod - def _generate_default_avatar(contact, size, scale): - # Get initial from name - name = contact.get_shown_name() - letter = name[0].capitalize() - - # Use nickname for group chats and bare JID for single contacts - if contact.is_gc_contact: - color_string = contact.name - else: - color_string = contact.jid + def _generate_letter(name): + for letter in name: + if letter.isalpha(): + return letter.capitalize() + return name[0].capitalize() + + def _generate_default_avatar(self, name, color_string, size, scale): + letter = self._generate_letter(name) color = text_to_color(color_string) surface = generate_avatar(letter, color, size, scale) surface = clip_circle(surface) ===================================== gajim/gtk/start_chat.py ===================================== @@ -33,7 +33,6 @@ from gajim.common.const import AvatarSize from gajim.common.const import MUC_DISCO_ERRORS from gajim.gtk.groupchat_info import GroupChatInfoScrolled -from gajim.gtk.util import get_icon_name from gajim.gtk.util import get_builder from gajim.gtk.util import ensure_not_destroyed @@ -569,20 +568,7 @@ class ContactRow(Gtk.ListBoxRow): grid.set_column_spacing(12) grid.set_size_request(260, -1) - if self.groupchat: - muc_icon = get_icon_name( - 'muc-inactive' if self.new else 'muc-active') - image = Gtk.Image.new_from_icon_name(muc_icon, Gtk.IconSize.DND) - else: - scale = self.get_scale_factor() - avatar = app.contacts.get_avatar( - account, jid, AvatarSize.CHAT, scale) - if avatar is None: - image = Gtk.Image.new_from_icon_name( - 'avatar-default', Gtk.IconSize.DND) - else: - image = Gtk.Image.new_from_surface(avatar) - + image = self._get_avatar_image(account, jid) image.set_size_request(AvatarSize.CHAT, AvatarSize.CHAT) grid.add(image) @@ -631,6 +617,18 @@ class ContactRow(Gtk.ListBoxRow): self.add(grid) self.show_all() + def _get_avatar_image(self, account, jid): + scale = self.get_scale_factor() + + if self.groupchat: + surface = app.interface.avatar_storage.get_muc_surface( + account, jid, AvatarSize.CHAT, scale) + return Gtk.Image.new_from_surface(surface) + + avatar = app.contacts.get_avatar( + account, jid, AvatarSize.CHAT, scale) + return Gtk.Image.new_from_surface(avatar) + def update_jid(self, jid): self.jid = jid self.jid_label.set_text(jid) ===================================== gajim/gui_interface.py ===================================== @@ -1522,10 +1522,12 @@ class Interface: def create_groupchat_control(self, account, room_jid, muc_data, minimize=False): + avatar_sha = app.logger.get_muc_avatar_sha(room_jid) contact = app.contacts.create_contact(jid=room_jid, account=account, groups=[_('Group chats')], sub='none', + avatar_sha=avatar_sha, groupchat=True) app.contacts.add_contact(account, contact) View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/0740133237997da9312aa5b13c70eff23… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/0740133237997da9312aa5b13c70eff23… 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