noury/mirror-chatterino2
1
0
Fork 0
mirror of https://github.com/Chatterino/chatterino2.git synced 2024-11-13 19:49:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

removed unused function

Browse source
This commit is contained in:
fourtf 2019-08-13 13:02:11 +02:00
parent 23f1ec9ac2
commit 96532be765
2 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/providers/twitch/TwitchEmotes.cpp
View file

@ -45,7 +45,7 @@ QString TwitchEmotes::cleanUpEmoteCode(const EmoteName &dirtyEmoteCode)
EmotePtr TwitchEmotes::getOrCreateEmote(const EmoteId &id, EmotePtr TwitchEmotes::getOrCreateEmote(const EmoteId &id,
const EmoteName &name_) const EmoteName &name_)
{ {
static QMap<QString, QString> replacements{ static const QMap<QString, QString> replacements{
{"[oO](_|\\.)[oO]", "O_o"}, {"\\&gt\\;\\(", "&gt;("}, {"[oO](_|\\.)[oO]", "O_o"}, {"\\&gt\\;\\(", "&gt;("},
{"\\&lt\\;3", "&lt;3"}, {"\\:-?(o|O)", ":O"}, {"\\&lt\\;3", "&lt;3"}, {"\\:-?(o|O)", ":O"},
{"\\:-?(p|P)", ":P"}, {"\\:-?[\\\\/]", ":/"}, {"\\:-?(p|P)", ":P"}, {"\\:-?[\\\\/]", ":/"},
@ -95,9 +95,4 @@ Url TwitchEmotes::getEmoteLink(const EmoteId &id, const QString &emoteScale)
.replace("{scale}", emoteScale)}; .replace("{scale}", emoteScale)};
} }
AccessGuard<std::unordered_map<EmoteName, EmotePtr>> TwitchEmotes::accessAll()
{
return this->twitchEmotes_.access();
}
} // namespace chatterino } // namespace chatterino

7
src/providers/twitch/TwitchEmotes.hpp
View file

@ -7,7 +7,6 @@
#include "common/Aliases.hpp" #include "common/Aliases.hpp"
#include "common/UniqueAccess.hpp" #include "common/UniqueAccess.hpp"
#include "providers/twitch/TwitchEmotes.hpp"
#define TWITCH_EMOTE_TEMPLATE \ #define TWITCH_EMOTE_TEMPLATE \
"https://static-cdn.jtvnw.net/emoticons/v1/{id}/{scale}" "https://static-cdn.jtvnw.net/emoticons/v1/{id}/{scale}"
@ -36,13 +35,13 @@ public:
TwitchEmotes(); TwitchEmotes();
EmotePtr getOrCreateEmote(const EmoteId &id, const EmoteName &name); EmotePtr getOrCreateEmote(const EmoteId &id, const EmoteName &name);
Url getEmoteLink(const EmoteId &id, const QString &emoteScale);
AccessGuard<std::unordered_map<EmoteName, EmotePtr>> accessAll();
private: private:
UniqueAccess<std::unordered_map<EmoteName, EmotePtr>> twitchEmotes_; Url getEmoteLink(const EmoteId &id, const QString &emoteScale);
UniqueAccess<std::unordered_map<EmoteId, std::weak_ptr<Emote>>> UniqueAccess<std::unordered_map<EmoteId, std::weak_ptr<Emote>>>
twitchEmotesCache_; twitchEmotesCache_;
std::mutex mutex_;
}; };
} // namespace chatterino } // namespace chatterino