hostserv: expand events for newer vhost model

3 files changed, 47 insertions, 14 deletions

diff --git a/include/event.h b/include/event.h
index 0dc200c7e..774672843 100644
--- a/include/event.h
+++ b/include/event.h
@@ -875,18 +875,6 @@ namespace Event
 		virtual void OnInvite(User *source, Channel *c, User *targ) anope_abstract;
 	};
 
-	struct CoreExport SetVhost : Events
-	{
-		static constexpr const char *NAME = "setvhost";
-
-		using Events::Events;
-
-		/** Called when a vhost is set
-		 * @param na The nickalias of the vhost
-		 */
-		virtual void OnSetVhost(NickServ::Nick *na) anope_abstract;
-	};
-
 	struct CoreExport SetDisplayedHost : Events
 	{
 		static constexpr const char *NAME = "setdisplayedhost";
diff --git a/include/modules/hostserv/add.h b/include/modules/hostserv/add.h
new file mode 100644
index 000000000..b930760ad
--- /dev/null
+++ b/include/modules/hostserv/add.h
@@ -0,0 +1,36 @@
+/*
+ * Anope IRC Services
+ *
+ * Copyright (C) 2014-2017 Anope Team <team@anope.org>
+ *
+ * This file is part of Anope. Anope is free software; you can
+ * redistribute it and/or modify it under the terms of the GNU
+ * General Public License as published by the Free Software
+ * Foundation, version 2.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Event
+{
+        struct CoreExport SetVhost : Events
+        {
+                static constexpr const char *NAME = "setvhost";
+
+                using Events::Events;
+
+                /** Called when a vhost is set
+                 * @param source The setter of the vhost
+                 * @param account The account the vhost is set on
+                 * @param vhost The vhost
+                 */
+                virtual void OnSetVhost(CommandSource *source, NickServ::Account *account, HostServ::VHost *vhost) anope_abstract;
+        };
+}
+
diff --git a/include/modules/hostserv/del.h b/include/modules/hostserv/del.h
index 5df29d772..05007e337 100644
--- a/include/modules/hostserv/del.h
+++ b/include/modules/hostserv/del.h
@@ -25,10 +25,19 @@ namespace Event
 
 		using Events::Events;
 
+		/**
+		 * Called when all of a users vhosts are being deleted
+		 * @param source The user deleting the vhost
+		 * @param account The account the vhost is being deleted from
+		 */
+		virtual void OnDeleteAllVhost(CommandSource *source, NickServ::Account *account) anope_abstract;
+
 		/** Called when a vhost is deleted
-		 * @param na The nickalias of the vhost
+		 * @param source The user deleting the vhost
+		 * @param account The account the vhost is being deleted from
+		 * @param vhost The vhost being deleted
 		 */
-		virtual void OnDeleteVhost(NickServ::Nick *na) anope_abstract;
+		virtual void OnDeleteVhost(CommandSource *source, NickServ::Account *account, HostServ::VHost *vhost) anope_abstract;
 	};
 }