From 30bf87b106a94a0dc64ad87b851baf21111e3414 Mon Sep 17 00:00:00 2001
From: Cadence Ember <cadence@disroot.org>
Date: Fri, 25 Aug 2023 12:05:16 +1200
Subject: [PATCH] channel name decoration for threads and voice-text

---
 d2m/actions/create-room.js      | 11 ++++++++---
 d2m/actions/create-room.test.js | 29 +++++++++++++++++++++++++----
 2 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/d2m/actions/create-room.js b/d2m/actions/create-room.js
index cb1bc85..6fbc42e 100644
--- a/d2m/actions/create-room.js
+++ b/d2m/actions/create-room.js
@@ -36,12 +36,17 @@ function applyKStateDiffToRoom(roomID, kstate) {
 }
 
 /**
- * @param {{id: string, name: string, topic?: string?}} channel
+ * @param {{id: string, name: string, topic?: string?, type: number}} channel
  * @param {{id: string}} guild
  * @param {string?} customName
  */
 function convertNameAndTopic(channel, guild, customName) {
-	const convertedName = customName || channel.name;
+	let channelPrefix =
+		( channel.type === DiscordTypes.ChannelType.PublicThread ? "[⛓️] "
+		: channel.type === DiscordTypes.ChannelType.PrivateThread ? "[🔒⛓️] "
+		: channel.type === DiscordTypes.ChannelType.GuildVoice ? "[🔊] "
+		: "")
+	const chosenName = customName || (channelPrefix + channel.name);
 	const maybeTopicWithPipe = channel.topic ? ` | ${channel.topic}` : '';
 	const maybeTopicWithNewlines = channel.topic ? `${channel.topic}\n\n` : '';
 	const channelIDPart = `Channel ID: ${channel.id}`;
@@ -51,7 +56,7 @@ function convertNameAndTopic(channel, guild, customName) {
 		 ? `#${channel.name}${maybeTopicWithPipe}\n\n${channelIDPart}\n${guildIDPart}`
 		 : `${maybeTopicWithNewlines}${channelIDPart}\n${guildIDPart}`;
 
-	return [convertedName, convertedTopic];
+	return [chosenName, convertedTopic];
 }
 
 /**
diff --git a/d2m/actions/create-room.test.js b/d2m/actions/create-room.test.js
index ec5c3d3..e40bf6f 100644
--- a/d2m/actions/create-room.test.js
+++ b/d2m/actions/create-room.test.js
@@ -14,28 +14,49 @@ test("channel2room: general", async t => {
 
 test("convertNameAndTopic: custom name and topic", t => {
 	t.deepEqual(
-		_convertNameAndTopic({id: "123", name: "the-twilight-zone", topic: "Spooky stuff here. :ghost:"}, {id: "456"}, "hauntings"),
+		_convertNameAndTopic({id: "123", name: "the-twilight-zone", topic: "Spooky stuff here. :ghost:", type: 0}, {id: "456"}, "hauntings"),
 		["hauntings", "#the-twilight-zone | Spooky stuff here. :ghost:\n\nChannel ID: 123\nGuild ID: 456"]
 	)
 })
 
 test("convertNameAndTopic: custom name, no topic", t => {
 	t.deepEqual(
-		_convertNameAndTopic({id: "123", name: "the-twilight-zone"}, {id: "456"}, "hauntings"),
+		_convertNameAndTopic({id: "123", name: "the-twilight-zone", type: 0}, {id: "456"}, "hauntings"),
 		["hauntings", "#the-twilight-zone\n\nChannel ID: 123\nGuild ID: 456"]
 	)
 })
 
 test("convertNameAndTopic: original name and topic", t => {
 	t.deepEqual(
-		_convertNameAndTopic({id: "123", name: "the-twilight-zone", topic: "Spooky stuff here. :ghost:"}, {id: "456"}, null),
+		_convertNameAndTopic({id: "123", name: "the-twilight-zone", topic: "Spooky stuff here. :ghost:", type: 0}, {id: "456"}, null),
 		["the-twilight-zone", "Spooky stuff here. :ghost:\n\nChannel ID: 123\nGuild ID: 456"]
 	)
 })
 
 test("convertNameAndTopic: original name, no topic", t => {
 	t.deepEqual(
-		_convertNameAndTopic({id: "123", name: "the-twilight-zone"}, {id: "456"}, null),
+		_convertNameAndTopic({id: "123", name: "the-twilight-zone", type: 0}, {id: "456"}, null),
 		["the-twilight-zone", "Channel ID: 123\nGuild ID: 456"]
 	)
 })
+
+test("convertNameAndTopic: public thread icon", t => {
+	t.deepEqual(
+		_convertNameAndTopic({id: "123", name: "the-twilight-zone", topic: "Spooky stuff here. :ghost:", type: 11}, {id: "456"}, null),
+		["[⛓️] the-twilight-zone", "Spooky stuff here. :ghost:\n\nChannel ID: 123\nGuild ID: 456"]
+	)
+})
+
+test("convertNameAndTopic: private thread icon", t => {
+	t.deepEqual(
+		_convertNameAndTopic({id: "123", name: "the-twilight-zone", topic: "Spooky stuff here. :ghost:", type: 12}, {id: "456"}, null),
+		["[🔒⛓️] the-twilight-zone", "Spooky stuff here. :ghost:\n\nChannel ID: 123\nGuild ID: 456"]
+	)
+})
+
+test("convertNameAndTopic: voice channel icon", t => {
+	t.deepEqual(
+		_convertNameAndTopic({id: "123", name: "the-twilight-zone", topic: "Spooky stuff here. :ghost:", type: 2}, {id: "456"}, null),
+		["[🔊] the-twilight-zone", "Spooky stuff here. :ghost:\n\nChannel ID: 123\nGuild ID: 456"]
+	)
+})