chatterino2
Code Issues

Add showInMentions option for Badge Highlights (#4034)

Browse Source 
Co-authored-by: Rasmus Karlsson <rasmus.karlsson@pajlada.com>
This commit is contained in:
Felanbird
2022-10-02 07:25:10 -04:00
committed by GitHub
parent 2deed8e1cb
commit 9816722b5e
8 changed files with 97 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/controllers/highlights/HighlightBadge.hpp
+13 -7
View File
@@ -15,15 +15,16 @@ public:
bool operator==(const HighlightBadge &other) const;
HighlightBadge(const QString &badgeName, const QString &displayName,
bool hasAlert, bool hasSound, const QString &soundUrl,
QColor color);
bool showInMentions, bool hasAlert, bool hasSound,
const QString &soundUrl, QColor color);
HighlightBadge(const QString &badgeName, const QString &displayName,
bool hasAlert, bool hasSound, const QString &soundUrl,
std::shared_ptr<QColor> color);
bool showInMentions, bool hasAlert, bool hasSound,
const QString &soundUrl, std::shared_ptr<QColor> color);
const QString &badgeName() const;
const QString &displayName() const;
bool showInMentions() const;
bool hasAlert() const;
bool hasSound() const;
bool isMatch(const Badge &badge) const;
@@ -53,6 +54,7 @@ private:
QString badgeName_;
QString displayName_;
bool showInMentions_;
bool hasAlert_;
bool hasSound_;
QUrl soundUrl_;
@@ -75,6 +77,7 @@ struct Serialize<chatterino::HighlightBadge> {
chatterino::rj::set(ret, "name", value.badgeName(), a);
chatterino::rj::set(ret, "displayName", value.displayName(), a);
chatterino::rj::set(ret, "showInMentions", value.showInMentions(), a);
chatterino::rj::set(ret, "alert", value.hasAlert(), a);
chatterino::rj::set(ret, "sound", value.hasSound(), a);
chatterino::rj::set(ret, "soundUrl", value.getSoundUrl().toString(), a);
@@ -94,11 +97,12 @@ struct Deserialize<chatterino::HighlightBadge> {
{
PAJLADA_REPORT_ERROR(error);
return chatterino::HighlightBadge(QString(), QString(), false,
false, "", QColor());
false, false, "", QColor());
}
QString _name;
QString _displayName;
bool _showInMentions = false;
bool _hasAlert = true;
bool _hasSound = false;
QString _soundUrl;
@@ -106,6 +110,7 @@ struct Deserialize<chatterino::HighlightBadge> {
chatterino::rj::getSafe(value, "name", _name);
chatterino::rj::getSafe(value, "displayName", _displayName);
chatterino::rj::getSafe(value, "showInMentions", _showInMentions);
chatterino::rj::getSafe(value, "alert", _hasAlert);
chatterino::rj::getSafe(value, "sound", _hasSound);
chatterino::rj::getSafe(value, "soundUrl", _soundUrl);
@@ -115,8 +120,9 @@ struct Deserialize<chatterino::HighlightBadge> {
if (!_color.isValid())
_color = chatterino::HighlightBadge::FALLBACK_HIGHLIGHT_COLOR;
return chatterino::HighlightBadge(_name, _displayName, _hasAlert,
_hasSound, _soundUrl, _color);
return chatterino::HighlightBadge(_name, _displayName, _showInMentions,
_hasAlert, _hasSound, _soundUrl,
_color);
}
};