noury/mirror-chatterino2
1
0
Fork 0
mirror of https://github.com/Chatterino/chatterino2.git synced 2024-11-21 22:24:07 +01:00
Code Issues Projects Releases Packages Wiki Activity

Update emoji-data to v15.1.1 (#5182)

Browse source
This commit is contained in:
nerix 2024-02-18 14:11:25 +01:00 committed by GitHub
parent e130c48f76
commit 641cb26a76
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -32,6 +32,7 @@
- Minor: Added support for the `{input.text}` placeholder in the **Split** -> **Run a command** hotkey. (#5130) - 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: 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: 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 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: 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) - 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)

2
resources/emoji.json
View file

File diff suppressed because one or more lines are too long

7
src/providers/emoji/Emojis.cpp
View file

@ -167,7 +167,7 @@ void Emojis::load()
void Emojis::loadEmojis() 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"); QFile file(":/emoji.json");
file.open(QFile::ReadOnly); file.open(QFile::ReadOnly);
QTextStream s1(&file); QTextStream s1(&file);
@ -269,14 +269,15 @@ void Emojis::loadEmojiSet()
}; };
// clang-format on // clang-format on
// As of emoji-data v15.1.1, google is the only source missing no images.
if (!emoji->capabilities.contains(emojiSetToUse)) if (!emoji->capabilities.contains(emojiSetToUse))
{ {
emojiSetToUse = "Twitter"; emojiSetToUse = "Google";
} }
QString code = emoji->unifiedCode.toLower(); QString code = emoji->unifiedCode.toLower();
QString urlPrefix = 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); auto it = emojiSets.find(emojiSetToUse);
if (it != emojiSets.end()) if (it != emojiSets.end())
{ {