Fix Kick emote detection

Author: steveseguin

multi-alerts.js

@@ -267,7 +267,8 @@ function getTranslation(key, fallback = '') {
 function formatTranslation(key, fallback, values = {}) {
   let template = getTranslation(key, fallback);
   Object.keys(values).forEach((valueKey) => {
-    template = template.replace(new RegExp(`\\{${valueKey}\\}`, 'g'), values[valueKey]);
+    const replacement = values[valueKey] == null ? '' : String(values[valueKey]);
+    template = template.replace(new RegExp(`\\{${valueKey}\\}`, 'g'), () => replacement);
   });
   return template;
 }

sources/kick.js

@@ -690,6 +690,7 @@
 	const KICK_BADGE_SELECTOR = ".badge-tooltip img[src], .badge-tooltip svg, .base-badge img[src], .base-badge svg, .badge img[src], .badge svg, div[data-state] img[src], div[data-state] svg";
 	const KICK_MESSAGE_CONTENT_SELECTOR = ".chat-entry-content, .chat-emote-container, .break-all, seventv-container, .seventv-painted-content, span[class*='font-normal'], div[class*='font-normal']";
 	const KICK_MOD_ACTIONS_SELECTOR = "[style*='chatroom-mod-actions-display'], button[aria-label='Delete'], button[aria-label='Pin'], button[aria-label='Reply'], button[aria-label='Ban'], button[aria-label='Timeout'], button[aria-label='Block']";
+	const KICK_MOD_ACTIONS_CLOSEST_SELECTOR = "button[aria-label='Delete'], button[aria-label='Pin'], button[aria-label='Reply'], button[aria-label='Ban'], button[aria-label='Timeout'], button[aria-label='Block']";
 
 	function getKickUsernameButton(ele) {
 		return ele.querySelector("button.inline.font-bold[data-prevent-expand]")
@@ -704,7 +705,7 @@
 		if (node.matches && node.matches(KICK_MOD_ACTIONS_SELECTOR)) {
 			return true;
 		}
-		return Boolean(node.closest && node.closest(KICK_MOD_ACTIONS_SELECTOR));
+		return Boolean(node.closest && node.closest(KICK_MOD_ACTIONS_CLOSEST_SELECTOR));
 	}
 
 	function isKickMessageTextNode(node) {

sources/websocket/twitch.js

@@ -375,7 +375,10 @@ try{
 	function formatTranslation(key, fallback, values = {}) {
 		let template = getTranslation(key, fallback);
 		Object.keys(values).forEach(function(valueKey) {
-			template = template.replace(new RegExp("\\{" + valueKey + "\\}", "g"), values[valueKey]);
+			const replacement = values[valueKey] == null ? '' : String(values[valueKey]);
+			template = template.replace(new RegExp("\\{" + valueKey + "\\}", "g"), function() {
+				return replacement;
+			});
 		});
 		return template;
 	}
@@ -2322,10 +2325,18 @@ async function ensureChatClientInstance() {
 			case 'anonsubgift':
 			case 'submysterygift':
 			case 'anonsubmysterygift':
+				const giftRecipient = parsedMessage.tags['msg-param-recipient-display-name'] ||
+					parsedMessage.tags['msg-param-recipient-user-name'] ||
+					(normalizedPayload && normalizedPayload.raw && normalizedPayload.raw.recipient) ||
+					(normalizedPayload && normalizedPayload.recipient) ||
+					'';
 				const giftMessage = formatTranslation('twitch-gifted-a-sub-message', '{name} gifted a sub', {
 					name: displayName || getTranslation('someone', 'Someone')
 				});
-				eventData.chatmessage = useTranslatedNoticeText ? giftMessage : (systemMsg || giftMessage);
+				const giftMessageWithRecipient = giftRecipient
+					? giftMessage + ' ' + getTranslation('membership-to-word', 'to') + ' ' + giftRecipient
+					: giftMessage;
+				eventData.chatmessage = useTranslatedNoticeText ? giftMessageWithRecipient : (systemMsg || giftMessageWithRecipient);
 				eventData.event = 'subscription_gift';
 				if (settings.limitedtwitchmemberchat) {
 					eventData.membership = getSubscriberLabel();