refactor: Split ChatRow out into own module

3 files changed, 575 insertions, 524 deletions

diff --git a/gajim/gtk/chat_list.py b/gajim/gtk/chat_list.py
index deb99b4f9..d403e5713 100644
--- a/gajim/gtk/chat_list.py
+++ b/gajim/gtk/chat_list.py
@@ -21,44 +21,26 @@ from typing import Union
 
 import logging
 import time
-import pickle
 
-from gi.repository import Gio
 from gi.repository import Gdk
 from gi.repository import GLib
 from gi.repository import GObject
 from gi.repository import Gtk
-import cairo
 
 from nbxmpp import JID
 
 from gajim.common import app
 from gajim.common import ged
 from gajim.common import events
-from gajim.common.const import AvatarSize
 from gajim.common.const import Direction
-from gajim.common.const import KindConstant
 from gajim.common.const import RowHeaderType
 from gajim.common.i18n import _
-from gajim.common.helpers import get_groupchat_name
 from gajim.common.helpers import get_group_chat_nick
 from gajim.common.helpers import get_retraction_text
-from gajim.common.helpers import get_uf_relative_time
-from gajim.common.helpers import message_needs_highlight
-from gajim.common.helpers import AdditionalDataDict
-from gajim.common.preview_helpers import filename_from_uri
-from gajim.common.preview_helpers import guess_simple_file_type
 from gajim.common.setting_values import OpenChatsSettingT
-from gajim.common.types import ChatContactT
-from gajim.common.types import OneOnOneContactT
-from gajim.common.modules.contacts import BareContact
-from gajim.common.modules.contacts import GroupchatContact
-from gajim.common.modules.contacts import GroupchatParticipant
-
-from .menus import get_chat_list_row_menu
-from .builder import get_builder
+
+from .chat_list_row import ChatRow
 from .util import EventHelper
-from .util import GajimPopover
 
 
 log = logging.getLogger('gajim.gui.chatlist')
@@ -154,9 +136,10 @@ class ChatList(Gtk.ListBox, EventHelper):
         if chat is not None:
             chat.reset_unread()
 
-    def emit_unread_changed(self) -> None:
+    def _emit_unread_changed(self) -> None:
         count = self.get_unread_count()
-        chat_list = cast(ChatList, self.get_parent())
+        chat_list = self.get_parent()
+        assert chat_list is not None
         chat_list.emit('unread-count-changed',
                        self._workspace_id,
                        count)
@@ -179,9 +162,16 @@ class ChatList(Gtk.ListBox, EventHelper):
         assert last_row is not None
         return cast(ChatRow, last_row)
 
-    def set_drag_row(self, row: ChatRow) -> None:
+    def _on_row_drag_begin(self,
+                           row: ChatRow,
+                           _drag_context: Gdk.DragContext
+                           ) -> None:
+
         self._drag_row = row
 
+    def _on_row_unread_changed(self, row: ChatRow) -> None:
+        self._emit_unread_changed()
+
     def _on_drag_data_received(self,
                                _widget: Gtk.Widget,
                                _drag_context: Gdk.DragContext,
@@ -320,6 +310,7 @@ class ChatList(Gtk.ListBox, EventHelper):
                                 _widget: Gtk.ListBox,
                                 event: Gdk.EventCrossing
                                 ) -> None:
+
         if event.type == Gdk.EventType.ENTER_NOTIFY:
             self._mouseover = True
 
@@ -379,6 +370,9 @@ class ChatList(Gtk.ListBox, EventHelper):
         if pinned:
             self._chat_order.insert(position, row)
 
+        row.connect('drag-begin', self._on_row_drag_begin)
+        row.connect('unread-changed', self._on_row_unread_changed)
+
         self.add(row)
 
     def select_chat(self, account: str, jid: JID) -> None:
@@ -476,14 +470,14 @@ class ChatList(Gtk.ListBox, EventHelper):
         self.remove(row)
         row.destroy()
         if emit_unread:
-            self.emit_unread_changed()
+            self._emit_unread_changed()
 
     def remove_chats_for_account(self, account: str) -> None:
         for row_account, jid in list(self._chats.keys()):
             if row_account != account:
                 continue
             self.remove_chat(account, jid)
-        self.emit_unread_changed()
+        self._emit_unread_changed()
 
     def get_selected_chat(self) -> Optional[ChatRow]:
         row = cast(ChatRow, self.get_selected_row())
@@ -674,502 +668,3 @@ class ChatList(Gtk.ListBox, EventHelper):
         rows = cast(list[ChatRow], self.get_children())
         for row in rows:
             row.update_name()
-
-
-class ChatRow(Gtk.ListBoxRow):
-    def __init__(self,
-                 workspace_id: str,
-                 account: str,
-                 jid: JID,
-                 type_: str,
-                 pinned: bool,
-                 position: int
-                 ) -> None:
-
-        Gtk.ListBoxRow.__init__(self)
-
-        self.account = account
-        self.jid = jid
-        self.workspace_id = workspace_id
-        self.type = type_
-        self.position = position
-
-        self.active_label = ActiveHeader()
-        self.conversations_label = ConversationsHeader()
-        self.pinned_label = PinnedHeader()
-
-        self._client = app.get_client(account)
-        self.contact = self._client.get_module('Contacts').get_contact(jid)
-
-        if isinstance(self.contact, BareContact):
-            self.contact.connect('presence-update', self._on_presence_update)
-            self.contact.connect('chatstate-update', self._on_chatstate_update)
-            self.contact.connect('nickname-update', self._on_nickname_update)
-            self.contact.connect('caps-update', self._on_avatar_update)
-            self.contact.connect('avatar-update', self._on_avatar_update)
-
-        elif isinstance(self.contact, GroupchatContact):
-            self.contact.connect('avatar-update', self._on_avatar_update)
-
-        elif isinstance(self.contact, GroupchatParticipant):
-            self.contact.connect('chatstate-update', self._on_chatstate_update)
-            self.contact.connect('user-joined', self._on_muc_user_update)
-            self.contact.connect('user-left', self._on_muc_user_update)
-            self.contact.connect('user-avatar-update', self._on_muc_user_update)
-            self.contact.connect('user-status-show-changed',
-                                 self._on_muc_user_update)
-
-            self.contact.room.connect('room-left', self._on_muc_update)
-            self.contact.room.connect('room-destroyed', self._on_muc_update)
-            self.contact.room.connect('room-kicked', self._on_muc_update)
-
-        self.contact_name: str = self.contact.name
-        self.timestamp: float = 0
-        self.stanza_id: Optional[str] = None
-        self.message_id: Optional[str] = None
-        self._unread_count: int = 0
-        self._needs_muc_highlight: bool = False
-        self._pinned: bool = pinned
-
-        self.get_style_context().add_class('chatlist-row')
-
-        self._ui = get_builder('chat_list_row.ui')
-        self.add(self._ui.eventbox)
-
-        self.connect('state-flags-changed', self._on_state_flags_changed)
-        self.connect('destroy', self._on_destroy)
-        self._ui.eventbox.connect('button-press-event', self._on_button_press)
-        self._ui.close_button.connect('clicked', self._on_close_button_clicked)
-
-        # Drag and Drop
-        entries = [Gtk.TargetEntry.new(
-            'CHAT_LIST_ITEM',
-            Gtk.TargetFlags.SAME_APP,
-            0)]
-        self._ui.eventbox.drag_source_set(
-            Gdk.ModifierType.BUTTON1_MASK,
-            entries,
-            Gdk.DragAction.MOVE)
-        self._ui.eventbox.connect('drag-begin', self._on_drag_begin)
-        self._ui.eventbox.connect('drag-data-get', self._on_drag_data_get)
-
-        if self.type == 'groupchat':
-            self._ui.group_chat_indicator.show()
-
-        self.update_avatar()
-        self.update_name()
-        self.update_account_identifier()
-
-        if (isinstance(self.contact, GroupchatContact) and
-                not self.contact.can_notify()):
-            self._ui.unread_label.get_style_context().add_class(
-                'unread-counter-silent')
-
-        # Get last chat message from archive
-        line = app.storage.archive.get_last_conversation_line(account, jid)
-
-        if line is None:
-            self.show_all()
-            return
-
-        if line.message is not None:
-            message_text = line.message
-
-            if line.additional_data is not None:
-                retracted_by = line.additional_data.get_value(
-                    'retracted', 'by')
-                if retracted_by is not None:
-                    reason = line.additional_data.get_value(
-                        'retracted', 'reason')
-                    message_text = get_retraction_text(
-                        self.account, retracted_by, reason)
-
-            me_nickname = None
-            if line.kind in (KindConstant.CHAT_MSG_SENT,
-                             KindConstant.SINGLE_MSG_SENT):
-                self.set_nick(_('Me'))
-                me_nickname = app.nicks[account]
-
-            if line.kind == KindConstant.GC_MSG:
-                our_nick = get_group_chat_nick(account, jid)
-                if line.contact_name == our_nick:
-                    self.set_nick(_('Me'))
-                    me_nickname = our_nick
-                else:
-                    self.set_nick(line.contact_name)
-                    me_nickname = line.contact_name
-
-            self.set_message_text(
-                message_text,
-                nickname=me_nickname,
-                additional_data=line.additional_data)
-
-            self.timestamp = line.time
-            uf_timestamp = get_uf_relative_time(line.time)
-            self._ui.timestamp_label.set_text(uf_timestamp)
-
-            self.stanza_id = line.stanza_id
-            self.message_id = line.message_id
-
-        if line.kind in (KindConstant.FILE_TRANSFER_INCOMING,
-                         KindConstant.FILE_TRANSFER_OUTGOING):
-            self.set_message_text(
-                _('File'), icon_name='text-x-generic-symbolic')
-            self.timestamp = line.time
-            uf_timestamp = get_uf_relative_time(line.time)
-            self._ui.timestamp_label.set_text(uf_timestamp)
-
-        if line.kind in (KindConstant.CALL_INCOMING,
-                         KindConstant.CALL_OUTGOING):
-            self.set_message_text(
-                _('Call'), icon_name='call-start-symbolic')
-            self.timestamp = line.time
-            uf_timestamp = get_uf_relative_time(line.time)
-            self._ui.timestamp_label.set_text(uf_timestamp)
-
-        self.show_all()
-
-    @property
-    def header(self) -> Optional[RowHeaderType]:
-        header = self.get_header()
-        if header is None:
-            return None
-        assert isinstance(header, BaseHeader)
-        return header.type
-
-    @header.setter
-    def header(self, type_: Optional[RowHeaderType]) -> None:
-        if type_ == self.header:
-            return
-        if type_ is None:
-            self.set_header(None)
-        elif type_ is RowHeaderType.PINNED:
-            self.set_header(self.pinned_label)
-        elif type_ == RowHeaderType.ACTIVE:
-            self.set_header(self.active_label)
-        else:
-            self.set_header(self.conversations_label)
-
-    @property
-    def is_pinned(self) -> bool:
-        return self._pinned
-
-    def _on_button_press(self,
-                         _widget: Gtk.Widget,
-                         event: Gdk.EventButton
-                         ) -> None:
-        if event.button == 3:  # right click
-            self._popup_menu(event)
-        elif event.button == 2:  # middle click
-            app.window.activate_action(
-                'remove-chat',
-                GLib.Variant('as', [self.account, str(self.jid)]))
-
-    def _popup_menu(self, event: Gdk.EventButton):
-        menu = get_chat_list_row_menu(
-            self.workspace_id, self.account, self.jid, self._pinned)
-
-        event_widget = Gtk.get_event_widget(event)
-        x = event.x
-        if isinstance(event_widget, Gtk.Button):
-            # When the event is triggered by pressing the close button we get
-            # a x coordinate relative to the window of the close button, which
-            # would be a very low x integer as the close button is small, this
-            # leads to opening the menu far away from the mouse. We overwrite
-            # the x coordinate with an approx. position of the close button.
-            x = self.get_allocated_width() - 10
-
-        popover = GajimPopover(menu, relative_to=self)
-        popover.set_pointing_to_coord(x=x, y=event.y)
-        popover.popup()
-
-    def _on_drag_begin(self,
-                       widget: Gtk.Widget,
-                       drag_context: Gdk.DragContext
-                       ) -> None:
-
-        chat_list = cast(ChatList, self.get_parent())
-        chat_list.set_drag_row(self)
-
-        # Use rendered ChatListRow as drag icon
-        alloc = self.get_allocation()
-        surface = cairo.ImageSurface(
-            cairo.Format.ARGB32, alloc.width, alloc.height)
-        context = cairo.Context(surface)
-        self.draw(context)
-        coords = widget.translate_coordinates(self, 0, 0)
-        if coords is None:
-            return
-        dest_x, dest_y = coords
-        surface.set_device_offset(-dest_x, -dest_y)
-        Gtk.drag_set_icon_surface(drag_context, surface)
-
-    def _on_drag_data_get(self,
-                          _widget: Gtk.Widget,
-                          _drag_context: Gdk.DragContext,
-                          selection_data: Gtk.SelectionData,
-                          _info: int,
-                          _time: int
-                          ) -> None:
-        drop_type = Gdk.Atom.intern_static_string('CHAT_LIST_ITEM')
-        byte_data = pickle.dumps((self.account, self.jid))
-        selection_data.set(drop_type, 8, byte_data)
-
-    def toggle_pinned(self) -> None:
-        self._pinned = not self._pinned
-
-    def _on_presence_update(self,
-                            _contact: ChatContactT,
-                            _signal_name: str
-                            ) -> None:
-        self.update_avatar()
-
-    def _on_avatar_update(self,
-                          _contact: ChatContactT,
-                          _signal_name: str
-                          ) -> None:
-        self.update_avatar()
-
-    def _on_muc_user_update(self,
-                            _contact: GroupchatParticipant,
-                            _signal_name: str,
-                            *args: Any
-                            ) -> None:
-        self.update_avatar()
-
-    def _on_muc_update(self,
-                       _contact: GroupchatContact,
-                       _signal_name: str,
-                       *args: Any
-                       ) -> None:
-        self.update_avatar()
-
-    def update_avatar(self) -> None:
-        scale = self.get_scale_factor()
-        surface = self.contact.get_avatar(AvatarSize.ROSTER, scale)
-        self._ui.avatar_image.set_from_surface(surface)
-
-    def update_name(self) -> None:
-        if self.type == 'pm':
-            client = app.get_client(self.account)
-            muc_name = get_groupchat_name(client, self.jid.new_as_bare())
-            self._ui.name_label.set_text(f'{self.contact.name} ({muc_name})')
-            return
-
-        self.contact_name = self.contact.name
-        if self.jid == self._client.get_own_jid().bare:
-            self.contact_name = _('Note to myself')
-        self._ui.name_label.set_text(self.contact_name)
-
-    def update_account_identifier(self) -> None:
-        account_class = app.css_config.get_dynamic_class(self.account)
-        self._ui.account_identifier.get_style_context().add_class(account_class)
-        show = len(app.settings.get_active_accounts()) > 1
-        self._ui.account_identifier.set_visible(show)
-
-    def _on_chatstate_update(self,
-                             contact: OneOnOneContactT,
-                             _signal_name: str
-                             ) -> None:
-        if contact.chatstate is None:
-            self._ui.chatstate_image.hide()
-        else:
-            self._ui.chatstate_image.set_visible(contact.chatstate.is_composing)
-
-    def _on_nickname_update(self,
-                            _contact: ChatContactT,
-                            _signal_name: str
-                            ) -> None:
-        self.update_name()
-
-    def get_real_unread_count(self) -> int:
-        return self._unread_count
-
-    @property
-    def unread_count(self) -> int:
-        if (self.contact.is_groupchat and not self.contact.can_notify() and
-                not self._needs_muc_highlight):
-            return 0
-        return self._unread_count
-
-    @unread_count.setter
-    def unread_count(self, value: int) -> None:
-        self._unread_count = value
-        self._update_unread()
-        chat_list = cast(ChatList, self.get_parent())
-        chat_list.emit_unread_changed()
-
-    def _update_unread(self) -> None:
-        unread_count = self._get_unread_string(self._unread_count)
-        self._ui.unread_label.set_text(unread_count)
-        self._ui.unread_label.set_visible(bool(self._unread_count))
-
-    @staticmethod
-    def _get_unread_string(count: int) -> str:
-        if count < 1000:
-            return str(count)
-        return '999+'
-
-    def add_unread(self, text: str) -> None:
-        control = app.window.get_control()
-        if (self.is_active and
-                control.is_loaded(self.account, self.jid) and
-                control.get_autoscroll()):
-            return
-
-        self._unread_count += 1
-        self._update_unread()
-        app.storage.cache.set_unread_count(
-            self.account,
-            self.jid,
-            self.get_real_unread_count(),
-            self.message_id,
-            self.timestamp)
-
-        if self.contact.is_groupchat:
-            needs_highlight = message_needs_highlight(
-                text,
-                self.contact.nickname,
-                self._client.get_own_jid().bare)
-            if needs_highlight:
-                self._needs_muc_highlight = True
-                self._ui.unread_label.get_style_context().remove_class(
-                    'unread-counter-silent')
-
-        chat_list = cast(ChatList, self.get_parent())
-        chat_list.emit_unread_changed()
-
-    def reset_unread(self) -> None:
-        self._needs_muc_highlight = False
-        self._unread_count = 0
-        self._update_unread()
-        chat_list = cast(ChatList, self.get_parent())
-        chat_list.emit_unread_changed()
-        app.storage.cache.reset_unread_count(self.account, self.jid)
-
-        # Add class again in case we were mentioned previously
-        if self.contact.is_groupchat and not self.contact.can_notify():
-            self._ui.unread_label.get_style_context().add_class(
-                'unread-counter-silent')
-
-    @property
-    def is_active(self) -> bool:
-        return (self.is_selected() and
-                self.get_toplevel().get_property('is-active'))
-
-    @property
-    def is_recent(self) -> bool:
-        if self._unread_count:
-            return True
-        return False
-
-    def _on_state_flags_changed(self,
-                                _row: ChatRow,
-                                _flags: Gtk.StateFlags
-                                ) -> None:
-        state = self.get_state_flags()
-        if (state & Gtk.StateFlags.PRELIGHT) != 0:
-            self._ui.revealer.set_reveal_child(True)
-        else:
-            self._ui.revealer.set_reveal_child(False)
-
-    def _on_destroy(self, _row: ChatRow) -> None:
-        self.contact.disconnect_all_from_obj(self)
-        if isinstance(self.contact, GroupchatParticipant):
-            self.contact.room.disconnect_all_from_obj(self)
-
-        app.check_finalize(self)
-
-    def _on_close_button_clicked(self, _button: Gtk.Button) -> None:
-        app.window.activate_action(
-            'remove-chat',
-            GLib.Variant('as', [self.account, str(self.jid)]))
-
-    def set_timestamp(self, timestamp: int) -> None:
-        self.timestamp = timestamp
-        self.update_time()
-
-    def set_stanza_id(self, stanza_id: str) -> None:
-        self.stanza_id = stanza_id
-
-    def set_message_id(self, message_id: str) -> None:
-        self.message_id = message_id
-
-    def update_time(self) -> None:
-        if self.timestamp == 0:
-            return
-        self._ui.timestamp_label.set_text(
-            get_uf_relative_time(self.timestamp))
-
-    def set_nick(self, nickname: str) -> None:
-        self._ui.nick_label.set_visible(bool(nickname))
-        self._ui.nick_label.set_text(
-            _('%(nickname)s:') % {'nickname': nickname})
-
-    def set_message_text(self,
-                         text: str,
-                         nickname: Optional[str] = None,
-                         icon_name: Optional[str] = None,
-                         additional_data: Optional[AdditionalDataDict] = None
-                         ) -> None:
-        icon = None
-        if icon_name is not None:
-            icon = Gio.Icon.new_for_string(icon_name)
-        if additional_data is not None:
-            if app.preview_manager.is_previewable(text, additional_data):
-                file_name = filename_from_uri(text)
-                icon, file_type = guess_simple_file_type(text)
-                text = f'{file_type} ({file_name})'
-
-        text = GLib.markup_escape_text(text)
-        if text.startswith('/me') and nickname is not None:
-            nickname = GLib.markup_escape_text(nickname)
-            text = text.replace('/me', f'* {nickname}', 1)
-            text = f'<i>{text}</i>'
-
-        # Split by newline and display last line (or first, if last is newline)
-        lines = text.split('\n')
-        text = lines[-1] or lines[0]
-        self._ui.message_label.set_markup(text)
-
-        if icon is None:
-            self._ui.message_icon.hide()
-        else:
-            self._ui.message_icon.set_from_gicon(icon, Gtk.IconSize.MENU)
-            self._ui.message_icon.show()
-
-
-class BaseHeader(Gtk.Box):
-    def __init__(self, row_type: RowHeaderType, text: str) -> None:
-        Gtk.Box.__init__(self, orientation=Gtk.Orientation.VERTICAL)
-        self.type = row_type
-        label = Gtk.Label(label=text)
-        label.set_halign(Gtk.Align.START)
-        self.add(label)
-        self.get_style_context().add_class('header-box')
-        self.show_all()
-
-
-class ActiveHeader(BaseHeader):
-
-    def __init__(self):
-        BaseHeader.__init__(self,
-                            RowHeaderType.ACTIVE,
-                            _('Active'))
-
-
-class ConversationsHeader(BaseHeader):
-
-    def __init__(self):
-        BaseHeader.__init__(self,
-                            RowHeaderType.CONVERSATIONS,
-                            _('Conversations'))
-
-
-class PinnedHeader(BaseHeader):
-
-    def __init__(self):
-        BaseHeader.__init__(self,
-                            RowHeaderType.PINNED,
-                            _('Pinned'))
-        self.get_style_context().add_class('header-box-first')
diff --git a/gajim/gtk/chat_list_row.py b/gajim/gtk/chat_list_row.py
new file mode 100644
index 000000000..3c57d7813
--- /dev/null
+++ b/gajim/gtk/chat_list_row.py
@@ -0,0 +1,555 @@
+# 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/>.
+
+from __future__ import annotations
+
+from typing import Optional
+from typing import Any
+
+import pickle
+
+from gi.repository import Gdk
+from gi.repository import Gio
+from gi.repository import GLib
+from gi.repository import Gtk
+from gi.repository import GObject
+import cairo
+
+from nbxmpp import JID
+
+from gajim.common import app
+from gajim.common.const import AvatarSize
+from gajim.common.const import KindConstant
+from gajim.common.const import RowHeaderType
+from gajim.common.i18n import _
+from gajim.common.helpers import get_groupchat_name
+from gajim.common.helpers import get_group_chat_nick
+from gajim.common.helpers import get_retraction_text
+from gajim.common.helpers import get_uf_relative_time
+from gajim.common.helpers import message_needs_highlight
+from gajim.common.helpers import AdditionalDataDict
+from gajim.common.preview_helpers import filename_from_uri
+from gajim.common.preview_helpers import guess_simple_file_type
+from gajim.common.types import ChatContactT
+from gajim.common.types import OneOnOneContactT
+from gajim.common.modules.contacts import BareContact
+from gajim.common.modules.contacts import GroupchatContact
+from gajim.common.modules.contacts import GroupchatParticipant
+
+from .menus import get_chat_list_row_menu
+from .builder import get_builder
+from .util import GajimPopover
+
+
+class ChatRow(Gtk.ListBoxRow):
+
+    __gsignals__ = {
+        'unread-changed': (
+            GObject.SignalFlags.RUN_LAST,
+            None,
+            ()),
+    }
+
+    def __init__(self,
+                 workspace_id: str,
+                 account: str,
+                 jid: JID,
+                 type_: str,
+                 pinned: bool,
+                 position: int
+                 ) -> None:
+
+        Gtk.ListBoxRow.__init__(self)
+
+        self.account = account
+        self.jid = jid
+        self.workspace_id = workspace_id
+        self.type = type_
+        self.position = position
+
+        self.active_label = ActiveHeader()
+        self.conversations_label = ConversationsHeader()
+        self.pinned_label = PinnedHeader()
+
+        self._client = app.get_client(account)
+        self.contact = self._client.get_module('Contacts').get_contact(jid)
+
+        if isinstance(self.contact, BareContact):
+            self.contact.connect('presence-update', self._on_presence_update)
+            self.contact.connect('chatstate-update', self._on_chatstate_update)
+            self.contact.connect('nickname-update', self._on_nickname_update)
+            self.contact.connect('caps-update', self._on_avatar_update)
+            self.contact.connect('avatar-update', self._on_avatar_update)
+
+        elif isinstance(self.contact, GroupchatContact):
+            self.contact.connect('avatar-update', self._on_avatar_update)
+
+        elif isinstance(self.contact, GroupchatParticipant):
+            self.contact.connect('chatstate-update', self._on_chatstate_update)
+            self.contact.connect('user-joined', self._on_muc_user_update)
+            self.contact.connect('user-left', self._on_muc_user_update)
+            self.contact.connect('user-avatar-update', self._on_muc_user_update)
+            self.contact.connect('user-status-show-changed',
+                                 self._on_muc_user_update)
+
+            self.contact.room.connect('room-left', self._on_muc_update)
+            self.contact.room.connect('room-destroyed', self._on_muc_update)
+            self.contact.room.connect('room-kicked', self._on_muc_update)
+
+        self.contact_name: str = self.contact.name
+        self.timestamp: float = 0
+        self.stanza_id: Optional[str] = None
+        self.message_id: Optional[str] = None
+        self._unread_count: int = 0
+        self._needs_muc_highlight: bool = False
+        self._pinned: bool = pinned
+
+        self.get_style_context().add_class('chatlist-row')
+
+        self._ui = get_builder('chat_list_row.ui')
+        self.add(self._ui.eventbox)
+
+        self.connect('state-flags-changed', self._on_state_flags_changed)
+        self.connect('destroy', self._on_destroy)
+        self._ui.eventbox.connect('button-press-event', self._on_button_press)
+        self._ui.close_button.connect('clicked', self._on_close_button_clicked)
+
+        # Drag and Drop
+        entries = [Gtk.TargetEntry.new(
+            'CHAT_LIST_ITEM',
+            Gtk.TargetFlags.SAME_APP,
+            0)]
+        self.drag_source_set(
+            Gdk.ModifierType.BUTTON1_MASK,
+            entries,
+            Gdk.DragAction.MOVE)
+        self.connect('drag-begin', self._on_drag_begin)
+        self.connect('drag-data-get', self._on_drag_data_get)
+
+        if self.type == 'groupchat':
+            self._ui.group_chat_indicator.show()
+
+        self.update_avatar()
+        self.update_name()
+        self.update_account_identifier()
+
+        if (isinstance(self.contact, GroupchatContact) and
+                not self.contact.can_notify()):
+            self._ui.unread_label.get_style_context().add_class(
+                'unread-counter-silent')
+
+        # Get last chat message from archive
+        line = app.storage.archive.get_last_conversation_line(account, jid)
+
+        if line is None:
+            self.show_all()
+            return
+
+        if line.message is not None:
+            message_text = line.message
+
+            if line.additional_data is not None:
+                retracted_by = line.additional_data.get_value(
+                    'retracted', 'by')
+                if retracted_by is not None:
+                    reason = line.additional_data.get_value(
+                        'retracted', 'reason')
+                    message_text = get_retraction_text(
+                        self.account, retracted_by, reason)
+
+            me_nickname = None
+            if line.kind in (KindConstant.CHAT_MSG_SENT,
+                             KindConstant.SINGLE_MSG_SENT):
+                self.set_nick(_('Me'))
+                me_nickname = app.nicks[account]
+
+            if line.kind == KindConstant.GC_MSG:
+                our_nick = get_group_chat_nick(account, jid)
+                if line.contact_name == our_nick:
+                    self.set_nick(_('Me'))
+                    me_nickname = our_nick
+                else:
+                    self.set_nick(line.contact_name)
+                    me_nickname = line.contact_name
+
+            self.set_message_text(
+                message_text,
+                nickname=me_nickname,
+                additional_data=line.additional_data)
+
+            self.timestamp = line.time
+            uf_timestamp = get_uf_relative_time(line.time)
+            self._ui.timestamp_label.set_text(uf_timestamp)
+
+            self.stanza_id = line.stanza_id
+            self.message_id = line.message_id
+
+        if line.kind in (KindConstant.FILE_TRANSFER_INCOMING,
+                         KindConstant.FILE_TRANSFER_OUTGOING):
+            self.set_message_text(
+                _('File'), icon_name='text-x-generic-symbolic')
+            self.timestamp = line.time
+            uf_timestamp = get_uf_relative_time(line.time)
+            self._ui.timestamp_label.set_text(uf_timestamp)
+
+        if line.kind in (KindConstant.CALL_INCOMING,
+                         KindConstant.CALL_OUTGOING):
+            self.set_message_text(
+                _('Call'), icon_name='call-start-symbolic')
+            self.timestamp = line.time
+            uf_timestamp = get_uf_relative_time(line.time)
+            self._ui.timestamp_label.set_text(uf_timestamp)
+
+        self.show_all()
+
+    @property
+    def header(self) -> Optional[RowHeaderType]:
+        header = self.get_header()
+        if header is None:
+            return None
+        assert isinstance(header, BaseHeader)
+        return header.type
+
+    @header.setter
+    def header(self, type_: Optional[RowHeaderType]) -> None:
+        if type_ == self.header:
+            return
+        if type_ is None:
+            self.set_header(None)
+        elif type_ is RowHeaderType.PINNED:
+            self.set_header(self.pinned_label)
+        elif type_ == RowHeaderType.ACTIVE:
+            self.set_header(self.active_label)
+        else:
+            self.set_header(self.conversations_label)
+
+    @property
+    def is_pinned(self) -> bool:
+        return self._pinned
+
+    def _on_button_press(self,
+                         _widget: Gtk.Widget,
+                         event: Gdk.EventButton
+                         ) -> None:
+        if event.button == 3:  # right click
+            self._popup_menu(event)
+        elif event.button == 2:  # middle click
+            app.window.activate_action(
+                'remove-chat',
+                GLib.Variant('as', [self.account, str(self.jid)]))
+
+    def _popup_menu(self, event: Gdk.EventButton):
+        menu = get_chat_list_row_menu(
+            self.workspace_id, self.account, self.jid, self._pinned)
+
+        event_widget = Gtk.get_event_widget(event)
+        x = event.x
+        if isinstance(event_widget, Gtk.Button):
+            # When the event is triggered by pressing the close button we get
+            # a x coordinate relative to the window of the close button, which
+            # would be a very low x integer as the close button is small, this
+            # leads to opening the menu far away from the mouse. We overwrite
+            # the x coordinate with an approx. position of the close button.
+            x = self.get_allocated_width() - 10
+
+        popover = GajimPopover(menu, relative_to=self)
+        popover.set_pointing_to_coord(x=x, y=event.y)
+        popover.popup()
+
+    def _on_drag_begin(self,
+                       row: ChatRow,
+                       drag_context: Gdk.DragContext
+                       ) -> None:
+
+        # Use rendered ChatRow as drag icon
+        alloc = self.get_allocation()
+        surface = cairo.ImageSurface(
+            cairo.Format.ARGB32, alloc.width, alloc.height)
+        context = cairo.Context(surface)
+        self.draw(context)
+        coords = row.translate_coordinates(self, 0, 0)
+        if coords is None:
+            return
+        dest_x, dest_y = coords
+        surface.set_device_offset(-dest_x, -dest_y)
+        Gtk.drag_set_icon_surface(drag_context, surface)
+
+    def _on_drag_data_get(self,
+                          _widget: Gtk.Widget,
+                          _drag_context: Gdk.DragContext,
+                          selection_data: Gtk.SelectionData,
+                          _info: int,
+                          _time: int
+                          ) -> None:
+
+        drop_type = Gdk.Atom.intern_static_string('CHAT_LIST_ITEM')
+        byte_data = pickle.dumps((self.account, self.jid))
+        selection_data.set(drop_type, 8, byte_data)
+
+    def toggle_pinned(self) -> None:
+        self._pinned = not self._pinned
+
+    def _on_presence_update(self,
+                            _contact: ChatContactT,
+                            _signal_name: str
+                            ) -> None:
+        self.update_avatar()
+
+    def _on_avatar_update(self,
+                          _contact: ChatContactT,
+                          _signal_name: str
+                          ) -> None:
+        self.update_avatar()
+
+    def _on_muc_user_update(self,
+                            _contact: GroupchatParticipant,
+                            _signal_name: str,
+                            *args: Any
+                            ) -> None:
+        self.update_avatar()
+
+    def _on_muc_update(self,
+                       _contact: GroupchatContact,
+                       _signal_name: str,
+                       *args: Any
+                       ) -> None:
+        self.update_avatar()
+
+    def update_avatar(self) -> None:
+        scale = self.get_scale_factor()
+        surface = self.contact.get_avatar(AvatarSize.ROSTER, scale)
+        self._ui.avatar_image.set_from_surface(surface)
+
+    def update_name(self) -> None:
+        if self.type == 'pm':
+            client = app.get_client(self.account)
+            muc_name = get_groupchat_name(client, self.jid.new_as_bare())
+            self._ui.name_label.set_text(f'{self.contact.name} ({muc_name})')
+            return
+
+        self.contact_name = self.contact.name
+        if self.jid == self._client.get_own_jid().bare:
+            self.contact_name = _('Note to myself')
+        self._ui.name_label.set_text(self.contact_name)
+
+    def update_account_identifier(self) -> None:
+        account_class = app.css_config.get_dynamic_class(self.account)
+        self._ui.account_identifier.get_style_context().add_class(account_class)
+        show = len(app.settings.get_active_accounts()) > 1
+        self._ui.account_identifier.set_visible(show)
+
+    def _on_chatstate_update(self,
+                             contact: OneOnOneContactT,
+                             _signal_name: str
+                             ) -> None:
+        if contact.chatstate is None:
+            self._ui.chatstate_image.hide()
+        else:
+            self._ui.chatstate_image.set_visible(contact.chatstate.is_composing)
+
+    def _on_nickname_update(self,
+                            _contact: ChatContactT,
+                            _signal_name: str
+                            ) -> None:
+        self.update_name()
+
+    def get_real_unread_count(self) -> int:
+        return self._unread_count
+
+    @property
+    def unread_count(self) -> int:
+        if (self.contact.is_groupchat and not self.contact.can_notify() and
+                not self._needs_muc_highlight):
+            return 0
+        return self._unread_count
+
+    @unread_count.setter
+    def unread_count(self, value: int) -> None:
+        self._unread_count = value
+        self._update_unread()
+        self.emit('unread-changed')
+
+    def _update_unread(self) -> None:
+        unread_count = self._get_unread_string(self._unread_count)
+        self._ui.unread_label.set_text(unread_count)
+        self._ui.unread_label.set_visible(bool(self._unread_count))
+
+    @staticmethod
+    def _get_unread_string(count: int) -> str:
+        if count < 1000:
+            return str(count)
+        return '999+'
+
+    def add_unread(self, text: str) -> None:
+        control = app.window.get_control()
+        if (self.is_active and
+                control.is_loaded(self.account, self.jid) and
+                control.get_autoscroll()):
+            return
+
+        self._unread_count += 1
+        self._update_unread()
+        app.storage.cache.set_unread_count(
+            self.account,
+            self.jid,
+            self.get_real_unread_count(),
+            self.message_id,
+            self.timestamp)
+
+        if self.contact.is_groupchat:
+            needs_highlight = message_needs_highlight(
+                text,
+                self.contact.nickname,
+                self._client.get_own_jid().bare)
+            if needs_highlight:
+                self._needs_muc_highlight = True
+                self._ui.unread_label.get_style_context().remove_class(
+                    'unread-counter-silent')
+
+        self.emit('unread-changed')
+
+    def reset_unread(self) -> None:
+        self._needs_muc_highlight = False
+        self._unread_count = 0
+        self._update_unread()
+        self.emit('unread-changed')
+
+        app.storage.cache.reset_unread_count(self.account, self.jid)
+
+        # Add class again in case we were mentioned previously
+        if self.contact.is_groupchat and not self.contact.can_notify():
+            self._ui.unread_label.get_style_context().add_class(
+                'unread-counter-silent')
+
+    @property
+    def is_active(self) -> bool:
+        return (self.is_selected() and
+                self.get_toplevel().get_property('is-active'))
+
+    @property
+    def is_recent(self) -> bool:
+        if self._unread_count:
+            return True
+        return False
+
+    def _on_state_flags_changed(self,
+                                _row: ChatRow,
+                                _flags: Gtk.StateFlags
+                                ) -> None:
+        state = self.get_state_flags()
+        if (state & Gtk.StateFlags.PRELIGHT) != 0:
+            self._ui.revealer.set_reveal_child(True)
+        else:
+            self._ui.revealer.set_reveal_child(False)
+
+    def _on_destroy(self, _row: ChatRow) -> None:
+        self.contact.disconnect_all_from_obj(self)
+        if isinstance(self.contact, GroupchatParticipant):
+            self.contact.room.disconnect_all_from_obj(self)
+
+        app.check_finalize(self)
+
+    def _on_close_button_clicked(self, _button: Gtk.Button) -> None:
+        app.window.activate_action(
+            'remove-chat',
+            GLib.Variant('as', [self.account, str(self.jid)]))
+
+    def set_timestamp(self, timestamp: int) -> None:
+        self.timestamp = timestamp
+        self.update_time()
+
+    def set_stanza_id(self, stanza_id: str) -> None:
+        self.stanza_id = stanza_id
+
+    def set_message_id(self, message_id: str) -> None:
+        self.message_id = message_id
+
+    def update_time(self) -> None:
+        if self.timestamp == 0:
+            return
+        self._ui.timestamp_label.set_text(
+            get_uf_relative_time(self.timestamp))
+
+    def set_nick(self, nickname: str) -> None:
+        self._ui.nick_label.set_visible(bool(nickname))
+        self._ui.nick_label.set_text(
+            _('%(nickname)s:') % {'nickname': nickname})
+
+    def set_message_text(self,
+                         text: str,
+                         nickname: Optional[str] = None,
+                         icon_name: Optional[str] = None,
+                         additional_data: Optional[AdditionalDataDict] = None
+                         ) -> None:
+        icon = None
+        if icon_name is not None:
+            icon = Gio.Icon.new_for_string(icon_name)
+        if additional_data is not None:
+            if app.preview_manager.is_previewable(text, additional_data):
+                file_name = filename_from_uri(text)
+                icon, file_type = guess_simple_file_type(text)
+                text = f'{file_type} ({file_name})'
+
+        text = GLib.markup_escape_text(text)
+        if text.startswith('/me') and nickname is not None:
+            nickname = GLib.markup_escape_text(nickname)
+            text = text.replace('/me', f'* {nickname}', 1)
+            text = f'<i>{text}</i>'
+
+        # Split by newline and display last line (or first, if last is newline)
+        lines = text.split('\n')
+        text = lines[-1] or lines[0]
+        self._ui.message_label.set_markup(text)
+
+        if icon is None:
+            self._ui.message_icon.hide()
+        else:
+            self._ui.message_icon.set_from_gicon(icon, Gtk.IconSize.MENU)
+            self._ui.message_icon.show()
+
+
+class BaseHeader(Gtk.Box):
+    def __init__(self, row_type: RowHeaderType, text: str) -> None:
+        Gtk.Box.__init__(self, orientation=Gtk.Orientation.VERTICAL)
+        self.type = row_type
+        label = Gtk.Label(label=text)
+        label.set_halign(Gtk.Align.START)
+        self.add(label)
+        self.get_style_context().add_class('header-box')
+        self.show_all()
+
+
+class ActiveHeader(BaseHeader):
+
+    def __init__(self):
+        BaseHeader.__init__(self,
+                            RowHeaderType.ACTIVE,
+                            _('Active'))
+
+
+class ConversationsHeader(BaseHeader):
+
+    def __init__(self):
+        BaseHeader.__init__(self,
+                            RowHeaderType.CONVERSATIONS,
+                            _('Conversations'))
+
+
+class PinnedHeader(BaseHeader):
+
+    def __init__(self):
+        BaseHeader.__init__(self,
+                            RowHeaderType.PINNED,
+                            _('Pinned'))
+        self.get_style_context().add_class('header-box-first')
diff --git a/pyrightconfig.json b/pyrightconfig.json
index b833c0cee..9da53ad58 100644
--- a/pyrightconfig.json
+++ b/pyrightconfig.json
@@ -63,6 +63,7 @@
         "gajim/gtk/chat_filter.py",
         "gajim/gtk/chat_function_page.py",
         "gajim/gtk/chat_list.py",
+        "gajim/gtk/chat_list_row.py",
         "gajim/gtk/chat_list_stack.py",
         "gajim/gtk/chat_page.py",
         "gajim/gtk/chat_stack.py",