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

Use New 7TV Cosmetics System #4512

Merged
merged 26 commits into from
Jul 29, 2023
Merged

Conversation

Nerixyz
Copy link
Contributor

@Nerixyz Nerixyz commented Apr 4, 2023

Pull request checklist:

  • CHANGELOG.md was updated, if applicable

Description

This PR implements the new cosmetics system for 7TV, where cosmetics are updated using the EventAPI. This is essentially the same code that's already in chatterino7 (relevant PR). Adding and updating a badge for a user only requires taking one lock.

Once this is merged, I'm planning to add support for the similar BTTV system as well.

@Nerixyz
Copy link
Contributor Author

Nerixyz commented Apr 4, 2023

--- /dev/fd/63	2023-04-04 14:15:21.963666976 +0000
+++ /dev/fd/62	2023-04-04 14:15:21.963666976 +0000
@@ -1264,8 +1264,8 @@
     this->threads_[thread->rootId()] = thread;
 }
 
-const std::unordered_map<QString, std::weak_ptr<MessageThread>> &
-    TwitchChannel::threads() const
+const std::unordered_map<QString, std::weak_ptr<MessageThread>>
+    &TwitchChannel::threads() const
 {
     return this->threads_;
 }
src/providers/twitch/TwitchChannel.cpp differs!!!!!!!
At least one file is poorly formatted - check the output above

clang-format should be updated :)

src/providers/twitch/TwitchChannel.cpp Outdated Show resolved Hide resolved
src/providers/twitch/TwitchChannel.cpp Outdated Show resolved Hide resolved
src/providers/twitch/TwitchAccount.cpp Outdated Show resolved Hide resolved
src/providers/twitch/TwitchAccount.cpp Outdated Show resolved Hide resolved
src/providers/twitch/TwitchAccount.cpp Outdated Show resolved Hide resolved
src/providers/seventv/eventapi/Dispatch.cpp Outdated Show resolved Hide resolved
src/providers/seventv/SeventvEventAPI.cpp Outdated Show resolved Hide resolved
src/providers/seventv/SeventvEventAPI.cpp Outdated Show resolved Hide resolved
src/providers/seventv/SeventvEventAPI.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/seventv/SeventvBadges.cpp Outdated Show resolved Hide resolved
src/providers/seventv/SeventvBadges.cpp Outdated Show resolved Hide resolved
src/providers/seventv/SeventvBadges.cpp Outdated Show resolved Hide resolved
src/providers/seventv/SeventvEmotes.cpp 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/seventv/SeventvApi.cpp Outdated Show resolved Hide resolved
src/providers/seventv/SeventvEmotes.cpp Show resolved Hide resolved
src/providers/seventv/SeventvApi.cpp Outdated Show resolved Hide resolved
src/providers/seventv/SeventvApi.hpp Outdated Show resolved Hide resolved
src/providers/seventv/SeventvBadges.cpp Outdated Show resolved Hide resolved
src/providers/seventv/SeventvEventAPI.hpp Outdated Show resolved Hide resolved
src/providers/twitch/TwitchChannel.hpp Show resolved Hide resolved
src/providers/twitch/TwitchChannel.cpp Outdated Show resolved Hide resolved
src/singletons/Settings.hpp Show resolved Hide resolved
src/providers/seventv/SeventvBadges.cpp Outdated Show resolved Hide resolved
tests/src/main.cpp Outdated Show resolved Hide resolved
benchmarks/src/main.cpp Outdated 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.

I'm happy to merge this in when the network issue thing is 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.

Thank you for putting in the effort!

@pajlada pajlada enabled auto-merge July 29, 2023 09:27
@pajlada pajlada added this pull request to the merge queue Jul 29, 2023
Merged via the queue into Chatterino:master with commit 33fa3e0 Jul 29, 2023
15 of 16 checks passed
@Nerixyz Nerixyz deleted the feat/v3-cosmetics branch July 29, 2023 12:25
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.

4 participants