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

diff --git a/include/channels.h b/include/channels.h
index 0a131ddb3..be872b7fe 100644
--- a/include/channels.h
+++ b/include/channels.h
@@ -138,8 +138,11 @@ class CoreExport Channel : public Extensible
 	/** Sets the channel topic.
 	 * @param user The user setting the topic.
 	 * @param topic The topic to set it to.
+	 * @param topicts Timestamp of the new topic.
+	 * @param setter Setter string, may be used when the original setter is no longer online.
+	 * If omitted or NULL, the setter string is obtained from the user.
 	 */
-	void SetTopic(User* user, const std::string& topic);
+	void SetTopic(User* user, const std::string& topic, time_t topicts, const std::string* setter = NULL);
 
 	/** Obtain the channel "user counter"
 	 * This returns the number of users on this channel