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

feat: Show FrankerFaceZ channel badges #5119

Merged
merged 9 commits into from
Feb 25, 2024

Conversation

pajlada
Copy link
Member

@pajlada pajlada commented Jan 21, 2024

We already make the request, so this just parses more of the payload.
One thing of note, for the API parsing: FrankerFaceZ gives us Twitch User IDs as integers, while we always treat them as strings. For this, I've made sure to handle a potential change in the API if they change to strings.

For thread safety, I've added a thread guard which will assert in debug mode if the channel badge map is accessed or written to in different threads. On Arch Linux with Qt 6.6.3 this works as expected. This should be tested on macOS & Windows builds.

Fixes #2241

@pajlada pajlada force-pushed the feat/ffz-channel-specific-badge-assignments branch from d49cb52 to 7bf36f8 Compare January 21, 2024 12:16
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
src/providers/ffz/FfzEmotes.hpp Show resolved Hide resolved
src/providers/twitch/TwitchChannel.cpp 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/twitch/TwitchMessageBuilder.cpp Show resolved Hide resolved
@pajlada pajlada force-pushed the feat/ffz-channel-specific-badge-assignments branch from e62ff2f to 331416e Compare February 11, 2024 18:13
@SputNikPlop
Copy link
Contributor

@pajlada Tested on macOS and it looks good

Copy link
Member Author

@pajlada pajlada left a comment

Choose a reason for hiding this comment

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

image

@pajlada pajlada enabled auto-merge (squash) February 25, 2024 10:55
@pajlada pajlada merged commit 101dc82 into master Feb 25, 2024
17 checks passed
@pajlada pajlada deleted the feat/ffz-channel-specific-badge-assignments branch February 25, 2024 11:18
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.

FrankerFaceZ Channel-Specific Badge Assignments
2 participants