From 23c2fa8ee56807cf41a0b1ec21bf0e4fa0e0401a Mon Sep 17 00:00:00 2001
From: TranRed <kupfer.nils@gmail.com>
Date: Sun, 25 Aug 2019 15:09:30 +0200
Subject: [PATCH] made fillLatestMessages into a free standing function

---
 src/widgets/dialogs/UserInfoPopup.cpp | 51 +++++++++++++++------------
 src/widgets/dialogs/UserInfoPopup.hpp |  1 -
 2 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/src/widgets/dialogs/UserInfoPopup.cpp b/src/widgets/dialogs/UserInfoPopup.cpp
index 960e5861..b774b054 100644
--- a/src/widgets/dialogs/UserInfoPopup.cpp
+++ b/src/widgets/dialogs/UserInfoPopup.cpp
@@ -40,6 +40,32 @@ int calculateTimeoutDuration(TimeoutButton timeout)
     return timeout.second * durations[timeout.first];
 }
 
+chatterino::ChannelPtr filterMessages(const QString &userName,
+                                      chatterino::ChannelPtr channel)
+{
+    chatterino::LimitedQueueSnapshot<chatterino::MessagePtr> snapshot =
+        channel->getMessageSnapshot();
+
+    chatterino::ChannelPtr channelPtr(new chatterino::Channel(
+        channel->getName(), chatterino::Channel::Type::None));
+
+    for (size_t i = 0; i < snapshot.size(); i++)
+    {
+        chatterino::MessagePtr message = snapshot[i];
+
+        bool isSelectedUser =
+            message->loginName.compare(userName, Qt::CaseInsensitive) == 0;
+
+        if (isSelectedUser &&
+            !message->flags.has(chatterino::MessageFlag::Whisper))
+        {
+            channelPtr->addMessage(message);
+        }
+    }
+
+    return channelPtr;
+}
+
 }  // namespace
 
 namespace chatterino {
@@ -363,7 +389,8 @@ void UserInfoPopup::setData(const QString &name, const ChannelPtr &channel)
 
     this->userStateChanged_.invoke();
 
-    this->fillLatestMessages();
+    this->latestMessages_->setChannel(
+        filterMessages(this->userName_, this->channel_));
 }
 
 void UserInfoPopup::updateUserData()
@@ -554,26 +581,4 @@ void UserInfoPopup::TimeoutWidget::paintEvent(QPaintEvent *)
     //    / 2);
 }
 
-void UserInfoPopup::fillLatestMessages()
-{
-    LimitedQueueSnapshot<MessagePtr> snapshot =
-        this->channel_->getMessageSnapshot();
-    ChannelPtr channelPtr(
-        new Channel(this->channel_->getName(), Channel::Type::None));
-    for (size_t i = 0; i < snapshot.size(); i++)
-    {
-        MessagePtr message = snapshot[i];
-
-        bool isSelectedUser = message->loginName.compare(
-                                  this->userName_, Qt::CaseInsensitive) == 0;
-
-        if (isSelectedUser && !message->flags.has(MessageFlag::Whisper))
-        {
-            channelPtr->addMessage(message);
-        }
-    }
-
-    this->latestMessages_->setChannel(channelPtr);
-}
-
 }  // namespace chatterino
diff --git a/src/widgets/dialogs/UserInfoPopup.hpp b/src/widgets/dialogs/UserInfoPopup.hpp
index 91f49744..8a07ffd9 100644
--- a/src/widgets/dialogs/UserInfoPopup.hpp
+++ b/src/widgets/dialogs/UserInfoPopup.hpp
@@ -28,7 +28,6 @@ protected:
 private:
     void installEvents();
     void updateUserData();
-    void fillLatestMessages();
 
     void loadAvatar(const QUrl &url);
     bool isMod_;