diff --git a/gajim/gtk/controls/groupchat.py b/gajim/gtk/controls/groupchat.py
index 3ae87a7e4cb4d009b9f5b8ade0a1bf9f1fbe1cae..c4a8d4343293aba34fbd4bae96ed4fd5cc90b09a 100644
--- a/gajim/gtk/controls/groupchat.py
+++ b/gajim/gtk/controls/groupchat.py
@@ -974,10 +974,8 @@ def rejoin(self):
def _on_user_joined(self, _contact, _signal_name, user_contact, properties):
nick = user_contact.name
if not properties.is_muc_self_presence:
-
- if (self.contact.is_joined and
- self.contact.settings.get('print_join_left')):
- self.add_info_message(_('%s has joined the group chat') % nick)
+ if self.contact.is_joined:
+ self.conversation_view.add_muc_user_joined(nick)
return
status_codes = properties.muc_status_codes or []
@@ -1031,7 +1029,6 @@ def _on_user_nickname_changed(self, _contact, _signal_name, user_contact, proper
# tv.last_received_message_id[nick]
# del tv.last_received_message_id[nick]
-
def _on_user_status_show_changed(self,
_contact,
_signal_name,
@@ -1182,15 +1179,10 @@ def _on_user_left(self, _contact, _signal_name, user_contact, properties):
#Group Chat: We have been removed from the room
message = _('{nick} has been removed from the group chat{by}{reason}')
- print_join_left = self.contact.settings.get('print_join_left')
-
if StatusCode.REMOVED_ERROR in status_codes:
# Handle 333 before 307, some MUCs add both
- if print_join_left:
- #Group Chat: User was kicked because of an server error: reason
- message = _('{nick} has left due to '
- 'an error{reason}').format(nick=nick, reason=reason)
- self.add_info_message(message)
+ self.conversation_view.add_muc_user_left(
+ nick, properties.muc_user.reason, error=True)
elif StatusCode.REMOVED_KICKED in status_codes:
#Group Chat: User was kicked by Alice: reason
@@ -1218,10 +1210,9 @@ def _on_user_left(self, _contact, _signal_name, user_contact, properties):
message = message.format(nick=nick, by=actor, reason=reason)
self.add_info_message(message)
- elif print_join_left:
- message = _('{nick} has left{reason}').format(nick=nick,
- reason=reason)
- self.add_info_message(message)
+ else:
+ self.conversation_view.add_muc_user_left(
+ nick, properties.muc_user.reason)
def _on_room_joined(self, _contact, _signal_name):
self._show_page('groupchat')
diff --git a/gajim/gtk/conversation/rows/info.py b/gajim/gtk/conversation/rows/info.py
index 243111644e00269decc0b03fa39684af9cc4a05e..59acd3ee398bbe56db923588ee558823981a6c47 100644
--- a/gajim/gtk/conversation/rows/info.py
+++ b/gajim/gtk/conversation/rows/info.py
@@ -33,7 +33,6 @@ def __init__(self, account, text):
timestamp = time.time()
self.timestamp = datetime.fromtimestamp(timestamp)
self.db_timestamp = timestamp
- self.kind = 'info'
text = GLib.markup_escape_text(text)
diff --git a/gajim/gtk/conversation/rows/muc_join_left.py b/gajim/gtk/conversation/rows/muc_join_left.py
new file mode 100644
index 0000000000000000000000000000000000000000..af0582c323664565442bce8eb910c84c61cd8eb0
--- /dev/null
+++ b/gajim/gtk/conversation/rows/muc_join_left.py
@@ -0,0 +1,75 @@
+# 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/>.
+
+import time
+from datetime import datetime
+
+from gi.repository import Gtk
+from gi.repository import Pango
+
+from gajim.common.i18n import _
+from gajim.common.const import AvatarSize
+
+from .base import BaseRow
+
+
+class MUCJoinLeft(BaseRow):
+ def __init__(self, type_, account, nick, reason=None, error=False):
+ BaseRow.__init__(self, account)
+
+ self.type = type_
+ timestamp = time.time()
+ self.timestamp = datetime.fromtimestamp(timestamp)
+ self.db_timestamp = timestamp
+
+ self._label = Gtk.Label()
+ self._label.set_selectable(True)
+ self._label.set_line_wrap(True)
+ self._label.set_xalign(0)
+ self._label.set_line_wrap_mode(Pango.WrapMode.WORD_CHAR)
+
+ if type_ == 'muc-user-joined':
+ text = self._make_join_message(nick)
+ else:
+ text = self._make_left_message(nick, reason, error)
+
+ self._label.set_text(text)
+
+ avatar_placeholder = Gtk.Box()
+ avatar_placeholder.set_size_request(AvatarSize.ROSTER, -1)
+ self.grid.attach(avatar_placeholder, 0, 0, 1, 2)
+ timestamp_widget = self.create_timestamp_widget(self.timestamp)
+ timestamp_widget.set_valign(Gtk.Align.START)
+ self.grid.attach(timestamp_widget, 2, 0, 1, 1)
+
+ self.grid.attach(self._label, 1, 0, 1, 1)
+ self.show_all()
+
+ @staticmethod
+ def _make_left_message(nick, reason, error):
+ reason = '' if reason is None else ': {reason}'.format(reason=reason)
+
+ if error:
+ #Group Chat: User was kicked because of an server error: reason
+ message = _('{nick} has left due to '
+ 'an error{reason}').format(nick=nick, reason=reason)
+
+ else:
+ message = _('{nick} has left{reason}').format(nick=nick,
+ reason=reason)
+ return message
+
+ @staticmethod
+ def _make_join_message(nick):
+ return _('%s has joined the group chat') % nick
diff --git a/gajim/gtk/conversation/view.py b/gajim/gtk/conversation/view.py
index c79615aad4b3525309c094acbfa36358e4195fb0..87f8a8921ccb5c9f2a1a526322d6f5cfaf5c6a92 100644
--- a/gajim/gtk/conversation/view.py
+++ b/gajim/gtk/conversation/view.py
@@ -33,6 +33,7 @@
from .conversation.rows.info import InfoMessage
from .conversation.rows.date import DateRow
from .conversation.rows.muc_subject import MUCSubject
+from .conversation.rows.muc_join_left import MUCJoinLeft
log = logging.getLogger('gajim.gui.conversation_view')
@@ -52,6 +53,7 @@ def __init__(self, account, contact, history_mode=False):
Gtk.ListBox.__init__(self)
self.set_selection_mode(Gtk.SelectionMode.NONE)
self.set_sort_func(self._sort_func)
+ self.set_filter_func(self._filter_func)
self._account = account
self._client = None
if account is not None:
@@ -73,6 +75,11 @@ def __init__(self, account, contact, history_mode=False):
# message_id -> row mapping
self._message_id_row_map = {}
+ app.settings.connect_signal('print_join_left',
+ self._on_contact_setting_changed,
+ account=self._account,
+ jid=self._contact.jid)
+
if self._contact is not None:
self._read_marker_row = ReadMarkerRow(self._account, self._contact)
self.add(self._read_marker_row)
@@ -106,10 +113,29 @@ def _sort_func(self, row1, row2):
return 0
return -1 if row1.timestamp < row2.timestamp else 1
+ def _filter_func(self, row):
+ if row.type in ('muc-user-joined', 'muc-user-left'):
+ return self._contact.settings.get('print_join_left')
+ return True
+
def add_muc_subject(self, text, nick, date):
subject = MUCSubject(self._account, text, nick, date)
self._insert_message(subject)
+ def add_muc_user_left(self, nick, reason, error=False):
+ join_left = MUCJoinLeft('muc-user-left',
+ self._account,
+ nick,
+ reason=reason,
+ error=error)
+ self._insert_message(join_left)
+
+ def add_muc_user_joined(self, nick):
+ join_left = MUCJoinLeft('muc-user-joined',
+ self._account,
+ nick)
+ self._insert_message(join_left)
+
def add_info_message(self, text):
message = InfoMessage(self._account, text)
self._insert_message(message)
@@ -364,3 +390,6 @@ def show_error(self, id_, error):
def on_quote(self, text):
self.emit('quote', text)
+
+ def _on_contact_setting_changed(self, *args):
+ self.invalidate_filter()