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

Update Emoji Data to v14.0 (#3612)

Browse source
This commit is contained in:
nerix 2022-03-19 11:30:01 +01:00 committed by GitHub
parent 414313726e
commit 4c275cb183
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -59,6 +59,7 @@
- Minor: Show right click context menu anywhere within a message's line. (#3566) - Minor: Show right click context menu anywhere within a message's line. (#3566)
- Minor: Make Tab Layout setting only accept predefined values (#3564) - Minor: Make Tab Layout setting only accept predefined values (#3564)
- Minor: Added librewolf, icecat, and waterfox incognito support. (#3588) - Minor: Added librewolf, icecat, and waterfox incognito support. (#3588)
- Minor: Updated to Emoji v14.0 (#3612)
- Bugfix: Fix Split Input hotkeys not being available when input is hidden (#3362) - Bugfix: Fix Split Input hotkeys not being available when input is hidden (#3362)
- Bugfix: Fixed colored usernames sometimes not working. (#3170) - Bugfix: Fixed colored usernames sometimes not working. (#3170)
- Bugfix: Restored ability to send duplicate `/me` messages. (#3166) - Bugfix: Restored ability to send duplicate `/me` messages. (#3166)

2
resources/emoji.json
View file

File diff suppressed because one or more lines are too long

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

@ -137,7 +137,7 @@ void Emojis::load()
void Emojis::loadEmojis() void Emojis::loadEmojis()
{ {
// Current version: https://github.com/iamcal/emoji-data/blob/v7.0.2/emoji.json (Emoji version 13.1 (2021)) // Current version: https://github.com/iamcal/emoji-data/blob/v14.0.0/emoji.json (Emoji version 14.0 (2022))
QFile file(":/emoji.json"); QFile file(":/emoji.json");
file.open(QFile::ReadOnly); file.open(QFile::ReadOnly);
QTextStream s1(&file); QTextStream s1(&file);