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

Fixed degraded dirty emote code escaping #3010

Merged
merged 3 commits into from Jul 17, 2021
Merged

Conversation

zneix
Copy link
Collaborator

@zneix zneix commented Jul 14, 2021

Pull request checklist:

  • CHANGELOG.md was updated, if applicable

Description

Degradation introduced in #2951, where cleanCode variable was used while appending emote to emoteSet, but used dirty code while appending to EmoteMap with all emote names.
Additionally, I removed duplicate code in TwitchEmotes.cpp and made TwitchEmotes::cleanUpEmoteCode take QString as an argument - this is more convenient in all usecases of this method plus imho it is a better practice to make it take a variable of the same type as the type it returns.

@Mm2PL Mm2PL self-requested a review July 14, 2021 17:39
@zneix zneix enabled auto-merge (squash) July 17, 2021 10:17
@zneix zneix merged commit a509c75 into master Jul 17, 2021
@zneix zneix deleted the zneix/fix/clean-emote-codes branch July 17, 2021 10:35
zneix added a commit to SevenTV/chatterino7 that referenced this pull request Jul 17, 2021
Now we're on commit 9f2fc90; Changes from upstream we pulled:

- Major: Newly uploaded Twitch emotes are once again present in emote picker and can be autocompleted with Tab as well. (Chatterino#2992)
- Minor: Added autocompletion in /whispers for Twitch emotes, Global Bttv/Ffz emotes and emojis. (Chatterino#2999, Chatterino#3033)
- Minor: Received Twitch messages now use the exact same timestamp (obtained from Twitch's server) for every Chatterino user instead of assuming message timestamp on client's side. (Chatterino#3021)
- Minor: Received IRC messages use `time` message tag for timestamp if it's available. (Chatterino#3021)
- Bugfix: Fixed "smiley" emotes being unable to be "Tabbed" with autocompletion, introduced in v2.3.3. (Chatterino#3010)
- Dev: Ubuntu packages are now available (Chatterino#2936)
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.

None yet

2 participants