mirror of
https://github.com/Chatterino/chatterino2.git
synced 2024-11-13 19:49:51 +01:00
Update emoji-data to v15.1.1 (#5182)
This commit is contained in:
parent
e130c48f76
commit
641cb26a76
|
@ -32,6 +32,7 @@
|
|||
- Minor: Added support for the `{input.text}` placeholder in the **Split** -> **Run a command** hotkey. (#5130)
|
||||
- Minor: Add a new Channel API for experimental plugins feature. (#5141)
|
||||
- Minor: Added the ability to change the top-most status of a window regardless of the _Always on top_ setting (right click the notebook). (#5135)
|
||||
- Minor: Updated to Emoji v15.1. Google emojis are now used as the fallback instead of Twitter emojis. (#5182)
|
||||
- Bugfix: Fixed an issue where certain emojis did not send to Twitch chat correctly. (#4840)
|
||||
- Bugfix: Fixed capitalized channel names in log inclusion list not being logged. (#4848)
|
||||
- Bugfix: Trimmed custom streamlink paths on all platforms making sure you don't accidentally add spaces at the beginning or end of its path. (#4834)
|
||||
|
|
File diff suppressed because one or more lines are too long
|
@ -167,7 +167,7 @@ void Emojis::load()
|
|||
|
||||
void Emojis::loadEmojis()
|
||||
{
|
||||
// Current version: https://github.com/iamcal/emoji-data/blob/v14.0.0/emoji.json (Emoji version 14.0 (2022))
|
||||
// Current version: https://github.com/iamcal/emoji-data/blob/v15.1.1/emoji.json (Emoji version 15.1 (2023))
|
||||
QFile file(":/emoji.json");
|
||||
file.open(QFile::ReadOnly);
|
||||
QTextStream s1(&file);
|
||||
|
@ -269,14 +269,15 @@ void Emojis::loadEmojiSet()
|
|||
};
|
||||
// clang-format on
|
||||
|
||||
// As of emoji-data v15.1.1, google is the only source missing no images.
|
||||
if (!emoji->capabilities.contains(emojiSetToUse))
|
||||
{
|
||||
emojiSetToUse = "Twitter";
|
||||
emojiSetToUse = "Google";
|
||||
}
|
||||
|
||||
QString code = emoji->unifiedCode.toLower();
|
||||
QString urlPrefix =
|
||||
"https://pajbot.com/static/emoji-v2/img/twitter/64/";
|
||||
"https://pajbot.com/static/emoji-v2/img/google/64/";
|
||||
auto it = emojiSets.find(emojiSetToUse);
|
||||
if (it != emojiSets.end())
|
||||
{
|
||||
|
|
Loading…
Reference in a new issue