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 emotesets not loading properly #2905

Merged
merged 9 commits into from Jun 24, 2021
Merged

Fix emotesets not loading properly #2905

merged 9 commits into from Jun 24, 2021

Conversation

zneix
Copy link
Collaborator

@zneix zneix commented Jun 20, 2021

Pull request checklist:

  • CHANGELOG.md was updated, if applicable

Description

Fixes #2904

fk I'm so tired...
@zneix zneix mentioned this pull request Jun 20, 2021
1 task
@zneix zneix marked this pull request as ready for review June 21, 2021 14:22
@zneix zneix requested a review from pajlada June 21, 2021 14:22
Copy link
Collaborator

@Mm2PL Mm2PL left a comment

Choose a reason for hiding this comment

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

pajaDent

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/twitch/api/Helix.cpp Outdated Show resolved Hide resolved
Copy link
Contributor

@talneoran talneoran left a comment

Choose a reason for hiding this comment

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

Seems to work 👍
Only issue is the qa_TW_Partner user that twitch seems to use for some of the global emotes, which causes them to show under that user instead of under Twitch in the emote popup.
Could maybe handle this by manually moving emotes from that emote set to the Twitch set until this is changed by twitch or another fix is possible.

Copy link
Collaborator

@Mm2PL Mm2PL left a comment

Choose a reason for hiding this comment

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

2021-06-21_22-54
Here's how it currently looks. I dislike the qa_TW_Partner

@fourtf fourtf enabled auto-merge (squash) June 24, 2021 21:02
@fourtf fourtf merged commit 0021290 into master Jun 24, 2021
@fourtf fourtf deleted the zneix/fix/emoteset-stuff branch June 24, 2021 21:23
zneix added a commit to SevenTV/chatterino7 that referenced this pull request Jun 25, 2021
Now we're on commit 0021290; Changes from upstream we pulled:

- Bugfix: Fix reconnecting when IRC write connection is lost (Chatterino#1831, Chatterino#2356, Chatterino#2850, Chatterino#2892)
- Bugfix: Fixed subscription emotes showing up incorrectly in the emote menu. (Chatterino#2905)

Changes added in Chatterino7 only:

- Major: Added 7tv badges. (2154981)
- Minor: Fixed potential issues preventing 7tv emotes from loading (c0b1117)
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.

Twitchemotes API died making emoteset queries fail to deliver data
4 participants