summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorSadie Powell <sadie@witchery.services>2022-01-12 22:05:59 +0000
committerSadie Powell <sadie@witchery.services>2022-01-12 22:08:35 +0000
commita631028660d527f509c3b028cfa5f2903a125077 (patch)
tree830ba6644bb312af32847db654bfb842ed44a7cd /include
parent4e5fc9797c2ea285e855f808dc65694d1cdba358 (diff)
parent04257b9d6ab0fa1a63ade1d2ad0edc2d08eb74ce (diff)
Merge branch '2.0' into 2.1.
Diffstat (limited to 'include')
-rw-r--r--include/access.h2
-rw-r--r--include/account.h2
-rw-r--r--include/anope.h2
-rw-r--r--include/base.h2
-rw-r--r--include/bots.h2
-rw-r--r--include/channels.h2
-rw-r--r--include/commands.h2
-rw-r--r--include/config.h2
-rw-r--r--include/defs.h2
-rw-r--r--include/extensible.h2
-rw-r--r--include/hashcomp.h2
-rw-r--r--include/language.h2
-rw-r--r--include/lists.h2
-rw-r--r--include/logger.h2
-rw-r--r--include/mail.h2
-rw-r--r--include/memo.h2
-rw-r--r--include/messages.h2
-rw-r--r--include/modes.h2
-rw-r--r--include/module.h2
-rw-r--r--include/modules.h11
-rw-r--r--include/modules/bs_badwords.h2
-rw-r--r--include/modules/bs_kick.h2
-rw-r--r--include/modules/cs_entrymsg.h2
-rw-r--r--include/modules/cs_log.h2
-rw-r--r--include/modules/cs_mode.h2
-rw-r--r--include/modules/dns.h2
-rw-r--r--include/modules/encryption.h2
-rw-r--r--include/modules/httpd.h2
-rw-r--r--include/modules/ldap.h2
-rw-r--r--include/modules/ns_cert.h2
-rw-r--r--include/modules/os_forbid.h2
-rw-r--r--include/modules/os_ignore.h2
-rw-r--r--include/modules/os_news.h2
-rw-r--r--include/modules/os_session.h2
-rw-r--r--include/modules/pseudoclients/chanserv.h2
-rw-r--r--include/modules/pseudoclients/global.h2
-rw-r--r--include/modules/pseudoclients/memoserv.h2
-rw-r--r--include/modules/pseudoclients/nickserv.h2
-rw-r--r--include/modules/redis.h2
-rw-r--r--include/modules/sasl.h2
-rw-r--r--include/modules/set_misc.h2
-rw-r--r--include/modules/sql.h2
-rw-r--r--include/modules/ssl.h2
-rw-r--r--include/modules/suspend.h2
-rw-r--r--include/modules/xmlrpc.h2
-rw-r--r--include/opertype.h2
-rw-r--r--include/protocol.h2
-rw-r--r--include/regchannel.h2
-rw-r--r--include/regexpr.h2
-rw-r--r--include/serialize.h2
-rw-r--r--include/servers.h2
-rw-r--r--include/service.h2
-rw-r--r--include/services.h2
-rw-r--r--include/socketengine.h2
-rw-r--r--include/sockets.h2
-rw-r--r--include/threadengine.h2
-rw-r--r--include/timers.h2
-rw-r--r--include/uplink.h2
-rw-r--r--include/users.h2
-rw-r--r--include/version.cpp2
-rw-r--r--include/xline.h2
61 files changed, 69 insertions, 62 deletions
diff --git a/include/access.h b/include/access.h
index 7b3f5eb86..63b20955d 100644
--- a/include/access.h
+++ b/include/access.h
@@ -1,6 +1,6 @@
/*
*
- * (C) 2003-2021 Anope Team
+ * (C) 2003-2022 Anope Team
* Contact us at team@anope.org
*
* Please read COPYING and README for further details.
diff --git a/include/account.h b/include/account.h
index fd22393fd..a26f1e184 100644
--- a/include/account.h
+++ b/include/account.h
@@ -1,6 +1,6 @@
/*
*
- * (C) 2003-2021 Anope Team
+ * (C) 2003-2022 Anope Team
* Contact us at team@anope.org
*
* Please read COPYING and README for further details.
diff --git a/include/anope.h b/include/anope.h
index 3f81c3b91..1267a1d88 100644
--- a/include/anope.h
+++ b/include/anope.h
@@ -1,6 +1,6 @@
/*
*
- * (C) 2003-2021 Anope Team
+ * (C) 2003-2022 Anope Team
* Contact us at team@anope.org
*
* Please read COPYING and README for further details.
diff --git a/include/base.h b/include/base.h
index 87f9ce0c1..cb852d37d 100644
--- a/include/base.h
+++ b/include/base.h
@@ -1,7 +1,7 @@
/*
*
* (C) 2008-2011 Adam <Adam@anope.org>
- * (C) 2008-2021 Anope Team <team@anope.org>
+ * (C) 2008-2022 Anope Team <team@anope.org>
*
* Please read COPYING and README for further details.
*/
diff --git a/include/bots.h b/include/bots.h
index eed1308a1..d407de835 100644
--- a/include/bots.h
+++ b/include/bots.h
@@ -1,7 +1,7 @@
/*
*
* (C) 2008-2011 Robin Burchell <w00t@inspircd.org>
- * (C) 2008-2021 Anope Team <team@anope.org>
+ * (C) 2008-2022 Anope Team <team@anope.org>
*
* Please read COPYING and README for further details.
*/
diff --git a/include/channels.h b/include/channels.h
index 5b7e7a52e..aed970adf 100644
--- a/include/channels.h
+++ b/include/channels.h
@@ -1,6 +1,6 @@
/* Channel support
*
- * (C) 2008-2021 Anope Team
+ * (C) 2008-2022 Anope Team
* Contact us at team@anope.org
*
* Please read COPYING and README for further details.
diff --git a/include/commands.h b/include/commands.h
index ed7b42511..158bb4743 100644
--- a/include/commands.h
+++ b/include/commands.h
@@ -1,6 +1,6 @@
/* Declarations for command data.
*
- * (C) 2003-2021 Anope Team
+ * (C) 2003-2022 Anope Team
* Contact us at team@anope.org
*
* Please read COPYING and README for further details.
diff --git a/include/config.h b/include/config.h
index 4891eeacd..4acd32f09 100644
--- a/include/config.h
+++ b/include/config.h
@@ -1,6 +1,6 @@
/*
*
- * (C) 2003-2021 Anope Team
+ * (C) 2003-2022 Anope Team
* Contact us at team@anope.org
*
* Please read COPYING and README for further details.
diff --git a/include/defs.h b/include/defs.h
index af5709c20..9778a0c7e 100644
--- a/include/defs.h
+++ b/include/defs.h
@@ -1,6 +1,6 @@
/*
*
- * (C) 2003-2021 Anope Team
+ * (C) 2003-2022 Anope Team
* Contact us at team@anope.org
*
* Please read COPYING and README for further details.
diff --git a/include/extensible.h b/include/extensible.h
index 40c71e3e2..286c0d490 100644
--- a/include/extensible.h
+++ b/include/extensible.h
@@ -1,6 +1,6 @@
/*
*
- * (C) 2003-2021 Anope Team
+ * (C) 2003-2022 Anope Team
* Contact us at team@anope.org
*
* Please read COPYING and README for further details.
diff --git a/include/hashcomp.h b/include/hashcomp.h
index 6ab84fafa..4f27a8446 100644
--- a/include/hashcomp.h
+++ b/include/hashcomp.h
@@ -1,7 +1,7 @@
/*
*
* (C) 2002-2011 InspIRCd Development Team
- * (C) 2009-2021 Anope Team <team@anope.org>
+ * (C) 2009-2022 Anope Team <team@anope.org>
*
* Please read COPYING and README for further details.
*/
diff --git a/include/language.h b/include/language.h
index 46b5b6a50..4a95b41c8 100644
--- a/include/language.h
+++ b/include/language.h
@@ -1,6 +1,6 @@
/*
*
- * (C) 2008-2021 Anope Team
+ * (C) 2008-2022 Anope Team
* Contact us at team@anope.org
*
* Please read COPYING and README for further details.
diff --git a/include/lists.h b/include/lists.h
index 8410fa890..c6e638750 100644
--- a/include/lists.h
+++ b/include/lists.h
@@ -1,6 +1,6 @@
/*
*
- * (C) 2003-2021 Anope Team
+ * (C) 2003-2022 Anope Team
* Contact us at team@anope.org
*
* Please read COPYING and README for further details.
diff --git a/include/logger.h b/include/logger.h
index 95f8f81d2..2cc36fe55 100644
--- a/include/logger.h
+++ b/include/logger.h
@@ -1,6 +1,6 @@
/*
*
- * (C) 2003-2021 Anope Team
+ * (C) 2003-2022 Anope Team
* Contact us at team@anope.org
*
* Please read COPYING and README for further details.
diff --git a/include/mail.h b/include/mail.h
index bb246ba29..d0ec6386f 100644
--- a/include/mail.h
+++ b/include/mail.h
@@ -1,6 +1,6 @@
/*
*
- * (C) 2003-2021 Anope Team
+ * (C) 2003-2022 Anope Team
* Contact us at team@anope.org
*
* Please read COPYING and README for further details.
diff --git a/include/memo.h b/include/memo.h
index 5ce167839..fa1aab414 100644
--- a/include/memo.h
+++ b/include/memo.h
@@ -1,6 +1,6 @@
/*
*
- * (C) 2003-2021 Anope Team
+ * (C) 2003-2022 Anope Team
* Contact us at team@anope.org
*
* Please read COPYING and README for further details.
diff --git a/include/messages.h b/include/messages.h
index 042330223..b138d1d90 100644
--- a/include/messages.h
+++ b/include/messages.h
@@ -1,6 +1,6 @@
/*
*
- * (C) 2003-2021 Anope Team
+ * (C) 2003-2022 Anope Team
* Contact us at team@anope.org
*
* Please read COPYING and README for further details.
diff --git a/include/modes.h b/include/modes.h
index 9ea82142f..d5916e119 100644
--- a/include/modes.h
+++ b/include/modes.h
@@ -1,7 +1,7 @@
/* Mode support
*
* (C) 2008-2011 Adam <Adam@anope.org>
- * (C) 2008-2021 Anope Team <team@anope.org>
+ * (C) 2008-2022 Anope Team <team@anope.org>
*
* Please read COPYING and README for further details.
*/
diff --git a/include/module.h b/include/module.h
index c8000f35f..e816eb86e 100644
--- a/include/module.h
+++ b/include/module.h
@@ -1,6 +1,6 @@
/*
*
- * (C) 2003-2021 Anope Team
+ * (C) 2003-2022 Anope Team
* Contact us at team@anope.org
*
* Please read COPYING and README for further details.
diff --git a/include/modules.h b/include/modules.h
index 4bf579a1f..f7956ecab 100644
--- a/include/modules.h
+++ b/include/modules.h
@@ -1,6 +1,6 @@
/* Modular support
*
- * (C) 2003-2021 Anope Team
+ * (C) 2003-2022 Anope Team
* Contact us at team@anope.org
*
* Please read COPYING and README for further details.
@@ -1098,6 +1098,13 @@ class CoreExport Module : public Extensible
* @return EVENT_STOP to force the user off of the nick
*/
virtual EventReturn OnNickValidate(User *u, NickAlias *na) { throw NotImplementedException(); }
+
+ /** Called when a certain user has to be unbanned on a certain channel.
+ * May be used to send protocol-specific messages.
+ * @param u The user to be unbanned
+ * @param c The channel that user has to be unbanned on
+ */
+ virtual void OnChannelUnban(User *u, ChannelInfo *ci) { throw NotImplementedException(); }
};
enum Implementation
@@ -1123,7 +1130,7 @@ enum Implementation
I_OnPrivmsg, I_OnLog, I_OnLogMessage, I_OnDnsRequest, I_OnCheckModes, I_OnChannelSync, I_OnSetCorrectModes,
I_OnSerializeCheck, I_OnSerializableConstruct, I_OnSerializableDestruct, I_OnSerializableUpdate,
I_OnSerializeTypeCreate, I_OnSetChannelOption, I_OnSetNickOption, I_OnMessage, I_OnCanSet, I_OnCheckDelete,
- I_OnExpireTick, I_OnNickValidate,
+ I_OnExpireTick, I_OnNickValidate, I_OnChannelUnban,
I_SIZE
};
diff --git a/include/modules/bs_badwords.h b/include/modules/bs_badwords.h
index a3120d609..f41da55f5 100644
--- a/include/modules/bs_badwords.h
+++ b/include/modules/bs_badwords.h
@@ -1,6 +1,6 @@
/* BotServ core functions
*
- * (C) 2003-2021 Anope Team
+ * (C) 2003-2022 Anope Team
* Contact us at team@anope.org
*
* Please read COPYING and README for further details.
diff --git a/include/modules/bs_kick.h b/include/modules/bs_kick.h
index dc9926615..8c6d561f5 100644
--- a/include/modules/bs_kick.h
+++ b/include/modules/bs_kick.h
@@ -1,6 +1,6 @@
/* BotServ core functions
*
- * (C) 2003-2021 Anope Team
+ * (C) 2003-2022 Anope Team
* Contact us at team@anope.org
*
* Please read COPYING and README for further details.
diff --git a/include/modules/cs_entrymsg.h b/include/modules/cs_entrymsg.h
index 5ff38130e..a0efe142a 100644
--- a/include/modules/cs_entrymsg.h
+++ b/include/modules/cs_entrymsg.h
@@ -1,6 +1,6 @@
/*
*
- * (C) 2003-2021 Anope Team
+ * (C) 2003-2022 Anope Team
* Contact us at team@anope.org
*
* Please read COPYING and README for further details.
diff --git a/include/modules/cs_log.h b/include/modules/cs_log.h
index 6438dfada..d240aef04 100644
--- a/include/modules/cs_log.h
+++ b/include/modules/cs_log.h
@@ -1,6 +1,6 @@
/* ChanServ core functions
*
- * (C) 2003-2021 Anope Team
+ * (C) 2003-2022 Anope Team
* Contact us at team@anope.org
*
* Please read COPYING and README for further details.
diff --git a/include/modules/cs_mode.h b/include/modules/cs_mode.h
index 33bf14317..d237b4273 100644
--- a/include/modules/cs_mode.h
+++ b/include/modules/cs_mode.h
@@ -1,6 +1,6 @@
/* ChanServ core functions
*
- * (C) 2003-2021 Anope Team
+ * (C) 2003-2022 Anope Team
* Contact us at team@anope.org
*
* Please read COPYING and README for further details.
diff --git a/include/modules/dns.h b/include/modules/dns.h
index 2dc75a188..0ab666be8 100644
--- a/include/modules/dns.h
+++ b/include/modules/dns.h
@@ -1,6 +1,6 @@
/*
*
- * (C) 2003-2021 Anope Team
+ * (C) 2003-2022 Anope Team
* Contact us at team@anope.org
*
* Please read COPYING and README for further details.
diff --git a/include/modules/encryption.h b/include/modules/encryption.h
index 6d20c906e..6a0f402c7 100644
--- a/include/modules/encryption.h
+++ b/include/modules/encryption.h
@@ -1,6 +1,6 @@
/*
*
- * (C) 2003-2021 Anope Team
+ * (C) 2003-2022 Anope Team
* Contact us at team@anope.org
*
* Please read COPYING and README for further details.
diff --git a/include/modules/httpd.h b/include/modules/httpd.h
index f5a4c026f..096f93ca2 100644
--- a/include/modules/httpd.h
+++ b/include/modules/httpd.h
@@ -1,6 +1,6 @@
/*
*
- * (C) 2012-2021 Anope Team
+ * (C) 2012-2022 Anope Team
* Contact us at team@anope.org
*
* Please read COPYING and README for further details.
diff --git a/include/modules/ldap.h b/include/modules/ldap.h
index 05eceed50..2b4177657 100644
--- a/include/modules/ldap.h
+++ b/include/modules/ldap.h
@@ -1,6 +1,6 @@
/*
*
- * (C) 2011-2021 Anope Team
+ * (C) 2011-2022 Anope Team
* Contact us at team@anope.org
*
* Please read COPYING and README for further details.
diff --git a/include/modules/ns_cert.h b/include/modules/ns_cert.h
index a4c9df02b..2c9252ec1 100644
--- a/include/modules/ns_cert.h
+++ b/include/modules/ns_cert.h
@@ -1,6 +1,6 @@
/* NickServ core functions
*
- * (C) 2003-2021 Anope Team
+ * (C) 2003-2022 Anope Team
* Contact us at team@anope.org
*
* Please read COPYING and README for further details.
diff --git a/include/modules/os_forbid.h b/include/modules/os_forbid.h
index 2c49fb197..3c433f044 100644
--- a/include/modules/os_forbid.h
+++ b/include/modules/os_forbid.h
@@ -1,6 +1,6 @@
/*
*
- * (C) 2011-2021 Anope Team
+ * (C) 2011-2022 Anope Team
* Contact us at team@anope.org
*
* Please read COPYING and README for further details.
diff --git a/include/modules/os_ignore.h b/include/modules/os_ignore.h
index 658f5b712..a0fe1d607 100644
--- a/include/modules/os_ignore.h
+++ b/include/modules/os_ignore.h
@@ -1,6 +1,6 @@
/* OperServ ignore interface
*
- * (C) 2003-2021 Anope Team
+ * (C) 2003-2022 Anope Team
* Contact us at team@anope.org
*
* Please read COPYING and README for further details.
diff --git a/include/modules/os_news.h b/include/modules/os_news.h
index 68baa79cc..f9bd6ebbf 100644
--- a/include/modules/os_news.h
+++ b/include/modules/os_news.h
@@ -1,6 +1,6 @@
/*
*
- * (C) 2011-2021 Anope Team
+ * (C) 2011-2022 Anope Team
* Contact us at team@anope.org
*
* Please read COPYING and README for further details.
diff --git a/include/modules/os_session.h b/include/modules/os_session.h
index 638a587c2..42456e4af 100644
--- a/include/modules/os_session.h
+++ b/include/modules/os_session.h
@@ -1,6 +1,6 @@
/*
*
- * (C) 2011-2021 Anope Team
+ * (C) 2011-2022 Anope Team
* Contact us at team@anope.org
*
* Please read COPYING and README for further details.
diff --git a/include/modules/pseudoclients/chanserv.h b/include/modules/pseudoclients/chanserv.h
index c9b52e630..284fa7db6 100644
--- a/include/modules/pseudoclients/chanserv.h
+++ b/include/modules/pseudoclients/chanserv.h
@@ -1,6 +1,6 @@
/*
*
- * (C) 2011-2021 Anope Team
+ * (C) 2011-2022 Anope Team
* Contact us at team@anope.org
*
* Please read COPYING and README for further details.
diff --git a/include/modules/pseudoclients/global.h b/include/modules/pseudoclients/global.h
index 9d1f4505c..2211a1dee 100644
--- a/include/modules/pseudoclients/global.h
+++ b/include/modules/pseudoclients/global.h
@@ -1,6 +1,6 @@
/*
*
- * (C) 2011-2021 Anope Team
+ * (C) 2011-2022 Anope Team
* Contact us at team@anope.org
*
* Please read COPYING and README for further details.
diff --git a/include/modules/pseudoclients/memoserv.h b/include/modules/pseudoclients/memoserv.h
index ff0584772..bb735cb8f 100644
--- a/include/modules/pseudoclients/memoserv.h
+++ b/include/modules/pseudoclients/memoserv.h
@@ -1,6 +1,6 @@
/*
*
- * (C) 2011-2021 Anope Team
+ * (C) 2011-2022 Anope Team
* Contact us at team@anope.org
*
* Please read COPYING and README for further details.
diff --git a/include/modules/pseudoclients/nickserv.h b/include/modules/pseudoclients/nickserv.h
index 1a50a67c1..7ee207547 100644
--- a/include/modules/pseudoclients/nickserv.h
+++ b/include/modules/pseudoclients/nickserv.h
@@ -1,6 +1,6 @@
/*
*
- * (C) 2011-2021 Anope Team
+ * (C) 2011-2022 Anope Team
* Contact us at team@anope.org
*
* Please read COPYING and README for further details.
diff --git a/include/modules/redis.h b/include/modules/redis.h
index b4adb1f40..fcd4e20ed 100644
--- a/include/modules/redis.h
+++ b/include/modules/redis.h
@@ -1,6 +1,6 @@
/*
*
- * (C) 2003-2021 Anope Team
+ * (C) 2003-2022 Anope Team
* Contact us at team@anope.org
*
* Please read COPYING and README for further details.
diff --git a/include/modules/sasl.h b/include/modules/sasl.h
index ab848e587..b3f5f1faa 100644
--- a/include/modules/sasl.h
+++ b/include/modules/sasl.h
@@ -1,6 +1,6 @@
/*
*
- * (C) 2014-2021 Anope Team
+ * (C) 2014-2022 Anope Team
* Contact us at team@anope.org
*
* Please read COPYING and README for further details.
diff --git a/include/modules/set_misc.h b/include/modules/set_misc.h
index a2cd1b973..df4925592 100644
--- a/include/modules/set_misc.h
+++ b/include/modules/set_misc.h
@@ -1,6 +1,6 @@
/*
*
- * (C) 2003-2021 Anope Team
+ * (C) 2003-2022 Anope Team
* Contact us at team@anope.org
*
* Please read COPYING and README for further details.
diff --git a/include/modules/sql.h b/include/modules/sql.h
index fcad4c79d..7ee150b83 100644
--- a/include/modules/sql.h
+++ b/include/modules/sql.h
@@ -1,6 +1,6 @@
/*
*
- * (C) 2003-2021 Anope Team
+ * (C) 2003-2022 Anope Team
* Contact us at team@anope.org
*
* P