From 26bc06f9831eb5447074de984833ab35c23847cb Mon Sep 17 00:00:00 2001 From: Rasmus Karlsson Date: Sun, 16 Feb 2020 13:11:49 +0100 Subject: [PATCH] Attempt to use Cloudflare/B2 backed emoji cdn --- src/providers/emoji/Emojis.cpp | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/src/providers/emoji/Emojis.cpp b/src/providers/emoji/Emojis.cpp index 424f42ed183..dae8ee28fd3 100644 --- a/src/providers/emoji/Emojis.cpp +++ b/src/providers/emoji/Emojis.cpp @@ -269,12 +269,12 @@ void Emojis::loadEmojiSet() {"EmojiOne 2", "https://cdnjs.cloudflare.com/ajax/libs/emojione/2.2.6/assets/png/"}, // JSDELIVR - // {"EmojiOne 3", "https://cdn.jsdelivr.net/npm/emoji-datasource-emojione@5.0.1/img/emojione/64/"}, + {"EmojiOne 3", "https://cdn.jsdelivr.net/npm/emoji-datasource-emojione@5.0.1/img/emojione/64/"}, // {"Twitter", "https://cdn.jsdelivr.net/npm/emoji-datasource-twitter@4.0.4/img/twitter/64/"}, // {"Facebook", "https://cdn.jsdelivr.net/npm/emoji-datasource-facebook@4.0.4/img/facebook/64/"}, // {"Apple", "https://cdn.jsdelivr.net/npm/emoji-datasource-apple@5.0.1/img/apple/64/"}, // {"Google", "https://cdn.jsdelivr.net/npm/emoji-datasource-google@4.0.4/img/google/64/"}, - // {"Messenger", "https://cdn.jsdelivr.net/npm/emoji-datasource-messenger@4.0.4/img/messenger/64/"}, + {"Messenger", "https://cdn.jsdelivr.net/npm/emoji-datasource-messenger@4.0.4/img/messenger/64/"}, // OBRODAI // {"EmojiOne 3", "https://pajbot.com/static/emoji/img/emojione/64/"}, @@ -282,14 +282,13 @@ void Emojis::loadEmojiSet() // {"Facebook", "https://pajbot.com/static/emoji/img/facebook/64/"}, // {"Apple", "https://pajbot.com/static/emoji/img/apple/64/"}, // {"Google", "https://pajbot.com/static/emoji/img/google/64/"}, - {"Messenger", "https://pajbot.com/static/emoji/img/messenger/64/"}, - - // BRAIZE - {"EmojiOne 3", "https://test.pajlada.se/emoji/emojione/64/"}, - {"Twitter", "https://test.pajlada.se/emoji/twitter/64/"}, - {"Facebook", "https://test.pajlada.se/emoji/facebook/64/"}, - {"Apple", "https://test.pajlada.se/emoji/apple/64/"}, - {"Google", "https://test.pajlada.se/emoji/google/64/"}, + // {"Messenger", "https://pajbot.com/static/emoji/img/messenger/64/"}, + + // Cloudflare+B2 bucket + {"Twitter", "https://chatterino2-emoji-cdn.pajlada.se/file/c2-emojis/emojis-v1/twitter/64/"}, + {"Facebook", "https://chatterino2-emoji-cdn.pajlada.se/file/c2-emojis/emojis-v1/facebook/64/"}, + {"Apple", "https://chatterino2-emoji-cdn.pajlada.se/file/c2-emojis/emojis-v1/apple/64/"}, + {"Google", "https://chatterino2-emoji-cdn.pajlada.se/file/c2-emojis/emojis-v1/google/64/"}, }; // clang-format on