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

Remove twitchemotes.com-related functionality #3136

Merged
merged 5 commits into from
Aug 7, 2021

Conversation

pajlada
Copy link
Member

@pajlada pajlada commented Aug 7, 2021

  • Remove attribution to twitchemotes.com API as we now pull data from Helix directly
  • Remove "Open TwitchEmotes emote link" and "Copy TwitchEmotes emote link" menu options when right-clicking Twitch emotes
  • Add changelog entry

Pull request checklist:

  • CHANGELOG.md was updated, if applicable

Description

Fixes #3114
Fixes #2745
Fixes #3126

@zneix zneix self-requested a review August 7, 2021 10:37
CHANGELOG.md Outdated Show resolved Hide resolved
@pajlada pajlada changed the title chore/remove twitchemotes.com functionality Remove twitchemotes.com-related functionality Aug 7, 2021
Copy link
Collaborator

@zneix zneix left a comment

Choose a reason for hiding this comment

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

A 👍 for noticing and removing twitchemotes mention from AboutPage.cpp

@zneix zneix enabled auto-merge (squash) August 7, 2021 11:02
@zneix zneix merged commit 54f6e4f into master Aug 7, 2021
@zneix zneix deleted the chore/remove-twitchemotes.com-functionality branch August 7, 2021 11:13
zneix added a commit to SevenTV/chatterino7 that referenced this pull request Aug 8, 2021
Now we're on commit a216e11; Changes from upstream we've pulled:

- Minor: Remove TwitchEmotes.com attribution and the open/copy options when right-clicking a Twitch Emote. (Chatterino#2214, Chatterino#3136)
- Minor: Strip leading @ and trailing , from username in /user and /usercard commands. (Chatterino#3143)
- Minor: Display a system message when reloading subscription emotes to match BTTV/FFZ behavior (Chatterino#3135)
- Bugfix: Moderation mode and active filters are now preserved when opening a split as a popup. (Chatterino#3113, Chatterino#3130)
- Bugfix: Fixed a bug that caused all badge highlights to use the same color. (Chatterino#3132, Chatterino#3134)
- Dev: Renamed CMake's build option `USE_SYSTEM_QT5KEYCHAIN` to `USE_SYSTEM_QTKEYCHAIN`. (Chatterino#3103)
- Dev: Add benchmarks that can be compiled with the `BUILD_BENCHMARKS` CMake flag. Off by default. (Chatterino#3038)
- Dev: Allow building against Qt 5.11 (Chatterino#3105)
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 link in emote context menu not working anymore Add special handling for Twitch bits emotes
2 participants