From 3009540a00d392912affea5f2545134e2f657c01 Mon Sep 17 00:00:00 2001
From: Adam <Adam@anope.org>
Date: Thu, 23 Dec 2010 18:39:54 -0500
Subject: Rewrote the ignore code. Adds creator and reason to /os ignore list.

---
 include/extern.h   |  8 --------
 include/language.h |  4 ----
 include/modules.h  | 10 +++++++++-
 include/services.h | 10 ----------
 4 files changed, 9 insertions(+), 23 deletions(-)

(limited to 'include')

diff --git a/include/extern.h b/include/extern.h
index 7dc49e929..fee91178d 100644
--- a/include/extern.h
+++ b/include/extern.h
@@ -293,14 +293,6 @@ E bool is_on_access(const User *u, const NickCore *nc);
 
 /**** process.c ****/
 
-E int allow_ignore;
-E std::list<IgnoreData *> ignore;
-
-E void add_ignore(const Anope::string &nick, time_t delta);
-E IgnoreData *get_ignore(const Anope::string &nick);
-E int delete_ignore(const Anope::string &nick);
-E int clear_ignores();
-
 E void process(const Anope::string &buf);
 
 /**** send.c ****/
diff --git a/include/language.h b/include/language.h
index 4b04028f9..e40b93432 100644
--- a/include/language.h
+++ b/include/language.h
@@ -998,9 +998,6 @@ enum LanguageString
 	OPER_SZLINE_VIEW_HEADER,
 	OPER_SZLINE_CLEAR,
 	OPER_SET_SYNTAX,
-	OPER_SET_IGNORE_ON,
-	OPER_SET_IGNORE_OFF,
-	OPER_SET_IGNORE_ERROR,
 	OPER_SET_READONLY_ON,
 	OPER_SET_READONLY_OFF,
 	OPER_SET_READONLY_ERROR,
@@ -1458,7 +1455,6 @@ enum LanguageString
 	OPER_HELP_SET_DEBUG,
 	OPER_HELP_SET_NOEXPIRE,
 	OPER_HELP_SET_SUPERADMIN,
-	OPER_HELP_SET_IGNORE,
 	OPER_HELP_SET_LIST,
 	OPER_HELP_NOOP,
 	OPER_HELP_JUPE,
diff --git a/include/modules.h b/include/modules.h
index 0afd033a3..4f7bddf69 100644
--- a/include/modules.h
+++ b/include/modules.h
@@ -1026,6 +1026,14 @@ class CoreExport Module : public Extensible
 	 * @param s Our uplink
 	 */
 	virtual void OnUplinkSync(Server *s) { }
+
+	/** Called when we receive a PRIVMSG for one of our clients
+	 * @param u The user sending the PRIVMSG
+	 * @param bi The target of the PRIVMSG
+	 * @param message The message
+	 * @return EVENT_STOP to halt processing
+	 */
+	virtual EventReturn OnBotPrivmsg(User *u, BotInfo *bi, const Anope::string &message) { return EVENT_CONTINUE; }
 };
 
 /** Implementation-specific flags which may be set in ModuleManager::Attach()
@@ -1078,7 +1086,7 @@ enum Implementation
 		I_OnServerQuit, I_OnTopicUpdated,
 		I_OnEncrypt, I_OnEncryptCheckLen, I_OnDecrypt, I_OnCheckPassword,
 		I_OnChannelModeSet, I_OnChannelModeUnset, I_OnUserModeSet, I_OnUserModeUnset, I_OnChannelModeAdd, I_OnUserModeAdd,
-		I_OnMLock, I_OnUnMLock, I_OnServerSync, I_OnUplinkSync,
+		I_OnMLock, I_OnUnMLock, I_OnServerSync, I_OnUplinkSync, I_OnBotPrivmsg,
 	I_END
 };
 
diff --git a/include/services.h b/include/services.h
index 645afc911..d86729e51 100644
--- a/include/services.h
+++ b/include/services.h
@@ -793,16 +793,6 @@ class Entry : public Flags<EntryType>
 
 /*************************************************************************/
 
-/* Ignorance list data. */
-
-struct IgnoreData
-{
-	Anope::string mask;
-	time_t time; /* When do we stop ignoring them? */
-};
-
-/*************************************************************************/
-
 /* News stuff */
 
 enum NewsType
-- 
cgit