Commits October 2019

commits@gajim.org

1 participants
53 discussions

[Git][gajim/gajim][master] 2 commits: Receipts: Save/Load receipts to/from database
by Philipp Hörist 23 Oct '19

23 Oct '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: e7bc06ca by Philipp Hörist at 2019-10-23T20:05:48Z Receipts: Save/Load receipts to/from database - - - - - 23448095 by Philipp Hörist at 2019-10-23T20:05:48Z ConversationTextview: Rename methods show_receipt_icon() -> set_receipt() show_error_icon() -> set_error() show_correction_icon() -> set_correction() - - - - - 5 changed files: - gajim/chat_control.py - gajim/chat_control_base.py - gajim/common/logger.py - gajim/common/modules/receipts.py - gajim/conversation_textview.py Changes: ===================================== gajim/chat_control.py ===================================== @@ -1262,6 +1262,7 @@ class ChatControl(ChatControlBase): old_kind=local_old_kind, xhtml=xhtml, additional_data=additional_data, + marker=row.marker, error=row.error) if row.message.startswith('/me ') or row.message.startswith('/me\n'): local_old_kind = None ===================================== gajim/chat_control_base.py ===================================== @@ -991,7 +991,7 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): old_kind=None, xhtml=None, displaymarking=None, msg_log_id=None, message_id=None, correct_id=None, additional_data=None, - encrypted=None, error=None): + encrypted=None, marker=None, error=None): """ Print 'chat' type messages correct_id = (message_id, correct_id) @@ -1017,7 +1017,7 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): subject, old_kind, xhtml, displaymarking=displaymarking, message_id=message_id, correct_id=correct_id, additional_data=additional_data, - encrypted=encrypted, error=error) + encrypted=encrypted, marker=marker, error=error) if restored: return ===================================== gajim/common/logger.py ===================================== @@ -195,12 +195,17 @@ def _convert_common_error(common_error): def _adapt_common_error(common_error): return common_error.serialize() +def _convert_marker(marker): + return 'received' if marker == 0 else 'displayed' + sqlite.register_converter('disco_info', _convert_disco_info) sqlite.register_adapter(DiscoInfo, _adapt_disco_info) sqlite.register_converter('common_error', _convert_common_error) sqlite.register_adapter(CommonError, _adapt_common_error) +sqlite.register_converter('marker', _convert_marker) + class Logger: def __init__(self): @@ -799,7 +804,7 @@ class Logger: sql = ''' SELECT time, kind, message, error as "error [common_error]", - subject, additional_data + subject, additional_data, marker as "marker [marker]" FROM logs NATURAL JOIN jids WHERE jid IN ({jids}) AND kind IN ({kinds}) AND time > get_timeout() ORDER BY time DESC, log_line_id DESC LIMIT ? OFFSET ? @@ -1480,6 +1485,38 @@ class Logger: self._con.execute(sql, (error, account_id, jid_id, message_id)) self._timeout_commit() + def set_marker(self, account_jid, jid, message_id, state): + """ + Update the marker state of the corresponding message + + :param account_jid: The jid of the account + + :param jid: The jid that belongs to the avatar + + :param message_id: The id of the message + + :param state: The state, 'received' or 'displayed' + + """ + if state not in ('received', 'displayed'): + raise ValueError('Invalid marker state') + + account_id = self.get_jid_id(account_jid) + try: + jid_id = self.get_jid_id(str(jid)) + except ValueError: + # Unknown JID + return + + state = 0 if state == 'received' else 1 + + sql = ''' + UPDATE logs SET marker = ? + WHERE account_id = ? AND jid_id = ? AND message_id = ? + ''' + self._con.execute(sql, (state, account_id, jid_id, message_id)) + self._timeout_commit() + def set_avatar_sha(self, account_jid, jid, sha=None): """ Set the avatar sha of a jid on an account ===================================== gajim/common/modules/receipts.py ===================================== @@ -68,6 +68,11 @@ class Receipts(BaseModule): if not properties.is_muc_pm: jid.setBare() + app.logger.set_marker(app.get_jid_from_account(self._account), + jid, + properties.receipt.id, + 'received') + app.nec.push_incoming_event( NetworkEvent('receipt-received', account=self._account, ===================================== gajim/conversation_textview.py ===================================== @@ -405,13 +405,13 @@ class ConversationTextview(GObject.GObject): line = self._get_message_line(id_) if line is None: return - line.show_receipt_icon() + line.set_receipt() def show_error(self, id_, error): line = self._get_message_line(id_) if line is None: return - line.show_error_icon(to_user_string(error)) + line.set_error(to_user_string(error)) def show_focus_out_line(self): if not self.allow_focus_out_line: @@ -915,7 +915,7 @@ class ConversationTextview(GObject.GObject): other_tags_for_name=None, other_tags_for_time=None, other_tags_for_text=None, subject=None, old_kind=None, xhtml=None, graphics=True, displaymarking=None, message_id=None, correct_id=None, additional_data=None, - encrypted=None, error=None): + encrypted=None, marker=None, error=None): """ Print 'chat' type messages """ @@ -1047,11 +1047,14 @@ class ConversationTextview(GObject.GObject): message_line = MessageLine(message_id, tim, message_icons, new_mark) if corrected: - message_line.show_correction_icon( + message_line.set_correction( self.corrected_text_list[message_id]) if error is not None: - message_line.show_error_icon(to_user_string(error)) + message_line.set_error(to_user_string(error)) + + if marker is not None: + message_line.set_receipt() if index is None: # New Message @@ -1307,16 +1310,22 @@ class MessageLine: self.id = id_ self.timestamp = timestamp self.start_mark = start_mark + self._has_receipt = False self._message_icons = message_icons - def show_receipt_icon(self): + @property + def has_receipt(self): + return self._has_receipt + + def set_receipt(self): + self._has_receipt = True self._message_icons.set_receipt_icon_visible(True) - def show_correction_icon(self, tooltip): + def set_correction(self, tooltip): self._message_icons.set_correction_icon_visible(True) self._message_icons.set_correction_tooltip(tooltip) - def show_error_icon(self, tooltip): + def set_error(self, tooltip): self._message_icons.set_error_icon_visible(True) self._message_icons.set_error_tooltip(tooltip) View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/cd9885c0a1b2c55fd3ede70a20f3f2c4d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/cd9885c0a1b2c55fd3ede70a20f3f2c4d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] HistoryWindow: Close search results first
by Philipp Hörist 23 Oct '19

23 Oct '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: cd9885c0 by Daniel Brötzmann at 2019-10-23T14:25:45Z HistoryWindow: Close search results first This checks if the search results scrolled window is visible when pressing Esc. It will first hide the scrolled window, and only then close the history window. - - - - - 1 changed file: - gajim/gtk/history.py Changes: ===================================== gajim/gtk/history.py ===================================== @@ -276,6 +276,9 @@ class HistoryWindow(Gtk.ApplicationWindow): def _on_key_press(self, widget, event): if event.keyval == Gdk.KEY_Escape: + if self._ui.results_scrolledwindow.get_visible(): + self._ui.results_scrolledwindow.set_visible(False) + return self.save_state() self.destroy() @@ -294,7 +297,7 @@ class HistoryWindow(Gtk.ApplicationWindow): def _jid_entry_search(self, jid): self._load_history(jid, self.account) - self._ui.results_scrolledwindow.set_property('visible', False) + self._ui.results_scrolledwindow.set_visible(False) def _load_history(self, jid_or_name, account=None): """ @@ -373,7 +376,7 @@ class HistoryWindow(Gtk.ApplicationWindow): self._ui.button_first_day.set_sensitive(False) self._ui.button_last_day.set_sensitive(False) - self._ui.results_scrolledwindow.set_property('visible', False) + self._ui.results_scrolledwindow.set_visible(False) def on_calendar_day_selected(self, widget): if not self.jid: @@ -650,10 +653,10 @@ class HistoryWindow(Gtk.ApplicationWindow): self.history_buffer.remove_tag_by_name('highlight', start, end) if text == '': - self._ui.results_scrolledwindow.set_property('visible', False) + self._ui.results_scrolledwindow.set_visible(False) return - self._ui.results_scrolledwindow.set_property('visible', True) + self._ui.results_scrolledwindow.set_visible(True) # perform search in preselected jids # jids are preselected with the query_entry @@ -804,7 +807,7 @@ class HistoryWindow(Gtk.ApplicationWindow): # Only in that case because it's called by # self._fill_completion_dict() otherwise self._load_history(jid, account) - self._ui.results_scrolledwindow.set_property('visible', False) + self._ui.results_scrolledwindow.set_visible(False) def save_state(self): x, y = self.get_window().get_root_origin() View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/cd9885c0a1b2c55fd3ede70a20f3f2c4d2… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/cd9885c0a1b2c55fd3ede70a20f3f2c4d2… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 4 commits: Remove Fuzzy Clock
by Philipp Hörist 20 Oct '19

20 Oct '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 39b4b8fc by Philipp Hörist at 2019-10-20T17:34:45Z Remove Fuzzy Clock I consider this feature bloat - - - - - 19b2911b by Philipp Hörist at 2019-10-20T17:37:33Z Rename method show_receipt_icon() -> show_receipt() - - - - - 8b6a1d1c by Philipp Hörist at 2019-10-20T19:54:36Z Receipts: Simplify event code - - - - - fddcd2b3 by Philipp Hörist at 2019-10-20T19:55:43Z Receipts: use build_receipt() - - - - - 5 changed files: - gajim/chat_control.py - gajim/common/config.py - − gajim/common/fuzzyclock.py - gajim/common/modules/receipts.py - gajim/conversation_textview.py Changes: ===================================== gajim/chat_control.py ===================================== @@ -941,13 +941,9 @@ class ChatControl(ChatControlBase): else: self.old_msg_kind = kind + @event_filter(['account', 'jid']) def _receipt_received(self, event): - if event.conn.name != self.account: - return - if event.jid != self.contact.jid: - return - - self.conv_textview.show_receipt_icon(event.receipt_id) + self.conv_textview.show_receipt(event.receipt_id) def get_tab_label(self): unread = '' ===================================== gajim/common/config.py ===================================== @@ -112,7 +112,6 @@ class Config: 'ignore_incoming_xhtml': [opt_bool, False, ], 'speller_language': [opt_str, '', _('Language used for spell checking.')], 'print_time': [opt_str, 'always', _('\'always\' - print time for every message.\n\'sometimes\' - print time every print_ichat_every_foo_minutes minute.\n\'never\' - never print time.')], - 'print_time_fuzzy': [opt_int, 0, _('Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 to disable Fuzzy Clock. 1 is the most precise clock, 4 the least precise one. This is used only if \'print_time\' is \'sometimes\'.')], 'emoticons_theme': [opt_str, 'noto-emoticons', '', True], 'ascii_emoticons': [opt_bool, True, _('When enabled, ASCII emojis will be converted to graphical emojis.'), True], 'ascii_formatting': [opt_bool, True, ===================================== gajim/common/fuzzyclock.py deleted ===================================== @@ -1,95 +0,0 @@ -# Copyright (C) 2006 Christoph Neuroth <delmonico AT gmx.net> -# Copyright (C) 2006-2014 Yann Leboulanger <asterix AT lagaule.org> -# Copyright (C) 2007 Jean-Marie Traissard <jim AT lapin.org> -# Copyright (C) 2009 Benjamin Richter <br AT waldteufel-online.net> -# -# This file is part of Gajim. -# -# Gajim 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; version 3 only. -# -# Gajim 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 Gajim. If not, see <http://www.gnu.org/licenses/>. - -""" -Python class to show a "fuzzy clock". -Homepage of the original: http://home.gna.org/fuzzyclock/ -Project Page of the original: http://gna.org/projects/fuzzyclock - -The class is based on a port from PHP code by -Henrique Recidive <henrique at recidive.com> which was -in turn based on the Fuzzy Clock Applet of Frerich Raabe (KDE). -So most of the credit goes to this guys, thanks :-) -""" - -from gajim.common.i18n import _ - - -class FuzzyClock: - HOUR_NAMES = [ - _('twelve'), _('one'), _('two'), _('three'), _('four'), - _('five'), _('six'), _('seven'), _('eight'), _('nine'), _('ten'), - _('eleven') - ] - - # Strings to use for the output. %(0)s will be replaced with - # the preceding hour (e.g. "x PAST %(0)s"), %(1)s with the coming hour - # (e.g. "x TO %(0)s") - FUZZY_TIME = [ - _("%(0)s o'clock"), - _('five past %(0)s'), - _('ten past %(0)s'), - _('quarter past %(0)s'), - _('twenty past %(0)s'), - _('twenty five past %(0)s'), - _('half past %(0)s'), - _('twenty five to %(1)s'), - _('twenty to %(1)s'), - _('quarter to %(1)s'), - _('ten to %(1)s'), - _('five to %(1)s'), - _("%(1)s o'clock") - ] - - FUZZY_DAYTIME = [ - _('Night'), - _('Early morning'), - _('Morning'), - _('Almost noon'), - _('Noon'), - _('Afternoon'), - _('Evening'), - _('Late evening'), - _('Night') - ] - - FUZZY_WEEK = [ - _('Start of week'), - _('Middle of week'), - _('Middle of week'), - _('Middle of week'), - _('End of week'), - _('Weekend!'), - _('Weekend!') - ] - - def fuzzy_time(self, fuzzyness, now): - if fuzzyness in (1, 2): - if fuzzyness == 1: - sector = int(round(now.tm_min / 5.0)) - else: - sector = int(round(now.tm_min / 15.0)) * 3 - - return self.FUZZY_TIME[sector] % { - '0': self.HOUR_NAMES[now.tm_hour % 12], - '1': self.HOUR_NAMES[(now.tm_hour + 1) % 12]} - - if fuzzyness == 3: - return self.FUZZY_DAYTIME[int(round(now.tm_hour / 3.0))] - return self.FUZZY_WEEK[now.tm_wday] ===================================== gajim/common/modules/receipts.py ===================================== @@ -16,6 +16,7 @@ import nbxmpp from nbxmpp.structs import StanzaHandler +from nbxmpp.modules.receipts import build_receipt from gajim.common import app from gajim.common.nec import NetworkEvent @@ -55,7 +56,7 @@ class Receipts(BaseModule): if contact is None: return self._log.info('Send receipt: %s', properties.jid) - self._con.connection.send(stanza.buildReceipt()) + self._con.connection.send(build_receipt(stanza)) return if properties.receipt.is_received: @@ -65,13 +66,13 @@ class Receipts(BaseModule): jid = properties.jid if not properties.is_muc_pm: - jid = properties.jid.getBare() + jid.setBare() app.nec.push_incoming_event( NetworkEvent('receipt-received', - conn=self._con, - receipt_id=properties.receipt.id, - jid=jid)) + account=self._account, + jid=jid, + receipt_id=properties.receipt.id)) raise nbxmpp.NodeProcessed ===================================== gajim/conversation_textview.py ===================================== @@ -41,7 +41,6 @@ from gajim.common import helpers from gajim.common import i18n from gajim.common.i18n import _ from gajim.common.helpers import AdditionalDataDict -from gajim.common.fuzzyclock import FuzzyClock from gajim.common.const import StyleAttr from gajim.common.const import Trust from gajim.common.helpers import to_user_string @@ -188,7 +187,6 @@ class ConversationTextview(GObject.GObject): self.line = 0 self._message_list = [] self.corrected_text_list = {} - self.fc = FuzzyClock() # no need to inherit TextView, use it as atrribute is safer self.tv = HtmlTextView(account) @@ -403,7 +401,7 @@ class ConversationTextview(GObject.GObject): return index, end_mark, old_txt - def show_receipt_icon(self, id_): + def show_receipt(self, id_): line = self._get_message_line(id_) if line is None: return @@ -1198,11 +1196,7 @@ class ConversationTextview(GObject.GObject): seconds_passed = tim - self.last_time_printout if seconds_passed > every_foo_seconds: self.last_time_printout = tim - if app.config.get('print_time_fuzzy') > 0: - tim_format = self.fc.fuzzy_time( - app.config.get('print_time_fuzzy'), local_tim) - else: - tim_format = self.get_time_to_show(local_tim, direction_mark) + tim_format = self.get_time_to_show(local_tim, direction_mark) buffer_.insert_with_tags_by_name(iter_, tim_format + '\n', 'time_sometimes') View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/e5ac5e9bd20c6ad118b8ef67a24e054c9… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/e5ac5e9bd20c6ad118b8ef67a24e054c9… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] 2 commits: Add utility function for generating uuids
by Philipp Hörist 20 Oct '19

20 Oct '19

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 69d0c55b by Philipp Hörist at 2019-10-20T19:04:03Z Add utility function for generating uuids - - - - - ff68a5df by Philipp Hörist at 2019-10-20T19:04:06Z Receipts: Refactor helper method for building receipts - Add helper isMucPM - Move receipt build code into receipts module - Improve receipt build code - - - - - 3 changed files: - nbxmpp/modules/receipts.py - nbxmpp/protocol.py - nbxmpp/util.py Changes: ===================================== nbxmpp/modules/receipts.py ===================================== @@ -18,8 +18,12 @@ import logging from nbxmpp.protocol import NS_RECEIPTS +from nbxmpp.protocol import NS_MUC_USER +from nbxmpp.protocol import isMucPM +from nbxmpp.protocol import Message from nbxmpp.structs import StanzaHandler from nbxmpp.structs import ReceiptData +from nbxmpp.util import generate_id log = logging.getLogger('nbxmpp.m.receipts') @@ -49,3 +53,34 @@ class Receipts: return properties.receipt = ReceiptData(received.getName(), id_) + + +def build_receipt(stanza): + if not isinstance(stanza, Message): + raise ValueError('Stanza type must be protocol.Message') + + if stanza.getType() == 'error': + raise ValueError('Receipt can not be generated for type error messages') + + if stanza.getID() is None: + raise ValueError('Receipt can not be generated for messages without id') + + if stanza.getTag('received', namespace=NS_RECEIPTS) is not None: + raise ValueError('Receipt can not be generated for receipts') + + is_muc_pm = isMucPM(stanza) + + jid = stanza.getFrom() + typ = stanza.getType() + if typ == 'groupchat' or not is_muc_pm: + jid.setBare() + + message = Message(to=jid, typ=typ) + if is_muc_pm: + message.setTag('x', namespace=NS_MUC_USER) + message_id = generate_id() + message.setID(message_id) + message.setReceiptReceived(stanza.getID()) + message.setHint('store') + message.setOriginID(message_id) + return message ===================================== nbxmpp/protocol.py ===================================== @@ -580,6 +580,12 @@ def isErrorNode(node): """ return node and node.getType() == 'error' +def isMucPM(message): + muc_user = message.getTag('x', namespace=NS_MUC_USER) + return (message.getType() in ('chat', 'error') and + muc_user is not None and + not muc_user.getChildren()) + class NodeProcessed(Exception): """ Exception that should be raised by handler when the handling should be @@ -1325,11 +1331,6 @@ class Message(Protocol): """ self.setTag('origin-id', namespace=NS_SID, attrs={'id': val}) - def buildReceipt(self): - message = Message(to=self.getFrom().getBare(), typ=self.getType()) - message.setReceiptReceived(self.getID()) - return message - def buildReply(self, text=None): """ Builds and returns another message object with specified text. The to, @@ -1377,6 +1378,9 @@ class Message(Protocol): def setAttention(self): self.setTag('attention', namespace=NS_ATTENTION) + def setHint(self, hint): + self.setTag(hint, namespace=NS_HINTS) + class Presence(Protocol): ===================================== nbxmpp/util.py ===================================== @@ -19,6 +19,7 @@ import logging import base64 import weakref import hashlib +import uuid from functools import wraps from functools import lru_cache @@ -310,3 +311,7 @@ def compute_caps_hash(info, compare=True): raise DiscoInfoMalformed('Caps hashes differ: %s != %s' % ( b64hash, info.get_caps_hash())) return b64hash + + +def generate_id(): + return str(uuid.uuid4()) View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/7bbf8194fbe6b54e419877782… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/7bbf8194fbe6b54e419877782… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Database: Save message-id for sent messages
by Philipp Hörist 20 Oct '19

20 Oct '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: e1c684c6 by Philipp Hörist at 2019-10-20T14:46:28Z Database: Save message-id for sent messages - - - - - e5ac5e9b by Philipp Hörist at 2019-10-20T17:21:33Z Rework message error handling - Database: Save error in the corresponding message datarow - ConversationTextview: Show error icon with error message as tooltip - - - - - 13 changed files: - gajim/chat_control.py - gajim/chat_control_base.py - gajim/common/connection.py - gajim/common/connection_handlers.py - gajim/common/connection_handlers_events.py - gajim/common/logger.py - gajim/common/modules/message.py - gajim/common/zeroconf/client_zeroconf.py - gajim/common/zeroconf/connection_handlers_zeroconf.py - gajim/common/zeroconf/connection_zeroconf.py - gajim/conversation_textview.py - gajim/groupchat_control.py - gajim/gui_interface.py Changes: ===================================== gajim/chat_control.py ===================================== @@ -46,6 +46,7 @@ from gajim.common.i18n import _ from gajim.common.helpers import AdditionalDataDict from gajim.common.helpers import open_uri from gajim.common.helpers import geo_provider_from_location +from gajim.common.helpers import event_filter from gajim.common.contacts import GC_Contact from gajim.common.const import AvatarSize from gajim.common.const import KindConstant @@ -231,12 +232,20 @@ class ChatControl(ChatControlBase): app.ged.register_event_handler( 'receipt-received', ged.GUI1, self._receipt_received) + app.ged.register_event_handler('message-error', + ged.GUI1, self._on_message_error) + app.ged.register_event_handler('zeroconf-error', ged.GUI1, + self._on_zeroconf_error) # PluginSystem: adding GUI extension point for this ChatControl # instance object app.plugin_manager.gui_extension_point('chat_control', self) self.update_actions() + @property + def jid(self): + return self.contact.jid + def add_actions(self): super().add_actions() actions = [ @@ -824,6 +833,10 @@ class ChatControl(ChatControlBase): == pw.get_active_control() and pw.is_active() and end): app.logger.set_read_messages([obj.msg_log_id]) + @event_filter(['account', 'jid']) + def _on_message_error(self, event): + self.conv_textview.show_error(event.message_id, event.error) + def _message_sent(self, obj): if obj.conn.name != self.account: return @@ -880,7 +893,7 @@ class ChatControl(ChatControlBase): def add_message(self, text, frm='', tim=None, encrypted=None, subject=None, xhtml=None, displaymarking=None, msg_log_id=None, correct_id=None, - message_id=None, additional_data=None): + message_id=None, additional_data=None, error=None): """ Print a line in the conversation @@ -922,7 +935,7 @@ class ChatControl(ChatControlBase): displaymarking=displaymarking, msg_log_id=msg_log_id, message_id=message_id, correct_id=correct_id, additional_data=additional_data, - encrypted=encrypted) + encrypted=encrypted, error=error) if text.startswith('/me ') or text.startswith('/me\n'): self.old_msg_kind = None else: @@ -1252,7 +1265,8 @@ class ChatControl(ChatControlBase): restored=True, old_kind=local_old_kind, xhtml=xhtml, - additional_data=additional_data) + additional_data=additional_data, + error=row.error) if row.message.startswith('/me ') or row.message.startswith('/me\n'): local_old_kind = None else: @@ -1355,6 +1369,10 @@ class ChatControl(ChatControlBase): 'name': name, 'show': uf_show, 'status': status or ''} self.add_status_message(status_line) + @event_filter(['account', 'jid']) + def _on_zeroconf_error(self, event): + self.add_status_message(event.message) + def _info_bar_show_message(self): if self.info_bar.get_visible(): # A message is already shown ===================================== gajim/chat_control_base.py ===================================== @@ -991,7 +991,7 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): old_kind=None, xhtml=None, displaymarking=None, msg_log_id=None, message_id=None, correct_id=None, additional_data=None, - encrypted=None): + encrypted=None, error=None): """ Print 'chat' type messages correct_id = (message_id, correct_id) @@ -1017,7 +1017,7 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): subject, old_kind, xhtml, displaymarking=displaymarking, message_id=message_id, correct_id=correct_id, additional_data=additional_data, - encrypted=encrypted) + encrypted=encrypted, error=error) if restored: return ===================================== gajim/common/connection.py ===================================== @@ -338,6 +338,7 @@ class CommonConnection: message=obj.message, subject=obj.subject, additional_data=obj.additional_data, + message_id=obj.stanza_id, stanza_id=obj.stanza_id) def new_account(self, name, config, sync=False): ===================================== gajim/common/connection_handlers.py ===================================== @@ -44,9 +44,6 @@ class ConnectionHandlersBase: # keep track of sessions this connection has with other JIDs self.sessions = {} - # IDs of sent messages (https://trac.gajim.org/ticket/8222) - self.sent_message_ids = [] - def get_sessions(self, jid): """ Get all sessions for the given full jid ===================================== gajim/common/connection_handlers_events.py ===================================== @@ -58,30 +58,6 @@ class OurShowEvent(nec.NetworkIncomingEvent): class MessageSentEvent(nec.NetworkIncomingEvent): name = 'message-sent' - def generate(self): - if not self.automatic_message: - self.conn.sent_message_ids.append(self.stanza_id) - # only record the last 20000 message ids (should be about 1MB [36 byte per uuid] - # and about 24 hours if you send out a message every 5 seconds) - self.conn.sent_message_ids = self.conn.sent_message_ids[-20000:] - return True - -class MessageErrorEvent(nec.NetworkIncomingEvent): - name = 'message-error' - - def init(self): - self.zeroconf = False - - def generate(self): - if self.zeroconf: - return True - self.id_ = self.stanza.getID() - #only alert for errors of explicitly sent messages (see https://trac.gajim.org/ticket/8222) - if self.id_ in self.conn.sent_message_ids: - self.conn.sent_message_ids.remove(self.id_) - return True - return False - class JingleRequestReceivedEvent(nec.NetworkIncomingEvent): name = 'jingle-request-received' ===================================== gajim/common/logger.py ===================================== @@ -40,6 +40,7 @@ from gi.repository import GLib from nbxmpp.protocol import Node from nbxmpp.protocol import Iq from nbxmpp.structs import DiscoInfo +from nbxmpp.structs import CommonError from nbxmpp.modules.dataforms import extend_form from nbxmpp.modules.discovery import parse_disco_info @@ -76,6 +77,7 @@ LOGS_SQL_STATEMENT = ''' kind INTEGER, show INTEGER, message TEXT, + error TEXT, subject TEXT, additional_data TEXT, stanza_id TEXT, @@ -93,7 +95,7 @@ LOGS_SQL_STATEMENT = ''' ); CREATE INDEX idx_logs_jid_id_time ON logs (jid_id, time DESC); CREATE INDEX idx_logs_stanza_id ON logs (stanza_id); - PRAGMA user_version=2; + PRAGMA user_version=4; ''' CACHE_SQL_STATEMENT = ''' @@ -187,10 +189,18 @@ def _convert_disco_info(disco_info): def _adapt_disco_info(disco_info): return str(disco_info.stanza) -sqlite.register_converter('disco_info', _convert_disco_info) +def _convert_common_error(common_error): + return CommonError.from_string(common_error) +def _adapt_common_error(common_error): + return common_error.serialize() + +sqlite.register_converter('disco_info', _convert_disco_info) sqlite.register_adapter(DiscoInfo, _adapt_disco_info) +sqlite.register_converter('common_error', _convert_common_error) +sqlite.register_adapter(CommonError, _adapt_common_error) + class Logger: def __init__(self): @@ -306,6 +316,13 @@ class Logger: ] self._execute_multiple(con, statements) + if self._get_user_version(con) < 4: + statements = [ + 'ALTER TABLE logs ADD COLUMN "error" TEXT', + 'PRAGMA user_version=4' + ] + self._execute_multiple(con, statements) + def _migrate_cache(self, con): if self._get_user_version(con) == 0: # All migrations from 0.16.9 until 1.0.0 @@ -781,7 +798,8 @@ class Logger: jids = self._get_family_jids(account, jid) sql = ''' - SELECT time, kind, message, subject, additional_data + SELECT time, kind, message, error as "error [common_error]", + subject, additional_data FROM logs NATURAL JOIN jids WHERE jid IN ({jids}) AND kind IN ({kinds}) AND time > get_timeout() ORDER BY time DESC, log_line_id DESC LIMIT ? OFFSET ? @@ -1434,6 +1452,34 @@ class Logger: return lastrowid + def set_message_error(self, account_jid, jid, message_id, error): + """ + Update the corresponding message with the error + + :param account_jid: The jid of the account + + :param jid: The jid that belongs to the avatar + + :param message_id: The id of the message + + :param error: The error stanza as string + + """ + + account_id = self.get_jid_id(account_jid) + try: + jid_id = self.get_jid_id(str(jid)) + except ValueError: + # Unknown JID + return + + sql = ''' + UPDATE logs SET error = ? + WHERE account_id = ? AND jid_id = ? AND message_id = ? + ''' + self._con.execute(sql, (error, account_id, jid_id, message_id)) + self._timeout_commit() + def set_avatar_sha(self, account_jid, jid, sha=None): """ Set the avatar sha of a jid on an account ===================================== gajim/common/modules/message.py ===================================== @@ -18,10 +18,8 @@ import time import nbxmpp from nbxmpp.structs import StanzaHandler -from nbxmpp.const import MessageType from gajim.common import app -from gajim.common.i18n import _ from gajim.common.nec import NetworkEvent from gajim.common.helpers import AdditionalDataDict from gajim.common.const import KindConstant @@ -31,7 +29,6 @@ from gajim.common.modules.security_labels import parse_securitylabel from gajim.common.modules.misc import parse_correction from gajim.common.modules.misc import parse_oob from gajim.common.modules.misc import parse_xhtml -from gajim.common.connection_handlers_events import MessageErrorEvent class Message(BaseModule): @@ -42,6 +39,10 @@ class Message(BaseModule): StanzaHandler(name='message', callback=self._message_received, priority=50), + StanzaHandler(name='message', + typ='error', + callback=self._message_error_received, + priority=50), ] # XEPs for which this message module should not be executed @@ -49,7 +50,9 @@ class Message(BaseModule): nbxmpp.NS_IBB]) def _message_received(self, _con, stanza, properties): - if properties.is_mam_message or properties.is_pubsub: + if (properties.is_mam_message or + properties.is_pubsub or + properties.type.is_error): return # Check if a child of the message contains any # namespaces that we handle in other modules. @@ -108,19 +111,6 @@ class Message(BaseModule): if not gc_control: minimized = app.interface.minimized_controls[self._account] gc_control = minimized.get(jid) - - if gc_control and jid == fjid: - if properties.type.is_error: - if msgtxt: - msgtxt = _('error while sending %(message)s ( %(error)s )') % { - 'message': msgtxt, 'error': stanza.getErrorMsg()} - else: - msgtxt = _('error: %s') % stanza.getErrorMsg() - # TODO: why is this here? - if stanza.getTag('html'): - stanza.delChild('html') - type_ = MessageType.GROUPCHAT - session = None if not properties.type.is_groupchat: if properties.is_muc_pm and properties.type.is_error: @@ -158,29 +148,6 @@ class Message(BaseModule): 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, 'stanza': stanza, @@ -234,13 +201,25 @@ class Message(BaseModule): app.nec.push_incoming_event( NetworkEvent('decrypted-message-received', **event_attr)) - def _log_error_message(self, error_msg, jid, timestamp): - if app.config.should_log(self._account, jid): - app.logger.insert_into_logs(self._account, - jid, - timestamp, - KindConstant.ERROR, - message=error_msg) + def _message_error_received(self, _con, _stanza, properties): + jid = properties.jid + if not properties.is_muc_pm: + jid.setBare() + + self._log.info(properties.error) + + app.logger.set_message_error(app.get_jid_from_account(self._account), + jid, + properties.id, + properties.error) + + app.nec.push_incoming_event( + NetworkEvent('message-error', + account=self._account, + jid=jid, + room_jid=jid, + message_id=properties.id, + error=properties.error)) def _log_muc_message(self, event): if event.mtype == 'error': ===================================== gajim/common/zeroconf/client_zeroconf.py ===================================== @@ -326,6 +326,9 @@ class P2PClient(IdleObject): self.RegisterHandler(*StanzaHandler(name='message', callback=self._caller._messageCB)) + self.RegisterHandler(*StanzaHandler(name='message', + typ='error', + callback=self._caller._message_error_received)) self._caller._register_new_handlers(self) ===================================== gajim/common/zeroconf/connection_handlers_zeroconf.py ===================================== @@ -25,15 +25,12 @@ import logging 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 NetworkEvent -from gajim.common.const import KindConstant 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 from gajim.common.modules.misc import parse_xhtml -from gajim.common.connection_handlers_events import MessageErrorEvent log = logging.getLogger('gajim.c.z.connection_handlers_zeroconf') @@ -50,6 +47,8 @@ class ConnectionHandlersZeroconf(connection_handlers.ConnectionHandlersBase): """ Called when we receive a message """ + if properties.is_error: + return log.info('Zeroconf MessageCB') # Dont trust from attr set by sender @@ -91,25 +90,6 @@ class ConnectionHandlersZeroconf(connection_handlers.ConnectionHandlersBase): 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, @@ -146,11 +126,17 @@ class ConnectionHandlersZeroconf(connection_handlers.ConnectionHandlersBase): app.nec.push_incoming_event( NetworkEvent('decrypted-message-received', **event_attr)) - 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, - jid, - timestamp, - KindConstant.ERROR, - message=error_msg) + def _message_error_received(self, _con, _stanza, properties): + log.info(properties.error) + + app.logger.set_message_error(app.get_jid_from_account(self.name), + properties.jid, + properties.id, + properties.error) + + app.nec.push_incoming_event( + NetworkEvent('message-error', + account=self.name, + jid=properties.jid, + message_id=properties.id, + error=properties.error)) ===================================== gajim/common/zeroconf/connection_zeroconf.py ===================================== @@ -49,7 +49,6 @@ from gajim.common.connection_handlers_events import OurShowEvent from gajim.common.connection_handlers_events import InformationEvent from gajim.common.connection_handlers_events import ConnectionLostEvent from gajim.common.connection_handlers_events import MessageSentEvent -from gajim.common.connection_handlers_events import MessageErrorEvent log = logging.getLogger('gajim.c.connection_zeroconf') @@ -423,9 +422,11 @@ class ConnectionZeroconf(CommonConnection, ConnectionHandlersZeroconf): def on_send_not_ok(reason): reason += ' ' + _('Your message could not be sent.') - app.nec.push_incoming_event(MessageErrorEvent( - None, conn=self, fjid=obj.jid, error_code=-1, error_msg=reason, - msg=None, time_=None, session=obj.session, zeroconf=True)) + app.nec.push_incoming_event(NetworkEvent( + 'zeroconf-error', + account=self.name, + jid=obj.jid, + message=reason)) # Dont propagate event return True @@ -438,10 +439,11 @@ class ConnectionZeroconf(CommonConnection, ConnectionHandlersZeroconf): # Contact Offline error_message = _( 'Contact is offline. Your message could not be sent.') - app.nec.push_incoming_event(MessageErrorEvent( - None, conn=self, fjid=obj.jid, error_code=-1, - error_msg=error_message, msg=None, time_=None, - session=obj.session, zeroconf=True)) + app.nec.push_incoming_event(NetworkEvent( + 'zeroconf-error', + account=self.name, + jid=obj.jid, + message=error_message)) # Dont propagate event return True @@ -457,16 +459,15 @@ class ConnectionZeroconf(CommonConnection, ConnectionHandlersZeroconf): CommonConnection._event_dispatcher(self, realm, event, data) if realm == '': if event == nbxmpp.transports.DATA_ERROR: - thread_id = data[1] frm = data[0] - session = self.get_or_create_session(frm, thread_id) error_message = _( 'Connection to host could not be established: ' 'Timeout while sending data.') - app.nec.push_incoming_event(MessageErrorEvent( - None, conn=self, fjid=frm, error_code=-1, - error_msg=error_message, msg=None, time_=None, - session=session, zeroconf=True)) + app.nec.push_incoming_event(NetworkEvent( + 'zeroconf-error', + account=self.name, + jid=frm, + message=error_message)) def cleanup(self): pass ===================================== gajim/conversation_textview.py ===================================== @@ -42,7 +42,9 @@ from gajim.common import i18n from gajim.common.i18n import _ from gajim.common.helpers import AdditionalDataDict from gajim.common.fuzzyclock import FuzzyClock -from gajim.common.const import StyleAttr, Trust +from gajim.common.const import StyleAttr +from gajim.common.const import Trust +from gajim.common.helpers import to_user_string from gajim.gtk import util from gajim.gtk.util import get_cursor @@ -407,6 +409,12 @@ class ConversationTextview(GObject.GObject): return line.show_receipt_icon() + def show_error(self, id_, error): + line = self._get_message_line(id_) + if line is None: + return + line.show_error_icon(to_user_string(error)) + def show_focus_out_line(self): if not self.allow_focus_out_line: # if room did not receive focus-in from the last time we added @@ -909,7 +917,7 @@ class ConversationTextview(GObject.GObject): other_tags_for_name=None, other_tags_for_time=None, other_tags_for_text=None, subject=None, old_kind=None, xhtml=None, graphics=True, displaymarking=None, message_id=None, correct_id=None, additional_data=None, - encrypted=None): + encrypted=None, error=None): """ Print 'chat' type messages """ @@ -1044,6 +1052,9 @@ class ConversationTextview(GObject.GObject): message_line.show_correction_icon( self.corrected_text_list[message_id]) + if error is not None: + message_line.show_error_icon(to_user_string(error)) + if index is None: # New Message self._message_list.append(message_line) @@ -1311,6 +1322,10 @@ class MessageLine: self._message_icons.set_correction_icon_visible(True) self._message_icons.set_correction_tooltip(tooltip) + def show_error_icon(self, tooltip): + self._message_icons.set_error_icon_visible(True) + self._message_icons.set_error_tooltip(tooltip) + class MessageIcons(Gtk.Box): def __init__(self): @@ -1328,8 +1343,14 @@ class MessageIcons(Gtk.Box): self._receipt_image.set_tooltip_text(_('Received')) self._receipt_image.set_no_show_all(True) + self._error_image = Gtk.Image.new_from_icon_name( + 'dialog-warning-symbolic', Gtk.IconSize.MENU) + self._error_image.get_style_context().add_class('warning-color') + self._error_image.set_no_show_all(True) + self.add(self._correction_image) self.add(self._receipt_image) + self.add(self._error_image) self.show_all() def set_receipt_icon_visible(self, visible): @@ -1342,3 +1363,9 @@ class MessageIcons(Gtk.Box): def set_correction_tooltip(self, text): self._correction_image.set_tooltip_markup(text) + + def set_error_icon_visible(self, visible): + self._error_image.set_visible(visible) + + def set_error_tooltip(self, text): + self._error_image.set_tooltip_markup(text) ===================================== gajim/groupchat_control.py ===================================== @@ -1573,6 +1573,9 @@ class GroupchatControl(ChatControlBase): self.msg_textview.get_buffer().set_text('') self.msg_textview.grab_focus() + @event_filter(['account', 'room_jid']) + def _on_message_error(self, event): + self.conv_textview.show_error(event.message_id, event.error) def minimizable(self): if self.force_non_minimizable: ===================================== gajim/gui_interface.py ===================================== @@ -285,61 +285,6 @@ class Interface: if ctrl and ctrl.session and len(obj.contact_list) > 1: ctrl.remove_session(ctrl.session) - def handle_event_msgerror(self, obj): - #'MSGERROR' (account, (jid, error_code, error_msg, msg, time[session])) - account = obj.conn.name - jids = obj.fjid.split('/', 1) - jid = jids[0] - - session = obj.session - - gc_control = self.msg_win_mgr.get_gc_control(jid, account) - if not gc_control and \ - jid in self.minimized_controls[account]: - gc_control = self.minimized_controls[account][jid] - if gc_control and gc_control.type_id != message_control.TYPE_GC: - gc_control = None - if gc_control: - if len(jids) > 1: # it's a pm - nick = jids[1] - - if session: - ctrl = session.control - else: - ctrl = self.msg_win_mgr.get_control(obj.fjid, account) - - if not ctrl: - tv = gc_control.list_treeview - model = tv.get_model() - iter_ = gc_control.get_contact_iter(nick) - if iter_: - show = model[iter_][3] - else: - show = 'offline' - gc_c = app.contacts.create_gc_contact(room_jid=jid, - account=account, name=nick, show=show) - ctrl = self.new_private_chat(gc_c, account, session) - - ctrl.add_info_message(_('Error %(code)s: %(msg)s') % { - 'code': obj.error_code, 'msg': obj.error_msg}) - return - - gc_control.add_info_message(_('Error %(code)s: %(msg)s') % { - 'code': obj.error_code, 'msg': obj.error_msg}) - if gc_control.parent_win and \ - gc_control.parent_win.get_active_jid() == jid: - gc_control.set_subject(gc_control.subject) - return - - if app.jid_is_transport(jid): - jid = jid.replace('@', '') - msg = obj.error_msg - if obj.msg: - msg = _('error while sending %(message)s ( %(error)s )') % { - 'message': obj.msg, 'error': msg} - if session: - session.roster_message(jid, msg, obj.time_, msg_type='error') - @staticmethod def handle_event_msgsent(obj): # ('MSGSENT', account, (jid, msg)) @@ -1152,7 +1097,6 @@ class Interface: 'jingle-error-received': [self.handle_event_jingle_error], 'jingle-request-received': [self.handle_event_jingle_incoming], 'jingleFT-cancelled-received': [self.handle_event_jingleft_cancel], - 'message-error': [self.handle_event_msgerror], 'message-not-sent': [self.handle_event_msgnotsent], 'message-sent': [self.handle_event_msgsent], 'metacontacts-received': [self.handle_event_metacontacts], View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/9c431173c1b54aa7fcd7e5c1238dcadd4… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/9c431173c1b54aa7fcd7e5c1238dcadd4… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] 2 commits: Make CommonError serializeable
by Philipp Hörist 20 Oct '19

20 Oct '19

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 1c38ab14 by Philipp Hörist at 2019-10-19T21:15:35Z Make CommonError serializeable - - - - - 7bbf8194 by Philipp Hörist at 2019-10-20T17:22:58Z MUC: Set muc_private_message attribute also for error messages - - - - - 2 changed files: - nbxmpp/modules/muc.py - nbxmpp/structs.py Changes: ===================================== nbxmpp/modules/muc.py ===================================== @@ -185,7 +185,9 @@ class MUC: return # MUC Private message - if properties.type == MessageType.CHAT and not muc_user.getChildren(): + if (properties.type.is_chat or + properties.type.is_error and + not muc_user.getChildren()): properties.muc_private_message = True return ===================================== nbxmpp/structs.py ===================================== @@ -25,6 +25,8 @@ from nbxmpp.protocol import NS_MAM_1 from nbxmpp.protocol import NS_MAM_2 from nbxmpp.protocol import NS_MUC from nbxmpp.protocol import NS_MUC_INFO +from nbxmpp.protocol import NS_CLIENT +from nbxmpp.protocol import Protocol from nbxmpp.const import MessageType from nbxmpp.const import AvatarState from nbxmpp.const import StatusCode @@ -385,6 +387,7 @@ class ChatMarker(namedtuple('ChatMarker', 'type id')): class CommonError: def __init__(self, stanza): + self._stanza_name = stanza.getName() self._error_node = stanza.getTag('error') self.condition = stanza.getError() self.condition_data = self._error_node.getTagData(self.condition) @@ -400,6 +403,10 @@ class CommonError: text = element.getData() self._text[lang] = text + @classmethod + def from_string(cls, node_string): + return cls(Protocol(node=node_string)) + def get_text(self, pref_lang=None): if pref_lang is not None: text = self._text.get(pref_lang) @@ -429,6 +436,13 @@ class CommonError: text = ' - %s' % text return 'Error from %s: %s%s' % (self.jid, condition, text) + def serialize(self): + return str(Protocol(name=self._stanza_name, + frm=self.jid, + xmlns=NS_CLIENT, + attrs={'id': self.id}, + payload=self._error_node)) + class StanzaMalformedError(CommonError): def __init__(self, stanza, text): @@ -443,12 +457,19 @@ class StanzaMalformedError(CommonError): if text: self._text['en'] = text + @classmethod + def from_string(cls, node_string): + raise NotImplementedError + def __str__(self): text = self.get_text('en') if text: text = ': %s' % text return 'Received malformed stanza from %s%s' % (self.jid, text) + def serialize(self): + raise NotImplementedError + class TuneData(namedtuple('TuneData', 'artist length rating source title track uri')): View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/8fb372a55962a47e4ddf8bb35… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/8fb372a55962a47e4ddf8bb35… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ConversationTextview: Reduce line height
by Philipp Hörist 20 Oct '19

20 Oct '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 9c431173 by Philipp Hörist at 2019-10-20T07:23:40Z ConversationTextview: Reduce line height - - - - - 1 changed file: - gajim/conversation_textview.py Changes: ===================================== gajim/conversation_textview.py ===================================== @@ -270,7 +270,7 @@ class ConversationTextview(GObject.GObject): self.tagMarked.set_property('weight', Pango.Weight.BOLD) textview_icon = buffer_.create_tag('textview-icon') - textview_icon.set_property('rise', Pango.units_from_double(-4.45)) + textview_icon.set_property('rise', Pango.units_from_double(-2.45)) tag = buffer_.create_tag('time_sometimes') tag.set_property('foreground', 'darkgrey') View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/9c431173c1b54aa7fcd7e5c1238dcadd4c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/9c431173c1b54aa7fcd7e5c1238dcadd4c… You're receiving this email because of your account on dev.gajim.org.

1 0

[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

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits October 2019