Commits November 2018

commits@gajim.org

1 participants
84 discussions

[Git][gajim/gajim][master] 4 commits: Simplify PEP module inits
by Philipp Hörist 20 Nov '18

20 Nov '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: c61bd656 by Philipp Hörist at 2018-11-20T14:32:01Z Simplify PEP module inits - - - - - b74468b9 by Philipp Hörist at 2018-11-20T14:32:01Z Move chatstate css to default theme This is needed so we can query the current chatstate colors in cellrenderers - - - - - 15c3de2b by Philipp Hörist at 2018-11-20T14:32:01Z Add option to show chatstate in roster - Preferences: Add options for display in banner, tab, roster - This makes the chatstate Plugin obsolete - - - - - 8f9c596a by Philipp Hörist at 2018-11-20T15:10:11Z Windows: Remove cryptography fix The package has been fixed in the mingw repos - - - - - 18 changed files: - gajim/chat_control.py - gajim/common/config.py - gajim/common/modules/atom.py - gajim/common/modules/pep.py - gajim/common/modules/user_activity.py - gajim/common/modules/user_avatar.py - gajim/common/modules/user_location.py - gajim/common/modules/user_mood.py - gajim/common/modules/user_nickname.py - gajim/common/modules/user_tune.py - gajim/data/gui/preferences_window.ui - gajim/data/style/default-dark.css - gajim/data/style/default.css - gajim/data/style/gajim.css - gajim/gtk/preferences.py - gajim/message_window.py - gajim/roster_window.py - win/_base.sh Changes: ===================================== gajim/chat_control.py ===================================== @@ -669,19 +669,14 @@ class ChatControl(ChatControlBase): status_reduced = '' status_escaped = GLib.markup_escape_text(status_reduced) - st = app.config.get('displayed_chat_state_notifications') if self.TYPE_ID == 'pm': cs = self.gc_contact.chatstate else: cs = app.contacts.get_combined_chatstate( self.account, self.contact.jid) - if cs and st in ('composing_only', 'all'): - if contact.show == 'offline': - chatstate = '' - elif st == 'all' or cs == 'composing': - chatstate = helpers.get_uf_chatstate(cs) - else: - chatstate = '' + + if app.config.get('show_chatstate_in_banner'): + chatstate = helpers.get_uf_chatstate(cs) label_text = '%s%s %s' \ % (name, acct_info, chatstate) ===================================== gajim/common/config.py ===================================== @@ -187,7 +187,6 @@ class Config: 'always_english_wiktionary': [opt_bool, True], 'remote_control': [opt_bool, False, _('If checked, Gajim can be controlled remotely using gajim-remote.'), True], 'outgoing_chat_state_notifications': [opt_str, 'all', _('Sent chat state notifications. Can be one of all, composing_only, disabled.')], - 'displayed_chat_state_notifications': [opt_str, 'all', _('Displayed chat state notifications in chat windows. Can be one of all, composing_only, disabled.')], 'autodetect_browser_mailer': [opt_bool, True, '', True], 'print_ichat_every_foo_minutes': [opt_int, 5, _('When not printing time for every message (print_time==sometimes), print it every x minutes.')], 'confirm_close_muc': [opt_bool, True, _('Ask before closing a group chat tab/window.')], @@ -296,6 +295,9 @@ class Config: 'public_room_sync_threshold': [opt_int, 1, _('Maximum history in days we request from a public room archive. 0: As much as possible')], 'private_room_sync_threshold': [opt_int, 0, _('Maximum history in days we request from a private room archive. 0: As much as possible')], 'show_subject_on_join': [opt_bool, True, _('If the room subject is shown in chat on join')], + 'show_chatstate_in_roster': [opt_bool, True, _('If the contact row is colored according to the current chatstate of the contact')], + 'show_chatstate_in_tabs': [opt_bool, True, _('If the tab is colored according to the current chatstate of the contact')], + 'show_chatstate_in_banner': [opt_bool, True, _('Shows a text in the banner that describes the current chatstate of the contact')], }, {}) # type: Tuple[Dict[str, List[Any]], Dict[Any, Any]] __options_per_key = { ===================================== gajim/common/modules/atom.py ===================================== @@ -58,11 +58,6 @@ class Atom(AbstractPEPModule): store_publish = False _log = log - def __init__(self, con): - AbstractPEPModule.__init__(self, con, con.name) - - self.handlers = [] - def _extract_info(self, item): entry = item.getTag('entry', namespace=nbxmpp.NS_ATOM) if entry is None: ===================================== gajim/common/modules/pep.py ===================================== @@ -153,11 +153,11 @@ class AbstractPEPModule: store_publish = True _log = log - def __init__(self, - con: ConnectionT, - account: str) -> None: - self._account = account + def __init__(self, con: ConnectionT) -> None: self._con = con + self._account = con.name + + self.handlers = [] # type: List[Tuple[Any, ...]] self._stored_publish = None ===================================== gajim/common/modules/user_activity.py ===================================== @@ -30,9 +30,6 @@ class UserActivityData(AbstractPEPData): type_ = PEPEventType.ACTIVITY - def __init__(self, activity): - self.data = activity - def as_markup_text(self): pep = self.data activity = pep['activity'] @@ -62,11 +59,6 @@ class UserActivity(AbstractPEPModule): store_publish = True _log = log - def __init__(self, con): - AbstractPEPModule.__init__(self, con, con.name) - - self.handlers = [] - def _extract_info(self, item): activity_dict = {} activity_tag = item.getTag('activity', namespace=self.namespace) ===================================== gajim/common/modules/user_avatar.py ===================================== @@ -32,9 +32,6 @@ class UserAvatarData(AbstractPEPData): type_ = PEPEventType.AVATAR - def __init__(self, avatar): - self.data = avatar - class UserAvatar(AbstractPEPModule): @@ -44,11 +41,6 @@ class UserAvatar(AbstractPEPModule): store_publish = False _log = log - def __init__(self, con): - AbstractPEPModule.__init__(self, con, con.name) - - self.handlers = [] - def get_pubsub_avatar(self, jid, item_id): log.info('Request: %s %s', jid, item_id) self._con.get_module('PubSub').send_pb_retrieve( ===================================== gajim/common/modules/user_location.py ===================================== @@ -30,11 +30,6 @@ class UserLocationData(AbstractPEPData): type_ = PEPEventType.LOCATION - def __init__(self, location): - # set_location plugin uses self._pep_specific_data - self._pep_specific_data = location - self.data = location - def as_markup_text(self): location = self.data location_string = '' @@ -58,11 +53,6 @@ class UserLocation(AbstractPEPModule): store_publish = True _log = log - def __init__(self, con): - AbstractPEPModule.__init__(self, con, con.name) - - self.handlers = [] - def _extract_info(self, item): location_dict = {} location_tag = item.getTag('geoloc', namespace=nbxmpp.NS_LOCATION) ===================================== gajim/common/modules/user_mood.py ===================================== @@ -37,9 +37,6 @@ class UserMoodData(AbstractPEPData): type_ = PEPEventType.MOOD - def __init__(self, mood: Optional[Dict[str, str]]) -> None: - self.data = mood - def as_markup_text(self) -> str: if self.data is None: return '' @@ -65,11 +62,6 @@ class UserMood(AbstractPEPModule): store_publish = True _log = log - def __init__(self, con: ConnectionT) -> None: - AbstractPEPModule.__init__(self, con, con.name) - - self.handlers = [] # type: List[Tuple[Any, ...]] - def _extract_info(self, item: nbxmpp.Node) -> Optional[Dict[str, str]]: mood_dict = {} mood_tag = item.getTag('mood', namespace=nbxmpp.NS_MOOD) ===================================== gajim/common/modules/user_nickname.py ===================================== @@ -36,9 +36,6 @@ class UserNicknameData(AbstractPEPData): type_ = PEPEventType.NICKNAME - def __init__(self, nickname: Optional[str]) -> None: - self.data = nickname - def get_nick(self) -> str: return self.data or '' @@ -51,11 +48,6 @@ class UserNickname(AbstractPEPModule): store_publish = True _log = log - def __init__(self, con: ConnectionT) -> None: - AbstractPEPModule.__init__(self, con, con.name) - - self.handlers = [] # type: List[Tuple[Any, ...]] - def _extract_info(self, item: nbxmpp.Node) -> Optional[str]: nick = '' child = item.getTag('nick', namespace=nbxmpp.NS_NICK) ===================================== gajim/common/modules/user_tune.py ===================================== @@ -39,9 +39,6 @@ class UserTuneData(AbstractPEPData): type_ = PEPEventType.TUNE - def __init__(self, tune: Optional[Dict[str, str]]) -> None: - self.data = tune - def as_markup_text(self) -> str: if self.data is None: return '' @@ -72,11 +69,6 @@ class UserTune(AbstractPEPModule): store_publish = True _log = log - def __init__(self, con: ConnectionT) -> None: - AbstractPEPModule.__init__(self, con, con.name) - - self.handlers = [] # type: List[Tuple[Any, ...]] - def _extract_info(self, item: nbxmpp.Node) -> Optional[Dict[str, str]]: tune_dict = {} tune_tag = item.getTag('tune', namespace=self.namespace) ===================================== gajim/data/gui/preferences_window.ui ===================================== @@ -737,49 +737,107 @@ <property name="top_attach">0</property> </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">5</property> + </packing> + </child> + </object> + </child> + <child type="label"> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Chat Settings</property> + <property name="use_markup">True</property> + <style> + <class name="bold"/> + <class name="margin-top6"/> + </style> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkFrame"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label_xalign">0</property> + <property name="shadow_type">none</property> + <child> + <object class="GtkAlignment"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_top">6</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> <child> - <object class="GtkLabel"> + <object class="GtkCheckButton" id="show_chatstate_in_tabs"> + <property name="label" translatable="yes">Show chatstate in tabs</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="tooltip_text" translatable="yes">Gajim can send and receive meta-information related to a conversation you may have with a contact. Here you can specify which chatstates you want to display in chat windows.</property> - <property name="halign">end</property> - <property name="label" translatable="yes">_Display chat state notifications</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="tooltip_text" translatable="yes">If checked, the tab will be colored according to the current chatstate of the contact</property> + <property name="halign">start</property> <property name="use_underline">True</property> - <property name="justify">right</property> - <property name="mnemonic_widget">displayed_chat_states_combobox</property> - <style> - <class name="dim-label"/> - </style> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_show_chatstate_in_tabs_toggled" swapped="no"/> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> </packing> </child> <child> - <object class="GtkComboBox" id="displayed_chat_states_combobox"> + <object class="GtkCheckButton" id="show_chatstate_in_roster"> + <property name="label" translatable="yes">Show chatstate in roster</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="model">display_chat_state_notifications_liststore</property> - <signal name="changed" handler="on_displayed_chat_states_combobox_changed" swapped="no"/> - <child> - <object class="GtkCellRendererText"/> - <attributes> - <attribute name="text">0</attribute> - </attributes> - </child> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="tooltip_text" translatable="yes">If checked, the contact row will be colored according to the current chatstate of the contact</property> + <property name="halign">start</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_show_chatstate_in_roster_toggled" swapped="no"/> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="show_chatstate_in_banner"> + <property name="label" translatable="yes">Show chatstate in banner</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="tooltip_text" translatable="yes">If checked, a desciption of the contacts current chatstate is shown in the banner</property> + <property name="halign">start</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_show_chatstate_in_banner_toggled" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> </packing> </child> </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">5</property> - </packing> </child> </object> </child> @@ -787,8 +845,7 @@ <object class="GtkLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Chat Settings</property> - <property name="use_markup">True</property> + <property name="label" translatable="yes">Chatstate</property> <style> <class name="bold"/> <class name="margin-top6"/> @@ -799,7 +856,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> </object> ===================================== gajim/data/style/default-dark.css ===================================== @@ -15,4 +15,16 @@ } .gajim-status-message { color: rgb(115, 210, 22) + } +.gajim-state-composing { + color: rgb(0, 139, 0) + } +.gajim-state-inactive { + color: rgb(158, 158, 158) + } +.gajim-state-gone { + color: rgb(128, 128, 128) + } +.gajim-state-paused { + color: rgb(0, 0, 205) } \ No newline at end of file ===================================== gajim/data/style/default.css ===================================== @@ -1 +1 @@ - .gajim-incoming-nickname { color: rgb(164, 0, 0) } .gajim-outgoing-nickname { color: rgb(52, 101, 164) } .gajim-outgoing-message-text { color: rgb(85, 87, 83) } .gajim-status-message { color: rgb(78, 154, 6) } .gajim-url { color: rgb(32, 74, 135) } .gajim-highlight-message { color: rgb(255, 128, 128) } .gajim-restored-message { color: rgb(85, 87, 83) } .gajim-roster-disconnected { background: rgb(171 ,97 ,97) } .gajim-roster-connected { background: rgb(173, 195, 198) } \ No newline at end of file + .gajim-incoming-nickname { color: rgb(164, 0, 0) } .gajim-outgoing-nickname { color: rgb(52, 101, 164) } .gajim-outgoing-message-text { color: rgb(85, 87, 83) } .gajim-status-message { color: rgb(78, 154, 6) } .gajim-url { color: rgb(32, 74, 135) } .gajim-highlight-message { color: rgb(255, 128, 128) } .gajim-restored-message { color: rgb(85, 87, 83) } .gajim-roster-disconnected { background: rgb(171 ,97 ,97) } .gajim-roster-connected { background: rgb(173, 195, 198) } .gajim-state-composing { color: rgb(0, 139, 0) } .gajim-state-inactive { color: rgb(158, 158, 158) } .gajim-state-gone { color: rgb(128, 128, 128) } .gajim-state-paused { color: rgb(0, 0, 205) } \ No newline at end of file ===================================== gajim/data/style/gajim.css ===================================== @@ -1,17 +1,5 @@ /* Gajim Application CSS File */ -.gajim-state-composing { - color: rgb(0, 139, 0) - } -.gajim-state-inactive { - color: rgb(158, 158, 158) - } -.gajim-state-gone { - color: rgb(128, 128, 128) - } -.gajim-state-paused { - color: rgb(0, 0, 205) - } .gajim-msg-correcting text { background: rgb(238, 232, 170) } ===================================== gajim/gtk/preferences.py ===================================== @@ -157,13 +157,14 @@ class Preferences(Gtk.ApplicationWindow): self._ui.print_status_in_muc_combobox.set_active(2) # Displayed chat state notifications - st = app.config.get('displayed_chat_state_notifications') - if st == 'all': - self._ui.displayed_chat_states_combobox.set_active(0) - elif st == 'composing_only': - self._ui.displayed_chat_states_combobox.set_active(1) - else: # disabled - self._ui.displayed_chat_states_combobox.set_active(2) + st = app.config.get('show_chatstate_in_tabs') + self._ui.show_chatstate_in_tabs.set_active(st) + + st = app.config.get('show_chatstate_in_roster') + self._ui.show_chatstate_in_roster.set_active(st) + + st = app.config.get('show_chatstate_in_banner') + self._ui.show_chatstate_in_banner.set_active(st) ### Notifications tab ### ## Visual Notifications @@ -612,15 +613,14 @@ class Preferences(Gtk.ApplicationWindow): else: # in_and_out app.config.set('print_status_in_muc', 'in_and_out') - def on_displayed_chat_states_combobox_changed(self, widget): - active = widget.get_active() - if active == 0: # all - app.config.set('displayed_chat_state_notifications', 'all') - elif active == 1: # only composing - app.config.set('displayed_chat_state_notifications', - 'composing_only') - else: # disabled - app.config.set('displayed_chat_state_notifications', 'disabled') + def on_show_chatstate_in_tabs_toggled(self, widget): + self.on_checkbutton_toggled(widget, 'show_chatstate_in_tabs') + + def on_show_chatstate_in_roster_toggled(self, widget): + self.on_checkbutton_toggled(widget, 'show_chatstate_in_roster') + + def on_show_chatstate_in_banner_toggled(self, widget): + self.on_checkbutton_toggled(widget, 'show_chatstate_in_banner') ### Notifications tab ### def on_systray_combobox_changed(self, widget): ===================================== gajim/message_window.py ===================================== @@ -652,7 +652,9 @@ class MessageWindow: if isinstance(ctrl, ChatControl): tab_label_str = ctrl.get_tab_label() # Set Label Color - gtkgui_helpers.add_css_class(nick_label, chatstate, 'gajim-state-') + if app.config.get('show_chatstate_in_tabs'): + gtkgui_helpers.add_css_class( + nick_label, chatstate, 'gajim-state-') else: tab_label_str, color = ctrl.get_tab_label(chatstate) # Set Label Color ===================================== gajim/roster_window.py ===================================== @@ -4639,6 +4639,11 @@ class RosterWindow: gtkgui_helpers.set_unset_urgency_hint(self.window, nb_unread) + def _nec_chatstate_received(self, event): + if event.contact.is_gc_contact or event.contact.is_pm_contact: + return + self.draw_contact(event.contact.jid, event.account) + def _style_changed(self, *args): self.change_roster_style(None) @@ -4741,17 +4746,22 @@ class RosterWindow: return jid = model[titer][Column.JID] account = model[titer][Column.ACCOUNT] + color = None if type_ == 'groupchat': - ctrl = app.interface.minimized_controls[account].get(jid, - None) + ctrl = app.interface.minimized_controls[account].get(jid, None) if ctrl and ctrl.attention_flag: color = app.css_config.get_value( '.state_muc_directed_msg_color', StyleAttr.COLOR) - renderer.set_property('foreground', color) - if not color: - color = app.css_config.get_value('.gajim-contact-row', StyleAttr.COLOR) - renderer.set_property('foreground', color) + elif app.config.get('show_chatstate_in_roster'): + chatstate = app.contacts.get_combined_chatstate(account, jid) + if chatstate not in (None, 'active'): + color = app.css_config.get_value( + '.gajim-state-%s' % chatstate, StyleAttr.COLOR) + else: + color = app.css_config.get_value( + '.gajim-contact-row', StyleAttr.COLOR) + renderer.set_property('foreground', color) self._set_contact_row_background_color(renderer, jid, account) desc = app.css_config.get_font('.gajim-contact-row') @@ -5886,3 +5896,5 @@ class RosterWindow: self._nec_blocking) app.ged.register_event_handler('style-changed', ged.GUI1, self._style_changed) + app.ged.register_event_handler('chatstate-received', ged.GUI1, + self._nec_chatstate_received) ===================================== win/_base.sh ===================================== @@ -75,11 +75,6 @@ function install_deps { https://gajim.org/downloads/snap/win/build/mingw-w64-"${ARCH}"-glib2-2.56.2-1-any.pkg.tar.xz build_pacman --noconfirm -U "${BUILD_ROOT}"/mingw-w64-"${ARCH}"-glib2-2.56.2-1-any.pkg.tar.xz - # Fix broken cryptography package - curl -o "${BUILD_ROOT}"/mingw-w64-"${ARCH}"-python3-cryptography-2.3.1-1-any.pkg.tar.xz \ - https://gajim.org/downloads/snap/win/build/mingw-w64-"${ARCH}"-python3-cryptography-2.3.1-1-any.pkg.tar.xz - build_pacman --noconfirm -U "${BUILD_ROOT}"/mingw-w64-"${ARCH}"-python3-cryptography-2.3.1-1-any.pkg.tar.xz - build_pacman --noconfirm -S mingw-w64-"${ARCH}"-gtk3 mingw-w64-"${ARCH}"-"${PYTHON_ID}" \ mingw-w64-"${ARCH}"-"${PYTHON_ID}"-gobject \ mingw-w64-"${ARCH}"-"${PYTHON_ID}"-pip \ View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/9d8b56bc0fa9770e05f8cd5d3dfa0bb37… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/9d8b56bc0fa9770e05f8cd5d3dfa0bb37… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Refactor groupchat nick auto completion
by Philipp Hörist 20 Nov '18

20 Nov '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 9d8b56bc by Marcin Mielniczuk at 2018-11-20T09:37:12Z Refactor groupchat nick auto completion - - - - - 3 changed files: - gajim/groupchat_control.py - gajim/gtk/util.py - + test/no_gui/unit/test_nick_completion.py Changes: ===================================== gajim/groupchat_control.py ===================================== @@ -8,6 +8,7 @@ # Stephan Erb <steve-e AT h3c.de> # Copyright (C) 2008 Brendan Taylor <whateley AT gmail.com> # Jonathan Schleifer <js-gajim AT webkeks.org> +# Copyright (C) 2018 Marcin Mielniczuk <marmistrz dot dev at zoho dot eu> # # This file is part of Gajim. # @@ -32,6 +33,7 @@ import logging from enum import IntEnum, unique import nbxmpp + from gi.repository import Gtk from gi.repository import Gdk from gi.repository import Pango @@ -75,6 +77,7 @@ from gajim.gtk.add_contact import AddNewContactWindow from gajim.gtk.tooltips import GCTooltip from gajim.gtk.groupchat_config import GroupchatConfig from gajim.gtk.adhoc_commands import CommandWindow +from gajim.gtk.util import NickCompletionGenerator from gajim.gtk.util import get_icon_name from gajim.gtk.util import get_affiliation_surface from gajim.gtk.util import get_builder @@ -317,6 +320,7 @@ class GroupchatControl(ChatControlBase): # sorted list of nicks who mentioned us (last at the end) self.attention_list = [] self.nick_hits = [] + self._nick_completion = NickCompletionGenerator(self.nick) self.last_key_tabs = False self.subject = '' @@ -1433,11 +1437,7 @@ class GroupchatControl(ChatControlBase): other_tags_for_name.append('bold') other_tags_for_text.append('marked') - if contact in self.attention_list: - self.attention_list.remove(contact) - elif len(self.attention_list) > 6: - self.attention_list.pop(0) # remove older - self.attention_list.append(contact) + self._nick_completion.record_message(contact, highlight) if text.startswith('/me ') or text.startswith('/me\n'): other_tags_for_text.append('gc_nickname_color_' + \ @@ -1826,6 +1826,10 @@ class GroupchatControl(ChatControlBase): for role in ('visitor', 'participant', 'moderator'): self.draw_role(role) + def _change_nick(self, new_nick: str) -> None: + self.nick = new_nick + self._nick_completion.change_nick(new_nick) + def _nec_gc_presence_received(self, obj): if obj.room_jid != self.room_jid or obj.conn.name != self.account: return @@ -1945,7 +1949,7 @@ class GroupchatControl(ChatControlBase): elif '303' in obj.status_code: # Someone changed their nick if obj.new_nick == self.new_nick or obj.nick == self.nick: # We changed our nick - self.nick = obj.new_nick + self.change_nick(obj.new_nick) self.new_nick = '' s = _('You are now known as %s') % self.nick else: @@ -1963,8 +1967,7 @@ class GroupchatControl(ChatControlBase): # after that, but that doesn't hurt self.add_contact_to_roster(obj.new_nick, obj.show, role, affiliation, obj.status, obj.real_jid) - if obj.nick in self.attention_list: - self.attention_list.remove(obj.nick) + self._nick_completion.contact_renamed(nick, obj.new_nick) # keep nickname color if obj.nick in self.gc_custom_colors: self.gc_custom_colors[obj.new_nick] = \ @@ -2016,7 +2019,7 @@ class GroupchatControl(ChatControlBase): if not iter_: if '210' in obj.status_code: # Server changed our nick - self.nick = obj.nick + self.change_nick(obj.nick) s = _('You are now known as %s') % nick self.print_conversation(s, 'info', graphics=False) iter_ = self.add_contact_to_roster(obj.nick, obj.show, role, @@ -2080,9 +2083,6 @@ class GroupchatControl(ChatControlBase): right_changed: st = '' - if obj.show == 'offline': - if obj.nick in self.attention_list: - self.attention_list.remove(obj.nick) if obj.show == 'offline' and print_status in ('all', 'in_and_out') \ and (not obj.status_code or '307' not in obj.status_code): st = _('%s has left') % nick_jid @@ -2469,6 +2469,10 @@ class GroupchatControl(ChatControlBase): self.print_conversation(_('%(jid)s has been invited in this room') % {'jid': contact_jid}, graphics=False) + def _jid_not_blocked(self, bare_jid: str) -> bool: + fjid = self.room_jid + '/' + bare_jid + return not helpers.jid_is_blocked(self.account, fjid) + def _on_message_textview_key_press_event(self, widget, event): res = ChatControlBase._on_message_textview_key_press_event(self, widget, event) @@ -2508,29 +2512,21 @@ class GroupchatControl(ChatControlBase): self.nick_hits.append(self.nick_hits[0]) begin = self.nick_hits.pop(0) else: - self.nick_hits = [] # clear the hit list list_nick = app.contacts.get_nick_list(self.account, self.room_jid) - list_nick.sort(key=str.lower) # case-insensitive sort - if begin == '': - # empty message, show lasts nicks that highlighted us first - for nick in self.attention_list: - if nick in list_nick: - list_nick.remove(nick) - list_nick.insert(0, nick) - - if self.nick in list_nick: - list_nick.remove(self.nick) # Skip self - for nick in list_nick: - fjid = self.room_jid + '/' + nick - if nick.lower().startswith(begin.lower()) and not \ - helpers.jid_is_blocked(self.account, fjid): - # the word is the beginning of a nick - self.nick_hits.append(nick) + list_nick = list(filter(self._jid_not_blocked, list_nick)) + + log.debug("Nicks to be considered for autosuggestions: %s", + list_nick) + self.nick_hits = self._nick_completion.generate_suggestions( + nicks=list_nick, beginning=begin) + log.debug("Nicks filtered for autosuggestions: %s", + self.nick_hits) + if self.nick_hits: if len(splitted_text) < 2 or with_refer_to_nick_char: - # This is the 1st word of the line or no word or we are cycling - # at the beginning, possibly with a space in one nick + # This is the 1st word of the line or no word or we are cycling + # at the beginning, possibly with a space in one nick add = gc_refer_to_nick_char + ' ' else: add = ' ' ===================================== gajim/gtk/util.py ===================================== @@ -1,3 +1,6 @@ +# Copyright (C) 2018 Marcin Mielniczuk <marmistrz.dev AT zoho.eu> +# Copyright (C) 2018 Philipp Hörist <philipp AT hoerist.com> +# # This file is part of Gajim. # # Gajim is free software; you can redistribute it and/or modify @@ -42,6 +45,89 @@ if _icon_theme is not None: log = logging.getLogger('gajim.gtk.util') +class NickCompletionGenerator: + def __init__(self, self_nick: str) -> None: + self.nick = self_nick + self.sender_list = [] # type: List[str] + self.attention_list = [] # type: List[str] + + def change_nick(self, new_nick: str) -> None: + self.nick = new_nick + + def record_message(self, contact: str, highlight: bool) -> None: + if contact == self.nick: + return + + log.debug('Recorded a message from %s, highlight; %s', contact, + highlight) + if highlight: + try: + self.attention_list.remove(contact) + except ValueError: + pass + if len(self.attention_list) > 6: + self.attention_list.pop(0) # remove older + self.attention_list.append(contact) + + # TODO implement it in a more efficient way + # Currently it's O(n*m + n*s), where n is the number of participants and + # m is the number of messages processed, s - the number of times the + # suggestions are requested + # + # A better way to do it would be to keep a dict: contact -> timestamp + # with expected O(1) insert, and sort it by timestamps in O(n log n) + # for each suggestion (currently generating the suggestions is O(n)) + # this would give the expected complexity of O(m + s * n log n) + try: + self.sender_list.remove(contact) + except ValueError: + pass + self.sender_list.append(contact) + + def contact_renamed(self, contact_old: str, contact_new: str) -> None: + log.debug('Contact %s renamed to %s', contact_old, contact_new) + for lst in (self.attention_list, self.sender_list): + for idx, contact in enumerate(lst): + if contact == contact_old: + lst[idx] = contact_new + + + def generate_suggestions(self, nicks: List[str], + beginning: str) -> List[str]: + """ + Generate the order of suggested MUC autocompletions + + `nicks` is the list of contacts currently participating in a MUC + `beginning` is the text already typed by the user + """ + def nick_matching(nick: str) -> bool: + return nick != self.nick \ + and nick.lower().startswith(beginning.lower()) + + if beginning == '': + # empty message, so just suggest recent mentions + potential_matches = self.attention_list + else: + # nick partially typed, try completing it + potential_matches = self.sender_list + + potential_matches_set = set(potential_matches) + log.debug('Priority matches: %s', potential_matches_set) + + matches = [n for n in potential_matches if nick_matching(n)] + # the most recent nick is the last one on the list + matches.reverse() + + # handle people who have not posted/mentioned us + other_nicks = [ + n for n in nicks if nick_matching(n) and n not in potential_matches_set + ] + other_nicks.sort(key=str.lower) + log.debug('Other matches: %s', other_nicks) + + return matches + other_nicks + + class Builder: def __init__(self, filename: str, ===================================== test/no_gui/unit/test_nick_completion.py ===================================== @@ -0,0 +1,48 @@ +import unittest + +from gajim.gtk.util import NickCompletionGenerator + +class Test(unittest.TestCase): + + def test_generate_suggestions(self): + gen = NickCompletionGenerator('meeeee') + + l = ['aaaa', 'meeeee', 'fooo', 'xxxxz', 'xaaaz'] + for n in l: + gen.record_message(n, False) + l2 = ['xxx'] + l + r = gen.generate_suggestions(nicks=l2, beginning='x') + self.assertEqual(r, ['xaaaz', 'xxxxz', 'xxx']) + + r = gen.generate_suggestions( + nicks=l2, + beginning='m' + ) + self.assertEqual(r, []) + + for n in ['xaaaz', 'xxxxz']: + gen.record_message(n, True) + + r = gen.generate_suggestions( + nicks=l2, + beginning='x' + ) + self.assertEqual(r, ['xxxxz', 'xaaaz', 'xxx']) + r = gen.generate_suggestions( + nicks=l2, + beginning='' + ) + self.assertEqual(r, ['xxxxz', 'xaaaz', 'aaaa', 'fooo', 'xxx']) + + l2[1] = 'bbbb' + gen.contact_renamed('aaaa', 'bbbb') + r = gen.generate_suggestions( + nicks=l2, + beginning='' + ) + self.assertEqual(r, ['xxxxz', 'xaaaz', 'bbbb', 'fooo', 'xxx']) + + + +if __name__ == "__main__": + unittest.main() View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/9d8b56bc0fa9770e05f8cd5d3dfa0bb375… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/9d8b56bc0fa9770e05f8cd5d3dfa0bb375… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Dont use deprecated GLib.glib_version
by Philipp Hörist 19 Nov '18

19 Nov '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: a00e8e3a by Philipp Hörist at 2018-11-19T23:04:41Z Dont use deprecated GLib.glib_version - - - - - 1 changed file: - gajim/gtk/exception.py Changes: ===================================== gajim/gtk/exception.py ===================================== @@ -101,7 +101,9 @@ class ExceptionDialog(): Gtk.get_minor_version(), Gtk.get_micro_version()) gobject_ver = '.'.join(map(str, GObject.pygobject_version)) - glib_ver = '.'.join(map(str, GLib.glib_version)) + glib_ver = '.'.join(map(str, [GLib.MAJOR_VERSION, + GLib.MINOR_VERSION, + GLib.MICRO_VERSION])) return ISSUE_TEXT.format(get_os_info(), gtk_ver, View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/a00e8e3abb5c9aba93810fc4b992fb5229… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/a00e8e3abb5c9aba93810fc4b992fb5229… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.1] 10 commits: Refactor htmltextview test
by Philipp Hörist 19 Nov '18

19 Nov '18

Philipp Hörist pushed to branch gajim_1.1 at gajim / gajim Commits: 4979bcf6 by Philipp Hörist at 2018-11-19T19:04:51Z Refactor htmltextview test - - - - - 3e8b12a5 by Philipp Hörist at 2018-11-19T19:05:02Z XHTML: Fix parsing font-size Remove checking for font_scale, Gtk.TextIter.get_attributes() seems buggy at the moment, and we dont need to check the current scale to apply a new scale Fixes #9067 - - - - - bc6068cd by André Apitzsch at 2018-11-19T19:05:36Z Test: Fix KeyError The added account causes an issue with test_gui_interface, so the account needs to be removed again - - - - - 55eed7a5 by André Apitzsch at 2018-11-19T19:05:36Z CI: Make test verbose - - - - - 31e75823 by André Apitzsch at 2018-11-19T19:05:36Z Remove useless comment - - - - - 00c7715c by Philipp Hörist at 2018-11-19T19:06:31Z Refactor parse_datetime and add unit test - - - - - 9bf88c1f by Philipp Hörist at 2018-11-19T19:06:40Z Improve Entity Time parsing - Use parse_datetime() - Improve tzo node validation - - - - - 567b871b by Philipp Hörist at 2018-11-19T19:07:38Z Dont answer groupchat receipt requests - - - - - 9c99af4f by Philipp Hörist at 2018-11-19T19:07:38Z Dont check mam:2 compliance for error messages - - - - - 193092d0 by Philipp Hörist at 2018-11-19T19:07:38Z Fix receipts for MUC-PMs - - - - - 10 changed files: - .gitlab-ci.yml - gajim/common/connection_handlers.py - gajim/common/modules/date_and_time.py - gajim/common/modules/entity_time.py - gajim/common/modules/receipts.py - gajim/htmltextview.py - test/gtk/htmltextview.py - + test/no_gui/unit/test_date_time.py - test/no_gui/unit/test_protocol_caps.py - test/unit/test_gui_interface.py Changes: ===================================== .gitlab-ci.yml ===================================== @@ -10,7 +10,7 @@ stages: run-test: stage: test script: - - python3 setup.py test -s test.no_gui -q + - python3 setup.py test -s test.no_gui run-mypy: stage: test ===================================== gajim/common/connection_handlers.py ===================================== @@ -207,6 +207,9 @@ class ConnectionHandlersBase: if obj.conn.name != self.name: return + if obj.stanza.getType() == 'error': + return + self._check_for_mam_compliance(obj.jid, obj.stanza_id) if (app.config.should_log(obj.conn.name, obj.jid) and ===================================== gajim/common/modules/date_and_time.py ===================================== @@ -16,8 +16,13 @@ import re import time -from datetime import datetime, timedelta, timezone, tzinfo +import logging +from datetime import datetime +from datetime import timedelta +from datetime import timezone +from datetime import tzinfo +log = logging.getLogger('gajim.c.m.date_and_time') PATTERN_DATETIME = re.compile( r'([0-9]{4}-[0-9]{2}-[0-9]{2})' @@ -91,6 +96,33 @@ class LocalTimezone(tzinfo): return tt.tm_isdst > 0 +def create_tzinfo(hours=0, minutes=0, tz_string=None): + if tz_string is None: + return timezone(timedelta(hours=hours, minutes=minutes)) + + if tz_string.lower() == 'z': + return timezone.utc + + try: + hours, minutes = map(int, tz_string.split(':')) + except Exception: + log.warning('Wrong tz string: %s', tz_string) + return + + if hours not in range(-24, 24): + log.warning('Wrong tz string: %s', tz_string) + return + + if minutes not in range(0, 59): + log.warning('Wrong tz string: %s', tz_string) + return + + if hours in (24, -24) and minutes != 0: + log.warning('Wrong tz string: %s', tz_string) + return + return timezone(timedelta(hours=hours, minutes=minutes)) + + def parse_datetime(timestring, check_utc=False, convert='utc', epoch=False): ''' @@ -133,11 +165,30 @@ def parse_datetime(timestring, check_utc=False, except ValueError: pass else: - if not check_utc and convert == 'utc': + if check_utc: + if convert != 'utc': + raise ValueError( + 'check_utc can only be used with convert="utc"') + date_time.replace(tzinfo=timezone.utc) + if epoch: + return date_time.timestamp() + return date_time + + if convert == 'utc': date_time = date_time.astimezone(timezone.utc) + if epoch: + return date_time.timestamp() + return date_time + + if epoch: + # epoch is always UTC, use convert='utc' or check_utc=True + raise ValueError( + 'epoch not available while converting to local') + if convert == 'local': date_time = date_time.astimezone(LocalTimezone()) - if epoch: - return date_time.timestamp() + return date_time + + # convert=None return date_time return None ===================================== gajim/common/modules/entity_time.py ===================================== @@ -15,13 +15,14 @@ # XEP-0202: Entity Time import logging -import datetime import time import nbxmpp from gajim.common import app -from gajim.common.nec import NetworkIncomingEvent +from gajim.common.nec import NetworkEvent +from gajim.common.modules.date_and_time import parse_datetime +from gajim.common.modules.date_and_time import create_tzinfo log = logging.getLogger('gajim.c.m.entity_time') @@ -61,10 +62,10 @@ class EntityTime: log.info('Received: %s %s', stanza.getFrom(), time_info) - app.nec.push_incoming_event( - TimeResultReceivedEvent(None, conn=self._con, - jid=stanza.getFrom(), - time_info=time_info)) + app.nec.push_incoming_event(NetworkEvent('time-result-received', + conn=self._con, + jid=stanza.getFrom(), + time_info=time_info)) @staticmethod def _extract_info(stanza): @@ -74,42 +75,24 @@ class EntityTime: return tzo = time_.getTag('tzo').getData() - if tzo.lower() == 'z': - tzo = '0:0' - try: - tzoh, tzom = tzo.split(':') - except Exception: + if not tzo: log.warning('Wrong tzo node: %s', stanza) return - utc_time = time_.getTag('utc').getData() - if utc_time[-1:] == 'Z': - # Remove the trailing 'Z' - utc_time = utc_time[:-1] - elif utc_time[-6:] == "+00:00": - # Remove the trailing "+00:00" - utc_time = utc_time[:-6] - else: + remote_tz = create_tzinfo(tz_string=tzo) + if remote_tz is None: + log.warning('Wrong tzo node: %s', stanza) + return + + utc_time = time_.getTag('utc').getData() + date_time = parse_datetime(utc_time, check_utc=True) + if date_time is None: log.warning('Wrong timezone defintion: %s %s', utc_time, stanza.getFrom()) return - try: - dtime = datetime.datetime.strptime(utc_time, '%Y-%m-%dT%H:%M:%S') - except ValueError: - try: - dtime = datetime.datetime.strptime(utc_time, - '%Y-%m-%dT%H:%M:%S.%f') - except ValueError as error: - log.warning('Wrong time format: %s %s', - error, stanza.getFrom()) - return - - utc = datetime.timezone(datetime.timedelta(0)) - dtime = dtime.replace(tzinfo=utc) - utc_offset = datetime.timedelta(hours=int(tzoh), minutes=int(tzom)) - contact_tz = datetime.timezone(utc_offset, "remote timezone") - return dtime.astimezone(contact_tz).strftime('%c') + date_time = date_time.astimezone(remote_tz) + return date_time.strftime('%c %Z') def _answer_request(self, _con, stanza): log.info('%s asked for the time', stanza.getFrom()) @@ -132,9 +115,5 @@ class EntityTime: raise nbxmpp.NodeProcessed -class TimeResultReceivedEvent(NetworkIncomingEvent): - name = 'time-result-received' - - def get_instance(*args, **kwargs): return EntityTime(*args, **kwargs), 'EntityTime' ===================================== gajim/common/modules/receipts.py ===================================== @@ -49,7 +49,7 @@ class Receipts: 'answer_receipts'): return - if event.mtype not in ('chat', 'groupchat'): + if event.mtype not in ('chat', 'normal'): return if event.sent: @@ -72,15 +72,15 @@ class Receipts: self._con.connection.send(receipt) def _get_contact(self, event): - if event.mtype == 'chat': - contact = app.contacts.get_contact(self._account, event.jid) - if contact and contact.sub not in ('to', 'none'): - return contact - else: + if event.muc_pm: return app.contacts.get_gc_contact(self._account, event.jid, event.resource) + contact = app.contacts.get_contact(self._account, event.jid) + if contact is None and contact.sub not in ('to', 'none'): + return contact + @staticmethod def _build_answer_receipt(to, receipt_id): receipt = nbxmpp.Message(to=to, typ='chat') @@ -95,11 +95,16 @@ class Receipts: log.warning('Receipt without ID: %s', event.stanza) return log.info('Received %s', receipt_id) + + jid = event.jid + if event.muc_pm: + jid = event.fjid + app.nec.push_incoming_event( NetworkIncomingEvent('receipt-received', conn=self._con, receipt_id=receipt_id, - jid=event.jid)) + jid=jid)) def get_instance(*args, **kwargs): ===================================== gajim/htmltextview.py ===================================== @@ -230,13 +230,6 @@ class HtmlHandler(xml.sax.handler.ContentHandler): tag.set_property('background-gdk', color) tag.set_property('paragraph-background-gdk', color) - def _get_current_attributes(self): - attrs = self.textview.get_default_attributes() - self.iter.backward_char() - attrs = (self.iter.get_attributes())[1] - self.iter.forward_char() - return attrs - def __parse_length_frac_size_allocate(self, textview, allocation, frac, callback, args): callback(allocation.width*frac, *args) @@ -338,30 +331,19 @@ class HtmlHandler(xml.sax.handler.ContentHandler): def _parse_style_font_size(self, tag, value): try: - # see http://developer.gnome.org/pango/stable/pango-Text-Attributes.html#PANGO-SC… - # http://consciouslyusing.blogspot.ru/2012/01/heads-up-missing-pango-text-sca… scale = { - #'xx-small': Pango.SCALE_XX_SMALL, - #'x-small': Pango.SCALE_X_SMALL, - #'small': Pango.SCALE_SMALL, - #'medium': Pango.SCALE_MEDIUM, - #'large': Pango.SCALE_LARGE, - #'x-large': Pango.SCALE_X_LARGE, - #'xx-large': Pango.SCALE_XX_LARGE, - 'xx-small': 0.5787037037037, - 'x-small': 0.6444444444444, - 'small': 0.8333333333333, - 'medium': 1.0, - 'large': 1.2, - 'x-large': 1.4399999999999, - 'xx-large': 1.728, - }[value] + 'xx-small': 0.5787037037037, + 'x-small': 0.6444444444444, + 'small': 0.8333333333333, + 'medium': 1.0, + 'large': 1.2, + 'x-large': 1.4399999999999, + 'xx-large': 1.728, + }[value] except KeyError: pass else: - attrs = self._get_current_attributes() - if attrs.font_scale == 0: - tag.set_property('scale', scale) + tag.set_property('scale', scale) return if value == 'smaller': tag.set_property('scale', 0.8333333333333) ===================================== test/gtk/htmltextview.py ===================================== @@ -1,17 +1,14 @@ -import sys -import os from unittest.mock import MagicMock -sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), '..', '..'))) - -from gi.repository import Gtk, Gdk +import gi +gi.require_version('Gtk', '3.0') +from gi.repository import Gtk from gajim.common import app from gajim.common import configpaths configpaths.init() from gajim.common import caps_cache -from gajim.gtk.util import get_cursor from gajim.conversation_textview import ConversationTextview from gajim.gui_interface import Interface @@ -20,168 +17,196 @@ app.plugin_manager = MagicMock() app.logger = MagicMock() app.interface = Interface() -change_cursor = None -htmlview = ConversationTextview(None) - - -def on_textview_motion_notify_event(widget, event): - """ - Change the cursor to a hand when we are over a mail or an url - """ - global change_cursor - w = htmlview.tv.get_window(Gtk.TextWindowType.TEXT) - device = w.get_display().get_device_manager().get_client_pointer() - pointer = w.get_device_position(device) - x = pointer[1] - y = pointer[2] - tags = htmlview.tv.get_iter_at_location(x, y)[1].get_tags() - if change_cursor: - w.set_cursor(get_cursor('XTERM')) - change_cursor = None - for tag in tags: - try: - if tag.is_anchor: - w.set_cursor(get_cursor('HAND2')) - change_cursor = tag - except Exception: - pass - -htmlview.tv.connect('motion_notify_event', on_textview_motion_notify_event) - -def handler(texttag, widget, event, iter_, kind): - if event.type == Gdk.EventType.BUTTON_PRESS: - pass - - -htmlview.print_real_text(None, xhtml='<div>' -'Hello \n' - ' <img src="http://images.slashdot.org/topics/topicsoftware.gif"/> \n' -'World\n' - '</div>\n') -htmlview.print_real_text(None, xhtml='<hr />') -htmlview.print_real_text(None, xhtml=''' -<body xmlns='http://www.w3.org/1999/xhtml'> - a:b - <a href='http://google.com/' xmlns='http://www.w3.org/1999/xhtml'>Google - </a> - -</body>''') -htmlview.print_real_text(None, xhtml=''' - <body xmlns='http://www.w3.org/1999/xhtml'> - - O - MG, - I'm green - with envy! - - </body> - ''') -htmlview.print_real_text(None, xhtml='<hr />') -htmlview.print_real_text(None, xhtml=''' -<body xmlns='http://www.w3.org/1999/xhtml'> + +XHTML = [ + ''' + <body xmlns='http://www.w3.org/1999/xhtml'>rexxnor: i nimes chum a...</body> + ''', + + ''' + <div> + Hello + \n + <img src="http://images.slashdot.org/topics/topicsoftware.gif"/> + \n + World\n + </div> + \n + ''', + + ''' + <hr /> + ''', + + ''' + <body xmlns='http://www.w3.org/1999/xhtml'> + a:b + <a href='http://google.com/' xmlns='http://www.w3.org/1999/xhtml'>Google</a> + + + </body> + ''', + + ''' + <body xmlns='http://www.w3.org/1999/xhtml'> + + O + MG + , I'm greenwith + envy! + + </body> + ''', + + ''' + <hr /> + ''', + + ''' + <body xmlns='http://www.w3.org/1999/xhtml'> http://test.com/ testing links autolinkifying -</body> - ''') -htmlview.print_real_text(None, xhtml='<hr />') -htmlview.print_real_text(None, xhtml=''' -<body xmlns='http://www.w3.org/1999/xhtml'> - As Emerson said in his essay Self-Reliance: - - "A foolish consistency is the hobgoblin of little minds." - -</body> - ''') -htmlview.print_real_text(None, xhtml='<hr />') -htmlview.print_real_text(None, xhtml=''' -<body xmlns='http://www.w3.org/1999/xhtml'> - - Hey, are you licensed to <a href='http://www.jabber.org/'>Jabber</a>? - - - <img src='http://www.xmpp.org/images/psa-license.jpg' - alt='A License to Jabber' width='50%' height='50%'/> - -</body> - ''') -htmlview.print_real_text(None, xhtml='<hr />') -htmlview.print_real_text(None, xhtml=''' -<body xmlns='http://www.w3.org/1999/xhtml'> - <ul style='background-color:rgb(120,140,100)'> - <li> One </li> - <li> Two </li> - <li> Three </li> - </ul><hr /><pre style="background-color:rgb(120,120,120)">def fac(n): -def faciter(n,acc): -if n==0: return acc -return faciter(n-1, acc*n) -if n<0: raise ValueError('Must be non-negative') -return faciter(n,1)</pre> -</body> - ''') -htmlview.print_real_text(None, xhtml='<hr />') -htmlview.print_real_text(None, xhtml=''' -<body xmlns='http://www.w3.org/1999/xhtml'> - <ol style='background-color:rgb(120,140,100)'> - <li> One </li> - <li> Two is nested: <ul style='background-color:rgb(200,200,100)'> - <li> One </li> - <li style='font-size:50%'> Two </li> - <li style='font-size:200%'> Three </li> - <li style='font-size:9999pt'> Four </li> - </ul></li> - <li> Three </li></ol> -</body> - ''') -htmlview.print_real_text(None, xhtml='<hr />') -htmlview.print_real_text(None, xhtml=''' -<body xmlns='http://www.w3.org/1999/xhtml'> - - - <a href='xmpp:example@example.org'>xmpp link</a> - : -<div xmlns='http://www.w3.org/1999/xhtml'> - <cite style='margin: 7px;' title='xmpp:examples@example.org'> - - examples(a)example.org wrote: - - this cite - bla bla bla, smile- :-) … - </cite> - <div> - some text - </div> -</div> - -#232/1 -</body> -''') -htmlview.print_real_text(None, xhtml='<hr />') -htmlview.print_real_text(None, xhtml=''' -<body xmlns='http://www.w3.org/1999/xhtml'> - -<img src='data:image/png;base64,R0lGODdhMAAwAPAAAAAAAP///ywAAAAAMAAw\ -AAAC8IyPqcvt3wCcDkiLc7C0qwyGHhSWpjQu5yqmCYsapyuvUUlvONmOZtfzgFz\ -ByTB10QgxOR0TqBQejhRNzOfkVJ+5YiUqrXF5Y5lKh/DeuNcP5yLWGsEbtLiOSp\ -a/TPg7JpJHxyendzWTBfX0cxOnKPjgBzi4diinWGdkF8kjdfnycQZXZeYGejmJl\ -ZeGl9i2icVqaNVailT6F5iJ90m6mvuTS4OK05M0vDk0Q4XUtwvKOzrcd3iq9uis\ -F81M1OIcR7lEewwcLp7tuNNkM3uNna3F2JQFo97Vriy/Xl4/f1cf5VWzXyym7PH\ -hhx4dbgYKAAA7' alt='Larry'/> -</body> -''') -htmlview.tv.show() -sw = Gtk.ScrolledWindow() -sw.set_property('hscrollbar-policy', Gtk.PolicyType.AUTOMATIC) -sw.set_property('vscrollbar-policy', Gtk.PolicyType.AUTOMATIC) -sw.set_property('border-width', 0) -sw.add(htmlview.tv) -sw.show() -frame = Gtk.Frame() -frame.set_shadow_type(Gtk.ShadowType.IN) -frame.show() -frame.add(sw) -win = Gtk.Window() -win.add(frame) -win.set_default_size(400, 300) + </body> + ''', + + ''' + <hr /> + ''', + + ''' + <body xmlns='http://www.w3.org/1999/xhtml'> + As Emerson said in his essay Self-Reliance: + + "A foolish consistency is the hobgoblin of little minds." + + </body> + ''', + + ''' + <hr /> + ''', + + ''' + <body xmlns='http://www.w3.org/1999/xhtml'> + + Hey, are you licensed to <a href='http://www.jabber.org/'>Jabber</a>? + + + <img src='http://www.xmpp.org/images/psa-license.jpg' + alt='A License to Jabber' width='50%' height='50%'/> + + </body> + ''', + + ''' + <hr /> + ''', + + ''' + <body xmlns='http://www.w3.org/1999/xhtml'> + <ul style='background-color:rgb(120,140,100)'> + <li> One </li> + <li> Two </li> + <li> Three </li> + </ul> + <hr /> + <pre style="background-color:rgb(120,120,120)">def fac(n): + def faciter(n,acc): + if n==0: return acc + return faciter(n-1, acc*n) + if n<0: raise ValueError('Must be non-negative') + return faciter(n,1)</pre> + </body> + ''', + + ''' + <hr /> + ''', + + ''' + <body xmlns='http://www.w3.org/1999/xhtml'> + <ol style='background-color:rgb(120,140,100)'> + <li> One </li> + <li> + Two is nested: + <ul style='background-color:rgb(200,200,100)'> + <li> One </li> + <li style='font-size:50%'> Two </li> + <li style='font-size:200%'> Three </li> + <li style='font-size:9999pt'> Four </li> + </ul> + </li> + <li> Three </li> + </ol> + </body> + ''', + + ''' + <hr /> + ''', + + ''' + <body xmlns='http://www.w3.org/1999/xhtml'> + + + <a href='xmpp:example@example.org'>xmpp link</a> + : + + <div xmlns='http://www.w3.org/1999/xhtml'> + <cite style='margin: 7px;' title='xmpp:examples@example.org'> + + examples(a)example.org wrote: + + this cite - bla bla bla, smile- :-) … + </cite> + <div> + some text + </div> + </div> + + #232/1 + </body> + ''', + + ''' + <hr /> + ''', + + ''' + <body xmlns='http://www.w3.org/1999/xhtml'> + + <img src='data:image/png;base64,R0lGODdhMAAwAPAAAAAAAP///ywAAAAAMAAw\ + AAAC8IyPqcvt3wCcDkiLc7C0qwyGHhSWpjQu5yqmCYsapyuvUUlvONmOZtfzgFz\ + ByTB10QgxOR0TqBQejhRNzOfkVJ+5YiUqrXF5Y5lKh/DeuNcP5yLWGsEbtLiOSp\ + a/TPg7JpJHxyendzWTBfX0cxOnKPjgBzi4diinWGdkF8kjdfnycQZXZeYGejmJl\ + ZeGl9i2icVqaNVailT6F5iJ90m6mvuTS4OK05M0vDk0Q4XUtwvKOzrcd3iq9uis\ + F81M1OIcR7lEewwcLp7tuNNkM3uNna3F2JQFo97Vriy/Xl4/f1cf5VWzXyym7PH\ + hhx4dbgYKAAA7' alt='Larry'/> + </body> + ''', + +] + + +class TextviewWindow(Gtk.Window): + def __init__(self): + Gtk.Window.__init__(self, title="Textview Test") + self.set_default_size(600, 600) + + self._textview = ConversationTextview(None) + + scrolled = Gtk.ScrolledWindow() + scrolled.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC) + scrolled.add(self._textview.tv) + self.add(scrolled) + self.show() + self._print_xhtml() + + def _print_xhtml(self): + for xhtml in XHTML: + self._textview.print_real_text(None, xhtml=xhtml) + +win = TextviewWindow() +win.connect("destroy", Gtk.main_quit) win.show_all() -win.connect('destroy', lambda win: Gtk.main_quit()) Gtk.main() ===================================== test/no_gui/unit/test_date_time.py ===================================== @@ -0,0 +1,99 @@ +import unittest +from datetime import datetime +from datetime import timezone +from datetime import timedelta + +from gajim.common.modules.date_and_time import parse_datetime +from gajim.common.modules.date_and_time import LocalTimezone +from gajim.common.modules.date_and_time import create_tzinfo + + +class TestDateTime(unittest.TestCase): + + def test_convert_to_utc(self): + + strings = { + # Valid UTC strings and fractions + '2017-11-05T01:41:20Z': 1509846080.0, + '2017-11-05T01:41:20.123Z': 1509846080.123, + '2017-11-05T01:41:20.123123123+00:00': 1509846080.123123, + '2017-11-05T01:41:20.123123123123123-00:00': 1509846080.123123, + + # Invalid strings + '2017-11-05T01:41:20Z+05:00': None, + '2017-11-05T01:41:20+0000': None, + '2017-11-05T01:41:20-0000': None, + + # Valid strings with offset + '2017-11-05T01:41:20-05:00': 1509864080.0, + '2017-11-05T01:41:20+05:00': 1509828080.0, + } + + strings2 = { + # Valid strings with offset + '2017-11-05T01:41:20-05:00': datetime(2017, 11, 5, 1, 41, 20, 0, create_tzinfo(hours=-5)), + '2017-11-05T01:41:20+05:00': datetime(2017, 11, 5, 1, 41, 20, 0, create_tzinfo(hours=5)), + } + + for time_string, expected_value in strings.items(): + result = parse_datetime(time_string, convert='utc', epoch=True) + self.assertEqual(result, expected_value) + + for time_string, expected_value in strings2.items(): + result = parse_datetime(time_string, convert='utc') + self.assertEqual(result, expected_value.astimezone(timezone.utc)) + + def test_convert_to_local(self): + + strings = { + # Valid UTC strings and fractions + '2017-11-05T01:41:20Z': datetime(2017, 11, 5, 1, 41, 20, 0, timezone.utc), + '2017-11-05T01:41:20.123Z': datetime(2017, 11, 5, 1, 41, 20, 123000, timezone.utc), + '2017-11-05T01:41:20.123123123+00:00': datetime(2017, 11, 5, 1, 41, 20, 123123, timezone.utc), + '2017-11-05T01:41:20.123123123123123-00:00': datetime(2017, 11, 5, 1, 41, 20, 123123, timezone.utc), + + # Valid strings with offset + '2017-11-05T01:41:20-05:00': datetime(2017, 11, 5, 1, 41, 20, 0, create_tzinfo(hours=-5)), + '2017-11-05T01:41:20+05:00': datetime(2017, 11, 5, 1, 41, 20, 0, create_tzinfo(hours=5)), + } + + for time_string, expected_value in strings.items(): + result = parse_datetime(time_string, convert='local') + self.assertEqual(result, expected_value.astimezone(LocalTimezone())) + + def test_no_convert(self): + + strings = { + # Valid UTC strings and fractions + '2017-11-05T01:41:20Z': timedelta(0), + '2017-11-05T01:41:20.123Z': timedelta(0), + '2017-11-05T01:41:20.123123123+00:00': timedelta(0), + '2017-11-05T01:41:20.123123123123123-00:00': timedelta(0), + + # Valid strings with offset + '2017-11-05T01:41:20-05:00': timedelta(hours=-5), + '2017-11-05T01:41:20+05:00': timedelta(hours=5), + } + + for time_string, expected_value in strings.items(): + result = parse_datetime(time_string, convert=None) + self.assertEqual(result.utcoffset(), expected_value) + + def test_check_utc(self): + + strings = { + # Valid UTC strings and fractions + '2017-11-05T01:41:20Z': 1509846080.0, + '2017-11-05T01:41:20.123Z': 1509846080.123, + '2017-11-05T01:41:20.123123123+00:00': 1509846080.123123, + '2017-11-05T01:41:20.123123123123123-00:00': 1509846080.123123, + + # Valid strings with offset + '2017-11-05T01:41:20-05:00': None, + '2017-11-05T01:41:20+05:00': None, + } + + for time_string, expected_value in strings.items(): + result = parse_datetime( + time_string, check_utc=True, epoch=True) + self.assertEqual(result, expected_value) ===================================== test/no_gui/unit/test_protocol_caps.py ===================================== @@ -31,6 +31,9 @@ class TestConnectionCaps(unittest.TestCase): self.module._account = 'account' self.module._capscache = MagicMock() + def tearDown(self): + app.contacts.remove_account('account') + def _nec_caps_presence_received(self, obj): self.assertTrue( isinstance(obj.client_caps, caps_cache.ClientCaps), ===================================== test/unit/test_gui_interface.py ===================================== @@ -53,5 +53,4 @@ class TestInterface(unittest.TestCase): if __name__ == "__main__": - #import sys;sys.argv = ['', 'Test.test'] unittest.main() View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/5271f192949a52b064ccb36b286b59646… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/5271f192949a52b064ccb36b286b59646… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix receipts for MUC-PMs
by Philipp Hörist 19 Nov '18

19 Nov '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: e3050697 by Philipp Hörist at 2018-11-19T18:33:28Z Fix receipts for MUC-PMs - - - - - 1 changed file: - gajim/common/modules/receipts.py Changes: ===================================== gajim/common/modules/receipts.py ===================================== @@ -72,15 +72,15 @@ class Receipts: self._con.connection.send(receipt) def _get_contact(self, event): - if event.mtype == 'chat': - contact = app.contacts.get_contact(self._account, event.jid) - if contact and contact.sub not in ('to', 'none'): - return contact - else: + if event.muc_pm: return app.contacts.get_gc_contact(self._account, event.jid, event.resource) + contact = app.contacts.get_contact(self._account, event.jid) + if contact is None and contact.sub not in ('to', 'none'): + return contact + @staticmethod def _build_answer_receipt(to, receipt_id): receipt = nbxmpp.Message(to=to, typ='chat') @@ -95,11 +95,16 @@ class Receipts: log.warning('Receipt without ID: %s', event.stanza) return log.info('Received %s', receipt_id) + + jid = event.jid + if event.muc_pm: + jid = event.fjid + app.nec.push_incoming_event( NetworkIncomingEvent('receipt-received', conn=self._con, receipt_id=receipt_id, - jid=event.jid)) + jid=jid)) def get_instance(*args, **kwargs): View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/e30506979899bcb338010a4f59e0c2133f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/e30506979899bcb338010a4f59e0c2133f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Dont check mam:2 compliance for error messages
by Philipp Hörist 19 Nov '18

19 Nov '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: b5bd5f15 by Philipp Hörist at 2018-11-19T17:04:32Z Dont check mam:2 compliance for error messages - - - - - 1 changed file: - gajim/common/connection_handlers.py Changes: ===================================== gajim/common/connection_handlers.py ===================================== @@ -207,6 +207,9 @@ class ConnectionHandlersBase: if obj.conn.name != self.name: return + if obj.stanza.getType() == 'error': + return + self._check_for_mam_compliance(obj.jid, obj.stanza_id) if (app.config.should_log(obj.conn.name, obj.jid) and View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/b5bd5f15f02aeeb8a5843c66e12950438c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/b5bd5f15f02aeeb8a5843c66e12950438c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Dont answer groupchat receipt requests
by Philipp Hörist 19 Nov '18

19 Nov '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 15048055 by Philipp Hörist at 2018-11-19T16:51:18Z Dont answer groupchat receipt requests - - - - - 1 changed file: - gajim/common/modules/receipts.py Changes: ===================================== gajim/common/modules/receipts.py ===================================== @@ -49,7 +49,7 @@ class Receipts: 'answer_receipts'): return - if event.mtype not in ('chat', 'groupchat'): + if event.mtype not in ('chat', 'normal'): return if event.sent: View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/15048055750db24f0f72ceab5eba1dc61e… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/15048055750db24f0f72ceab5eba1dc61e… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix missing default arg
by Philipp Hörist 19 Nov '18

19 Nov '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 596f268f by Philipp Hörist at 2018-11-19T14:04:04Z Fix missing default arg - - - - - 1 changed file: - gajim/gtk/notification.py Changes: ===================================== gajim/gtk/notification.py ===================================== @@ -57,7 +57,7 @@ class Notification: # Detect if actions are supported by the notification daemon if sys.platform not in ('win32', 'darwin'): - def on_proxy_ready(_source, res, _data): + def on_proxy_ready(_source, res, _data=None): try: proxy = Gio.DBusProxy.new_finish(res) self._daemon_capabilities = proxy.GetCapabilities() View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/596f268f14be630ccea76c6e4867709d55… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/596f268f14be630ccea76c6e4867709d55… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 10 commits: Roster: Use icons from IconTheme for Roster
by Philipp Hörist 18 Nov '18

18 Nov '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: acc89ad6 by Philipp Hörist at 2018-11-18T21:24:10Z Roster: Use icons from IconTheme for Roster With this Gajim loses the ability to draw animated GIFs in the Roster GIFs have numerous drawbacks: - We cant add them to the IconTheme, which means we need a different interface to load them - The IconTheme scales all icons we load for the current scale (HiDPI) - The animation causes many updates to the Roster, and causes high cpu usage Fixes #8814, #8655 - - - - - 619793a0 by Philipp Hörist at 2018-11-18T21:24:32Z Groupchat: Use icons from IconTheme - - - - - 3ba34fa3 by Philipp Hörist at 2018-11-18T21:24:32Z Remove old iconset code - - - - - aca34d5c by Philipp Hörist at 2018-11-18T21:24:33Z Remove old icons - - - - - 1179333f by Philipp Hörist at 2018-11-18T21:24:33Z Refactor loading user supplied iconsets - - - - - 2ece342d by Philipp Hörist at 2018-11-18T21:24:33Z Notification: Use load_icon() - - - - - fedc00eb by Philipp Hörist at 2018-11-18T21:24:33Z Move notify to gtk folder - Rename notify to notification - Move get_show_in_roster() to gtk.util - Move get_show_in_systray() to gtk.util - - - - - dffa54f7 by Philipp Hörist at 2018-11-18T21:24:33Z Refactor Windows Notifications - Only show one notification at a time - Fix pylint errors - - - - - 3c32d511 by Philipp Hörist at 2018-11-18T21:24:33Z Fix deprecated init - - - - - b98f0a3f by Philipp Hörist at 2018-11-18T21:24:34Z Remove all usage of get_gtk_builder() - - - - - 30 changed files: - gajim/application.py - − gajim/cell_renderer_image.py - gajim/chat_control.py - gajim/chat_control_base.py - gajim/common/helpers.py - gajim/config.py - gajim/data/gui/popup_notification_window.ui - − gajim/data/iconsets/dcraven/16x16/away.png - − gajim/data/iconsets/dcraven/16x16/chat.png - − gajim/data/iconsets/dcraven/16x16/closed.png - − gajim/data/iconsets/dcraven/16x16/connecting.png - − gajim/data/iconsets/dcraven/16x16/dnd.png - − gajim/data/iconsets/dcraven/16x16/error.png - − gajim/data/iconsets/dcraven/16x16/event.png - − gajim/data/iconsets/dcraven/16x16/invisible.png - − gajim/data/iconsets/dcraven/16x16/muc_active.png - − gajim/data/iconsets/dcraven/16x16/muc_inactive.png - − gajim/data/iconsets/dcraven/16x16/not_in_roster.png - − gajim/data/iconsets/dcraven/16x16/offline.png - − gajim/data/iconsets/dcraven/16x16/online.png - − gajim/data/iconsets/dcraven/16x16/opened.png - − gajim/data/iconsets/dcraven/16x16/requested.png - − gajim/data/iconsets/dcraven/16x16/xa.png - − gajim/data/iconsets/dcraven/32x32/away.png - − gajim/data/iconsets/dcraven/32x32/chat.png - − gajim/data/iconsets/dcraven/32x32/closed.png - − gajim/data/iconsets/dcraven/32x32/connecting.png - − gajim/data/iconsets/dcraven/32x32/dnd.png - − gajim/data/iconsets/dcraven/32x32/error.png - − gajim/data/iconsets/dcraven/32x32/event.png The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/8be5562b92f06047dbfa17c48f9abc29f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/8be5562b92f06047dbfa17c48f9abc29f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Dont fail when IconTheme is not available
by Philipp Hörist 18 Nov '18

18 Nov '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 8be5562b by Philipp Hörist at 2018-11-18T11:52:24Z Dont fail when IconTheme is not available This is needed for tests to work - - - - - 1 changed file: - gajim/gtk/util.py Changes: ===================================== gajim/gtk/util.py ===================================== @@ -32,7 +32,8 @@ from gajim.common import i18n from gajim.common.i18n import _ _icon_theme = Gtk.IconTheme.get_default() -_icon_theme.append_search_path(configpaths.get('ICONS')) +if _icon_theme is not None: + _icon_theme.append_search_path(configpaths.get('ICONS')) log = logging.getLogger('gajim.gtk.util') View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/8be5562b92f06047dbfa17c48f9abc29f1… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/8be5562b92f06047dbfa17c48f9abc29f1… You're receiving this email because of your account on dev.gajim.org.

1 0

← Newer
1
2
3
4
5
6
7
8
9
Older →

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits November 2018