feat: support 7TV overrides and emoji-emotes #283
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2133,24 +2133,6 @@ void MessageBuilder::addEmoji(const EmotePtr &emote) | |
|
|
||
| void MessageBuilder::addTextOrEmote(TextState &state, QString string) | ||
| { | ||
| auto link = linkparser::parse(string); | ||
| auto textColor = this->textColor_; | ||
|
|
||
|
|
@@ -2639,6 +2621,13 @@ Outcome MessageBuilder::tryAppendEmote(TwitchChannel *twitchChannel, | |
| return Failure; | ||
| } | ||
|
|
||
| this->appendEmote(*emote, flags, zeroWidth); | ||
| return Success; | ||
| } | ||
|
|
||
| void MessageBuilder::appendEmote(const EmotePtr &emote, | ||
| MessageElementFlags flags, bool zeroWidth) | ||
| { | ||
| if (zeroWidth && getSettings()->enableZeroWidthEmotes && !this->isEmpty()) | ||
| { | ||
| // Attempt to merge current zero-width emote into any previous emotes | ||
|
|
@@ -2651,26 +2640,25 @@ Outcome MessageBuilder::tryAppendEmote(TwitchChannel *twitchChannel, | |
| auto baseEmoteElement = this->releaseBack(); | ||
|
|
||
| std::vector<LayeredEmoteElement::Emote> layers = { | ||
| {baseEmote, baseEmoteElement->getFlags()}, {emote, flags}}; | ||
| this->emplace<LayeredEmoteElement>( | ||
| std::move(layers), baseEmoteElement->getFlags() | flags, | ||
| this->textColor_); | ||
| return; | ||
| } | ||
|
|
||
| auto *asLayered = dynamic_cast<LayeredEmoteElement *>(&this->back()); | ||
| if (asLayered) | ||
| { | ||
| asLayered->addEmoteLayer({emote, flags}); | ||
| asLayered->addFlags(flags); | ||
| return; | ||
| } | ||
|
|
||
| // No emote to merge with, just show as regular emote | ||
| } | ||
|
|
||
| this->emplace<EmoteElement>(emote, flags, this->textColor_); | ||
| } | ||
|
|
||
| void MessageBuilder::addWords( | ||
|
|
@@ -2696,10 +2684,18 @@ void MessageBuilder::addWords( | |
|
|
||
| if (currentTwitchEmote.start == cursor) | ||
| { | ||
| auto [emote, flags, zeroWidth] = parseEmote( | ||
| state.twitchChannel, state.userID, currentTwitchEmote.name); | ||
| if (emote && emote->get()->isGlobalOverride) | ||
| { | ||
| this->appendEmote(*emote, flags, zeroWidth); | ||
| } | ||
| else | ||
| { | ||
| this->emplace<EmoteElement>(currentTwitchEmote.ptr, | ||
| MessageElementFlag::TwitchEmote, | ||
| this->textColor_); | ||
| } | ||
|
|
||
| auto len = currentTwitchEmote.name.string.length(); | ||
| cursor += len; | ||
|
|
@@ -2750,7 +2746,25 @@ void MessageBuilder::addWords( | |
| continue; | ||
| } | ||
|
|
||
| if (state.hasBits && this->tryAppendCheermote(state, word)) | ||
| { | ||
| // This string was parsed as a cheermote | ||
| cursor += word.size() + 1; | ||
| continue; | ||
| } | ||
|
|
||
| // TODO: Implement ignored emotes | ||
| // Format of ignored emotes: | ||
| // Emote name: "forsenPuke" - if string in ignoredEmotes | ||
| // Will match emote regardless of source (i.e. bttv, ffz) | ||
| // Emote source + name: "bttv:nyanPls" | ||
| if (this->tryAppendEmote(state.twitchChannel, state.userID, {word})) | ||
| { | ||
| // Successfully appended an emote | ||
| cursor += word.size() + 1; | ||
|
There was a problem hiding this comment. warning: narrowing conversion from 'qsizetype' (aka 'long long') to signed type 'int' is implementation-defined [bugprone-narrowing-conversions] emote
^ |
||
| continue; | ||
| } | ||
|
|
||
| for (auto variant : getApp()->getEmotes()->getEmojis()->parse(word)) | ||
| { | ||
| boost::apply_visitor(variant::Overloaded{ | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
warning: narrowing conversion from 'qsizetype' (aka 'long long') to signed type 'int' is implementation-defined [bugprone-narrowing-conversions]
rmote ^