From 7d9826fc2dbfa531c8efe53c31dc94e633d456dd Mon Sep 17 00:00:00 2001
From: Gary Kramlich <grim@reaperworld.com>
Date: Mon, 2 May 2022 09:44:12 -0500
Subject: [PATCH] Make sure we use the configured format string on room name
 updates

Refs #37
---
 bridge/portal.go | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/bridge/portal.go b/bridge/portal.go
index 0fbdae8..f8eb998 100644
--- a/bridge/portal.go
+++ b/bridge/portal.go
@@ -413,10 +413,22 @@ func (p *Portal) handleDiscordMessageCreate(user *User, msg *discordgo.Message)
 
 	// Handle room name changes
 	if msg.Type == discordgo.MessageTypeChannelNameChange {
-		p.Name = msg.Content
+		channel, err := user.Session.Channel(msg.ChannelID)
+		if err != nil {
+			p.log.Errorf("Failed to find the channel for portal %s", p.Key)
+			return
+		}
+
+		name, err := p.bridge.Config.Bridge.FormatChannelname(channel, user.Session)
+		if err != nil {
+			p.log.Errorf("Failed to format name for portal %s", p.Key)
+			return
+		}
+
+		p.Name = name
 		p.Update()
 
-		p.MainIntent().SetRoomName(p.MXID, msg.Content)
+		p.MainIntent().SetRoomName(p.MXID, name)
 
 		return
 	}