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

chore: improve appearance of Twitch emotes in popup #5632

Merged
merged 7 commits into from
Oct 13, 2024

Conversation

Nerixyz
Copy link
Contributor

@Nerixyz Nerixyz commented Oct 7, 2024

  • Combines bit emote sets into one for each user
  • Sorts emote sets by name in popup (not when searching)

Fixes #5631 (hopefully)

Comment on lines +497 to +504
// some bit emote-sets have an id, but we want to combine them into a
// single set
if (isBits)
{
return emote.setID;
return TWITCH_BIT_EMOTE_SET_PREFIX % emote.ownerID;
}

if (isSub)
{
return TWITCH_SUB_EMOTE_SET_PREFIX % emote.ownerID;
}
// isBits
return TWITCH_BIT_EMOTE_SET_PREFIX % emote.ownerID;
// isSub
return TWITCH_SUB_EMOTE_SET_PREFIX % emote.ownerID;
Copy link
Contributor Author

Choose a reason for hiding this comment

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

just relaized I could make this more readable by checking bits/subs first, but let's see if this works at all

@Nerixyz
Copy link
Contributor Author

Nerixyz commented Oct 7, 2024

@digitizeddave could you try the appimage from this PR (https://github.com/Chatterino/chatterino2/actions/runs/11217307145?pr=5632, at the bottom)?

@digitizeddave
Copy link

@digitizeddave could you try the appimage from this PR (https://github.com/Chatterino/chatterino2/actions/runs/11217307145?pr=5632, at the bottom)?

Yes, that is organized much better! It's alphabetized and the bits are next to their respective channels.
image

@pajlada pajlada enabled auto-merge (squash) October 13, 2024 09:42
@pajlada pajlada merged commit 3e21166 into Chatterino:master Oct 13, 2024
18 checks passed
@Nerixyz Nerixyz deleted the fix/more-emote-stuff branch October 13, 2024 10:10
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.

Emote Picker Order and Bit Emotes
3 participants