Release 2.1.14.

Update the change logs.
Deduplicate code in cs_access.
2026-06-15 22:14:46 +02:00 · 2025-05-02 09:52:40 +01:00 · 2025-05-02 09:52:40 +01:00 · 2025-04-27 20:58:35 +01:00 · 2025-04-27 14:16:10 +01:00 · 2025-04-27 13:01:29 +01:00
402 changed files with 34787 additions and 13631 deletions
@@ -0,0 +1,44 @@
+---
+name: Bug report
+description: Report a non-security bug in Anope.
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to fill out this bug report! Please make sure to answer the questions properly and don't just enter the same text into every field as this will make it harder for us to fix your bug.
+
+        If you're looking for help with setting up your services please post on [our support forum](https://github.com/orgs/anope/discussions/categories/support) instead.
+
+        If you're reporting a crash or other security issue [please read our security policy](https://github.com/anope/anope/security/policy#reporting-a-vulnerability) for how to report security issues privately.
+
+  - type: textarea
+    attributes:
+      label: Description
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Steps to reproduce the issue
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Describe the results you received
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Describe the results you expected
+    validations:
+      required: true
+
+  - type: input
+    attributes:
+      label: Anope version
+      description: |-
+        Either the output of `services --version` (2.0) or `anope --version` (2.1).
+    validations:
+      required: true
@@ -1,33 +0,0 @@
---
-name: Bug report
-about: Report a non-security issue with Anope.
---
-
-<!--
-Please fill in the template below. It will help us process your bug report a lot faster. If you have multiple bugs to report then please open one issue for each bug.
-->
-
-**Description**
-
-
-
-**Steps to reproduce the issue:**
-
-1.
-2.
-3.
-
-**Describe the results you received:**
-
-
-
-**Describe the results you expected:**
-
-
-
-**Additional information you deem important (e.g. issue happens only occasionally):**
-
-
-
-**Output of `services --version`:**
-
@@ -0,0 +1,20 @@
+---
+name: Feature request
+description: Request that a new feature is added to Anope.
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to fill out this feature request!
+
+  - type: textarea
+    attributes:
+      label: Description
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Why this would be useful?
+    validations:
+      required: true
@@ -1,15 +0,0 @@
---
-name: Feature request
-about: Request that a new feature is added to Anope.
---
-
-<!--
-Please fill in the template below. It will help us process your feature request a lot faster. If you have multiple features to request then please open one issue for each feature.
-->
-
-**Description**
-
-
-
-**Why this would be useful**
-
@@ -1 +1,5 @@
 blank_issues_enabled: false
+contact_links:
+  - name: Support forum
+    url: https://github.com/orgs/anope/discussions/categories/support
+    about: Please ask support questions here.
@@ -24,3 +24,16 @@ I have tested this pull request on:

 **Operating system name and version:** <!-- e.g. Linux 3.11 -->
 **Compiler name and version:** <!-- e.g. GCC 4.2.0 -->
+
+## Checks
+
+<!--
+Tick the boxes for the checks you have made.
+-->
+
+I have ensured that:
+
+- [ ] The code I am submitting is my own work and/or I have permission from the author to share it.
+- [ ] Generative AI (Copilot, ChatGPT, etc) was not used to create any part of this pull request.
+- [ ] I have documented any features added by this pull request.
+- [ ] This pull request does not introduce any incompatible API changes (stable branches only, delete if not applicable).
@@ -14,6 +14,6 @@ Version | Supported

 ## Reporting a Vulnerability

-Please do not report security vulnerabilities on GitHub. Instead, email the details to team@anope.org or get the attention of a developer in our development IRC channel at irc.anope.org #anope-devel and PM them the details.
+Please do not report security vulnerabilities on GitHub. Instead, email the details to team@anope.org or get the attention of a developer in our development IRC channel at irc.teranova.net #anope-devel and PM them the details.

 We will triage your issue as soon as possible and try to release a fixed version within a week of receiving your report.
@@ -5,7 +5,7 @@ on:
 jobs:
  build:
    if: "!contains(github.event.head_commit.message, '[skip ubuntu ci]')"
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
    env:
      CXX: ${{ matrix.compiler }}
      CXXFLAGS: -Werror
@@ -10,10 +10,18 @@ on:
 jobs:
  build:
    if: "!contains(github.event.head_commit.message, '[skip windows ci]')"
-    runs-on: windows-2019
+    runs-on: windows-2025
+    env:
+      BUILD_TYPE: ${{ github.event_name == 'release' && 'Release' || 'Debug' }}
+      CONAN_USER_HOME: ${{ github.workspace }}/win/build
+      CONAN_USER_HOME_SHORT: None
    steps:
      - uses: actions/checkout@v4

+      - name: Setup NSIS
+        run: |-
+          choco install nsis
+
      - name: Setup MSBuild
        uses: microsoft/setup-msbuild@v2

@@ -22,20 +30,34 @@ jobs:
        with:
          version: 1.64.0

+      - name: Try to restore libraries from the cache
+        uses: actions/cache/restore@v4
+        id: library-cache
+        with:
+          key: conan-${{ hashFiles('src/win32/conanfile.txt') }}
+          path: ${{ env.CONAN_USER_HOME }}/.conan
+
      - name: Install libraries
        run: |
          conan install ${{ github.workspace }}\src\win32 --build=missing

+      - name: Save libraries to the cache
+        if: ${{ steps.library-cache.outputs.cache-hit != 'true' }}
+        uses: actions/cache/save@v4
+        with:
+          key:  ${{ steps.library-cache.outputs.cache-primary-key }}
+          path: ${{ env.CONAN_USER_HOME }}/.conan
+
      - name: Run CMake
        run: |
          mkdir ${{ github.workspace }}\build
          cd ${{ github.workspace }}\build
-          cmake -A "x64" -D "CMAKE_BUILD_TYPE=${{ github.event_name == 'release' && 'Release' || 'Debug' }}" -G "Visual Studio 16 2019" ..
+          cmake -A x64 -D "CMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }}" -G "Visual Studio 17 2022" ..

      - name: Build Anope
        working-directory: ${{ github.workspace }}\build
        run: |
-          msbuild PACKAGE.vcxproj /M:3 /P:Configuration=${{ github.event_name == 'release' && 'Release' || 'Debug' }} /P:Platform=x64 /VERBOSITY:MINIMAL
+          msbuild PACKAGE.vcxproj /M:5 /P:Configuration=${{ env.BUILD_TYPE }} /P:Platform=x64 /VERBOSITY:MINIMAL

      - name: Upload installer
        if: "${{ github.event_name == 'release' }}"
@@ -12,5 +12,7 @@ modules/sqlite.cpp
 modules/ssl_gnutls.cpp
 modules/ssl_openssl.cpp
 modules/stats
+modules/xmlrpc.cpp
 run/
 *.mo
+*.pot
@@ -12,39 +12,49 @@ 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>
+David Robson <rob@anope.org> <robbeh@5417fbe8-f217-4b02-8779-1006273d7864>
 Dennis Friis <peavey@inspircd.org> <peavey peavey@inspircd.org@5417fbe8-f217-4b02-8779-1006273d7864>
+Dragone2 <dragone2@risposteinformatiche.it> <davide.paolini8@gmail.com>
 Fabio Scotoni <cculex@gmail.com>
+Filippo Cortigiani <simos@simosnap.org> <devel@devel.crtnet.it>
+Filippo Cortigiani <simos@simosnap.org> <simos@H7-25.fritz.box>
 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>
+Hendrik Jäger <gitcommit@henk.geekmail.org> <github@henk.geekmail.org>
 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>
 Jens Voss <dukepyrolator@anope.org> <anope@s15355730.onlinehome-server.info>
 Jens Voss <dukepyrolator@anope.org> <DukePyrolator@5417fbe8-f217-4b02-8779-1006273d7864>
 Jens Voss <dukepyrolator@anope.org> <DukePyrolator@anope.org>
-Jens Voss <dukepyrolator@anope.org> Jens Voß <jens@pyrobook.(none)>
+Jens Voss <dukepyrolator@anope.org> <jens@pyrobook.(none)>
+k4be <k4be@pirc.pl> <34816207+k4bek4be@users.noreply.github.com>
 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 Stapelberg <michael@robustirc.net> <stapelberg@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>
+PeGaSuS <droider.pc@gmail.com>
+PeGaSuS <droider.pc@gmail.com> <25697531+TehPeGaSuS@users.noreply.github.com>
 Pieter Bootsma <geniusdex@anope.org> <geniusdex geniusdex@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864>
 Robby <robby@chatbelgie.be> <robby@anope.org>
 Robby <robby@chatbelgie.be> <robby@chat.be>
+Robert Scheck <robert@fedoraproject.org> <robert-scheck@users.noreply.github.com>
 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>
+Sadie Powell <sadie@witchery.services> <petpow@saberuk.com>
 Sebastian Barfurth <github@afreshmelon.com>
 Sebastian V. <hal9000@denorastats.org>
 Sebastian V. <hal9000@denorastats.org> <pimpmylinux@5417fbe8-f217-4b02-8779-1006273d7864>
 Trystan S. Lee <trystan@nomadirc.net> <trystan trystan@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864>
+Val Lorentz <progval+git@progval.net> <progval+git@progval.net>
@@ -1,5 +1,5 @@
-# This usage of CMake requires at least version 3.8
-cmake_minimum_required(VERSION 3.8 FATAL_ERROR)
+# This usage of CMake requires at least version 3.20
+cmake_minimum_required(VERSION 3.20 FATAL_ERROR)

 # Set the project as C++ primarily, but have C enabled for the checks required later
 project(Anope CXX)
@@ -31,12 +31,8 @@ if(CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang$")
  execute_process(COMMAND ${CMAKE_C_COMPILER} -print-search-dirs OUTPUT_VARIABLE LINES OUTPUT_STRIP_TRAILING_WHITESPACE)
  # Find only the part after "libraries: "
  string(REGEX REPLACE ".*\nlibraries: (.*)$" "\\1" LINE "${LINES}")
-  # Replace the colons in the list with semicolons (only when not on MinGW, which uses semicolons already), and if on MinGW, just copy the line
-  if(NOT MINGW)
-    string(REGEX REPLACE ":" ";" LIBRARIES ${LINE})
-  else()
-    set(LIBRARIES "${LINE}")
-  endif()
+  # Replace the colons in the list with semicolons
+  string(REGEX REPLACE ":" ";" LIBRARIES ${LINE})
  # Iterate through the libraries
  foreach(LIBRARY ${LIBRARIES})
    # Check if the first character is an equal sign, and skip that library directory as it is (I believe) the primary default and shows up later in the list anyways
@@ -106,13 +102,6 @@ if(NOT MSVC)
  endif()
 endif()

-# If running under MinGW, we have to force the resource compiler settings (hopefully this will be fixed in a later version of CMake)
-if(MINGW)
-  set(CMAKE_RC_COMPILER_INIT windres)
-  enable_language(RC)
-  set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> <FLAGS> <DEFINES> -o <OBJECT> <SOURCE>")
-endif()
-
 # Include the checking functions used later in this CMakeLists.txt
 include(CheckFunctionExists)
 include(CheckTypeSize)
@@ -153,11 +142,6 @@ include_directories(
  ${Anope_SOURCE_DIR}/vendor
 )

-# Pass on REPRODUCIBLE_BUILD
-if(REPRODUCIBLE_BUILD)
-  add_definitions(-DREPRODUCIBLE_BUILD)
-endif()
-
 if(WIN32)
  # If using Windows, include the windows specific folder for anope_windows.h
  include_directories(${Anope_SOURCE_DIR}/src/win32)
@@ -189,11 +173,6 @@ if(CMAKE_THREAD_LIBS_INIT)
  list(APPEND LINK_LIBS ${CMAKE_THREAD_LIBS_INIT})
 endif()

-# Under MinGW, the -shared flag isn't properly set in the module-specific linker flags, add it from the C flags for shared libraries
-if(MINGW)
-  set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ${CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS}")
-endif()
-
 if(NOT PROGRAM_NAME)
  set(PROGRAM_NAME anope)
 endif()
@@ -337,14 +316,6 @@ if(${Anope_SOURCE_DIR} STREQUAL ${Anope_BINARY_DIR})
  endif()
 endif()

-# Go into the following directories and run their CMakeLists.txt as well
-add_subdirectory(data)
-add_subdirectory(docs)
-add_subdirectory(language)
-add_subdirectory(src)
-add_subdirectory(modules)
-add_subdirectory(include)
-
 # Get the filename of the Anope binary, to use later
 set(SERVICES_BINARY "$<TARGET_FILE:${PROGRAM_NAME}>")
 get_filename_component(SERVICES_BINARY ${SERVICES_BINARY} NAME)
@@ -417,3 +388,11 @@ if(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake")
  set(CPACK_MONOLITHIC_INSTALL TRUE)
  include(CPack)
 endif()
+
+# Go into the following directories and run their CMakeLists.txt as well
+add_subdirectory(data)
+add_subdirectory(docs)
+add_subdirectory(language)
+add_subdirectory(src)
+add_subdirectory(modules)
+add_subdirectory(include)
@@ -2,7 +2,7 @@
 #
 # Configuration script for Anope.
 #
-# Anope (C) 2003-2024 Anope Team
+# Anope (C) 2003-2025 Anope Team
 # Contact us at team@anope.org
 #
 # This program is free but copyrighted software; see the file COPYING for
@@ -13,10 +13,6 @@
 #
 ###########################################################################

-echo2 () {
-	$ECHO2 "$*$ECHO2SUF" # these are defined later
-}
-
 exists () { # because some shells don't have test -e
 	if [ -f $1 -o -d $1 -o -p $1 -o -c $1 -o -b $1 ] ; then
 		return 0
@@ -42,7 +38,6 @@ Run_Build_System () {
 	WITH_PERM=""
 	EXTRA_INCLUDE=""
 	EXTRA_LIBS=""
-	GEN_TYPE=""

 	if [ "$INSTDIR" != "" ] ; then
 		WITH_INST="-DINSTDIR:STRING=$INSTDIR"
@@ -70,45 +65,25 @@ Run_Build_System () {
 		EXTRA_LIBS="-DEXTRA_LIBS:STRING=$EXTRA_LIB_DIRS"
 	fi

-	if [ "$SOURCE_DIR" = "." ] ; then
-		pwdsave=`pwd`
-		test -d build || mkdir build
-		cd "build"
-		REAL_SOURCE_DIR=".."
-	else
-		REAL_SOURCE_DIR="$SOURCE_DIR"
-	fi
+	BUILD_PATHS="-B ${SOURCE_DIR}/build ${SOURCE_DIR}"

-	echo "cmake $GEN_TYPE $WITH_INST $WITH_RUN $WITH_PERM $BUILD_TYPE $EXTRA_INCLUDE $EXTRA_LIBS $EXTRA_CONFIG_ARGS $REAL_SOURCE_DIR"
+	CMAKE="cmake $GEN_TYPE $WITH_INST $WITH_RUN $WITH_PERM $BUILD_TYPE $EXTRA_INCLUDE $EXTRA_LIBS $EXTRA_CONFIG_ARGS $BUILD_PATHS"
+	echo $CMAKE
+	$CMAKE

-	cmake $GEN_TYPE $WITH_INST $WITH_RUN $WITH_PERM $BUILD_TYPE $EXTRA_INCLUDE $EXTRA_LIBS $EXTRA_CONFIG_ARGS $REAL_SOURCE_DIR
 	if [ $? -ne 0 ]; then
 		echo "You should fix these issues and then run ./Config -quick to rerun CMake."
 		exit 1
 	fi

 	echo ""
-	if [ "$SOURCE_DIR" = "." ] ; then
-		echo "Now cd build, then run make to build Anope."
-		cd "$pwdsave"
-	else
+	if [ "$PWD" = "${SOURCE_DIR}/build" ]; then
 		echo "Now run make to build Anope."
+	else
+		echo "Now cd build, then run make to build Anope."
 	fi
 }

-ECHO2SUF=''
-if [ "`echo -n a ; echo -n b`" = "ab" ] ; then
-	ECHO2='echo -n'
-elif [ "`echo 'a\c' ; echo 'b\c'`" = "ab" ] ; then
-	ECHO2='echo' ; ECHO2SUF='\c'
-elif [ "`printf 'a' 2>&1 ; printf 'b' 2>&1`" = "ab" ] ; then
-	ECHO2='printf "%s"'
-else
-	# oh well...
-	ECHO2='echo'
-fi
-export ECHO2 ECHO2SUF
-
 ###########################################################################
 # Init values
 ###########################################################################
@@ -121,7 +96,7 @@ EXTRA_INCLUDE_DIRS=
 EXTRA_LIB_DIRS=
 EXTRA_CONFIG_ARGS=
 CAN_QUICK="no"
-SOURCE_DIR=`dirname $0`
+SOURCE_DIR="$(cd "$(dirname "$0")" && pwd)"

 ###########################################################################
 # Check out the options
@@ -138,7 +113,8 @@ while [ $# -ge 1 ] ; do
 		exit 0
 	elif [ $1 = "-devel" ] ; then
 		DEBUG="yes"
-		INSTDIR="$PWD/run"
+		DEVEL="yes"
+		INSTDIR="$SOURCE_DIR/run"
 	elif [ $1 = "-nocache" ] ; then
 		IGNORE_CACHE="1"
 	elif [ $1 = "-nointro" ] ; then
@@ -163,7 +139,7 @@ done
 cmake --version 2>&1 > /dev/null
 if [ $? -ne 0 ] ; then
 	clear
-	echo "Anope requires CMake 3.8 or newer, which can be downloaded at https://cmake.org/ or through your system's package manager."
+	echo "Anope requires CMake 3.20 or newer, which can be downloaded at https://cmake.org/ or through your system's package manager."
 	echo "If you have installed CMake already, ensure it is in your PATH environment variable."
 	exit 0
 fi
@@ -196,10 +172,37 @@ export ok INPUT

 ####

+TEMP_YN="n"
+if [ "$DEVEL" = "yes" ] ; then
+	TEMP_YN="y"
+fi
+echo "You are building the 2.1 development branch. This branch is not as well tested"
+echo "as the 2.0 stable branch and may have compatibility breaks without notice. Are"
+echo "you sure you want to use this version?"
+echo -n "[$TEMP_YN] "
+read YN
+if [ "$YN" ] ; then
+	if [ "$YN" = "y" ] ; then
+		DEVEL="yes"
+	else
+		DEVEL="no"
+	fi
+fi
+echo ""
+
+if [ "$DEVEL" != "yes" ] ; then
+	echo "If you are building from Git you can run \`git checkout 2.0\` to get the latest"
+	echo "stable code. Otherwise, you can download the latest 2.0 release tarball from"
+	echo "https://github.com/anope/anope/releases/latest"
+	exit 1
+fi
+
+####
+
 ok=0
 echo "In what directory should Anope be installed?"
 while [ $ok -eq 0 ] ; do
-	echo2 "[$INSTDIR] "
+	echo -n "[$INSTDIR] "
 	if read INPUT ; then : ; else echo "" ; exit 1 ; fi
 	if [ ! "$INPUT" ] ; then
 		INPUT=$INSTDIR
@@ -209,7 +212,7 @@ while [ $ok -eq 0 ] ; do
 			echo "$INPUT exists, but is not a directory!"
 		else
 			echo "$INPUT does not exist.  Create it?"
-			echo2 "[y] "
+			echo -n "[y] "
 			read YN
 			if [ "$YN" != "n" ] ; then
 				if mkdir -p $INPUT ; then
@@ -238,7 +241,7 @@ else
 	echo "should not force files to be owned by a particular group, just press"
 	echo "Return.)"
 fi
-echo2 "[$RUNGROUP] "
+echo -n "[$RUNGROUP] "
 if read INPUT ; then : ; else echo "" ; exit 1 ; fi
 if [ "$INPUT" ] ; then
 	if [ "$INPUT" = "none" ] ; then
@@ -263,7 +266,7 @@ ok=0
 echo "What should the default umask for data files be (in octal)?"
 echo "(077 = only accessible by owner; 007 = accessible by owner and group)"
 while [ $ok -eq 0 ] ; do
-	echo2 "[$UMASK] "
+	echo -n "[$UMASK] "
 	if read INPUT ; then : ; else echo "" ; exit 1 ; fi
 	if [ ! "$INPUT" ] ; then
 		INPUT=$UMASK
@@ -287,7 +290,7 @@ if [ "$DEBUG" = "yes" ] ; then
 	TEMP_YN="y"
 fi
 echo "Would you like to build a debug version of Anope?"
-echo2 "[$TEMP_YN] "
+echo -n "[$TEMP_YN] "
 read YN
 if [ "$YN" ] ; then
 	if [ "$YN" = "y" ] ; then
@@ -305,7 +308,7 @@ echo "You may only need to do this if CMake is unable to locate"
 echo "missing dependencies without hints."
 echo "Separate directories with semicolons."
 echo "If you need no extra include directories, enter NONE in all caps."
-echo2 "[$EXTRA_INCLUDE_DIRS] "
+echo -n "[$EXTRA_INCLUDE_DIRS] "
 if read INPUT ; then : ; else echo "" ; exit 1 ; fi
 if [ "$INPUT" ] ; then
 	if [ "$INPUT" = "NONE" ] ; then
@@ -323,7 +326,7 @@ echo "You may only need to do this if CMake is unable to locate"
 echo "missing dependencies without hints."
 echo "Separate directories with semicolons."
 echo "If you need no extra library directories, enter NONE in all caps."
-echo2 "[$EXTRA_LIB_DIRS] "
+echo -n "[$EXTRA_LIB_DIRS] "
 if read INPUT ; then : ; else echo "" ; exit 1 ; fi
 if [ "$INPUT" ] ; then
 	if [ "$INPUT" = "NONE" ] ; then
@@ -338,7 +341,7 @@ echo ""

 echo "Are there any extra arguments you wish to pass to CMake?"
 echo "If you need no extra arguments to CMake, enter NONE in all caps."
-echo2 "[$EXTRA_CONFIG_ARGS] "
+echo -n "[$EXTRA_CONFIG_ARGS] "
 if read INPUT ; then : ; else echo "" ; exit 1 ; fi
 if [ "$INPUT" ] ; then
 	if [ "$INPUT" = "NONE" ] ; then
@@ -355,13 +358,14 @@ echo ""
 # Store values
 ################################################################################

-echo2 "Saving configuration results in config.cache... "
+echo -n "Saving configuration results in config.cache... "

 cat <<EOT >$SOURCE_DIR/config.cache
 INSTDIR="$INSTDIR"
 RUNGROUP="$RUNGROUP"
 UMASK=$UMASK
 DEBUG="$DEBUG"
+DEVEL="$DEVEL"
 EXTRA_INCLUDE_DIRS="$EXTRA_INCLUDE_DIRS"
 EXTRA_LIB_DIRS="$EXTRA_LIB_DIRS"
 EXTRA_CONFIG_ARGS="$EXTRA_CONFIG_ARGS"
@@ -4,7 +4,7 @@ Anope is an open source set of IRC services. It is highly modular, with a vast n

 * [Website](https://anope.org)
 * [GitHub](https://github.com/anope)
-* IRC \#anope on irc.anope.org
+* IRC \#anope on irc.teranova.net

 ## Installation

@@ -33,7 +33,7 @@ Copy conf/anope.example.conf to conf/anope.conf
 $ cp conf/anope.example.conf conf/anope.conf
 ```

-Edit anope.conf, configuring the uplink, serverinfo, and protocol module configurations. Example link blocks for popular IRCds are included in the anope.example.conf documentation. The [Anope wiki](https://wiki.anope.org) is also a good source of information. Our support channel is located at #anope on [irc.anope.org](irc://irc.anope.org/#anope).
+Edit anope.conf, configuring the uplink, serverinfo, and protocol module configurations. Example link blocks for popular IRCds are included in the the example.conf documentation. The [Anope wiki](https://wiki.anope.org) is also a good source of information. Our support channel is located at #anope on [irc.teranova.net](ircs://irc.teranova.net/anope).

 Note that the example configuration file includes other example configuration files. If you want to modify the other example configuration files, copy them (e.g. `modules.example.conf` to `modules.conf`) and modify the `include` directive in `anope.conf` to include the new file.

@@ -1,4 +1,4 @@
-# Only install example.chk and anope.example.conf from this directory
+# Only install cron.example.sh and anope.example.conf from this directory
 # NOTE: I would've had this just find all files in the directory, but that would include files not needed (like this file)
 set(DATA cron.example.sh anope.example.conf botserv.example.conf hostserv.example.conf modules.example.conf operserv.example.conf chanserv.example.conf global.example.conf memoserv.example.conf nickserv.example.conf chanstats.example.conf irc2sql.example.conf stats.standalone.example.conf)
 install(FILES ${DATA}
@@ -79,13 +79,16 @@
 /*
 * [OPTIONAL] Defines
 *
- * You can define values to other values, which can be used to easily change
- * many values in the configuration at once.
+ * You can use defines for repeated information, which can be used to easily change many
+ * values in the configuration at once.
+ *
+ * To use a define called foo.bar you use ${foo.bar} in your config file. You can also use
+ * environment variables by prefixing their name with "env." like ${env.USER}.
 */

 /*
 * The services.host define is used in multiple different locations throughout the
- * configuration for services clients hostnames.
+ * configuration for the server name and pseudoclient hostnames.
 */
 define
 {
@@ -211,7 +214,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.example.com"
+	name = "${services.host}"

 	/*
 	 * The text which should appear as the server's information in /WHOIS and similar
@@ -328,7 +331,7 @@ networkinfo
 	 *
 	 * It is recommended you DON'T change this.
 	 */
-	vhost_chars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789.-"
+	vhost_chars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789.-/"

 	/*
 	 * If set to true, allows vHosts to not contain dots (.).
@@ -414,12 +417,6 @@ options
 	 */
 	readtimeout = 5s

-	/*
-	 * Sets the interval between sending warning messages for program errors via
-	 * WALLOPS/GLOBOPS.
-	 */
-	warningtimeout = 4h
-
 	/*
 	 * Sets the (maximum) frequency at which the timeout list is checked. This,
 	 * combined with readtimeout above, determines how accurately timed events,
@@ -436,26 +433,11 @@ options
 	timeoutcheck = 3s

 	/*
-	 * If set, this will allow users to let services send PRIVMSGs to them
-	 * instead of NOTICEs. Also see the "msg" option of nickserv:defaults,
-	 * which also toggles the default communication (PRIVMSG or NOTICE) to
-	 * use for unregistered users.
-	 *
-	 * This is a feature that is against the IRC RFC and should be used ONLY
-	 * if absolutely necessary.
-	 *
-	 * This directive is optional, and not recommended.
+	 * If set Anope will tell users to use a server-side alias for messaging
+	 * services instead of /msg. The alias for each service defaults to the
+	 * bot name but can be configured in the service block.
 	 */
-	#useprivmsg = yes
-
-	/*
-	 * If set, will force services to only respond to PRIVMSGs addresses to
-	 * 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.
-	 */
-	#usestrictprivmsg = yes
+	#servicealias = yes

 	/*
 	 * If set, Anope will only show /stats o to IRC Operators. This directive
@@ -497,6 +479,26 @@ options
 	 */
 	didyoumeandifference = 4

+	/*
+	 * The length of codes used for confirming actions like dropping a channel or a
+	 * nickname.
+	 *
+	 * Defaults to 15 if not set.
+	 */
+	codelength = 15
+
+	/*
+	 * If set, the maximum number of bytes after which to wrap services messages. This
+	 * can be set a bit higher than the default but should be well under the maximum
+	 * message length imposed by your IRC server or messages will end up truncated.
+	 *
+	 * NOTE: this currently only applies to tables but will be expanded to all messages
+	 * in a later release.
+	 *
+	 * Defaults to 100 if not set.
+	 */
+	linelength = 100
+
 	/* The regex engine to use, as provided by the regex modules.
 	 * Leave commented to disable regex matching.
 	 *
@@ -746,6 +748,7 @@ log
 *  nickserv/cert                 - Can modify other users certificate lists
 *  nickserv/confirm              - Can confirm other users nicknames
 *  nickserv/drop                 - Can drop other users nicks
+ *  nickserv/drop/display         - Allows dropping display nicks when preservedisplay is enabled
 *  nickserv/drop/override        - Allows dropping nicks without using a confirmation code
 *  nickserv/recover              - Can recover other users nicks
 *  operserv/config               - Can modify services's configuration
@@ -766,8 +769,8 @@ log
 *   nickserv/getemail         nickserv/suspend       nickserv/ajoin           nickserv/list
 *
 *   nickserv/saset/autoop   nickserv/saset/display    nickserv/saset/email    nickserv/saset/greet
- *   nickserv/saset/kill     nickserv/saset/keepmodes  nickserv/saset/language  nickserv/saset/message
- *   nickserv/saset/neverop  nickserv/saset/noexpire   nickserv/saset/password  nickserv/saset/private
+ *   nickserv/saset/keepmodes  nickserv/saset/language  nickserv/saset/message nickserv/saset/neverop
+ *   nickserv/saset/noexpire   nickserv/saset/password  nickserv/saset/private nickserv/saset/protect
 *   nickserv/saset/url
 *
 *   hostserv/set            hostserv/del           hostserv/list
@@ -822,8 +825,6 @@ opertype
 	 *
 	 * This can be used to automatically oper users who identify for services operator accounts, and is
 	 * useful for setting modes such as Plexus's user mode +N.
-	 *
-	 * Note that some IRCds, such as InspIRCd, do not allow directly setting +o, and this will not work.
 	 */
 	#modes = "+o"
 }
@@ -874,6 +875,16 @@ opertype
 	/* An optional password. If defined, the user must login using "/OPERSERV LOGIN" first */
 	#password = "secret"

+	/*
+	 * The algorithm which the above password is hashed with. If this is not set then services will
+	 * assume the above password is not hashed.
+	 *
+	 * You will need to have the appropriate encryption module (e.g. enc_bcrypt) loaded in order
+	 * for this to work.
+	 *
+	 */
+	#password_hash = "bcrypt"
+
 	/* An optional SSL fingerprint. If defined, it's required to be able to use this opertype. */
 	#certfp = "ed3383b3f7d74e89433ddaa4a6e5b2d7"

@@ -915,7 +926,7 @@ mail
 	 * If set, this option enables the mail commands in Anope. You may choose
 	 * to disable it if you have no Sendmail-compatible mailer installed. Whilst
 	 * this directive (and entire block) is optional, it is required if
-	 * nickserv:registration is set to yes.
+	 * nickserv:registration is set to mail.
 	 */
 	usemail = yes

@@ -974,76 +985,76 @@ mail
 	 * The subject and message of emails sent to users when they register accounts.
 	 *
 	 * Available tokens for this template are:
-	 *  %n - Gets replaced with the nickname
-	 *  %N - Gets replaced with the network name
-	 *  %c - Gets replaced with the confirmation code
+	 *  {nick}    - Gets replaced with the nickname
+	 *  {network} - Gets replaced with the network name
+	 *  {code}    - Gets replaced with the confirmation code
 	 */
-	registration_subject = "Nickname registration for %n"
+	registration_subject = "Nickname registration for {nick}"
 	registration_message = "Hi,

-				You have requested to register the nickname %n on %N.
-				Please type \" /msg NickServ CONFIRM %c \" to complete registration.
+				You have requested to register the nickname {nick} on {network}.
+				Please type \" /msg NickServ CONFIRM {code} \" to complete registration.

 				If you don't know why this mail was sent to you, please ignore it silently.

-				%N administrators."
+				{network} administrators."

 	/*
 	 * The subject and message of emails sent to users when they request a new password.
 	 *
 	 * Available tokens for this template are:
-	 *  %n - Gets replaced with the nickname
-	 *  %N - Gets replaced with the network name
-	 *  %c - Gets replaced with the confirmation code
+	 *  {nick}    - Gets replaced with the nickname
+	 *  {network} - Gets replaced with the network name
+	 *  {code}    - Gets replaced with the confirmation code
 	 */
-	reset_subject = "Reset password request for %n"
+	reset_subject = "Reset password request for {nick}"
 	reset_message = "Hi,

-			You have requested to have the password for %n reset.
-			To reset your password, type \" /msg NickServ CONFIRM %n %c \"
+			You have requested to have the password for {nick} reset.
+			To reset your password, type \" /msg NickServ CONFIRM {nick} {code} \"

 			If you don't know why this mail was sent to you, please ignore it silently.

-			%N administrators."
+			{network} administrators."

 	/*
 	 * The subject and message of emails sent to users when they request a new email address.
 	 *
 	 * Available tokens for this template are:
-	 *  %e - Gets replaced with the old email address
-	 *  %E - Gets replaced with the new email address
-	 *  %n - Gets replaced with the nickname
-	 *  %N - Gets replaced with the network name
-	 *  %c - Gets replaced with the confirmation code
+	 *  {old_email} - Gets replaced with the old email address
+	 *  {new_email} - Gets replaced with the new email address
+	 *  {account}   - Gets replaced with the nickname
+	 *  {network}   - Gets replaced with the network name
+	 *  {code}      - Gets replaced with the confirmation code
 	 */
 	emailchange_subject = "Email confirmation"
 	emailchange_message = "Hi,

-			You have requested to change your email address from %e to %E.
-			Please type \" /msg NickServ CONFIRM %c \" to confirm this change.
+			You have requested to change your email address from {old_email} to {new_email}.
+			Please type \" /msg NickServ CONFIRM {code} \" to confirm this change.

 			If you don't know why this mail was sent to you, please ignore it silently.

-			%N administrators."
+			{network} administrators."

 	/*
 	 * The subject and message of emails sent to users when they receive a new memo.
 	 *
 	 * Available tokens for this template are:
-	 *  %n - Gets replaced with the nickname
-	 *  %s - Gets replaced with the sender's nickname
-	 *  %d - Gets replaced with the memo number
-	 *  %t - Gets replaced with the memo text
-	 *  %N - Gets replaced with the network name
+	 *  {receiver}  - Gets replaced with the receiver's nickname
+	 *  {sender}    - Gets replaced with the sender's nickname
+	 *  {number}    - Gets replaced with the memo number
+	 *  {text}      - Gets replaced with the memo text
+	 *  {network}   - Gets replaced with the network name
 	 */
 	memo_subject = "New memo"
-	memo_message = "Hi %n,
+	memo_message = "Hi {receiver},

-			You've just received a new memo from %s. This is memo number %d.
+			You've just received a new memo from {sender}. This is memo number {number}.

 			Memo text:

-			%t"
+			{text}"
 }

 /*
@@ -1109,11 +1120,9 @@ module
 	 * Sets the number of days backups of databases are kept. If you don't give it,
 	 * or if you set it to 0, Anope won't backup the databases.
 	 *
-	 * NOTE: Anope must run 24 hours a day for this feature to work.
-	 *
 	 * This directive is optional, but recommended.
 	 */
-	keepbackups = 3
+	keepbackups = 7

 	/*
 	 * Allows Anope to continue file write operations (i.e. database saving)
@@ -1138,6 +1147,59 @@ module
 	fork = no
 }

+/*
+ * db_json
+ *
+ * Stores your data in a JSON file. This is currently experimental and has not
+ * been fully tested so make sure you have db_flatfile loaded as a secondary
+ * database module if you use this.
+ */
+#module
+{
+	name = "db_json"
+
+	/*
+	 * The file that db_json will write your main database to.
+	 *
+	 * This is relative to your data directory.
+	 */
+	database = "anope.json"
+
+	/*
+	 * The file that db_json will write third-party databases to.
+	 *
+	 * {name} will be replaced with the name of the module.
+	 *
+	 * This is relative to your data directory.
+	 */
+	module_database = "{name}.module.json"
+
+	/*
+	 * Sets how many days and months worth of backups should be kept.
+	 *
+	 * It is recommended that at the very least you keep one backup. Failure to
+	 * do so may result in total data loss if you ever run out of disk space or
+	 * have a power failure during a database write. However, if you're *REALLY*
+	 * sure this won't happen you can disable backups by setting these to 0.
+	 */
+	daily_backups = 7
+	monthly_backups = 3
+
+	/*
+	 * The directory in which backups are kept.
+	 *
+	 * This is relative to your data directory.
+	 */
+	backup_directory = "backups"
+
+	/*
+	 * Allows Anope to continue writing the database even if the original can
+	 * not be backed up. This is not recommended as it may result in total data
+	 * loss during the circumstances described above.
+	 */
+	#ignore_backup_failure = yes
+}
+
 /*
 * db_sql and db_sql_live
 *
@@ -1149,7 +1211,8 @@ module
 * db_sql_live module allows saving and loading databases using one of the SQL engines.
 * This module reads and writes to SQL in real time. Changes to the SQL tables
 * will be immediately reflected into Anope. This module should not be loaded
- * in conjunction with db_sql.
+ * in conjunction with db_sql. It should also not be used on large networks as it
+ * executes quite a lot of queries which can cause performance issues.
 *
 */
 #module
@@ -1171,9 +1234,10 @@ module

 	/* Whether or not to import data from another database module in to SQL on startup.
 	 * If you enable this, be sure that the database services is configured to use is
-	 * empty and that another database module to import from is loaded before db_sql.
-	 * After you enable this and do a database import you should disable it for
-	 * subsequent restarts.
+	 * empty and that another database module to import from is loaded BEFORE db_sql.
+	 * After you enable this and do a database import you MUST disable it for
+	 * subsequent restarts. If you want to keep writing a flatfile database after the
+	 * SQL import is done you should load db_flatfile AFTER this module.
 	 *
 	 * Note that you can not import databases using db_sql_live. If you want to import
 	 * databases and use db_sql_live you should import them using db_sql, then shut down
@@ -1227,9 +1291,9 @@ module
 	name = "enc_sha2"

 	/** The sub-algorithm to use. Can be set to sha224 for SHA-224, sha256 for
-	 * SHA-256, sha284 for SHA-384 or sha512 to SHA-512. Defaults to sha256.
+	 * SHA-256, sha384 for SHA-384, or sha512 for SHA-512. Defaults to sha512.
 	 */
-	#algorithm = "sha256"
+	#algorithm = "sha512"
 }

 /*
@@ -31,7 +31,7 @@ service
 	/*
 	 * The hostname of the BotServ client.
 	 */
-	host = "services.host"
+	host = "${services.host}"

 	/*
 	 * The realname of the BotServ client.
@@ -59,6 +59,17 @@ service
 	 * Prefixes may be given to the channels in the form of mode characters or prefix symbols.
 	 */
 	#channels = "@#services,#mychan"
+
+	/*
+	 * The server alias that can be used to securely message this service. If
+	 * your IRC server does not have an alias for this service you can set this
+	 * to an empty string to tell users to use /msg instead.
+	 *
+	 * This setting is ignored when options:servicealias is disabled.
+	 *
+	 * Defaults to the nick of the service if not set.
+	 */
+	#alias = "BS"
 }

 /*
@@ -334,10 +345,10 @@ privilege
 /*
 * fantasy
 *
- * Allows 'fantasist' commands to be used in channels.
+ * Allows fantasy commands (e.g. !kick) to be used in channels.
 *
 * Provides the commands:
- *   botserv/set/fantasy - Used for enabling or disabling BotServ's fantasist commands.
+ *   botserv/set/fantasy - Used for enabling or disabling BotServ's fantasy commands.
 */
 module
 {
@@ -399,6 +410,7 @@ fantasy { name = "SUSPEND"; command = "chanserv/suspend"; permission = "chanserv
 fantasy { name = "SYNC"; command = "chanserv/sync"; }
 fantasy { name = "TOPIC"; command = "chanserv/topic"; }
 fantasy { name = "UNBAN"; command = "chanserv/unban"; }
+fantasy { name = "UNMUTE"; command = "chanserv/unban"; mode = "QUIET"; }
 fantasy { name = "UNSUSPEND"; command = "chanserv/unsuspend"; permission = "chanserv/suspend"; }
 fantasy { name = "UP"; command = "chanserv/up"; }
 fantasy { name = "VOICE"; command = "chanserv/modes"; }
@@ -21,7 +21,7 @@ service
 	/*
 	 * The hostname of the ChanServ client.
 	 */
-	host = "services.host"
+	host = "${services.host}"

 	/*
 	 * The realname of the ChanServ client.
@@ -49,6 +49,17 @@ service
 	 * Prefixes may be given to the channels in the form of mode characters or prefix symbols.
 	 */
 	#channels = "@#services,#mychan"
+
+	/*
+	 * The server alias that can be used to securely message this service. If
+	 * your IRC server does not have an alias for this service you can set this
+	 * to an empty string to tell users to use /msg instead.
+	 *
+	 * This setting is ignored when options:servicealias is disabled.
+	 *
+	 * Defaults to the nick of the service if not set.
+	 */
+	#alias = "CS"
 }

 /*
@@ -91,10 +102,10 @@ module
 	 *                   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, peace,
-	 * securefounder, and signkick. If you really want no defaults, use "none" by itself as the option.
+	 * This directive is optional, if left blank, the options will default to cs_keep_modes, keeptopic, peace,
+	 * persist, securefounder, and signkick. If you really want no defaults, use "none" by itself as the option.
 	 */
-	defaults = "keeptopic peace securefounder signkick"
+	defaults = "cs_keep_modes keeptopic peace persist securefounder signkick"

 	/*
 	 * The maximum number of channels which may be registered to a single nickname.
@@ -152,10 +163,10 @@ module

 	/*
 	 * The message formatting to use for signed kick messages.
-	 * %n is the nick of the kicker
-	 * %m is the message specified
+	 * {nick} is the nick of the kicker
+	 * {message} is the message specified
 	 */
-	signkickformat = "%m (%n)"
+	signkickformat = "{message} ({nick})"

 	/*
 	 * If set, prevents channel access entries from containing hostmasks.
@@ -726,7 +737,7 @@ privilege
 privilege
 {
 	name = "SET"
-	desc = _("Allowed to set channel settings")
+	desc = _("Allowed to modify channel settings")
 	rank = 320
 	level = 9999
 	flag = "s"
@@ -1171,7 +1182,7 @@ module
 	simple = false

 	/* Sets the time to keep seen entries in the seen database. */
-	purgetime = "30d"
+	purgetime = 90d
 }
 command { service = "OperServ"; name = "SEEN"; command = "operserv/seen"; permission = "operserv/seen"; }

@@ -1245,7 +1256,7 @@ command { service = "ChanServ"; name = "SET NOEXPIRE"; command = "chanserv/saset
 * A field named misc_description may be given for use with help output.
 */
 module { name = "cs_set_misc" }
-command { service = "ChanServ"; name = "SET URL"; command = "chanserv/set/misc"; misc_description = _("Associate a URL with the channel"); }
+command { service = "ChanServ"; name = "SET URL"; command = "chanserv/set/misc"; misc_description = _("Associate a URL with the channel"); misc_numeric = 328; }
 command { service = "ChanServ"; name = "SET EMAIL"; command = "chanserv/set/misc"; misc_description = _("Associate an email address with the channel"); }

 /*
@@ -21,7 +21,7 @@ service
 	/*
 	 * The hostname of the Global client.
 	 */
-	host = "services.host"
+	host = "${services.host}"

 	/*
 	 * The realname of the Global client.
@@ -49,6 +49,17 @@ service
 	 * Prefixes may be given to the channels in the form of mode characters or prefix symbols.
 	 */
 	#channels = "@#services,#mychan"
+
+	/*
+	 * The server alias that can be used to securely message this service. If
+	 * your IRC server does not have an alias for this service you can set this
+	 * to an empty string to tell users to use /msg instead.
+	 *
+	 * This setting is ignored when options:servicealias is disabled.
+	 *
+	 * Defaults to the nick of the service if not set.
+	 */
+	#alias = "GL"
 }

 /*
@@ -21,7 +21,7 @@ service
 	/*
 	 * The hostname of the HostServ client.
 	 */
-	host = "services.host"
+	host = "${services.host}"

 	/*
 	 * The realname of the HostServ client.
@@ -49,6 +49,17 @@ service
 	 * Prefixes may be given to the channels in the form of mode characters or prefix symbols.
 	 */
 	#channels = "@#services,#mychan"
+
+	/*
+	 * The server alias that can be used to securely message this service. If
+	 * your IRC server does not have an alias for this service you can set this
+	 * to an empty string to tell users to use /msg instead.
+	 *
+	 * This setting is ignored when options:servicealias is disabled.
+	 *
+	 * Defaults to the nick of the service if not set.
+	 */
+	#alias = "HS"
 }

 /*
@@ -68,7 +79,12 @@ module
 	/*
 	 * If enabled, vhosts are activated on users immediately when they are set.
 	 */
-	activate_on_set = false
+	activate_on_set = yes
+
+	/*
+	 * If enabled, vhosts are activated on users immediately when they log out of an operator account.
+	 */
+	activate_on_deoper = yes
 }

 /*
@@ -18,7 +18,7 @@ service
 	/*
 	 * The hostname of the StatServ client.
 	 */
-	host = "stats.host"
+	host = "${services.host}"

 	/*
 	 * The realname of the StatServ client.
@@ -21,7 +21,7 @@ service
 	/*
 	 * The hostname of the MemoServ client.
 	 */
-	host = "services.host"
+	host = "${services.host}"

 	/*
 	 * The realname of the MemoServ client.
@@ -49,6 +49,17 @@ service
 	 * Prefixes may be given to the channels in the form of mode characters or prefix symbols.
 	 */
 	#channels = "@#services,#mychan"
+
+	/*
+	 * The server alias that can be used to securely message this service. If
+	 * your IRC server does not have an alias for this service you can set this
+	 * to an empty string to tell users to use /msg instead.
+	 *
+	 * This setting is ignored when options:servicealias is disabled.
+	 *
+	 * Defaults to the nick of the service if not set.
+	 */
+	#alias = "MS"
 }

 /*
@@ -119,15 +119,15 @@ module { name = "help" }
 		time = 4h

 		/* Reason for akill.
-		 * %n is the nick of the user
-		 * %u is the ident/username of the user
-		 * %g is the realname of the user
-		 * %h is the hostname of the user
-		 * %i is the IP of the user
-		 * %r is the reply reason (configured below). Will be nothing if not configured.
-		 * %N is the network name set in networkinfo:networkname
+		 * {nick} is the nick of the user
+		 * {user} is the ident/username of the user
+		 * {real} is the realname of the user
+		 * {host} is the hostname of the user
+		 * {ip} is the IP of the user
+		 * {reply} is the reply reason (configured below). Will be nothing if not configured.
+		 * {network} is the network name set in networkinfo:networkname
 		 */
-		reason = "You are listed in the EFnet RBL, visit https://rbl.efnetrbl.org/?i=%i for info"
+		reason = "You are listed in the EFnet RBL, visit https://rbl.efnetrbl.org/?i={ip} for info"

 		/* Replies to ban and their reason. If no replies are configured, all replies get banned. */
 		reply
@@ -171,7 +171,7 @@ module { name = "help" }
 	{
 		name = "dnsbl.dronebl.org"
 		time = 4h
-		reason = "You have a host listed in the DroneBL. For more information, visit https://dronebl.org/lookup_branded?ip=%i&network=%N"
+		reason = "You have a host listed in the DroneBL. For more information, visit https://dronebl.org/lookup?ip={ip}&network={network}"
 	}

 	/* Exempt localhost from DNSBL checks */
@@ -270,10 +270,10 @@ module { name = "help" }

 	/*
 	 * The search filter used to look up users's accounts.
-	 * %account is replaced with the user's account.
-	 * %object_class is replaced with the object_class configured below.
+	 * {account} is replaced with the user's account.
+	 * {object_class} is replaced with the object_class configured below.
 	 */
-	search_filter = "(&(uid=%account)(objectClass=%object_class))"
+	search_filter = "(&(uid={account})(objectClass={object_class}))"

 	/*
 	 * The object class used by LDAP to store user account information.
@@ -327,7 +327,7 @@ module { name = "help" }

 	/*
 	 * An optional binddn to use when searching for groups.
-	 * %a is replaced with the account name of the user.
+	 * {account} is replaced with the account name of the user.
 	 */
 	#binddn = "cn=Manager,dc=anope,dc=org"

@@ -343,9 +343,9 @@ module { name = "help" }

 	/*
 	 * The filter to use when searching for users.
-	 * %a is replaced with the account name of the user.
+	 * {account} is replaced with the account name of the user.
 	 */
-	filter = "(member=uid=%a,ou=users,dc=anope,dc=org)"
+	filter = "(member=uid={account},ou=users,dc=anope,dc=org)"

 	/*
 	 * The attribute of the group that is the name of the opertype.
@@ -372,6 +372,7 @@ module { name = "help" }
 		username = "anope"
 		password = "mypassword"
 		port = 3306
+		socket = ""
 	}
 }

@@ -549,24 +550,14 @@ module

 		/*
 		 * The reason to ban the user for.
-		 * %h is replaced with the type of proxy found.
-		 * %i is replaced with the IP of proxy found.
-		 * %p is replaced with the port.
+		 * {type} is replaced with the type of proxy found.
+		 * {ip} is replaced with the IP of proxy found.
+		 * {port} is replaced with the port.
 		 */
-		reason = "You have an open proxy running on your host (%t:%i:%p)"
+		reason = "You have an open proxy running on your host ({type}:{ip}:{port})"
 	}
 }

-/*
- * sasl
- *
- * Some IRCds allow "SASL" authentication to let users identify to services
- * during the IRCd user registration process. If this module is loaded, Anope will allow
- * authenticating users through this mechanism. Supported mechanisms are:
- * PLAIN, EXTERNAL.
- */
-module { name = "sasl" }
-
 /*
 * ssl_gnutls [EXTRA]
 *
@@ -679,6 +670,23 @@ module { name = "sasl" }
 	 */
 	query = "SELECT `email_addr` AS `email` FROM `my_users` WHERE `username` = @a@ AND `password` = MD5(CONCAT('salt', @p@))"

+	/*
+	 * If your database uses a password hashing algorithm that can not be compared using a simple
+	 * comparison function then you can specify it here to compare locally.
+	 *
+	 * You will need to have the appropriate encryption module (e.g. enc_bcrypt) loaded in order
+	 * for this to work.
+	 */
+	#password_hash = "bcrypt"
+
+	/*
+	 * If using the password_hash field (above) you will need to specify the name of the field to
+	 * fetch the password from.
+	 *
+	 * Defaults to "password" if not set.
+	 */
+	#password_field = "password"
+
 	/*
 	 * If set, the reason to give the users who try to "/msg NickServ REGISTER".
 	 * If not set, then registration is not blocked.
@@ -754,7 +762,7 @@ module { name = "sasl" }
 		name = "sqlite/main"

 		/* The database name, it will be created if it does not exist. */
-		database = "anope.db"
+		database = "anope.sqlite"
 	}
 }

@@ -772,23 +780,41 @@ module { name = "sasl" }
 	name = "webcpanel"

 	/* Web server to use. */
-	server = "httpd/main";
+	server = "httpd/main"

 	/*
 	 * The directory containing the webcpanel templates. This is relative to the
 	 * data directory.
 	 */
-	template_dir = "webcpanel/templates/default";
+	template_dir = "webcpanel/templates/default"

 	/* Page title. */
-	title = "Anope IRC Services";
+	title = "Anope IRC Services"
 }

 /*
- * xmlrpc
+ * jsonrpc
 *
 * Allows remote applications (websites) to execute queries in real time to retrieve data from Anope.
- * By itself this module does nothing, but allows other modules (xmlrpc_main) to receive and send XMLRPC queries.
+ * By itself this module does nothing, but allows other modules (rpc_main) to receive and send JSON-RPC queries.
+ *
+ * IMPORTANT: this can not be loaded at the same time as the xmlrpc module.
+ */
+#module
+{
+	name = "jsonrpc"
+
+	/* Web service to use. Requires httpd. */
+	server = "httpd/main"
+}
+
+/*
+ * [EXTRA] xmlrpc
+ *
+ * Allows remote applications (websites) to execute queries in real time to retrieve data from Anope.
+ * By itself this module does nothing, but allows other modules (rpc_main) to receive and send XMLRPC queries.
+ *
+ * IMPORTANT: this can not be loaded at the same time as the jsonrpc module.
 */
 #module
 {
@@ -796,12 +822,71 @@ module { name = "sasl" }

 	/* Web service to use. Requires httpd. */
 	server = "httpd/main"
+
+	/*
+	 * Whether to enable the use of XML-RPC extensions.
+	 *
+	 * By default Anope will use some extended XML-RPC types. If your XML-RPC
+	 * client can not handle these you will need to disable them.
+	 *
+	 * If i8 is disabled a string will be used for values outside of the range
+	 * supported by the 32-bit int data type.
+	 *
+	 * If nil is disabled an empty struct will be used instead.
+	 */
+	#enable_i8 = no
+	#enable_nil = no
 }

 /*
- * xmlrpc_main
+ * rpc_data
 *
- * Adds the main XMLRPC core functions.
+ * Adds support for the following RPC methods:
+ *
+ * anope.listAccounts    anope.account
+ * anope.listChannels    anope.channel
+ * anope.listOpers       anope.oper
+ * anope.listServers     anope.server
+ * anope.listUsers       anope.user
+ *
+ * Requires either the jsonrpc or xmlrpc module.
+ *
+ * See docs/RPC/rpc_data.md for API documentation.
+ */
+#module { name = "rpc_data" }
+
+/*
+ * rpc_main
+ *
+ * Adds the main RPC core functions.
 * Requires xmlrpc.
 */
-#module { name = "xmlrpc_main" }
+#module { name = "rpc_main" }
+
+/*
+ * rpc_message
+ *
+ * Adds support for the following RPC methods:
+ *
+ * anope.messageNetwork    anope.messageServer
+ * anope.messageUser
+ *
+ * Requires either the jsonrpc or xmlrpc module.
+ *
+ * See docs/RPC/rpc_message.md for API documentation.
+ */
+#module { name = "rpc_message" }
+
+/*
+ * rpc_system
+ *
+ * Adds support for the following RPC methods:
+ *
+ * system.listMethods
+ *
+ * Requires either the jsonrpc or xmlrpc module.
+ *
+ * See https://gggeek.github.io/phpxmlrpc/doc-1.1/ch08.html for API
+ * documentation.
+ */
+#module { name = "rpc_system" }
@@ -21,7 +21,7 @@ service
 	/*
 	 * The hostname of the NickServ client.
 	 */
-	host = "services.host"
+	host = "${services.host}"

 	/*
 	 * The realname of the NickServ client.
@@ -49,6 +49,17 @@ service
 	 * Prefixes may be given to the channels in the form of mode characters or prefix symbols.
 	 */
 	#channels = "@#services,#mychan"
+
+	/*
+	 * The server alias that can be used to securely message this service. If
+	 * your IRC server does not have an alias for this service you can set this
+	 * to an empty string to tell users to use /msg instead.
+	 *
+	 * This setting is ignored when options:servicealias is disabled.
+	 *
+	 * Defaults to the nick of the service if not set.
+	 */
+	#alias = "NS"
 }

 /*
@@ -75,11 +86,14 @@ module
 	/*
 	 * Require users who change their email address to confirm they
 	 * own their new email.
+	 *
+	 * If {ns_register}:registration is set to mail then this defaults
+	 * to yes. Otherwise, it defaults to no.
 	 */
-	confirmemailchanges = no
+	#confirmemailchanges = yes

 	/*
-	 * A message sent to users on connect if they use an unregistered nick. %n will be replaced with the user's nickname.
+	 * A message sent to users on connect if they use an unregistered nick. {nick} will be replaced with the user's nickname.
 	 *
 	 * This directive is optional.
 	 */
@@ -91,11 +105,6 @@ module
 	 * by spaces.
 	 *
 	 * 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 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_private: Hide the nick from NickServ's LIST command
 	 * -    hide_email: Hide the nick's email address from NickServ's INFO command
 	 * -     hide_mask: Hide the nick's last or current user@host from NickServ's INFO command
@@ -106,14 +115,14 @@ module
 	 * -     memo_mail: Notify user if they have a new memo by mail
 	 * -        autoop: User will be automatically opped in channels they enter and have access to
 	 * -       neverop: User can not be added to access lists
-	 * -           msg: Messages will be sent as PRIVMSGs instead of NOTICEs, requires options:useprivmsg
-	 *                  to be enabled as well
+	 * -           msg: Messages will be sent as PRIVMSGs instead of NOTICEs
 	 * - ns_keep_modes: Enables keepmodes, which retains user modes across sessions
+	 * -       protect: Protects the registered nickname from use by unidentified users.
 	 *
 	 * This directive is optional, if left blank, the options will default to memo_signon, and
 	 * memo_receive. If you really want no defaults, use "none" by itself as the option.
 	 */
-	defaults = "killprotect ns_private hide_email hide_mask memo_signon memo_receive autoop"
+	defaults = "autoop hide_email hide_mask memo_receive memo_signon ns_private protect"

 	/*
 	 * The minimum length of time between consecutive uses of NickServ's REGISTER command. This
@@ -124,9 +133,9 @@ module
 	/*
 	 * The length of time before a nick's registration expires.
 	 *
-	 * This directive is optional, but recommended. If not set, the default is 90 days.
+	 * This directive is optional, but recommended. If not set, the default is one year.
 	 */
-	expire = 90d
+	expire = 1y

 	/*
 	 * Prevents the use of the ACCESS and CERT (excluding their LIST subcommand), DROP, FORBID, SUSPEND
@@ -158,11 +167,25 @@ module
 	hidenetsplitquit = no

 	/*
-	 * If set, is the length of time NickServ's killquick and kill options wait before
-	 * forcing users off of protected nicknames.
+	 * The default period to force users to stop using a protected nickname after.
+	 *
+	 * Defaults to 1 minute.
 	 */
-	killquick = 20s
-	kill = 60s
+	defaultprotect = 1m
+
+	/*
+	 * The minimum period that a user can have a user forced off their protected nickname after.
+	 *
+	 * Defaults to 10 seconds.
+	 */
+	minprotect = 10s
+
+	/*
+	 * The maximum period that a user can have a user forced off their protected nickname after.
+	 *
+	 * Defaults to 10 minutes.
+	 */
+	maxprotect = 10m

 	/*
 	 * If set, forbids the registration of nicks that contain an existing
@@ -183,7 +206,7 @@ module
 	 * hold a nickname.
 	 */
 	enforceruser = "enforcer"
-	enforcerhost = "services.host"
+	enforcerhost = "${services.host}"

 	/*
 	 * The length of time Anope should hold nicknames for.
@@ -193,13 +216,17 @@ module
 	releasetimeout = 1m

 	/*
-	 * When a user's nick is forcibly changed to enforce a "nick kill", their new nick will start
-	 * with this value. The rest will be made up of 6 or 7 digits.
-	 * Make sure this is a valid nick and Nicklen+7 is not longer than the allowed Nicklen on your ircd.
+	 * When a user's nick is forcibly changed to enforce nickname protection their new
+	 * nick will be based on this value. Any # in the value will be replaced with a random
+	 * number. If your IRCd has support for unique identifiers you can also set this to an
+	 * empty string to change a user's nick to their unique identifier.
 	 *
-	 * This directive is optional. If not set it defaults to "Guest"
+	 * Make sure this is a valid nick and that it is is not longer than the maximum nick
+	 * length on your IRCd.
+	 *
+	 * This directive is optional. If not set it defaults to "Guest####"
 	 */
-	guestnickprefix = "Guest"
+	guestnick = "Guest####"

 	/*
 	 * If set, Anope does not allow ownership of nick names, only ownership of accounts.
@@ -219,6 +246,12 @@ module
 	 * This directive is optional. If not set it defaults to 50.
 	 */
 	maxpasslen = 50
+
+	/*
+	 * Whether all of the secondary nicks of a nick group have to expire or be
+	  dropped before the display nick can expire or be dropped.
+	 */
+	preservedisplay = no
 }

 /*
@@ -496,6 +529,27 @@ command { service = "NickServ"; name = "RESEND"; command = "nickserv/resend"; }
 module { name = "ns_resetpass" }
 command { service = "NickServ"; name = "RESETPASS"; command = "nickserv/resetpass"; }

+/*
+ * ns_sasl
+ *
+ * Provides support for authentication to services via IRCv3 SASL. This is a standardised
+ * alternative to ns_identify that is supported by several IRCds.
+ *
+ * You will need to configure your IRCd to use SASL. See the following links for details:
+ *
+ * InspIRCd: https://docs.inspircd.org/4/modules/sasl/
+ * UnrealIRCd: https://www.unrealircd.org/docs/SASL#Enabling_SASL_on_the_server
+ */
+module
+{
+	name = "ns_sasl"
+
+	/*
+	 * The nick of the client which operates as the SASL agent.
+	 */
+	#agent = "NickServ"
+}
+
 /*
 * ns_set
 *
@@ -505,23 +559,11 @@ command { service = "NickServ"; name = "RESETPASS"; command = "nickserv/resetpas
 *   nickserv/set/display, nickserv/saset/display - Used for setting a users display name.
 *   nickserv/set/email, nickserv/saset/email - Used for setting a users email address.
 *   nickserv/set/keepmodes, nickserv/saset/keepmodes - Configure whether or not services should retain a user's modes across sessions.
- *   nickserv/set/kill, nickserv/saset/kill - Used for configuring nickname protection.
- *   nickserv/set/message, nickserv/saset/message - Used to configure how services send messages to you.
 *   nickserv/set/neverop, nickserv/saset/neverop - Used to configure whether a user can be added to access lists
 *   nickserv/saset/noexpire - Used for configuring noexpire, which prevents nicks from expiring.
 *   nickserv/set/password, nickserv/saset/password  - Used for changing a users password.
 */
-module
-{
-	name = "ns_set"
-
-	/*
-	 * Allow the use of the IMMED option in the NickServ SET KILL command.
-	 *
-	 * This directive is optional.
-	 */
-	#allowkillimmed = yes
-}
+module { name = "ns_set" }

 command { service = "NickServ"; name = "SET"; command = "nickserv/set"; }
 command { service = "NickServ"; name = "SASET"; command = "nickserv/saset"; permission = "nickserv/saset/"; group = "nickserv/admin"; }
@@ -535,15 +577,6 @@ command { service = "NickServ"; name = "SASET DISPLAY"; command = "nickserv/sase
 command { service = "NickServ"; name = "SET EMAIL"; command = "nickserv/set/email"; }
 command { service = "NickServ"; name = "SASET EMAIL"; command = "nickserv/saset/email"; permission = "nickserv/saset/email"; }

-command { service = "NickServ"; name = "SET KEEPMODES"; command = "nickserv/set/keepmodes"; }
-command { service = "NickServ"; name = "SASET KEEPMODES"; command = "nickserv/saset/keepmodes"; permission = "nickserv/saset/keepmodes"; }
-
-command { service = "NickServ"; name = "SET KILL"; command = "nickserv/set/kill"; }
-command { service = "NickServ"; name = "SASET KILL"; command = "nickserv/saset/kill"; permission = "nickserv/saset/kill"; }
-
-command { service = "NickServ"; name = "SET MESSAGE"; command = "nickserv/set/message"; }
-command { service = "NickServ"; name = "SASET MESSAGE"; command = "nickserv/saset/message"; permission = "nickserv/saset/message"; }
-
 command { service = "NickServ"; name = "SET PASSWORD"; command = "nickserv/set/password"; }
 command { service = "NickServ"; name = "SASET PASSWORD"; command = "nickserv/saset/password"; permission = "nickserv/saset/password"; }

@@ -552,6 +585,27 @@ command { service = "NickServ"; name = "SASET NEVEROP"; command = "nickserv/sase

 command { service = "NickServ"; name = "SASET NOEXPIRE"; command = "nickserv/saset/noexpire"; permission = "nickserv/saset/noexpire"; }

+/*
+ * ns_set_keepmodes
+ *
+ * Provides the command nickserv/set/keepmodes and nickserv/saset/keepmodes.
+ *
+ * Allows configuring services to keep user modes across logins.
+ */
+module
+{
+	name = "ns_set_keepmodes"
+
+	/*
+	 * Anope will try to not restore user modes that aren't settable by users. However, if
+	 * you have modes that you don't want to be automatically restored you can list them
+	 * here.
+	 */
+	#norestore = "ABCabc"
+}
+command { service = "NickServ"; name = "SET KEEPMODES"; command = "nickserv/set/keepmodes"; }
+command { service = "NickServ"; name = "SASET KEEPMODES"; command = "nickserv/saset/keepmodes"; permission = "nickserv/saset/keepmodes"; }
+
 /*
 * ns_set_language
 *
@@ -563,6 +617,21 @@ module { name = "ns_set_language" }
 command { service = "NickServ"; name = "SET LANGUAGE"; command = "nickserv/set/language"; }
 command { service = "NickServ"; name = "SASET LANGUAGE"; command = "nickserv/saset/language"; permission = "nickserv/saset/language"; }

+/*
+ * ns_set_message
+ *
+ * Provides the commands nickserv/set/message and nickserv/saset/message.
+ *
+ * Allows users to let services send them PRIVMSGs instead of NOTICEs.
+ *
+ * This might cause problems with badly written clients as the IRC RFC
+ * requires that automatic responses to a PRIVMSG use a NOTICE to avoid
+ * message loops. Only enable this if you are sure this can not happen.
+ */
+#module { name = "ns_set_message" }
+#command { service = "NickServ"; name = "SET MESSAGE"; command = "nickserv/set/message"; }
+#command { service = "NickServ"; name = "SASET MESSAGE"; command = "nickserv/saset/message"; permission = "nickserv/saset/message"; }
+
 /*
 * ns_set_misc
 *
@@ -576,10 +645,26 @@ command { service = "NickServ"; name = "SET URL"; command = "nickserv/set/misc";
 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 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 FACEBOOK"; command = "nickserv/set/misc"; misc_description = _("Associate a Facebook URL with your account"); }
-#command { service = "NickServ"; name = "SASET FACEBOOK"; command = "nickserv/saset/misc"; misc_description = _("Associate a Facebook URL with this account"); permission = "nickserv/saset/facebook"; group = "nickserv/admin"; }
 #command { service = "NickServ"; name = "SET MASTODON"; command = "nickserv/set/misc"; misc_description = _("Associate a Mastodon account with your account"); }
 #command { service = "NickServ"; name = "SASET MASTODON"; command = "nickserv/saset/misc"; misc_description = _("Associate a Mastodon account with this account"); permission = "nickserv/saset/mastodon"; group = "nickserv/admin"; }
+#command { service = "NickServ"; name = "SET TIMEZONE"; command = "nickserv/set/misc"; misc_description = _("Associate a time zone with your account"); }
+#command { service = "NickServ"; name = "SASET TIMEZONE"; command = "nickserv/saset/misc"; misc_description = _("Associate a time zone with this account"); permission = "nickserv/saset/timezone"; group = "nickserv/admin"; }
+
+/*
+ * ns_set_protect
+ *
+ * Provides the commands nickserv/set/protect and kickserv/saset/protect.
+ *
+ * Used for configuring nickname protection.
+ */
+module { name = "ns_set_protect" }
+
+command { service = "NickServ"; name = "SET PROTECT"; command = "nickserv/set/protect"; }
+command { service = "NickServ"; name = "SASET PROTECT"; command = "nickserv/saset/protect"; permission = "nickserv/saset/kill"; }
+
+# For compatibility with Anope 2.0.
+command { service = "NickServ"; name = "SET KILL"; command = "nickserv/set/protect"; hide = true; }
+command { service = "NickServ"; name = "SASET KILL"; command = "nickserv/saset/protect"; permission = "nickserv/saset/protect"; hide = true; }

 /*
 * ns_suspend
@@ -21,7 +21,7 @@ service
 	/*
 	 * The hostname of the OperServ client.
 	 */
-	host = "services.host"
+	host = "${services.host}"

 	/*
 	 * The realname of the OperServ client.
@@ -49,6 +49,17 @@ service
 	 * Prefixes may be given to the channels in the form of mode characters or prefix symbols.
 	 */
 	#channels = "@#services,#mychan"
+
+	/*
+	 * The server alias that can be used to securely message this service. If
+	 * your IRC server does not have an alias for this service you can set this
+	 * to an empty string to tell users to use /msg instead.
+	 *
+	 * This setting is ignored when options:servicealias is disabled.
+	 *
+	 * Defaults to the nick of the service if not set.
+	 */
+	#alias = "OS"
 }

 /*
@@ -491,6 +502,13 @@ module
 	 * This directive is optional, if not set it will default to 3.
 	 */
 	#newscount = 3
+
+	/*
+	 * Whether to show the datetime at which the news entry was added.
+	 *
+	 * This directive is optional, if not set it will default to yes.
+	 */
+	#showdate = yes
 }
 command { service = "OperServ"; name = "LOGONNEWS"; command = "operserv/logonnews"; permission = "operserv/news"; }
 command { service = "OperServ"; name = "OPERNEWS"; command = "operserv/opernews"; permission = "operserv/news"; }
@@ -569,7 +587,7 @@ module
 	 *
 	 * This directive is optional, if not set, nothing will be sent.
 	 */
-	sessionlimitexceeded = "The session limit for your IP %IP% has been exceeded."
+	sessionlimitexceeded = "The session limit for your IP {ip} has been exceeded."

 	/*
 	 * Same as above, but should be used to provide a website address where users can find out more
@@ -638,8 +656,18 @@ command { service = "OperServ"; name = "SET"; command = "operserv/set"; permissi
 *
 * Used to quit, restart, or shutdown services.
 */
-module { name = "os_shutdown" }
-command { service = "OperServ"; name = "QUIT"; command = "operserv/quit"; permission = "operserv/quit"; }
+module
+{
+	name = "os_shutdown"
+
+	/*
+	 * If enabled then server operators will be required to provide the network
+	 * name to confirm that they are quitting, restarting, or shutting down the
+	 * right server.
+	 */
+	requirename = yes
+}
+#command { service = "OperServ"; name = "QUIT"; command = "operserv/quit"; permission = "operserv/quit"; }
 command { service = "OperServ"; name = "RESTART"; command = "operserv/restart"; permission = "operserv/restart"; }
 command { service = "OperServ"; name = "SHUTDOWN"; command = "operserv/shutdown"; permission = "operserv/shutdown"; }

@@ -79,17 +79,20 @@
 /*
 * [OPTIONAL] Defines
 *
- * You can define values to other values, which can be used to easily change
- * many values in the configuration at once.
+ * You can use defines for repeated information, which can be used to easily change many
+ * values in the configuration at once.
+ *
+ * To use a define called foo.bar you use ${foo.bar} in your config file. You can also use
+ * environment variables by prefixing their name with "env." like ${env.USER}.
 */

 /*
- * The stats.host define is used in multiple different locations throughout the
- * configuration for the stats client hostname.
+ * The services.host define is used in multiple different locations throughout the
+ * configuration for the server name and pseudoclient hostnames.
 */
 define
 {
-	name = "stats.host"
+	name = "services.host"
 	value = "stats.example.com"
 }

@@ -208,7 +211,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.example.com"
+	name = "${services.host}"

 	/*
 	 * The text which should appear as the server's information in /WHOIS and similar
@@ -371,12 +374,6 @@ options
 	 */
 	readtimeout = 5s

-	/*
-	 * Sets the interval between sending warning messages for program errors via
-	 * WALLOPS/GLOBOPS.
-	 */
-	warningtimeout = 4h
-
 	/*
 	 * If set, Anope will only show /stats o to IRC Operators. This directive
 	 * is optional.
@@ -0,0 +1,92 @@
+Since the first commit in March 2004 88 people have submitted patches, commits,
+and other useful contributions to Anope. These people, ordered by the number of
+contributions they have made, are:
+
+  * Adam <adam@anope.org>
+  * Sadie Powell <sadie@witchery.services>
+  * Robin Burchell <w00t@inspircd.org>
+  * Naram Qashat <cyberbotx@anope.org>
+  * Pieter Bootsma <geniusdex@anope.org>
+  * Jens Voss <dukepyrolator@anope.org>
+  * David Robson <rob@anope.org>
+  * Florian Schulze <certus@anope.org>
+  * Daniel Engel <dane@zero.org>
+  * Trystan S. Lee <trystan@nomadirc.net>
+  * Robby <robby@chatbelgie.be>
+  * Charles Kingsley <chaz@anope.org>
+  * Lee Holmes <lethality@anope.org>
+  * Gabriel Acevedo H. <drstein@anope.org>
+  * Jan Milants <viper@anope.org>
+  * Adam Kramer <ribosome@anope.org>
+  * Attila Molnar <attilamolnar@hush.com>
+  * Michael Wobst <wobst.michael@web.de>
+  * Mark Summers <mark@goopler.net>
+  * Matt Schatz <genius3000@g3k.solutions>
+  * Daniel Vassdal <shutter@canternet.org>
+  * MatthewM <mcm@they-got.us>
+  * PeGaSuS <droider.pc@gmail.com>
+  * Sebastian V. <hal9000@denorastats.org>
+  * Alvaro Toledo <atoledo@keldon.org>
+  * Dragone2 <dragone2@risposteinformatiche.it>
+  * Björn Stiddien <keeper@anope.org>
+  * n0kS Phr33d0m <god@politeia.in>
+  * Hendrik Jäger <gitcommit@henk.geekmail.org>
+  * k4be <k4be@pirc.pl>
+  * Thomas Fargeix <t.fargeix@gmail.com>
+  * Bram Matthys <syzop@vulnscan.org>
+  * Federico G. Schwindt <fgsch@lodoss.net>
+  * Val Lorentz <progval+git@progval.net>
+  * Alexander Barton <alex@barton.de>
+  * CaPa CuL <capacul@gmail.com>
+  * Cronus <cronus@nite-serv.com>
+  * H7-25 <simos@simosnap.org>
+  * Jyzee <jyzee.git@gmail.com>
+  * Sebastian Barfurth <github@afreshmelon.com>
+  * Zantox <jyoerger10@msn.com>
+  * Zoddo <zoddo.ino@gmail.com>
+  * Dominic Hargreaves <dom@earth.li>
+  * Michael Hazell <michaelhazell@hotmail.com>
+  * Robert Scheck <robert@fedoraproject.org>
+  * Dennis Friis <peavey@inspircd.org>
+  * Filippo Cortigiani <simos@simosnap.org>
+  * Michał Zegan <webczat_200@poczta.onet.pl>
+  * AlphaTech <alphat3ch@icloud.com>
+  * Austin Ellis <siniStar@IRC4Fun.net>
+  * bonnedav <theD_2011@hotmail.com>
+  * Denis M. (Phr33d0m) <god@politeia.in>
+  * Harakiri <harakiri@overstack.fr>
+  * Marcin Łabanowski <marcin@6irc.net>
+  * Matt Ullman <matt@airraidsirens.com>
+  * Michael Stapelberg <michael@robustirc.net>
+  * Alexander Maassen <outsider@twingoversum.scarynet.org>
+  * artemiiav <artemiiav@gmail.com>
+  * blackbeard420 <blackbeard@blackbeard420.me>
+  * BoGu5 <bogus@onzin.org>
+  * Chris Langsenkamp <chris@langsenkamp.com>
+  * Clem Morton
+  * Daniel Oaks <danneh@danneh.net>
+  * Fabio Scotoni <cculex@gmail.com>
+  * ItsOnlyBinary
+  * Jason Foster <retsofaj@gmail.com>
+  * Jeremy <jeremy@ssnet.ca>
+  * Josh Soref
+  * KindOne <ineedalifetoday@live.com>
+  * linuxdaemon
+  * Mantas Mikulėnas <grawity@gmail.com>
+  * Matthew Beeching <jobe@mdbnet.co.uk>
+  * Michael <michaelhazell@hotmail.com>
+  * Mingjie Shen <shen497@purdue.edu>
+  * nekoswag
+  * Peter Tseng <pht24@cornell.edu>
+  * Romain Rivière <lecoyote@lecoyote.org>
+  * Sam James (sam_c) <sam@cmpct.info>
+  * ShutterQuick <shutter@canternet.org>
+  * Sketch <denverfreeburn@outlook.com>
+  * Tim Gunter <tim@vanillaforums.com>
+  * Toni Kaija <diftraku@gmail.com>
+  * Victor Coss <gtaxl@gtaxl.net>
+  * VisioN <vision@myirc.us>
+  * westor <westor7@gmail.com>
+  * Wilson Birney <wpb@360scada.com>
+  * Yann Sionneau <yann@sionneau.net>
+  * Zach Bloomquist <zrbq@live.com>
@@ -1,3 +1,133 @@
+Anope Version 2.1.14-git
+------------------------
+Added a detail specifier to the anope.list{Channels,Opers,Servers,Users} RPC methods.
+Added a matcher for the InspIRCd oper extban.
+Added support for hashed operator passwords.
+Added support for hiding the date news was added in os_news.
+Added support for local password comparison to the sql_authentication module.
+Added support for monthly backups to db_json.
+Added support for unbanning virtual modes using cs_unban.
+Added the !unmute fantasy command.
+Added the anope.account and anope.listAccounts RPC methods to the rpc_data module.
+Added the protection time to the INFO output.
+Allowed unprivileged channel successors to remove themselves from succession.
+Bumped the minimum required CMake version to 3.20.
+Changed deletion callbacks to specify the mask that was deleted if only one was.
+Changed nickserv/alist to show all permissions not just the highest ranked one.
+Fixed NEVEROP not being respected in chanserv/set/founder and chanserv/set/successor.
+Fixed stripping IRC formatting codes from messages.
+Messages are now automatically line wrapped to options:linelength.
+Redocumented the ns_sasl module.
+Removed hardcoded command names from several messages.
+Updated the Windows CI to Windows Server 2025 and Visual Studio 2022.
+
+Anope Version 2.1.13
+--------------------
+Added a Config check to ensure users actually want to use the development branch.
+Added a flag to the version string when Anope is compiled in reproducible mode.
+Added a warning on rehash when the max password is longer than the maximum bcrypt password length.
+Added an ALLTIME handler on InspIRCd.
+Added an opt-out for extended XML-RPC types.
+Added RPC messages for sending global messages.
+Added support for importing cs_set_misc and ns_set_misc data from Atheme.
+Added support for importing news from Atheme.
+Added support for oper-only quit messages.
+Added support for the experimental "services cloak" system from the InspIRCd development branch.
+Added support for using defines from the environment.
+Added support for using defines within the value of a variable.
+Blacklisted an old version of an UnrealIRCd module that is known to send malformed S2S messages.
+Changed RPC events to be registered as core services.
+Changed the database to refer to accounts by their account identifier instead of their display nick.
+Changed the syntax of defines from "foo" to "${foo}".
+Deduplicated JSON generation code in the jsonrpc module.
+Fixed a warning when importing an Atheme account that uses external authentication.
+Fixed counting email addresses in ns_maxemail.
+Fixed db_atheme creating duplicate accounts, bots, and nicks when importing over an existing database.
+Fixed deleting old database backups after Anope has been restarted.
+Fixed importing user metadata from Anope 1.8.
+Fixed including a port in uplink messages when connecting to a UNIX socket endpoint.
+Fixed memo ignores being erroneously case sensitive.
+Fixed modules with third-party dependencies writing generic log messages instead of module log messages.
+Fixed not performing SQL database updates in some rare circumstances.
+Fixed sending global messages with the default sender.
+Imported mkauthors from InspIRCd and used it to generate docs/AUTHORS.txt
+Moved around a bunch of module headers.
+Moved database serialization from the serializable to the serializable type.
+Moved the SASL protocol interface to its own service.
+Refactored handling S2S metadata on InspIRCd.
+Updated more messages to use gettext plural forms.
+
+Anope Version 2.1.12
+--------------------
+Added an example JavaScript library for accessing the RPC interface.
+Added an option to require specifying the server name when running destructive network commands like restart or shutdown.
+Added support for importing X-line identifiers from Atheme.
+Added support for JSON-RPC to the RPC interface.
+Added support for killing SASL users that fail to log in repeatedly.
+Added support for more RPC response types to the RPC interface.
+Added support for multiple targets in chanserv/modes.
+Added support for SSL client certificate fallback fingerprints on InspIRCd.
+Added the anope. prefix to the channel and user RPC events and moved them to the rpc_data module.
+Added the anope.listChannels, anope.listServers, anope.listUsers, and anope.server RPC events to the new rpc_data module.
+Added the OPERONLY, UNUSED and VANITY filters to botserv/botlist.
+Added the system.listMethods RPC event to the new rpc_system module.
+Deprecated support for InspIRCd v3 (scheduled to be removed in around a year).
+Fixed enc_bcrypt silently truncating passwords longer than 71 characters.
+Fixed ns_set_language being able to be loaded when Anope was built without language support.
+Fixed sql_authentication not being able to use the IP address of a RPC, SASL, or web user in SQL queries.
+Made modules that use third-party libraries log the version in use on load.
+Redesigned the RPC interface to add support for emitting multiple data types.
+Replaced the opers RPC event with rpc.listOpers and rpc.oper events in the new rpc_data module.
+Updated the Dutch translation.
+
+Anope Version 2.1.11
+--------------------
+Added support for database migrations to the mysql module.
+Added support for renicking users to their UID when enforcing nickname protection.
+Added support for sending channel URLs to joining users.
+Allowed selecting languages using a shorter version of their name.
+Changed various messages to use human-readable durations instead of seconds.
+Improved the creation of expiry and duration messages.
+Improved the translation system with support for plural forms.
+Reworked how guest nicknames are generated.
+Simplified how account identifiers are allocated.
+
+Anope Version 2.1.10
+--------------------
+Added support for NEXTBANS on UnrealIRCd.
+Changed hostmask access entries added by nick to use that nick as the default description.
+Changed modes to be handled internally in their split form.
+Changed ns_cert to notify a user that their certificate is being automatically added to their account.
+Fixed matching users against extended bans.
+Fixed parsing name-only extended bans on InspIRCd.
+Fixed respecting the preferred extended ban format on InspIRCd.
+Fixed the name of the cron script in the docs.
+Updated the list of supported IRCds.
+Updated the location of the Anope IRC channels
+
+Anope Version 2.1.9
+-------------------
+Bumped the minimum supported version of UnrealIRCd to 6.
+Fixed granting IRC operator status to services operators.
+Fixed making users an IRC operator on InspIRCd.
+Fixed nonicknameownership on InspIRCd v4.
+Fixed some messages not being translatable.
+Fixed the Argon2 module not having test vectors.
+Increased the default nickname expiry period to one year.
+
+Anope Version 2.1.8
+-------------------
+Added account identifiers to the nickserv/info output.
+Added support for bool, float, and uint SQL columns.
+Added the ability to automatically determine SQL column types based on the native type.
+Added UNIX socket support to mysql module.
+Changed smartjoin to use SendClearBans where available.
+Dropped support for MinGW in favour of native builds.
+Fixed parsing named extbans on InspIRCd.
+Fixed parsing SVSMODE and SVS2MODE from UnrealIRCd.
+Fixed sending global messages to remotely linked servers.
+Removed the services server name from the CTCP version response.
+
 Anope Version 2.1.7
 -------------------
 Added importing of akick reasons, forbid reasons, opers and session exceptions to db_atheme.
@@ -1,14 +1,79 @@
+Anope Version 2.1.14-git
+------------------------
+Added oper:password_hash.
+Added options:codelength (defaults to 15).
+Added {os_news}:showdate (defaults to yes).
+Added {sql_authentication}:password_field (defaults to "password").
+Added {sql_authentication}:password_hash.
+Changed the default value for options:linelength to "100".
+Changed the default value for {enc_sha2}:algorithm to "sha512".
+Changed the default value for {ns_seen}:purgetime to "90d".
+Changed the syntax for template variables in mail:emailchange_message, mail:emailchange_subject, mail:memo_message, mail:memo_subject, mail:registration_message, mail:registration_subject,, mail:reset_message, mail:reset_subject, {chanserv}:signkickformat, {dnsbl}:blacklist:reason, {ldap_authentication}:search_filter, {ldap_oper}:binddn, {ldap_oper}:search_filter, {nickserv}:unregistered_notice, {os_session}:sessionlimitexceeded, {proxyscan}:proxyscan:reason.
+
+Anope Version 2.1.13
+--------------------
+Added options:linelength (defaults to 120).
+Added the db_json module.
+Added the rpc_message module.
+Added {nickserv}:defaultprotect (defaults to 1m).
+Added {nickserv}:maxprotect (defaults to 10m).
+Added {nickserv}:minprotect (defaults to 10s)
+Added {xmlrpc}:enable_i8 (defaults to yes).
+Added {xmlrpc}:enable_nil (defaults to yes).
+Changed the syntax for using defines (all existing defines will need to be updated).
+Removed {nickserv}:kill (replaced by custom protection timer durations).
+Removed {nickserv}:killquick (replaced by custom protection timer durations).
+Removed {ns_set_kill}:allowkillimmed (replaced by custom protection timer durations).
+Renamed the nickserv/saset/kill command to nickserv/saset/protect.
+Renamed the nickserv/saset/kill oper privilege to nickserv/saset/protect.
+Renamed the nickserv/set/kill command to nickserv/set/protect.
+Renamed the ns_set_kill module to ns_set_protect.
+Renamed the sasl module to ns_sasl and moved it to nickserv.example.conf.
+
+Anope Version 2.1.12
+--------------------
+Added the jsonrpc module.
+Added the rpc_data module.
+Added the rpc_system module.
+Added {hostserv}:activate_on_deoper (defaults to yes).
+Added {os_shutdown}:requirename (defaults to yes).
+Moved nickserv/set/keepmodes and nickserv/saset/keepmodes to the ns_set_keepmodes module.
+Moved the xmlrpc module to extra.
+Renamed the xmlrpc_main module to rpc_main.
+
+Anope Version 2.1.11
+--------------------
+Moved nickserv/set/kill and nickserv/saset/kill to the ns_set_kill module.
+Moved {ns_set}:allowkillimmed to {ns_set_kill}:allowkillimmed.
+Replaced {nickserv}:guestnickprefix with {nickserv}:guestnick (defaults to Guest####).
+
+Anope Version 2.1.10
+--------------------
+Added options:servicealias (defaults to no)
+Moved nickserv/set/message and nickserv/saset/message to the ns_set_message module.
+Removed options:useprivmsg (replaced by loading the ns_set_message module to enable).
+Removed options:usestrictprivmsg (feature unusable on modern servers, consider migrating to options:servicealias instead).
+
+Anope Version 2.1.9
+-------------------
+No significant changes.
+
+Anope Version 2.1.8
+-------------------
+Added the nickserv/drop/display oper privilege.
+Added {nickserv}:preservedisplay (defaults to no).
+
 Anope Version 2.1.7
 -------------------
 Moved nickserv/set/language and nickserv/saset/language to the ns_set_language module.
-Renamed module:expire for the cs_suspend module to suspendexpire.
-Renamed the FANTASIA privilege to FANTASY.
+Renamed the FANTASIA channel privilege to FANTASY.
+Renamed {cs_suspend}:expire to {cs_suspend}:suspendexpire.

 Anope Version 2.1.6
 -------------------
-Added module:automatic to the ns_cert module (defaults to yes).
-Removed module:use_server_side_mlock for the protocol modules (now always enabled).
-Removed module:use_server_side_topiclock for the protocol modules (now always enabled).
+Added {ns_cert}:automatic (defaults to yes).
+Removed {hybrid,inspircd,solanum,unrealircd}:use_server_side_mlock (now always enabled).
+Removed {inspircd}:use_server_side_topiclock (now always enabled).

 Anope Version 2.1.5
 -------------------
@@ -22,22 +87,21 @@ Added the enc_posix module.
 Added the enc_sha2 module.
 Added the gl_queue module.
 Added the gl_server module.
-Added the global/queue operator privilege.
-Added the global/server operator privilege.
+Added the global/queue oper privilege.
+Added the global/server oper privilege.
 Changed serverinfo:motd to be relative to the config directory.
 Changed serverinfo:pid to be relative to the data directory.
 Changed the default value of mail:sendmailpath to "/usr/sbin/sendmail -it".
-Changed the default value of module:accessmax for the chanserv module to 1000.
-Changed the default value of module:inhabit for the chanserv module to 1 minute.
-Changed the default value of module:max for the cs_mode module to 50.
-Changed the default value of module:max for the ms_ignore module to 50.
-Removed options:seed.
-Replaced module:template for the webcpanel module with module:template_dir.
-
+Changed the default value of {chanserv}:accessmax to 1000.
+Changed the default value of {chanserv}:inhabit to 1 minute.
+Changed the default value of {cs_mode}:max to 50.
+Changed the default value of {ms_ignore}:max to 50.
+Removed options:seed (not needed with modern random number generation).
+Replaced {webcpanel}:template with {webcpanel}:template_dir (defaults to webcpanel/templates/default).

 Anope Version 2.1.3
 -------------------
-Added options:didyoumeandifference.
+Added options:didyoumeandifference (defaults to 4).
 Added support for multiple SSL fingerprints in oper:certfp.
 Added the chanserv/cert oper privilege for modifying other user's certificate lists.
 Changed networkinfo:chanlen to default to 32 if not set.
@@ -47,21 +111,21 @@ Changed networkinfo:nicklen to default to 31 if not set.
 Changed networkinfo:userlen to default to 10 if not set.
 Increased the default maximum password length to 50 characters.
 Increased the default minimum password length to 10 characters.
-Removed the cs_secure option in module:defaults from the chanserv module (now always enabled).
-Removed the nickserv/saset/secure command.
-Removed the nickserv/saset/secure oper privilege.
-Removed the nickserv/set/secure command.
-Removed the nickserv/status command.
-Removed the ns_access module.
-Removed the ns_secure option in module:defaults from the nickserv module (now always enabled).
+Removed the cs_secure option in {chanserv}:defaults (now always enabled as support for nick access lists has been removed).
+Removed the nickserv/saset/secure command (support for nick access lists has been removed).
+Removed the nickserv/saset/secure oper privilege (support for nick access lists has been removed).
+Removed the nickserv/set/secure command (support for nick access lists has been removed).
+Removed the nickserv/status command (obsolete with modern IRCv3 extensions and the removal of nick access lists).
+Removed the ns_access module (support for nick access lists has been removed).
+Removed the ns_secure option in {nickserv}:defaults (now always enabled as support for nick access lists has been removed).

 Anope Version 2.1.2
 -------------------
-Added module:tlsv10 to the ssl_openssl module for configuring whether TLSv1.0 is usable (defaults to no).
-Added module:tlsv11 to the ssl_openssl module for configuring whether TLSv1.1 is usable (defaults to yes).
-Added module:tlsv12 to the ssl_openssl module for configuring whether TLSv1.2 is usable (defaults to yes).
-Removed module:sslv3 from the ssl_openssl module (now always disabled).
+Added {ssl_openssl}:tlsv10 for configuring whether TLSv1.0 is usable (defaults to no).
+Added {ssl_openssl}:tlsv11 for configuring whether TLSv1.1 is usable (defaults to yes).
+Added {ssl_openssl}:tlsv12 for configuring whether TLSv1.2 is usable (defaults to yes).
 Removed the m_ prefix from the names of the chanstats, dns, dnsbl, helpchan, httpd, ldap, ldap_oper, mysql, proxyscan, redis, regex_pcre2, regex_posix, regex_stdlib, regex_tre, rewrite, sasl, sql_log, sql_oper, sqlite, ssl_gnutls, ssl_openssl, xmlrpc, and xmlrpc_main modules.
+Removed {ssl_openssl}:sslv3 (now always disabled).

 Anope Version 2.1.1
 -------------------
@@ -71,7 +135,7 @@ Removed the m_regex_pcre module (use m_regex_pcre2 instead).
 Anope Version 2.1.0
 -------------------
 Added nickserv:minpasslen for configuring the minimum password length (defaults to 8).
-Removed nickserv:strictpasswords as it is obsolete now nickserv:minpasslen exists.
+Removed nickserv:strictpasswords (obsolete now nickserv:minpasslen exists).
 Removed the inspircd12 and inspircd20 modules (use inspircd instead).
 Removed the ns_getpass module (no supported encryption modules).
 Removed the os_oline module (no supported IRCds).
@@ -80,4 +144,4 @@ Renamed nickserv:passlen to nickserv:maxpasslen.
 Renamed the charybdis module to solanum.
 Renamed the inspircd3 module to inspircd.
 Renamed the unreal4 module to unrealircd.
-Replaced uplink:ipv6 with uplink:protocol.
+Replaced uplink:ipv6 with uplink:protocol (defaults to ipv4).
@@ -90,4 +90,4 @@ Anope DefCon
 6) Support

    You might get DefCon support by posting on our online forum, or maybe on
-    our #anope channel at /server irc.anope.org.
+    our #anope channel at /server irc.teranova.net.
@@ -27,7 +27,7 @@ Note: You should also read the README and FAQ files!
        cmake --version

    If it's installed, you will get a line that says something similar to
-    "cmake version 2.8.12.2". If the version is less than 2.4 or you get
+    "cmake version 3.28.3". If the version is less than 3.20.0 or you get
    an error saying the command was not found, you will not be able to use
    CMake unless you install it yourself into your home directory. CMake
    can be downloaded from:
@@ -60,7 +60,7 @@ Note: You should also read the README and FAQ files!
    most likely not work!

    If you need help, you should visit https://forum.anope.org/ or #anope on
-    irc.anope.org. Provide *complete* error output, along with other relevant
+    irc.teranova.net. Provide *complete* error output, along with other relevant
    information eg. OS, compiler and C++ library versions.
    See the README file for more information.

@@ -111,17 +111,17 @@ Note: You should also read the README and FAQ files!
    A crontab entry will allow you to check periodically whether Anope is
    still running, and restart it if not.

-    First rename the example.chk script that is in Anope path (by default,
-    this is ~/anope/conf) to anope.chk and edit it. You'll need to
+    First rename the cron.example.sh script that is in Anope path (by default,
+    this is ~/anope/conf) to cron.sh and edit it. You'll need to
    modify the CONFIGURATION part of the file. Then ensure that the file is
-    marked as executable by typing chmod +x anope.chk, and try to launch the
+    marked as executable by typing chmod +x cron.sh, and try to launch the
    script to see if it works (Anope must not be running when you do this ;))

    When this is done, you'll have to add the crontab entry. Type crontab -e.
    This will open the default text editor with the crontab file. Enter the
    following (with correct path):

-        */5 * * * * /home/ircd/anope/conf/anope.chk >/dev/null 2>&1
+        */5 * * * * /home/ircd/anope/conf/cron.sh >/dev/null 2>&1

    The */5 at the beginning means "check every 5 minutes". You may replace
    the 5 with other another number if you want (but less than 60). Consult
@@ -27,7 +27,7 @@ Note : Vous devrez également lire les fichiers README et FAQ !
        cmake --version

    Si CMake est installé, vous aurez une ligne qui dit quelque chose comme
-    "cmake version 2.8.12.2". Si la version est inférieure à 2.4 ou si vous
+    "cmake version 3.28.3". Si la version est inférieure à 3.20.0 ou si vous
    obtenez une erreur disant que la commande n'a pas été trouvée, vous ne
    pourrez pas utiliser CMake à moins de l'installer vous-même dans votre
    répertoire home. CMake peut être téléchargé ici :
@@ -64,7 +64,7 @@ Note : Vous devrez également lire les fichiers README et FAQ !
    recommandée, et Anope ne fonctionnera probablement pas !

    Si vous avez besoin d'aide, vous pouvez aller sur le site
-    https://forum.anope.org/ ou le canal #anope sur irc.anope.org.
+    https://forum.anope.org/ ou le canal #anope sur irc.teranova.net.
    Fournissez *l'essemble* des erreurs qui apparaîssent, en plus de
    toutes informations utiles, comme les versions de votre OS, du
    compilateur utilisé et de la librairie C++. Lisez le fichier README
@@ -121,11 +121,11 @@ Note : Vous devrez également lire les fichiers README et FAQ !
    Une entrée crontab vous permettra de vérifier périodiquement si Anope
    est toujours en cours d'exécution et de le redémarrer s'il n'est pas.

-    D'abord renommez le script example.chk qui est dans les dossiers
-    d'Anope (par défaut, ~/anope/conf) en anope.chk et modifiez-le.
+    D'abord renommez le script cron.example.sh qui est dans les dossiers
+    d'Anope (par défaut, ~/anope/conf) en cron.sh et modifiez-le.
    Vous aurez besoin de modifier la partie CONFIGURATION du fichier.
    Assurez-vous ensuite que le fichier est marqué comme exécutable en
-    tapant chmod +x anope.chk et essayez de lancer le script pour voir
+    tapant chmod +x cron.sh et essayez de lancer le script pour voir
    si cela fonctionne (Anope ne doit pas être en marche lorsque vous
    testez cela ;))

@@ -133,7 +133,7 @@ Note : Vous devrez également lire les fichiers README et FAQ !
    crontab -e. Cela va ouvrir l'éditeur de texte par défaut avec le
    fichier crontab. Entrez la ligne suivante (avec le chemin correct) :

-        */5 * * * * /home/ircd/anope/conf/anope.chk > /dev/null 2>&1
+        */5 * * * * /home/ircd/anope/conf/cron.sh > /dev/null 2>&1

    Le */5 au début signifie "vérifier toutes les 5 minutes". Vous pouvez
    remplacer le 5 par un autre numéro si vous voulez (mais moins de 60).
@@ -19,6 +19,8 @@ Anope Multi Language Support
        Then execute:
        dpkg-reconfigure locales

+    If you have already built Anope you will need to delete the build directory and rebuild from scratch.
+
    Building Anope on Windows with gettext support is explained in docs/WIN32.txt

 2) Adding a new language
@@ -32,10 +34,9 @@ Anope Multi Language Support
    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).

-    If you have finished a language file translation and you want others to use it, please send it to team@anope.org
-    (don't forget to mention clearly your (nick)name, your email and the language name). You'll of course get full credit for it.
-
-    NOTE: There is no guarantee we will use your work so please do not be offended if we say no thanks.
+    If you have finished a language file translation and you want others to use it, please file a pull request on GitHub
+    or send it to team@anope.org (don't forget to mention clearly your (nick)name, your email and the language name).
+    You'll of course get full credit for it.

 3) Using languages with modules

@@ -111,7 +111,7 @@ Anope Modules
    Use modules at your own risk, and make sure you get them from a
    reputable source. You might get module support by contacting the module
    author, posting on our online forum, or maybe on our #anope channel
-    at /server irc.anope.org.
+    at /server irc.teranova.net.

 7) Information for Developers

@@ -1,7 +1,7 @@
 Anope -- a set of IRC services for IRC networks
 -----------------------------------------------

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

@@ -167,13 +167,13 @@ Table of Contents
    Anope currently works with:

        * Bahamut 2.0 or later
-        * ircd-hybrid 8.2.23 or later
        * InspIRCd 3 or later
+        * ircd-hybrid 8.2.23 or later
+        * ircd-ratbox 3 or later
        * ngIRCd 19.2 or later
        * Plexus 3 or later
-        * Ratbox 2.0.6 or later
        * Solanum (all versions)
-        * UnrealIRCd 4 or later
+        * UnrealIRCd 6 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.
@@ -245,7 +245,7 @@ Table of Contents

    If you read the documentation carefully, and didn't find the answer to
    your question, feel free to post on the website forums or join our irc
-    channel (irc.anope.org #anope). Once you join our Support channel be as
+    channel (irc.teranova.net #anope). Once you join our Support channel be as
    precise as possible when asking a question, because we have no extraordinary
    powers and can't guess things if they aren't provided.

@@ -0,0 +1,21 @@
+RPC using JSON-RPC and XML-RPC (using PECL's xmlrpc_encode_request and xmlrpc_decode functions) is supported.
+
+This allows external applications, such as websites, to execute remote procedure calls to Anope in real time.
+
+Currently there are 5 supported RPC calls, provided by rpc_main:
+
+checkAuthentication - Takes two parameters, an account name and a password. Checks if the account name is valid and the password
+                      is correct for the account name, useful for making login pages on websites.
+
+command - Takes three parameters, a service name (BotServ, ChanServ, NickServ), a user name (whether online or not), and the command
+          to execute. This will execute the given command to Anope using the given service name. If the user given is online, the
+	  command reply will go to them, if not it is returned by RPC.
+
+stats - Takes no parameters, returns miscellaneous stats that can be found in the /operserv stats command.
+
+RPC was designed to be used with db_sql, and will not return any information that can be pulled from the SQL
+database, such as accounts and registered channel information. It is instead used for pulling realtime data such
+as users and channels currently online. For examples on how to use these calls in PHP, see xmlrpc.php in docs/RPC.
+
+Also note that when using XMLRPC the parameter named "id" is reserved for query ID. If you pass a query to Anope containing a value for id. it will
+be stored by Anope and the same id will be passed back in the result.
@@ -0,0 +1,211 @@
+// SPDX-License-Identifier: CC0-1.0
+"use strict";
+
+/** Implements methods for accessing an Anope JSON-RPC server. */
+class AnopeRPC {
+
+	/**
+	 * Initializes a new AnopeRPC instance with the specified RPC host.
+	 *
+	 * @param {string} The RPC host base URL.
+	 */
+	constructor(host) {
+		this.host = host;
+	}
+
+	/**
+	 * Executes an arbitrary RPC query.
+	 *
+	 * @param {string} method The name of the method to execute.
+	 * @param {...*} params The parameters pass to the method.
+	 * @returns {*} The result of the RPC query.
+	 */
+	async run(method, ...params) {
+		const request = JSON.stringify({
+			"jsonrpc": "2.0",
+			"method": method,
+			"params": params,
+			"id": Math.random().toString(36).slice(2)
+		});
+		const response = await fetch(this.host, {
+			method: 'POST',
+			body: request
+		});
+		if (!response.ok) {
+			throw new Error(`HTTP returned ${response.status}`)
+		}
+		const json = await response.json();
+		if ("error" in json) {
+			throw new Error(`JSON-RPC returned ${json.error.code}: ${json.error.message}`)
+		}
+		if ("result" in json) {
+			return json.result;
+		}
+		return null;
+	}
+
+	/**
+	 * Retrieves a list of accounts.
+	 *
+	 * Requires the rpc_data module to be loaded.
+	 *
+	 * @param {string} The level of detail to request.
+	 * @returns {array} An array of account names.
+	 */
+	listAccounts(detail = "name") {
+		return this.run("anope.listAccounts", detail);
+	}
+
+	/**
+	 * Retrieves information about the specified account.
+	 *
+	 * Requires the rpc_data module to be loaded.
+	 *
+	 * @param {string} name The name of the account.
+	 * @returns {object} An object containing information about the account.
+	 */
+	account(name) {
+		return this.run("anope.account", name);
+	}
+
+	/**
+	 * Retrieves a list of channels.
+	 *
+	 * Requires the rpc_data module to be loaded.
+	 *
+	 * @param {string} The level of detail to request.
+	 * @returns {array} An array of channel names.
+	 */
+	listChannels(detail = "name") {
+		return this.run("anope.listChannels", detail);
+	}
+
+	/**
+	 * Retrieves information about the specified channel.
+	 *
+	 * Requires the rpc_data module to be loaded.
+	 *
+	 * @param {string} name The name of the channel.
+	 * @returns {object} An object containing information about the channel.
+	 */
+	channel(name) {
+		return this.run("anope.channel", name);
+	}
+
+	/**
+	 * Retrieves a list of services operators.
+	 *
+	 * Requires the rpc_data module to be loaded.
+	 *
+	 * @param {string} The level of detail to request.
+	 * @returns {array} An array of channel names.
+	 */
+	listOpers(detail = "name") {
+		return this.run("anope.listOpers", detail);
+	}
+
+	/**
+	 * Retrieves information about the specified services operator.
+	 *
+	 * Requires the rpc_data module to be loaded.
+	 *
+	 * @param {string} name The name of the services operator.
+	 * @returns {object} An object containing information about the services operator.
+	 */
+	oper(name) {
+		return this.run("anope.oper", name);
+	}
+
+	/**
+	 * Retrieves a list of servers.
+	 *
+	 * Requires the rpc_data module to be loaded.
+	 *
+	 * @param {string} The level of detail to request.
+	 * @returns {array} An array of servers names.
+	 */
+	listServers(detail = "name") {
+		return this.run("anope.listServers", detail);
+	}
+
+	/**
+	 * Retrieves information about the specified server.
+	 *
+	 * Requires the rpc_data module to be loaded.
+	 *
+	 * @param {string} name The name of the server.
+	 * @returns {object} An object containing information about the server.
+	 */
+	server(name) {
+		return this.run("anope.server", name);
+	}
+
+	/**
+	 * Retrieves a list of users.
+	 *
+	 * Requires the rpc_data module to be loaded.
+	 *
+	 * @param {string} The level of detail to request.
+	 * @returns {array} An array of channel names.
+	 */
+	listUsers(detail = "name") {
+		return this.run("anope.listUsers", detail);
+	}
+
+	/**
+	 * Retrieves information about the specified user.
+	 *
+	 * Requires the rpc_data module to be loaded.
+	 *
+	 * @param {string} nick The nick of the user.
+	 * @returns {object} An object containing information about the user.
+	 */
+	user(nick) {
+		return this.run("anope.user", nick);
+	}
+
+	/**
+	 * Sends a message to every user on the network.
+	 *
+	 * Requires the rpc_message module to be loaded.
+	 *
+	 * @param {...*} messages One or more messages to send.
+	 */
+	messageNetwork(...messages) {
+		return this.run("anope.messageNetwork", ...messages);
+	}
+
+	/**
+	 * Sends a message to every user on the specified server.
+	 *
+	 * Requires the rpc_message module to be loaded.
+	 *
+	 * @param {string} name The name of the server.
+	 * @param {...*} messages One or more messages to send.
+	 */
+	messageServer(server, ...messages) {
+		return this.run("anope.messageServer", server, ...messages);
+	}
+
+	/**
+	 * Sends a message to the specified user.
+	 *
+	 * Requires the rpc_message module to be loaded.
+	 *
+	 * @param {string} source The source pseudoclient to send the message from.
+	 * @param {string} target The target user to send the message to.
+	 * @param {...*} messages One or more messages to send.
+	 */
+	messageUser(source, target, ...messages) {
+		return this.run("anope.messageUser", source, target, ...messages);
+	}
+}
+
+/*
+const arpc = new AnopeRPC("http://127.0.0.1:8080/jsonrpc");
+arpc.listServers().then(servers => {
+	console.log(servers);
+}).catch (error => {
+	console.log(error);
+});
+*/
@@ -1,23 +1,23 @@
 <?php

 /**
- * XMLRPC Functions
+ * JSON-RPC functions
 *
- * (C) 2003-2024 Anope Team
+ * (C) 2003-2025 Anope Team
 * Contact us at team@anope.org
 */

-class AnopeXMLRPC
+class AnopeRPC
 {
    /**
-     * The XMLRPC host
+     * The RPC host
     *
     * @var string
     */
    private $host;

    /**
-     * Initiate a new AnopeXMLRPC instance
+     * Initiate a new AnopeRPC instance
     *
     * @param $host
     */
@@ -27,7 +27,7 @@ class AnopeXMLRPC
    }

    /**
-     * Run an XMLRPC command. Name should be a query name and params an array of parameters, eg:
+     * Run an RPC command. Name should be a query name and params an array of parameters, eg:
     * $this->raw("checkAuthentication", ["adam", "qwerty"]);
     * If successful returns back an array of useful information.
     *
@@ -40,14 +40,19 @@ class AnopeXMLRPC
     */
    public function run($name, $params)
    {
-        $xmlquery = xmlrpc_encode_request($name, $params);
+        $request = json_encode([
+            "jsonrpc" => "2.0",
+            "id" => uniqid(),
+            "method" => $name,
+            "params" => $params,
+        ]);
        $context = stream_context_create(["http" => [
            "method" => "POST",
-            "header" => "Content-Type: text/xml",
-            "content" => $xmlquery]]);
+            "header" => "Content-Type: application/json",
+            "content" => $request]]);

        $inbuf = file_get_contents($this->host, false, $context);
-        $response = xmlrpc_decode($inbuf);
+        $response = json_decode($inbuf, true);

        if ($response) {
            return $response;
@@ -85,8 +90,8 @@ class AnopeXMLRPC
    {
        $ret = $this->run("checkAuthentication", [$account, $pass]);

-        if ($ret && $ret["result"] == "Success") {
-            return $ret["account"];
+        if ($ret && array_key_exists("result", $ret) && array_key_exists("account", $ret["result"])) {
+            return $ret["result"]["account"];
        }

        return null;
@@ -112,7 +117,7 @@ class AnopeXMLRPC
     */
    public function channel($channel)
    {
-        return $this->run("channel", [$channel]);
+        return $this->run("anope.channel", [$channel]);
    }

    /**
@@ -127,7 +132,7 @@ class AnopeXMLRPC
     */
    public function notice($source, $target, $message)
    {
-        return $this->run("notice", [$source, $target, $message]);
+        return $this->run("anope.messageUser", [$source, $target, $message]);
    }

    /**
@@ -138,8 +143,8 @@ class AnopeXMLRPC
     */
    public function user($user)
    {
-        return $this->run("user", [$user]);
+        return $this->run("anope.user", [$user]);
    }
 }

-$anope = new AnopeXMLRPC("http://127.0.0.1:8080/xmlrpc");
+$anope = new AnopeRPC("http://127.0.0.1:8080/jsonrpc");
@@ -0,0 +1,457 @@
+# Anope `rpc_data` RPC interface
+
+## `anope.listAccounts`
+
+Lists all accounts that exist on the network.
+
+### Parameters
+
+Index | Description
+----- | -----------
+0     | If specified then the level of detail to retrieve. Can be set to "full" to retrieve all information or "name" to just retrieve the account names. Defaults to "name".
+
+### Errors
+
+Code   | Description
+------ | -----------
+-32099 | The specified detail level does not exist.
+
+### Result
+
+If the detail level is not specified or is "name" then an array of account names.
+
+If the detail level is "full" then a mapping of account names to information about the account. See `anope.account` for more information on the data structure.
+
+#### Example
+
+```json
+["account1", "account2", "account3"]
+```
+
+## `anope.account`
+
+Retrieves information about the specified account.
+
+### Parameters
+
+Index | Description
+----- | -----------
+0     | A nickname belonging to the account.
+
+### Errors
+
+Code   | Description
+------ | -----------
+-32099 | The specified account does not exist.
+
+### Result
+
+Returns a map containing information about the account.
+
+Key                    | Type           | Description
+---                    | ----           | -----------
+display                | string         | The display nickname of the account.
+email                  | string or null | The email address associated with the account or null if one has not been specified.
+extensions             | map            | A key-value map of the extensions set on this account by modules.
+language               | string or null | The language associated with the account or null if the account uses the default language.
+lastmail               | int            | The time at which an email was last sent for this account.
+nicks                  | map            | Information about nicknames that belong to the account keyed by the nickname.
+nicks.\*.extensions    | map            | A key-value map of the extensions set on this nickname by modules.
+nicks.\*.lastseen      | int            | The time at which this nickname was last used.
+nicks.\*.registered    | int            | The time at which this nickname was registered.
+nicks.\*.vhost         | map or null    | The vhost associated with the account or null if the user has no vhost.
+nicks.\*.vhost.created | int            | The time at which the vhost was created.
+nicks.\*.vhost.creator | string         | The nickname of the creator of the vhost.
+nicks.\*.vhost.host    | string         | The host segment of the vhost.
+nicks.\*.vhost.ident   | string or null | The ident segment of the vhost or null if there is not one.
+nicks.\*.vhost.mask    | string         | The user@host or host mask of the vhost.
+opertype               | map or null    | The oper type associated with the account or null if they are not a services operator.
+opertype.commands      | array[string]  | The commands that the services operator type can use.
+opertype.name          | string         | The name of the services operator type.
+opertype.privileges    | array[string]  | The privileges that the services operator type has.
+registered             | int            | The time at which the account was registered.
+uniqueid               | uint           | The unique immutable identifier of the account.
+users                  | array[string]  | The IRC users who are currently logged in to this account.
+
+#### Example
+
+```json
+{
+	"display": "foo",
+	"email": "example@example.com",
+	"extensions": {
+		"AUTOOP": true,
+		"HIDE_EMAIL": true,
+		"HIDE_MASK": true,
+		"MEMO_RECEIVE": true,
+		"MEMO_SIGNON": true,
+		"NS_PRIVATE": true,
+		"PROTECT": true,
+		"PROTECT_AFTER": 69
+	},
+	"language": null,
+	"lastmail": 1745071858,
+	"nicks": {
+		"foo": {
+			"extensions": {
+				"NS_NO_EXPIRE": true
+			},
+			"lastseen": 1745074153,
+			"registered": 1745071857,
+			"vhost": null
+		},
+		"bar": {
+			"extensions": {},
+			"lastseen": 1745072602,
+			"registered": 1745071857,
+			"vhost": {
+				"created": 1745072653,
+				"creator": "foo",
+				"host": "bar.baz",
+				"ident": "foo",
+				"mask": "foo@bar.baz"
+			}
+		}
+	},
+	"opertype": {
+		"commands": ["hostserv/*", "operserv/session"],
+		"name": "Helper",
+		"privileges": ["chanserv/no-register-limit"]
+	},
+	"registered": 1745071857,
+	"uniqueid": 11085415958920757000,
+	"users": [
+		"foo"
+	]
+}
+```
+## `anope.listChannels`
+
+Lists all channels that exist on the network.
+
+### Parameters
+
+Index | Description
+----- | -----------
+0     | If specified then the level of detail to retrieve. Can be set to "full" to retrieve all information or "name" to just retrieve the channel names. Defaults to "name".
+
+### Errors
+
+Code   | Description
+------ | -----------
+-32099 | The specified detail level does not exist.
+
+### Result
+
+If the detail level is not specified or is "name" then an array of channel names.
+
+If the detail level is "full" then a mapping of channel names to information about the channel. See `anope.channel` for more information on the data structure.
+
+#### Example
+
+```json
+["#chan1", "#chan2", "#chan3"]
+```
+
+## `anope.channel`
+
+Retrieves information about the specified channel.
+
+### Parameters
+
+Index | Description
+----- | -----------
+0     | The name of the channel.
+
+### Errors
+
+Code   | Description
+------ | -----------
+-32099 | The specified channel does not exist.
+
+### Result
+
+Returns a map containing information about the channel.
+
+Key         | Type          | Description
+---         | ----          | -----------
+created     | int           | The UNIX time at which the channel was originally created.
+listmodes   | map           | List modes which are set on the channel keyed by the mode character.
+modes       | array[string] | Flag and parameter modes which are set on the channel.
+name        | string        | The name of the channel.
+registered  | boolean       | Whether the channel is registered.
+topic       | map or null   | The channel topic or null if no topic is set.
+topic.setat | int           | The time at which the topic was set.
+topic.setby | string        | The nick or nuh of the user who set the topic.
+topic.value | string        | The text of the topic.
+users       | array[string] | The users that are current in the channel prefixed by their status mode prefixes.
+
+#### Example
+
+```json
+{
+	"created": 1740402691,
+	"listmodes": {
+		"b": ["foo!bar@baz", "account:bax"],
+	},
+	"modes": ["+knrt", "secret"],
+	"name": "#chan1",
+	"registered": true,
+	"topic": {
+		"setat": 1740404706,
+		"setby": "nick1",
+		"value": "Example channel topic"
+	},
+	"users": ["@nick1", "nick2"]
+}
+```
+
+## `anope.listOpers`
+
+Lists all services operators that exist on the network.
+
+### Parameters
+
+Index | Description
+----- | -----------
+0     | If specified then the level of detail to retrieve. Can be set to "full" to retrieve all information or "name" to just retrieve the services operator nicknames. Defaults to "name".
+
+### Errors
+
+Code   | Description
+------ | -----------
+-32099 | The specified detail level does not exist.
+
+### Result
+
+If the detail level is not specified or is "name" then an array of services operator names.
+
+If the detail level is "full" then a mapping of services operator names to information about the services operator. See `anope.oper` for more information on the data structure.
+
+#### Example
+
+```json
+["nick1", "nick2", "nick3"]
+```
+
+## `anope.oper`
+
+Retrieves information about the specified services operator.
+
+### Parameters
+
+Index | Description
+----- | -----------
+0     | The name of the services operator.
+
+### Errors
+
+Code   | Description
+------ | -----------
+-32099 | The specified services operator does not exist.
+
+### Result
+
+Returns a map containing information about the services operator.
+
+Key                 | Type                  | Description
+---                 | ----                  | -----------
+fingerprints        | array[string] or null | The client certificate fingerprints that a user must be using to log in as this services operator or null if there are no client certificate restrictions.
+hosts               | array[string] or null | The user@ip and user@ip masks that a user must be connecting from to log in as this services operator or null if there are no host restrictions.
+name                | string                | The name of the services operator.
+operonly            | boolean               | Whether a user has to be a server operator to log in as this services operator.
+opertype            | map                   | The oper type associated with the services operator.
+opertype.commands   | array[string]         | The commands that the services operator type can use.
+opertype.name       | string                | The name of the services operator type.
+opertype.privileges | array[string]         | The privileges that the services operator type has.
+password            | boolean               | Whether a user has to specify a password to log in as the services operator.
+vhost               | string or null        | The vhost of the services operator or null if there is no vhost.
+
+#### Example
+
+```json
+{
+	"fingerprints": null,
+	"hosts": ["*@*.example.com"],
+	"name": "stest",
+	"operonly": true,
+	"opertype": {
+		"commands": ["hostserv/*", "operserv/session"],
+		"name": "Helper",
+		"privileges": ["chanserv/no-register-limit"]
+	},
+	"password": false,
+	"vhost": null
+}
+```
+
+## `anope.listServers`
+
+Lists all servers that exist on the network.
+
+### Parameters
+
+Index | Description
+----- | -----------
+0     | If specified then the level of detail to retrieve. Can be set to "full" to retrieve all information or "name" to just retrieve the server names. Defaults to "name".
+
+### Errors
+
+Code   | Description
+------ | -----------
+-32099 | The specified detail level does not exist.
+
+### Result
+
+If the detail level is not specified or is "name" then an array of server names.
+
+If the detail level is "full" then a mapping of server names to information about the server. See `anope.server` for more information on the data structure.
+
+#### Example
+
+```json
+["irc1.example.com", "irc2.example.com", "services.example.com"]
+```
+
+## `anope.server`
+
+Retrieves information about the specified server.
+
+### Parameters
+
+Index | Description
+----- | -----------
+0     | The name of the server.
+
+### Errors
+
+Code   | Description
+------ | -----------
+-32099 | The specified server does not exist.
+
+### Result
+
+Returns a map containing information about the server.
+
+Key         | Type           | Description
+---         | ----           | -----------
+description | string         | The description of the server.
+downlinks   | array[string]  | The servers which are behind this server
+juped       | boolean        | Whether the server has been juped.
+name        | string         | The name of the server.
+sid         | string or null | The unique immutable identifier of the server or null if the IRCd does not use SIDs.
+synced      | boolean        | Whether the server has finished syncing.
+ulined      | boolean        | Whether the server is U-lined.
+uplink      | string or null | The server in front of this server or null if it is the services server.
+
+#### Example
+
+```json
+{
+	"description": "Anope IRC Services",
+	"downlinks": ["irc.example.com"],
+	"juped": false,
+	"name": "services.example.com",
+	"sid": "00B",
+	"synced": true,
+	"ulined": true,
+	"uplink": null
+}
+```
+
+## `anope.listUsers`
+
+Lists all users that exist on the network.
+
+### Parameters
+
+Index | Description
+----- | -----------
+0     | If specified then the level of detail to retrieve. Can be set to "full" to retrieve all information or "name" to just retrieve the user nicknames. Defaults to "name".
+
+### Errors
+
+Code   | Description
+------ | -----------
+-32099 | The specified detail level does not exist.
+
+### Result
+
+If the detail level is not specified or is "name" then an array of user nicknames.
+
+If the detail level is "full" then a mapping of user nicknames to information about the user. See `anope.user` for more information on the data structure.
+
+#### Example
+
+```json
+["nick1", "nick2", "nick3"]
+```
+
+## `anope.user`
+
+Retrieves information about the specified user.
+
+### Parameters
+
+Index | Description
+----- | -----------
+0     | The nickname of the user.
+
+### Errors
+
+Code   | Description
+------ | -----------
+-32099 | The specified user does not exist.
+
+### Result
+
+Returns a map containing information about the user.
+
+Key              | Type           | Description
+---              | ----           | -----------
+account          | map or null    | The user's account or null if they are not logged in to an account.
+account.display  | string         | The display nickname of the account.
+account.opertype | string or null | The account's oper type or null if the account is not a services operator.
+account.uniqueid | uint           | The unique immutable identifier of the account.
+address          | string         | The IP address the user is connecting from.
+channels         | array[string]  | The channels that the user is in prefixed by their status mode prefixes.
+chost            | string or null | The cloaked hostname of the user or null if they have no cloak.
+fingerprint      | string or null | The fingerprint of the user's client certificate or null if they are not using one.
+host             | string         | The real hostname of the user.
+ident            | string         | The username (ident) of the user.
+modes            | array[string]  | Flag and parameter modes which are set on the user.
+nick             | string         | The nickname of the user.
+nickchanged      | int            | The time at which the user last changed their nickname.
+real             | string         | The real name of the user.
+server           | string         | The server that the user is connected to.
+signon           | int            | The time at which the user connected to the network.
+uid              | string or null | The unique immutable identifier of the user or null if the IRCd does not use UIDs.
+vhost            | string or null | The virtual host of the user or null if they have no vhost.
+vident           | string or null | The virtual ident (username) of the user or null if they have no vident.
+
+#### Example
+
+```json
+{
+	"account": {
+		"display": "nick1",
+		"opertype": "Services Root",
+		"uniqueid": "17183514657819486040"
+	},
+	"address":  "127.0.0.1",
+	"channels": ["@#chan1", "#chan2"],
+	"chost": "localhost",
+	"fingerprint": null,
+	"host": "localhost",
+	"id": "9TSAAAAAA",
+	"ident": "user1",
+	"modes": ["+r"],
+	"nick": "nick1",
+	"nickchanged": 1740408318,
+	"real": "An IRC User",
+	"server": "irc.example.com",
+	"signon": 1740408296,
+	"vhost": "staff.example.com",
+	"vident": null,
+}
+```
@@ -0,0 +1,67 @@
+# Anope `rpc_message` RPC interface
+
+## `anope.messageNetwork`
+
+Sends a message to all users on the network.
+
+### Parameters
+
+Index | Description
+----- | -----------
+0+    | One or more messages to send.
+
+### Errors
+
+Code   | Description
+------ | -----------
+-32099 | The global service is not available.
+
+### Result
+
+This procedure returns no result.
+
+## `anope.messageServer`
+
+Sends a message to all users on the specified server.
+
+### Parameters
+
+Index | Description
+----- | -----------
+0     | The name of the server to message users on.
+1+    | One or more messages to send.
+
+### Errors
+
+Code   | Description
+------ | -----------
+-32099 | The global service is not available.
+-32098 | The specified server does not exist.
+
+### Result
+
+This procedure returns no result.
+
+## `anope.messageUser`
+
+Sends a message to the specified user.
+
+### Parameters
+
+Index | Description
+----- | -----------
+0     | The source pseudoclient to send the message from.
+1     | The target user to send the message to.
+2+    | One or more messages to send.
+
+### Errors
+
+Code   | Description
+------ | -----------
+-32099 | The specified source does not exist.
+-32098 | The specified target does not exist.
+
+### Result
+
+This procedure returns no result.
+
@@ -1,29 +0,0 @@
-XMLRPC using PHP's xmlrpc_encode_request and xmlrpc_decode functions is supported.
-This allows external applications, such as websites, to execute remote procedure calls to Anope in real time.
-
-Currently there are 5 supported XMLRPC calls, provided by xmlrpc_main:
-
-checkAuthentication - Takes two parameters, an account name and a password. Checks if the account name is valid and the password
-                      is correct for the account name, useful for making login pages on websites.
-
-command - Takes three parameters, a service name (BotServ, ChanServ, NickServ), a user name (whether online or not), and the command
-          to execute. This will execute the given command to Anope using the given service name. If the user given is online, the
-	  command reply will go to them, if not it is returned by XMLRPC.
-
-stats - Takes no parameters, returns miscellaneous stats that can be found in the /operserv stats command.
-
-channel - Takes one parameter, a channel name, and returns real time information regarding that channel, such as users, modes
-          (ban lists and such), topic etc.
-
-user - Takes one parameter, a user name, and returns real time information regarding that user.
-
-opers - Takes no parameters, returns opertypes, their privileges and commands.
-
-notice - Takes three parameters, source user, target user, and message. Sends a message to the user.
-
-XMLRPC was designed to be used with db_sql, and will not return any information that can be pulled from the SQL
-database, such as accounts and registered channel information. It is instead used for pulling realtime data such
-as users and channels currently online. For examples on how to use these calls in PHP, see xmlrpc.php in docs/XMLRPC.
-
-Also note that the parameter named "id" is reserved for query ID. If you pass a query to Anope containing a value for id. it will
-be stored by Anope and the same id will be passed back in the result.
@@ -1,6 +1,6 @@
 /*
 *
- * (C) 2003-2024 Anope Team
+ * (C) 2003-2025 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -74,6 +74,16 @@ public:
 class CoreExport ChanAccess
 	: public Serializable
 {
+public:
+	struct Type final
+		: public Serialize::Type
+	{
+		Type();
+		void Serialize(const Serializable *obj, Serialize::Data &data) const override;
+		Serializable *Unserialize(Serializable *obj, Serialize::Data &data) const override;
+	};
+
+private:
 	Anope::string mask;
 	/* account this access entry is for, if any */
 	Serialize::Reference<NickCore> nc;
@@ -97,9 +107,6 @@ public:
 	const Anope::string &Mask() const;
 	NickCore *GetAccount() const;

-	void Serialize(Serialize::Data &data) const override;
-	static Serializable *Unserialize(Serializable *obj, Serialize::Data &);
-
 	static const unsigned int MAX_DEPTH = 4;

 	/** Check if this access entry matches the given user or account
@@ -1,6 +1,6 @@
 /*
 *
- * (C) 2003-2024 Anope Team
+ * (C) 2003-2025 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -23,7 +23,7 @@ typedef std::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;
+extern CoreExport Serialize::Checker<nickcoreid_map> NickCoreIdList;

 /* A registered nickname.
 * It matters that Base is here before Extensible (it is inherited by Serializable)
@@ -32,6 +32,16 @@ class CoreExport NickAlias final
 	: public Serializable
 	, public Extensible
 {
+public:
+	struct Type final
+		: public Serialize::Type
+	{
+		Type();
+		void Serialize(const Serializable *obj, Serialize::Data &data) const override;
+		Serializable *Unserialize(Serializable *obj, Serialize::Data &data) const override;
+	};
+
+private:
 	Anope::string vhost_ident, vhost_host, vhost_creator;
 	time_t vhost_created = 0;

@@ -43,7 +53,7 @@ public:
 	Anope::string last_usermask;
 	/* Last uncloaked usermask, requires nickserv/auspex to see */
 	Anope::string last_realhost;
-	time_t time_registered = Anope::CurTime;
+	time_t registered = Anope::CurTime;
 	time_t last_seen = Anope::CurTime;

 	/* Account this nick is tied to. Multiple nicks can be tied to a single account. */
@@ -56,9 +66,6 @@ public:
 	NickAlias(const Anope::string &nickname, NickCore *nickcore);
 	~NickAlias();

-	void Serialize(Serialize::Data &data) const override;
-	static Serializable *Unserialize(Serializable *obj, Serialize::Data &);
-
 	/** Set a vhost for the user
 	 * @param ident The ident
 	 * @param host The host
@@ -106,6 +113,7 @@ public:
 	 * @return the nick, if found
 	 */
 	static NickAlias *Find(const Anope::string &nick);
+	static NickAlias *FindId(uint64_t id);
 };

 /* A registered account. Each account must have a NickAlias with the same nick as the
@@ -116,6 +124,16 @@ class CoreExport NickCore final
 	: public Serializable
 	, public Extensible
 {
+public:
+	struct Type final
+		: public Serialize::Type
+	{
+		Type();
+		void Serialize(const Serializable *obj, Serialize::Data &data) const override;
+		Serializable *Unserialize(Serializable *obj, Serialize::Data &data) const override;
+	};
+
+private:
 	/* 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. */
@@ -131,7 +149,7 @@ public:
 	/* Last time an email was sent to this user */
 	time_t lastmail = 0;
 	/* The time this account was registered */
-	time_t time_registered = Anope::CurTime;
+	time_t registered = Anope::CurTime;
 	MemoInfo memos;
 	std::map<Anope::string, Anope::string> last_modes;

@@ -159,9 +177,6 @@ public:
 	NickCore(const Anope::string &nickdisplay, uint64_t nickid = 0);
 	~NickCore();

-	void Serialize(Serialize::Data &data) const override;
-	static Serializable *Unserialize(Serializable *obj, Serialize::Data &);
-
 	/** Changes the display for this account
 	 * @param na The new display, must be grouped to this account.
 	 */
@@ -180,6 +195,7 @@ public:
 	 * @return The account, if it exists
 	 */
 	static NickCore *Find(const Anope::string &nick);
+	static NickCore *FindId(uint64_t id);

 	void AddChannelReference(ChannelInfo *ci);
 	void RemoveChannelReference(ChannelInfo *ci);
@@ -196,6 +212,7 @@ class CoreExport IdentifyRequest
 	Module *owner;
 	Anope::string account;
 	Anope::string password;
+	Anope::string address;

 	std::set<Module *> holds;
 	bool dispatched = false;
@@ -204,7 +221,7 @@ class CoreExport IdentifyRequest
 	static std::set<IdentifyRequest *> Requests;

 protected:
-	IdentifyRequest(Module *o, const Anope::string &acc, const Anope::string &pass);
+	IdentifyRequest(Module *o, const Anope::string &acc, const Anope::string &pass, const Anope::string &ip);
 	virtual ~IdentifyRequest();

 public:
@@ -215,6 +232,7 @@ public:
 	Module *GetOwner() const { return owner; }
 	const Anope::string &GetAccount() const { return account; }
 	const Anope::string &GetPassword() const { return password; }
+	const Anope::string &GetAddress() const { return address; }

 	/* Holds this request. When a request is held it must be Released later
 	 * for the request to complete. Multiple modules may hold a request at any time,
@@ -1,6 +1,6 @@
 /*
 *
- * (C) 2003-2024 Anope Team
+ * (C) 2003-2025 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -221,6 +221,14 @@ namespace Anope
 		inline bool is_number_only() const { return this->find_first_not_of("0123456789.-") == npos; }
 		inline bool is_pos_number_only() const { return this->find_first_not_of("0123456789.") == npos; }

+		/**
+		 * In IRC messages we use a substitute (ASCII 0x1A) instead of a space
+		 * (ASCII 0x20) so it doesn't get line wrapped when put into a message.
+		 * The line wrapper will convert this to a space before it is sent to
+		 * clients.
+		 */
+		inline Anope::string nobreak() const { return this->replace_all_cs("\x20", "\x1A"); }
+
 		/**
 		 * Replace parts of the string.
 		 */
@@ -346,7 +354,7 @@ namespace Anope
 	template<typename T>
 	using unordered_map = std::unordered_map<string, T, hash_ci, compare>;

-#ifndef REPRODUCIBLE_BUILD
+#if !REPRODUCIBLE_BUILD
 	static const char *const compiled = __TIME__ " " __DATE__;
 #endif

@@ -473,13 +481,6 @@ namespace Anope
 	 */
 	extern CoreExport bool Encrypt(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.
@@ -615,6 +616,13 @@ namespace Anope
 	 * @return True if the message was a well formed CTCP; otherwise, false.
 	 */
 	extern CoreExport bool ParseCTCP(const Anope::string &text, Anope::string &name, Anope::string &body);
+
+	/** Replaces template variables within a string with values from a map.
+	 * @param str The string to template from.
+	 * @param vars The variables to replace within the string.
+	 * @return The specified string with all variables replaced within it.
+	 */
+	extern CoreExport Anope::string Template(const Anope::string &str, const Anope::map<Anope::string> &vars);
 }

 /** sepstream allows for splitting token separated lists.
@@ -1,7 +1,7 @@
 /*
 *
 * (C) 2008-2011 Adam <Adam@anope.org>
- * (C) 2008-2024 Anope Team <team@anope.org>
+ * (C) 2008-2025 Anope Team <team@anope.org>
 *
 * Please read COPYING and README for further details.
 */
@@ -1,7 +1,7 @@
 /*
 *
 * (C) 2008-2011 Robin Burchell <w00t@inspircd.org>
- * (C) 2008-2024 Anope Team <team@anope.org>
+ * (C) 2008-2025 Anope Team <team@anope.org>
 *
 * Please read COPYING and README for further details.
 */
@@ -23,6 +23,16 @@ class CoreExport BotInfo final
 	: public User
 	, public Serializable
 {
+public:
+	struct Type final
+		: public Serialize::Type
+	{
+		Type();
+		void Serialize(const Serializable *obj, Serialize::Data &data) const override;
+		Serializable *Unserialize(Serializable *obj, Serialize::Data &data) const override;
+	};
+
+private:
 	/* Channels this bot is assigned to */
 	Serialize::Checker<std::set<ChannelInfo *> > channels;
 public:
@@ -31,6 +41,8 @@ public:
 	time_t lastmsg;
 	/* Map of actual command names -> service name/permission required */
 	CommandInfo::map commands;
+	/* The server-side alias used to message this bot. */
+	Anope::string alias;
 	/* Modes the bot should have as configured in service:modes */
 	Anope::string botmodes;
 	/* Channels the bot should be in as configured in service:channels */
@@ -126,6 +138,9 @@ public:
 	 */
 	CommandInfo *GetCommand(const Anope::string &cname);

+	/** Get the command that users can use to send a message to this bot. */
+	Anope::string GetQueryCommand(const Anope::string &command = "", const Anope::string &extra = "") const;
+
 	/** Find a bot by nick
 	 * @param nick The nick
 	 * @param nick_only True to only look by nick, and not by UID
@@ -1,6 +1,6 @@
 /* Channel support
 *
- * (C) 2008-2024 Anope Team
+ * (C) 2008-2025 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -48,11 +48,11 @@ public:
 	/* Set if this channel is registered. ci->c == this. Contains information relevant to the registered channel */
 	Serialize::Reference<ChannelInfo> ci;
 	/* When the channel was created */
-	time_t creation_time;
+	time_t created;
 	/* If the channel has just been created in a netjoin */
-	bool syncing;
+	bool syncing = false;
 	/* Is configured in the conf as a channel bots should be in */
-	bool botchannel;
+	bool botchannel = false;

 	/* Users in the channel */
 	typedef std::map<User *, ChanUserContainer *> ChanUserList;
@@ -66,15 +66,15 @@ public:
 	 * This is the time the topic was *originally set*. When we restore the topic we want to change the TS back
 	 * to this, but we can only do this on certain IRCds.
 	 */
-	time_t topic_ts;
+	time_t topic_ts = 0;
 	/* The actual time the topic was set, probably close to Anope::CurTime */
-	time_t topic_time;
+	time_t topic_time = 0;

-	time_t server_modetime;		/* Time of last server MODE */
-	time_t chanserv_modetime;	/* Time of last check_modes() */
-	int16_t server_modecount;	/* Number of server MODEs this second */
-	int16_t chanserv_modecount;	/* Number of check_mode()'s this sec */
-	int16_t bouncy_modes;		/* Did we fail to set modes here? */
+	time_t server_modetime = 0;		/* Time of last server MODE */
+	time_t chanserv_modetime = 0;	/* Time of last check_modes() */
+	int16_t server_modecount = 0;	/* Number of server MODEs this second */
+	int16_t chanserv_modecount = 0;	/* Number of check_mode()'s this sec */
+	bool bouncy_modes = false;		/* Did we fail to set modes here? */

 private:
 	/** Constructor
@@ -215,7 +215,7 @@ public:
 	 * @param mode the modes
 	 * @param enforce_mlock true to enforce mlock
 	 */
-	void SetModesInternal(MessageSource &source, const Anope::string &mode, time_t ts = 0, bool enforce_mlock = true);
+	void SetModesInternal(MessageSource &source, const Anope::string &modes, const std::vector<Anope::string> &params, time_t ts = 0, bool enforce_mlock = true);

 	/** Does the given user match the given list? (CMODE_BAN, CMODE_EXCEPT, etc, a list mode)
 	 * @param u The user
@@ -1,6 +1,6 @@
 /* Declarations for command data.
 *
- * (C) 2003-2024 Anope Team
+ * (C) 2003-2025 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -14,6 +14,7 @@
 #include "service.h"
 #include "anope.h"
 #include "channels.h"
+#include "textproc.h"

 struct CommandGroup final
 {
@@ -81,6 +82,7 @@ public:
 	bool IsFounder(ChannelInfo *ci);

 	void Reply(const char *message, ...) ATTR_FORMAT(2, 3);
+	void Reply(int count, const char *singular, const char *plural, ...) ATTR_FORMAT(4, 5);
 	void Reply(const Anope::string &message);

 	bool HasCommand(const Anope::string &cmd);
@@ -95,7 +97,7 @@ class CoreExport Command
 	: public Service
 {
 	Anope::string desc;
-	std::vector<Anope::string> syntax;
+	std::vector<std::pair<Anope::string, std::function<bool(CommandSource&)>>> syntax;
 	/* Allow unregistered users to use this command */
 	bool allow_unregistered;
 	/* Command requires that a user is executing it */
@@ -127,7 +129,7 @@ protected:
 	void SetDesc(const Anope::string &d);

 	void ClearSyntax();
-	void SetSyntax(const Anope::string &s);
+	void SetSyntax(const Anope::string &s, const std::function<bool(CommandSource&)> &p = nullptr);
 	void SendSyntax(CommandSource &);

 	void AllowUnregistered(bool b);
@@ -149,10 +151,10 @@ public:
 	 */
 	virtual void Execute(CommandSource &source, const std::vector<Anope::string> &params) = 0;

-	/** Called when HELP is requested 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);
+	virtual void OnServHelp(CommandSource &source, HelpWrapper &help);

 	/** Requested when the user is requesting help on this command. Help on this command should be sent to the user.
 	 * @param source The source
@@ -1,6 +1,6 @@
 /*
 *
- * (C) 2003-2024 Anope Team
+ * (C) 2003-2025 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -18,11 +18,9 @@

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

 	public:
 		typedef Anope::map<Anope::string> item_map;
@@ -41,7 +39,7 @@ namespace Configuration
 		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;
+		const Block &GetBlock(const Anope::string &name, int num = 0) const;
 		Block *GetMutableBlock(const Anope::string &name, int num = 0);

 		template<typename T> T Get(const Anope::string &tag, const Anope::string &def = "") const
@@ -56,10 +54,6 @@ 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
 	 */
@@ -83,26 +77,27 @@ namespace Configuration

 	struct Uplink;

-	struct CoreExport Conf final
-		: Block
+	class CoreExport Conf final
+		: public Block
 	{
+	private:
+		/** Replaces defined variables within a string. */
+		Anope::string ReplaceVars(const Anope::string &str, const File &file, int linenumber);
+
+	public:
 		/* options:readtimeout */
 		time_t ReadTimeout;
-		/* options:useprivmsg */
-		bool UsePrivmsg;
 		/* If we should default to privmsging clients */
 		bool DefPrivmsg;
 		/* Default language */
 		Anope::string DefLanguage;
 		/* options:timeoutcheck */
 		time_t TimeoutCheck;
-		/* options:usestrictprivmsg */
-		bool UseStrictPrivmsg;
+		/* options:servicealias */
+		bool ServiceAlias;
 		/* networkinfo:nickchars */
 		Anope::string NickChars;

-		/* either "/msg " or "/" */
-		Anope::string StrictPrivmsg;
 		/* List of uplink servers to try and connect to */
 		std::vector<Uplink> Uplinks;
 		/* A vector of our logfile options */
@@ -130,12 +125,12 @@ namespace Configuration
 		void LoadConf(File &file);
 		void Post(Conf *old);

-		Block *GetModule(Module *);
-		Block *GetModule(const Anope::string &name);
+		Block &GetModule(const Module *);
+		Block &GetModule(const Anope::string &name);

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

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

 	struct Uplink final
@@ -148,6 +143,7 @@ namespace Configuration
 		Uplink(const Anope::string &_host, int _port, const Anope::string &_password, int _protocol) : host(_host), port(_port), password(_password), protocol(_protocol) { }
 		inline bool operator==(const Uplink &other) const { return host == other.host && port == other.port && password == other.password && protocol == other.protocol; }
 		inline bool operator!=(const Uplink &other) const { return !(*this == other); }
+		Anope::string str() const;
 	};
 }

@@ -1,6 +1,6 @@
 /*
 *
- * (C) 2003-2024 Anope Team
+ * (C) 2003-2025 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -1,6 +1,6 @@
 /*
 *
- * (C) 2003-2024 Anope Team
+ * (C) 2003-2025 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -23,7 +23,7 @@ struct ChanUserContainer;
 class ClientSocket;
 class Command;
 class CommandSource;
-namespace Configuration { struct Conf; }
+namespace Configuration { class Conf; }
 class ConnectionSocket;
 namespace DNS { struct Query; }
 class Entry;
@@ -1,6 +1,6 @@
 /*
 *
- * (C) 2003-2024 Anope Team
+ * (C) 2003-2025 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -173,7 +173,7 @@ public:
 	void ExtensibleSerialize(const Extensible *e, const Serializable *s, Serialize::Data &data) const override
 	{
 		T *t = this->Get(e);
-		data[this->name] << *t;
+		data.Store(this->name, *t);
 	}

 	void ExtensibleUnserialize(Extensible *e, Serializable *s, Serialize::Data &data) override
@@ -194,8 +194,7 @@ public:

 	void ExtensibleSerialize(const Extensible *e, const Serializable *s, Serialize::Data &data) const override
 	{
-		data.SetType(this->name, Serialize::Data::DT_INT);
-		data[this->name] << true;
+		data.Store(this->name, this->HasExt(e));
 	}

 	void ExtensibleUnserialize(Extensible *e, Serializable *s, Serialize::Data &data) override
@@ -1,7 +1,7 @@
 /*
 *
 * (C) 2002-2011 InspIRCd Development Team
- * (C) 2009-2024 Anope Team <team@anope.org>
+ * (C) 2009-2025 Anope Team <team@anope.org>
 *
 * Please read COPYING and README for further details.
 */
@@ -1,6 +1,6 @@
 /*
 *
- * (C) 2008-2024 Anope Team
+ * (C) 2008-2025 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -55,28 +55,63 @@ namespace Language
 	 */
 	extern CoreExport const char *Translate(const NickCore *nc, const char *string);

-	/** Translatesa string to the given language.
+	/** Translates a string to the given language.
 	 * @param lang The language to translate to
 	 * @param string The string to translate
 	 * @return The translated string if found, else the original string.
 	 */
 	extern CoreExport const char *Translate(const char *lang, const char *string);

+	/** Translates a plural string to the default language.
+	 * @param count The number of items the string is counting.
+	 * @param singular The string to translate if there is one of \p count
+	 * @param plural The string to translate if there is multiple of \p count
+	 * @return The translated string if found, else the original string.
+	 */
+	extern CoreExport const char *Translate(int count, const char *singular, const char *plural);
+
+	/** Translates a plural string to the language of the given user.
+	 * @param u The user to translate the string for
+	 * @param count The number of items the string is counting.
+	 * @param singular The string to translate if there is one of \p count
+	 * @param plural The string to translate if there is multiple of \p count
+	 * @return The translated string if found, else the original string.
+	 */
+	extern CoreExport const char *Translate(User *u, int count, const char *singular, const char *plural);
+
+	/** Translates a plural string to the language of the given account.
+	 * @param nc The account to translate the string for
+	 * @param count The number of items the string is counting.
+	 * @param singular The string to translate if there is one of \p count
+	 * @param plural The string to translate if there is multiple of \p count
+	 * @return The translated string if count, else the original string
+	 */
+	extern CoreExport const char *Translate(const NickCore *nc, int count, const char *singular, const char *plural);
+
+	/** Translates a plural string to the given language.
+	 * @param lang The language to translate to
+	 * @param count The number of items the string is counting.
+	 * @param singular The string to translate if there is one of \p count
+	 * @param plural The string to translate if there is multiple of \p count
+	 * @return The translated string if found, else the original string.
+	 */
+	extern CoreExport const char *Translate(const char *lang, int count, const char *singular, const char *plural);
+
 } // namespace Language

 /* Commonly used language strings */
-#define CONFIRM_DROP			_("Please confirm that you want to drop \002%s\002 with \002%s%s DROP %s %s\002")
+#define CONFIRM_DROP			_("Please confirm that you want to drop \002%s\002 with \002%s\032%s\032%s\002")
 #define SERVICE_UNAVAILABLE		_("Sorry, %s is temporarily unavailable.")
-#define MORE_INFO			_("\002%s%s HELP %s\002 for more information.")
+#define MORE_INFO			_("\002%s\002 for more information.")
 #define BAD_USERHOST_MASK		_("Mask must be in the form \037user\037@\037host\037.")
 #define BAD_EXPIRY_TIME			_("Invalid expiry time.")
 #define USERHOST_MASK_TOO_WIDE		_("%s coverage is too wide; Please use a more specific mask.")
 #define READ_ONLY_MODE			_("Services are temporarily in read-only mode.")
 #define PASSWORD_INCORRECT		_("Password incorrect.")
 #define ACCESS_DENIED			_("Access denied.")
-#define MORE_OBSCURE_PASSWORD		_("Please try again with a more obscure password. Passwords should not be\n" \
-						"something that could be easily guessed (e.g. your real name or your nick) and\n" \
-						"cannot contain the space or tab characters.\n")
+#define MORE_OBSCURE_PASSWORD		_("Please try again with a more obscure password. Passwords should not be " \
+						"something that could be easily guessed (e.g. your real name or your nick) and " \
+						"cannot contain the space or tab characters.")
 #define PASSWORD_TOO_SHORT		_("Your password is too short. It must be longer than %u characters.")
 #define PASSWORD_TOO_LONG		_("Your password is too long. It must be shorter than %u characters.")
 #define NICK_NOT_REGISTERED		_("Your nick isn't registered.")
@@ -92,8 +127,8 @@ namespace Language
 #define UNKNOWN				_("<unknown>")
 #define NO_EXPIRE			_("does not expire")
 #define LIST_INCORRECT_RANGE		_("Incorrect range specified. The correct syntax is \002#\037from\037-\037to\037\002.")
-#define NICK_IS_SECURE			_("This nickname is registered and protected.  If it is your\n" \
-						"nick, type \002%s%s IDENTIFY \037password\037\002.  Otherwise,\n" \
+#define NICK_IS_SECURE			_("This nickname is registered and protected.  If it is your " \
+						"nick, type \002%s\032\037password\037\002.  Otherwise, " \
 						"please choose a different nick.")
 #define FORCENICKCHANGE_NOW		_("This nickname has been registered; you may not use it.")
 #define NICK_CANNOT_BE_REGISTERED	_("Nickname \002%s\002 may not be registered.")
@@ -108,12 +143,12 @@ namespace Language
 #define CHAN_SETTING_CHANGED		_("%s for %s set to %s.")
 #define CHAN_SETTING_UNSET		_("%s for %s unset.")
 #define CHAN_ACCESS_LEVEL_RANGE		_("Access level must be between %d and %d inclusive.")
-#define CHAN_INFO_HEADER		_("Information for channel \002%s\002:")
+#define CHAN_INFO_HEADER		_("Information about channel \002%s\002:")
 #define CHAN_EXCEPTED			_("\002%s\002 matches an except on %s and cannot be banned until the except has been removed.")
-#define MEMO_NEW_X_MEMO_ARRIVED		_("There is a new memo on channel %s.\n" \
-						"Type \002%s%s READ %s %zu\002 to read it.")
-#define MEMO_NEW_MEMO_ARRIVED		_("You have a new memo from %s.\n" \
-						"Type \002%s%s READ %zu\002 to read it.")
+#define MEMO_NEW_X_MEMO_ARRIVED		_("There is a new memo on channel %s. " \
+						"Type \002%s\032%s\032%zu\002 to read it.")
+#define MEMO_NEW_MEMO_ARRIVED		_("You have a new memo from %s. " \
+						"Type \002%s\032%zu\002 to read it.")
 #define MEMO_HAVE_NO_MEMOS		_("You have no memos.")
 #define MEMO_X_HAS_NO_MEMOS		_("%s has no memos.")
 #define MEMO_HAVE_NO_NEW_MEMOS		_("You have no new memos.")
@@ -1,6 +1,6 @@
 /*
 *
- * (C) 2003-2024 Anope Team
+ * (C) 2003-2025 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -1,6 +1,6 @@
 /*
 *
- * (C) 2003-2024 Anope Team
+ * (C) 2003-2025 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -1,6 +1,6 @@
 /*
 *
- * (C) 2003-2024 Anope Team
+ * (C) 2003-2025 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -1,6 +1,6 @@
 /*
 *
- * (C) 2003-2024 Anope Team
+ * (C) 2003-2025 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -18,15 +18,20 @@ class CoreExport Memo final
 	: public Serializable
 {
 public:
+	struct Type final
+		: public Serialize::Type
+	{
+		Type();
+		void Serialize(const Serializable *obj, Serialize::Data &data) const override;
+		Serializable *Unserialize(Serializable *obj, Serialize::Data &data) const override;
+	};
+
 	MemoInfo *mi;
 	bool unread;
 	bool receipt;
 	Memo();
 	~Memo();

-	void Serialize(Serialize::Data &data) const override;
-	static Serializable *Unserialize(Serializable *obj, Serialize::Data &);
-
 	Anope::string owner;
 	/* When it was sent */
 	time_t time;
@@ -41,7 +46,7 @@ struct CoreExport MemoInfo final
 {
 	int16_t memomax = 0;
 	Serialize::Checker<std::vector<Memo *> > memos;
-	std::vector<Anope::string> ignores;
+	std::set<Anope::string, ci::less> ignores;

 	MemoInfo();
 	Memo *GetMemo(unsigned index) const;
@@ -1,6 +1,6 @@
 /*
 *
- * (C) 2003-2024 Anope Team
+ * (C) 2003-2025 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -45,6 +45,13 @@ namespace Message
 		void Run(MessageSource &source, const std::vector<Anope::string> &params, const Anope::map<Anope::string> &tags) override;
 	};

+	struct CoreExport Ignore final
+		: IRCDMessage
+	{
+		Ignore(Module *creator, const Anope::string &mname);
+		void Run(MessageSource &source, const std::vector<Anope::string> &params, const Anope::map<Anope::string> &tags) override;
+	};
+
 	struct CoreExport Invite
 		: IRCDMessage
 	{
@@ -66,10 +73,11 @@ namespace Message
 		 * @param source The source of the SJOIN
 		 * @param chan The channel the users are joining to
 		 * @param ts The TS for the channel
-		 * @param modes The modes sent with the SJOIN, if any
+		 * @param modes The mode letters sent with the SJOIN, if any
+		 * @param modeparams The mode parameters sent with the SJOIN, if any
 		 * @param users The users and their status, if any
 		 */
-		static void SJoin(MessageSource &source, const Anope::string &chan, time_t ts, const Anope::string &modes, const std::list<SJoinUser> &users);
+		static void SJoin(MessageSource &source, const Anope::string &chan, time_t ts, const Anope::string &modes, const std::vector<Anope::string> &modeparams, const std::list<SJoinUser> &users);
 	};

 	struct CoreExport Kick
@@ -1,7 +1,7 @@
 /* Mode support
 *
 * (C) 2008-2011 Adam <Adam@anope.org>
- * (C) 2008-2024 Anope Team <team@anope.org>
+ * (C) 2008-2025 Anope Team <team@anope.org>
 *
 * Please read COPYING and README for further details.
 */
@@ -216,9 +216,12 @@ template<typename T>
 class CoreExport ChannelModeVirtual
 	: public T
 {
-	Anope::string base;
+private:
 	ChannelMode *basech;

+protected:
+	Anope::string base;
+
 public:
 	ChannelModeVirtual(const Anope::string &mname, const Anope::string &basename);

@@ -1,6 +1,6 @@
 /*
 *
- * (C) 2003-2024 Anope Team
+ * (C) 2003-2025 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -45,7 +45,7 @@
 #include "users.h"
 #include "xline.h"

-#include "modules/pseudoclients/chanserv.h"
-#include "modules/pseudoclients/global.h"
-#include "modules/pseudoclients/memoserv.h"
-#include "modules/pseudoclients/nickserv.h"
+#include "modules/chanserv/service.h"
+#include "modules/global/service.h"
+#include "modules/memoserv/service.h"
+#include "modules/nickserv/service.h"
@@ -1,6 +1,6 @@
 /* Modular support
 *
- * (C) 2003-2024 Anope Team
+ * (C) 2003-2025 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -305,7 +305,7 @@ public:
 	 * @param conf The config that is being built now and will replace the global Config object
 	 * @throws A ConfigException to abort the config (re)loading process.
 	 */
-	virtual void OnReload(Configuration::Conf *conf) ATTR_NOT_NULL(2) { throw NotImplementedException(); }
+	virtual void OnReload(Configuration::Conf &conf) { throw NotImplementedException(); }

 	/** Called before a bot is assigned to a channel.
 	 * @param sender The user assigning the bot
@@ -1068,28 +1068,139 @@ public:

 enum Implementation
 {
+	I_IsServicesOper,
+	I_OnAccessAdd,
+	I_OnAccessClear,
+	I_OnAccessDel,
+	I_OnAddXLine,
+	I_OnAkickAdd,
+	I_OnAkickDel,
+	I_OnBadWordAdd,
+	I_OnBadWordDel,
+	I_OnBotAssign,
+	I_OnBotBan,
+	I_OnBotChange,
+	I_OnBotCreate,
+	I_OnBotDelete,
+	I_OnBotFantasy,
+	I_OnBotInfo,
+	I_OnBotKick,
+	I_OnBotNoFantasyAccess,
+	I_OnBotNotice,
+	I_OnBotPrivmsg,
+	I_OnBotUnAssign,
+	I_OnCanSet,
+	I_OnChanDrop,
+	I_OnChanExpire,
+	I_OnChangeCoreDisplay,
+	I_OnChanInfo,
+	I_OnChannelCreate,
+	I_OnChannelDelete,
+	I_OnChannelModeAdd,
+	I_OnChannelModeSet,
+	I_OnChannelModeUnset,
+	I_OnChannelSync,
+	I_OnChanRegistered,
+	I_OnChanSuspend,
+	I_OnChanUnsuspend,
+	I_OnCheckAuthentication,
+	I_OnCheckDelete,
+	I_OnCheckKick,
+	I_OnCheckModes,
+	I_OnCheckPriv,
+	I_OnCreateBot,
+	I_OnCreateChan,
+	I_OnDecrypt,
+	I_OnDefconLevel,
+	I_OnDelBot,
+	I_OnDelChan,
+	I_OnDelCore,
+	I_OnDeleteVHost,
+	I_OnDelNick,
+	I_OnDelXLine,
+	I_OnDnsRequest,
+	I_OnEncrypt,
+	I_OnExceptionAdd,
+	I_OnExceptionDel,
+	I_OnExpireTick,
+	I_OnFingerprint,
+	I_OnGroupCheckPriv,
+	I_OnInvite,
+	I_OnJoinChannel,
+	I_OnLeaveChannel,
+	I_OnLevelChange,
+	I_OnLoadDatabase,
+	I_OnLog,
+	I_OnLogMessage,
+	I_OnMemoDel,
+	I_OnMemoSend,
+	I_OnMessage,
+	I_OnMLock,
+	I_OnModuleLoad,
+	I_OnModuleUnload,
+	I_OnNewServer,
+	I_OnNickAddCert,
+	I_OnNickClearCert,
+	I_OnNickConfirm,
+	I_OnNickCoreCreate,
+	I_OnNickDrop,
+	I_OnNickEraseCert,
+	I_OnNickExpire,
+	I_OnNickGroup,
+	I_OnNickIdentify,
+	I_OnNickInfo,
+	I_OnNickLogout,
+	I_OnNickRegister,
+	I_OnNickSuspend,
+	I_OnNickUnsuspended,
+	I_OnNickUpdate,
+	I_OnNickValidate,
+	I_OnPartChannel,
+	I_OnPostCommand,
+	I_OnPostHelp,
 	I_OnPostInit,
-	I_OnPreUserKicked, I_OnUserKicked, I_OnReload, I_OnPreBotAssign, I_OnBotAssign, I_OnBotUnAssign, I_OnUserConnect,
-	I_OnNewServer, I_OnUserNickChange, I_OnPreHelp, I_OnPostHelp, I_OnPreCommand, I_OnPostCommand, I_OnSaveDatabase,
-	I_OnLoadDatabase, I_OnEncrypt, I_OnDecrypt, I_OnBotFantasy, I_OnBotNoFantasyAccess, I_OnBotBan, I_OnBadWordAdd,
-	I_OnBadWordDel, I_OnCreateBot, I_OnDelBot, I_OnBotKick, I_OnPrePartChannel, I_OnPartChannel, I_OnLeaveChannel,
-	I_OnJoinChannel, I_OnTopicUpdated, I_OnPreChanExpire, I_OnChanExpire, I_OnPreServerConnect, I_OnServerConnect,
-	I_OnPreUplinkSync, I_OnServerDisconnect, I_OnRestart, I_OnShutdown, I_OnPreNickExpire, I_OnNickExpire, I_OnDefconLevel,
-	I_OnExceptionAdd, I_OnExceptionDel, I_OnAddXLine, I_OnDelXLine, I_IsServicesOper, I_OnServerQuit, I_OnUserQuit,
-	I_OnPreUserLogoff, I_OnPostUserLogoff, I_OnBotCreate, I_OnBotChange, I_OnBotDelete, I_OnAccessDel, I_OnAccessAdd,
-	I_OnAccessClear, I_OnLevelChange, I_OnChanDrop, I_OnChanRegistered, I_OnChanSuspend, I_OnChanUnsuspend,
-	I_OnCreateChan, I_OnDelChan, I_OnChannelCreate, I_OnChannelDelete, I_OnAkickAdd, I_OnAkickDel, I_OnCheckKick,
-	I_OnChanInfo, I_OnCheckPriv, I_OnGroupCheckPriv, I_OnNickDrop, I_OnNickGroup, I_OnNickIdentify,
-	I_OnUserLogin, I_OnNickLogout, I_OnNickRegister, I_OnNickConfirm, I_OnNickSuspend, I_OnNickUnsuspended, I_OnDelNick, I_OnNickCoreCreate,
-	I_OnDelCore, I_OnChangeCoreDisplay, I_OnNickClearCert,
-	I_OnNickAddCert, I_OnNickEraseCert, I_OnNickInfo, I_OnBotInfo, I_OnCheckAuthentication, I_OnNickUpdate,
-	I_OnFingerprint, I_OnUserAway, I_OnInvite, I_OnDeleteVHost, I_OnSetVHost, I_OnSetDisplayedHost, I_OnMemoSend, I_OnMemoDel,
-	I_OnChannelModeSet, I_OnChannelModeUnset, I_OnUserModeSet, I_OnUserModeUnset, I_OnChannelModeAdd, I_OnUserModeAdd,
-	I_OnMLock, I_OnUnMLock, I_OnModuleLoad, I_OnModuleUnload, I_OnServerSync, I_OnUplinkSync, I_OnBotPrivmsg, I_OnBotNotice,
-	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_OnPostUserLogoff,
+	I_OnPreBotAssign,
+	I_OnPreChanExpire,
+	I_OnPreCommand,
+	I_OnPreHelp,
+	I_OnPreNickExpire,
+	I_OnPrePartChannel,
+	I_OnPreServerConnect,
+	I_OnPreUplinkSync,
+	I_OnPreUserKicked,
+	I_OnPreUserLogoff,
+	I_OnPrivmsg,
+	I_OnReload,
+	I_OnRestart,
+	I_OnSaveDatabase,
+	I_OnSerializableConstruct,
+	I_OnSerializableDestruct,
+	I_OnSerializableUpdate,
+	I_OnSerializeCheck,
+	I_OnSerializeTypeCreate,
+	I_OnServerConnect,
+	I_OnServerDisconnect,
+	I_OnServerQuit,
+	I_OnServerSync,
+	I_OnSetChannelOption,
+	I_OnSetCorrectModes,
+	I_OnSetDisplayedHost,
+	I_OnSetNickOption,
+	I_OnSetVHost,
+	I_OnShutdown,
+	I_OnTopicUpdated,
+	I_OnUnMLock,
+	I_OnUplinkSync,
+	I_OnUserAway,
+	I_OnUserConnect,
+	I_OnUserKicked,
+	I_OnUserLogin,
+	I_OnUserModeAdd,
+	I_OnUserModeSet,
+	I_OnUserModeUnset,
+	I_OnUserNickChange,
+	I_OnUserQuit,
 	I_SIZE
 };

@@ -1,6 +1,6 @@
 /* BotServ core functions
 *
- * (C) 2003-2024 Anope Team
+ * (C) 2003-2025 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-2024 Anope Team
+ * (C) 2003-2025 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -1,6 +1,6 @@
 /*
 *
- * (C) 2003-2024 Anope Team
+ * (C) 2003-2025 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-2024 Anope Team
+ * (C) 2003-2025 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-2024 Anope Team
+ * (C) 2003-2025 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -1,6 +1,6 @@
 /*
 *
- * (C) 2011-2024 Anope Team
+ * (C) 2011-2025 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -1,6 +1,6 @@
 /*
 *
- * (C) 2003-2024 Anope Team
+ * (C) 2003-2025 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -1,6 +1,6 @@
 /*
 *
- * (C) 2003-2024 Anope Team
+ * (C) 2003-2025 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -1,6 +1,6 @@
 /*
 *
- * (C) 2011-2024 Anope Team
+ * (C) 2011-2025 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -1,6 +1,6 @@
 /*
 *
- * (C) 2003-2024 Anope Team
+ * (C) 2003-2025 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -1,6 +1,6 @@
 /*
 *
- * (C) 2012-2024 Anope Team
+ * (C) 2012-2025 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -1,6 +1,6 @@
 /*
 *
- * (C) 2003-2024 Anope Team
+ * (C) 2003-2025 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -1,6 +1,6 @@
 /*
 *
- * (C) 2011-2024 Anope Team
+ * (C) 2011-2025 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -1,6 +1,6 @@
 /*
 *
- * (C) 2011-2024 Anope Team
+ * (C) 2011-2025 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-2024 Anope Team
+ * (C) 2003-2025 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -0,0 +1,195 @@
+/*
+ *
+ * (C) 2014-2025 Anope Team
+ * Contact us at team@anope.org
+ *
+ * Please read COPYING and README for further details.
+ */
+
+#pragma once
+
+namespace SASL
+{
+	class Mechanism;
+	struct Message;
+	class ProtocolInterface;
+	struct Service;
+	struct Session;
+
+	/** The SASL interface implemented by the protocol modules. */
+	static ServiceReference<SASL::ProtocolInterface> protocol_interface("SASL::ProtocolInterface", "sasl");
+
+	/** The SASL interface implemented by ns_sasl. */
+	static ServiceReference<SASL::Service> service("SASL::Service", "sasl");
+}
+
+/** Represents a single SASL message. */
+struct SASL::Message final
+{
+	/** The source UID or name. */
+	Anope::string source;
+
+	/** The target UID or name. */
+	Anope::string target;
+
+	/** The type of message. */
+	Anope::string type;
+
+	/** One or more data parameters. */
+	std::vector<Anope::string> data;
+};
+
+/** Sends IRCd messages used by the SASL module. */
+class SASL::ProtocolInterface
+	: public ::Service
+{
+protected:
+	ProtocolInterface(Module *o)
+		: ::Service(o, "SASL::ProtocolInterface", "sasl")
+	{
+	}
+
+public:
+	/** Sends the list of SASL mechanisms to the IRCd
+	 * @param mechs The list of SASL mechanisms.
+	 */
+	virtual void SendSASLMechanisms(std::vector<Anope::string> &mechs) { };
+
+	/** Sends a SASL message to the IRCd.
+	 * @param message The SASL message to send.
+	 */
+	virtual void SendSASLMessage(const SASL::Message &message) = 0;
+
+	/** Sends a login or logout for \p uid to \p na.
+	 * @param uid The uid of the user to log in.
+	 * @param na The nick alias to log the user in as or logout if nullptr.
+	 */
+	virtual void SendSVSLogin(const Anope::string &uid, NickAlias *na) = 0;
+};
+
+/** SASL service interface. */
+struct SASL::Service
+	: ::Service
+{
+	Service(Module *o)
+		: ::Service(o, "SASL::Service", "sasl")
+	{
+	}
+
+	virtual void DeleteSessions(Mechanism *mech, bool da = false) = 0;
+
+	/** Fails a SASL session. This notifies the client and increments the
+	 * failed attempt counter which may kill the client if the bad password
+	 * limit has been reached.
+	 *
+	 * @param sess The session to fail.
+	 */
+	virtual void Fail(Session *sess) = 0;
+
+	/** Retrieves the session for the specified user identifier. */
+	virtual Session *GetSession(const Anope::string &uid) = 0;
+
+	/** Processes a SASL authentication message from the uplink.
+	 * @param m The message to process.
+	 */
+	virtual void ProcessMessage(const Message &m) = 0;
+
+	/** Removes the specified SASL session from the service.
+	 * @param sess The session to remove.
+	 */
+	virtual void RemoveSession(Session *sess) = 0;
+
+	/** Sends a SASL message for the specified session.
+	 * @param type The type of message to send.
+	 * @param data The contents of the SASL message.
+	 */
+	virtual void SendMessage(SASL::Session *sess, const Anope::string &type, const Anope::string &data) = 0;
+
+	/** Completes a successful authentication.
+	 * @param sess The session which finished authentication.
+	 * @param nc The account which has been logged into.
+	 */
+	virtual void Succeed(Session *sess, NickCore *nc) = 0;
+};
+
+/** Represents a single SASL session. */
+struct SASL::Session
+{
+	/** The time at which the session was created. */
+	const time_t created;
+
+	/** The hostname and IP address of the authenticating user. */
+	Anope::string hostname, ip;
+
+	/** A reference to the mechanism that the session is authenticating using. */
+	Reference<Mechanism> mech;
+
+	/** The unique identifier of the authenticating user. */
+	const Anope::string uid;
+
+	/** Creates a new authentication session.
+	 * @param m The mechanism that the session is authenticating with.
+	 * @param u The unique identifier of the authenticating user.
+	 */
+	Session(Mechanism *m, const Anope::string &u)
+		: created(Anope::CurTime)
+		, mech(m)
+		, uid(u)
+	{
+	}
+
+	virtual ~Session()
+	{
+		if (service)
+			service->RemoveSession(this);
+	}
+
+	/** Retrieves a description of the user this session is associated with. */
+	inline Anope::string GetUserInfo()
+	{
+		auto *u = User::Find(uid);
+		if (u)
+			return u->GetMask();
+		if (!hostname.empty() && !ip.empty())
+			return Anope::printf("%s (%s)", hostname.c_str(), ip.c_str());
+		return "A user";
+	};
+};
+
+/* Represents an authentication mechanism. */
+class SASL::Mechanism
+	: public ::Service
+{
+protected:
+	/** Creates a new authentication mechanism.
+	 * @param o The module that owns this instance.
+	 * @param sname The name of the authentication mechanism (e.g. PLAIN).
+	 */
+	Mechanism(Module *o, const Anope::string &sname)
+		: Service(o, "SASL::Mechanism", sname)
+	{
+	}
+
+public:
+	virtual ~Mechanism()
+	{
+		if (service)
+			service->DeleteSessions(this, true);
+	}
+
+	/** Creates a new SASL session.
+	 * @param uid The unique identifier of the authenticating user.
+	 */
+	virtual Session *CreateSession(const Anope::string &uid)
+	{
+		return new Session(this, uid);
+	}
+
+	/** Processes an authentication message from the authenticating user.
+	 * @param session The session for which the message applies.
+	 * @param m The message sent by the user.
+	 * @return True if the message was processed successfully or false if
+	 *         the session should be aborted.
+	 */
+	virtual bool ProcessMessage(Session *sess, const Message &m) = 0;
+};
@@ -1,6 +1,6 @@
 /*
 *
- * (C) 2011-2024 Anope Team
+ * (C) 2011-2025 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -19,4 +19,5 @@ public:
 	virtual void Validate(User *u) = 0;
 	virtual void Collide(User *u, NickAlias *na) = 0;
 	virtual void Release(NickAlias *na) = 0;
+	virtual bool IsGuestNick(const Anope::string &nick) const = 0;
 };
@@ -1,6 +1,6 @@
 /*
 *
- * (C) 2011-2024 Anope Team
+ * (C) 2011-2025 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-2024 Anope Team
+ * (C) 2003-2025 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -1,6 +1,6 @@
 /*
 *
- * (C) 2011-2024 Anope Team
+ * (C) 2011-2025 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -0,0 +1,16 @@
+/*
+ *
+ * (C) 2011-2025 Anope Team
+ * Contact us at team@anope.org
+ *
+ * Please read COPYING and README for further details.
+ */
+
+#pragma once
+
+struct MyOper final
+	: Oper
+	, Serializable
+{
+	MyOper(const Anope::string &n, OperType *o) : Oper(n, o), Serializable("Oper") { }
+};
@@ -1,6 +1,6 @@
 /*
 *
- * (C) 2011-2024 Anope Team
+ * (C) 2011-2025 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -28,8 +28,6 @@ struct Exception final
 	time_t expires;			/* Time when it expires. 0 == no expiry */

 	Exception() : Serializable("Exception") { }
-	void Serialize(Serialize::Data &data) const override;
-	static Serializable *Unserialize(Serializable *obj, Serialize::Data &data);
 };

 class SessionService
@@ -59,35 +57,3 @@ public:
 };

 static ServiceReference<SessionService> session_service("SessionService", "session");
-
-void Exception::Serialize(Serialize::Data &data) const
-{
-	data["mask"] << this->mask;
-	data["limit"] << this->limit;
-	data["who"] << this->who;
-	data["reason"] << this->reason;
-	data["time"] << this->time;
-	data["expires"] << this->expires;
-}
-
-Serializable *Exception::Unserialize(Serializable *obj, Serialize::Data &data)
-{
-	if (!session_service)
-		return NULL;
-
-	Exception *ex;
-	if (obj)
-		ex = anope_dynamic_static_cast<Exception *>(obj);
-	else
-		ex = new Exception;
-	data["mask"] >> ex->mask;
-	data["limit"] >> ex->limit;
-	data["who"] >> ex->who;
-	data["reason"] >> ex->reason;
-	data["time"] >> ex->time;
-	data["expires"] >> ex->expires;
-
-	if (!obj)
-		session_service->AddException(ex);
-	return ex;
-}
@@ -1,46 +0,0 @@
-/*
- *
- * (C) 2011-2024 Anope Team
- * Contact us at team@anope.org
- *
- * Please read COPYING and README for further details.
- */
-
-#pragma once
-
-struct MyOper final
-	: Oper
-	, Serializable
-{
-	MyOper(const Anope::string &n, OperType *o) : Oper(n, o), Serializable("Oper") { }
-
-	void Serialize(Serialize::Data &data) const override
-	{
-		data["name"] << this->name;
-		data["type"] << this->ot->GetName();
-	}
-
-	static Serializable *Unserialize(Serializable *obj, Serialize::Data &data)
-	{
-		Anope::string stype, sname;
-
-		data["type"] >> stype;
-		data["name"] >> sname;
-
-		OperType *ot = OperType::Find(stype);
-		if (ot == NULL)
-			return NULL;
-		NickCore *nc = NickCore::Find(sname);
-		if (nc == NULL)
-			return NULL;
-
-		MyOper *myo;
-		if (obj)
-			myo = anope_dynamic_static_cast<MyOper *>(obj);
-		else
-			myo = new MyOper(nc->display, ot);
-		nc->o = myo;
-		Log(LOG_NORMAL, "operserv/oper") << "Tied oper " << nc->display << " to type " << ot->GetName();
-		return myo;
-	}
-};
@@ -1,6 +1,6 @@
 /*
 *
- * (C) 2003-2024 Anope Team
+ * (C) 2003-2025 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -0,0 +1,234 @@
+/*
+ *
+ * (C) 2010-2025 Anope Team
+ * Contact us at team@anope.org
+ *
+ * Please read COPYING and README for further details.
+ */
+
+#pragma once
+
+#include "httpd.h"
+
+#include <variant>
+
+namespace RPC
+{
+	class Array;
+	class Event;
+	class Map;
+	class Request;
+	class ServiceInterface;
+	class Value;
+
+	/** Represents possible types of RPC value. */
+	using ValueUnion = std::variant<Array, Map, Anope::string, std::nullptr_t, bool, double, int64_t, uint64_t>;
+
+	/** Represents standard RPC errors from the JSON-RPC and XML-RPC specifications. */
+	enum Error
+		: int64_t
+	{
+		ERR_CUSTOM_END       = -32000,
+		ERR_CUSTOM_START     = -32099,
+		ERR_PARSE_ERROR      = -32700,
+		ERR_INVALID_REQUEST  = -32600,
+		ERR_METHOD_NOT_FOUND = -32601,
+		ERR_INVALID_PARAMS   = -32602,
+	};
+}
+
+class RPC::Array final
+{
+private:
+	std::vector<Value> replies;
+
+public:
+	/** Retrieves the list of RPC replies. */
+	inline const auto &GetReplies() const { return this->replies; }
+
+	template <typename T>
+	inline Array &Reply(const T &t)
+	{
+		this->replies.emplace_back(RPC::Value(t));
+		return *this;
+	}
+
+	inline Array &ReplyArray();
+
+	inline Map &ReplyMap();
+};
+
+class RPC::Map final
+{
+private:
+	Anope::map<Value> replies;
+
+public:
+	/** Retrieves the list of RPC replies. */
+	inline const auto &GetReplies() const { return this->replies; }
+
+	template <typename T>
+	inline Map &Reply(const Anope::string &key, const T &t)
+	{
+		this->replies.emplace(key, RPC::Value(t));
+		return *this;
+	}
+
+	inline Array &ReplyArray(const Anope::string &key);
+
+	inline Map &ReplyMap(const Anope::string &key);
+};
+
+class RPC::Value final
+{
+private:
+	RPC::ValueUnion value;
+
+public:
+	explicit Value(const ValueUnion &v)
+		: value(v)
+	{
+	}
+
+	explicit Value(const Array &a)
+		: value(a)
+	{
+	}
+
+	explicit Value(const Map &m)
+		: value(m)
+	{
+	}
+
+	explicit Value(std::nullptr_t)
+		: value(nullptr)
+	{
+	}
+
+	explicit Value(bool b)
+		: value(b)
+	{
+	}
+
+	Value(double d)
+		: value(d)
+	{
+	}
+
+	Value(int64_t i)
+		: value(i)
+	{
+	}
+
+	Value(uint64_t u)
+		: value(u)
+	{
+	}
+
+	template <typename T>
+	Value(const T &t)
+		: value(Anope::ToString(t))
+	{
+	}
+
+	inline auto &Get() { return this->value; }
+
+	inline const auto &Get() const { return this->value; }
+};
+
+class RPC::Request final
+{
+private:
+	std::optional<std::pair<int64_t, Anope::string>> error;
+	std::optional<Value> root;
+
+public:
+	Anope::string name;
+	Anope::string id;
+	std::deque<Anope::string> data;
+	HTTPReply &reply;
+
+	Request(HTTPReply &r)
+		: reply(r)
+	{
+	}
+
+	inline void Error(uint64_t errcode, const Anope::string &errstr)
+	{
+		this->error.emplace(errcode, errstr);
+	}
+
+	template<typename T = Map>
+	inline T &Root();
+
+	inline const auto &GetError() const { return this->error; }
+
+	inline const auto &GetRoot() const { return this->root; }
+};
+
+#define RPC_EVENT "RPC::Event"
+
+class RPC::Event
+	: public Service
+{
+private:
+	size_t minparams;
+
+protected:
+	Event(Module *o, const Anope::string& e, size_t mp = 0)
+		: Service(o, RPC_EVENT, e)
+		, minparams(mp)
+	{
+	}
+
+public:
+	virtual ~Event() = default;
+
+	const auto &GetMinParams() const { return minparams; }
+
+	virtual bool Run(ServiceInterface *iface, HTTPClient *client, Request &request) = 0;
+};
+
+class RPC::ServiceInterface
+	: public Service
+{
+public:
+	ServiceInterface(Module *creator)
+		: Service(creator, "RPC::ServiceInterface", "rpc")
+	{
+	}
+
+	virtual void Reply(Request &request) = 0;
+};
+
+inline RPC::Array &RPC::Array::ReplyArray()
+{
+	auto &reply = this->replies.emplace_back(RPC::Array());
+	return std::get<RPC::Array>(reply.Get());
+}
+
+inline RPC::Map &RPC::Array::ReplyMap()
+{
+	auto &reply = this->replies.emplace_back(RPC::Map());
+	return std::get<RPC::Map>(reply.Get());
+}
+
+inline RPC::Array &RPC::Map::ReplyArray(const Anope::string &key)
+{
+	auto it = this->replies.emplace(key, RPC::Array());
+	return std::get<RPC::Array>(it.first->second.Get());
+}
+
+inline RPC::Map &RPC::Map::ReplyMap(const Anope::string &key)
+{
+	auto it = this->replies.emplace(key, RPC::Map());
+	return std::get<RPC::Map>(it.first->second.Get());
+}
+
+template<typename T>
+inline T &RPC::Request::Root()
+{
+	if (!this->root.has_value())
+		this->root = RPC::Value(T());
+	return std::get<T>(this->root.value().Get());
+}
@@ -1,144 +0,0 @@
-/*
- *
- * (C) 2014-2024 Anope Team
- * Contact us at team@anope.org
- *
- * Please read COPYING and README for further details.
- */
-
-#pragma once
-
-namespace SASL
-{
-	struct Message final
-	{
-		Anope::string source;
-		Anope::string target;
-		Anope::string type;
-		Anope::string data;
-		Anope::string ext;
-	};
-
-	class Mechanism;
-	struct Session;
-
-	class Service
-		: public ::Service
-	{
-	public:
-		Service(Module *o) : ::Service(o, "SASL::Service", "sasl") { }
-
-		virtual void ProcessMessage(const Message &) = 0;
-
-		virtual Anope::string GetAgent() = 0;
-
-		virtual Session *GetSession(const Anope::string &uid) = 0;
-
-		virtual void SendMessage(SASL::Session *session, const Anope::string &type, const Anope::string &data) = 0;
-
-		virtual void Succeed(Session *, NickCore *) = 0;
-		virtual void Fail(Session *) = 0;
-		virtual void SendMechs(Session *) = 0;
-		virtual void DeleteSessions(Mechanism *, bool = false) = 0;
-		virtual void RemoveSession(Session *) = 0;
-	};
-
-	static ServiceReference<SASL::Service> sasl("SASL::Service", "sasl");
-
-	struct Session
-	{
-		time_t created;
-		Anope::string uid;
-		Anope::string hostname, ip;
-		Reference<Mechanism> mech;
-
-		Session(Mechanism *m, const Anope::string &u) : created(Anope::CurTime), uid(u), mech(m) { }
-		virtual ~Session()
-		{
-			if (sasl)
-				sasl->RemoveSession(this);
-		}
-	};
-
-	/* PLAIN, EXTERNAL, etc */
-	class Mechanism
-		: public ::Service
-	{
-	public:
-		Mechanism(Module *o, const Anope::string &sname) : Service(o, "SASL::Mechanism", sname) { }
-
-		virtual Session *CreateSession(const Anope::string &uid) { return new Session(this, uid); }
-
-		virtual void ProcessMessage(Session *session, const Message &) = 0;
-
-		virtual ~Mechanism()
-		{
-			if (sasl)
-				sasl->DeleteSessions(this, true);
-		}
-	};
-
-	class IdentifyRequest
-		: public ::IdentifyRequest
-	{
-		Anope::string uid;
-		Anope::string hostname, ip;
-
-	public:
-		IdentifyRequest(Module *m, const Anope::string &id, const Anope::string &acc, const Anope::string &pass, const Anope::string &h, const Anope::string &i) : ::IdentifyRequest(m, acc, pass), uid(id), hostname(h), ip(i) { }
-
-		void OnSuccess() override
-		{
-			if (!sasl)
-				return;
-
-			NickAlias *na = NickAlias::Find(GetAccount());
-			if (!na || na->nc->HasExt("NS_SUSPENDED") || na->nc->HasExt("UNCONFIRMED"))
-				return OnFail();
-
-			unsigned int maxlogins = Config->GetModule("ns_identify")->Get<unsigned int>("maxlogins");
-			if (maxlogins && na->nc->users.size() >= maxlogins)
-				return OnFail();
-
-			Session *s = sasl->GetSession(uid);
-			if (s)
-			{
-				Anope::string user = "A user";
-				if (!hostname.empty() && !ip.empty())
-					user = hostname + " (" + ip + ")";
-
-				Log(this->GetOwner(), "sasl", Config->GetClient("NickServ")) << user << " identified to account " << this->GetAccount() << " using SASL";
-				sasl->Succeed(s, na->nc);
-				delete s;
-			}
-		}
-
-		void OnFail() override
-		{
-			if (!sasl)
-				return;
-
-			Session *s = sasl->GetSession(uid);
-			if (s)
-			{
-				sasl->Fail(s);
-				delete s;
-			}
-
-			Anope::string accountstatus;
-			NickAlias *na = NickAlias::Find(GetAccount());
-			if (!na)
-				accountstatus = "nonexistent ";
-			else if (na->nc->HasExt("NS_SUSPENDED"))
-				accountstatus = "suspended ";
-			else if (na->nc->HasExt("UNCONFIRMED"))
-				accountstatus = "unconfirmed ";
-
-			Anope::string user = "A user";
-			if (!hostname.empty() && !ip.empty())
-				user = hostname + " (" + ip + ")";
-
-			Log(this->GetOwner(), "sasl", Config->GetClient("NickServ")) << user << " failed to identify for " << accountstatus << "account " << this->GetAccount() << " using SASL";
-		}
-	};
-}
@@ -1,6 +1,6 @@
 /*
 *
- * (C) 2003-2024 Anope Team
+ * (C) 2003-2025 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -1,6 +1,6 @@
 /*
 *
- * (C) 2003-2024 Anope Team
+ * (C) 2003-2025 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -19,7 +19,6 @@ namespace SQL
 	public:
 		typedef std::map<Anope::string, std::stringstream *> Map;
 		Map data;
-		std::map<Anope::string, Type> types;

 		~Data()
 		{
@@ -34,14 +33,6 @@ namespace SQL
 			return *ss;
 		}

-		std::set<Anope::string> KeySet() const override
-		{
-			std::set<Anope::string> keys;
-			for (const auto &[key, _] : this->data)
-				keys.insert(key);
-			return keys;
-		}
-
 		size_t Hash() const override
 		{
 			size_t hash = 0;
@@ -67,19 +58,6 @@ namespace SQL
 				delete value;
 			this->data.clear();
 		}
-
-		void SetType(const Anope::string &key, Type t) override
-		{
-			this->types[key] = t;
-		}
-
-		Type GetType(const Anope::string &key) const override
-		{
-			std::map<Anope::string, Type>::const_iterator it = this->types.find(key);
-			if (it != this->types.end())
-				return it->second;
-			return DT_TEXT;
-		}
 	};

 	/** A SQL exception, can be thrown at various points
@@ -1,6 +1,6 @@
 /*
 *
- * (C) 2010-2024 Anope Team
+ * (C) 2010-2025 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -1,6 +1,6 @@
 /*
 *
- * (C) 2003-2024 Anope Team
+ * (C) 2003-2025 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -1,50 +0,0 @@
-/*
- *
- * (C) 2010-2024 Anope Team
- * Contact us at team@anope.org
- *
- * Please read COPYING and README for further details.
- */
-
-#pragma once
-
-#include "httpd.h"
-
-class XMLRPCRequest final
-{
-	std::map<Anope::string, Anope::string> replies;
-
-public:
-	Anope::string name;
-	Anope::string id;
-	std::deque<Anope::string> data;
-	HTTPReply &r;
-
-	XMLRPCRequest(HTTPReply &_r) : r(_r) { }
-	inline void reply(const Anope::string &dname, const Anope::string &ddata) { this->replies.emplace(dname, ddata); }
-	inline const std::map<Anope::string, Anope::string> &get_replies() { return this->replies; }
-};
-
-class XMLRPCServiceInterface;
-
-class XMLRPCEvent
-{
-public:
-	virtual ~XMLRPCEvent() = default;
-	virtual bool Run(XMLRPCServiceInterface *iface, HTTPClient *client, XMLRPCRequest &request) = 0;
-};
-
-class XMLRPCServiceInterface
-	: public Service
-{
-public:
-	XMLRPCServiceInterface(Module *creator, const Anope::string &sname) : Service(creator, "XMLRPCServiceInterface", sname) { }
-
-	virtual void Register(XMLRPCEvent *event) = 0;
-
-	virtual void Unregister(XMLRPCEvent *event) = 0;
-
-	virtual Anope::string Sanitize(const Anope::string &string) = 0;
-
-	virtual void Reply(XMLRPCRequest &request) = 0;
-};
@@ -1,6 +1,6 @@
 /*
 *
- * (C) 2003-2024 Anope Team
+ * (C) 2003-2025 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -1,7 +1,7 @@
 /*
 *
 * (C) 2008-2011 Robin Burchell <w00t@inspircd.org>
- * (C) 2008-2024 Anope Team <team@anope.org>
+ * (C) 2008-2025 Anope Team <team@anope.org>
 *
 * Please read COPYING and README for further details.
 */
@@ -23,6 +23,7 @@ struct CoreExport Oper
 	/* Whether the user must be an IRC operator (umode +o) to be considered a services operator */
 	bool require_oper = true;
 	Anope::string password;
+	Anope::string password_hash;
 	std::vector<Anope::string> certfp;
 	/* Hosts allowed to use this operator block */
 	std::vector<Anope::string> hosts;
@@ -1,6 +1,6 @@
 /*
 *
- * (C) 2003-2024 Anope Team
+ * (C) 2003-2025 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -107,8 +107,8 @@ public:
 	/* If this IRCd has unique ids, whether the IDs and nicknames are ambiguous */
 	bool AmbiguousID = false;

-	/** Can we ask the server to unban a user? */
-	bool CanClearBans = false;
+	/** Can we ask the server to remove list modes matching a user? */
+	std::set<Anope::string> CanClearModes;

 	/** Can we send tag messages? */
 	bool CanTagMessage = false;
@@ -222,7 +222,7 @@ public:
 	virtual void SendContextNotice(BotInfo *bi, User *target, Channel *context, const Anope::string &msg);
 	virtual void SendContextPrivmsg(BotInfo *bi, User *target, Channel *context, const Anope::string &msg);

-	virtual void SendQuit(User *u, const Anope::string &msg);
+	virtual void SendQuit(User *u, const Anope::string &msg = "", const Anope::string &opermsg = "");
 	virtual void SendPing(const Anope::string &servname, const Anope::string &who);
 	virtual void SendPong(const Anope::string &servname, const Anope::string &who);

@@ -240,9 +240,9 @@ public:
 	 * @param bi The source of the message
 	 * @param u The user to join
 	 * @param chan The channel to join the user to
-	 * @param param Channel key?
+	 * @param key Channel key
 	 */
-	virtual void SendSVSJoin(const MessageSource &source, User *u, const Anope::string &chan, const Anope::string &param) { }
+	virtual void SendSVSJoin(const MessageSource &source, User *u, const Anope::string &chan, const Anope::string &key) { }

 	/** Force parts a user that isn't ours from a channel.
 	 * @param source The source of the message
@@ -304,11 +304,7 @@ public:
 	 */
 	virtual void SendOper(User *u);

-	virtual void SendClearBans(const MessageSource &user, Channel *c, User* u) { }
-
-	virtual void SendSASLMechanisms(std::vector<Anope::string> &) { }
-	virtual void SendSASLMessage(const SASL::Message &) { }
-	virtual void SendSVSLogin(const Anope::string &uid, NickAlias *na) { }
+	virtual void SendClearModes(const MessageSource &user, Channel *c, User* u, const Anope::string &mode) { }

 	virtual bool IsNickValid(const Anope::string &);
 	virtual bool IsChannelValid(const Anope::string &);
@@ -366,7 +362,7 @@ public:
 		FLAG_MAX,
 	};

-private:
+protected:
 	/** The name of the message (e.g. PRIVMSG). */
 	const Anope::string name;

@@ -1,6 +1,6 @@
 /*
 *
- * (C) 2008-2024 Anope Team
+ * (C) 2008-2025 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -25,6 +25,14 @@ class CoreExport AutoKick final
 	: public Serializable
 {
 public:
+	struct Type final
+		: public Serialize::Type
+	{
+		Type();
+		void Serialize(const Serializable *obj, Serialize::Data &data) const override;
+		Serializable *Unserialize(Serializable *obj, Serialize::Data &data) const override;
+	};
+
 	/* Channel this autokick is on */
 	Serialize::Reference<ChannelInfo> ci;

@@ -38,8 +46,6 @@ public:

 	AutoKick();
 	~AutoKick();
-	void Serialize(Serialize::Data &data) const override;
-	static Serializable *Unserialize(Serializable *obj, Serialize::Data &);
 };

 /* It matters that Base is here before Extensible (it is inherited by Serializable)
@@ -48,9 +54,18 @@ class CoreExport ChannelInfo final
 	: public Serializable
 	, public Extensible
 {
+public:
+	struct Type final
+		: public Serialize::Type
+	{
+		Type();
+		void Serialize(const Serializable *obj, Serialize::Data &data) const override;
+		Serializable *Unserialize(Serializable *obj, Serialize::Data &data) const override;
+	};
+
+private:
 	/* channels who reference this one */
 	Anope::map<int> references;
-private:
 	Serialize::Reference<NickCore> founder;					/* Channel founder */
 	Serialize::Reference<NickCore> successor;                               /* Who gets the channel if the founder nick is dropped or expires */
 	Serialize::Checker<std::vector<ChanAccess *> > access;			/* List of authorized users */
@@ -64,16 +79,16 @@ public:
 	Anope::string name;                       /* Channel name */
 	Anope::string desc;

-	time_t time_registered;
+	time_t registered;
 	time_t last_used;

 	Anope::string last_topic;                 /* The last topic that was set on this channel */
 	Anope::string last_topic_setter;          /* Setter */
-	time_t last_topic_time;	                  /* Time */
+	time_t last_topic_time = 0;               /* Time */

 	Channel::ModeList last_modes;             /* The last modes set on this channel */

-	int16_t bantype;
+	int16_t bantype = 2;

 	MemoInfo memos;

@@ -82,7 +97,7 @@ public:
 	/* For BotServ */
 	Serialize::Reference<BotInfo> bi;         /* Bot used on this channel */

-	time_t banexpire;                       /* Time bans expire in */
+	time_t banexpire = 0;                     /* Time bans expire in */

 	/** Constructor
 	 * @param chname The channel name
@@ -97,9 +112,6 @@ public:
 	~ChannelInfo();
 	ChannelInfo &operator=(const ChannelInfo &) = default;

-	void Serialize(Serialize::Data &data) const override;
-	static Serializable *Unserialize(Serializable *obj, Serialize::Data &);
-
 	/** Change the founder of the channel
 	 * @params nc The new founder
 	 */
@@ -1,6 +1,6 @@
 /*
 *
- * (C) 2003-2024 Anope Team
+ * (C) 2003-2025 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -1,6 +1,6 @@
 /*
 *
- * (C) 2003-2024 Anope Team
+ * (C) 2003-2025 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -16,25 +16,59 @@
 #include "anope.h"
 #include "base.h"

+/** Names of serialization types implemented in the core. */
+#define AUTOKICK_TYPE    "AutoKick"
+#define BOTINFO_TYPE     "BotInfo"
+#define CHANACCESS_TYPE  "ChanAccess"
+#define CHANNELINFO_TYPE "ChannelInfo"
+#define MEMO_TYPE        "Memo"
+#define NICKALIAS_TYPE   "NickAlias"
+#define NICKCORE_TYPE    "NickCore"
+#define XLINE_TYPE       "XLine"
+
 namespace Serialize
 {
-	class Data
+	enum class DataType
+		: uint8_t
 	{
-	public:
-		enum Type
-		{
-			DT_TEXT,
-			DT_INT
-		};
+		BOOL,
+		FLOAT,
+		INT,
+		TEXT,
+		UINT,
+	};

+	class CoreExport Data
+	{
+	protected:
+		std::map<Anope::string, Serialize::DataType> types;
+
+	public:
 		virtual ~Data() = default;

 		virtual std::iostream &operator[](const Anope::string &key) = 0;
-		virtual std::set<Anope::string> KeySet() const { throw CoreException("Not supported"); }
+
+		template <typename T>
+		void Store(const Anope::string &key, const T &value)
+		{
+			using Type = std::remove_cv_t<std::remove_reference_t<T>>;
+
+			if constexpr (std::is_same_v<Type, bool>)
+				SetType(key, DataType::BOOL);
+			else if constexpr (std::is_floating_point_v<Type>)
+				SetType(key, DataType::FLOAT);
+			else if constexpr (std::is_integral_v<Type> && std::is_signed_v<Type>)
+				SetType(key, DataType::INT);
+			else if constexpr (std::is_integral_v<Type> && std::is_unsigned_v<Type>)
+				SetType(key, DataType::UINT);
+
+			this->operator[](key) << value;
+		}
+
 		virtual size_t Hash() const { throw CoreException("Not supported"); }

-		virtual void SetType(const Anope::string &key, Type t) { }
-		virtual Type GetType(const Anope::string &key) const { return DT_TEXT; }
+		Serialize::DataType GetType(const Anope::string &key) const;
+		void SetType(const Anope::string &key, Serialize::DataType dt);
 	};

 	extern void RegisterTypes();
@@ -76,10 +110,11 @@ protected:
 	Serializable &operator=(const Serializable &);

 public:
+	using Id = uint64_t;
 	virtual ~Serializable();

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

 	/* Only used by redis, to ignore updates */
 	unsigned short redis_ignore = 0;
@@ -99,82 +134,104 @@ public:
 	 */
 	Serialize::Type *GetSerializableType() const { return this->s_type; }

-	virtual void Serialize(Serialize::Data &data) const = 0;
-
 	static const std::list<Serializable *> &GetItems();
 };

-/* A serializable type. There should be one of these classes for each type
- * of class that inherits from Serializable. Used for unserializing objects
- * of this type, as it requires a function pointer to a static member function.
+/* A serializable type. There should be a single instance of a subclass of this
+ * for each subclass of Serializable as this is what is used to serialize and
+ * deserialize data from the database.
 */
-class CoreExport Serialize::Type final
+class CoreExport Serialize::Type
 	: public Base
 {
-	typedef Serializable *(*unserialize_func)(Serializable *obj, Serialize::Data &);
-
-	static std::vector<Anope::string> TypeOrder;
-	static std::map<Anope::string, Serialize::Type *> Types;
-
-	/* The name of this type, should be a class name */
+private:
+	/** The name of this type in the database (e.g. NickAlias). */
 	Anope::string name;
-	unserialize_func unserialize;
-	/* Owner of this type. Used for placing objects of this type in separate databases
-	 * based on what module, if any, owns it.
+
+	/** The module which owns this type, or nullptr if it belongs to the core.
+	 * Some database backends use this to put third-party module data into their
+	 * own database.
 	 */
 	Module *owner;

-	/* 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.
+	/** The time at which this type was last synchronised with the database.
+	 * Only used by live database backends like db_sql_live.
 	 */
 	time_t timestamp = 0;

-public:
-	/* Map of Serializable::id to Serializable objects */
-	std::map<uint64_t, Serializable *> objects;
+	/* The names of currently registered types in order of registration. */
+	static std::vector<Anope::string> TypeOrder;

-	/** Creates a new serializable type
-	 * @param n Type name
-	 * @param f Func to unserialize objects
-	 * @param owner Owner of this type. Leave NULL for the core.
+	/** The currently registered types. */
+	static std::map<Anope::string, Serialize::Type *> Types;
+
+protected:
+	/** Creates a new serializable type.
+	 * @param n The name of the type . This should match the value passed in the
+	 *          constructor of the equivalent Serializable type.
+	 * @param o The module which owns this type, or nullptr if it belongs to the
+	 *          core.
 	 */
-	Type(const Anope::string &n, unserialize_func f, Module *owner = NULL);
+	Type(const Anope::string &n, Module *o = nullptr);
+
+public:
+	/* Map of Serializable objects of this type keyed by their object id. */
+	std::map<Serializable::Id, Serializable *> objects;
+
+	/** Destroys a serializable type. */
 	~Type();

-	/** Gets the name for this type
-	 * @return The name, eg "NickAlias"
-	 */
-	const Anope::string &GetName() { return this->name; }
-
-	/** Unserialized an object.
-	 * @param obj NULL if this object doesn't yet exist. If this isn't NULL, instead
-	 * update the contents of this object.
-	 * @param data The data to unserialize
-	 * @return The unserialized object. If obj != NULL this should be obj.
-	 */
-	Serializable *Unserialize(Serializable *obj, Serialize::Data &data);
-
-	/** Check if this object type has any pending changes and update them.
-	 */
+	/** Checks for and applies any pending object updates for this type. */
 	void Check();

-	/** Gets the timestamp for the object type. That is, the time we know
-	 * all objects of this type are updated at least to.
+	/** Attempts to find a serializable type with the specified name.
+	 * @param n The name of the serializable type to find.
 	 */
-	time_t GetTimestamp() const;
+	static Serialize::Type *Find(const Anope::string &n);

-	/** Bumps object type timestamp to current time
+	/** Retrieves the name of this type in the database (e.g. NickAlias). */
+	inline const auto &GetName() const { return this->name; }
+
+	/** Retrieves the module which owns this type, or nullptr if it belongs to
+	 * the core. Some database backends use this to put third-party module data
+	 * into their own database.
+	 */
+	inline auto *GetOwner() const { return this->owner; }
+
+	/** Retrieves the time at which this type was last synchronised with the
+	 * database. Only used by live database backends like db_sql_live.
+	 */
+	inline auto GetTimestamp() const { return this->timestamp; };
+
+	/** Retrieves the names of currently registered types in order of
+	 * registration.
+	 */
+	inline static const auto &GetTypeOrder() { return TypeOrder; }
+
+	/** Retrieves the currently registered types. */
+	inline static const auto &GetTypes() { return Types; }
+
+	/** Serializes the specified object to the database.
+	 * @param obj The object to serialise. This is guaranteed to be the correct
+	 *            type so you can cast it without any checks.
+	 * @param data The database to serialize to.
+	 */
+	virtual void Serialize(const Serializable *obj, Serialize::Data &data) const = 0;
+
+	/** Unserializes the specified object from the database.
+	 * @param obj The object to unserialize into. If the object has not been
+	 *            unserialized yet this will be nullptr. This is guaranteed to
+	 *            be the correct type so you can cast it without any checks.
+	 * @param data The database to unserialize from.
+	 * @return The object specified in obj or a new object it if was nullptr.
+	 */
+	virtual Serializable *Unserialize(Serializable *obj, Serialize::Data &data) const = 0;
+
+	/** Updates the time at which this type was last synchronised with the
+	 * database to the current time. Only used by live database backends like
+	 * db_sql_live.
 	 */
 	void UpdateTimestamp();
-
-	Module *GetOwner() const { return this->owner; }
-
-	static Serialize::Type *Find(const Anope::string &name);
-
-	static const std::vector<Anope::string> &GetTypeOrder();
-
-	static const std::map<Anope::string, Serialize::Type *>& GetTypes();
 };

 /** Should be used to hold lists and other objects of a specific type,
@@ -1,6 +1,6 @@
 /*
 *
- * (C) 2003-2024 Anope Team
+ * (C) 2003-2025 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
--- a/Show More
+++ b/Show More