Cleanup after mode locks, badwords, akick, access, if destructed

2 files changed, 13 insertions, 3 deletions

diff --git a/include/modes.h b/include/modes.h
index b38ef3dc1..e8c8b2f2b 100644
--- a/include/modes.h
+++ b/include/modes.h
@@ -350,7 +350,8 @@ class CoreExport ModeManager
 	/* Number of generic channel and user modes we are tracking */
 	static unsigned GenericChannelModes, GenericUserModes;
 	/* Default channel mode lock */
-	static std::multimap<ChannelModeName, ModeLock *> DefaultModeLocks;
+	static std::list<std::pair<ChannelModeName, Anope::string> > ModeLockOn;
+	static std::list<ChannelModeName> ModeLockOff;
 	/* Default modes bots have on channels */
 	static ChannelStatus DefaultBotModes;
 
diff --git a/include/regchannel.h b/include/regchannel.h
index 1cefe27dd..6c1b618b2 100644
--- a/include/regchannel.h
+++ b/include/regchannel.h
@@ -138,11 +138,12 @@ enum BadWordType
 /* Structure used to contain bad words. */
 struct CoreExport BadWord : Serializable
 {
-	ChannelInfo *ci;
+	Serialize::Reference<ChannelInfo> ci;
 	Anope::string word;
 	BadWordType type;
 
-	BadWord() : Serializable("BadWord") { }
+	BadWord();
+	~BadWord();
 	void Serialize(Serialize::Data &data) const anope_override;
 	static Serializable* Unserialize(Serializable *obj, Serialize::Data &);
 };
@@ -172,6 +173,7 @@ class CoreExport AutoKick : public Flags<AutoKickFlag>, public Serializable
 	time_t last_used;
 
  	AutoKick();
+	~AutoKick();
 	void Serialize(Serialize::Data &data) const anope_override;
 	static Serializable* Unserialize(Serializable *obj, Serialize::Data &);
 };
@@ -187,6 +189,7 @@ struct CoreExport ModeLock : Serializable
 	time_t created;
 
 	ModeLock(ChannelInfo *ch, bool s, ChannelModeName n, const Anope::string &p, const Anope::string &se = "", time_t c = Anope::CurTime);
+	~ModeLock();
 
 	void Serialize(Serialize::Data &data) const anope_override;
 	static Serializable* Unserialize(Serializable *obj, Serialize::Data &);
@@ -357,6 +360,8 @@ class CoreExport ChannelInfo : public Serializable, public Extensible, public Fl
 	 */
 	unsigned GetAkickCount() const;
 
+	void EraseAkick(const AutoKick *akick);
+
 	/** Erase an entry from the channel akick list
 	 * @param index The index of the akick
 	 */
@@ -384,6 +389,8 @@ class CoreExport ChannelInfo : public Serializable, public Extensible, public Fl
 	 */
 	unsigned GetBadWordCount() const;
 
+	void EraseBadWord(const BadWord *bw);
+
 	/** Remove a badword
 	 * @param index The index of the badword
 	 */
@@ -419,6 +426,8 @@ class CoreExport ChannelInfo : public Serializable, public Extensible, public Fl
 	 */
 	bool RemoveMLock(ChannelMode *mode, bool status, const Anope::string &param = "");
 
+	void RemoveMLock(ModeLock *mlock);
+
 	/** Clear all mlocks on the channel
 	 */
 	void ClearMLock();