From b16d731ddbdef62807e28f3f904f1e683ea2cf10 Mon Sep 17 00:00:00 2001
From: Cadence Ember <cadence@disroot.org>
Date: Tue, 3 Feb 2026 01:02:57 +1300
Subject: [PATCH] Better emoji pack names

---
 src/d2m/actions/create-space.js |  6 ++++--
 src/d2m/actions/expression.js   | 10 ++++++----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/d2m/actions/create-space.js b/src/d2m/actions/create-space.js
index 89e0f08..1417b2d 100644
--- a/src/d2m/actions/create-space.js
+++ b/src/d2m/actions/create-space.js
@@ -229,14 +229,16 @@ async function syncSpaceExpressions(data, checkBeforeSync) {
 	 */
 	async function update(spaceID, key, eventKey, fn) {
 		if (!(key in data) || !data[key].length) return
-		const content = await fn(data[key])
+		const guild = discord.guilds.get(data.guild_id)
+		assert(guild)
+		const content = await fn(data[key], guild)
 		if (checkBeforeSync) {
 			let existing
 			try {
 				existing = await api.getStateEvent(spaceID, "im.ponies.room_emotes", eventKey)
 			} catch (e) {
 				// State event not found. This space doesn't have any existing emojis. We create a dummy empty event for comparison's sake.
-				existing = fn([])
+				existing = fn([], guild)
 			}
 			if (isDeepStrictEqual(existing, content)) return
 		}
diff --git a/src/d2m/actions/expression.js b/src/d2m/actions/expression.js
index 1c95dda..c7ab27a 100644
--- a/src/d2m/actions/expression.js
+++ b/src/d2m/actions/expression.js
@@ -9,11 +9,12 @@ const file = sync.require("../../matrix/file")
 
 /**
  * @param {DiscordTypes.APIEmoji[]} emojis
+ * @param {DiscordTypes.APIGuild} guild
  */
-async function emojisToState(emojis) {
+async function emojisToState(emojis, guild) {
 	const result = {
 		pack: {
-			display_name: "Discord Emojis",
+			display_name: `${guild.name} (Discord Emojis)`,
 			usage: ["emoticon"] // we'll see...
 		},
 		images: {
@@ -42,11 +43,12 @@ async function emojisToState(emojis) {
 
 /**
  * @param {DiscordTypes.APISticker[]} stickers
+ * @param {DiscordTypes.APIGuild} guild
  */
-async function stickersToState(stickers) {
+async function stickersToState(stickers, guild) {
 	const result = {
 		pack: {
-			display_name: "Discord Stickers",
+			display_name: `${guild.name} (Discord Stickers)`,
 			usage: ["sticker"] // we'll see...
 		},
 		images: {