Commits

commits@gajim.org

17632 discussions

[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

[Git][gajim/gajim][master] HTTPUpload: Allow max_file_size to be a float
by Philipp Hörist 22 Aug '19

22 Aug '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 07401332 by Philipp Hörist at 2019-08-22T22:22:06Z HTTPUpload: Allow max_file_size to be a float - - - - - 1 changed file: - gajim/common/modules/httpupload.py Changes: ===================================== gajim/common/modules/httpupload.py ===================================== @@ -89,7 +89,11 @@ class HTTPUpload(BaseModule): continue size = form.vars.get('max-file-size') if size is not None: - self.max_file_size = int(size.value) + try: + self.max_file_size = float(size.value) + except Exception: + self._log.info('Invalid file size: %s', size.value) + size = None break if self.max_file_size is None: @@ -205,7 +209,7 @@ class HTTPUpload(BaseModule): tmp = stanza.getTag('error').getTag('file-too-large') if tmp is not None: - max_file_size = int(tmp.getTag('max-file-size').getData()) + max_file_size = float(tmp.getTag('max-file-size').getData()) return _('File is too large, maximum allowed file size is: %s') % \ GLib.format_size_full(max_file_size, GLib.FormatSizeFlags.IEC_UNITS) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/0740133237997da9312aa5b13c70eff234… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/0740133237997da9312aa5b13c70eff234… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Bookmarks: Check if there was a change before store
by Philipp Hörist 22 Aug '19

22 Aug '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 0ebc5171 by Philipp Hörist at 2019-08-22T18:23:11Z Bookmarks: Check if there was a change before store - - - - - 1 changed file: - gajim/common/modules/bookmarks.py Changes: ===================================== gajim/common/modules/bookmarks.py ===================================== @@ -200,13 +200,17 @@ class Bookmarks(BaseModule): bookmark = self.get_bookmark_from_jid(jid) if bookmark is None: bookmark = BookmarkData(jid=jid, **kwargs) + self._bookmarks.append(bookmark) self._log.info('Add new bookmark: %s', bookmark) else: + modified_bookmark = bookmark._replace(**kwargs) + if modified_bookmark == bookmark: + # No change happened + return self._log.info('Modify bookmark: %s %s', jid, kwargs) self._bookmarks.remove(bookmark) - bookmark = bookmark._replace(**kwargs) + self._bookmarks.append(modified_bookmark) - self._bookmarks.append(bookmark) self.store_bookmarks() def remove(self, jid: str, publish: bool = True) -> None: View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/0ebc51714c156832531bb1b9f4ab44db65… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/0ebc51714c156832531bb1b9f4ab44db65… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix undefined variable
by Philipp Hörist 21 Aug '19

21 Aug '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: e4aec8dc by Philipp Hörist at 2019-08-21T21:14:48Z Fix undefined variable - - - - - 1 changed file: - gajim/groupchat_control.py Changes: ===================================== gajim/groupchat_control.py ===================================== @@ -1702,7 +1702,7 @@ class GroupchatControl(ChatControlBase): self.add_info_message(_('A new group chat has been created')) @event_filter(['account', 'room_jid']) - def _on_configuration_failed(self, _event): + def _on_configuration_failed(self, event): self.xml.error_label.set_text(to_user_string(event.error)) self._show_page('error') View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/e4aec8dca88bc6bd471666779697459960… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/e4aec8dca88bc6bd471666779697459960… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] MUC: Refactor MUC creation
by Philipp Hörist 21 Aug '19

21 Aug '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 761d4068 by Philipp Hörist at 2019-08-21T21:08:24Z MUC: Refactor MUC creation Clearly separate join and creation even though this is not the case protocol wise - - - - - 5 changed files: - gajim/common/const.py - gajim/common/modules/mam.py - gajim/common/modules/muc.py - gajim/groupchat_control.py - gajim/gui_interface.py Changes: ===================================== gajim/common/const.py ===================================== @@ -205,6 +205,7 @@ class MUCJoinedState(Enum): JOINED = 'joined' NOT_JOINED = 'not joined' JOINING = 'joining' + CREATING = 'creating' CAPTCHA_REQUEST = 'captcha in progress' CAPTCHA_FAILED = 'captcha failed' ===================================== gajim/common/modules/mam.py ===================================== @@ -112,6 +112,11 @@ class MAM(BaseModule): if properties.type.is_groupchat: archive_jid = properties.jid.getBare() disco_info = app.logger.get_last_disco_info(archive_jid) + if disco_info is None: + # This is the case on MUC creation + # After MUC configuration we receive a configuration change + # message before we had the chance to disco the new MUC + return namespace = disco_info.mam_namespace timestamp = properties.timestamp if namespace is None: ===================================== gajim/common/modules/muc.py ===================================== @@ -149,6 +149,13 @@ class MUC(BaseModule): else: self._join(muc_data) + def create(self, muc_data): + if not app.account_is_connected(self._account): + return + + self._muc_data[muc_data.jid] = muc_data + self._create(muc_data) + def _on_disco_result(self, result): if is_error_result(result): self._log.info('Disco %s failed: %s', result.jid, result.get_text()) @@ -179,6 +186,20 @@ class MUC(BaseModule): self._set_muc_state(muc_data.jid, MUCJoinedState.JOINING) self._con.connection.send(presence) + def _create(self, muc_data): + show = helpers.get_xmpp_show(app.SHOW_LIST[self._con.connected]) + + presence = self._con.get_module('Presence').get_presence( + muc_data.occupant_jid, + show=show, + status=self._con.status) + + presence.setTag(nbxmpp.NS_MUC + ' x') + + self._log.info('Create MUC: %s', muc_data.jid) + self._set_muc_state(muc_data.jid, MUCJoinedState.CREATING) + self._con.connection.send(presence) + def leave(self, room_jid, reason=None): self._log.info('Leave MUC: %s', room_jid) self._remove_join_timeout(room_jid) @@ -236,13 +257,8 @@ class MUC(BaseModule): error=result)) return - self._log.info('Configuration finished: %s', result.jid) - app.nec.push_incoming_event(NetworkEvent( - 'muc-configuration-finished', - account=self._account, - room_jid=result.jid)) - - self._con.get_module('Discovery').disco_muc(result.jid) + self._con.get_module('Discovery').disco_muc( + result.jid, callback=self._on_disco_result_after_config) # If this is an automatic room creation try: @@ -258,6 +274,19 @@ class MUC(BaseModule): for jid in invites: self.invite(result.jid, jid) + def _on_disco_result_after_config(self, result): + if is_error_result(result): + self._log.info('Disco %s failed: %s', result.jid, result.get_text()) + return + + self._room_join_complete(self._get_muc_data(result.jid)) + + self._log.info('Configuration finished: %s', result.jid) + app.nec.push_incoming_event(NetworkEvent( + 'muc-configuration-finished', + account=self._account, + room_jid=result.jid)) + def update_presence(self, auto=False): mucs = self.get_mucs_with_state([MUCJoinedState.JOINED, MUCJoinedState.JOINING]) @@ -345,6 +374,14 @@ class MUC(BaseModule): room_jid=room_jid, error=properties.error)) + elif muc_data.state == MUCJoinedState.CREATING: + self._set_muc_state(room_jid, MUCJoinedState.NOT_JOINED) + app.nec.push_incoming_event( + NetworkEvent('muc-creation-failed', + account=self._account, + room_jid=room_jid, + error=properties.error)) + elif muc_data.state == MUCJoinedState.CAPTCHA_REQUEST: app.nec.push_incoming_event( NetworkEvent('muc-captcha-error', @@ -407,15 +444,19 @@ class MUC(BaseModule): if properties.is_muc_self_presence: self._log.info('Self presence: %s', properties.jid) if muc_data.state == MUCJoinedState.JOINING: - self._start_join_timeout(room_jid) if (properties.is_nickname_modified or muc_data.nick != properties.muc_nickname): muc_data.nick = properties.muc_nickname self._log.info('Server modified nickname to: %s', properties.muc_nickname) + + elif muc_data.state == MUCJoinedState.CREATING: + if properties.is_new_room: + self.configure_room(room_jid) + + self._start_join_timeout(room_jid) self._raise_muc_event('muc-self-presence', properties) - if properties.is_new_room: - self.configure_room(room_jid) + else: self._log.info('User joined: %s', properties.jid) self._raise_muc_event('muc-user-joined', properties) @@ -592,19 +633,21 @@ class MUC(BaseModule): muc_data = self._get_muc_data(room_jid) if muc_data.state == MUCJoinedState.JOINING: - self._remove_join_timeout(room_jid) - self._set_muc_state(room_jid, MUCJoinedState.JOINED) - + self._room_join_complete(muc_data) app.nec.push_incoming_event( NetworkEvent('muc-joined', account=self._account, - room_jid=room_jid)) + room_jid=muc_data.jid)) + + def _room_join_complete(self, muc_data): + self._remove_join_timeout(muc_data.jid) + self._set_muc_state(muc_data.jid, MUCJoinedState.JOINED) - # We successfully joined a MUC, set add bookmark with autojoin - self._con.get_module('Bookmarks').modify(muc_data.jid, - autojoin=True, - password=muc_data.password, - nick=muc_data.nick) + # We successfully joined a MUC, set add bookmark with autojoin + self._con.get_module('Bookmarks').modify(muc_data.jid, + autojoin=True, + password=muc_data.password, + nick=muc_data.nick) def _on_voice_request(self, _con, _stanza, properties): if not properties.is_voice_request: ===================================== gajim/groupchat_control.py ===================================== @@ -305,6 +305,7 @@ class GroupchatControl(ChatControlBase): settings_menu.set_menu_model(self.control_menu) self._event_handlers = [ + ('muc-creation-failed', ged.GUI1, self._on_muc_creation_failed), ('muc-joined', ged.GUI1, self._on_muc_joined), ('muc-join-failed', ged.GUI1, self._on_muc_join_failed), ('muc-user-joined', ged.GUI1, self._on_user_joined), @@ -325,6 +326,7 @@ class GroupchatControl(ChatControlBase): ('muc-voice-approval', ged.GUI1, self._on_voice_approval), ('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), ('gc-message-received', ged.GUI1, self._nec_gc_message_received), ('mam-decrypted-message-received', ged.GUI1, self._nec_mam_decrypted_message_received), ('update-gc-avatar', ged.GUI1, self._nec_update_avatar), @@ -1695,8 +1697,15 @@ class GroupchatControl(ChatControlBase): @event_filter(['account', 'room_jid']) def _on_configuration_finished(self, _event): + self.got_connected() + self._show_page('groupchat') self.add_info_message(_('A new group chat has been created')) + @event_filter(['account', 'room_jid']) + def _on_configuration_failed(self, _event): + self.xml.error_label.set_text(to_user_string(event.error)) + self._show_page('error') + @event_filter(['account', 'room_jid']) def _on_nickname_changed(self, event): nick = event.properties.muc_nickname @@ -1950,6 +1959,11 @@ class GroupchatControl(ChatControlBase): self._show_page('error') self.autorejoin = False + @event_filter(['account', 'room_jid']) + def _on_muc_creation_failed(self, event): + self.xml.error_label.set_text(to_user_string(event.error)) + self._show_page('error') + @event_filter(['account', 'room_jid']) def _on_presence_error(self, event): error_message = to_user_string(event.properties.error) ===================================== gajim/gui_interface.py ===================================== @@ -1564,7 +1564,7 @@ class Interface: def create_groupchat(self, account, room_jid, config=None): muc_data = self._create_muc_data(account, room_jid, None, config) self.create_groupchat_control(account, room_jid, muc_data) - app.connections[account].get_module('MUC').join(muc_data) + app.connections[account].get_module('MUC').create(muc_data) def show_or_join_groupchat(self, account, room_jid, **kwargs): if self.show_groupchat(account, room_jid): View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/761d4068afdc43fd71cc177ccd69a865ac… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/761d4068afdc43fd71cc177ccd69a865ac… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: StartChat: Show correct group chat name
by Philipp Hörist 21 Aug '19

21 Aug '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 5302d834 by Philipp Hörist at 2019-08-21T16:06:20Z StartChat: Show correct group chat name - - - - - c91d29c9 by Philipp Hörist at 2019-08-21T16:07:16Z Bookmarks: Replace some methods with modify() - - - - - dca797ba by Philipp Hörist at 2019-08-21T19:14:56Z GroupchatInfo: Show correct group chat name - - - - - 6 changed files: - gajim/common/contacts.py - gajim/common/helpers.py - gajim/common/modules/bookmarks.py - gajim/common/modules/muc.py - gajim/gtk/groupchat_info.py - gajim/gtk/start_chat.py Changes: ===================================== gajim/common/contacts.py ===================================== @@ -183,16 +183,9 @@ class Contact(CommonContact): def _get_groupchat_name(self): from gajim.common import app + from gajim.common.helpers import get_groupchat_name con = app.connections[self.account.name] - name = con.get_module('Bookmarks').get_name_from_bookmark(self.jid) - if name: - return name - - disco_info = app.logger.get_last_disco_info(self.jid) - if disco_info is not None: - if disco_info.muc_room_name: - return disco_info.muc_room_name - return self.jid.split('@')[0] + return get_groupchat_name(con, self.jid) def get_shown_groups(self): if self.is_observer(): ===================================== gajim/common/helpers.py ===================================== @@ -1628,3 +1628,16 @@ def to_user_string(error): if error.app_condition is not None: return '%s (%s)' % (condition, error.app_condition) return condition + + +def get_groupchat_name(con, jid): + name = con.get_module('Bookmarks').get_name_from_bookmark(jid) + if name: + return name + + disco_info = app.logger.get_last_disco_info(jid) + if disco_info is not None: + if disco_info.muc_name: + return disco_info.muc_name + + return jid.split('@')[0] ===================================== gajim/common/modules/bookmarks.py ===================================== @@ -16,10 +16,10 @@ from typing import Any from typing import List +from typing import Dict from typing import Optional import nbxmpp -from nbxmpp.protocol import JID from nbxmpp.util import is_error_result from nbxmpp.structs import BookmarkData from nbxmpp.const import BookmarkStoreType @@ -196,52 +196,16 @@ class Bookmarks(BaseModule): str(bookmark.jid), minimized=minimize) - def add_bookmark(self, - name: str, - jid: JID, - autojoin: bool, - password: str, - nick: str) -> None: - - bookmark = self.get_bookmark_from_jid(jid) - if bookmark is not None: - self._bookmarks.remove(bookmark) - - bookmark = BookmarkData(jid=jid, - name=name, - autojoin=autojoin, - password=password, - nick=nick) - self._bookmarks.append(bookmark) - self.store_bookmarks() - - def set_autojoin(self, jid, enabled): + def modify(self, jid: str, **kwargs: Dict[str, str]) -> None: bookmark = self.get_bookmark_from_jid(jid) if bookmark is None: - return - self._log.info('Set autojoin for: %s to %s', jid, enabled) - self._bookmarks.remove(bookmark) - bookmark = bookmark._replace(autojoin=enabled) - self._bookmarks.append(bookmark) - self.store_bookmarks() - - def set_nickname(self, jid, nick): - bookmark = self.get_bookmark_from_jid(jid) - if bookmark is None: - return - self._log.info('Set nick for: %s to %s', jid, nick) - self._bookmarks.remove(bookmark) - bookmark = bookmark._replace(nick=nick) - self._bookmarks.append(bookmark) - self.store_bookmarks() + bookmark = BookmarkData(jid=jid, **kwargs) + self._log.info('Add new bookmark: %s', bookmark) + else: + self._log.info('Modify bookmark: %s %s', jid, kwargs) + self._bookmarks.remove(bookmark) + bookmark = bookmark._replace(**kwargs) - def set_name(self, jid, name): - bookmark = self.get_bookmark_from_jid(jid) - if bookmark is None: - return - self._log.info('Set name for: %s to %s', jid, name) - self._bookmarks.remove(bookmark) - bookmark = bookmark._replace(name=name) self._bookmarks.append(bookmark) self.store_bookmarks() ===================================== gajim/common/modules/muc.py ===================================== @@ -189,7 +189,7 @@ class MUC(BaseModule): typ='unavailable', status=reason) # We leave a group chat, disable bookmark autojoin - self._con.get_module('Bookmarks').set_autojoin(room_jid, False) + self._con.get_module('Bookmarks').modify(room_jid, autojoin=False) def configure_room(self, room_jid): self._nbxmpp('MUC').request_config(room_jid, @@ -389,8 +389,8 @@ class MUC(BaseModule): if properties.is_nickname_changed: if properties.is_muc_self_presence: muc_data.nick = properties.muc_user.nick - self._con.get_module('Bookmarks').set_nickname(muc_data.jid, - muc_data.nick) + self._con.get_module('Bookmarks').modify(muc_data.jid, + nick=muc_data.nick) app.contacts.remove_gc_contact(self._account, contact) contact.name = properties.muc_user.nick app.contacts.add_gc_contact(self._account, contact) @@ -600,12 +600,11 @@ class MUC(BaseModule): account=self._account, room_jid=room_jid)) - # We successfully joined a MUC, set autojoin bookmark - self._con.get_module('Bookmarks').add_bookmark(None, - muc_data.jid, - True, - muc_data.password, - muc_data.nick) + # We successfully joined a MUC, set add bookmark with autojoin + self._con.get_module('Bookmarks').modify(muc_data.jid, + autojoin=True, + password=muc_data.password, + nick=muc_data.nick) def _on_voice_request(self, _con, _stanza, properties): if not properties.is_voice_request: ===================================== gajim/gtk/groupchat_info.py ===================================== @@ -21,9 +21,11 @@ from gi.repository import Gtk from nbxmpp.protocol import NS_MAM_1 from nbxmpp.protocol import NS_MAM_2 +from gajim.common import app from gajim.common.i18n import _ from gajim.common.i18n import Q_ from gajim.common.helpers import open_uri +from gajim.common.helpers import get_groupchat_name from gajim.common.const import RFC5646_LANGUAGE_TAGS from gajim.gtk.util import get_builder @@ -141,9 +143,13 @@ class GroupChatInfoScrolled(Gtk.ScrolledWindow): def set_from_disco_info(self, info): self._info = info # Set name - has_name = bool(info.muc_name) - self._ui.name.set_text(info.muc_name or '') - self._ui.name.set_visible(has_name) + if self._account is None: + name = info.muc_name + else: + con = app.connections[self._account] + name = get_groupchat_name(con, info.jid) + self._ui.name.set_text(name) + self._ui.name.set_visible(True) # Set description has_desc = bool(info.muc_description) ===================================== gajim/gtk/start_chat.py ===================================== @@ -27,6 +27,7 @@ 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.helpers import get_groupchat_name from gajim.common.i18n import _ from gajim.common.const import AvatarSize from gajim.common.const import MUC_DISCO_ERRORS @@ -125,21 +126,10 @@ class StartChatDialog(Gtk.ApplicationWindow): self.new_groupchat_rows[account] = None con = app.connections[account] bookmarks = con.get_module('Bookmarks').bookmarks - groupchats = {} for bookmark in bookmarks: - groupchats[str(bookmark.jid)] = bookmark.name - - for jid in app.contacts.get_gc_list(account): - if jid in groupchats: - continue - groupchats[jid] = None - - for jid in groupchats: - name = groupchats[jid] - if not name: - name = app.get_nick_from_jid(jid) - row = ContactRow(account, None, jid, name, - show_account, True) + jid = str(bookmark.jid) + name = get_groupchat_name(con, jid) + row = ContactRow(account, None, jid, name, show_account, True) self._ui.listbox.add(row) def _on_page_changed(self, stack, _param): View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/aa3cc79e300040827e3816611d1a95ce7… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/aa3cc79e300040827e3816611d1a95ce7… 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