mirror of
https://github.com/Chatterino/chatterino2.git
synced 2024-11-13 19:49:51 +01:00
720e5aa25f
* Ran clang-format * Implement user-specific search in message history This functionality was originally requested in #1236. This commit changes the SearchPopup::performSearch method so that only messages from specific users can be shown. In order to filter for a specific user, enter their username with a leading '@' in the search popup. You can also add an additional search phrase which will also be considered in the search. * Naive implementation for "from:" tags Rebase later? * Cleverer (?) version using Predicates Commit adds two POC predicates: one for the author of messages, and one for substring search in messages. Problems/TODOs: * Best way to register new predicates? * Clean up tags (e.g. "from:") or not? * Test combinations of different predicates * Add a predicate to check for links in messages * Remove a dumb TODO * Rewrite SearchPopup::performSearch to be cleaner * Ran clang-format on all files * Remove TODO I missed earlier * Forgot to run clang-format peepoSadDank * Re-use {}-initialization Was accidentally removed when fixing earlier merge conflict. * Does this fix line endings? No diffs are shown locally, hopefully Git doesn't lie to me. * Rename "predicates" directory to "search" Resolving one conversation in the review of #1237. * Use LinkParser in LinkPredicate Resolving a conversation in the review of #1237. * Predicates: Use unique_ptr instead of shared_ptr Resolves a conversation in the review of #1237. * Refactor of SearchPopup and AuthorPredicate Resolving some points from the review in #1237. * Moved parsing of comma-seperated values into AuthorPredicate constructor. * Rewrite SearchPopup::parsePredicates as suggested. * Deleted now redundant methods in SearchPopup. * MessagePredicate::appliesTo now takes a Message& ... instead of a MessagePtr. This resolves a conversation in the review of #1237. * Run clang-format on two files I missed * AuthorPredicate: Check for displayName & loginName Resolving conversation on #1237.
82 lines
2.5 KiB
C++
82 lines
2.5 KiB
C++
#include "TwitchBadges.hpp"
|
|
|
|
#include <QJsonArray>
|
|
#include <QJsonObject>
|
|
#include <QJsonValue>
|
|
#include <QThread>
|
|
|
|
#include "common/NetworkRequest.hpp"
|
|
#include "common/Outcome.hpp"
|
|
#include "debug/Log.hpp"
|
|
#include "messages/Emote.hpp"
|
|
|
|
namespace chatterino {
|
|
|
|
void TwitchBadges::loadTwitchBadges()
|
|
{
|
|
static QString url(
|
|
"https://badges.twitch.tv/v1/badges/global/display?language=en");
|
|
|
|
NetworkRequest(url)
|
|
|
|
.onSuccess([this](auto result) -> Outcome {
|
|
auto root = result.parseJson();
|
|
auto badgeSets = this->badgeSets_.access();
|
|
|
|
auto jsonSets = root.value("badge_sets").toObject();
|
|
for (auto sIt = jsonSets.begin(); sIt != jsonSets.end(); ++sIt)
|
|
{
|
|
auto key = sIt.key();
|
|
auto versions =
|
|
sIt.value().toObject().value("versions").toObject();
|
|
|
|
for (auto vIt = versions.begin(); vIt != versions.end(); ++vIt)
|
|
{
|
|
auto versionObj = vIt.value().toObject();
|
|
|
|
auto emote = Emote{
|
|
{""},
|
|
ImageSet{
|
|
Image::fromUrl(
|
|
{versionObj.value("image_url_1x").toString()},
|
|
1),
|
|
Image::fromUrl(
|
|
{versionObj.value("image_url_2x").toString()},
|
|
.5),
|
|
Image::fromUrl(
|
|
{versionObj.value("image_url_4x").toString()},
|
|
.25),
|
|
},
|
|
Tooltip{versionObj.value("description").toString()},
|
|
Url{versionObj.value("click_url").toString()}};
|
|
// "title"
|
|
// "clickAction"
|
|
|
|
(*badgeSets)[key][vIt.key()] =
|
|
std::make_shared<Emote>(emote);
|
|
}
|
|
}
|
|
|
|
return Success;
|
|
})
|
|
.execute();
|
|
}
|
|
|
|
boost::optional<EmotePtr> TwitchBadges::badge(const QString &set,
|
|
const QString &version) const
|
|
{
|
|
auto badgeSets = this->badgeSets_.access();
|
|
auto it = badgeSets->find(set);
|
|
if (it != badgeSets->end())
|
|
{
|
|
auto it2 = it->second.find(version);
|
|
if (it2 != it->second.end())
|
|
{
|
|
return it2->second;
|
|
}
|
|
}
|
|
return boost::none;
|
|
}
|
|
|
|
} // namespace chatterino
|