Merge branch 'master' of https://github.com/fourtf/chatterino2

src/widgets/Window.cpp

@@ -15,8 +15,10 @@
 #include "widgets/dialogs/UpdateDialog.hpp"
 #include "widgets/dialogs/WelcomeDialog.hpp"
 #include "widgets/helper/EffectLabel.hpp"
+#include "widgets/helper/NotebookTab.hpp"
 #include "widgets/helper/Shortcut.hpp"
 #include "widgets/helper/TitlebarButton.hpp"
+#include "widgets/splits/ClosedSplits.hpp"
 #include "widgets/splits/Split.hpp"
 #include "widgets/splits/SplitContainer.hpp"
 
@@ -304,6 +306,26 @@ void Window::addShortcuts()
     // Close tab
     createWindowShortcut(this, "CTRL+SHIFT+W",
                          [this] { this->notebook_->removeCurrentPage(); });
+
+    // Reopen last closed split
+    createWindowShortcut(this, "CTRL+G", [this] {
+        if (ClosedSplits::empty()) {
+            return;
+        }
+        ClosedSplits::SplitInfo si = ClosedSplits::pop();
+        SplitContainer *splitContainer{nullptr};
+        if (si.tab) {
+            splitContainer = dynamic_cast<SplitContainer *>(si.tab->page);
+        }
+        if (!splitContainer) {
+            splitContainer = this->notebook_->getOrAddSelectedPage();
+        }
+        this->notebook_->select(splitContainer);
+        Split *split = new Split(splitContainer);
+        split->setChannel(
+            getApp()->twitch.server->getOrAddChannel(si.channelName));
+        splitContainer->appendSplit(split);
+    });
 }
 
 #define UGLYMACROHACK1(s) #s

src/widgets/dialogs/EmotePopup.cpp

@@ -48,19 +48,26 @@ namespace {
         std::vector<std::shared_ptr<TwitchAccount::EmoteSet>> sets,
         Channel &globalChannel, Channel &subChannel)
     {
-        for (const auto &set : sets) {
-            auto &channel = set->key == "0" ? globalChannel : subChannel;
+        QMap<QString, QPair<bool, std::vector<MessagePtr>>> mapOfSets;
 
+        for (const auto &set : sets) {
             // TITLE
+            auto channelName = set->channelName;
             auto text =
                 set->key == "0" || set->text.isEmpty() ? "Twitch" : set->text;
-            channel.addMessage(makeTitleMessage(text));
 
             // EMOTES
             MessageBuilder builder;
             builder->flags.set(MessageFlag::Centered);
             builder->flags.set(MessageFlag::DisableCompactEmotes);
 
+            // If value of map is empty, create init pair and add title.
+            if (mapOfSets.find(channelName) == mapOfSets.end()) {
+                std::vector<MessagePtr> b;
+                b.push_back(makeTitleMessage(text));
+                mapOfSets[channelName] = qMakePair(set->key == "0", b);
+            }
+
             for (const auto &emote : set->emotes) {
                 builder
                     .emplace<EmoteElement>(
@@ -70,7 +77,16 @@ namespace {
                     ->setLink(Link(Link::InsertText, emote.name.string));
             }
 
-            channel.addMessage(builder.release());
+            mapOfSets[channelName].second.push_back(builder.release());
+        }
+
+        // Output to channel all created messages,
+        // That contain title or emotes.
+        foreach (auto pair, mapOfSets) {
+            auto &channel = pair.first ? globalChannel : subChannel;
+            for (auto message : pair.second) {
+                channel.addMessage(message);
+            }
         }
     }
 }  // namespace

src/widgets/helper/ChannelView.cpp

@@ -552,10 +552,9 @@ void ChannelView::setChannel(ChannelPtr newChannel)
     this->queueUpdate();
 
     // Notifications
-    TwitchChannel *tc = dynamic_cast<TwitchChannel *>(newChannel.get());
-    if (tc != nullptr) {
-        tc->tabHighlightRequested.connect([this](HighlightState state) {
-            this->tabHighlightRequested.invoke(HighlightState::Notification);
+    if (auto tc = dynamic_cast<TwitchChannel *>(newChannel.get())) {
+        tc->liveStatusChanged.connect([this]() {
+            this->liveStatusChanged.invoke();  //
         });
     }
 }
@@ -1251,14 +1250,21 @@ void ChannelView::addContextMenuItems(
         QGuiApplication::clipboard()->setText(copyString);
     });
 
-    // Join to channel
+    // Open in new split.
     if (hoveredElement->getLink().type == Link::Url) {
         static QRegularExpression twitchChannelRegex(
-            R"(^(?:https?:\/\/)?(?:www\.|go\.)?twitch\.tv\/(?<username>[a-z0-9_]+))",
+            R"(^(?:https?:\/\/)?(?:www\.|go\.)?twitch\.tv\/(?<username>[a-z0-9_]{3,}))",
             QRegularExpression::CaseInsensitiveOption);
         static QSet<QString> ignoredUsernames{
             "videos",
             "settings",
+            "directory",
+            "jobs",
+            "friends",
+            "inventory",
+            "payments",
+            "subscriptions",
+            "messages",
         };
 
         auto twitchMatch =

src/widgets/helper/ChannelView.hpp

@@ -61,6 +61,7 @@ public:
     pajlada::Signals::Signal<QMouseEvent *> mouseDown;
     pajlada::Signals::NoArgSignal selectionChanged;
     pajlada::Signals::Signal<HighlightState> tabHighlightRequested;
+    pajlada::Signals::NoArgSignal liveStatusChanged;
     pajlada::Signals::Signal<const Link &> linkClicked;
     pajlada::Signals::Signal<QString> joinToChannel;
 

src/widgets/helper/NotebookTab.cpp

@@ -168,13 +168,20 @@ void NotebookTab::setSelected(bool value)
     this->update();
 }
 
+void NotebookTab::setLive(bool isLive)
+{
+    if (this->isLive_ != isLive) {
+        this->isLive_ = isLive;
+        this->update();
+    }
+}
+
 void NotebookTab::setHighlightState(HighlightState newHighlightStyle)
 {
     if (this->isSelected() || !this->highlightEnabled_) {
         return;
     }
-    if (this->highlightState_ != HighlightState::Highlighted &&
-        this->highlightState_ != HighlightState::Notification) {
+    if (this->highlightState_ != HighlightState::Highlighted) {
         this->highlightState_ = newHighlightStyle;
 
         this->update();
@@ -252,8 +259,6 @@ void NotebookTab::paintEvent(QPaintEvent *)
         colors = this->theme->tabs.selected;
     } else if (this->highlightState_ == HighlightState::Highlighted) {
         colors = this->theme->tabs.highlighted;
-    } else if (this->highlightState_ == HighlightState::Notification) {
-        colors = this->theme->tabs.notified;
     } else if (this->highlightState_ == HighlightState::NewMessage) {
         colors = this->theme->tabs.newMessage;
     } else {
@@ -297,6 +302,20 @@ void NotebookTab::paintEvent(QPaintEvent *)
             ? colors.line.hover
             : (windowFocused ? colors.line.regular : colors.line.unfocused));
 
+    // draw live indicator
+    if (this->isLive_) {
+        painter.setPen(QColor(Qt::GlobalColor::red));
+        QBrush b;
+        b.setColor(QColor(Qt::GlobalColor::red));
+        b.setStyle(Qt::SolidPattern);
+        painter.setBrush(b);
+
+        auto x = this->width() - (6.f * scale);
+        auto y = 4.f * scale;
+        auto diameter = 4.f * scale;
+        painter.drawEllipse(QRectF(x, y, diameter, diameter));
+    }
+
     // set the pen color
     painter.setPen(colors.text);
 

src/widgets/helper/NotebookTab.hpp

@@ -39,6 +39,7 @@ public:
     bool isSelected() const;
     void setSelected(bool value);
 
+    void setLive(bool isLive);
     void setHighlightState(HighlightState style);
     void setHighlightsEnabled(const bool &newVal);
     bool hasHighlightsEnabled() const;
@@ -88,6 +89,8 @@ private:
     bool highlightEnabled_ = true;
     QAction *highlightNewMessagesAction_;
 
+    bool isLive_{};
+
     QMenu menu_;
 
     std::vector<pajlada::Signals::ScopedConnection> managedConnections_;

src/widgets/settingspages/LookPage.cpp

@@ -23,8 +23,8 @@
 #define THEME_ITEMS "White", "Light", "Dark", "Black"
 
 #define TAB_X "Show tab close button"
-#define TAB_PREF "Preferences button (ctrl+p to show)"
-#define TAB_USER "User button"
+#define TAB_PREF "Hide preferences button (ctrl+p to show)"
+#define TAB_USER "Hide user button"
 
 // clang-format off
 #define TIMESTAMP_FORMATS "hh:mm a", "h:mm a", "hh:mm:ss a", "h:mm:ss a", "HH:mm", "H:mm", "HH:mm:ss", "H:mm:ss"

src/widgets/splits/ClosedSplits.cpp

@@ -0,0 +1,52 @@
+#include "ClosedSplits.hpp"
+
+namespace chatterino {
+
+std::mutex ClosedSplits::m_;
+std::vector<ClosedSplits::SplitInfo> ClosedSplits::closedSplits_;
+
+void ClosedSplits::invalidateTab(NotebookTab *const tab)
+{
+    std::lock_guard<std::mutex> lk(ClosedSplits::m_);
+    auto it = std::find_if(
+        ClosedSplits::closedSplits_.begin(), ClosedSplits::closedSplits_.end(),
+        [tab](const auto &item) -> bool { return item.tab == tab; });
+    if (it == ClosedSplits::closedSplits_.end()) {
+        return;
+    }
+    it->tab = nullptr;
+}
+
+void ClosedSplits::push(const SplitInfo &si)
+{
+    std::lock_guard<std::mutex> lk(ClosedSplits::m_);
+    ClosedSplits::closedSplits_.push_back(si);
+}
+
+void ClosedSplits::push(SplitInfo &&si)
+{
+    std::lock_guard<std::mutex> lk(ClosedSplits::m_);
+    ClosedSplits::closedSplits_.push_back(std::move(si));
+}
+
+ClosedSplits::SplitInfo ClosedSplits::pop()
+{
+    std::lock_guard<std::mutex> lk(ClosedSplits::m_);
+    SplitInfo si = std::move(ClosedSplits::closedSplits_.back());
+    ClosedSplits::closedSplits_.pop_back();
+    return si;
+}
+
+bool ClosedSplits::empty()
+{
+    std::lock_guard<std::mutex> lk(ClosedSplits::m_);
+    return ClosedSplits::closedSplits_.empty();
+}
+
+std::size_t ClosedSplits::size()
+{
+    std::lock_guard<std::mutex> lk(ClosedSplits::m_);
+    return ClosedSplits::closedSplits_.size();
+}
+
+}  // namespace chatterino

src/widgets/splits/ClosedSplits.hpp

@@ -0,0 +1,32 @@
+#pragma once
+
+#include "common/Channel.hpp"
+#include "widgets/helper/NotebookTab.hpp"
+
+#include <deque>
+#include <mutex>
+#include <utility>
+
+namespace chatterino {
+
+class ClosedSplits
+{
+public:
+    struct SplitInfo {
+        QString channelName;
+        NotebookTab *tab;  // non owning ptr
+    };
+
+    static void invalidateTab(NotebookTab *const tab);
+    static void push(const SplitInfo &si);
+    static void push(SplitInfo &&si);
+    static SplitInfo pop();
+    static bool empty();
+    static std::size_t size();
+
+private:
+    static std::mutex m_;
+    static std::vector<SplitInfo> closedSplits_;
+};
+
+}  // namespace chatterino

src/widgets/splits/Split.cpp

@@ -19,9 +19,11 @@
 #include "widgets/dialogs/UserInfoPopup.hpp"
 #include "widgets/helper/ChannelView.hpp"
 #include "widgets/helper/DebugPopup.hpp"
+#include "widgets/helper/NotebookTab.hpp"
 #include "widgets/helper/ResizingTextEdit.hpp"
 #include "widgets/helper/SearchPopup.hpp"
 #include "widgets/helper/Shortcut.hpp"
+#include "widgets/splits/ClosedSplits.hpp"
 #include "widgets/splits/SplitContainer.hpp"
 #include "widgets/splits/SplitHeader.hpp"
 #include "widgets/splits/SplitInput.hpp"
@@ -290,7 +292,7 @@ void Split::showChangeChannelPopup(const char *dialogTitle, bool empty,
         if (dialog->hasSeletedChannel()) {
             this->setChannel(dialog->getSelectedChannel());
             if (this->isInContainer()) {
-                this->container_->refreshTabTitle();
+                this->container_->refreshTab();
             }
         }
 
@@ -415,6 +417,10 @@ void Split::deleteFromContainer()
 {
     if (this->container_) {
         this->container_->deleteSplit(this);
+        auto *tab = this->getContainer()->getTab();
+        tab->connect(tab, &QWidget::destroyed,
+                     [tab]() mutable { ClosedSplits::invalidateTab(tab); });
+        ClosedSplits::push({this->getChannel()->getName(), tab});
     }
 }
 

src/widgets/splits/SplitContainer.cpp

@@ -84,7 +84,7 @@ void SplitContainer::setTab(NotebookTab *_tab)
 
     this->tab_->page = this;
 
-    this->refreshTabTitle();
+    this->refreshTab();
 }
 
 void SplitContainer::hideResizeHandles()
@@ -177,7 +177,7 @@ void SplitContainer::addSplit(Split *split)
     this->unsetCursor();
     this->splits_.push_back(split);
 
-    this->refreshTabTitle();
+    this->refreshTab();
 
     split->getChannelView().tabHighlightRequested.connect(
         [this](HighlightState state) {
@@ -186,6 +186,10 @@ void SplitContainer::addSplit(Split *split)
             }
         });
 
+    split->getChannelView().liveStatusChanged.connect([this]() {
+        this->refreshTabLiveStatus();  //
+    });
+
     split->focused.connect([this, split] { this->setSelected(split); });
 
     this->layout();
@@ -228,7 +232,7 @@ SplitContainer::Position SplitContainer::releaseSplit(Split *split)
         this->splits_.front()->giveFocus(Qt::MouseFocusReason);
     }
 
-    this->refreshTabTitle();
+    this->refreshTab();
 
     // fourtf: really bad
     split->getChannelView().tabHighlightRequested.disconnectAll();
@@ -568,34 +572,10 @@ void SplitContainer::focusInEvent(QFocusEvent *)
     }
 }
 
-void SplitContainer::refreshTabTitle()
+void SplitContainer::refreshTab()
 {
-    if (this->tab_ == nullptr) {
-        return;
-    }
-
-    QString newTitle = "";
-    bool first = true;
-
-    for (const auto &chatWidget : this->splits_) {
-        auto channelName = chatWidget->getChannel()->getName();
-        if (channelName.isEmpty()) {
-            continue;
-        }
-
-        if (!first) {
-            newTitle += ", ";
-        }
-        newTitle += channelName;
-
-        first = false;
-    }
-
-    if (newTitle.isEmpty()) {
-        newTitle = "empty";
-    }
-
-    this->tab_->setDefaultTitle(newTitle);
+    this->refreshTabTitle();
+    this->refreshTabLiveStatus();
 }
 
 int SplitContainer::getSplitCount()
@@ -677,6 +657,54 @@ void SplitContainer::decodeNodeRecusively(QJsonObject &obj, Node *node)
     }
 }
 
+void SplitContainer::refreshTabTitle()
+{
+    if (this->tab_ == nullptr) {
+        return;
+    }
+
+    QString newTitle = "";
+    bool first = true;
+
+    for (const auto &chatWidget : this->splits_) {
+        auto channelName = chatWidget->getChannel()->getName();
+        if (channelName.isEmpty()) {
+            continue;
+        }
+
+        if (!first) {
+            newTitle += ", ";
+        }
+        newTitle += channelName;
+
+        first = false;
+    }
+
+    if (newTitle.isEmpty()) {
+        newTitle = "empty";
+    }
+
+    this->tab_->setDefaultTitle(newTitle);
+}
+
+void SplitContainer::refreshTabLiveStatus()
+{
+    if (this->tab_ == nullptr) {
+        return;
+    }
+
+    bool liveStatus = false;
+    for (const auto &s : this->splits_) {
+        auto c = s->getChannel();
+        if (c->isLive()) {
+            liveStatus = true;
+            break;
+        }
+    }
+
+    this->tab_->setLive(liveStatus);
+}
+
 //
 // Node
 //

src/widgets/splits/SplitContainer.hpp

@@ -171,7 +171,7 @@ private:
 public:
     SplitContainer(Notebook *parent);
 
-    Split* appendNewSplit(bool openChannelNameDialog);
+    Split *appendNewSplit(bool openChannelNameDialog);
     void appendSplit(Split *split);
     void insertSplit(Split *split, const Position &position);
     void insertSplit(Split *split, Direction direction, Split *relativeTo);
@@ -186,7 +186,9 @@ public:
 
     int getSplitCount();
     const std::vector<Split *> getSplits() const;
-    void refreshTabTitle();
+
+    void refreshTab();
+
     NotebookTab *getTab() const;
     Node *getBaseNode();
 
@@ -221,6 +223,9 @@ private:
     void decodeNodeRecusively(QJsonObject &obj, Node *node);
     Split *getTopRightSplit(Node &node);
 
+    void refreshTabTitle();
+    void refreshTabLiveStatus();
+
     struct DropRegion {
         QRect rect;
         std::pair<int, int> position;