Refactor topic setting logic to go through Channel::SetTopic() in all cases

- Pass topic set time and optionally the setter to SetTopic()
- Don't do anything if the topic is changed by a local user to what it is currently

1 files changed, 6 insertions, 6 deletions

diff --git a/src/modules/m_permchannels.cpp b/src/modules/m_permchannels.cpp
index 22513abea..9a5da5ce4 100644
--- a/src/modules/m_permchannels.cpp
+++ b/src/modules/m_permchannels.cpp
@@ -207,16 +207,16 @@ public:
 				c = new Channel(channel, TS);
 
 				unsigned int topicset = tag->getInt("topicts");
-				c->topic = tag->getString("topic");
+				std::string topic = tag->getString("topic");
 
-				if ((topicset != 0) || (!c->topic.empty()))
+				if ((topicset != 0) || (!topic.empty()))
 				{
 					if (topicset == 0)
 						topicset = ServerInstance->Time();
-					c->topicset = topicset;
-					c->setby = tag->getString("topicsetby");
-					if (c->setby.empty())
-						c->setby = ServerInstance->Config->ServerName;
+					std::string topicsetby = tag->getString("topicsetby");
+					if (topicsetby.empty())
+						topicsetby = ServerInstance->Config->ServerName;
+					c->SetTopic(ServerInstance->FakeClient, topic, topicset, &topicsetby);
 				}
 
 				ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Added %s with topic %s", channel.c_str(), c->topic.c_str());