fix: missing global emotes in popup #4062
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
clang-tidy review says "All clean, LGTM! 👍" |
pajlada
approved these changes
Oct 16, 2022
|
clang-tidy review says "All clean, LGTM! 👍" |
Nerixyz
added a commit
to Nerixyz/chatterino2
that referenced
this pull request
Oct 17, 2022
TroyKomodo
pushed a commit
to SevenTV/chatterino7
that referenced
this pull request
Oct 20, 2022
* feat: use v3 REST api for channel emotes * feat: initial event api update * feat: use changes from initial 7tv pr and eventapi refactor * refactor: rename everything related to event-api * fix: update changes from pr * feat: handle user connection update * fix: update emoteset id on change * fix: format why did it not auto format amongE * fix: includes msvc moment * fix: order of initialization msvc moment * fix: includes * feat: unsubscribing * refactor: use `unordered_set` for subscriptions * refactor: use `qHash` for hashing * fix: includes * fix: wording Co-authored-by: Anatole <me@anatole.dev> * fix: formatting * fix: don't add emotes without any images * fix: don't add empty emotes * Update 1xelerate contributors github link (Chatterino#4061) * Fix channel-based popups rewriting messages to file log (Chatterino#4060) Co-authored-by: pajlada <rasmus.karlsson@pajlada.com> * feat: Add 7TV Emotes and Badges (Chatterino#4002) Co-authored-by: pajlada <rasmus.karlsson@pajlada.com> * fix: bad merges * fix: remove unused enum constants * fix: remove unused files * fix: missing global emotes in popup (Chatterino#4062) * fix: includes * fix: duplicates * fix: emit 4 images * fix: order * fix: cv paste error * fix: add settings migration Co-authored-by: Anatole <me@anatole.dev> Co-authored-by: xel86 <xel@xel.sh> Co-authored-by: pajlada <rasmus.karlsson@pajlada.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Pull request checklist:
CHANGELOG.mdwas updated, if applicableDescription
I'm currently merging chatterino2 into chatterino7 and I noticed something missing.
I might find something else, that's why this is only a draft for now.This was the only difference.