Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "twitch-chat",
"private": true,
"version": "1.0.1",
"version": "1.0.2",
"type": "module",
"scripts": {
"dev": "vite",
Expand Down
15 changes: 8 additions & 7 deletions src/views/Chat/ChatImageRenderer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ export const ChatImageRenderer = ({ fragments }: { fragments: ChannelChatMessage
emote: getTwitchEmote(fragment.emote.id),
cheer: undefined,
skip: false,
modifierFlags: [...nextMessageModifierFlags],
});
nextMessageModifierFlags.length = 0;
return;
Expand Down Expand Up @@ -169,6 +170,8 @@ export const ChatImageRenderer = ({ fragments }: { fragments: ChannelChatMessage
});
});

console.log('Message Parts:', messageParts);

return (
<>
{messageParts.map(({ match, emote, cheer, skip, modifierFlags }, index) => {
Expand Down Expand Up @@ -208,7 +211,7 @@ export const ChatImageRenderer = ({ fragments }: { fragments: ChannelChatMessage
}

// Next message part is a space
if (nextMessagePart.match === ' ') {
if (nextMessagePart.match.trim() === '') {
nextIndex++;
continue;
}
Expand All @@ -221,12 +224,10 @@ export const ChatImageRenderer = ({ fragments }: { fragments: ChannelChatMessage

// Next message part is a modifier
if (nextMessagePart.emote && nextMessagePart.emote.modifierFlags > 0) {
let nextMessageParsedFlags: string[] = [];
if (nextMessagePart.emote.origin === 'sevenTV') {
nextMessageParsedFlags = parseSevenTVModifierFlags(nextMessagePart.emote.modifierFlags);
} else if (nextMessagePart.emote.origin === 'frankerFaceZ') {
nextMessageParsedFlags = parseFrankerFaceZModifierFlags(nextMessagePart.emote.modifierFlags);
}
const nextMessageParsedFlags: string[] = [
...parseSevenTVModifierFlags(nextMessagePart.emote.modifierFlags),
...parseFrankerFaceZModifierFlags(nextMessagePart.emote.modifierFlags),
];

// Next message part is a modifier that applies to this emote
if (nextMessageParsedFlags.length > 0) {
Expand Down
Loading