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

Support Animated FFZ Emotes and Authors for Global Emotes #4434

Merged
merged 4 commits into from
Mar 18, 2023

Conversation

Nerixyz
Copy link
Contributor

@Nerixyz Nerixyz commented Mar 5, 2023

Pull request checklist:

  • CHANGELOG.md was updated, if applicable

Description

This PR adds support for animated FFZ emotes and shows authors for global emotes:

chatterino_2023-03-05_11-24-21.mp4

I refactored the code a bit to reduce duplicated parsing of channel/global emotes and to make it easier to read (by replacing QJsonObject::value with QJsonObject::operator[]).

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
src/providers/ffz/FfzEmotes.cpp Show resolved Hide resolved
src/providers/ffz/FfzEmotes.cpp Show resolved Hide resolved
Copy link
Member

@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.

For simplicity in reviewing, could you rebase the animated URL check into a separate commit from the refactors? Moving code (into a function in this case) & changing something in that function hides the functional changes that were made

not feedback, just notes for myself:
dev: This changes a bunch of toObject().value(...) calls to [...]. For QJsonValue's they do the same thing
dev: This changes a few value(...) calls to [...]. For QJsonObject's, they do the same thing
EDIT: I see you explaine dth evalue/operator[] stuff but I didn't read it :tf:

src/providers/ffz/FfzEmotes.cpp Outdated Show resolved Hide resolved
CHANGELOG.md Outdated Show resolved Hide resolved
@Nerixyz Nerixyz force-pushed the feat/ffz-animated branch from fd014f7 to e2e1e05 Compare March 5, 2023 20:06
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
Copy link
Collaborator

@Felanbird Felanbird left a comment

Choose a reason for hiding this comment

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

chatterino_2023-03-06_14-42-05

@pajlada pajlada enabled auto-merge (squash) March 18, 2023 10:58
@pajlada pajlada merged commit d7206a2 into Chatterino:master Mar 18, 2023
@Nerixyz Nerixyz deleted the feat/ffz-animated branch March 18, 2023 11:39
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.

3 participants