@nodebb/nodebb-plugin-reactions 3.1.3 → 3.1.5

package/helpers.js

@@ -46,10 +46,6 @@ function resolveByName(name) {
 	return null;
 }
 
-/**
- * Resolve FEP-c0e0 reaction content (unicode grapheme, `:shortcode:`, bare name,
- * or a custom-emoji `tag`) to a local emoji name. Returns null when unresolvable.
- */
 function resolveReaction(content, tag) {
 	if (typeof content !== 'string' || !content.trim()) {
 		return null;
@@ -90,7 +86,13 @@ function resolveReaction(content, tag) {
 	if (!reaction && Array.isArray(tag)) {
 		const emojiTag = tag.find(t => t && t.type === 'Emoji' && typeof t.name === 'string');
 		if (emojiTag) {
-			reaction = resolveByName(emojiTag.name.replace(/^:|:$/g, ''));
+			const name = emojiTag.name.replace(/^:|:$/g, '');
+			// Try to resolve as a local emoji first
+			reaction = resolveByName(name);
+			// If not local, return the tag so the caller can cache the custom emoji
+			if (!reaction) {
+				return { emoji: name, emojiTag };
+			}
 		}
 	}
 

package/library.js

@@ -30,6 +30,49 @@ function parse(name) {
 	return emoji ? emojiParser.buildEmoji(emoji, '') : '';
 }
 
+async function parseReaction(name, sourceUrl) {
+	const emoji = nameToEmoji(name) || helpers.getEmojiTable()[helpers.getEmojiAliases()[name]];
+	if (emoji) {
+		return emojiParser.buildEmoji(emoji, '');
+	}
+
+	// Try to find the custom emoji: first by source URL hostname, then by scanning emoji:ap:lookup
+	let hostname = null;
+	if (typeof sourceUrl === 'string') {
+		try {
+			hostname = new URL(sourceUrl).hostname;
+		} catch (e) {
+			// Not a valid URL (e.g. numeric pid)
+		}
+	}
+
+	let metadata = null;
+	if (hostname) {
+		metadata = await activitypub.emoji.getEmoji(name, hostname);
+	}
+
+	// Fallback: scan emoji:ap:lookup for any entry matching this shortcode
+	if (!metadata) {
+		const allKeys = await db.getObjectKeys('emoji:ap:lookup');
+		if (allKeys && allKeys.length > 0) {
+			const matchKey = allKeys.find(k => k.startsWith(`${name}:`));
+			if (matchKey) {
+				const idx = matchKey.indexOf(':');
+				if (idx !== -1) {
+					hostname = matchKey.slice(idx + 1);
+					metadata = await activitypub.emoji.getEmoji(name, hostname);
+				}
+			}
+		}
+	}
+
+	if (metadata) {
+		const proxyUrl = activitypub.emoji.getProxyUrl(name, hostname);
+		return `<img class="not-responsive emoji" src="${proxyUrl}" title=":${name}:" />`;
+	}
+	return '';
+}
+
 const ReactionsPlugin = module.exports;
 
 ReactionsPlugin.init = async function (params) {
@@ -150,7 +193,7 @@ ReactionsPlugin.getPostReactions = async function (data) {
 					for (const reaction of reactions) {
 						const reactionSet = `pid:${post.pid}:reaction:${reaction}`;
 						const uids = reactionSetToUsersMap.get(reactionSet);
-						const reactionImage = parse(reaction);
+						const reactionImage = await parseReaction(reaction, post.pid);
 						if (Array.isArray(uids) && reactionImage) {
 							post.reactions.push({
 								pid: post.pid,
@@ -215,7 +258,7 @@ ReactionsPlugin.getMessageReactions = async function (data) {
 					for (const reaction of reactions) {
 						const reactionSet = `mid:${msg.mid}:reaction:${reaction}`;
 						const uids = reactionSetToUsersMap.get(reactionSet);
-						const reactionImage = parse(reaction);
+						const reactionImage = await parseReaction(reaction, msg.mid);
 						if (Array.isArray(uids) && reactionImage) {
 							msg.reactions.push({
 								mid: msg.mid,
@@ -290,7 +333,7 @@ async function sendPostEvent(data, eventName) {
 			reaction: data.reaction,
 			reactionCount,
 			totalReactions,
-			reactionImage: parse(data.reaction),
+			reactionImage: await parseReaction(data.reaction, data.pid),
 		});
 	} catch (e) {
 		console.error(e);
@@ -314,7 +357,7 @@ async function sendMessageEvent(data, eventName) {
 			reaction: data.reaction,
 			reactionCount,
 			totalReactions,
-			reactionImage: parse(data.reaction),
+			reactionImage: await parseReaction(data.reaction, data.mid),
 		});
 	} catch (e) {
 		console.error(e);
@@ -501,13 +544,36 @@ ReactionsPlugin.applyEmojiReact = async function (activity) {
 
 	const id = await resolveReactionPost(object);
 	if (!id) {
-		return;
+		return false;
 	}
 
-	const reaction = helpers.resolveReaction(content, tag);
-	if (!reaction) {
+	const resolved = helpers.resolveReaction(content, tag);
+	if (!resolved) {
 		activitypub.helpers.log(`[reactions/ap] Unresolvable reaction content (${JSON.stringify(content)}), ignoring.`);
-		return;
+		return false;
+	}
+
+	let reaction;
+	let emojiTag;
+	if (typeof resolved === 'object' && resolved.emoji) {
+		reaction = resolved.emoji;
+		emojiTag = resolved.emojiTag;
+	} else {
+		reaction = resolved;
+	}
+
+	if (emojiTag) {
+		const cacheTag = { name: emojiTag.name };
+		if (emojiTag.icon && emojiTag.icon.url) {
+			cacheTag.icon = emojiTag.icon;
+		} else if (emojiTag.id) {
+			cacheTag.icon = { url: emojiTag.id, mediaType: emojiTag.mediaType || null };
+		} else {
+			cacheTag = null;
+		}
+		if (cacheTag) {
+			await activitypub.emoji.cacheEmoji(cacheTag);
+		}
 	}
 
 	const allowed = await privileges.posts.can('posts:upvote', id, activitypub._constants.uid);
@@ -519,6 +585,7 @@ ReactionsPlugin.applyEmojiReact = async function (activity) {
 	activitypub.helpers.log(`[reactions/ap] id ${id} (${reaction}) via ${actor}`);
 	await ReactionsPlugin.addPostReaction(id, actor, reaction);
 	await activitypub.feps.announce(object.id, activity);
+	return true;
 };
 
 ReactionsPlugin.undoEmojiReact = async function (activity) {
@@ -526,19 +593,22 @@ ReactionsPlugin.undoEmojiReact = async function (activity) {
 
 	const id = await resolveReactionPost(object);
 	if (!id) {
-		return;
+		return false;
 	}
 
-	const reaction = helpers.resolveReaction(content, tag);
-	if (!reaction) {
+	const resolved = helpers.resolveReaction(content, tag);
+	if (!resolved) {
 		activitypub.helpers.log(`[reactions/ap] Unresolvable reaction content in undo, ignoring.`);
-		return;
+		return false;
 	}
 
+	const reaction = typeof resolved === 'object' ? resolved.emoji : resolved;
+
 	activitypub.helpers.log(`[reactions/ap] undo id ${id} (${reaction}) via ${actor}`);
 	await ReactionsPlugin.removePostReaction(id, actor, reaction);
 	await ReactionsPlugin.rescindPostReaction(id, actor, reaction);
 	await activitypub.feps.announce(object.id, activity);
+	return true;
 };
 
 ReactionsPlugin.handleEmojiReact = async function (context) {
@@ -547,10 +617,11 @@ ReactionsPlugin.handleEmojiReact = async function (context) {
 };
 
 ReactionsPlugin.handleLike = async function (context) {
-	// FEP-c0e0: a Like with content is an emoji reaction; a plain Like falls through to core
 	if (typeof context.activity.content === 'string' && context.activity.content.trim()) {
-		await ReactionsPlugin.applyEmojiReact(context.activity);
-		return { ...context, claimed: true };
+		const applied = await ReactionsPlugin.applyEmojiReact(context.activity);
+		if (applied) {
+			return { ...context, claimed: true };
+		}
 	}
 	return context;
 };
@@ -615,8 +686,11 @@ ReactionsPlugin.handleAnnounce = async function (context) {
 		}
 	}
 
-	await ReactionsPlugin.applyEmojiReact(object);
-	return { ...context, claimed: true };
+	const applied = await ReactionsPlugin.applyEmojiReact(object);
+	if (applied) {
+		return { ...context, claimed: true };
+	}
+	return context;
 };
 
 SocketPlugins.reactions = {