Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] Passwords: Improve log message in case of deletion error
by Philipp Hörist 19 Oct '19

19 Oct '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 172725d1 by Philipp Hörist at 2019-10-19T13:51:20Z Passwords: Improve log message in case of deletion error Fixes #9865 - - - - - 1 changed file: - gajim/common/passwords.py Changes: ===================================== gajim/common/passwords.py ===================================== @@ -81,9 +81,11 @@ class SecretPasswordStorage(PasswordStorage): log.info('Remove password from keyring') try: return self.keyring.delete_password('gajim', account_name) + except keyring.errors.PasswordDeleteError as error: + log.warning('Removing password failed: %s', error) except Exception: - log.exception('Remove password failed') - return + log.exception('Removing password failed') + class PasswordStorageManager(PasswordStorage): """Access all the implemented password storage backends, knowing which ones View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/172725d18c5e0bea540605c7b1a8da047e… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/172725d18c5e0bea540605c7b1a8da047e… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ConversationTextview: Refactor showing message icons
by Philipp Hörist 19 Oct '19

19 Oct '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 06700c96 by Philipp Hörist at 2019-10-19T13:24:28Z ConversationTextview: Refactor showing message icons - Add a dedicated MessageLine class which holds all informations about a message line and is easily expandable. - Add a MessageIcons Widget which holds all icons and is easily expandable later - - - - - 3 changed files: - gajim/chat_control.py - gajim/conversation_textview.py - gajim/data/style/gajim.css Changes: ===================================== gajim/chat_control.py ===================================== @@ -934,7 +934,7 @@ class ChatControl(ChatControlBase): if event.jid != self.contact.jid: return - self.conv_textview.show_xep0184_ack(event.receipt_id) + self.conv_textview.show_receipt_icon(event.receipt_id) def get_tab_label(self): unread = '' ===================================== gajim/conversation_textview.py ===================================== @@ -45,7 +45,6 @@ from gajim.common.fuzzyclock import FuzzyClock from gajim.common.const import StyleAttr, Trust 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 @@ -185,7 +184,7 @@ class ConversationTextview(GObject.GObject): GObject.GObject.__init__(self) self.used_in_history_window = used_in_history_window self.line = 0 - self.message_list = [] + self._message_list = [] self.corrected_text_list = {} self.fc = FuzzyClock() @@ -204,7 +203,6 @@ class ConversationTextview(GObject.GObject): self._buffer = self.tv.get_buffer() self.handlers = {} self.image_cache = {} - self.xep0184_marks = {} # self.last_sent_message_id = message_id self.last_sent_message_id = None # last_received_message_id[name] = (message_id, line_start_mark) @@ -298,9 +296,6 @@ class ConversationTextview(GObject.GObject): buffer_.create_tag('focus-out-line', justification=Gtk.Justification.CENTER) self.displaymarking_tags = {} - tag = buffer_.create_tag('xep0184-received') - tag.set_property('foreground', '#73d216') - # One mark at the begining then 2 marks between each lines size = app.config.get('max_conversation_lines') size = 2 * size - 1 @@ -339,12 +334,7 @@ class ConversationTextview(GObject.GObject): window.set_cursor(get_cursor('pointer')) self._cursor_changed = True return False - try: - text = self.corrected_text_list[tag_name] - tooltip.set_markup(text) - return True - except KeyError: - pass + if self._cursor_changed: window.set_cursor(get_cursor('text')) self._cursor_changed = False @@ -411,30 +401,11 @@ class ConversationTextview(GObject.GObject): return index, end_mark, old_txt - def add_xep0184_mark(self, id_): - if id_ in self.xep0184_marks: + def show_receipt_icon(self, id_): + line = self._get_message_line(id_) + if line is None: return - - buffer_ = self.tv.get_buffer() - buffer_.begin_user_action() - - self.xep0184_marks[id_] = buffer_.create_mark( - None, buffer_.get_end_iter(), left_gravity=True) - - buffer_.end_user_action() - - def show_xep0184_ack(self, id_): - if id_ not in self.xep0184_marks: - return - - buffer_ = self.tv.get_buffer() - - if app.config.get('positive_184_ack'): - begin_iter = buffer_.get_iter_at_mark(self.xep0184_marks[id_]) - buffer_.insert_with_tags_by_name(begin_iter, ' ✓', - 'xep0184-received') - - del self.xep0184_marks[id_] + line.show_receipt_icon() def show_focus_out_line(self): if not self.allow_focus_out_line: @@ -892,10 +863,10 @@ class ConversationTextview(GObject.GObject): self.just_cleared = False def get_end_mark(self, message_id, start_mark): - for index, msg in enumerate(self.message_list): - if msg[2] == message_id and msg[1] == start_mark: + for index, line in enumerate(self._message_list): + if line.id == message_id and line.start_mark == start_mark: try: - end_mark = self.message_list[index + 1][1] + end_mark = self._message_list[index + 1].start_mark end_mark_name = end_mark.get_name() except IndexError: # We are at the last message @@ -914,7 +885,7 @@ class ConversationTextview(GObject.GObject): # message_list = [(timestamp, line_start_mark, message_id)] # We check if this is a new Message try: - if self.message_list[-1][0] <= timestamp: + if self._message_list[-1].timestamp <= timestamp: return None, None except IndexError: # We have no Messages in the TextView @@ -922,13 +893,18 @@ class ConversationTextview(GObject.GObject): # Not a new Message # Search for insertion point - for index, msg in enumerate(self.message_list): - if msg[0] > timestamp: - return msg[1], index + for index, line in enumerate(self._message_list): + if line.timestamp > timestamp: + return line.start_mark, index # Should not happen, but who knows return None, None + def _get_message_line(self, id_): + for message_line in reversed(self._message_list): + if message_line.id == id_: + return message_line + def print_conversation_line(self, text, kind, name, tim, other_tags_for_name=None, other_tags_for_time=None, other_tags_for_text=None, subject=None, old_kind=None, xhtml=None, graphics=True, @@ -1049,16 +1025,8 @@ class ConversationTextview(GObject.GObject): iter_ = self.print_real_text(text, text_tags, name, xhtml, graphics=graphics, mark=insert_mark, additional_data=additional_data) - if corrected: - # Show Correction Icon - buffer_.create_tag(tag_name=message_id) - buffer_.insert(iter_, ' ') - icon = load_icon('document-edit-symbolic', self.tv, pixbuf=True) - buffer_.insert_pixbuf( - iter_, icon) - tag_start_iter = iter_.copy() - tag_start_iter.backward_chars(2) - buffer_.apply_tag_by_name(message_id, tag_start_iter, iter_) + message_icons = MessageIcons() + self._insert_message_icons(iter_, message_icons) # If we inserted a Line we add a new line at the end if insert_mark: @@ -1070,15 +1038,21 @@ class ConversationTextview(GObject.GObject): new_mark = buffer_.create_mark( str(self.line), temp_iter, left_gravity=False) + message_line = MessageLine(message_id, tim, message_icons, new_mark) + + if corrected: + message_line.show_correction_icon( + self.corrected_text_list[message_id]) + if index is None: # New Message - self.message_list.append((tim, new_mark, message_id)) + self._message_list.append(message_line) elif corrected: # Replace the corrected message - self.message_list[index] = (tim, new_mark, message_id) + self._message_list[index] = message_line else: # We insert the message at index - self.message_list.insert(index, (tim, new_mark, message_id)) + self._message_list.insert(index, message_line) if kind == 'incoming': self.last_received_message_id[name] = (message_id, new_mark) @@ -1095,9 +1069,6 @@ class ConversationTextview(GObject.GObject): self.line += 1 - if kind == 'outgoing' and message_id is not None: - self.add_xep0184_mark(message_id) - def get_time_to_show(self, tim, direction_mark=''): """ Get the time, with the day before if needed and return it. It DOESN'T @@ -1135,6 +1106,18 @@ class ConversationTextview(GObject.GObject): if text.startswith('/me ') or text.startswith('/me\n'): return kind + def _insert_message_icons(self, iter_, message_icons): + temp_mark = self._buffer.create_mark(None, iter_, True) + self._buffer.insert(iter_, ' ') + anchor = self._buffer.create_child_anchor(iter_) + anchor.plaintext = '' + self._buffer.insert(iter_, ' ') + + # Apply mark to vertically center the icon + start = self._buffer.get_iter_at_mark(temp_mark) + self._buffer.apply_tag_by_name('textview-icon', start, iter_) + self.tv.add_child_at_anchor(message_icons, anchor) + def print_encryption_status(self, iter_, additional_data): details = self._get_encryption_details(additional_data) if details is None: @@ -1312,3 +1295,50 @@ class ConversationTextview(GObject.GObject): # detect urls formatting and if the user has it on emoticons return self.detect_and_print_special_text(text, text_tags, graphics=graphics, iter_=iter_, additional_data=additional_data) + + +class MessageLine: + def __init__(self, id_, timestamp, message_icons, start_mark): + self.id = id_ + self.timestamp = timestamp + self.start_mark = start_mark + self._message_icons = message_icons + + def show_receipt_icon(self): + self._message_icons.set_receipt_icon_visible(True) + + def show_correction_icon(self, tooltip): + self._message_icons.set_correction_icon_visible(True) + self._message_icons.set_correction_tooltip(tooltip) + + +class MessageIcons(Gtk.Box): + def __init__(self): + Gtk.Box.__init__(self, + orientation=Gtk.Orientation.HORIZONTAL) + + self._correction_image = Gtk.Image.new_from_icon_name( + 'document-edit-symbolic', Gtk.IconSize.MENU) + self._correction_image.set_no_show_all(True) + + self._receipt_image = Gtk.Image.new_from_icon_name( + 'emblem-ok-symbolic', Gtk.IconSize.MENU) + self._receipt_image.get_style_context().add_class( + 'receipt-received-color') + self._receipt_image.set_tooltip_text(_('Received')) + self._receipt_image.set_no_show_all(True) + + self.add(self._correction_image) + self.add(self._receipt_image) + self.show_all() + + def set_receipt_icon_visible(self, visible): + if not app.config.get('positive_184_ack'): + return + self._receipt_image.set_visible(visible) + + def set_correction_icon_visible(self, visible): + self._correction_image.set_visible(visible) + + def set_correction_tooltip(self, text): + self._correction_image.set_tooltip_markup(text) ===================================== gajim/data/style/gajim.css ===================================== @@ -246,6 +246,9 @@ button.flat.link { padding: 0; border: 0; } .encrypted-color { color: rgb(75, 181, 67) } .unencrypted-color { color: @error_color } +/*Receipts*/ +.receipt-received-color { color: rgb(75, 181, 67) } + /*Dataforms*/ .field-fixed { font-size: 16px; font-weight: bold; padding-top:5px;} .data-form-title { font-size: 16px; font-weight: bold; } View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/06700c9628240eb7afe5bb45175967d268… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/06700c9628240eb7afe5bb45175967d268… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] AccountCreation: Register plugin modules after successful registration
by Philipp Hörist 18 Oct '19

18 Oct '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 0d7316be by Philipp Hörist at 2019-10-18T21:34:09Z AccountCreation: Register plugin modules after successful registration Fixes #9856 - - - - - 1 changed file: - gajim/gtk/account_wizard.py Changes: ===================================== gajim/gtk/account_wizard.py ===================================== @@ -293,7 +293,6 @@ class AccountCreationWizard: 100, self.update_progressbar) # Get form from serveur con = connection.Connection(self.account) - app.plugin_manager.register_modules_for_account(con) app.connections[self.account] = con con.new_account(self.account, config) elif cur_page == 3: @@ -458,6 +457,10 @@ class AccountCreationWizard: self.create_vars(obj.account_info) self.show_finish_page() + # Register plugin modules after successful registration + # Some plugins need the registered JID to function properly + app.plugin_manager.register_modules_for_account(obj.conn) + if self.update_progressbar_timeout_id is not None: GLib.source_remove(self.update_progressbar_timeout_id) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/0d7316be2dfb447240af96df1f20df9e2c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/0d7316be2dfb447240af96df1f20df9e2c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] MAM: Correctly detect if we sent a message
by Philipp Hörist 18 Oct '19

18 Oct '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 0acfc4c8 by Philipp Hörist at 2019-10-18T21:01:28Z MAM: Correctly detect if we sent a message properties.jid always yields the remote JID now after nbxmpp changes - - - - - 1 changed file: - gajim/common/modules/mam.py Changes: ===================================== gajim/common/modules/mam.py ===================================== @@ -96,7 +96,7 @@ class MAM(BaseModule): if properties.is_muc_pm: return properties.mam.id, properties.id - if self._con.get_own_jid().bareMatch(properties.jid): + if self._con.get_own_jid().bareMatch(properties.from_): # message we sent return properties.mam.id, properties.id View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/0acfc4c8087c731296a49e3cd4c489ee09… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/0acfc4c8087c731296a49e3cd4c489ee09… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Remove unused import
by Philipp Hörist 17 Oct '19

17 Oct '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 44630205 by Philipp Hörist at 2019-10-16T19:03:07Z Remove unused import - - - - - a4945d26 by Philipp Hörist at 2019-10-17T19:10:25Z Refactor message handlers - Remove 'decrypt' extension point, its not needed anymore - Remove decryption finished methods - Remove MessageReceived Events, DecryptedMessageReceived servs the same purpose now Plugins decrypt messages before we execute this handler - - - - - 5 changed files: - gajim/common/modules/mam.py - gajim/common/modules/message.py - gajim/common/zeroconf/connection_handlers_zeroconf.py - gajim/gajim.py - test/broken/unit/test_sessions.py Changes: ===================================== gajim/common/modules/mam.py ===================================== @@ -197,6 +197,37 @@ class MAM(BaseModule): parse_oob(properties, additional_data) + msgtxt = properties.body + + if properties.is_encrypted: + additional_data['encrypted'] = properties.encrypted.additional_data + else: + if properties.eme is not None: + msgtxt = get_eme_message(properties.eme) + + if not msgtxt: + # For example Chatstates, Receipts, Chatmarkers + self._log.debug(stanza.getProperties()) + return + + with_ = properties.jid.getStripped() + if properties.is_muc_pm: + # we store the message with the full JID + with_ = str(with_) + + if properties.is_self_message: + # Self messages can only be deduped with origin-id + if message_id is None: + self._log.warning('Self message without origin-id found') + return + stanza_id = message_id + + if properties.mam.namespace == nbxmpp.NS_MAM_1: + if app.logger.search_for_duplicate( + self._account, with_, properties.mam.timestamp, msgtxt): + self._log.info('Found duplicate with fallback for mam:1') + return + event_attrs.update( {'conn': self._con, 'account': self._account, @@ -217,23 +248,19 @@ class MAM(BaseModule): 'namespace': properties.mam.namespace, }) - if groupchat: - event = MamGcMessageReceivedEvent(None, **event_attrs) - else: - event = MamMessageReceivedEvent(None, **event_attrs) - - if properties.is_encrypted: - event.additional_data['encrypted'] = properties.encrypted.additional_data - self._decryption_finished(event) - else: - app.plugin_manager.extension_point( - 'decrypt', self._con, event, self._decryption_finished) - if not event.encrypted: - if properties.eme is not None: - event.msgtxt = get_eme_message(properties.eme) - self._decryption_finished(event) + app.logger.insert_into_logs(self._account, + with_, + properties.mam.timestamp, + event_attrs['kind'], + unread=False, + message=msgtxt, + contact_name=event_attrs['nick'], + additional_data=additional_data, + stanza_id=stanza_id, + message_id=properties.id) - raise nbxmpp.NodeProcessed + app.nec.push_incoming_event( + NetworkEvent('mam-decrypted-message-received', **event_attrs)) @staticmethod def _parse_gc_attrs(properties): @@ -255,45 +282,6 @@ class MAM(BaseModule): 'nick': None, 'kind': kind} - def _decryption_finished(self, event): - if not event.msgtxt: - # For example Chatstates, Receipts, Chatmarkers - self._log.debug(event.message.getProperties()) - return - - with_ = event.with_.getStripped() - if event.muc_pm: - # we store the message with the full JID - with_ = str(event.with_) - - stanza_id = event.stanza_id - if event.self_message: - # Self messages can only be deduped with origin-id - if event.origin_id is None: - self._log.warning('Self message without origin-id found') - return - stanza_id = event.origin_id - - if event.namespace == nbxmpp.NS_MAM_1: - if app.logger.search_for_duplicate( - self._account, with_, event.timestamp, event.msgtxt): - self._log.info('Found duplicate with fallback for mam:1') - return - - app.logger.insert_into_logs(self._account, - with_, - event.timestamp, - event.kind, - unread=False, - message=event.msgtxt, - contact_name=event.nick, - additional_data=event.additional_data, - stanza_id=stanza_id, - message_id=event.message_id) - - app.nec.push_incoming_event( - MamDecryptedMessageReceived(None, **vars(event))) - def _is_valid_request(self, properties): valid_id = self._mam_query_ids.get(str(properties.mam.archive), None) return valid_id == properties.mam.query_id @@ -634,18 +622,6 @@ class MAM(BaseModule): MAMPreferenceSaved(None, conn=self._con)) -class MamMessageReceivedEvent(NetworkIncomingEvent): - name = 'mam-message-received' - - -class MamGcMessageReceivedEvent(NetworkIncomingEvent): - name = 'mam-gc-message-received' - - -class MamDecryptedMessageReceived(NetworkIncomingEvent): - name = 'mam-decrypted-message-received' - - class MAMPreferenceError(NetworkIncomingEvent): name = 'mam-prefs-error' ===================================== gajim/common/modules/message.py ===================================== @@ -22,7 +22,6 @@ from nbxmpp.const import MessageType from gajim.common import app from gajim.common.i18n import _ -from gajim.common.nec import NetworkIncomingEvent from gajim.common.nec import NetworkEvent from gajim.common.helpers import AdditionalDataDict from gajim.common.const import KindConstant @@ -146,6 +145,41 @@ class Message(BaseModule): 'gajim', 'user_timestamp', properties.user_timestamp) parse_oob(properties, additional_data) + xhtml = parse_xhtml(properties) + + app.nec.push_incoming_event(NetworkEvent('update-client-info', + account=self._account, + jid=jid, + resource=resource)) + + if properties.is_encrypted: + additional_data['encrypted'] = properties.encrypted.additional_data + else: + if properties.eme is not None: + msgtxt = get_eme_message(properties.eme) + + if type_.is_error: + if not msgtxt: + msgtxt = _('message') + if gc_control: + gc_control.add_info_message(msgtxt) + else: + error_msg = stanza.getErrorMsg() or msgtxt + msgtxt = None if error_msg == msgtxt else msgtxt + self._log_error_message(error_msg, + jid, + properties.timestamp) + app.nec.push_incoming_event( + MessageErrorEvent(None, + conn=self._con, + fjid=fjid, + error_code=stanza.getErrorCode(), + error_msg=error_msg, + msg=msgtxt, + time_=properties.timestamp, + session=session, + stanza=stanza)) + return event_attr = { 'conn': self._con, @@ -173,90 +207,40 @@ class Message(BaseModule): 'muc_pm': properties.is_muc_pm, 'gc_control': gc_control, 'attention': properties.attention, - 'xhtml': parse_xhtml(properties), + 'xhtml': xhtml, 'user_nick': properties.nickname, 'subject': properties.subject, - } - - app.nec.push_incoming_event(NetworkEvent('update-client-info', - account=self._account, - jid=jid, - resource=resource)) - - event = MessageReceivedEvent(None, **event_attr) - app.nec.push_incoming_event(event) - - if properties.is_encrypted: - event.additional_data['encrypted'] = properties.encrypted.additional_data - self._on_message_decrypted(event) - else: - app.plugin_manager.extension_point( - 'decrypt', self._con, event, self._on_message_decrypted) - if not event.encrypted: - if properties.eme is not None: - event.msgtxt = get_eme_message(properties.eme) - self._on_message_decrypted(event) - - def _on_message_decrypted(self, event): - groupchat = event.mtype == 'groupchat' - - event_attr = { 'popup': False, 'msg_log_id': None, - 'displaymarking': parse_securitylabel(event.stanza), + 'displaymarking': parse_securitylabel(stanza), } - for name, value in event_attr.items(): - setattr(event, name, value) - - if event.mtype == 'error': - if not event.msgtxt: - event.msgtxt = _('message') - if event.gc_control: - event.gc_control.add_info_message(event.msgtxt) - else: - self._log_error_message(event) - error_msg = event.stanza.getErrorMsg() or event.msgtxt - msgtxt = None if error_msg == event.msgtxt else event.msgtxt - app.nec.push_incoming_event( - MessageErrorEvent(None, - conn=self._con, - fjid=event.fjid, - error_code=event.stanza.getErrorCode(), - error_msg=error_msg, - msg=msgtxt, - time_=event.timestamp, - session=event.session, - stanza=event.stanza)) - return - - if groupchat: - if not event.msgtxt: + if type_.is_groupchat: + if not msgtxt: return - event.room_jid = event.jid - event.nickname = event.resource - event.xhtml_msgtxt = event.xhtml - event.nick = event.resource or '' - app.nec.push_incoming_event(NetworkEvent('gc-message-received', - **vars(event))) + event_attr.update({ + 'room_jid': jid, + 'nickname': resource, + 'xhtml_msgtxt': xhtml, + 'nick': resource or '', + }) + event = NetworkEvent('gc-message-received', **event_attr) + app.nec.push_incoming_event(event) # TODO: Some plugins modify msgtxt in the GUI event self._log_muc_message(event) return app.nec.push_incoming_event( - DecryptedMessageReceivedEvent( - None, **vars(event))) + NetworkEvent('decrypted-message-received', **event_attr)) - def _log_error_message(self, event): - error_msg = event.stanza.getErrorMsg() or event.msgtxt - if app.config.should_log(self._account, event.jid): + def _log_error_message(self, error_msg, jid, timestamp): + if app.config.should_log(self._account, jid): app.logger.insert_into_logs(self._account, - event.jid, - event.timestamp, + jid, + timestamp, KindConstant.ERROR, - message=error_msg, - subject=event.subject) + message=error_msg) def _log_muc_message(self, event): if event.mtype == 'error': @@ -311,13 +295,5 @@ class Message(BaseModule): return None, None -class MessageReceivedEvent(NetworkIncomingEvent): - name = 'message-received' - - -class DecryptedMessageReceivedEvent(NetworkIncomingEvent): - name = 'decrypted-message-received' - - def get_instance(*args, **kwargs): return Message(*args, **kwargs), 'Message' ===================================== gajim/common/zeroconf/connection_handlers_zeroconf.py ===================================== @@ -27,7 +27,7 @@ from gajim.common import app from gajim.common import connection_handlers from gajim.common.i18n import _ from gajim.common.helpers import AdditionalDataDict -from gajim.common.nec import NetworkIncomingEvent, NetworkEvent +from gajim.common.nec import NetworkEvent from gajim.common.const import KindConstant from gajim.common.modules.util import get_eme_message from gajim.common.modules.misc import parse_correction @@ -42,15 +42,6 @@ STATUS_LIST = ['offline', 'connecting', 'online', 'chat', 'away', 'xa', 'dnd', 'invisible'] -class ZeroconfMessageReceivedEvent(NetworkIncomingEvent): - name = 'message-received' - - -class DecryptedMessageReceivedEvent(NetworkIncomingEvent): - name = 'decrypted-message-received' - - - class ConnectionHandlersZeroconf(connection_handlers.ConnectionHandlersBase): def __init__(self): connection_handlers.ConnectionHandlersBase.__init__(self) @@ -88,11 +79,37 @@ class ConnectionHandlersZeroconf(connection_handlers.ConnectionHandlersBase): if thread_id and not session.received_thread_id: session.received_thread_id = True - session.last_receive = time.time() + timestamp = time.time() + session.last_receive = timestamp additional_data = AdditionalDataDict() parse_oob(properties, additional_data) + if properties.is_encrypted: + additional_data['encrypted'] = properties.encrypted.additional_data + else: + if properties.eme is not None: + msgtxt = get_eme_message(properties.eme) + + if type_ == 'error': + if not msgtxt: + msgtxt = _('message') + self._log_error_message(stanza, msgtxt, jid, timestamp) + error_msg = stanza.getErrorMsg() or msgtxt + msgtxt = None if error_msg == msgtxt else msgtxt + app.nec.push_incoming_event( + MessageErrorEvent(None, + conn=self, + fjid=fjid, + error_code=stanza.getErrorCode(), + error_msg=error_msg, + msg=msgtxt, + time_=timestamp, + session=session, + stanza=stanza)) + + return + event_attr = { 'conn': self, 'stanza': stanza, @@ -120,57 +137,20 @@ class ConnectionHandlersZeroconf(connection_handlers.ConnectionHandlersBase): 'xhtml': parse_xhtml(properties), 'user_nick': properties.nickname, 'subject': None, - } - - event = ZeroconfMessageReceivedEvent(None, **event_attr) - app.nec.push_incoming_event(event) - - app.plugin_manager.extension_point( - 'decrypt', self, event, self._on_message_decrypted) - if not event.encrypted: - if properties.eme is not None: - event.msgtxt = get_eme_message(properties.eme) - self._on_message_decrypted(event) - - def _on_message_decrypted(self, event): - event_attr = { 'popup': False, 'msg_log_id': None, 'displaymarking': None, - 'stanza_id': event.unique_id + 'stanza_id': id_, } - for name, value in event_attr.items(): - setattr(event, name, value) - - if event.mtype == 'error': - if not event.msgtxt: - event.msgtxt = _('message') - self._log_error_message(event) - error_msg = event.stanza.getErrorMsg() or event.msgtxt - msgtxt = None if error_msg == event.msgtxt else event.msgtxt - app.nec.push_incoming_event( - MessageErrorEvent(None, - conn=self, - fjid=event.fjid, - error_code=event.stanza.getErrorCode(), - error_msg=error_msg, - msg=msgtxt, - time_=event.timestamp, - session=event.session, - stanza=event.stanza)) - - return - app.nec.push_incoming_event( - DecryptedMessageReceivedEvent(None, **vars(event))) + NetworkEvent('decrypted-message-received', **event_attr)) - def _log_error_message(self, event): - error_msg = event.stanza.getErrorMsg() or event.msgtxt - if app.config.should_log(self.name, event.jid): + def _log_error_message(self, stanza, msgtxt, jid, timestamp): + error_msg = stanza.getErrorMsg() or msgtxt + if app.config.should_log(self.name, jid): app.logger.insert_into_logs(self.name, - event.jid, - event.timestamp, + jid, + timestamp, KindConstant.ERROR, - message=error_msg, - subject=event.subject) + message=error_msg) ===================================== gajim/gajim.py ===================================== @@ -95,7 +95,6 @@ def _disable_csd(): def _init_gtk(): - from gi.repository import Gtk from gajim.gtk import exception exception.init() ===================================== test/broken/unit/test_sessions.py ===================================== @@ -10,8 +10,6 @@ from gajim.common import app from gajim.common import nec from gajim.common import ged from gajim.common.nec import NetworkEvent -from gajim.common.modules.message import MessageReceivedEvent -from gajim.common.modules.message import DecryptedMessageReceivedEvent from gajim.session import ChatControlSession from gajim.roster_window import RosterWindow View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/b2330c57cdd30ce2f1fad00242e033d2b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/b2330c57cdd30ce2f1fad00242e033d2b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 5 commits: Check for required pygobject version
by Philipp Hörist 16 Oct '19

16 Oct '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 7599a37d by Philipp Hörist at 2019-10-16T17:07:02Z Check for required pygobject version - - - - - 8c6e8ea9 by Philipp Hörist at 2019-10-16T17:26:57Z Refactor dependency checks - - - - - c54c1097 by Philipp Hörist at 2019-10-16T17:29:28Z Use single quotes - - - - - 39df77a6 by Philipp Hörist at 2019-10-16T17:30:37Z Use sys.platform instead of os.name - - - - - b2330c57 by Philipp Hörist at 2019-10-16T17:31:29Z Remove tooltip bug workaround for Gtk 3.24.1 Newer Gtk versions are available for Windows and Mac - - - - - 1 changed file: - gajim/gajim.py Changes: ===================================== gajim/gajim.py ===================================== @@ -26,38 +26,56 @@ from distutils.version import LooseVersion as V from gajim.common import i18n -_MIN_NBXMPP_VER = "0.9.92" -_MIN_GTK_VER = "3.22.0" -_MIN_CAIRO_VER = "1.14.0" +_MIN_NBXMPP_VER = '0.9.92' +_MIN_GTK_VER = '3.22.0' +_MIN_CAIRO_VER = '1.14.0' +_MIN_PYGOBJECT_VER = '3.32.0' + + +def check_version(dep_name, current_ver, min_ver): + if V(current_ver) < V(min_ver): + sys.exit('Gajim needs %s >= %s to run. ' + 'Quitting...' % (dep_name, min_ver)) def _check_required_deps(): + error_message = 'Gajim needs %s to run. Quitting…' + try: import nbxmpp except ImportError: - print('Gajim needs python-nbxmpp to run. Quitting…') - sys.exit(1) + sys.exit(error_message % 'python-nbxmpp') + + try: + import gi + except ImportError: + sys.exit(error_message % 'pygobject') - if V(nbxmpp.__version__) < V(_MIN_NBXMPP_VER): - print('Gajim needs python-nbxmpp >= %s to run. ' - 'Quitting...' % _MIN_NBXMPP_VER) - sys.exit(1) + try: + gi.require_versions({'GLib': '2.0', + 'Gio': '2.0', + 'Gtk': '3.0', + 'GObject': '2.0', + 'Pango': '1.0', + 'Soup': '2.4'}) + except ValueError as error: + sys.exit('Missing dependency: %s' % error) try: import cairo except ImportError: - print('Gajim needs python-cairo to run. Quitting…') - sys.exit(1) + sys.exit(error_message % 'python-cairo') - if V(cairo.cairo_version_string()) < V(_MIN_CAIRO_VER): - print('Gajim needs libcairo >= %s to run. ' - 'Quitting...' % _MIN_CAIRO_VER) - sys.exit(1) + from gi.repository import Gtk + gtk_ver = '%s.%s.%s' % (Gtk.get_major_version(), + Gtk.get_minor_version(), + Gtk.get_micro_version()) - if V(cairo.version) < V(_MIN_CAIRO_VER): - print('Gajim needs python-cairo >= %s to run. ' - 'Quitting...' % _MIN_CAIRO_VER) - sys.exit(1) + check_version('python-nbxmpp', nbxmpp.__version__, _MIN_NBXMPP_VER) + check_version('pygobject', gi.__version__, _MIN_PYGOBJECT_VER) + check_version('libcairo', cairo.cairo_version_string(), _MIN_CAIRO_VER) + check_version('python-cairo', cairo.version, _MIN_CAIRO_VER) + check_version('gtk3', gtk_ver, _MIN_GTK_VER) def _init_gui(gui): @@ -66,38 +84,18 @@ def _init_gui(gui): def _disable_csd(): - if os.name != 'nt': + if sys.platform != 'win32': return if 'GTK_OSD' in os.environ: # Respect user settings return - os.environ['GTK_CSD'] = "0" + os.environ['GTK_CSD'] = '0' def _init_gtk(): - import gi - try: - gi.require_version('GLib', '2.0') - gi.require_version('Gio', '2.0') - gi.require_version('Gtk', '3.0') - gi.require_version('Gdk', '3.0') - gi.require_version('GObject', '2.0') - gi.require_version('Pango', '1.0') - gi.require_version('Soup', '2.4') - except ValueError as error: - sys.exit('Missing dependency: %s' % error) - from gi.repository import Gtk - gtk_ver = '%s.%s.%s' % (Gtk.get_major_version(), - Gtk.get_minor_version(), - Gtk.get_micro_version()) - if V(gtk_ver) < V(_MIN_GTK_VER): - print('Gajim needs GTK >= %s to run. ' - 'Quitting...' % _MIN_GTK_VER) - sys.exit(1) - from gajim.gtk import exception exception.init() @@ -105,11 +103,6 @@ def _init_gtk(): from gajim.application import GajimApplication - # Fix bug in 3.24.1 with flickering tooltips - if sys.platform in ('darwin', 'win32'): - settings = Gtk.Settings.get_default() - settings.set_property('gtk-cursor-theme-size', 16) - application = GajimApplication() _install_sginal_handlers(application) application.run(sys.argv) @@ -140,14 +133,14 @@ def _install_sginal_handlers(application): # ^C exits the application normally signal.signal(signal.SIGINT, sigint_cb) signal.signal(signal.SIGTERM, sigint_cb) - if os.name != 'nt': + if sys.platform != 'win32': signal.signal(signal.SIGPIPE, signal.SIG_DFL) def main(): if sys.platform != 'win32': if os.geteuid() == 0: - sys.exit("You must not launch gajim as root, it is insecure.") + sys.exit('You must not launch gajim as root, it is insecure.') _check_required_deps() _set_proc_title() View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/7b9278ae996ff3d185f5b174f20f27337… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/7b9278ae996ff3d185f5b174f20f27337… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Use monotonic time for timeouts
by Philipp Hörist 16 Oct '19

16 Oct '19

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 8fb372a5 by Philipp Hörist at 2019-10-16T17:42:10Z Use monotonic time for timeouts Fixes #87 - - - - - 1 changed file: - nbxmpp/idlequeue.py Changes: ===================================== nbxmpp/idlequeue.py ===================================== @@ -22,6 +22,7 @@ import os import errno import select import logging +import time log = logging.getLogger('nbxmpp.idlequeue') # needed for get_idleqeue @@ -174,8 +175,7 @@ class IdleCommand(IdleObject): self.pipe = Popen(self._compose_command_args(), stdout=PIPE, bufsize=1024, shell=True, stderr=STDOUT, stdin=PIPE) if self.commandtimeout >= 0: - self.endtime = self.idlequeue.current_time() + \ - (self.commandtimeout * 1e6) + self.endtime = self.idlequeue.current_time() + self.commandtimeout self.idlequeue.set_alarm(self.wait_child, 0.1) def _start_posix(self): @@ -253,7 +253,7 @@ class IdleQueue: """ Set up a new alarm. alarm_cb will be called after specified seconds. """ - alarm_time = self.current_time() + (seconds * 1e6) + alarm_time = self.current_time() + seconds # almost impossible, but in case we have another alarm_cb at this time if alarm_time in self.alarms: self.alarms[alarm_time].append(alarm_cb) @@ -306,7 +306,7 @@ class IdleQueue: if func: log_txt += ' with function ' + str(func) log.info(log_txt) - timeout = self.current_time() + (seconds * 1e6) + timeout = self.current_time() + seconds if fd in self.read_timeouts: self.read_timeouts[fd][timeout] = func else: @@ -385,8 +385,7 @@ class IdleQueue: self._remove_idle(fd) def current_time(self): - from time import time - return time() * 1e6 + return time.monotonic() def _remove_idle(self, fd): """ @@ -571,5 +570,3 @@ class GlibIdleQueue(IdleQueue): def process(self): self._check_time_events() - - current_time = GLib.get_real_time View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/8fb372a55962a47e4ddf8bb35a… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/8fb372a55962a47e4ddf8bb35a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Don't import version from package
by Philipp Hörist 16 Oct '19

16 Oct '19

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: bf53ae00 by Philipp Hörist at 2019-10-16T11:14:46Z Don't import version from package __init__.py has too many other imports, this leads to all dependencys beeing imported in the install process before they are downloaded - - - - - 1 changed file: - setup.cfg Changes: ===================================== setup.cfg ===================================== @@ -1,6 +1,6 @@ [metadata] name = nbxmpp -version = attr: nbxmpp.__version__ +version = 0.9.92 description = Non blocking Jabber/XMPP module author = Yann Leboulanger, Philipp Hoerist author_email = gajim-devel(a)gajim.org View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/bf53ae006052d0a3265a1969d9… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/bf53ae006052d0a3265a1969d9… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 4 commits: Refactor parsing xhtml
by Philipp Hörist 14 Oct '19

14 Oct '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 3ffa37f2 by Philipp Hörist at 2019-10-14T15:31:43Z Refactor parsing xhtml Adapt to nbxmpp changes - - - - - 61873094 by Philipp Hörist at 2019-10-14T15:57:22Z Refactor parsing nickname - - - - - 1af5612d by Philipp Hörist at 2019-10-14T20:09:43Z Refactor parsing subject - - - - - 7b9278ae by Philipp Hörist at 2019-10-14T20:34:50Z Chatstate: Use StanzaHandler instead of delegate() - - - - - 5 changed files: - gajim/common/modules/chatstates.py - gajim/common/modules/message.py - gajim/common/modules/misc.py - gajim/common/modules/user_nickname.py - gajim/common/zeroconf/connection_handlers_zeroconf.py Changes: ===================================== gajim/common/modules/chatstates.py ===================================== @@ -51,17 +51,6 @@ def ensure_enabled(func): return func_wrapper -def parse_chatstate(stanza: nbxmpp.Message) -> Optional[str]: - if stanza.getTag('delay', namespace=nbxmpp.NS_DELAY2) is not None: - return None - - children = stanza.getChildren() - for child in children: - if child.getNamespace() == nbxmpp.NS_CHATSTATES: - return child.getName() - return None - - class Chatstate(BaseModule): def __init__(self, con: ConnectionT) -> None: BaseModule.__init__(self, con) @@ -69,6 +58,10 @@ class Chatstate(BaseModule): self.handlers = [ StanzaHandler(name='presence', callback=self._presence_received), + StanzaHandler(name='message', + callback=self._process_chatstate, + ns=nbxmpp.NS_CHATSTATES, + priority=46), ] # Our current chatstate with a specific contact @@ -144,35 +137,39 @@ class Chatstate(BaseModule): account=self._account, contact=contact)) - def delegate(self, event: Any) -> None: - if self._con.get_own_jid().bareMatch(event.jid) or event.sent: - # Dont show chatstates from our own resources + def _process_chatstate(self, _con, _stanza, properties): + if not properties.has_chatstate: return - if event.mtype == 'groupchat': - # Not implemented yet + if (properties.is_self_message or + properties.type.is_groupchat or + properties.is_carbon_message and properties.carbon.is_sent): + if properties.chatstate in ('inactive', 'gone', + 'composing', 'paused'): + raise nbxmpp.NodeProcessed return - chatstate = parse_chatstate(event.stanza) - if chatstate is None: - return - - if event.muc_pm: + if properties.is_muc_pm: contact = app.contacts.get_gc_contact( - self._account, event.jid, event.resource) + self._account, + properties.jid.getBare(), + properties.jid.getResource()) else: contact = app.contacts.get_contact_from_full_jid( - self._account, event.fjid) + self._account, str(properties.jid)) if contact is None: return - contact.chatstate = chatstate - self._log.info('Recv: %-10s - %s', chatstate, event.fjid) + contact.chatstate = properties.chatstate + self._log.info('Recv: %-10s - %s', properties.chatstate, properties.jid) app.nec.push_outgoing_event( NetworkEvent('chatstate-received', account=self._account, contact=contact)) + if properties.chatstate in ('inactive', 'gone', 'composing', 'paused'): + raise nbxmpp.NodeProcessed + @ensure_enabled def _check_last_interaction(self) -> GLib.SOURCE_CONTINUE: now = time.time() ===================================== gajim/common/modules/message.py ===================================== @@ -29,7 +29,6 @@ from gajim.common.const import KindConstant from gajim.common.modules.base import BaseModule from gajim.common.modules.util import get_eme_message from gajim.common.modules.security_labels import parse_securitylabel -from gajim.common.modules.user_nickname import parse_nickname from gajim.common.modules.misc import parse_correction from gajim.common.modules.misc import parse_oob from gajim.common.modules.misc import parse_xhtml @@ -174,6 +173,9 @@ class Message(BaseModule): 'muc_pm': properties.is_muc_pm, 'gc_control': gc_control, 'attention': properties.attention, + 'xhtml': parse_xhtml(properties), + 'user_nick': properties.nickname, + 'subject': properties.subject, } app.nec.push_incoming_event(NetworkEvent('update-client-info', @@ -196,21 +198,12 @@ class Message(BaseModule): self._on_message_decrypted(event) def _on_message_decrypted(self, event): - try: - self._con.get_module('Chatstate').delegate(event) - except nbxmpp.NodeProcessed: - return - - subject = event.stanza.getSubject() groupchat = event.mtype == 'groupchat' event_attr = { 'popup': False, 'msg_log_id': None, - 'subject': subject, 'displaymarking': parse_securitylabel(event.stanza), - 'user_nick': '' if event.sent else parse_nickname(event.stanza), - 'xhtml': parse_xhtml(event.stanza), } for name, value in event_attr.items(): ===================================== gajim/common/modules/misc.py ===================================== @@ -43,7 +43,7 @@ def parse_correction(properties): # XEP-0071: XHTML-IM -def parse_xhtml(stanza): +def parse_xhtml(properties): if app.config.get('ignore_incoming_xhtml'): return None - return stanza.getXHTML() + return properties.xhtml ===================================== gajim/common/modules/user_nickname.py ===================================== @@ -57,12 +57,5 @@ class UserNickname(BaseModule): nickname=nick)) -def parse_nickname(stanza: nbxmpp.Node) -> str: - nick = stanza.getTag('nick', namespace=nbxmpp.NS_NICK) - if nick is None: - return '' - return nick.getData() - - def get_instance(*args: Any, **kwargs: Any) -> Tuple[UserNickname, str]: return UserNickname(*args, **kwargs), 'UserNickname' ===================================== gajim/common/zeroconf/connection_handlers_zeroconf.py ===================================== @@ -22,8 +22,6 @@ import time import logging -import nbxmpp - from gajim.common import app from gajim.common import connection_handlers @@ -31,7 +29,6 @@ from gajim.common.i18n import _ from gajim.common.helpers import AdditionalDataDict from gajim.common.nec import NetworkIncomingEvent, NetworkEvent from gajim.common.const import KindConstant -from gajim.common.modules.user_nickname import parse_nickname from gajim.common.modules.util import get_eme_message from gajim.common.modules.misc import parse_correction from gajim.common.modules.misc import parse_oob @@ -120,6 +117,9 @@ class ConnectionHandlersZeroconf(connection_handlers.ConnectionHandlersBase): 'muc_pm': False, 'gc_control': None, 'attention': properties.attention, + 'xhtml': parse_xhtml(properties), + 'user_nick': properties.nickname, + 'subject': None, } event = ZeroconfMessageReceivedEvent(None, **event_attr) @@ -133,18 +133,10 @@ class ConnectionHandlersZeroconf(connection_handlers.ConnectionHandlersBase): self._on_message_decrypted(event) def _on_message_decrypted(self, event): - try: - self.get_module('Chatstate').delegate(event) - except nbxmpp.NodeProcessed: - return - event_attr = { 'popup': False, 'msg_log_id': None, - 'subject': None, 'displaymarking': None, - 'user_nick': parse_nickname(event.stanza), - 'xhtml': parse_xhtml(event.stanza), 'stanza_id': event.unique_id } View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/9225b79dc8865b18294784d70be466dc9… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/9225b79dc8865b18294784d70be466dc9… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] 4 commits: Add xhtml message attribute
by Philipp Hörist 14 Oct '19

14 Oct '19

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 8cc2f1d3 by Philipp Hörist at 2019-10-14T15:06:06Z Add xhtml message attribute - - - - - bae3cfd1 by Philipp Hörist at 2019-10-14T16:20:19Z Add Security Labels (XEP-0258) support - - - - - 16305759 by Philipp Hörist at 2019-10-14T18:53:27Z Add Chat State Notifications (XEP-0085) support - - - - - 6705a89b by Philipp Hörist at 2019-10-14T18:53:31Z Attention: Don't parse legacy delay tags - - - - - 8 changed files: - nbxmpp/const.py - nbxmpp/dispatcher.py - nbxmpp/modules/attention.py - + nbxmpp/modules/chatstates.py - nbxmpp/modules/message.py - + nbxmpp/modules/security_labels.py - nbxmpp/protocol.py - nbxmpp/structs.py Changes: ===================================== nbxmpp/const.py ===================================== @@ -545,3 +545,12 @@ TUNE_DATA = [ 'title', 'track', 'uri'] + + +CHATSTATES = [ + 'active', + 'inactive', + 'gone', + 'composing', + 'paused' +] \ No newline at end of file ===================================== nbxmpp/dispatcher.py ===================================== @@ -76,6 +76,8 @@ from nbxmpp.modules.receipts import Receipts from nbxmpp.modules.oob import OOB from nbxmpp.modules.correction import Correction from nbxmpp.modules.attention import Attention +from nbxmpp.modules.security_labels import SecurityLabels +from nbxmpp.modules.chatstates import Chatstates from nbxmpp.modules.misc import unwrap_carbon from nbxmpp.modules.misc import unwrap_mam from nbxmpp.util import get_properties_struct @@ -219,6 +221,8 @@ class XMPPDispatcher(PlugIn): self._modules['OOB'] = OOB(self._owner) self._modules['Correction'] = Correction(self._owner) self._modules['Attention'] = Attention(self._owner) + self._modules['SecurityLabels'] = SecurityLabels(self._owner) + self._modules['Chatstates'] = Chatstates(self._owner) for instance in self._modules.values(): for handler in instance.handlers: ===================================== nbxmpp/modules/attention.py ===================================== @@ -45,7 +45,7 @@ class Attention: if properties.is_carbon_message and properties.carbon.is_sent: return - if stanza.getTag('x', namespace=NS_DELAY2) is not None: + if stanza.getTag('delay', namespace=NS_DELAY2) is not None: return properties.attention = True ===================================== nbxmpp/modules/chatstates.py ===================================== @@ -0,0 +1,62 @@ +# Copyright (C) 2018 Philipp Hörist <philipp AT hoerist.com> +# +# This file is part of nbxmpp. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 3 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; If not, see <http://www.gnu.org/licenses/>. + +import logging + +from nbxmpp.protocol import NS_CHATSTATES +from nbxmpp.protocol import NS_DELAY2 +from nbxmpp.structs import StanzaHandler +from nbxmpp.const import CHATSTATES + +log = logging.getLogger('nbxmpp.m.chatstates') + + +class Chatstates: + def __init__(self, client): + self._client = client + self.handlers = [ + StanzaHandler(name='message', + callback=self._process_message_chatstate, + ns=NS_CHATSTATES, + priority=15), + ] + + def _process_message_chatstate(self, _con, stanza, properties): + chatstate = parse_chatstate(stanza) + if chatstate is None: + return + + if properties.is_mam_message: + return + + if stanza.getTag('delay', namespace=NS_DELAY2) is not None: + return + + if chatstate not in CHATSTATES: + log.warning('Invalid chatstate: %s', chatstate) + log.warning(stanza) + return + + properties.chatstate = chatstate + + +def parse_chatstate(stanza): + children = stanza.getChildren() + for child in children: + if child.getNamespace() == NS_CHATSTATES: + return child.getName() + return None ===================================== nbxmpp/modules/message.py ===================================== @@ -79,6 +79,7 @@ class BaseMessage: forms = stanza.getTags('x', namespace=NS_DATA) if forms: properties.forms = forms + properties.xhtml = stanza.getXHTML() @staticmethod def _parse_type(stanza): ===================================== nbxmpp/modules/security_labels.py ===================================== @@ -0,0 +1,57 @@ +# Copyright (C) 2018 Philipp Hörist <philipp AT hoerist.com> +# +# This file is part of nbxmpp. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 3 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; If not, see <http://www.gnu.org/licenses/>. + +import logging + +from nbxmpp.protocol import NS_SECLABEL +from nbxmpp.structs import StanzaHandler +from nbxmpp.structs import SecurityLabel +from nbxmpp.structs import DisplayMarking + +log = logging.getLogger('nbxmpp.m.security_labels') + + +class SecurityLabels: + def __init__(self, client): + self._client = client + self.handlers = [ + StanzaHandler(name='message', + callback=self._process_message_security_label, + ns=NS_SECLABEL, + priority=15), + ] + + def _process_message_security_label(self, _con, stanza, properties): + security = stanza.getTag('securitylabel', namespace=NS_SECLABEL) + if security is None: + return + + displaymarking = security.getTag('displaymarking') + if displaymarking is None: + return + + label = displaymarking.getData() + if not label: + log.warning('No label found') + log.warning(stanza) + return + + fgcolor = displaymarking.getAttr('fgcolor') + bgcolor = displaymarking.getAttr('bgcolor') + + properties.security_label = SecurityLabel( + DisplayMarking(label, fgcolor, bgcolor)) ===================================== nbxmpp/protocol.py ===================================== @@ -1243,12 +1243,14 @@ class Message(Protocol): TODO: Returning a DOM could make rendering faster. """ - xhtml = self.getTag('html') + xhtml = self.getTag('html', namespace=NS_XHTML_IM) if xhtml: if xmllang: - body = xhtml.getTag('body', attrs={'xml:lang': xmllang}) + body = xhtml.getTag('body', + namespace=NS_XHTML, + attrs={'xml:lang': xmllang}) else: - body = xhtml.getTag('body') + body = xhtml.getTag('body', namespace=NS_XHTML) return str(body) return None ===================================== nbxmpp/structs.py ===================================== @@ -125,6 +125,9 @@ OOBData = namedtuple('OOBData', 'url desc') CorrectionData = namedtuple('CorrectionData', 'id') +DisplayMarking = namedtuple('DisplayMarking', 'label fgcolor bgcolor') +SecurityLabel = namedtuple('SecurityLabel', 'displaymarking') + class DiscoInfo(namedtuple('DiscoInfo', 'stanza identities features dataforms timestamp')): @@ -553,6 +556,9 @@ class MessageProperties: self.correction = None self.attention = False self.forms = None + self.xhtml = None + self.security_label = None + self.chatstate = None @property def has_user_delay(self): @@ -649,6 +655,18 @@ class MessageProperties: def has_forms(self): return self.forms is not None + @property + def has_xhtml(self): + return self.xhtml is not None + + @property + def has_security_label(self): + return self.security_label is not None + + @property + def has_chatstate(self): + return self.chatstate is not None + class IqProperties: def __init__(self): View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/22ddb4b89a8bdd94d96c7b4b0… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/22ddb4b89a8bdd94d96c7b4b0… 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