From 3c01af980579db1e97c9393446a257a412cf70af Mon Sep 17 00:00:00 2001
From: hemirt <hemirt@email.cz>
Date: Fri, 1 Mar 2019 21:18:32 +0100
Subject: [PATCH] changes and fix displayname of 'is live' message

---
 src/common/Channel.cpp                   |  5 +++++
 src/common/Channel.hpp                   |  1 +
 src/providers/twitch/ChatroomChannel.cpp | 22 +++++++++++++++++-----
 src/providers/twitch/ChatroomChannel.hpp |  2 ++
 src/providers/twitch/TwitchChannel.cpp   |  3 ++-
 src/providers/twitch/TwitchServer.cpp    | 17 ++++++++++++++++-
 6 files changed, 43 insertions(+), 7 deletions(-)

diff --git a/src/common/Channel.cpp b/src/common/Channel.cpp
index f8d9f501f..92a9dd330 100644
--- a/src/common/Channel.cpp
+++ b/src/common/Channel.cpp
@@ -43,6 +43,11 @@ const QString &Channel::getName() const
     return this->name_;
 }
 
+const QString &Channel::getDisplayName() const
+{
+    return this->getName();
+}
+
 bool Channel::isTwitchChannel() const
 {
     return this->type_ >= Type::Twitch && this->type_ < Type::TwitchEnd;
diff --git a/src/common/Channel.hpp b/src/common/Channel.hpp
index 9f4d0c2e0..9e111aa46 100644
--- a/src/common/Channel.hpp
+++ b/src/common/Channel.hpp
@@ -47,6 +47,7 @@ public:
 
     Type getType() const;
     const QString &getName() const;
+    virtual const QString &getDisplayName() const;
     bool isTwitchChannel() const;
     virtual bool isEmpty() const;
     LimitedQueueSnapshot<MessagePtr> getMessageSnapshot();
diff --git a/src/providers/twitch/ChatroomChannel.cpp b/src/providers/twitch/ChatroomChannel.cpp
index d3d43f96d..fdccdb19c 100644
--- a/src/providers/twitch/ChatroomChannel.cpp
+++ b/src/providers/twitch/ChatroomChannel.cpp
@@ -3,7 +3,7 @@
 #include <QDebug>
 #include "TwitchApi.hpp"
 #include "common/Common.hpp"
-#include "messages\Emote.hpp"
+#include "messages/Emote.hpp"
 #include "providers/bttv/BttvEmotes.hpp"
 #include "providers/bttv/LoadBttvChannelEmote.hpp"
 #include "singletons/Emotes.hpp"
@@ -15,19 +15,22 @@ ChatroomChannel::ChatroomChannel(const QString &channelName,
                                  BttvEmotes &globalBttv, FfzEmotes &globalFfz)
     : TwitchChannel(channelName, globalTwitchBadges, globalBttv, globalFfz)
 {
-    auto list = channelName.split(":");
-    if (list.size() > 2)
+    auto listRef = channelName.splitRef(":");
+    if (listRef.size() > 2)
     {
-        this->chatroomOwnerId = list[1];
+        this->chatroomOwnerId = listRef[1].toString();
     }
 }
 
 void ChatroomChannel::refreshChannelEmotes()
 {
+    if (this->chatroomOwnerId.isEmpty())
+    {
+        return;
+    }
     TwitchApi::findUserName(
         this->chatroomOwnerId,
         [this, weak = weakOf<Channel>(this)](QString username) {
-            qDebug() << username;
             BttvEmotes::loadChannel(username, [this, weak](auto &&emoteMap) {
                 if (auto shared = weak.lock())
                     this->bttvEmotes_.set(
@@ -38,7 +41,16 @@ void ChatroomChannel::refreshChannelEmotes()
                     this->ffzEmotes_.set(
                         std::make_shared<EmoteMap>(std::move(emoteMap)));
             });
+            if (auto shared = weak.lock())
+            {
+                this->chatroomOwnerName = username;
+            }
         });
 }
 
+const QString &ChatroomChannel::getDisplayName() const
+{
+    return this->chatroomOwnerName;
+}
+
 }  // namespace chatterino
diff --git a/src/providers/twitch/ChatroomChannel.hpp b/src/providers/twitch/ChatroomChannel.hpp
index c3d6cff67..55606e915 100644
--- a/src/providers/twitch/ChatroomChannel.hpp
+++ b/src/providers/twitch/ChatroomChannel.hpp
@@ -14,8 +14,10 @@ protected:
                              TwitchBadges &globalTwitchBadges,
                              BttvEmotes &globalBttv, FfzEmotes &globalFfz);
     virtual void refreshChannelEmotes() override;
+    virtual const QString &getDisplayName() const override;
 
     QString chatroomOwnerId;
+    QString chatroomOwnerName;
 
     friend class TwitchServer;
     friend class TwitchMessageBuilder;
diff --git a/src/providers/twitch/TwitchChannel.cpp b/src/providers/twitch/TwitchChannel.cpp
index 4992e3b61..a569de5ae 100644
--- a/src/providers/twitch/TwitchChannel.cpp
+++ b/src/providers/twitch/TwitchChannel.cpp
@@ -438,7 +438,8 @@ void TwitchChannel::setLive(bool newLiveStatus)
                         getApp()->windows->sendAlert();
                     }
                 }
-                auto live = makeSystemMessage(this->getName() + " is live");
+                auto live =
+                    makeSystemMessage(this->getDisplayName() + " is live");
                 this->addMessage(live);
             }
             else
diff --git a/src/providers/twitch/TwitchServer.cpp b/src/providers/twitch/TwitchServer.cpp
index 822db879f..b12a46190 100644
--- a/src/providers/twitch/TwitchServer.cpp
+++ b/src/providers/twitch/TwitchServer.cpp
@@ -23,6 +23,21 @@ using namespace std::chrono_literals;
 
 namespace chatterino {
 
+namespace {
+    bool isChatroom(const QString &channel)
+    {
+        if (channel.left(10) == "chatrooms:")
+        {
+            auto reflist = channel.splitRef(':');
+            if (reflist.size() == 3)
+            {
+                return true;
+            }
+        }
+        return false;
+    }
+}  // namespace
+
 TwitchServer::TwitchServer()
     : whispersChannel(new Channel("/whispers", Channel::Type::TwitchWhispers))
     , mentionsChannel(new Channel("/mentions", Channel::Type::TwitchMentions))
@@ -94,7 +109,7 @@ void TwitchServer::initializeConnection(IrcConnection *connection, bool isRead,
 std::shared_ptr<Channel> TwitchServer::createChannel(const QString &channelName)
 {
     std::shared_ptr<TwitchChannel> channel;
-    if (channelName.left(10).toLower() == "chatrooms:")
+    if (isChatroom(channelName))
     {
         channel = std::static_pointer_cast<TwitchChannel>(
             std::shared_ptr<ChatroomChannel>(new ChatroomChannel(