Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix usage of FrankerFaceZ global emote API #3921

Merged
merged 4 commits into from
Oct 1, 2022
Merged

Conversation

pajlada
Copy link
Member

@pajlada pajlada commented Aug 12, 2022

Pull request checklist:

  • CHANGELOG.md was updated, if applicable

Description

We no longer blindly parse all sets as global emotes, but rather match them against the default_sets as intended.

This means that some emotes will no longer be visible through Chatterino (e.g. AndKnuckles). This is more in line with how the FrankerFaceZ browser extension works.

Fixes #1116

@Mm2PL
Copy link
Collaborator

Mm2PL commented Aug 12, 2022

Sadge . o 0 ( AndKnuckles )

Copy link
Contributor

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

clang-tidy made some suggestions

src/providers/ffz/FfzEmotes.cpp Outdated Show resolved Hide resolved
Copy link
Contributor

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

clang-tidy made some suggestions

src/providers/ffz/FfzEmotes.cpp Show resolved Hide resolved
@pajlada
Copy link
Member Author

pajlada commented Oct 1, 2022

Looks good to me!
image

@pajlada pajlada enabled auto-merge (squash) October 1, 2022 11:21
@pajlada pajlada merged commit 5e02fda into master Oct 1, 2022
@pajlada pajlada deleted the fix/ffz-global-emote-api branch October 1, 2022 11:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

FFZ Global emote sets API parsed incorrectly
2 participants