Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] MucCapsCache: Add query for anonymity
by Philipp Hörist 13 Jun '19

13 Jun '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 1348a741 by Daniel Brötzmann at 2019-06-13T15:23:38Z MucCapsCache: Add query for anonymity This adds a query to determine whether a MUC is semi-anonymous or non-anonymous. - - - - - 1 changed file: - gajim/common/caps_cache.py Changes: ===================================== gajim/common/caps_cache.py ===================================== @@ -505,6 +505,9 @@ class MucCapsCache: pass return allowed + def is_anonymous(self, jid): + return 'muc_nonanonymous' not in self.cache[jid].features + def get_room_infos(self, jid): room_info = {} if jid in self.cache: View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/1348a741fd2dd24bc285525b022070c374… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/1348a741fd2dd24bc285525b022070c374… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] MUC: Rework captcha prompt
by Philipp Hörist 12 Jun '19

12 Jun '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: e1bef611 by Philipp Hörist at 2019-06-12T19:18:58Z MUC: Rework captcha prompt - - - - - 4 changed files: - gajim/chat_control_base.py - gajim/data/gui/groupchat_control.ui - gajim/groupchat_control.py - gajim/gtk/dataform.py Changes: ===================================== gajim/chat_control_base.py ===================================== @@ -314,6 +314,8 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): self.msg_textview.drag_dest_set(Gtk.DestDefaults.MOTION | Gtk.DestDefaults.HIGHLIGHT, self.dnd_list, Gdk.DragAction.COPY) + self._overlay = self.xml.get_object('overlay') + # the following vars are used to keep history of user's messages self.sent_history = [] self.sent_history_pos = 0 ===================================== gajim/data/gui/groupchat_control.ui ===================================== @@ -98,309 +98,318 @@ <signal name="button-release-event" handler="_on_hpaned_release_button" swapped="no"/> <signal name="notify::position" handler="_on_hpaned_handle_change" swapped="no"/> <child> - <object class="GtkBox" id="gc_textviews_vbox"> - <property name="width_request">0</property> + <object class="GtkOverlay" id="overlay"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_right">4</property> - <property name="orientation">vertical</property> <child> - <object class="GtkEventBox" id="banner_eventbox"> - <property name="name">GroupChatControl-BannerEventBox</property> + <object class="GtkBox" id="gc_textviews_vbox"> + <property name="width_request">0</property> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="margin_right">4</property> + <property name="orientation">vertical</property> <child> - <object class="GtkBox" id="hbox3024"> + <object class="GtkEventBox" id="banner_eventbox"> + <property name="name">GroupChatControl-BannerEventBox</property> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="GtkImage" id="gc_banner_status_image"> + <object class="GtkBox" id="hbox3024"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="stock">gtk-missing-image</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="padding">5</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="banner_name_label"> - <property name="name">GroupChatControl-BannerNameLabel</property> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label"><span weight="heavy" size="large">room jid</span></property> - <property name="use_markup">True</property> - <property name="selectable">True</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkActionBar" id="banner_actionbar"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <style> - <class name="actionbar-no-border"/> - </style> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="pack_type">end</property> - <property name="position">2</property> - </packing> - </child> - </object> - </child> - <style> - <class name="gajim-banner"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkSeparator"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <style> - <class name="chatcontrol-separator-top"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkScrolledWindow" id="conversation_scrolledwindow"> - <property name="width_request">200</property> - <property name="height_request">60</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="shadow_type">in</property> - <property name="overlay_scrolling">False</property> - <signal name="edge-reached" handler="_on_edge_reached" swapped="no"/> - <signal name="scroll-event" handler="_on_scroll" swapped="no"/> - <child> - <placeholder/> - </child> - <style> - <class name="scrolled-no-border"/> - <class name="no-scroll-indicator"/> - <class name="scrollbar-style"/> - </style> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> - <child> - <object class="GtkSeparator"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <style> - <class name="chatcontrol-separator"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">3</property> - </packing> - </child> - <child> - <object class="GtkBox" id="hbox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <child> - <object class="GtkMenuButton" id="settings_menu"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="relief">none</property> - <child> - <object class="GtkImage"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">open-menu-symbolic</property> + <child> + <object class="GtkImage" id="gc_banner_status_image"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="stock">gtk-missing-image</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="padding">5</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="banner_name_label"> + <property name="name">GroupChatControl-BannerNameLabel</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label"><span weight="heavy" size="large">room jid</span></property> + <property name="use_markup">True</property> + <property name="selectable">True</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkActionBar" id="banner_actionbar"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <style> + <class name="actionbar-no-border"/> + </style> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="pack_type">end</property> + <property name="position">2</property> + </packing> + </child> </object> </child> <style> - <class name="chatcontrol-actionbar-button"/> + <class name="gajim-banner"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="pack_type">end</property> <property name="position">0</property> </packing> </child> <child> - <object class="GtkButton" id="authentication_button"> - <property name="can_focus">True</property> - <property name="focus_on_click">False</property> - <property name="receives_default">True</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="no_show_all">True</property> - <property name="relief">none</property> - <child> - <object class="GtkImage" id="lock_image"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="stock">gtk-dialog-authentication</property> - <property name="icon_size">1</property> - </object> - </child> + <object class="GtkSeparator"> + <property name="visible">True</property> + <property name="can_focus">False</property> <style> - <class name="chatcontrol-actionbar-button"/> + <class name="chatcontrol-separator-top"/> </style> </object> <packing> <property name="expand">False</property> - <property name="fill">False</property> - <property name="pack_type">end</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> <child> - <object class="GtkMenuButton" id="encryption_menu"> + <object class="GtkScrolledWindow" id="conversation_scrolledwindow"> + <property name="width_request">200</property> + <property name="height_request">60</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes">Choose encryption</property> - <property name="relief">none</property> + <property name="shadow_type">in</property> + <property name="overlay_scrolling">False</property> + <signal name="edge-reached" handler="_on_edge_reached" swapped="no"/> + <signal name="scroll-event" handler="_on_scroll" swapped="no"/> <child> <placeholder/> </child> <style> - <class name="chatcontrol-actionbar-button"/> + <class name="scrolled-no-border"/> + <class name="no-scroll-indicator"/> + <class name="scrollbar-style"/> </style> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="fill">True</property> - <property name="pack_type">end</property> <property name="position">2</property> </packing> </child> <child> - <object class="GtkButton" id="sendfile_button"> + <object class="GtkSeparator"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="focus_on_click">False</property> - <property name="receives_default">True</property> - <property name="relief">none</property> - <child> - <object class="GtkImage"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">mail-attachment-symbolic</property> - </object> - </child> + <property name="can_focus">False</property> <style> - <class name="chatcontrol-actionbar-button"/> + <class name="chatcontrol-separator"/> </style> </object> <packing> <property name="expand">False</property> - <property name="fill">False</property> - <property name="pack_type">end</property> + <property name="fill">True</property> <property name="position">3</property> </packing> </child> <child> - <object class="GtkMenuButton" id="emoticons_button"> + <object class="GtkBox" id="hbox"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes">Show a list of emojis (Alt+M)</property> - <property name="relief">none</property> + <property name="can_focus">False</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <child> - <object class="GtkImage"> + <object class="GtkMenuButton" id="settings_menu"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">face-smile-symbolic</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="relief">none</property> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="icon_name">open-menu-symbolic</property> + </object> + </child> + <style> + <class name="chatcontrol-actionbar-button"/> + </style> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack_type">end</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="authentication_button"> + <property name="can_focus">True</property> + <property name="focus_on_click">False</property> + <property name="receives_default">True</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="no_show_all">True</property> + <property name="relief">none</property> + <child> + <object class="GtkImage" id="lock_image"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="stock">gtk-dialog-authentication</property> + <property name="icon_size">1</property> + </object> + </child> + <style> + <class name="chatcontrol-actionbar-button"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="pack_type">end</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkMenuButton" id="encryption_menu"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes">Choose encryption</property> + <property name="relief">none</property> + <child> + <placeholder/> + </child> + <style> + <class name="chatcontrol-actionbar-button"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack_type">end</property> + <property name="position">2</property> + </packing> </child> - <style> - <class name="chatcontrol-actionbar-button"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">4</property> - </packing> - </child> - <child> - <object class="GtkMenuButton" id="formattings_button"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="focus_on_click">False</property> - <property name="receives_default">True</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="has_tooltip">True</property> - <property name="relief">none</property> - <property name="popup">formattings_menu</property> <child> - <object class="GtkImage" id="image10"> + <object class="GtkButton" id="sendfile_button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="focus_on_click">False</property> + <property name="receives_default">True</property> + <property name="relief">none</property> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="icon_name">mail-attachment-symbolic</property> + </object> + </child> + <style> + <class name="chatcontrol-actionbar-button"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="pack_type">end</property> + <property name="position">3</property> + </packing> + </child> + <child> + <object class="GtkMenuButton" id="emoticons_button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes">Show a list of emojis (Alt+M)</property> + <property name="relief">none</property> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="icon_name">face-smile-symbolic</property> + </object> + </child> + <style> + <class name="chatcontrol-actionbar-button"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">4</property> + </packing> + </child> + <child> + <object class="GtkMenuButton" id="formattings_button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="focus_on_click">False</property> + <property name="receives_default">True</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="has_tooltip">True</property> + <property name="relief">none</property> + <property name="popup">formattings_menu</property> + <child> + <object class="GtkImage" id="image10"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="icon_name">format-text-bold-symbolic</property> + <property name="icon_size">1</property> + </object> + </child> + <style> + <class name="chatcontrol-actionbar-button"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">5</property> + </packing> + </child> + <child> + <placeholder/> + </child> + <child> + <object class="GtkComboBox" id="label_selector"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="icon_name">format-text-bold-symbolic</property> - <property name="icon_size">1</property> + <property name="no_show_all">True</property> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">7</property> + </packing> </child> - <style> - <class name="chatcontrol-actionbar-button"/> - </style> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">5</property> - </packing> - </child> - <child> - <placeholder/> - </child> - <child> - <object class="GtkComboBox" id="label_selector"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">7</property> + <property name="fill">False</property> + <property name="position">4</property> </packing> </child> </object> <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">4</property> + <property name="index">-1</property> </packing> </child> </object> <packing> - <property name="resize">True</property> + <property name="resize">False</property> <property name="shrink">False</property> </packing> </child> ===================================== gajim/groupchat_control.py ===================================== @@ -264,8 +264,6 @@ class GroupchatControl(ChatControlBase): self.setup_seclabel() - self.form_widget = None - # Send file self.sendfile_button = self.xml.get_object('sendfile_button') self.sendfile_button.set_action_name('win.send-file-' + \ @@ -299,6 +297,9 @@ class GroupchatControl(ChatControlBase): self.banner_actionbar.pack_end(self.hide_roster_button) self.banner_actionbar.pack_start(self.subject_button) + # Holds CaptchaRequest widget + self._captcha_request = None + # GC Roster tooltip self.gc_tooltip = GCTooltip() @@ -1155,42 +1156,31 @@ class GroupchatControl(ChatControlBase): if event.jid != self.room_jid: return - if self.form_widget: - self.form_widget.hide() - self.form_widget.destroy() - self.btn_box.destroy() # pylint: disable=access-member-before-definition + self._remove_captcha_request() - self.form_widget = DataFormWidget(event.form) - - def on_send_dataform_clicked(widget): - if not self.form_widget: - return - form_node = self.form_widget.get_submit_form() + def on_send_dataform_clicked(*args): + form_node = self._captcha_request.get_submit_form() con = app.connections[self.account] con.get_module('MUC').send_captcha(self.room_jid, form_node) - self.form_widget.hide() - self.form_widget.destroy() - self.btn_box.destroy() - self.form_widget = None - del self.btn_box - - # self.form_widget.connect('validated', on_send_dataform_clicked) - self.form_widget.show_all() - vbox = self.xml.get_object('gc_textviews_vbox') - vbox.pack_start(self.form_widget, False, True, 0) - - valid_button = Gtk.Button(stock=Gtk.STOCK_OK) - valid_button.connect('clicked', on_send_dataform_clicked) - self.btn_box = Gtk.HButtonBox() - self.btn_box.set_layout(Gtk.ButtonBoxStyle.END) - self.btn_box.pack_start(valid_button, True, True, 0) - self.btn_box.show_all() - vbox.pack_start(self.btn_box, False, False, 0) + self._remove_captcha_request() + + self._captcha_request = CaptchaRequest(event.form, + on_send_dataform_clicked) + self._overlay.add_overlay(self._captcha_request) + if self.parent_win: self.parent_win.redraw_tab(self, 'attention') else: self.attention_flag = True + def _remove_captcha_request(self): + if self._captcha_request is None: + return + if self._captcha_request in self._overlay.get_children(): + self._overlay.remove(self._captcha_request) + self._captcha_request.destroy() + self._captcha_request = None + def _nec_mam_decrypted_message_received(self, obj): if obj.conn.name != self.account: return @@ -3062,3 +3052,27 @@ class SubjectPopover(Gtk.Popover): # is not cross-platform compatible open_uri(uri) return Gdk.EVENT_STOP + + +class CaptchaRequest(Gtk.Box): + def __init__(self, form, callback): + Gtk.Box.__init__(self, orientation=Gtk.Orientation.VERTICAL) + + options = {'no-scrolling': True} + self._form_widget = DataFormWidget(form, options=options) + self._form_widget.set_valign(Gtk.Align.START) + + send_button = Gtk.Button(label='Send') + send_button.connect('clicked', callback) + send_button.set_halign(Gtk.Align.CENTER) + + self.add(self._form_widget) + self.add(send_button) + + self.set_valign(Gtk.Align.START) + self.set_margin_top(100) + + self.show_all() + + def get_submit_form(self): + return self._form_widget.get_submit_form() ===================================== gajim/gtk/dataform.py ===================================== @@ -38,10 +38,13 @@ class DataFormWidget(Gtk.ScrolledWindow): self.get_style_context().add_class('data-form-widget') self.set_overlay_scrolling(False) - self._form_node = form_node - if options is None: options = {} + + if options.get('no-scrolling', False): + self.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.NEVER) + + self._form_node = form_node self._form_grid = FormGrid(form_node, options) self.add(self._form_grid) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/e1bef6111caa5132adc60bc4c5c06d36b1… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/e1bef6111caa5132adc60bc4c5c06d36b1… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Unpack colors correctly
by Philipp Hörist 12 Jun '19

12 Jun '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: b86c5afa by Philipp Hörist at 2019-06-12T17:23:38Z Unpack colors correctly - - - - - 239b34f4 by Philipp Hörist at 2019-06-12T17:39:11Z Dont use deprecated Gdk.Color - - - - - 3 changed files: - gajim/conversation_textview.py - gajim/gtk/htmltextview.py - gajim/gtk/util.py Changes: ===================================== gajim/conversation_textview.py ===================================== @@ -1253,8 +1253,8 @@ class ConversationTextview(GObject.GObject): def _add_new_colour_tags(self, tag, name): if self._buffer.get_tag_table().lookup(tag) is not None: return - gdk_color = Gdk.Color.from_floats(*text_to_color(name)) - self._buffer.create_tag(tag, foreground_gdk=gdk_color) + rgba = Gdk.RGBA(*text_to_color(name)) + self._buffer.create_tag(tag, foreground_rgba=rgba) def print_subject(self, subject, iter_=None): if subject: # if we have subject, show it too! ===================================== gajim/gtk/htmltextview.py ===================================== @@ -193,10 +193,11 @@ for _name in BLOCK_HEAD: ('font-weight: bold', 'font-style: oblique')[_weight]) def _parse_css_color(color): - if color.startswith('rgb(') and color.endswith(')'): - red, green, blue = [int(c)*257 for c in color[4:-1].split(',')] - return Gdk.Color(red, green, blue) - return Gdk.color_parse(color) + rgba = Gdk.RGBA() + success = rgba.parse(color) + if not success: + log.warning('Can\'t parse color: %s', color) + return rgba def style_iter(style): return ([x.strip() for x in item.split(':', 1)] for item in style.split(';')\ @@ -237,13 +238,13 @@ class HtmlHandler(xml.sax.handler.ContentHandler): @staticmethod def _parse_style_color(tag, value): color = _parse_css_color(value) - tag.set_property('foreground-gdk', color) + tag.set_property('foreground-rgba', color) @staticmethod def _parse_style_background_color(tag, value): color = _parse_css_color(value) - tag.set_property('background-gdk', color) - tag.set_property('paragraph-background-gdk', color) + tag.set_property('background-rgba', color) + tag.set_property('paragraph-background-rgba', color) @staticmethod def __parse_length_frac_size_allocate(_textview, allocation, frac, ===================================== gajim/gtk/util.py ===================================== @@ -623,7 +623,7 @@ def find_widget(name, container): @lru_cache(maxsize=1024) def generate_avatar(letters, color, size, scale): # Get color for nickname with XEP-0392 - color_r, color_b, color_g = color + color_r, color_g, color_b = color # Set up colors and size if scale is not None: View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/de982e963b80f23c28c1988ec86bc943a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/de982e963b80f23c28c1988ec86bc943a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Add avatar generator
by Philipp Hörist 12 Jun '19

12 Jun '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: de982e96 by Daniel Brötzmann at 2019-06-12T17:04:46Z Add avatar generator - - - - - 11 changed files: - gajim/chat_control.py - gajim/common/config.py - gajim/common/contacts.py - gajim/groupchat_control.py - gajim/gtk/profile.py - gajim/gtk/tooltips.py - gajim/gtk/util.py - gajim/gtkgui_helpers.py - gajim/gui_interface.py - gajim/privatechat_control.py - gajim/remote_control.py Changes: ===================================== gajim/chat_control.py ===================================== @@ -1220,10 +1220,7 @@ class ChatControl(ChatControlBase): self.account, self.contact.jid, AvatarSize.CHAT, scale) image = self.xml.get_object('avatar_image') - if surface is None: - image.set_from_icon_name('avatar-default', Gtk.IconSize.DIALOG) - else: - image.set_from_surface(surface) + image.set_from_surface(surface) def _nec_update_avatar(self, obj): if obj.account != self.account: ===================================== gajim/common/config.py ===================================== @@ -294,6 +294,7 @@ class Config: 'show_chatstate_in_banner': [opt_bool, True, _('Shows a text in the banner that describes the current chatstate of the contact')], 'send_chatstate_default': [opt_str, 'composing_only', _('Chat state notifications that are sent to contacts. Possible values: all, composing_only, disabled')], 'send_chatstate_muc_default': [opt_str, 'composing_only', _('Chat state notifications that are sent to the group chat. Possible values: all, composing_only, disabled')], + 'avatar_clipping': [opt_str, 'rounded_corners', _('How to display avatars:\n\'rounded_corners\' - Display avatars with cropped corners.\n\'circle\' - Display round avatars.\n\'no_clipping\' - Display avatar as-is.')], }, {}) # type: Tuple[Dict[str, List[Any]], Dict[Any, Any]] __options_per_key = { ===================================== gajim/common/contacts.py ===================================== @@ -251,7 +251,7 @@ class GC_Contact(CommonContact): return self.name def get_avatar(self, *args, **kwargs): - return common.app.interface.get_avatar(self.avatar_sha, *args, **kwargs) + return common.app.interface.get_avatar(self, *args, **kwargs) def as_contact(self): """ @@ -599,10 +599,8 @@ class Contacts(): return None for resource in self._contacts[jid]: - if resource.avatar_sha is None: - continue avatar = common.app.interface.get_avatar( - resource.avatar_sha, size, scale) + resource, size, scale) if avatar is None: self.set_avatar(jid, None) return avatar ===================================== gajim/groupchat_control.py ===================================== @@ -746,7 +746,7 @@ class GroupchatControl(ChatControlBase): transient_for=self.parent_win.window) return - publish = app.interface.get_avatar(sha, publish=True) + publish = app.interface.get_avatar_from_storage(sha, publish=True) avatar = base64.b64encode(publish).decode('utf-8') con = app.connections[self.account] con.get_module('VCardTemp').upload_room_avatar( @@ -1074,7 +1074,7 @@ class GroupchatControl(ChatControlBase): 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.avatar_sha, + surface = app.interface.get_avatar(self.contact, AvatarSize.ROSTER, self.scale_factor) banner_status_img.set_from_surface(surface) @@ -1694,7 +1694,7 @@ class GroupchatControl(ChatControlBase): return surface = app.interface.get_avatar( - gc_contact.avatar_sha, AvatarSize.ROSTER, self.scale_factor) + gc_contact, AvatarSize.ROSTER, self.scale_factor) image = Gtk.Image.new_from_surface(surface) self.model[iter_][Column.AVATAR_IMG] = image @@ -2119,7 +2119,7 @@ class GroupchatControl(ChatControlBase): image = None if app.config.get('show_avatars_in_roster'): surface = app.interface.get_avatar( - contact.avatar_sha, AvatarSize.ROSTER, self.scale_factor) + contact, AvatarSize.ROSTER, self.scale_factor) image = Gtk.Image.new_from_surface(surface) # Add to model ===================================== gajim/gtk/profile.py ===================================== @@ -135,7 +135,7 @@ class ProfileWindow(Gtk.ApplicationWindow): return scale = self.get_scale_factor() - surface = app.interface.get_avatar(sha, AvatarSize.VCARD, scale) + surface = app.interface.get_avatar_from_storage(sha, AvatarSize.VCARD, scale) button = self.xml.get_object('PHOTO_button') image = self.xml.get_object('PHOTO_image') @@ -145,7 +145,7 @@ class ProfileWindow(Gtk.ApplicationWindow): text_button.hide() self.avatar_sha = sha - publish = app.interface.get_avatar(sha, publish=True) + publish = app.interface.get_avatar_from_storage(sha, publish=True) self.avatar_encoded = base64.b64encode(publish).decode('utf-8') self.avatar_mime_type = 'image/png' @@ -212,7 +212,7 @@ class ProfileWindow(Gtk.ApplicationWindow): self.avatar_mime_type = vcard_[i]['TYPE'] scale = self.get_scale_factor() - surface = app.interface.get_avatar( + surface = app.interface.get_avatar_from_storage( self.avatar_sha, AvatarSize.VCARD, scale) if surface is None: pixbuf = gtkgui_helpers.scale_pixbuf_from_data( ===================================== gajim/gtk/tooltips.py ===================================== @@ -232,13 +232,12 @@ class GCTooltip(): if contact.avatar_sha is not None: app.log('avatar').debug( 'Load GCTooltip: %s %s', contact.name, contact.avatar_sha) - scale = self._ui.tooltip_grid.get_scale_factor() - surface = app.interface.get_avatar( - contact.avatar_sha, AvatarSize.TOOLTIP, scale) - if surface is not None: - self._ui.avatar.set_from_surface(surface) - self._ui.avatar.show() - self._ui.fillelement.show() + scale = self._ui.tooltip_grid.get_scale_factor() + surface = app.interface.get_avatar( + contact, AvatarSize.TOOLTIP, scale) + self._ui.avatar.set_from_surface(surface) + self._ui.avatar.show() + self._ui.fillelement.show() app.plugin_manager.gui_extension_point( 'gc_tooltip_populate', self, contact, self._ui.tooltip_grid) @@ -442,9 +441,8 @@ class RosterTooltip(StatusTable): scale = self._ui.tooltip_grid.get_scale_factor() surface = app.contacts.get_avatar( account, self.prim_contact.jid, AvatarSize.TOOLTIP, scale) - if surface is not None: - self._ui.avatar.set_from_surface(surface) - self._ui.avatar.show() + self._ui.avatar.set_from_surface(surface) + self._ui.avatar.show() app.plugin_manager.gui_extension_point( 'roster_tooltip_populate', self, contacts, self._ui.tooltip_grid) ===================================== gajim/gtk/util.py ===================================== @@ -26,7 +26,9 @@ import logging import textwrap import xml.etree.ElementTree as ET from pathlib import Path +from functools import lru_cache from functools import wraps +from math import pi from gi.repository import Gdk from gi.repository import Gtk @@ -618,6 +620,87 @@ def find_widget(name, container): return find_widget(name, child) +@lru_cache(maxsize=1024) +def generate_avatar(letters, color, size, scale): + # Get color for nickname with XEP-0392 + color_r, color_b, color_g = color + + # Set up colors and size + if scale is not None: + size = size * scale + + width = size + height = size + font_size = size * 0.5 + + # Set up surface + surface = cairo.ImageSurface(cairo.FORMAT_ARGB32, width, height) + context = cairo.Context(surface) + + context.set_source_rgb(color_r, color_g, color_b) + context.rectangle(0, 0, width, height) + context.fill() + + # Draw letters + context.select_font_face('sans-serif', + cairo.FONT_SLANT_NORMAL, + cairo.FONT_WEIGHT_NORMAL) + context.set_font_size(font_size) + extends = context.text_extents(letters) + x_pos = width / 2 - (extends.width / 2 + extends.x_bearing) + y_pos = height / 2 - (extends.height / 2 + extends.y_bearing) + context.move_to(x_pos, y_pos) + context.set_source_rgb(0.95, 0.95, 0.95) + context.set_operator(cairo.Operator.OVER) + context.show_text(letters) + + return context.get_target() + + +def clip_circle(surface): + new_surface = cairo.ImageSurface(cairo.FORMAT_ARGB32, + surface.get_width(), + surface.get_height()) + context = cairo.Context(new_surface) + context.set_source_surface(surface, 0, 0) + + width = surface.get_width() + height = surface.get_height() + radius = width / 2 + + context.arc(width / 2, height / 2, radius, 0, 2 * pi) + + context.clip() + context.paint() + + return context.get_target() + + +def clip_rounded_corners(surface): + new_surface = cairo.ImageSurface(cairo.FORMAT_ARGB32, + surface.get_width(), + surface.get_height()) + context = cairo.Context(new_surface) + context.set_source_surface(surface, 0, 0) + + width = surface.get_width() + height = surface.get_height() + radius = width * 0.1 + deg = pi / 180.0 + + context.new_sub_path() + context.arc(width - radius, radius, radius, -90 * deg, 0) + context.arc(width - radius, height - radius, radius, 0, 90 * deg) + context.arc(radius, height - radius, radius, 90 * deg, 180 * deg) + context.arc(radius, radius, radius, 180 * deg, 270 * deg) + context.close_path() + + context.clip() + context.paint() + + return context.get_target() + + class MultiLineLabel(Gtk.Label): def __init__(self, *args, **kwargs): Gtk.Label.__init__(self, *args, **kwargs) ===================================== gajim/gtkgui_helpers.py ===================================== @@ -159,7 +159,7 @@ def on_avatar_save_as_menuitem_activate(widget, avatar, default_name=''): app.config.set('last_save_dir', os.path.dirname(file_path)) if isinstance(avatar, str): # We got a SHA - pixbuf = app.interface.get_avatar(avatar) + pixbuf = app.interface.get_avatar_from_storage(avatar) else: # We got a pixbuf pixbuf = avatar ===================================== gajim/gui_interface.py ===================================== @@ -124,6 +124,10 @@ from gajim.gtk.filetransfer import FileTransfersWindow from gajim.gtk.subscription_request import SubscriptionRequestWindow from gajim.gtk.util import get_show_in_roster from gajim.gtk.util import get_show_in_systray +from gajim.gtk.util import generate_avatar +from gajim.gtk.util import clip_circle +from gajim.gtk.util import clip_rounded_corners +from gajim.gtk.util import text_to_color parser = optparser.OptionsParser(configpaths.get('CONFIG_FILE')) @@ -2044,8 +2048,37 @@ class Interface: return sha - @staticmethod - def get_avatar(filename, size=None, scale=None, publish=False): + def get_avatar(self, contact, size=None, scale=None, publish=False): + surface = self.get_avatar_from_storage(contact.avatar_sha, + size, + scale, + publish) + + if surface is None: + # No avatar found, generate one + + # 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 + color = text_to_color(color_string) + surface = generate_avatar(letter, color, size, scale) + + # Clip avatar + clip_setting = app.config.get('avatar_clipping') + if clip_setting == 'circle': + return clip_circle(surface) + if clip_setting == 'rounded_corners': + return clip_rounded_corners(surface) + + return surface + + def get_avatar_from_storage(self, filename, size=None, scale=None, publish=False): if filename is None or '': return ===================================== gajim/privatechat_control.py ===================================== @@ -231,7 +231,7 @@ class PrivateChatControl(ChatControl): scale = self.parent_win.window.get_scale_factor() surface = app.interface.get_avatar( - self.gc_contact.avatar_sha, AvatarSize.CHAT, scale) + self.gc_contact, AvatarSize.CHAT, scale) image = self.xml.get_object('avatar_image') if surface is None: image.set_from_icon_name('avatar-default', Gtk.IconSize.DIALOG) ===================================== gajim/remote_control.py ===================================== @@ -918,7 +918,7 @@ class GajimRemote(Server): if sha is None: return app.config.set_per('accounts', self.name, 'avatar_sha', sha) - data = app.interface.get_avatar(sha, publish=True) + data = app.interface.get_avatar_from_storage(sha, publish=True) avatar = base64.b64encode(data).decode('utf-8') avatar_mime_type = mimetypes.guess_type(picture)[0] vcard = {} View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/de982e963b80f23c28c1988ec86bc943ae… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/de982e963b80f23c28c1988ec86bc943ae… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ConsistentColors: Fix background argument
by Philipp Hörist 12 Jun '19

12 Jun '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 5fdb76d0 by Philipp Hörist at 2019-06-12T16:04:16Z ConsistentColors: Fix background argument - - - - - 1 changed file: - gajim/gtk/util.py Changes: ===================================== gajim/gtk/util.py ===================================== @@ -646,7 +646,7 @@ class MaxWidthComboBoxText(Gtk.ComboBoxText): def text_to_color(text): if app.css_config.prefer_dark: - background = (1, 1, 1) + background = (0, 0, 0) # RGB (0, 0, 0) black else: - background = (0, 0, 0) + background = (1, 1, 1) # RGB (255, 255, 255) white return nbxmpp.util.text_to_color(text, background) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/5fdb76d02a12aa1a475143a8f06e848fac… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/5fdb76d02a12aa1a475143a8f06e848fac… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ConsistentColors: Adjust for background
by Philipp Hörist 11 Jun '19

11 Jun '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: d009a2cb by Philipp Hörist at 2019-06-11T22:14:40Z ConsistentColors: Adjust for background - - - - - 2 changed files: - gajim/conversation_textview.py - gajim/gtk/util.py Changes: ===================================== gajim/conversation_textview.py ===================================== @@ -36,8 +36,6 @@ from gi.repository import GObject from gi.repository import GLib from gi.repository import Gdk -from nbxmpp.util import text_to_colour - from gajim.common import app from gajim.common import helpers from gajim.common import i18n @@ -50,6 +48,7 @@ from gajim.gtk import util from gajim.gtk.util import load_icon from gajim.gtk.util import get_cursor from gajim.gtk.util import format_fingerprint +from gajim.gtk.util import text_to_color from gajim.gtk.emoji_data import emoji_pixbufs from gajim.gtk.emoji_data import is_emoji from gajim.gtk.emoji_data import get_emoji_pixbuf @@ -1254,7 +1253,7 @@ class ConversationTextview(GObject.GObject): def _add_new_colour_tags(self, tag, name): if self._buffer.get_tag_table().lookup(tag) is not None: return - gdk_color = Gdk.Color.from_floats(*text_to_colour(name)) + gdk_color = Gdk.Color.from_floats(*text_to_color(name)) self._buffer.create_tag(tag, foreground_gdk=gdk_color) def print_subject(self, subject, iter_=None): ===================================== gajim/gtk/util.py ===================================== @@ -32,6 +32,7 @@ from gi.repository import Gdk from gi.repository import Gtk from gi.repository import GLib from gi.repository import Pango +import nbxmpp import cairo from gajim.common import app @@ -641,3 +642,11 @@ class MaxWidthComboBoxText(Gtk.ComboBoxText): if minimum_width > self._max_width: minimum_width = self._max_width return minimum_width, natural_width + + +def text_to_color(text): + if app.css_config.prefer_dark: + background = (1, 1, 1) + else: + background = (0, 0, 0) + return nbxmpp.util.text_to_color(text, background) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/d009a2cbb9ebd679b7aa22d6ae607560c0… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/d009a2cbb9ebd679b7aa22d6ae607560c0… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] ConsistentColors: Adjust for background
by Philipp Hörist 11 Jun '19

11 Jun '19

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 9fd88196 by Philipp Hörist at 2019-06-11T22:03:02Z ConsistentColors: Adjust for background - Rename method - add LRU maxsize - - - - - 1 changed file: - nbxmpp/util.py Changes: ===================================== nbxmpp/util.py ===================================== @@ -233,11 +233,23 @@ def clip_rgb(red, green, blue): ) -@lru_cache() -def text_to_colour(text): +@lru_cache(maxsize=1024) +def text_to_color(text, background_color): + # background color = (rb, gb, bb) hash_ = hashlib.sha1() hash_.update(text.encode()) - hue = (int.from_bytes(hash_.digest()[:2], 'little') & 0xffff) / 0xffff + hue = int.from_bytes(hash_.digest()[:2], 'little') / 65536 red, green, blue = clip_rgb(*hsluv_to_rgb((hue * 360, 100, 50))) - return red * 0.8, green * 0.8, blue * 0.8 + + rb, gb, bb = background_color + + rb_inv = 1 - rb + gb_inv = 1 - gb + bb_inv = 1 - bb + + rc = 0.2 * rb_inv + 0.8 * red + gc = 0.2 * gb_inv + 0.8 * green + bc = 0.2 * bb_inv + 0.8 * blue + + return rc, gc, bc View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/9fd88196a947d24149927952f5… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/9fd88196a947d24149927952f5… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 4 commits: Fix undefined var error
by Philipp Hörist 11 Jun '19

11 Jun '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: c4012a30 by Philipp Hörist at 2019-06-11T17:31:03Z Fix undefined var error - - - - - 37507ec2 by Philipp Hörist at 2019-06-11T17:31:03Z DataForms: Add validation for list-multi fields - - - - - b262b560 by Philipp Hörist at 2019-06-11T17:31:03Z DataForms: Wrap and justify instructions and title - - - - - 1f626f51 by Philipp Hörist at 2019-06-11T17:31:03Z DataForms: Center some widgets vertically - - - - - 2 changed files: - gajim/gtk/dataform.py - gajim/gui_menu_builder.py Changes: ===================================== gajim/gtk/dataform.py ===================================== @@ -178,6 +178,9 @@ class SizeAdjustment: class Title: def __init__(self, title): self._label = Gtk.Label(label=title) + self._label.set_line_wrap(True) + self._label.set_line_wrap_mode(Pango.WrapMode.WORD) + self._label.set_justify(Gtk.Justification.CENTER) self._label.get_style_context().add_class('data-form-title') def add(self, form_grid, row_number): @@ -189,6 +192,7 @@ class Instructions: self._label = Gtk.Label(label=instructions) self._label.set_line_wrap(True) self._label.set_line_wrap_mode(Pango.WrapMode.WORD) + self._label.set_justify(Gtk.Justification.CENTER) def add(self, form_grid, row_number): form_grid.attach(self._label, 0, row_number, 2, 1) @@ -232,7 +236,8 @@ class Field: 'jid-multi', 'text-single', 'text-private', - 'text-multi'): + 'text-multi', + 'list-multi'): form_grid.attach_next_to(self._warning_box, self._widget, Gtk.PositionType.RIGHT, 1, 1) @@ -280,6 +285,7 @@ class BooleanField(Field): self._widget = Gtk.CheckButton() self._widget.set_active(field.value) self._widget.connect('toggled', self._toggled) + self._widget.set_valign(Gtk.Align.CENTER) def _toggled(self, _widget): self._field.value = self._widget.get_active() @@ -310,6 +316,7 @@ class ListSingleField(Field): Field.__init__(self, field, form_grid, options) self._widget = Gtk.ComboBoxText() + self._widget.set_valign(Gtk.Align.CENTER) for value, label in field.iter_options(): if not label: label = value @@ -327,7 +334,7 @@ class ListMultiField(Field): Field.__init__(self, field, form_grid, options) self._label.set_valign(Gtk.Align.START) - self._treeview = ListMutliTreeView(field) + self._treeview = ListMutliTreeView(field, self) self._widget = Gtk.ScrolledWindow() self._widget.set_propagate_natural_height(True) @@ -335,12 +342,16 @@ class ListMultiField(Field): self._widget.set_max_content_height(300) self._widget.add(self._treeview) + def validate(self): + self._validate() + class ListMutliTreeView(Gtk.TreeView): - def __init__(self, field): + def __init__(self, field, multi_field): Gtk.TreeView.__init__(self) self._field = field + self._multi_field = multi_field self._store = Gtk.ListStore(str, str, bool) @@ -374,6 +385,7 @@ class ListMutliTreeView(Gtk.TreeView): current_value = self._store[iter_][2] self._store.set_value(iter_, 2, not current_value) self._set_values() + self._multi_field.validate() def _set_values(self): values = [] @@ -487,6 +499,7 @@ class TextSingleField(Field): self._widget = Gtk.Entry() self._widget.set_text(field.value) self._widget.connect('changed', self._changed) + self._widget.set_valign(Gtk.Align.CENTER) def _changed(self, _widget): self._field.value = self._widget.get_text() ===================================== gajim/gui_menu_builder.py ===================================== @@ -427,11 +427,11 @@ control=None, gc_contact=None, is_anonymous=True): con = app.connections[account] if con and (con.get_module('PrivacyLists').supported or con.get_module('Blocking').supported): + transport = app.get_transport_name_from_jid(jid, use_config_setting=False) if helpers.jid_is_blocked(account, jid): block_menuitem.set_no_show_all(True) block_menuitem.hide() - if app.get_transport_name_from_jid(jid, use_config_setting=False)\ - and transport != 'jabber': + if transport != 'jabber': unblock_menuitem.set_no_show_all(True) unblock_menuitem.hide() unignore_menuitem.set_no_show_all(False) @@ -443,8 +443,7 @@ control=None, gc_contact=None, is_anonymous=True): else: unblock_menuitem.set_no_show_all(True) unblock_menuitem.hide() - if app.get_transport_name_from_jid(jid, use_config_setting=False)\ - and transport != 'jabber': + if transport != 'jabber': block_menuitem.set_no_show_all(True) block_menuitem.hide() ignore_menuitem.set_no_show_all(False) View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/29a7f5cda0f068795feee03deafe5ba64… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/29a7f5cda0f068795feee03deafe5ba64… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] RosterWindow: Fix Index out of range
by Philipp Hörist 10 Jun '19

10 Jun '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 29a7f5cd by Daniel Brötzmann at 2019-06-10T20:38:28Z RosterWindow: Fix Index out of range Currently, detecting a file drop on the roster window is not recognized correctly. This fix avoids an Index error thrown after dropping a file on the roster by checking if there is a selection before continuing. - - - - - 1 changed file: - gajim/roster_window.py Changes: ===================================== gajim/roster_window.py ===================================== @@ -4252,6 +4252,10 @@ class RosterWindow: dialog.popup() return + # Check if something is selected + if treeview.get_selection().count_selected_rows() == 0: + return + # a roster entry was dragged and dropped somewhere in the roster # source: the row that was dragged View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/29a7f5cda0f068795feee03deafe5ba645… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/29a7f5cda0f068795feee03deafe5ba645… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] CapsCache: Add room info query
by Philipp Hörist 10 Jun '19

10 Jun '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 062b62db by Daniel Brötzmann at 2019-06-10T20:35:16Z CapsCache: Add room info query - - - - - 1 changed file: - gajim/common/caps_cache.py Changes: ===================================== gajim/common/caps_cache.py ===================================== @@ -504,3 +504,21 @@ class MucCapsCache: except KeyError: pass return allowed + + def get_room_infos(self, jid): + room_info = {} + if jid in self.cache: + for form in self.cache[jid].data: + try: + room_info['name'] = form['muc#roomconfig_roomname'].value + except KeyError: + room_info['name'] = None + try: + room_info['desc'] = form['muc#roominfo_description'].value + except KeyError: + room_info['desc'] = None + try: + room_info['lang'] = form['muc#roominfo_lang'].value + except KeyError: + room_info['lang'] = None + return room_info or None View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/062b62db85dedf89bfdc7510789cdf89d4… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/062b62db85dedf89bfdc7510789cdf89d4… 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