Release 2.0.13.

Update the changelogs.
Small fixes to the Italian translation.
2026-06-14 11:54:46 +02:00 · 2023-06-01 23:12:07 +01:00 · 2023-05-30 16:07:54 +01:00 · 2023-05-29 21:33:59 +01:00 · 2023-05-28 21:26:03 -04:00 · 2023-05-28 21:26:03 -04:00
383 changed files with 4494 additions and 28068 deletions
@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: github-actions
+    directory: /
+    schedule:
+      interval: monthly
@@ -0,0 +1,52 @@
+name: Linux CI
+on:
+  - pull_request
+  - push
+jobs:
+  build:
+    runs-on: ubuntu-20.04
+    env:
+      CXX: ${{ matrix.compiler }}
+      CXXFLAGS: -std=${{ matrix.standard }}
+    steps:
+      - uses: actions/checkout@v3
+      - name: Install dependencies
+        run: |
+          sudo apt-get update --assume-yes
+          sudo apt-get install --assume-yes --no-install-recommends \
+            clang \
+            g++ \
+            git \
+            libc++-dev \
+            libc++abi-dev \
+            libgnutls28-dev \
+            libldap2-dev \
+            libmysqlclient-dev \
+            libpcre2-dev \
+            libpcre3-dev \
+            libsqlite3-dev \
+            libssl-dev \
+            libtre-dev \
+            make
+      - name: Enable extras
+        run: |
+          for MODULE in m_ldap.cpp m_ldap_authentication.cpp m_ldap_oper.cpp m_mysql.cpp m_regex_pcre.cpp m_regex_pcre2.cpp m_regex_posix.cpp m_regex_tre.cpp m_sql_authentication.cpp m_sql_log.cpp m_sql_oper.cpp m_sqlite.cpp m_ssl_gnutls.cpp m_ssl_openssl.cpp stats
+          do
+            ln -s ${{ github.workspace }}/modules/extra/$MODULE ${{ github.workspace }}/modules
+          done
+      - name: Run CMake
+        run: |
+          mkdir build && cd build
+          cmake -DCMAKE_BUILD_TYPE:STRING=DEBUG -DINSTDIR:STRING=${{ github.workspace }}/run ..
+      - name: Build Anope
+        run: |
+          make --directory ${{ github.workspace }}/build --jobs $(nproc) --no-print-directory install
+    strategy:
+      fail-fast: false
+      matrix:
+        compiler:
+          - clang++
+          - g++
+        standard:
+          - c++98
+          - c++17
@@ -1,3 +1,19 @@
+build/
 config.cache
 include/sysconf.h
-build/
+modules/m_ldap.cpp
+modules/m_ldap_authentication.cpp
+modules/m_ldap_oper.cpp
+modules/m_mysql.cpp
+modules/m_regex_pcre.cpp
+modules/m_regex_pcre2.cpp
+modules/m_regex_posix.cpp
+modules/m_regex_tre.cpp
+modules/m_sql_authentication.cpp
+modules/m_sql_log.cpp
+modules/m_sql_oper.cpp
+modules/m_sqlite.cpp
+modules/m_ssl_gnutls.cpp
+modules/m_ssl_openssl.cpp
+modules/stats
+run/
@@ -1,3 +1,4 @@
+(svnadmin) <svn@localhost> <svn svn@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864>
 Adam <adam@anope.org> <adam-@5417fbe8-f217-4b02-8779-1006273d7864>
 Adam <adam@anope.org> <adam@adam-laptop.(none)>
 Adam <adam@anope.org> <Adam@anope.org>
@@ -5,9 +6,11 @@ Adam <adam@anope.org> <Adam@drink-coca-cola.info>
 Adam <adam@anope.org> <Adam@sigterm.info>
 Adam Kramer <ribosome@anope.org> <ribosome ribosome@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864>
 Alvaro Toledo <atoledo@keldon.org> <atoledo atoledo@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864>
+Attila Molnar <attilamolnar@hush.com>
 Björn Stiddien <keeper@anope.org> <keeper keeper@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864>
 Charles Kingsley <chaz@anope.org>
 Charles Kingsley <chaz@anope.org> <sjaz@5417fbe8-f217-4b02-8779-1006273d7864>
+Cronus <cronus@nite-serv.com>
 Daniel Engel <dane@zero.org> <dane dane@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864>
 David Robson <rob@anope.org> <robbeh@5417fbe8-f217-4b02-8779-1006273d7864>
 David Robson <rob@anope.org> <rob rob@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864>
@@ -15,6 +18,7 @@ Dennis Friis <peavey@inspircd.org> <peavey peavey@inspircd.org@5417fbe8-f217-4b0
 Fabio Scotoni <cculex@gmail.com>
 Florian Schulze <certus@anope.org> <certus certus@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864>
 Gabriel Acevedo H. <drstein@anope.org> <drstein drstein@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864>
+Harakiri <harakiri@overstack.fr>
 Jan Milants <viper@anope.org>
 Jan Milants <viper@anope.org> <jantje_85@5417fbe8-f217-4b02-8779-1006273d7864>
 Jan Milants <viper@anope.org> <viper viper@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864>
@@ -23,17 +27,24 @@ Jens Voss <dukepyrolator@anope.org> <DukePyrolator@5417fbe8-f217-4b02-8779-10062
 Jens Voss <dukepyrolator@anope.org> <DukePyrolator@anope.org>
 Jens Voss <dukepyrolator@anope.org> Jens Voß <jens@pyrobook.(none)>
 Lee Holmes <lethality@anope.org>
+Lee Holmes <lethality@anope.org> <lee@lethality.me.uk>
 Mark Summers <mark@goopler.net> <mark mark@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864>
+Matt Schatz <genius3000@g3k.solutions>
+Matt Ullman <matt@airraidsirens.com> <blindsight@gamesurge.net>
+Michael Hazell <michaelhazell@hotmail.com> <Techman-@users.noreply.github.com>
+Michael Wobst <wobst.michael@web.de>
+Michael Wobst <wobst.michael@web.de> <michael@static.163.129.251.148.clients.your-server.de>
+Michael Wobst <wobst.michael@web.de> <michael@wobst.at>
 Naram Qashat <cyberbotx@anope.org> <cyberbotx@5417fbe8-f217-4b02-8779-1006273d7864>
 Naram Qashat <cyberbotx@anope.org> <cyberbotx@cyberbotx.com>
 Naram Qashat <cyberbotx@anope.org> <Naram Qashat cyberbotx@cyberbotx.com@5417fbe8-f217-4b02-8779-1006273d7864>
 Pieter Bootsma <geniusdex@anope.org> <geniusdex geniusdex@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864>
-Robby <robby@anope.org>
-Robby <robby@chat.be>
-Robby <robby@chatbelgie.be>
+Robby <robby@chatbelgie.be> <robby@anope.org>
+Robby <robby@chatbelgie.be> <robby@chat.be>
 Robin Burchell <w00t@inspircd.org> <rburchell@5417fbe8-f217-4b02-8779-1006273d7864>
 Robin Burchell <w00t@inspircd.org> <Robin Burchell w00t@inspircd.org@5417fbe8-f217-4b02-8779-1006273d7864>
+Sadie Powell <sadie@witchery.services> Peter Powell <petpow@saberuk.com>
+Sebastian Barfurth <github@afreshmelon.com>
 Sebastian V. <hal9000@denorastats.org>
 Sebastian V. <hal9000@denorastats.org> <pimpmylinux@5417fbe8-f217-4b02-8779-1006273d7864>
-(svnadmin) <svn@localhost> <svn svn@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864>
 Trystan S. Lee <trystan@nomadirc.net> <trystan trystan@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864>
@@ -1,16 +0,0 @@
-language: cpp
-
-compiler:
-  - gcc
-
-before_script:
-  - mkdir build
-  - cd build
-  - cmake -DINSTDIR:STRING=~/services -DDEFUMASK:STRING=077 -DCMAKE_BUILD_TYPE:STRING=DEBUG -DUSE_RUN_CC_PL:BOOLEAN=ON ..
-
-script:
-  - make
-
-notifications:
-  irc:
-    - "irc.anope.org#anope-devel"
@@ -87,9 +87,6 @@ if(CMAKE_COMPILER_IS_GNUCXX)
  if(GCC_VERSION LESS 4.2)
    message(FATAL_ERROR "Your compiler is too old to build Anope. Upgrade to GCC 4.2 or newer!")
  endif(GCC_VERSION LESS 4.2)
-  if(GCC_VERSION GREATER 6.0 OR GCC_VERSION EQUAL 6.0)
-    set(CXXFLAGS "${CXXFLAGS} -fno-delete-null-pointer-checks")
-  endif(GCC_VERSION GREATER 6.0 OR GCC_VERSION EQUAL 6.0)
 endif(CMAKE_COMPILER_IS_GNUCXX)

 # If we are using a GNU compiler (have to use CXX because it seems to fail on C), we will be able to determine it's default paths for libraries and includes
@@ -2,7 +2,7 @@
 #
 # Configuration script for Services.
 #
-# Anope (c) 2003-2019 Anope Team
+# Anope (C) 2003-2023 Anope Team
 # Contact us at team@anope.org
 #
 # This program is free but copyrighted software; see the file COPYING for
@@ -149,6 +149,9 @@ while [ $# -ge 1 ] ; do
 		echo "-nointro     Skip intro (disclaimer, etc)"
 		echo "-quick       Skip questions, go straight to cmake"
 		exit 0
+	elif [ $1 = "-devel" ] ; then
+		DEBUG="yes"
+		INSTDIR="$PWD/run"
 	elif [ $1 = "-nocache" ] ; then
 		IGNORE_CACHE="1"
 	elif [ $1 = "-nointro" ] ; then
@@ -160,7 +160,7 @@ macro(sort_list LIST)
    # For CMake 2.4.4 or better, this can be done automatically
    list(SORT ${LIST})
  else(CMAKE244_OR_BETTER)
-    # For CMake 2.4.x before 2.4.4, we have to do this ourselves, firstly we'll create a teporary list
+    # For CMake 2.4.x before 2.4.4, we have to do this ourselves, firstly we'll create a temporary list
    set(NEW_LIST)
    # Iterate through the old list
    foreach(ITEM ${${LIST}})
@@ -445,24 +445,32 @@ macro(calculate_libraries SRC SRC_LDFLAGS EXTRA_DEPENDS)
    string(REGEX REPLACE "," ";" REQUIRED_LIBRARY ${REQUIRED_LIBRARY})
    # Iterate through the libraries given
    foreach(LIBRARY ${REQUIRED_LIBRARY})
+      # If the library has multiple names extract the alternate.
+      unset(LIBRARY_ALT)
+      if (${LIBRARY} MATCHES "^.+\\|.+$")
+        string(REGEX REPLACE ".+\\|(.*)" "\\1" LIBRARY_ALT ${LIBRARY})
+        string(REGEX REPLACE "(.+)\\|.*" "\\1" LIBRARY ${LIBRARY})
+      endif(${LIBRARY} MATCHES "^.+\\|.+$")
      # Locate the library to see if it exists
      if(DEFAULT_LIBRARY_DIRS OR WSDK_PATH OR DEFINED $ENV{VCINSTALLDIR})
-        find_library(FOUND_${LIBRARY}_LIBRARY NAMES ${LIBRARY} PATHS ${DEFAULT_LIBRARY_DIRS} ${WSDK_PATH}/lib $ENV{VCINSTALLDIR}/lib ${EXTRA_INCLUDE} ${EXTRA_LIBS})
+        find_library(FOUND_${LIBRARY}_LIBRARY NAMES ${LIBRARY} ${LIBRARY_ALT} PATHS ${DEFAULT_LIBRARY_DIRS} ${WSDK_PATH}/lib $ENV{VCINSTALLDIR}/lib ${EXTRA_INCLUDE} ${EXTRA_LIBS})
      else(DEFAULT_LIBRARY_DIRS OR WSDK_PATH OR DEFINED $ENV{VCINSTALLDIR})
-        find_library(FOUND_${LIBRARY}_LIBRARY NAMES ${LIBRARY} PATHS ${EXTRA_INCLUDE} ${EXTRA_LIBS} NO_DEFAULT_PATH)
-        find_library(FOUND_${LIBRARY}_LIBRARY NAMES ${LIBRARY} PATHS ${EXTRA_INCLUDE} ${EXTRA_LIBS})
+        find_library(FOUND_${LIBRARY}_LIBRARY NAMES ${LIBRARY} ${LIBRARY_ALT} PATHS ${EXTRA_INCLUDE} ${EXTRA_LIBS} NO_DEFAULT_PATH)
+        find_library(FOUND_${LIBRARY}_LIBRARY NAMES ${LIBRARY} ${LIBRARY_ALT} PATHS ${EXTRA_INCLUDE} ${EXTRA_LIBS})
      endif(DEFAULT_LIBRARY_DIRS OR WSDK_PATH OR DEFINED $ENV{VCINSTALLDIR})
      # If the library was found, we will add it to the linker flags
      if(FOUND_${LIBRARY}_LIBRARY)
-        # Get the path only of the library, to add it to linker flags
-        get_filename_component(LIBRARY_PATH ${FOUND_${LIBRARY}_LIBRARY} PATH)
        if(MSVC)
          # For Visual Studio, instead of editing the linker flags, we'll add the library to a separate list of extra dependencies
          append_to_list(EXTRA_DEPENDENCIES "${FOUND_${LIBRARY}_LIBRARY}")
        else(MSVC)
-          # For all others, add the library paths and libraries
+          # Get the path only of the library, to add it to library paths.
+          get_filename_component(LIBRARY_PATH ${FOUND_${LIBRARY}_LIBRARY} PATH)
          append_to_list(LIBRARY_PATHS "${LIBRARY_PATH}")
-          append_to_list(LIBRARIES "${LIBRARY}")
+          # Extract the library short name, add it to the library path
+          get_filename_component(LIBRARY_NAME ${FOUND_${LIBRARY}_LIBRARY} NAME_WE)
+          string(REGEX REPLACE "^lib" "" LIBRARY_NAME ${LIBRARY_NAME})
+          append_to_list(LIBRARIES ${LIBRARY_NAME})
        endif(MSVC)
      else(FOUND_${LIBRARY}_LIBRARY)
        # In the case of the library not being found, we fatally error so CMake stops trying to generate
@@ -497,7 +505,7 @@ endmacro(calculate_libraries)
 # check_functions(<source filename> <output variable set to TRUE on success>)
 #
 # This macro is used in most of the module (sub)directories to calculate the
-#   fcuntion dependencies for the given source file.
+#   function dependencies for the given source file.
 ###############################################################################
 macro(check_functions SRC SUCCESS)
  # Default to true
@@ -118,7 +118,7 @@ Var AR_RegFlags
 "exit_${SecName}:"
 !macroend

-!macro RemoveSection SecName
+!macro RemoveSection_CPack SecName
  ;  This macro is used to call section's Remove_... macro
  ;from the uninstaller.
  ;Input: section index constant name specified in Section command.
@@ -348,7 +348,7 @@ Function un.RemoveFromPath
 FunctionEnd

 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; Uninstall sutff
+; Uninstall stuff
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

 ###########################################
@@ -452,15 +452,15 @@ Done:
 	Exch $R1
 FunctionEnd

-Function ConditionalAddToRegisty
+Function ConditionalAddToRegistry
  Pop $0
  Pop $1
-  StrCmp "$0" "" ConditionalAddToRegisty_EmptyString
+  StrCmp "$0" "" ConditionalAddToRegistry_EmptyString
    WriteRegStr SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_NAME@" \
    "$1" "$0"
    ;MessageBox MB_OK "Set Registry: '$1' to '$0'"
    DetailPrint "Set install registry entry: '$1' to '$0'"
-  ConditionalAddToRegisty_EmptyString:
+  ConditionalAddToRegistry_EmptyString:
 FunctionEnd

 ;--------------------------------
@@ -558,44 +558,44 @@ Section "-Core installation"
  WriteUninstaller "$INSTDIR\Uninstall.exe"
  Push "DisplayName"
  Push "@CPACK_NSIS_DISPLAY_NAME@"
-  Call ConditionalAddToRegisty
+  Call ConditionalAddToRegistry
  Push "DisplayVersion"
  Push "@CPACK_PACKAGE_VERSION@"
-  Call ConditionalAddToRegisty
+  Call ConditionalAddToRegistry
  Push "Publisher"
  Push "@CPACK_PACKAGE_VENDOR@"
-  Call ConditionalAddToRegisty
+  Call ConditionalAddToRegistry
  Push "UninstallString"
  Push "$INSTDIR\Uninstall.exe"
-  Call ConditionalAddToRegisty
+  Call ConditionalAddToRegistry
  Push "NoRepair"
  Push "1"
-  Call ConditionalAddToRegisty
+  Call ConditionalAddToRegistry

  !ifdef CPACK_NSIS_ADD_REMOVE
  ;Create add/remove functionality
  Push "ModifyPath"
  Push "$INSTDIR\AddRemove.exe"
-  Call ConditionalAddToRegisty
+  Call ConditionalAddToRegistry
  !else
  Push "NoModify"
  Push "1"
-  Call ConditionalAddToRegisty
+  Call ConditionalAddToRegistry
  !endif

  ; Optional registration
  Push "DisplayIcon"
  Push "$INSTDIR\@CPACK_NSIS_INSTALLED_ICON_NAME@"
-  Call ConditionalAddToRegisty
+  Call ConditionalAddToRegistry
  Push "HelpLink"
  Push "@CPACK_NSIS_HELP_LINK@"
-  Call ConditionalAddToRegisty
+  Call ConditionalAddToRegistry
  Push "URLInfoAbout"
  Push "@CPACK_NSIS_URL_INFO_ABOUT@"
-  Call ConditionalAddToRegisty
+  Call ConditionalAddToRegistry
  Push "Contact"
  Push "@CPACK_NSIS_CONTACT@"
-  Call ConditionalAddToRegisty
+  Call ConditionalAddToRegistry
  !insertmacro MUI_STARTMENU_WRITE_BEGIN Application

  ;Create shortcuts
@@ -607,19 +607,19 @@ Section "-Core installation"
  ; Write special uninstall registry entries
  Push "StartMenu"
  Push "$STARTMENU_FOLDER"
-  Call ConditionalAddToRegisty
+  Call ConditionalAddToRegistry
  Push "DoNotAddToPath"
  Push "$DO_NOT_ADD_TO_PATH"
-  Call ConditionalAddToRegisty
+  Call ConditionalAddToRegistry
  Push "AddToPathAllUsers"
  Push "$ADD_TO_PATH_ALL_USERS"
-  Call ConditionalAddToRegisty
+  Call ConditionalAddToRegistry
  Push "AddToPathCurrentUser"
  Push "$ADD_TO_PATH_CURRENT_USER"
-  Call ConditionalAddToRegisty
+  Call ConditionalAddToRegistry
  Push "InstallToDesktop"
  Push "$INSTALL_DESKTOP"
-  Call ConditionalAddToRegisty
+  Call ConditionalAddToRegistry

@CPACK_NSIS_EXTRA_INSTALL_COMMANDS@

@@ -731,7 +731,7 @@ Section "Uninstall"
  DeleteRegKey SHCTX "Software\@CPACK_PACKAGE_VENDOR@\@CPACK_PACKAGE_INSTALL_REGISTRY_KEY@"

  ; Removes all optional components
-  !insertmacro SectionList "RemoveSection"
+  !insertmacro SectionList "RemoveSection_CPack"

  !insertmacro MUI_STARTMENU_GETFOLDER Application $MUI_TEMP

@@ -739,7 +739,7 @@ Section "Uninstall"
@CPACK_NSIS_DELETE_ICONS@
@CPACK_NSIS_DELETE_ICONS_EXTRA@

-  ;Delete empty start menu parent diretories
+  ;Delete empty start menu parent directories
  StrCpy $MUI_TEMP "$SMPROGRAMS\$MUI_TEMP"

  startMenuDeleteLoop:
@@ -752,13 +752,13 @@ Section "Uninstall"
    StrCmp "$MUI_TEMP" "$SMPROGRAMS" startMenuDeleteLoopDone startMenuDeleteLoop
  startMenuDeleteLoopDone:

-  ; If the user changed the shortcut, then untinstall may not work. This should
+  ; If the user changed the shortcut, then uninstall may not work. This should
  ; try to fix it.
  StrCpy $MUI_TEMP "$START_MENU"
  Delete "$SMPROGRAMS\$MUI_TEMP\Uninstall.lnk"
@CPACK_NSIS_DELETE_ICONS_EXTRA@

-  ;Delete empty start menu parent diretories
+  ;Delete empty start menu parent directories
  StrCpy $MUI_TEMP "$SMPROGRAMS\$MUI_TEMP"

  secondStartMenuDeleteLoop:
@@ -89,6 +89,8 @@ module
 	 * -       noautoop: Disables autoop on the channel
 	 * -  cs_keep_modes: Enables keep modes on the channel, which retains modes when the channel is
 	 *                     not in use.
+	 * -   cs_no_expire: Enables no expire. Needs founder, successor (if set) or anyone in the access list
+	 *                   to be a registered nick, otherwise the channel will be dropped.
 	 * -           none: No defaults
 	 *
 	 * This directive is optional, if left blank, the options will default to keeptopic, cs_secure, securefounder,
@@ -90,7 +90,7 @@
 define
 {
 	name = "services.host"
-	value = "services.localhost.net"
+	value = "services.example.com"
 }

 /*
@@ -127,13 +127,16 @@ define
 * and serverinfo configuration would look like:
 *
 *     # This goes in inspircd.conf, *NOT* your Anope config!
- *     <link name="services.localhost.net"
+ *     <module name="hidechans">
+ *     <module name="services_account">
+ *     <module name="spanningtree">
+ *     <bind address="127.0.0.1" port="7000" type="servers">
+ *     <link name="services.example.com"
 *           ipaddr="127.0.0.1"
 *           port="7000"
 *           sendpass="mypassword"
 *           recvpass="mypassword">
- *     <uline server="services.localhost.net" silent="yes">
- *     <bind address="127.0.0.1" port="7000" type="servers">
+ *     <uline server="services.example.com" silent="yes">
 *
 * An example configuration for UnrealIRCd that is compatible with the below uplink
 * and serverinfo configuration would look like:
@@ -146,14 +149,14 @@ define
 *             serversonly;
 *         };
 *     };
- *     link services.localhost.net {
+ *     link services.example.com {
 *         incoming {
 *             mask *@127.0.0.1;
 *         };
 *         password "mypassword";
 *         class servers;
 *     };
- *     ulines { services.localhost.net; };
+ *     ulines { services.example.com; };
 */
 uplink
 {
@@ -206,7 +209,7 @@ serverinfo
 	 * other server names on the rest of your IRC network. Note that it does not have
 	 * to be an existing hostname, just one that isn't on your network already.
 	 */
-	name = "services.localhost.net"
+	name = "services.example.com"

 	/*
 	 * The text which should appear as the server's information in /WHOIS and similar
@@ -261,11 +264,11 @@ serverinfo
 *  - plexus
 *  - ratbox
 *  - unreal (for 3.2.x)
- *  - unreal4
+ *  - unreal4 (for 4.x or later)
 */
 module
 {
-	name = "inspircd20"
+	name = "inspircd3"

 	/*
 	 * Some protocol modules can enforce mode locks server-side. This reduces the spam caused by
@@ -491,7 +494,7 @@ options

 	/*
 	 * If set, will force Services to only respond to PRIVMSGs addresses to
-	 * Nick@ServerName - e.g. NickServ@localhost.net. This should be used in
+	 * Nick@ServerName - e.g. NickServ@example.com. This should be used in
 	 * conjunction with IRCd aliases. This directive is optional.
 	 *
 	 * This option will have no effect on some IRCds, such as TS6 IRCds.
@@ -660,6 +663,8 @@ log
 	 *   - a channel name
 	 *   - a filename
 	 *   - globops
+	 *
+	 * If you specify a filename the current date in the format ".YYYYMMDD" will be appended to the path.
 	 */
 	target = "services.log"

@@ -710,7 +715,7 @@ log
 	 * means "* ~operserv/*" would log everything because * matches everything.
 	 *
 	 * Valid admin, override, and command options are:
-	 *    pesudo-serv/commandname (e.g. operserv/akill, chanserv/set)
+	 *    pseudo-serv/commandname (e.g. operserv/akill, chanserv/set)
 	 *
 	 * Valid server options are:
 	 *    connect, quit, sync, squit
@@ -969,7 +974,7 @@ mail
 	 * This is the e-mail address from which all the e-mails are to be sent from.
 	 * It should really exist.
 	 */
-	sendfrom = "services@localhost.net"
+	sendfrom = "services@example.com"

 	/*
 	 * This controls the minimum amount of time a user must wait before sending
@@ -71,7 +71,7 @@ module
 	 *
 	 * This directive is optional.
 	 */
-	#globaloncycledown = "Services are restarting, they will be back shortly - please be good while we're gone"
+	#globaloncycledown = "Services are restarting, they will be back shortly - please be good while they're gone"

 	/*
 	 * This is the global message that will be sent when Services (re)join the
@@ -403,10 +403,18 @@ module { name = "help" }
 /*
 * m_regex_pcre [EXTRA]
 *
- * Provides the regex engine regex/pcre, which uses the Perl Compatible Regular Expressions library.
+ * Provides the regex engine regex/pcre, which uses version 1 of the Perl Compatible Regular
+ * Expressions library. This can not be loaded at the same time as the m_regex_pcre2 module.
 */
 #module { name = "m_regex_pcre" }

+/*
+ * m_regex_pcre2 [EXTRA]
+ *
+ * Provides the regex engine regex/pcre, which uses version 2 of the Perl Compatible Regular
+ * Expressions library. This can not be loaded at the same time as the m_regex_pcre module.
+#module { name = "m_regex_pcre2" }
+
 /*
 * m_regex_posix [EXTRA]
 *
@@ -92,8 +92,10 @@ module
 	 *
 	 * The options are:
 	 * -   killprotect: Kill nick if not identified within 60 seconds
-	 * -    kill_quick: Kill nick if not identified within 20 seconds, this one overrides the above
-	 *                    option and the above must be specified with this one
+	 * -    kill_quick: Kill nick if not identified within 20 seconds, this one overrides the killprotect
+	 *                    option and the killprotect option must be specified with this one
+	 * -    kill_immed: Kill nick immediately if not identified, this one overrides both the killprotect
+	 *                    and kill_quick options and the killprotect option must be specified with this one
 	 * -     ns_secure: Enable nickname security, requiring the nick's password before any operations
 	 *                    can be done on it
 	 * -    ns_private: Hide the nick from NickServ's LIST command
@@ -113,7 +115,7 @@ module
 	 * This directive is optional, if left blank, the options will default to ns_secure, memo_signon, and
 	 * memo_receive. If you really want no defaults, use "none" by itself as the option.
 	 */
-	defaults = "ns_secure ns_private hide_email hide_mask memo_signon memo_receive autoop"
+	defaults = "killprotect ns_secure ns_private hide_email hide_mask memo_signon memo_receive autoop"

 	/*
 	 * The minimum length of time between consecutive uses of NickServ's REGISTER command. This
@@ -262,7 +264,7 @@ module
 	 * being recognized, unless they manually add an address to the access list of their account.
 	 * This directive is optional.
 	 */
-	addaccessonreg = yes
+	addaccessonreg = no
 }
 command { service = "NickServ"; name = "ACCESS"; command = "nickserv/access"; }

@@ -592,8 +594,8 @@ command { service = "NickServ"; name = "SASET NOEXPIRE"; command = "nickserv/sas
 module { name = "ns_set_misc" }
 command { service = "NickServ"; name = "SET URL"; command = "nickserv/set/misc"; misc_description = _("Associate a URL with your account"); }
 command { service = "NickServ"; name = "SASET URL"; command = "nickserv/saset/misc"; misc_description = _("Associate a URL with this account"); permission = "nickserv/saset/url"; group = "nickserv/admin"; }
-#command { service = "NickServ"; name = "SET ICQ"; command = "nickserv/set/misc"; misc_description = _("Associate an ICQ account with your account"); }
-#command { service = "NickServ"; name = "SASET ICQ"; command = "nickserv/saset/misc"; misc_description = _("Associate an ICQ account with this account"); permission = "nickserv/saset/icq"; group = "nickserv/admin"; }
+#command { service = "NickServ"; name = "SET DISCORD"; command = "nickserv/set/misc"; misc_description = _("Associate a Discord account with your account"); }
+#command { service = "NickServ"; name = "SASET DISCORD"; command = "nickserv/saset/misc"; misc_description = _("Associate a Discord account with this account"); permission = "nickserv/saset/discord"; group = "nickserv/admin"; }
 #command { service = "NickServ"; name = "SET TWITTER"; command = "nickserv/set/misc"; misc_description = _("Associate a Twitter account with your account"); }
 #command { service = "NickServ"; name = "SASET TWITTER"; command = "nickserv/saset/misc"; misc_description = _("Associate a Twitter account with this account"); permission = "nickserv/saset/twitter"; group = "nickserv/admin"; }
 #command { service = "NickServ"; name = "SET FACEBOOK"; command = "nickserv/set/misc"; misc_description = _("Associate a Facebook URL with your account"); }
@@ -544,7 +544,7 @@ command { service = "OperServ"; name = "RELOAD"; command = "operserv/reload"; pe
 *
 * This module enables session limiting. Session limiting prevents users from connecting more than a certain
 * number of times from the same IP at the same time - thus preventing most types of cloning.
- * Once a host reaches it's session limit, all clients attempting to connect from that host will
+ * Once a host reaches its session limit, all clients attempting to connect from that host will
 * be killed. Exceptions to the default session limit can be defined via the exception list.
 *
 * Used to manage the session limit exception list, and view currently active sessions.
@@ -559,7 +559,7 @@ module
 	 *
 	 * This directive is required if os_session is loaded.
 	 */
-	defaultsessionlimit = 3
+	defaultsessionlimit = 5

 	/*
 	 * The maximum session limit that may be set for a host in an exception.
@@ -90,7 +90,7 @@
 define
 {
 	name = "stats.host"
-	value = "stats.localhost.net"
+	value = "stats.example.com"
 }

 /*
@@ -127,12 +127,12 @@ define
 * and serverinfo configuration would look like:
 *
 *     # This goes in inspircd.conf, *NOT* your Anope config!
- *     <link name="stats.localhost.net"
+ *     <link name="stats.example.com"
 *           ipaddr="127.0.0.1"
 *           port="7000"
 *           sendpass="mypassword"
 *           recvpass="mypassword">
- *     <uline server="stats.localhost.net" silent="yes">
+ *     <uline server="stats.example.com" silent="yes">
 *     <bind address="127.0.0.1" port="7000" type="servers">
 *
 * An example configuration for UnrealIRCd that is compatible with the below uplink
@@ -146,14 +146,14 @@ define
 *             serversonly;
 *         };
 *     };
- *     link stats.localhost.net {
+ *     link stats.example.com {
 *         incoming {
 *             mask *@127.0.0.1;
 *         };
 *         password "mypassword";
 *         class servers;
 *     };
- *     ulines { stats.localhost.net; };
+ *     ulines { stats.example.com; };
 */
 uplink
 {
@@ -206,7 +206,7 @@ serverinfo
 	 * other server names on the rest of your IRC network. Note that it does not have
 	 * to be an existing hostname, just one that isn't on your network already.
 	 */
-	name = "stats.localhost.net"
+	name = "stats.example.com"

 	/*
 	 * The text which should appear as the server's information in /WHOIS and similar
@@ -261,11 +261,11 @@ serverinfo
 *  - plexus
 *  - ratbox
 *  - unreal (for 3.2.x)
- *  - unreal4
+ *  - unreal4 (for 4.x or later)
 */
 module
 {
-	name = "inspircd20"
+	name = "inspircd3"
 }

 /*
@@ -59,7 +59,7 @@ yet follows these. This will be rectified with time.
 4. Braces

   Always put braces opening and closing blocks on separate lines, see the
-   identation example. For example, place braces like this:
+   indentation example. For example, place braces like this:
     if (apples == "green")
     {
         cout << "Apples are green" << endl;
@@ -1,3 +1,70 @@
+Anope Version 2.0.13
+--------------------
+Fixed a crash on some compilers when trying to call methods on a null pointer
+Fixed a crash when encountering an unterminated commented config block
+Fixed erroneously rejecting spaces in fantasy:name
+Fixed marking services pseudoclients as an oper on InspIRCd
+Fixed not checking user@ip as well as user@host when logging into an operator account
+Fixed setting the vhost/vident during SASL on UnrealIRCd
+Updated the German translation
+Updated the Italian translation
+
+Anope Version 2.0.12
+--------------------
+Added account confirmation to the web panel
+Added the regex_pcre2 module which provides regex/pcre with PCRE2
+Documented the cs_no_expire channel default
+Fixed config validation mistakenly allowing spaces in some fields
+Fixed the bahamut protocol module not knowing about halfops
+Fixed writing a flatfile database not being atomic
+Updated the hybrid protocol module for recent protocol changes
+
+Anope Version 2.0.11
+--------------------
+Fixed ldap on OpenLDAP 2.5+
+Fixed not using utf-8 encoding for outgoing email
+Fixed ns_resetpass not returning a response for XMLRPC
+Fixed some message params being sent as <middle> instead of <trailing>
+Fixed unsetting vhosts on unreal4
+Fixed username validity checking on ircd-hybrid
+Send the oper mode for services pseudoclients on InspIRCd
+Updated the pl_PL translation
+Updated unreal4 for various protocol changes
+
+Anope Version 2.0.10
+--------------------
+Add support for channel SQLines on InspIRCd
+Change default protocol module from inspircd20 to inspircd3
+Change the character set used by chanstats and irc2sql to utf8mb4
+Fix a ton of typos in messages
+Fix being able to override MAXLIST on InspIRCd
+Fix blocking on boot when trying to upgrade SQL databases without account identifiers
+Fix not flushing the ERROR message on squit
+Fix using an invalidated iterator when deleting bots
+Fix various harmless compiler warnings
+Fix webcpanel not using the forwarded IP
+Show the account name in nickserv/info
+
+Anope Version 2.0.9
+-------------------
+Fix a regression from 2.0.8 that prevented serialising to MySQL
+Send account identifiers to InspIRCd on SASL logins too
+Fix a query bug in irc2sql
+
+Anope Version 2.0.8
+-------------------
+Add +K channel mode for ircd-hybrid
+Add immutable identifiers to user accounts
+Fix build on systems that use musl libc
+Fix help of global/global not showing the correct origin nick
+Fix not removing vhosts when an nick is dropped
+Fix parsing channel metadata on InspIRCd 3+
+Fix parsing kicks on InspIRCd 3+
+Fix parsing topic changes on InspIRCd 3+
+Fix topiclock on InspIRCd
+Modernize the ircd-hybrid protocol module
+
+
 Anope Version 2.0.7
 -------------------
 Fix not sending login data on successful NickServ GROUP
@@ -60,7 +127,7 @@ Fix chankill to not add duplicate akills
 Allow nickserv/maxemail to disregard gmail style aliases when comparing emails
 Fix chanserv/mode when setting listmodes with CIDR ranges
 Fix reported expiry time when the time is divisible by 1 year
-Clearify botserv repeat kicker help and allow setting repeat times to 1
+Clarify botserv repeat kicker help and allow setting repeat times to 1
 Send vident/vhost with SASL login
 Add support for SASL reauth
 Fix log and database backup directories to be properly created by the installer
@@ -232,7 +299,7 @@ Anope Version 1.9.3
 A Added italics BotServ kicks support
 A Tell users when their nicks expire in /ns glist and /ns info
 A Added SSL support
-A Prevent negaitve mode changes, kicks, bans, and autokicks from affecting people with the 'god' user mode (On UnrealIRCd, usermode +q)
+A Prevent negative mode changes, kicks, bans, and autokicks from affecting people with the 'god' user mode (On UnrealIRCd, usermode +q)
 A Added nickserv/auxpex permission
 A Added nickserv ungroup command
 A Renamed the SGLINE to be SNLINE
@@ -244,15 +311,15 @@ A Added m_mysql which uses threads to execute queries
 A Added many subcommand modules for some commands, eg ns_set_autoop, ns_set_email, etc
 A Added a new logging system that is a bit more flexible
 A Added cs_set_misc and ns_set_misc to add miscellaneous set commands
-A Added os_modreload, which allows reloading some modules not normally unloable, like the protocol module
+A Added os_modreload, which allows reloading some modules not normally unloadable, like the protocol module
 A Added FOUNDER access level
 A Made OperServ, Global, MemoServ, and ChanServ optional
 F Shutting down if a config reload fails
 F Autoid to live through restarts on Unreal
 F Storing vhosts in MySQL
-F Not flushing the anope_extra table before rewriting databaes
+F Not flushing the anope_extra table before rewriting database
 F Anoperc start/stop to send the globaloncycle global, and fixed anoperc rehash to really rehash
-F Fixed a potential crash if HostServ or BotServ was disbled
+F Fixed a potential crash if HostServ or BotServ was disabled

 Anope Version 1.9.2
 -------------------
@@ -276,7 +343,7 @@ F Unban command to accept an optional nick arg
 F Some typos in services.conf
 F Crash when users change their host that are identified to a group, but not a nick
 F Host length checking in HS SET(ALL) and HS REQUEST
-F Only show if a user is online in NS INFO if they are really identiifed for the group of the nick they are on
+F Only show if a user is online in NS INFO if they are really identified for the group of the nick they are on
 F Crash when using BSSmartJoin
 F Converting access entries to access from xop when a users access is below voice
 F A bad pointer passed to the OnDelEvent which could cause some 3rd party modules to crash
@@ -1,3 +1,27 @@
+Anope Version 2.0.13
+--------------------
+No significant changes.
+
+Anope Version 2.0.12
+--------------------
+Added the regex_pcre2 module
+
+Anope Version 2.0.11
+--------------------
+No significant changes.
+
+Anope Version 2.0.10
+--------------------
+No significant changes.
+
+Anope Version 2.0.9
+-------------------
+No significant changes.
+
+Anope Version 2.0.8
+-------------------
+Fix ns_register:unconfirmedexpire not being used
+
 Anope Version 2.0.7
 -------------------
 Add nickserv/recover permission
@@ -52,7 +76,7 @@ mail:restrict removed

 Anope Version 1.9.9
 -------------------
-There is not many config changes betewen 1.9.8 and 1.9.9, however many of the
+There is not many config changes between 1.9.8 and 1.9.9, however many of the
 options have been moved around to make more sense, too many to list here,
 so get a new config.

@@ -153,7 +177,7 @@ options:enablelogchannel added to auto turn on the logchannel on startup
 options:mlock added to configure the default mlock modes on new channels
 options:database added for the database modules
 options:botmodes added to configure modes BotServ bots should use
-options:userlen added to configure maxiumum ident length
+options:userlen added to configure maximum ident length
 options:hostlen added to configure maximum hostname length
 options:database added to configure what database modules to use
 options:passlen added to specify the maximum length of passwords
@@ -80,7 +80,7 @@ Note: You should also read the README and FAQ files!

    The configuration varies depending on the IRCd, but you will probably need
    a link block (also called connect block, or C line), a U line (also called
-    a shared block), and be sure that the IRCd is listneing on the given port
+    a shared block), and be sure that the IRCd is listening on the given port
    in the link block.

    Example link configurations can be found in example.conf for some of the
@@ -1,9 +1,10 @@
-Anope Mutli Language Support
+Anope Multi Language Support
 ----------------------------

 1) Building Anope with gettext support
 2) Adding a new language
 3) Using languages with modules
+4) Updating a language file

 1) Building Anope with gettext support

@@ -36,7 +37,7 @@ Anope Mutli Language Support

    NOTE: There is no guarantee we will use your work so please do not be offended if we say no thanks.

-3) Using langages with modules
+3) Using languages with modules

    Module authors can easily add the ability to have their modules translated by adding _() around the strings they
    want translated (messages to the user, etc).
@@ -51,3 +52,14 @@ Anope Mutli Language Support

    All .po and .pot files should be placed in modules/third/language. Additionally an update script is provided there
    that will create .pot files and merge any changes to it with existing .po files.
+
+4) Updating a language file
+
+    Poedit (https://poedit.net/) is a popular po file editor, and we recommend using it or another editor designed to edit
+    po files (especially on Windows).
+
+    Before editing the relevant file in languages/, run `update.sh` in the languages/ folder, i.e. `cd` to it and run
+        ./update.sh
+    This will update the language file to contain all strings that need a translation.
+
+    Then commit only the changed .po files in git.
@@ -1,7 +1,7 @@
 Anope -- a set of IRC services for IRC networks
 -----------------------------------------------

-Anope is          2003-2019 Anope Team    <team@anope.org>.
+Anope is          2003-2023 Anope Team    <team@anope.org>.
 Based on Epona    2000-2002 PegSoft       <epona@pegsoft.net>.
 Based on Services 1996-1999 Andrew Church <achurch@achurch.org>.

@@ -92,7 +92,7 @@ Table of Contents
        * Lee Holmes <lethality@anope.org>
        * Lucas Nussbaum <lucas@lucas-nussbaum.net>
        * Mark Summers <mark@goopler.net>
-        * Matthew Beeching <jobe@invictachat.net>
+        * Matthew Beeching <jobe@mdbnet.co.uk>
        * Naram Qashat <cyberbotx@anope.org>
        * Phil Lavin <phil@anope.org>
        * Pieter Bootsma <geniusdex@anope.org>
@@ -168,12 +168,12 @@ Table of Contents

        * Bahamut 1.4.27 or later (including 1.8)
        * Charybdis 3.4 or later
-        * Hybrid 8.2 or later
+        * ircd-hybrid 8.2.23 or later
        * InspIRCd 1.2 or later
        * ngIRCd 19.2 or later
        * Plexus 3 or later
        * Ratbox 2.0.6 or later
-        * UnrealIRCd 3.2 or 4
+        * UnrealIRCd 3.2 or later

    Anope could also work with some of the daemons derived by the ones listed
    above, but there's no support for them if they work or don't work.
@@ -32,7 +32,7 @@ Table of Contents

        hash -  The keys in hash are the actual objects, stored as hashes. For
                example, if I had just looked up all BotInfo ids and wanted to iterate
-                over all of them, I woulld start by:
+                over all of them, I would start by:

                redis 127.0.0.1:6379> HGETALL hash:BotInfo:1

@@ -73,7 +73,7 @@ Table of Contents
    (https://redis.io/topics/notifications). This allows Redis to notify Anope of
    any external changes to objects in the database. Once notified, Anope will
    immediately update the object. Otherwise, Anope keeps all objects in memory
-    and will not regularly read from the databaes once started.
+    and will not regularly read from the database once started.

    You can use this to modify objects in Redis and have them immediately reflected
    back into Anope. Additionally you can use this feature to run multiple Anope
@@ -93,7 +93,7 @@ Table of Contents

    The key space ids and value are managed entirely by Anope, you do
    not (and should not) modify them. Once you modify the object (hash), Anope will
-    update them for you to correctly refelect any changes made to the object.
+    update them for you to correctly reflect any changes made to the object.

    Finally, always use atomic operations. If you are inserting a new object with
    multiple commands, or inserting multiple objects at once, specifically if the
@@ -3,7 +3,7 @@
 /**
 * XMLRPC Functions
 *
- * (C) 2003-2019 Anope Team
+ * (C) 2003-2023 Anope Team
 * Contact us at team@anope.org
 */

@@ -1,6 +1,6 @@
 /*
 *
- * (C) 2003-2019 Anope Team
+ * (C) 2003-2023 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -80,7 +80,7 @@ class CoreExport ChanAccess : public Serializable
 public:
 	typedef std::vector<ChanAccess *> Path;

- 	/* The provider that created this access entry */
+	/* The provider that created this access entry */
 	AccessProvider *provider;
 	/* Channel this access entry is on */
 	Serialize::Reference<ChannelInfo> ci;
@@ -139,7 +139,7 @@ class CoreExport AccessGroup
 	/* access entries + paths */
 	std::vector<ChanAccess::Path> paths;
 	/* Channel these access entries are on */
- 	const ChannelInfo *ci;
+	const ChannelInfo *ci;
 	/* Account these entries affect, if any */
 	const NickCore *nc;
 	/* super_admin always gets all privs. founder is a special case where ci->founder == nc */
@@ -1,6 +1,6 @@
 /*
 *
- * (C) 2003-2019 Anope Team
+ * (C) 2003-2023 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -20,9 +20,11 @@

 typedef Anope::hash_map<NickAlias *> nickalias_map;
 typedef Anope::hash_map<NickCore *> nickcore_map;
+typedef TR1NS::unordered_map<uint64_t, NickCore *> nickcoreid_map;

 extern CoreExport Serialize::Checker<nickalias_map> NickAliasList;
 extern CoreExport Serialize::Checker<nickcore_map> NickCoreList;
+extern CoreExport nickcoreid_map NickCoreIdList;

 /* A registered nickname.
 * It matters that Base is here before Extensible (it is inherited by Serializable)
@@ -45,7 +47,7 @@ class CoreExport NickAlias : public Serializable, public Extensible
 	/* Account this nick is tied to. Multiple nicks can be tied to a single account. */
 	Serialize::Reference<NickCore> nc;

- 	/** Constructor
+	/** Constructor
 	 * @param nickname The nick
 	 * @param nickcore The nickcore for this nick
 	 */
@@ -55,11 +57,11 @@ class CoreExport NickAlias : public Serializable, public Extensible
 	void Serialize(Serialize::Data &data) const anope_override;
 	static Serializable* Unserialize(Serializable *obj, Serialize::Data &);

- 	/** Set a vhost for the user
+	/** Set a vhost for the user
 	 * @param ident The ident
 	 * @param host The host
 	 * @param creator Who created the vhost
-	 * @param time When the vhost was craated
+	 * @param time When the vhost was created
 	 */
 	void SetVhost(const Anope::string &ident, const Anope::string &host, const Anope::string &creator, time_t created = Anope::CurTime);

@@ -107,8 +109,10 @@ class CoreExport NickCore : public Serializable, public Extensible
 {
 	/* Channels which reference this core in some way (this is on their access list, akick list, is founder, successor, etc) */
 	Serialize::Checker<std::map<ChannelInfo *, int> > chanaccess;
+	/* Unique identifier for the account. */
+	uint64_t id;
 public:
- 	/* Name of the account. Find(display)->nc == this. */
+	/* Name of the account. Find(display)->nc == this. */
 	Anope::string display;
 	/* User password in form of hashm:data */
 	Anope::string pass;
@@ -126,7 +130,7 @@ class CoreExport NickCore : public Serializable, public Extensible
 	 */
 	Serialize::Checker<std::vector<NickAlias *> > aliases;

-	/* Set if this user is a services operattor. o->ot must exist. */
+	/* Set if this user is a services operator. o->ot must exist. */
 	Oper *o;

 	/* Unsaved data */
@@ -140,8 +144,9 @@ class CoreExport NickCore : public Serializable, public Extensible

 	/** Constructor
 	 * @param display The display nick
+	 * @param id The account id
 	 */
-	NickCore(const Anope::string &nickdisplay);
+	NickCore(const Anope::string &nickdisplay, uint64_t nickid = 0);
 	~NickCore();

 	void Serialize(Serialize::Data &data) const anope_override;
@@ -178,6 +183,9 @@ class CoreExport NickCore : public Serializable, public Extensible
 	 */
 	unsigned GetAccessCount() const;

+	/** Retrieves the account id for this user */
+	uint64_t GetId();
+
 	/** Find an entry in the nick's access list
 	 *
 	 * @param entry The nick!ident@host entry to search for
@@ -226,7 +234,7 @@ class CoreExport NickCore : public Serializable, public Extensible
 class CoreExport IdentifyRequest
 {
 	/* Owner of this request, used to cleanup requests if a module is unloaded
-	 * while a reqyest us pending */
+	 * while a request us pending */
 	Module *owner;
 	Anope::string account;
 	Anope::string password;
@@ -242,7 +250,7 @@ class CoreExport IdentifyRequest
 	virtual ~IdentifyRequest();

 public:
- 	/* One of these is called when the request goes through */
+	/* One of these is called when the request goes through */
 	virtual void OnSuccess() = 0;
 	virtual void OnFail() = 0;

@@ -254,17 +262,17 @@ class CoreExport IdentifyRequest
 	 * for the request to complete. Multiple modules may hold a request at any time,
 	 * but the request is not complete until every module has released it. If you do not
 	 * require holding this (eg, your password check is done in this thread and immediately)
-	 * then you don't need to hold the request before Successing it.
+	 * then you don't need to hold the request before calling `Success()`.
 	 * @param m The module holding this request
 	 */
 	void Hold(Module *m);

 	/** Releases a held request
-	 * @param m The module releaseing the hold
+	 * @param m The module releasing the hold
 	 */
 	void Release(Module *m);

-	/** Called by modules when this IdentifyRequest has successeded successfully.
+	/** Called by modules when this IdentifyRequest has succeeded.
 	 * If this request is behind held it must still be Released after calling this.
 	 * @param m The module confirming authentication
 	 */
@@ -1,6 +1,6 @@
 /*
 *
- * (C) 2003-2019 Anope Team
+ * (C) 2003-2023 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -54,6 +54,9 @@ namespace Anope
 		string(const ci::string &_str) : _string(_str.c_str()) { }
 		string(const string &_str, size_type pos, size_type n = npos) : _string(_str._string, pos, n) { }
 		template <class InputIterator> string(InputIterator first, InputIterator last) : _string(first, last) { }
+#if __cplusplus >= 201103L
+		string(const string &) = default;
+#endif

 		/**
 		 * Assignment operators, so any type of string can be assigned to this class.
@@ -362,7 +365,7 @@ namespace Anope
 	 */
 	extern CoreExport int Debug;

-	/** Other comand line options.
+	/** Other command line options.
 	 */
 	extern CoreExport bool ReadOnly, NoFork, NoThird, NoExpire, ProtocolDebug;

@@ -403,7 +406,7 @@ namespace Anope

 	/** Used to "fork" the process and go into the background during initial startup
 	 * while we are AtTerm(). The actual fork is not done here, but earlier, and this
-	 * simply notifys the parent via kill() to exit().
+	 * simply notifies the parent via kill() to exit().
 	 */
 	extern void Fork();

@@ -413,7 +416,7 @@ namespace Anope

 	/** One of the first functions called, does general initialization such as reading
 	 * command line args, loading the configuration, doing the initial fork() if necessary,
-	 * initializating language support, loading modules, and loading databases.
+	 * initializing language support, loading modules, and loading databases.
 	 * @throws CoreException if something bad went wrong
 	 */
 	extern void Init(int ac, char **av);
@@ -470,6 +473,13 @@ namespace Anope
 	 */
 	extern CoreExport bool Decrypt(const Anope::string &src, Anope::string &dest);

+	/** Hashes a buffer with SipHash-2-4
+	 * @param src The start of the buffer to hash
+	 * @param src_sz The total number of bytes in the buffer
+	 * @param key A 16 byte key to hash the buffer with.
+	 */
+	extern CoreExport uint64_t SipHash24(const void *src, unsigned long src_sz, const char key[16]);
+
 	/** Returns a sequence of data formatted as the format argument specifies.
 	 ** After the format parameter, the function expects at least as many
 	 ** additional arguments as specified in format.
@@ -567,7 +577,7 @@ class CoreExport sepstream
 public:
 	/** Create a sepstream and fill it with the provided data
 	 */
-	sepstream(const Anope::string &source, char seperator, bool allowempty = false);
+	sepstream(const Anope::string &source, char separator, bool allowempty = false);

 	/** Fetch the next token from the stream
 	 * @param token The next token from the stream is placed here
@@ -577,7 +587,7 @@ class CoreExport sepstream

 	/** Gets token number 'num' from the stream
 	 * @param token The token is placed here
-	 * @param num The token number to featch
+	 * @param num The token number to fetch
 	 * @return True if the token was able to be fetched
 	 */
 	bool GetToken(Anope::string &token, int num);
@@ -595,7 +605,7 @@ class CoreExport sepstream

 	/** Gets token number 'num' from the stream and all remaining tokens.
 	 * @param token The token is placed here
-	 * @param num The token number to featch
+	 * @param num The token number to fetch
 	 * @return True if the token was able to be fetched
 	 */
 	bool GetTokenRemainder(Anope::string &token, int num);
@@ -621,7 +631,7 @@ class CoreExport sepstream
 class commasepstream : public sepstream
 {
 public:
-	/** Initialize with comma seperator
+	/** Initialize with comma separator
 	 */
 	commasepstream(const Anope::string &source, bool allowempty = false) : sepstream(source, ',', allowempty) { }
 };
@@ -631,7 +641,7 @@ class commasepstream : public sepstream
 class spacesepstream : public sepstream
 {
 public:
-	/** Initialize with space seperator
+	/** Initialize with space separator
 	 */
 	spacesepstream(const Anope::string &source) : sepstream(source, ' ') { }
 };
@@ -652,7 +662,7 @@ class CoreException : public std::exception
 	 */
 	Anope::string source;
 public:
-	/** Default constructor, just uses the error mesage 'Core threw an exception'.
+	/** Default constructor, just uses the error message 'Core threw an exception'.
 	 */
 	CoreException() : err("Core threw an exception"), source("The core") { }
 	/** This constructor can be used to specify an error message before throwing.
@@ -684,7 +694,7 @@ class CoreException : public std::exception
 class ModuleException : public CoreException
 {
 public:
-	/** Default constructor, just uses the error mesage 'Module threw an exception'.
+	/** Default constructor, just uses the error message 'Module threw an exception'.
 	 */
 	ModuleException() : CoreException("Module threw an exception", "A Module") { }

@@ -759,7 +769,7 @@ template<typename T> inline T convertTo(const Anope::string &s, bool failIfLefto
 }

 /** Casts to be used instead of dynamic_cast, this uses dynamic_cast
- * for debug builds and static_cast on releass builds
+ * for debug builds and static_cast on release builds
 * to speed up the program because dynamic_cast relies on RTTI.
 */
 #ifdef DEBUG_BUILD
@@ -1,7 +1,7 @@
 /*
 *
 * (C) 2008-2011 Adam <Adam@anope.org>
- * (C) 2008-2019 Anope Team <team@anope.org>
+ * (C) 2008-2023 Anope Team <team@anope.org>
 *
 * Please read COPYING and README for further details.
 */
@@ -50,7 +50,7 @@ class Reference : public ReferenceBase
 protected:
 	T *ref;
 public:
- 	Reference() : ref(NULL)
+	Reference() : ref(NULL)
 	{
 	}

@@ -1,7 +1,7 @@
 /*
 *
 * (C) 2008-2011 Robin Burchell <w00t@inspircd.org>
- * (C) 2008-2019 Anope Team <team@anope.org>
+ * (C) 2008-2023 Anope Team <team@anope.org>
 *
 * Please read COPYING and README for further details.
 */
@@ -1,6 +1,6 @@
 /* Channel support
 *
- * (C) 2008-2019 Anope Team
+ * (C) 2008-2023 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -41,7 +41,7 @@ class CoreExport Channel : public Base, public Extensible
 	ModeList modes;

 public:
- 	/* Channel name */
+	/* Channel name */
 	Anope::string name;
 	/* Set if this channel is registered. ci->c == this. Contains information relevant to the registered channel */
 	Serialize::Reference<ChannelInfo> ci;
@@ -139,7 +139,7 @@ class CoreExport Channel : public Base, public Extensible
 	/** See if a channel has a mode
 	 * @param name The mode name
 	 * @return The number of modes set
- 	 * @param param The optional mode param
+	 * @param param The optional mode param
 	 */
 	size_t HasMode(const Anope::string &name, const Anope::string &param = "");

@@ -232,7 +232,7 @@ class CoreExport Channel : public Base, public Extensible
 	 * @param bi The sender, can be NULL for the service bot for this channel
 	 * @param u The user being kicked
 	 * @param reason The reason for the kick
-	 * @return true if the kick was scucessful, false if a module blocked the kick
+	 * @return true if the kick was successful, false if a module blocked the kick
 	 */
 	bool Kick(BotInfo *bi, User *u, const char *reason = NULL, ...);

@@ -249,7 +249,7 @@ class CoreExport Channel : public Base, public Extensible

 	/** Get a string of the modes set on this channel
 	 * @param complete Include mode parameters
-	 * @param plus If set to false (with complete), mode parameters will not be given for modes requring no parameters to be unset
+	 * @param plus If set to false (with complete), mode parameters will not be given for modes requiring no parameters to be unset
 	 * @return A mode string
 	 */
 	Anope::string GetModes(bool complete, bool plus);
@@ -289,6 +289,11 @@ class CoreExport Channel : public Base, public Extensible
 	 */
 	bool CheckKick(User *user);

+	/** Find which bot should send mode/topic/etc changes for this channel
+	 * @return The bot
+	 */
+	BotInfo *WhoSends() const;
+
 	/** Finds a channel
 	 * @param name The channel to find
 	 * @return The channel, if found
@@ -1,6 +1,6 @@
 /* Declarations for command data.
 *
- * (C) 2003-2019 Anope Team
+ * (C) 2003-2023 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -40,7 +40,7 @@ struct CommandInfo
 	bool prepend_channel;
 };

-/* Where the replies from commands go to. User inheits from this and is the normal
+/* Where the replies from commands go to. User inherits from this and is the normal
 * source of a CommandReply
 */
 struct CoreExport CommandReply
@@ -101,7 +101,7 @@ class CoreExport Command : public Service
 	bool require_user;

 public:
- 	/* Maximum paramaters accepted by this command */
+	/* Maximum parameters accepted by this command */
 	size_t max_params;
 	/* Minimum parameters required to use this command */
 	size_t min_params;
@@ -136,11 +136,11 @@ class CoreExport Command : public Service
 	bool AllowUnregistered() const;
 	bool RequireUser() const;

- 	/** Get the command description
+	/** Get the command description
 	 * @param source The source wanting the command description
 	 * @return The commands description
 	 */
- 	virtual const Anope::string GetDesc(CommandSource &source) const;
+	virtual const Anope::string GetDesc(CommandSource &source) const;

 	/** Execute this command.
 	 * @param source The source
@@ -148,7 +148,7 @@ class CoreExport Command : public Service
 	 */
 	virtual void Execute(CommandSource &source, const std::vector<Anope::string> &params) = 0;

-	/** Called when HELP is requsted for the client this command is on.
+	/** Called when HELP is requested for the client this command is on.
 	 * @param source The source
 	 */
 	virtual void OnServHelp(CommandSource &source);
@@ -178,7 +178,7 @@ class CoreExport Command : public Service
 	 * Note that if the same command exists multiple places this will return the first one encountered
 	 * @param command_service The command service to lookup, eg, nickserv/register
 	 * @param bot If found, is set to the bot the command is on, eg NickServ
-	 * @param name If found, is set to the comand name, eg REGISTER
+	 * @param name If found, is set to the command name, eg REGISTER
 	 * @return true if the given command service exists
 	 */
 	static bool FindCommandFromService(const Anope::string &command_service, BotInfo* &bi, Anope::string &name);
@@ -1,6 +1,6 @@
 /*
 *
- * (C) 2003-2019 Anope Team
+ * (C) 2003-2023 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -20,9 +20,11 @@

 namespace Configuration
 {
+	namespace Internal
+	{
 	class CoreExport Block
 	{
-		friend struct Conf;
+		friend struct Configuration::Conf;

 	 public:
 		typedef Anope::map<Anope::string> item_map;
@@ -34,13 +36,17 @@ namespace Configuration
 		block_map blocks;
 		int linenum;

-	 public:
-	 	Block(const Anope::string &);
-		const Anope::string &GetName() const;
-		int CountBlock(const Anope::string &name);
-		Block* GetBlock(const Anope::string &name, int num = 0);
+		/* Represents a missing tag. */
+		static Block EmptyBlock;

-		template<typename T> inline T Get(const Anope::string &tag)
+	 public:
+		Block(const Anope::string &);
+		const Anope::string &GetName() const;
+		int CountBlock(const Anope::string &name) const;
+		const Block* GetBlock(const Anope::string &name, int num = 0) const;
+		Block* GetMutableBlock(const Anope::string &name, int num = 0);
+
+		template<typename T> inline T Get(const Anope::string &tag) const
 		{
 			return this->Get<T>(tag, "");
 		}
@@ -66,6 +72,10 @@ namespace Configuration
 	template<> CoreExport const Anope::string Block::Get(const Anope::string &tag, const Anope::string& def) const;
 	template<> CoreExport time_t Block::Get(const Anope::string &tag, const Anope::string &def) const;
 	template<> CoreExport bool Block::Get(const Anope::string &tag, const Anope::string &def) const;
+	} // namespace Internal
+
+	typedef const Internal::Block Block;
+	typedef Internal::Block MutableBlock;

 	/** Represents a configuration file
 	 */
@@ -140,7 +150,7 @@ namespace Configuration

 		BotInfo *GetClient(const Anope::string &name);

-		Block *GetCommand(CommandSource &);
+		const Block *GetCommand(CommandSource &);
 	};

 	struct Uplink
@@ -165,7 +175,7 @@ namespace Configuration
 class ConfigException : public CoreException
 {
 public:
-	/** Default constructor, just uses the error mesage 'Config threw an exception'.
+	/** Default constructor, just uses the error message 'Config threw an exception'.
 	 */
 	ConfigException() : CoreException("Config threw an exception", "Config Parser") { }
 	/** This constructor can be used to specify an error message before throwing.
@@ -1,6 +1,6 @@
 /*
 *
- * (C) 2003-2019 Anope Team
+ * (C) 2003-2023 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -1,6 +1,6 @@
 /*
 *
- * (C) 2003-2019 Anope Team
+ * (C) 2003-2023 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -164,7 +164,7 @@ template<typename T>
 class SerializableExtensibleItem : public PrimitiveExtensibleItem<T>
 {
 public:
- 	SerializableExtensibleItem(Module *m, const Anope::string &n) : PrimitiveExtensibleItem<T>(m, n) { }
+	SerializableExtensibleItem(Module *m, const Anope::string &n) : PrimitiveExtensibleItem<T>(m, n) { }

 	void ExtensibleSerialize(const Extensible *e, const Serializable *s, Serialize::Data &data) const anope_override
 	{
@@ -186,7 +186,7 @@ template<>
 class SerializableExtensibleItem<bool> : public PrimitiveExtensibleItem<bool>
 {
 public:
- 	SerializableExtensibleItem(Module *m, const Anope::string &n) : PrimitiveExtensibleItem<bool>(m, n) { }
+	SerializableExtensibleItem(Module *m, const Anope::string &n) : PrimitiveExtensibleItem<bool>(m, n) { }

 	void ExtensibleSerialize(const Extensible *e, const Serializable *s, Serialize::Data &data) const anope_override
 	{
@@ -1,7 +1,7 @@
 /*
 *
 * (C) 2002-2011 InspIRCd Development Team
- * (C) 2009-2019 Anope Team <team@anope.org>
+ * (C) 2009-2023 Anope Team <team@anope.org>
 *
 * Please read COPYING and README for further details.
 */
@@ -26,7 +26,7 @@ namespace Anope
 {
 	class string;

-	/* Casemap in use by Anope. ci::string's comparation functions use this (and thus Anope::string) */
+	/* Casemap in use by Anope. ci::string's comparison functions use this (and thus Anope::string) */
 	extern std::locale casemap;

 	extern void CaseMapRebuild();
@@ -1,6 +1,6 @@
 /*
 *
- * (C) 2008-2019 Anope Team
+ * (C) 2008-2023 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -40,7 +40,7 @@ namespace Language
 	extern CoreExport const char *Translate(const char *string);

 	/** Translates a string to the language of the given user.
-	 * @param u The user to transate the string for
+	 * @param u The user to translate the string for
 	 * @param string A string to translate
 	 * @return The translated string if found, else the original string.
 	 */
@@ -82,7 +82,7 @@ namespace Language
 #define CHAN_X_SUSPENDED		_("Channel %s is currently suspended.")
 #define CHAN_X_NOT_REGISTERED		_("Channel \002%s\002 isn't registered.")
 #define CHAN_X_NOT_IN_USE		_("Channel \002%s\002 doesn't exist.")
-#define NICK_IDENTIFY_REQUIRED		_("Password authentication required for that command.")
+#define NICK_IDENTIFY_REQUIRED		_("You must be logged into an account to use that command.")
 #define MAIL_X_INVALID			_("\002%s\002 is not a valid e-mail address.")
 #define UNKNOWN				_("<unknown>")
 #define NO_EXPIRE			_("does not expire")
@@ -1,6 +1,6 @@
 /*
 *
- * (C) 2003-2019 Anope Team
+ * (C) 2003-2023 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -64,7 +64,7 @@ class CoreExport NumberList
 class CoreExport ListFormatter
 {
 public:
- 	typedef std::map<Anope::string, Anope::string> ListEntry;
+	typedef std::map<Anope::string, Anope::string> ListEntry;
 private:
 	NickCore *nc;
 	std::vector<Anope::string> columns;
@@ -1,6 +1,6 @@
 /*
 *
- * (C) 2003-2019 Anope Team
+ * (C) 2003-2023 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -17,9 +17,9 @@

 enum LogType
 {
-	/* Used whenever an administrator uses an administrative comand */
+	/* Used whenever an administrator uses an administrative command */
 	LOG_ADMIN,
-	/* Used whenever an administrator overides something, such as adding
+	/* Used whenever an administrator overrides something, such as adding
 	 * access to a channel where they don't have permission to.
 	 */
 	LOG_OVERRIDE,
@@ -52,7 +52,7 @@ struct LogFile
 class CoreExport Log
 {
 public:
- 	/* Bot that should log this message */
+	/* Bot that should log this message */
 	BotInfo *bi;
 	/* For commands, the user executing the command, but might not always exist */
 	User *u;
@@ -113,7 +113,7 @@ class CoreExport Log
 class CoreExport LogInfo
 {
 public:
- 	BotInfo *bot;
+	BotInfo *bot;
 	std::vector<Anope::string> targets;
 	std::vector<LogFile *> logfiles;
 	int last_day;
@@ -1,6 +1,6 @@
 /*
 *
- * (C) 2003-2019 Anope Team
+ * (C) 2003-2023 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -26,7 +26,7 @@ namespace Mail
 	class Message : public Thread
 	{
 	 private:
-	 	Anope::string sendmail_path;
+		Anope::string sendmail_path;
 		Anope::string send_from;
 		Anope::string mail_to;
 		Anope::string addr;
@@ -36,7 +36,7 @@ namespace Mail

 		bool success;
 	 public:
-	 	/** Construct this message. Once constructed call Thread::Start to launch the mail sending.
+		/** Construct this message. Once constructed call Thread::Start to launch the mail sending.
 		 * @param sf Config->SendFrom
 		 * @param mailto Name of person being mailed (u->nick, nc->display, etc)
 		 * @param addr Destination address to mail
@@ -1,6 +1,6 @@
 /*
 *
- * (C) 2003-2019 Anope Team
+ * (C) 2003-2023 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -19,9 +19,9 @@ class CoreExport Memo : public Serializable
 {
 public:
 	MemoInfo *mi;
- 	bool unread;
+	bool unread;
 	bool receipt;
- 	Memo();
+	Memo();
 	~Memo();

 	void Serialize(Serialize::Data &data) const anope_override;
@@ -1,6 +1,6 @@
 /*
 *
- * (C) 2003-2019 Anope Team
+ * (C) 2003-2023 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -165,7 +165,7 @@ namespace Message

 	struct CoreExport Whois : IRCDMessage
 	{
- 		Whois(Module *creator, const Anope::string &mname = "WHOIS") : IRCDMessage(creator, mname, 1) { SetFlag(IRCDMESSAGE_SOFT_LIMIT); }
+		Whois(Module *creator, const Anope::string &mname = "WHOIS") : IRCDMessage(creator, mname, 1) { SetFlag(IRCDMESSAGE_SOFT_LIMIT); }

 		void Run(MessageSource &source, const std::vector<Anope::string> &params) anope_override;
 	};
@@ -1,7 +1,7 @@
 /* Mode support
 *
 * (C) 2008-2011 Adam <Adam@anope.org>
- * (C) 2008-2019 Anope Team <team@anope.org>
+ * (C) 2008-2023 Anope Team <team@anope.org>
 *
 * Please read COPYING and README for further details.
 */
@@ -39,8 +39,8 @@ enum ModeClass
 class CoreExport Mode : public Base
 {
 public:
- 	/* Mode name */
- 	Anope::string name;
+	/* Mode name */
+	Anope::string name;
 	/* Class of mode this is (user/channel) */
 	ModeClass mclass;
 	/* Mode char for this, eg 'b' */
@@ -78,7 +78,7 @@ class CoreExport UserMode : public Mode
 class CoreExport UserModeParam : public UserMode
 {
 public:
- 	/** constructor
+	/** constructor
 	 * @param name The mode name
 	 * @param mc The mode char
 	 */
@@ -96,7 +96,7 @@ class CoreExport UserModeParam : public UserMode
 class CoreExport ChannelMode : public Mode
 {
 public:
-	/* channel modes that can posssibly unwrap this mode */
+	/* channel modes that can possibly unwrap this mode */
 	std::vector<ChannelMode *> listeners;

 	/** constructor
@@ -221,7 +221,7 @@ class CoreExport ChannelModeVirtual : public T

 	ChannelMode *Wrap(Anope::string &param) anope_override;

-	ChannelMode *Unwrap(ChannelMode *cm, Anope::string &param) = 0;
+	ChannelMode *Unwrap(ChannelMode *cm, Anope::string &param) anope_override = 0;
 };

 /* The status a user has on a channel (+v, +h, +o) etc */
@@ -229,9 +229,9 @@ class CoreExport ChannelStatus
 {
 	Anope::string modes;
 public:
- 	ChannelStatus();
- 	ChannelStatus(const Anope::string &modes);
- 	void AddMode(char c);
+	ChannelStatus();
+	ChannelStatus(const Anope::string &modes);
+	void AddMode(char c);
 	void DelMode(char c);
 	bool HasMode(char c) const;
 	bool Empty() const;
@@ -399,8 +399,8 @@ class CoreExport Entry
 	Anope::string nick, user, host, real;

 	/** Constructor
- 	 * @param mode What mode this host is for, can be empty for unknown/no mode
-	 * @param host A full or poartial nick!ident@host/cidr#real name mask
+	 * @param mode What mode this host is for, can be empty for unknown/no mode
+	 * @param host A full or partial nick!ident@host/cidr#real name mask
 	 */
 	Entry(const Anope::string &mode, const Anope::string &host);

@@ -1,6 +1,6 @@
 /*
 *
- * (C) 2003-2019 Anope Team
+ * (C) 2003-2023 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -1,6 +1,6 @@
 /* Modular support
 *
- * (C) 2003-2019 Anope Team
+ * (C) 2003-2023 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -507,7 +507,7 @@ class CoreExport Module : public Extensible
 	 */
 	virtual void OnChanExpire(ChannelInfo *ci) { throw NotImplementedException(); }

-	/** Called before Anope connecs to its uplink
+	/** Called before Anope connects to its uplink
 	 */
 	virtual void OnPreServerConnect() { throw NotImplementedException(); }

@@ -555,7 +555,7 @@ class CoreExport Module : public Extensible

 	/** Called before an exception is deleted
 	 * @param source The source deleting it
-	 * @param ex The exceotion
+	 * @param ex The exception
 	 */
 	virtual void OnExceptionDel(CommandSource &source, Exception *ex) { throw NotImplementedException(); }

@@ -776,7 +776,7 @@ class CoreExport Module : public Extensible
 	 */
 	virtual void OnNickSuspend(NickAlias *na) { throw NotImplementedException(); }

-	/** Called when a nick is unsuspneded
+	/** Called when a nick is unsuspended
 	 * @param na The nick alias
 	 */
 	virtual void OnNickUnsuspended(NickAlias *na) { throw NotImplementedException(); }
@@ -939,12 +939,12 @@ class CoreExport Module : public Extensible
 	 */
 	virtual void OnUserModeUnset(const MessageSource &setter, User *u, const Anope::string &mname) { throw NotImplementedException(); }

-	/** Called when a channel mode is introducted into Anope
+	/** Called when a channel mode is introduced into Anope
 	 * @param cm The mode
 	 */
 	virtual void OnChannelModeAdd(ChannelMode *cm) { throw NotImplementedException(); }

-	/** Called when a user mode is introducted into Anope
+	/** Called when a user mode is introduced into Anope
 	 * @param um The mode
 	 */
 	virtual void OnUserModeAdd(UserMode *um) { throw NotImplementedException(); }
@@ -1080,7 +1080,7 @@ class CoreExport Module : public Extensible
 	 */
 	virtual EventReturn OnMessage(MessageSource &source, Anope::string &command, std::vector<Anope::string> &param) { throw NotImplementedException(); }

-	/** Called to determine if a chnanel mode can be set by a user
+	/** Called to determine if a channel mode can be set by a user
 	 * @param u The user
 	 * @param cm The mode
 	 */
@@ -1093,13 +1093,20 @@ class CoreExport Module : public Extensible
 	 */
 	virtual void OnExpireTick() { throw NotImplementedException(); }

-	/** Called when a nick is validated. That is, to determine if a user is permissted
+	/** Called when a nick is validated. That is, to determine if a user is permitted
 	 * to be on the given nick.
 	 * @param u The user
 	 * @param na The nick they are on
 	 * @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
@@ -1125,7 +1132,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
 };

@@ -1138,7 +1145,7 @@ class CoreExport ModuleManager
 	 */
 	static std::vector<Module *> EventHandlers[I_SIZE];

- 	/** List of all modules loaded in Anope
+	/** List of all modules loaded in Anope
 	 */
 	static std::list<Module *> Modules;

@@ -1177,7 +1184,7 @@ class CoreExport ModuleManager
 	/** Checks whether this version of Anope is at least major.minor.patch.build
 	 * Throws a ModuleException if not
 	 * @param major The major version
-	 * @param minor The minor vesion
+	 * @param minor The minor version
 	 * @param patch The patch version
 	 */
 	static void RequireVersion(int major, int minor, int patch);
@@ -1,6 +1,6 @@
 /* BotServ core functions
 *
- * (C) 2003-2019 Anope Team
+ * (C) 2003-2023 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -1,6 +1,6 @@
 /* BotServ core functions
 *
- * (C) 2003-2019 Anope Team
+ * (C) 2003-2023 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -1,6 +1,6 @@
 /*
 *
- * (C) 2003-2019 Anope Team
+ * (C) 2003-2023 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -1,6 +1,6 @@
 /* ChanServ core functions
 *
- * (C) 2003-2019 Anope Team
+ * (C) 2003-2023 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -37,6 +37,6 @@ struct LogSettings : Serialize::Checker<std::vector<LogSetting *> >
 	}

 public:
- 	virtual ~LogSettings() { }
+	virtual ~LogSettings() { }
 	virtual LogSetting *Create() = 0;
 };
@@ -1,6 +1,6 @@
 /* ChanServ core functions
 *
- * (C) 2003-2019 Anope Team
+ * (C) 2003-2023 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -74,7 +74,7 @@ struct ModeLocks

 	/** Get details for a specific mlock
 	 * @param mname The mode name
- 	 * @param An optional param to match with
+	 * @param An optional param to match with
 	 * @return The MLock, if any
 	 */
 	virtual const ModeLock *GetMLock(const Anope::string &mname, const Anope::string &param = "") = 0;
@@ -1,6 +1,6 @@
 /*
 *
- * (C) 2003-2019 Anope Team
+ * (C) 2003-2023 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -139,8 +139,8 @@ namespace DNS
 		/* Use result cache if available */
 		bool use_cache;
 		/* Request id */
-	 	unsigned short id;
-	 	/* Creator of this request */
+		unsigned short id;
+		/* Creator of this request */
 		Module *creator;

 		Request(Manager *mgr, Module *c, const Anope::string &addr, QueryType qt, bool cache = false) : Timer(0), Question(addr, qt), manager(mgr),
@@ -1,6 +1,6 @@
 /*
 *
- * (C) 2003-2019 Anope Team
+ * (C) 2003-2023 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -17,7 +17,7 @@ namespace Encryption
 	class Context
 	{
 	 public:
-	 	virtual ~Context() { }
+		virtual ~Context() { }
 		virtual void Update(const unsigned char *data, size_t len) = 0;
 		virtual void Finalize() = 0;
 		virtual Hash GetFinalizedHash() = 0;
@@ -1,6 +1,6 @@
 /*
 *
- * (C) 2012-2019 Anope Team
+ * (C) 2012-2023 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -80,7 +80,7 @@ struct HTTPReply
 	}
 };

-/* A message from soneone */
+/* A message from someone */
 struct HTTPMessage
 {
 	std::map<Anope::string, Anope::string> headers;
@@ -99,7 +99,7 @@ class HTTPPage : public Base
 	Anope::string content_type;

 public:
- 	HTTPPage(const Anope::string &u, const Anope::string &ct = "text/html") : url(u), content_type(ct) { }
+	HTTPPage(const Anope::string &u, const Anope::string &ct = "text/html") : url(u), content_type(ct) { }

 	const Anope::string &GetURL() const { return this->url; }

@@ -137,7 +137,7 @@ class HTTPClient : public ClientSocket, public BinarySocket, public Base

 class HTTPProvider : public ListenSocket, public Service
 {
- 	Anope::string ip;
+	Anope::string ip;
 	unsigned short port;
 	bool ssl;
 public:
@@ -1,6 +1,6 @@
 /*
 *
- * (C) 2011-2019 Anope Team
+ * (C) 2011-2023 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -1,6 +1,6 @@
 /* NickServ core functions
 *
- * (C) 2003-2019 Anope Team
+ * (C) 2003-2023 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -26,7 +26,7 @@ struct NSCertList

 	/** Get an entry from the nick's cert list by index
 	 *
-	 * @param entry Index in the certificaate list vector to retrieve
+	 * @param entry Index in the certificate list vector to retrieve
 	 * @return The fingerprint entry of the given index if within bounds, an empty string if the vector is empty or the index is out of bounds
 	 *
 	 * Retrieves an entry from the certificate list corresponding to the given index.
@@ -1,6 +1,6 @@
 /*
 *
- * (C) 2011-2019 Anope Team
+ * (C) 2011-2023 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -1,6 +1,6 @@
 /* OperServ ignore interface
 *
- * (C) 2003-2019 Anope Team
+ * (C) 2003-2023 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -1,6 +1,6 @@
 /*
 *
- * (C) 2011-2019 Anope Team
+ * (C) 2011-2023 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -1,6 +1,6 @@
 /*
 *
- * (C) 2011-2019 Anope Team
+ * (C) 2011-2023 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -35,7 +35,7 @@ struct Exception : Serializable
 class SessionService : public Service
 {
 public:
- 	typedef TR1NS::unordered_map<cidr, Session *, cidr::hash> SessionMap;
+	typedef TR1NS::unordered_map<cidr, Session *, cidr::hash> SessionMap;
 	typedef std::vector<Exception *> ExceptionVector;

 	SessionService(Module *m) : Service(m, "SessionService", "session") { }
@@ -1,6 +1,6 @@
 /*
 *
- * (C) 2011-2019 Anope Team
+ * (C) 2011-2023 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -1,6 +1,6 @@
 /*
 *
- * (C) 2011-2019 Anope Team
+ * (C) 2011-2023 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -16,6 +16,9 @@ class GlobalService : public Service
 	{
 	}

+	/** Retrieves the bot which sends global messages unless otherwise specified. */
+	virtual Reference<BotInfo> GetDefaultSender() = 0;
+
 	/** Send out a global message to all users
 	 * @param sender Our client which should send the global
 	 * @param source The sender of the global
@@ -1,6 +1,6 @@
 /*
 *
- * (C) 2011-2019 Anope Team
+ * (C) 2011-2023 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -25,7 +25,7 @@ class MemoServService : public Service
 	}

 	/** Sends a memo.
-	 * @param source The source of the memo, can be anythin.
+	 * @param source The source of the memo, can be anything.
 	 * @param target The target of the memo, nick or channel.
 	 * @param message Memo text
 	 * @param force true to force the memo, restrictions/delays etc are not checked
@@ -1,6 +1,6 @@
 /*
 *
- * (C) 2011-2019 Anope Team
+ * (C) 2011-2023 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -1,6 +1,6 @@
 /*
 *
- * (C) 2003-2019 Anope Team
+ * (C) 2003-2023 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -1,6 +1,6 @@
 /*
 *
- * (C) 2014-2019 Anope Team
+ * (C) 2014-2023 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -1,6 +1,6 @@
 /*
 *
- * (C) 2003-2019 Anope Team
+ * (C) 2003-2023 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -1,6 +1,6 @@
 /*
 *
- * (C) 2003-2019 Anope Team
+ * (C) 2003-2023 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -12,7 +12,7 @@ namespace SQL
 	class Data : public Serialize::Data
 	{
 	 public:
- 		typedef std::map<Anope::string, std::stringstream *> Map;
+		typedef std::map<Anope::string, std::stringstream *> Map;
 		Map data;
 		std::map<Anope::string, Type> types;

@@ -142,14 +142,14 @@ namespace SQL
 		Anope::string error;
 	 public:
 		unsigned int id;
- 		Anope::string finished_query;
+		Anope::string finished_query;

 		Result() : id(0) { }
 		Result(unsigned int i, const Query &q, const Anope::string &fq, const Anope::string &err = "") : query(q), error(err), id(i), finished_query(fq) { }

 		inline operator bool() const { return this->error.empty(); }

-		inline const unsigned int GetID() const { return this->id; }
+		inline unsigned int GetID() const { return this->id; }
 		inline const Query &GetQuery() const { return this->query; }
 		inline const Anope::string &GetError() const { return this->error; }

@@ -1,6 +1,6 @@
 /*
 *
- * (C) 2010-2019 Anope Team
+ * (C) 2010-2023 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -1,6 +1,6 @@
 /*
 *
- * (C) 2003-2019 Anope Team
+ * (C) 2003-2023 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -1,6 +1,6 @@
 /*
 *
- * (C) 2010-2019 Anope Team
+ * (C) 2010-2023 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -28,7 +28,7 @@ class XMLRPCServiceInterface;
 class XMLRPCEvent
 {
 public:
- 	virtual ~XMLRPCEvent() { }
+	virtual ~XMLRPCEvent() { }
 	virtual bool Run(XMLRPCServiceInterface *iface, HTTPClient *client, XMLRPCRequest &request) = 0;
 };

@@ -1,7 +1,7 @@
 /*
 *
 * (C) 2008-2011 Robin Burchell <w00t@inspircd.org>
- * (C) 2008-2019 Anope Team <team@anope.org>
+ * (C) 2008-2023 Anope Team <team@anope.org>
 *
 * Please read COPYING and README for further details.
 */
@@ -67,7 +67,7 @@ class CoreExport OperType
 	 */
 	std::set<OperType *> inheritances;
 public:
- 	/** Modes to set when someone identifys using this opertype
+	/** Modes to set when someone identifies using this opertype
 	 */
 	Anope::string modes;

@@ -1,6 +1,6 @@
 /*
 *
- * (C) 2003-2019 Anope Team
+ * (C) 2003-2023 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -15,14 +15,15 @@
 #include "services.h"
 #include "anope.h"
 #include "service.h"
+#include "modes.h"

-/* Encapsultes the IRCd protocol we are speaking. */
+/* Encapsulates the IRCd protocol we are speaking. */
 class CoreExport IRCDProto : public Service
 {
 	Anope::string proto_name;

 protected:
- 	IRCDProto(Module *creator, const Anope::string &proto_name);
+	IRCDProto(Module *creator, const Anope::string &proto_name);
 public:
 	virtual ~IRCDProto();

@@ -54,7 +55,7 @@ class CoreExport IRCDProto : public Service
 	bool CanSNLine;
 	/* Can we ban specific nicknames from being used? */
 	bool CanSQLine;
-	/* Can we ban sepcific channel names from being used? */
+	/* Can we ban specific channel names from being used? */
 	bool CanSQLineChannel;
 	/* Can we ban by IP? */
 	bool CanSZLine;
@@ -241,6 +242,7 @@ class CoreExport IRCDProto : public Service
 	 * Defaults to Config->ListSize
 	 */
 	virtual unsigned GetMaxListFor(Channel *c);
+	virtual unsigned GetMaxListFor(Channel *c, ChannelMode *cm);

 	virtual Anope::string NormalizeMask(const Anope::string &mask);
 };
@@ -1,6 +1,6 @@
 /*
 *
- * (C) 2008-2019 Anope Team
+ * (C) 2008-2023 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -36,7 +36,7 @@ class CoreExport AutoKick : public Serializable
 	time_t addtime;
 	time_t last_used;

- 	AutoKick();
+	AutoKick();
 	~AutoKick();
 	void Serialize(Serialize::Data &data) const anope_override;
 	static Serializable* Unserialize(Serializable *obj, Serialize::Data &);
@@ -56,7 +56,7 @@ class CoreExport ChannelInfo : public Serializable, public Extensible
 	Anope::map<int16_t> levels;

 public:
- 	friend class ChanAccess;
+	friend class ChanAccess;
 	friend class AutoKick;

 	Anope::string name;                       /* Channel name */
@@ -82,7 +82,7 @@ class CoreExport ChannelInfo : public Serializable, public Extensible

 	time_t banexpire;                       /* Time bans expire in */

- 	/** Constructor
+	/** Constructor
 	 * @param chname The channel name
 	 */
 	ChannelInfo(const Anope::string &chname);
@@ -97,7 +97,7 @@ class CoreExport ChannelInfo : public Serializable, public Extensible
 	void Serialize(Serialize::Data &data) const anope_override;
 	static Serializable* Unserialize(Serializable *obj, Serialize::Data &);

-	/** Change the founder of the channek
+	/** Change the founder of the channel
 	 * @params nc The new founder
 	 */
 	void SetFounder(NickCore *nc);
@@ -135,7 +135,7 @@ class CoreExport ChannelInfo : public Serializable, public Extensible
 	AccessGroup AccessFor(const User *u, bool updateLastUsed = true);
 	AccessGroup AccessFor(const NickCore *nc, bool updateLastUsed = true);

-	/** Get the size of the accss vector for this channel
+	/** Get the size of the access vector for this channel
 	 * @return The access vector size
 	 */
 	unsigned GetAccessCount() const;
@@ -1,6 +1,6 @@
 /*
 *
- * (C) 2003-2019 Anope Team
+ * (C) 2003-2023 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -30,7 +30,7 @@ class CoreExport Regex
 protected:
 	Regex(const Anope::string &expr) : expression(expr) { }
 public:
- 	virtual ~Regex() { }
+	virtual ~Regex() { }
 	const Anope::string &GetExpression() { return expression; }
 	virtual bool Matches(const Anope::string &str) = 0;
 };
@@ -1,6 +1,6 @@
 /*
 *
- * (C) 2003-2019 Anope Team
+ * (C) 2003-2023 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -22,7 +22,7 @@ namespace Serialize
 	class Data
 	{
 	 public:
- 		enum Type
+		enum Type
 		{
 			DT_TEXT,
 			DT_INT
@@ -46,7 +46,7 @@ namespace Serialize
 	template<typename T> class Reference;
 }

-/** A serialziable object. Serializable objects can be serialized into
+/** A serializable object. Serializable objects can be serialized into
 * abstract data types (Serialize::Data), and then reconstructed or
 * updated later at any time.
 */
@@ -62,7 +62,7 @@ class CoreExport Serializable : public virtual Base
 	friend class Serialize::Type;
 	/* The type of item this object is */
 	Serialize::Type *s_type;
- 	/* Iterator into serializable_items */
+	/* Iterator into serializable_items */
 	std::list<Serializable *>::iterator s_iter;
 	/* The hash of the last serialized form of this object committed to the database */
 	size_t last_commit;
@@ -70,7 +70,7 @@ class CoreExport Serializable : public virtual Base
 	time_t last_commit_time;

 protected:
- 	Serializable(const Anope::string &serialize_type);
+	Serializable(const Anope::string &serialize_type);
 	Serializable(const Serializable &);

 	Serializable &operator=(const Serializable &);
@@ -78,7 +78,7 @@ class CoreExport Serializable : public virtual Base
 public:
 	virtual ~Serializable();

- 	/* Unique ID (per type, not globally) for this object */
+	/* Unique ID (per type, not globally) for this object */
 	uint64_t id;

 	/* Only used by redis, to ignore updates */
@@ -105,7 +105,7 @@ class CoreExport Serializable : public virtual Base
 };

 /* A serializable type. There should be one of these classes for each type
- * of class that inherits from Serialiable. Used for unserializing objects
+ * of class that inherits from Serializable. Used for unserializing objects
 * of this type, as it requires a function pointer to a static member function.
 */
 class CoreExport Serialize::Type : public Base
@@ -123,14 +123,14 @@ class CoreExport Serialize::Type : public Base
 	 */
 	Module *owner;

-	/* The timesatmp for this type. All objects of this type are as up to date as
+	/* The timestamp for this type. All objects of this type are as up to date as
 	 * this timestamp. if curtime == timestamp then we have the most up to date
 	 * version of every object of this type.
 	 */
 	time_t timestamp;

 public:
- 	/* Map of Serializable::id to Serializable objects */
+	/* Map of Serializable::id to Serializable objects */
 	std::map<uint64_t, Serializable *> objects;

 	/** Creates a new serializable type
@@ -247,7 +247,7 @@ class Serialize::Reference : public ReferenceBase
 	T *ref;

 public:
- 	Reference() : ref(NULL)
+	Reference() : ref(NULL)
 	{
 	}

@@ -1,6 +1,6 @@
 /*
 *
- * (C) 2003-2019 Anope Team
+ * (C) 2003-2023 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -79,8 +79,8 @@ class CoreExport Server : public Extensible
 	~Server();

 public:
- 	/* Number of users on the server */
- 	unsigned users;
+	/* Number of users on the server */
+	unsigned users;

 	/** Delete this server with a reason
 	 * @param reason The reason
@@ -170,7 +170,7 @@ class CoreExport Server : public Extensible
 	 */
 	bool IsQuitting() const;

-	/** Send a message to alll users on this server
+	/** Send a message to all users on this server
 	 * @param source The source of the message
 	 * @param message The message
 	 */
@@ -1,6 +1,6 @@
 /*
 *
- * (C) 2003-2019 Anope Team
+ * (C) 2003-2023 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -43,7 +43,7 @@ class CoreExport Service : public virtual Base
 	}

 public:
- 	static Service *FindService(const Anope::string &t, const Anope::string &n)
+	static Service *FindService(const Anope::string &t, const Anope::string &n)
 	{
 		std::map<Anope::string, std::map<Anope::string, Service *> >::const_iterator it = Services.find(t);
 		if (it == Services.end())
@@ -122,7 +122,7 @@ class ServiceReference : public Reference<T>
 	Anope::string name;

 public:
- 	ServiceReference() { }
+	ServiceReference() { }

 	ServiceReference(const Anope::string &t, const Anope::string &n) : type(t), name(n)
 	{
@@ -1,6 +1,6 @@
 /*
 *
- * (C) 2003-2019 Anope Team
+ * (C) 2003-2023 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -48,7 +48,7 @@

 #define _(x) x

-#ifdef __GXX_EXPERIMENTAL_CXX0X__
+#if defined __GXX_EXPERIMENTAL_CXX0X__ || __cplusplus >= 201103L
 # define anope_override override
 # define anope_final final
 #else
@@ -1,6 +1,6 @@
 /*
 *
- * (C) 2003-2019 Anope Team
+ * (C) 2003-2023 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -1,6 +1,6 @@
 /*
 *
- * (C) 2003-2019 Anope Team
+ * (C) 2003-2023 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -98,7 +98,7 @@ class CoreExport cidr
 	Anope::string cidr_ip;
 	unsigned short cidr_len;
 public:
- 	cidr(const Anope::string &ip);
+	cidr(const Anope::string &ip);
 	cidr(const Anope::string &ip, unsigned char len);
 	cidr(const sockaddrs &ip, unsigned char len);
 	Anope::string mask() const;
@@ -147,7 +147,7 @@ class CoreExport SocketIO
 	virtual ~SocketIO() { }

 	/** Receive something from the buffer
- 	 * @param s The socket
+	 * @param s The socket
 	 * @param buf The buf to read to
 	 * @param sz How much to read
 	 * @return Number of bytes received
@@ -208,13 +208,13 @@ class CoreExport Socket
 	bool ipv6;

 public:
- 	std::bitset<SF_SIZE> flags;
+	std::bitset<SF_SIZE> flags;

 	/* Sockaddrs for bind() (if it's bound) */
 	sockaddrs bindaddr;

 	/* I/O functions used for this socket */
- 	SocketIO *io;
+	SocketIO *io;

 	/** Empty constructor, should not be called.
 	 */
@@ -225,7 +225,7 @@ class CoreExport Socket
 	 * @param ipv6 true if using ipv6
 	 * @param type The socket type, defaults to SOCK_STREAM
 	 */
- 	Socket(int sock, bool ipv6 = false, int type = SOCK_STREAM);
+	Socket(int sock, bool ipv6 = false, int type = SOCK_STREAM);

 	/** Destructor, closes the socket and removes it from the engine
 	 */
@@ -277,8 +277,8 @@ class CoreExport Socket
 class CoreExport BufferedSocket : public virtual Socket
 {
 protected:
- 	/* Things read from the socket */
- 	Anope::string read_buffer;
+	/* Things read from the socket */
+	Anope::string read_buffer;
 	/* Things to be written to the socket */
 	Anope::string write_buffer;
 	/* How much data was received from this socket on this recv() */
@@ -385,8 +385,8 @@ class CoreExport ListenSocket : public virtual Socket
 	bool ProcessRead();

 	/** Called when a connection is accepted
- 	 * @param fd The FD for the new connection
- 	 * @param addr The sockaddr for where the connection came from
+	 * @param fd The FD for the new connection
+	 * @param addr The sockaddr for where the connection came from
 	 * @return The new socket
 	 */
 	virtual ClientSocket *OnAccept(int fd, const sockaddrs &addr) = 0;
@@ -462,10 +462,10 @@ class CoreExport ClientSocket : public virtual Socket
 class CoreExport Pipe : public Socket
 {
 public:
- 	/** The FD of the write pipe
+	/** The FD of the write pipe
 	 * this->sock is the readfd
 	 */
- 	int write_pipe;
+	int write_pipe;

 	Pipe();
 	~Pipe();
@@ -1,6 +1,6 @@
 /*
 *
- * (C) 2003-2019 Anope Team
+ * (C) 2003-2023 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -1,6 +1,6 @@
 /* Timer include stuff.
 *
- * (C) 2003-2019 Anope Team
+ * (C) 2003-2023 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -17,7 +17,7 @@
 class CoreExport Timer
 {
 private:
- 	/** The owner of the timer, if any
+	/** The owner of the timer, if any
 	 */
 	Module *owner;

@@ -1,6 +1,6 @@
 /*
 *
- * (C) 2003-2019 Anope Team
+ * (C) 2003-2023 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -38,9 +38,9 @@ class UplinkSocket : public ConnectionSocket, public BufferedSocket
 		std::stringstream buffer;

 	 public:
-	 	Message();
-	 	Message(const MessageSource &);
-	 	~Message();
+		Message();
+		Message(const MessageSource &);
+		~Message();
 		template<typename T> Message &operator<<(const T &val)
 		{
 			this->buffer << val;
@@ -1,7 +1,7 @@
 /*
 *
 * (C) 2008-2011 Robin Burchell <w00t@inspircd.org>
- * (C) 2003-2019 Anope Team <team@anope.org>
+ * (C) 2003-2023 Anope Team <team@anope.org>
 *
 * Please read COPYING and README for further details.
 *
@@ -46,7 +46,7 @@ class CoreExport User : public virtual Base, public Extensible, public CommandRe
 	bool on_access;
 	/* Map of user modes and the params this user has (if any) */
 	ModeList modes;
-	/* NickCore account the user is currently loggged in as, if they are logged in */
+	/* NickCore account the user is currently logged in as, if they are logged in */
 	Serialize::Reference<NickCore> nc;

 	/* # of invalid password attempts */
@@ -56,7 +56,7 @@ class CoreExport User : public virtual Base, public Extensible, public CommandRe


 public: // XXX: exposing a tiny bit too much
- 	/* User's current nick */
+	/* User's current nick */
 	Anope::string nick;

 	/* User's real hostname */
@@ -161,13 +161,13 @@ class CoreExport User : public virtual Base, public Extensible, public CommandRe

 	/** Update the real ident (username) of a user record.
 	 * @param ident The new ident to give this user.
-	 * NOTE: Where possible, you should use the Get/SetVIdent() equivilants.
+	 * NOTE: Where possible, you should use the Get/SetVIdent() equivalents.
 	 */
 	void SetIdent(const Anope::string &ident);

 	/** Get the real ident (username) of this user.
 	 * @return The displayed ident of this user.
-	 * NOTE: Where possible, you should use the Get/SetVIdent() equivilants.
+	 * NOTE: Where possible, you should use the Get/SetVIdent() equivalents.
 	 */
 	const Anope::string &GetIdent() const;

@@ -1,6 +1,6 @@
 /* Build bumper
 *
- * (C) 2003-2019 Anope Team
+ * (C) 2003-2023 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -1,6 +1,6 @@
 /*
 *
- * (C) 2008-2019 Anope Team
+ * (C) 2008-2023 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -1,16 +1,48 @@
-#!/bin/bash
+#!/bin/sh

-rm -f anope.pot
-touch anope.pot
+if [ "${PWD##*/}" != "language" ]
+then
+	echo "Please run this script in the language/ subfolder of an anope source tree."
+	exit 1
+fi

-cd ..
-FILES=`find ./ -name *.cpp -o -name *.h -o -name *.conf | grep -v /modules/third/`
-xgettext -E -C -s -d Anope -j -o language/anope.pot --from-code=utf-8 --keyword --keyword=_ $FILES
-cd -
+# truncate
+: > anope.pot
+
+# find .cpp, .h, and .conf files
+# exclude docs and third party modules
+# run xgettext on found files
+find ../ \
+	! -path '../docs/*' \
+	-a ! -path '../modules/third/*' \
+	-a \( -name '*.cpp' \
+		-o -name '*.h' \
+		-o -name '*.conf' \
+	\) \
+	-exec \
+		xgettext \
+			--escape \
+			--language=C++ \
+			--sort-output \
+			--default-domain=Anope \
+			--join-existing \
+			--output=anope.pot \
+			--from-code=utf-8 \
+			--keyword \
+			--keyword=_ \
+			{} +

 for f in *.po
 do
-	msgmerge -v -s -U $f `echo $f | cut -d'.' -f1`.pot
+	echo "Merging $f"
+	msgmerge \
+		--no-location \
+		--no-wrap \
+		--sort-output \
+		--update \
+		--verbose \
+		"${f}" \
+		"${f%%.*}.pot"
 done

-rm -f *~
+rm -f -- *~
@@ -117,7 +117,7 @@ macro(build_subdir)

      # Append this source file's linker flags to the subdirectoy's linker flags, if there are any to append
      if(TEMP_DEPENDENCIES)
-        append_to_list(SUBDIR_EXTRA_DEPENDS ${TEMP_DEPDENCIES})
+        append_to_list(SUBDIR_EXTRA_DEPENDS ${TEMP_DEPENDENCIES})
      endif(TEMP_DEPENDENCIES)
    endif(HAS_FUNCTION)
  endforeach(SRC ${MODULES_SUBDIR_SRCS})
--- a/Show More
+++ b/Show More