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, 7 insertions, 1 deletions

diff --git a/src/coremods/core_channel/cmd_topic.cpp b/src/coremods/core_channel/cmd_topic.cpp
index b42148939..6d99edcc6 100644
--- a/src/coremods/core_channel/cmd_topic.cpp
+++ b/src/coremods/core_channel/cmd_topic.cpp
@@ -80,7 +80,13 @@ CmdResult CommandTopic::HandleLocal(const std::vector<std::string>& parameters,
 		}
 	}
 
-	c->SetTopic(user, t);
+	// Make sure the topic is not longer than the limit in the config
+	if (t.length() > ServerInstance->Config->Limits.MaxTopic)
+		t.erase(ServerInstance->Config->Limits.MaxTopic);
+
+	// Only change if the new topic is different than the current one
+	if (c->topic != t)
+		c->SetTopic(user, t, ServerInstance->Time());
 	return CMD_SUCCESS;
 }