From 12f41038701e26d4ad41d74cfd305fc89b8036b9 Mon Sep 17 00:00:00 2001
From: nemesio65 <chris_brown@bhsnw.com>
Date: Thu, 19 Mar 2026 15:58:54 -0700
Subject: [PATCH] d2m: Create voice channels as call rooms

---
 src/d2m/actions/create-room.js      | 10 ++++++++++
 src/d2m/actions/create-room.test.js | 11 +++++++++++
 test/data.js                        | 20 ++++++++++++++++++++
 3 files changed, 41 insertions(+)

diff --git a/src/d2m/actions/create-room.js b/src/d2m/actions/create-room.js
index c2ec01a..7f110ad 100644
--- a/src/d2m/actions/create-room.js
+++ b/src/d2m/actions/create-room.js
@@ -193,6 +193,16 @@ async function channelToKState(channel, guild, di) {
 	// Don't overwrite room topic if the topic has been customised
 	if (hasCustomTopic) delete channelKState["m.room.topic/"]
 
+	// Make voice channels be a Matrix voice room (MSC3417)
+	if (channel.type === DiscordTypes.ChannelType.GuildVoice) {
+		creationContent.type = "org.matrix.msc3417.call"
+		channelKState["org.matrix.msc3401.call/"] = {
+			"m.intent": "m.room",
+			"m.type": "m.voice",
+			"m.name": customName || channel.name
+		}
+	}
+
 	// Don't add a space parent if it's self service
 	// (The person setting up self-service has already put it in their preferred space to be able to get this far.)
 	const autocreate = select("guild_active", "autocreate", {guild_id: guild.id}).pluck().get()
diff --git a/src/d2m/actions/create-room.test.js b/src/d2m/actions/create-room.test.js
index 36fccba..c9e098b 100644
--- a/src/d2m/actions/create-room.test.js
+++ b/src/d2m/actions/create-room.test.js
@@ -190,6 +190,17 @@ test("channel2room: read-only discord channel", async t => {
 	t.equal(api.getCalled(), 2)
 })
 
+test("channel2room: voice channel", async t => {
+	const api = mockAPI(t)
+	const state = kstateStripConditionals(await channelToKState(testData.channel.voice, testData.guild.general, {api}).then(x => x.channelKState))
+	t.equal(state["m.room.create/"].type, "org.matrix.msc3417.call")
+	t.deepEqual(state["org.matrix.msc3401.call/"], {
+		"m.intent": "m.room",
+		"m.name": "🍞丨[8user] Piece",
+		"m.type": "m.voice"
+	})
+})
+
 test("convertNameAndTopic: custom name and topic", t => {
 	t.deepEqual(
 		_convertNameAndTopic({id: "123", name: "the-twilight-zone", topic: "Spooky stuff here. :ghost:", type: 0}, {id: "456"}, "hauntings"),
diff --git a/test/data.js b/test/data.js
index f5e8313..cc054cf 100644
--- a/test/data.js
+++ b/test/data.js
@@ -19,6 +19,26 @@ module.exports = {
 			default_thread_rate_limit_per_user: 0,
 			guild_id: "112760669178241024"
 		},
+		voice: {
+			voice_background_display: null,
+			version: 1774469910848,
+			user_limit: 0,
+			type: 2,
+			theme_color: null,
+			status: null,
+			rtc_region: null,
+			rate_limit_per_user: 0,
+			position: 0,
+			permission_overwrites: [],
+			parent_id: "805261291908104252",
+			nsfw: false,
+			name: "🍞丨[8user] Piece",
+			last_message_id: "1459912691098325137",
+			id: "1036840786093953084",
+			flags: 0,
+			bitrate: 256000,
+			guild_id: "112760669178241024"
+		},
 		updates: {
 			type: 0,
 			topic: "Updates and release announcements for Out Of Your Element.",