From 288ea5036b0826a17f28279cd22445d0d6af6c56 Mon Sep 17 00:00:00 2001
From: TranRed <kupfer.nils@gmail.com>
Date: Sun, 25 Aug 2019 14:57:31 +0200
Subject: [PATCH] did first requested refactors

---
 src/widgets/dialogs/UserInfoPopup.cpp | 25 ++++++++++++-------------
 src/widgets/dialogs/UserInfoPopup.hpp |  2 +-
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/src/widgets/dialogs/UserInfoPopup.cpp b/src/widgets/dialogs/UserInfoPopup.cpp
index 45320eb54..960e58613 100644
--- a/src/widgets/dialogs/UserInfoPopup.cpp
+++ b/src/widgets/dialogs/UserInfoPopup.cpp
@@ -30,14 +30,14 @@
 
 namespace {
 
-const auto kBorderColor = QColor(255, 255, 255, 80);
+const auto borderColor = QColor(255, 255, 255, 80);
 
-int calculateTimeoutDuration(int durationPerUnit, const QString &unit)
+int calculateTimeoutDuration(TimeoutButton timeout)
 {
     static const QMap<QString, int> durations{
         {"s", 1}, {"m", 60}, {"h", 3600}, {"d", 86400}, {"w", 604800},
     };
-    return durationPerUnit * durations[unit];
+    return timeout.second * durations[timeout.first];
 }
 
 }  // namespace
@@ -104,8 +104,8 @@ UserInfoPopup::UserInfoPopup()
         auto usercard = user.emplace<EffectLabel2>(this);
         usercard->getLabel().setText("Usercard");
 
-        usercard->setBorderColor(kBorderColor);
-        viewLogs->setBorderColor(kBorderColor);
+        usercard->setBorderColor(borderColor);
+        viewLogs->setBorderColor(borderColor);
 
         auto mod = user.emplace<Button>(this);
         mod->setPixmap(app->resources->buttons.mod);
@@ -528,16 +528,14 @@ UserInfoPopup::TimeoutWidget::TimeoutWidget()
             a->getLabel().setText(QString::number(item.second) + item.first);
 
             a->setScaleIndependantSize(buttonWidth, buttonHeight);
-            a->setBorderColor(kBorderColor);
+            a->setBorderColor(borderColor);
 
-            const auto pair = std::make_pair(
-                Action::Timeout,
-                calculateTimeoutDuration(item.second, item.first));
+            const auto pair =
+                std::make_pair(Action::Timeout, calculateTimeoutDuration(item));
 
             QObject::connect(
-                a.getElement(), &EffectLabel2::leftClicked, [this, pair] {
-                    this->buttonClicked.invoke(pair);
-                });
+                a.getElement(), &EffectLabel2::leftClicked,
+                [this, pair] { this->buttonClicked.invoke(pair); });
         }
     };
 
@@ -560,7 +558,8 @@ void UserInfoPopup::fillLatestMessages()
 {
     LimitedQueueSnapshot<MessagePtr> snapshot =
         this->channel_->getMessageSnapshot();
-    ChannelPtr channelPtr(new Channel("search", Channel::Type::None));
+    ChannelPtr channelPtr(
+        new Channel(this->channel_->getName(), Channel::Type::None));
     for (size_t i = 0; i < snapshot.size(); i++)
     {
         MessagePtr message = snapshot[i];
diff --git a/src/widgets/dialogs/UserInfoPopup.hpp b/src/widgets/dialogs/UserInfoPopup.hpp
index 4a07f2f9d..91f497444 100644
--- a/src/widgets/dialogs/UserInfoPopup.hpp
+++ b/src/widgets/dialogs/UserInfoPopup.hpp
@@ -37,7 +37,7 @@ private:
     QString userName_;
     QString userId_;
     ChannelPtr channel_;
-    ChannelView *latestMessages_;
+    ChannelView *latestMessages_{};
 
     pajlada::Signals::NoArgSignal userStateChanged_;