fixed greeting sending in companionless rooms yet again

BestMordaEver · May 23, 2024 · a31cb52 · a31cb52
1 parent ea97b99
commit a31cb52
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-## Voice Manager v4.6.6
+## Voice Manager v4.7.3
 
 <a href="https://top.gg/bot/601347755046076427">
     <img src="https://top.gg/api/widget/status/601347755046076427.svg" alt="Voice Manager" />

diff --git a/libs/embeds/greeting.lua b/libs/embeds/greeting.lua
@@ -15,16 +15,15 @@ return embedHandler("greeting", function (room, ephemeral)
 
 	if not channelData.parent.greeting then return end
 
-	local companion = client:getChannel(channelData.companion)
-	if not companion then return end
+	local companion = client:getChannel(channelData.companion) or room
 
 	local member = room.guild:getMember(channelData.host)
 	local uname = member.user.name
 	local nickname = member.nickname or uname
 
 	local rt = {
 		roomname = room.name,
-		chatname = companion and companion.name or nil,
+		chatname = companion.name,
 		nickname = nickname,
 		name = uname,
 		tag = member.user.tag,

diff --git a/libs/embeds/roomInfo.lua b/libs/embeds/roomInfo.lua
@@ -92,8 +92,8 @@ return embedHandler("roomInfo", function (room, ephemeral)
 		liner(room, roomPO, "voice", permission.connect),
 		liner(room, roomPO, "voice", permission.speak),
 		liner(room, roomPO, "voice", permission.sendMessages),
-		companion and companion ~= room and liner(companion, chatPO, "text", permission.readMessages),
-		companion and companion ~= room and liner(companion, chatPO, "text", permission.sendMessages)
+		companion and liner(companion, chatPO, "text", permission.readMessages),
+		companion and liner(companion, chatPO, "text", permission.sendMessages)
 	}
 
 	table.insert(fields, {name = locale.roomInfoCommands, value = availableCommands(room)})

diff --git a/libs/events/channelDelete.lua b/libs/events/channelDelete.lua
@@ -16,7 +16,7 @@ return function (channel) -- and make sure there are no traces!
 		lobbyData:delete()
 	end
 	if channelData then
-		local companion = client:getChannel(channelData.companion)
+		local companion = client:getChannel(channelData.companion) or channel
 		if companion then
 			local companionID = companion.id
 			if channelData.parent and channelData.parent.companionLog then