From 94ffc66b2a514e76ca159c509ac48889c3e2a136 Mon Sep 17 00:00:00 2001
From: TranRed <kupfer.nils@gmail.com>
Date: Sat, 20 Jul 2019 22:42:01 +0200
Subject: [PATCH] extracted latest messages logic into its own method

---
 src/widgets/dialogs/UserInfoPopup.cpp | 34 +++++++++++++++------------
 src/widgets/dialogs/UserInfoPopup.hpp |  3 ++-
 2 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/src/widgets/dialogs/UserInfoPopup.cpp b/src/widgets/dialogs/UserInfoPopup.cpp
index fd9633e4b..92a7f395a 100644
--- a/src/widgets/dialogs/UserInfoPopup.cpp
+++ b/src/widgets/dialogs/UserInfoPopup.cpp
@@ -204,9 +204,9 @@ UserInfoPopup::UserInfoPopup()
     }
 
     // fourth line (last messages)
-    this->lastMessages_ = new ChannelView();
-    this->lastMessages_->setScaleIndependantHeight(150);
-    layout.append(this->lastMessages_);
+    this->latestMessages_ = new ChannelView();
+    this->latestMessages_->setScaleIndependantHeight(150);
+    layout.append(this->latestMessages_);
 
     this->setStyleSheet("font-size: 11pt;");
 
@@ -347,18 +347,7 @@ void UserInfoPopup::setData(const QString &name, const ChannelPtr &channel)
 
     this->userStateChanged_.invoke();
 
-    LimitedQueueSnapshot<MessagePtr> snapshot = this->channel_->getMessageSnapshot();
-    ChannelPtr channelPtr(new Channel("search", Channel::Type::None));
-    for (size_t i = 0; i < snapshot.size(); i++)
-    {
-        MessagePtr message = snapshot[i];
-        if ( message->loginName.compare(this->userName_, Qt::CaseInsensitive) == 0)
-        {
-            channelPtr->addMessage(message);
-        }
-    }
-
-    this->lastMessages_->setChannel(channelPtr);
+    this->fillLatestMessages();
 }
 
 void UserInfoPopup::updateUserData()
@@ -625,4 +614,19 @@ void UserInfoPopup::TimeoutWidget::paintEvent(QPaintEvent *)
     //    / 2);
 }
 
+void UserInfoPopup::fillLatestMessages(){
+    LimitedQueueSnapshot<MessagePtr> snapshot = this->channel_->getMessageSnapshot();
+    ChannelPtr channelPtr(new Channel("search", Channel::Type::None));
+    for (size_t i = 0; i < snapshot.size(); i++)
+    {
+        MessagePtr message = snapshot[i];
+        if ( message->loginName.compare(this->userName_, Qt::CaseInsensitive) == 0)
+        {
+            channelPtr->addMessage(message);
+        }
+    }
+
+    this->latestMessages_->setChannel(channelPtr);
+}
+
 }  // namespace chatterino
diff --git a/src/widgets/dialogs/UserInfoPopup.hpp b/src/widgets/dialogs/UserInfoPopup.hpp
index 9a603b405..d65ca1463 100644
--- a/src/widgets/dialogs/UserInfoPopup.hpp
+++ b/src/widgets/dialogs/UserInfoPopup.hpp
@@ -28,6 +28,7 @@ protected:
 private:
     void installEvents();
     void updateUserData();
+    void fillLatestMessages();
 
     void loadAvatar(const QUrl &url);
     void loadProfileBanner(const QUrl &url);
@@ -37,7 +38,7 @@ private:
     QString userName_;
     QString userId_;
     ChannelPtr channel_;
-    ChannelView* lastMessages_;
+    ChannelView* latestMessages_;
 
     pajlada::Signals::NoArgSignal userStateChanged_;