Release 2.0.18.

This does not affect 2.1 because grouped nicknames work differently
on that branch.

Reported by @ValwareIRC.

.github/ISSUE_TEMPLATE/BUG_REPORT.md

@@ -0,0 +1,33 @@
+---
+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`:**
+

.github/ISSUE_TEMPLATE/FEATURE_REQUEST.md

@@ -0,0 +1,15 @@
+---
+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**
+

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1 @@
+blank_issues_enabled: false

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,26 @@
+<!--
+Please fill in the template below. It will help us process your pull request a lot faster.
+-->
+
+## Summary
+
+<!--
+Briefly describe what this pull request changes.
+-->
+
+## Rationale
+
+<!--
+Describe why you have made this change.
+-->
+
+## Testing Environment
+
+<!--
+Describe the environment in which you have tested this change:
+-->
+
+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 -->

.github/SECURITY.md

@@ -0,0 +1,19 @@
+# Security Policy
+
+## Supported Versions
+
+Currently the 2.0 (stable) branch is actively receiving security fixes.
+
+The 2.1 (development) branch is still early in development and currently only receives security fixes when they are synced from the 2.0 branch.
+
+Version | Supported
+------- | ---------
+2.1.x   | :warning:
+2.0.x   | :white_check_mark:
+1.8.x   | :x:
+
+## 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.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.

.github/dependabot.yml

@@ -0,0 +1,7 @@
+version: 2
+updates:
+  - package-ecosystem: github-actions
+    directory: /
+    schedule:
+      interval: monthly
+    target-branch: "2.1"

.github/workflows/ci-linux.yml

@@ -1,45 +1,51 @@
-name: Linux CI
+name: Ubuntu CI
 on:
   - pull_request
   - push
 jobs:
   build:
-    runs-on: ubuntu-20.04
+    if: "!contains(github.event.head_commit.message, '[skip ubuntu ci]')"
+    runs-on: ubuntu-24.04
     env:
       CXX: ${{ matrix.compiler }}
       CXXFLAGS: -std=${{ matrix.standard }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
+
       - name: Install dependencies
         run: |
           sudo apt-get update --assume-yes
           sudo apt-get install --assume-yes --no-install-recommends \
             clang \
             g++ \
+            gettext \
             git \
-            libc++-dev \
-            libc++abi-dev \
             libgnutls28-dev \
             libldap2-dev \
             libmysqlclient-dev \
+            libpcre2-dev \
             libpcre3-dev \
             libsqlite3-dev \
             libssl-dev \
             libtre-dev \
-            make
+            ninja-build
+
       - name: Enable extras
         run: |
-          for MODULE in m_ldap.cpp m_ldap_authentication.cpp m_ldap_oper.cpp m_mysql.cpp m_regex_pcre.cpp m_regex_posix.cpp m_regex_tre.cpp m_sql_authentication.cpp m_sql_log.cpp m_sql_oper.cpp m_sqlite.cpp m_ssl_gnutls.cpp m_ssl_openssl.cpp stats
+          for MODULE in m_ldap.cpp m_ldap_authentication.cpp m_ldap_oper.cpp m_mysql.cpp m_regex_pcre.cpp m_regex_pcre2.cpp m_regex_posix.cpp m_regex_tre.cpp m_sql_authentication.cpp m_sql_log.cpp m_sql_oper.cpp m_sqlite.cpp m_ssl_gnutls.cpp m_ssl_openssl.cpp stats
           do
             ln -s ${{ github.workspace }}/modules/extra/$MODULE ${{ github.workspace }}/modules
           done
+
       - name: Run CMake
         run: |
           mkdir build && cd build
-          cmake -DCMAKE_BUILD_TYPE:STRING=DEBUG -DINSTDIR:STRING=${{ github.workspace }}/run ..
+          cmake -GNinja -DCMAKE_BUILD_TYPE:STRING=DEBUG -DINSTDIR:STRING=${{ github.workspace }}/run ..
+
       - name: Build Anope
         run: |
-          make --directory ${{ github.workspace }}/build --jobs $(nproc) --no-print-directory install
+          ninja -C ${{ github.workspace }}/build install
+
     strategy:
       fail-fast: false
       matrix:

.github/workflows/ci-windows.yml

@@ -0,0 +1,66 @@
+name: Windows CI
+on:
+  pull_request:
+  push:
+  release:
+    types:
+      - published
+jobs:
+  build:
+    if: "!contains(github.event.head_commit.message, '[skip windows ci]')"
+    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
+
+      - name: Setup Conan
+        uses: turtlebrowser/get-conan@v1.2
+        with:
+          version: 1.66.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=${{ env.BUILD_TYPE }}" -G "Visual Studio 17 2022" ..
+
+      - name: Build Anope
+        working-directory: ${{ github.workspace }}\build
+        run: |
+          msbuild PACKAGE.vcxproj /M:5 /P:Configuration=${{ env.BUILD_TYPE }} /P:Platform=x64 /VERBOSITY:MINIMAL
+
+      - name: Upload installer
+        if: "${{ github.event_name == 'release' }}"
+        working-directory: ${{ github.workspace }}\build
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          gh release upload ${{ github.event.release.tag_name }} $(Get-ChildItem anope-*.exe)

.gitignore

@@ -1,4 +1,19 @@
+build/
 config.cache
 include/sysconf.h
-build/
+modules/m_ldap.cpp
+modules/m_ldap_authentication.cpp
+modules/m_ldap_oper.cpp
+modules/m_mysql.cpp
+modules/m_regex_pcre.cpp
+modules/m_regex_pcre2.cpp
+modules/m_regex_posix.cpp
+modules/m_regex_tre.cpp
+modules/m_sql_authentication.cpp
+modules/m_sql_log.cpp
+modules/m_sql_oper.cpp
+modules/m_sqlite.cpp
+modules/m_ssl_gnutls.cpp
+modules/m_ssl_openssl.cpp
+modules/stats
 run/

CMakeLists.txt

@@ -1,14 +1,5 @@
 # This usage of CMake requires at least version 2.4 (checks are made to determine what to use when certain versions lack functions)
-cmake_minimum_required(VERSION 2.4 FATAL_ERROR)
-if(COMMAND cmake_policy)
-  cmake_policy(SET CMP0003 NEW)
-  if(POLICY CMP0026)
-    cmake_policy(SET CMP0026 OLD)
-  endif(POLICY CMP0026)
-  if(POLICY CMP0007)
-    cmake_policy(SET CMP0007 OLD)
-  endif(POLICY CMP0007)
-endif(COMMAND cmake_policy)
+cmake_minimum_required(VERSION 2.4...3.20 FATAL_ERROR)
 
 # Set the project as C++ primarily, but have C enabled for the checks required later
 project(Anope CXX)
@@ -87,9 +78,6 @@ if(CMAKE_COMPILER_IS_GNUCXX)
   if(GCC_VERSION LESS 4.2)
     message(FATAL_ERROR "Your compiler is too old to build Anope. Upgrade to GCC 4.2 or newer!")
   endif(GCC_VERSION LESS 4.2)
-  if(GCC_VERSION GREATER 6.0 OR GCC_VERSION EQUAL 6.0)
-    set(CXXFLAGS "${CXXFLAGS} -fno-delete-null-pointer-checks")
-  endif(GCC_VERSION GREATER 6.0 OR GCC_VERSION EQUAL 6.0)
 endif(CMAKE_COMPILER_IS_GNUCXX)
 
 # If we are using a GNU compiler (have to use CXX because it seems to fail on C), we will be able to determine it's default paths for libraries and includes
@@ -232,6 +220,12 @@ if(EXTRA_LIBS)
   link_directories(${EXTRA_LIBS})
 endif(EXTRA_LIBS)
 
+# setup conan
+if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/conanbuildinfo.cmake")
+  include("${CMAKE_CURRENT_SOURCE_DIR}/conanbuildinfo.cmake")
+  conan_basic_setup()
+endif()
+
 # Find gettext
 find_package(Gettext)
 
@@ -419,7 +413,6 @@ read_from_file(${Anope_SOURCE_DIR}/src/version.sh "^VERSION_" VERSIONS)
 # Iterate through the strings found
 foreach(VERSION_STR ${VERSIONS})
   string(REGEX REPLACE "^VERSION_([A-Z]+)=\"?([^\"]*)\"?$" "\\1;\\2" VERSION_OUT ${VERSION_STR})
-  # Depends on CMP0007 OLD
   list(LENGTH VERSION_OUT VERSION_LEN)
   list(GET VERSION_OUT 0 VERSION_TYPE)
   if(${VERSION_LEN} GREATER 1)
@@ -476,16 +469,8 @@ if(${Anope_SOURCE_DIR} STREQUAL ${Anope_BINARY_DIR})
   endif(MSVC)
 endif(${Anope_SOURCE_DIR} STREQUAL ${Anope_BINARY_DIR})
 
-# 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
-get_target_property(SERVICES_BINARY ${PROGRAM_NAME} LOCATION)
+set(SERVICES_BINARY "$<TARGET_FILE:${PROGRAM_NAME}>")
 get_filename_component(SERVICES_BINARY ${SERVICES_BINARY} NAME)
 
 # At install time, create the following additional directories
@@ -505,10 +490,6 @@ if(WIN32)
   install(FILES ${Anope_SOURCE_DIR}/src/win32/anope.bat
     DESTINATION ${BIN_DIR}
   )
-
-  # Package any DLLs in src/win/
-  file(GLOB EXTRA_DLLS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "${Anope_SOURCE_DIR}/src/win32/*.dll")
-  install(FILES ${EXTRA_DLLS} DESTINATION ${BIN_DIR})
 endif(WIN32)
 
 install(CODE "file(REMOVE_RECURSE \"$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${LIB_DIR}/modules\")")
@@ -557,3 +538,12 @@ if(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake")
   set(CPACK_MONOLITHIC_INSTALL TRUE)
   include(CPack)
 endif(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake")
+
+# 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)
+

Config

@@ -2,7 +2,7 @@
 #
 # Configuration script for Services.
 #
-# Anope (c) 2003-2020 Anope Team
+# Anope (C) 2003-2024 Anope Team
 # Contact us at team@anope.org
 #
 # This program is free but copyrighted software; see the file COPYING for
@@ -149,6 +149,9 @@ while [ $# -ge 1 ] ; do
 		echo "-nointro     Skip intro (disclaimer, etc)"
 		echo "-quick       Skip questions, go straight to cmake"
 		exit 0
+	elif [ $1 = "-devel" ] ; then
+		DEBUG="yes"
+		INSTDIR="$PWD/run"
 	elif [ $1 = "-nocache" ] ; then
 		IGNORE_CACHE="1"
 	elif [ $1 = "-nointro" ] ; then
@@ -190,6 +193,7 @@ if [ ! "$NO_INTRO" ] ; then
 			clear
 			;;
 	esac
+	export MORE='-e'
 	. $SOURCE_DIR/src/version.sh
 	cat $SOURCE_DIR/.BANNER | sed "s/CURVER/$VERSION_MAJOR.$VERSION_MINOR.$VERSION_PATCH$VERSION_EXTRA/" | sed "s@SOURCE_DIR@$SOURCE_DIR@" | $PAGER
 	echo ""

README.md

@@ -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/example.conf to conf/services.conf
 $ cp conf/example.conf conf/services.conf
 ```
 
-Edit services.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.anope.org](irc://irc.anope.org/#anope).
+Edit services.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 `services.conf` to include the new file.
 

cmake/Anope.cmake

@@ -160,7 +160,7 @@ macro(sort_list LIST)
     # For CMake 2.4.4 or better, this can be done automatically
     list(SORT ${LIST})
   else(CMAKE244_OR_BETTER)
-    # For CMake 2.4.x before 2.4.4, we have to do this ourselves, firstly we'll create a teporary list
+    # For CMake 2.4.x before 2.4.4, we have to do this ourselves, firstly we'll create a temporary list
     set(NEW_LIST)
     # Iterate through the old list
     foreach(ITEM ${${LIST}})
@@ -408,7 +408,7 @@ macro(calculate_depends SRC)
         else(FOUND_${FILENAME}_INCLUDE)
           # XXX
           if(NOT ${FILENAME} STREQUAL "libintl.h")
-            message(FATAL_ERROR "${SRC} needs header file ${FILENAME} but we were unable to locate that header file! Check that the header file is within the search path of your OS.")
+            message(WARNING "${SRC} needs header file ${FILENAME} but we were unable to locate that header file! Check that the header file is within the search path of your OS.")
           endif(NOT ${FILENAME} STREQUAL "libintl.h")
         endif(FOUND_${FILENAME}_INCLUDE)
       endif(CHECK_ANGLE_INCLUDES)
@@ -445,24 +445,32 @@ macro(calculate_libraries SRC SRC_LDFLAGS EXTRA_DEPENDS)
     string(REGEX REPLACE "," ";" REQUIRED_LIBRARY ${REQUIRED_LIBRARY})
     # Iterate through the libraries given
     foreach(LIBRARY ${REQUIRED_LIBRARY})
+      # If the library has multiple names extract the alternate.
+      unset(LIBRARY_ALT)
+      if (${LIBRARY} MATCHES "^.+\\|.+$")
+        string(REGEX REPLACE ".+\\|(.*)" "\\1" LIBRARY_ALT ${LIBRARY})
+        string(REGEX REPLACE "(.+)\\|.*" "\\1" LIBRARY ${LIBRARY})
+      endif(${LIBRARY} MATCHES "^.+\\|.+$")
       # Locate the library to see if it exists
       if(DEFAULT_LIBRARY_DIRS OR WSDK_PATH OR DEFINED $ENV{VCINSTALLDIR})
-        find_library(FOUND_${LIBRARY}_LIBRARY NAMES ${LIBRARY} PATHS ${DEFAULT_LIBRARY_DIRS} ${WSDK_PATH}/lib $ENV{VCINSTALLDIR}/lib ${EXTRA_INCLUDE} ${EXTRA_LIBS})
+        find_library(FOUND_${LIBRARY}_LIBRARY NAMES ${LIBRARY} ${LIBRARY_ALT} PATHS ${DEFAULT_LIBRARY_DIRS} ${WSDK_PATH}/lib $ENV{VCINSTALLDIR}/lib ${EXTRA_INCLUDE} ${EXTRA_LIBS})
       else(DEFAULT_LIBRARY_DIRS OR WSDK_PATH OR DEFINED $ENV{VCINSTALLDIR})
-        find_library(FOUND_${LIBRARY}_LIBRARY NAMES ${LIBRARY} PATHS ${EXTRA_INCLUDE} ${EXTRA_LIBS} NO_DEFAULT_PATH)
-        find_library(FOUND_${LIBRARY}_LIBRARY NAMES ${LIBRARY} PATHS ${EXTRA_INCLUDE} ${EXTRA_LIBS})
+        find_library(FOUND_${LIBRARY}_LIBRARY NAMES ${LIBRARY} ${LIBRARY_ALT} PATHS ${EXTRA_INCLUDE} ${EXTRA_LIBS} NO_DEFAULT_PATH)
+        find_library(FOUND_${LIBRARY}_LIBRARY NAMES ${LIBRARY} ${LIBRARY_ALT} PATHS ${EXTRA_INCLUDE} ${EXTRA_LIBS})
       endif(DEFAULT_LIBRARY_DIRS OR WSDK_PATH OR DEFINED $ENV{VCINSTALLDIR})
       # If the library was found, we will add it to the linker flags
       if(FOUND_${LIBRARY}_LIBRARY)
-        # Get the path only of the library, to add it to linker flags
-        get_filename_component(LIBRARY_PATH ${FOUND_${LIBRARY}_LIBRARY} PATH)
         if(MSVC)
           # For Visual Studio, instead of editing the linker flags, we'll add the library to a separate list of extra dependencies
           append_to_list(EXTRA_DEPENDENCIES "${FOUND_${LIBRARY}_LIBRARY}")
         else(MSVC)
-          # For all others, add the library paths and libraries
+          # Get the path only of the library, to add it to library paths.
+          get_filename_component(LIBRARY_PATH ${FOUND_${LIBRARY}_LIBRARY} PATH)
           append_to_list(LIBRARY_PATHS "${LIBRARY_PATH}")
-          append_to_list(LIBRARIES "${LIBRARY}")
+          # Extract the library short name, add it to the library path
+          get_filename_component(LIBRARY_NAME ${FOUND_${LIBRARY}_LIBRARY} NAME_WE)
+          string(REGEX REPLACE "^lib" "" LIBRARY_NAME ${LIBRARY_NAME})
+          append_to_list(LIBRARIES ${LIBRARY_NAME})
         endif(MSVC)
       else(FOUND_${LIBRARY}_LIBRARY)
         # In the case of the library not being found, we fatally error so CMake stops trying to generate
@@ -497,7 +505,7 @@ endmacro(calculate_libraries)
 # check_functions(<source filename> <output variable set to TRUE on success>)
 #
 # This macro is used in most of the module (sub)directories to calculate the
-#   fcuntion dependencies for the given source file.
+#   function dependencies for the given source file.
 ###############################################################################
 macro(check_functions SRC SUCCESS)
   # Default to true
@@ -531,7 +539,7 @@ endmacro(check_functions)
 #   of TRUE is given, periods will be converted to \\. for CPack.
 ###############################################################################
 macro(add_to_cpack_ignored_files ITEM)
-  # Temporary copy of the orignal item
+  # Temporary copy of the original item
   set(REAL_ITEM "${ITEM}")
   # If we have 2+ arguments, assume that the second one was something like TRUE (doesn't matter really) and convert periods so they will be \\. for CPack
   if(${ARGC} GREATER 1)

cmake/FindGettext.cmake

@@ -10,9 +10,9 @@ if(NOT WIN32)
     endif(GETTEXT_LIBRARY)
   endif(GETTEXT_INCLUDE AND GETTEXT_MSGFMT)
 else(NOT WIN32)
-  find_path(GETTEXT_INCLUDE libintl.h ${DEFAULT_INCLUDE_DIRS} ${WSDK_PATH}/include $ENV{VCINSTALLDIR}/include gettext/include ${EXTRA_INCLUDE})
-  find_library(GETTEXT_LIBRARY libintl PATHS ${DEFAULT_LIBRARY_DIRS} ${WSDK_PATH}/lib $ENV{VCINSTALLDIR}/lib gettext/lib ${EXTRA_LIBS})
-  find_program(GETTEXT_MSGFMT msgfmt PATHS ${DEFAULT_INCLUDE_DIRS} ${WSDK_PATH}/bin $ENV{VCINSTALLDIR}/bin gettext/bin ${EXTRA_INCLUDE})
+  find_path(GETTEXT_INCLUDE libintl.h)
+  find_library(GETTEXT_LIBRARY gnuintl)
+  find_program(GETTEXT_MSGFMT msgfmt)
   if(GETTEXT_INCLUDE AND GETTEXT_LIBRARY AND GETTEXT_MSGFMT)
     set(GETTEXT_FOUND TRUE)
     set(GETTEXT_LIBRARIES ${GETTEXT_LIBRARY})

cmake/NSIS.template.in

@@ -118,7 +118,7 @@ Var AR_RegFlags
  "exit_${SecName}:"
 !macroend
 
-!macro RemoveSection SecName
+!macro RemoveSection_CPack SecName
   ;  This macro is used to call section's Remove_... macro
   ;from the uninstaller.
   ;Input: section index constant name specified in Section command.
@@ -348,7 +348,7 @@ Function un.RemoveFromPath
 FunctionEnd
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; Uninstall sutff
+; Uninstall stuff
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 ###########################################
@@ -452,15 +452,15 @@ Done:
 	Exch $R1
 FunctionEnd
 
-Function ConditionalAddToRegisty
+Function ConditionalAddToRegistry
   Pop $0
   Pop $1
-  StrCmp "$0" "" ConditionalAddToRegisty_EmptyString
+  StrCmp "$0" "" ConditionalAddToRegistry_EmptyString
     WriteRegStr SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_NAME@" \
     "$1" "$0"
     ;MessageBox MB_OK "Set Registry: '$1' to '$0'"
     DetailPrint "Set install registry entry: '$1' to '$0'"
-  ConditionalAddToRegisty_EmptyString:
+  ConditionalAddToRegistry_EmptyString:
 FunctionEnd
 
 ;--------------------------------
@@ -558,44 +558,44 @@ Section "-Core installation"
   WriteUninstaller "$INSTDIR\Uninstall.exe"
   Push "DisplayName"
   Push "@CPACK_NSIS_DISPLAY_NAME@"
-  Call ConditionalAddToRegisty
+  Call ConditionalAddToRegistry
   Push "DisplayVersion"
   Push "@CPACK_PACKAGE_VERSION@"
-  Call ConditionalAddToRegisty
+  Call ConditionalAddToRegistry
   Push "Publisher"
   Push "@CPACK_PACKAGE_VENDOR@"
-  Call ConditionalAddToRegisty
+  Call ConditionalAddToRegistry
   Push "UninstallString"
   Push "$INSTDIR\Uninstall.exe"
-  Call ConditionalAddToRegisty
+  Call ConditionalAddToRegistry
   Push "NoRepair"
   Push "1"
-  Call ConditionalAddToRegisty
+  Call ConditionalAddToRegistry
 
   !ifdef CPACK_NSIS_ADD_REMOVE
   ;Create add/remove functionality
   Push "ModifyPath"
   Push "$INSTDIR\AddRemove.exe"
-  Call ConditionalAddToRegisty
+  Call ConditionalAddToRegistry
   !else
   Push "NoModify"
   Push "1"
-  Call ConditionalAddToRegisty
+  Call ConditionalAddToRegistry
   !endif
 
   ; Optional registration
   Push "DisplayIcon"
   Push "$INSTDIR\@CPACK_NSIS_INSTALLED_ICON_NAME@"
-  Call ConditionalAddToRegisty
+  Call ConditionalAddToRegistry
   Push "HelpLink"
   Push "@CPACK_NSIS_HELP_LINK@"
-  Call ConditionalAddToRegisty
+  Call ConditionalAddToRegistry
   Push "URLInfoAbout"
   Push "@CPACK_NSIS_URL_INFO_ABOUT@"
-  Call ConditionalAddToRegisty
+  Call ConditionalAddToRegistry
   Push "Contact"
   Push "@CPACK_NSIS_CONTACT@"
-  Call ConditionalAddToRegisty
+  Call ConditionalAddToRegistry
   !insertmacro MUI_STARTMENU_WRITE_BEGIN Application
 
   ;Create shortcuts
@@ -607,19 +607,19 @@ Section "-Core installation"
   ; Write special uninstall registry entries
   Push "StartMenu"
   Push "$STARTMENU_FOLDER"
-  Call ConditionalAddToRegisty
+  Call ConditionalAddToRegistry
   Push "DoNotAddToPath"
   Push "$DO_NOT_ADD_TO_PATH"
-  Call ConditionalAddToRegisty
+  Call ConditionalAddToRegistry
   Push "AddToPathAllUsers"
   Push "$ADD_TO_PATH_ALL_USERS"
-  Call ConditionalAddToRegisty
+  Call ConditionalAddToRegistry
   Push "AddToPathCurrentUser"
   Push "$ADD_TO_PATH_CURRENT_USER"
-  Call ConditionalAddToRegisty
+  Call ConditionalAddToRegistry
   Push "InstallToDesktop"
   Push "$INSTALL_DESKTOP"
-  Call ConditionalAddToRegisty
+  Call ConditionalAddToRegistry
 
 @CPACK_NSIS_EXTRA_INSTALL_COMMANDS@
 
@@ -731,7 +731,7 @@ Section "Uninstall"
   DeleteRegKey SHCTX "Software\@CPACK_PACKAGE_VENDOR@\@CPACK_PACKAGE_INSTALL_REGISTRY_KEY@"
 
   ; Removes all optional components
-  !insertmacro SectionList "RemoveSection"
+  !insertmacro SectionList "RemoveSection_CPack"
 
   !insertmacro MUI_STARTMENU_GETFOLDER Application $MUI_TEMP
 
@@ -739,7 +739,7 @@ Section "Uninstall"
 @CPACK_NSIS_DELETE_ICONS@
 @CPACK_NSIS_DELETE_ICONS_EXTRA@
 
-  ;Delete empty start menu parent diretories
+  ;Delete empty start menu parent directories
   StrCpy $MUI_TEMP "$SMPROGRAMS\$MUI_TEMP"
 
   startMenuDeleteLoop:
@@ -752,13 +752,13 @@ Section "Uninstall"
     StrCmp "$MUI_TEMP" "$SMPROGRAMS" startMenuDeleteLoopDone startMenuDeleteLoop
   startMenuDeleteLoopDone:
 
-  ; If the user changed the shortcut, then untinstall may not work. This should
+  ; If the user changed the shortcut, then uninstall may not work. This should
   ; try to fix it.
   StrCpy $MUI_TEMP "$START_MENU"
   Delete "$SMPROGRAMS\$MUI_TEMP\Uninstall.lnk"
 @CPACK_NSIS_DELETE_ICONS_EXTRA@
 
-  ;Delete empty start menu parent diretories
+  ;Delete empty start menu parent directories
   StrCpy $MUI_TEMP "$SMPROGRAMS\$MUI_TEMP"
 
   secondStartMenuDeleteLoop:

data/botserv.example.conf

@@ -249,7 +249,7 @@ command { service = "BotServ"; name = "INFO"; command = "botserv/info"; }
  *   botserv/kick/italics - Configures BotServ's italics kicker.
  *   botserv/kick/repeat - Configures BotServ's repeat kicker.
  *   botserv/kick/reverses - Configures BotServ's reverse kicker.
- *   botserv/kick/underlines - Configures BotServ's reverse kicker.
+ *   botserv/kick/underlines - Configures BotServ's underline kicker.
  *   botserv/set/dontkickops - Used for preventing BotServ from kicking channel operators.
  *   botserv/set/dontkickvoices - Used for preventing BotServ from kicking voices.
  *

data/chanserv.example.conf

@@ -89,10 +89,12 @@ module
 	 * -       noautoop: Disables autoop on the channel
 	 * -  cs_keep_modes: Enables keep modes on the channel, which retains modes when the channel is
 	 *                     not in use.
+	 * -   cs_no_expire: Enables no expire. Needs founder, successor (if set) or anyone in the access list
+	 *                   to be a registered nick, otherwise the channel will be dropped.
 	 * -           none: No defaults
 	 *
-	 * This directive is optional, if left blank, the options will default to keeptopic, cs_secure, securefounder,
-	 * 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 keeptopic, peace, cs_secure,
+	 * securefounder, and signkick. If you really want no defaults, use "none" by itself as the option.
 	 */
 	defaults = "keeptopic peace cs_secure securefounder signkick"
 
@@ -107,10 +109,9 @@ module
 	/*
 	 * The length of time before a channel registration expires.
 	 *
-	 * This directive is optional, but recommended.
-	 * If not set, the default is 14 days.
+	 * This directive is optional. If not set, the default is never.
 	 */
-	expire = 14d
+	#expire = 90d
 
 	/*
 	 * The maximum number of entries on a channel's access list.

data/example.conf

@@ -90,7 +90,7 @@
 define
 {
 	name = "services.host"
-	value = "services.localhost.net"
+	value = "services.example.com"
 }
 
 /*
@@ -127,13 +127,16 @@ define
  * and serverinfo configuration would look like:
  *
  *     # This goes in inspircd.conf, *NOT* your Anope config!
- *     <link name="services.localhost.net"
+ *     <module name="hidechans">
+ *     <module name="services_account">
+ *     <module name="spanningtree">
+ *     <bind address="127.0.0.1" port="7000" type="servers">
+ *     <link name="services.example.com"
  *           ipaddr="127.0.0.1"
  *           port="7000"
  *           sendpass="mypassword"
  *           recvpass="mypassword">
- *     <uline server="services.localhost.net" silent="yes">
- *     <bind address="127.0.0.1" port="7000" type="servers">
+ *     <uline server="services.example.com" silent="yes">
  *
  * An example configuration for UnrealIRCd that is compatible with the below uplink
  * and serverinfo configuration would look like:
@@ -146,14 +149,14 @@ define
  *             serversonly;
  *         };
  *     };
- *     link services.localhost.net {
+ *     link services.example.com {
  *         incoming {
  *             mask *@127.0.0.1;
  *         };
  *         password "mypassword";
  *         class servers;
  *     };
- *     ulines { services.localhost.net; };
+ *     ulines { services.example.com; };
  */
 uplink
 {
@@ -206,7 +209,7 @@ serverinfo
 	 * other server names on the rest of your IRC network. Note that it does not have
 	 * to be an existing hostname, just one that isn't on your network already.
 	 */
-	name = "services.localhost.net"
+	name = "services.example.com"
 
 	/*
 	 * The text which should appear as the server's information in /WHOIS and similar
@@ -256,7 +259,7 @@ serverinfo
  *  - hybrid
  *  - inspircd12
  *  - inspircd20
- *  - inspircd3
+ *  - inspircd3 (for 3.x and 4.x)
  *  - ngircd
  *  - plexus
  *  - ratbox
@@ -265,7 +268,7 @@ serverinfo
  */
 module
 {
-	name = "inspircd20"
+	name = "inspircd3"
 
 	/*
 	 * Some protocol modules can enforce mode locks server-side. This reduces the spam caused by
@@ -455,12 +458,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,
@@ -491,7 +488,7 @@ options
 
 	/*
 	 * If set, will force Services to only respond to PRIVMSGs addresses to
-	 * Nick@ServerName - e.g. NickServ@localhost.net. This should be used in
+	 * Nick@ServerName - e.g. NickServ@example.com. This should be used in
 	 * conjunction with IRCd aliases. This directive is optional.
 	 *
 	 * This option will have no effect on some IRCds, such as TS6 IRCds.
@@ -660,6 +657,8 @@ log
 	 *   - a channel name
 	 *   - a filename
 	 *   - globops
+	 *
+	 * If you specify a filename the current date in the format ".YYYYMMDD" will be appended to the path.
 	 */
 	target = "services.log"
 
@@ -710,7 +709,7 @@ log
 	 * means "* ~operserv/*" would log everything because * matches everything.
 	 *
 	 * Valid admin, override, and command options are:
-	 *    pesudo-serv/commandname (e.g. operserv/akill, chanserv/set)
+	 *    pseudo-serv/commandname (e.g. operserv/akill, chanserv/set)
 	 *
 	 * Valid server options are:
 	 *    connect, quit, sync, squit
@@ -948,7 +947,7 @@ mail
 	 * If set, this option enables the mail commands in Services. 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
 
@@ -969,7 +968,7 @@ mail
 	 * This is the e-mail address from which all the e-mails are to be sent from.
 	 * It should really exist.
 	 */
-	sendfrom = "services@localhost.net"
+	sendfrom = "services@example.com"
 
 	/*
 	 * This controls the minimum amount of time a user must wait before sending
@@ -992,6 +991,14 @@ mail
 	 */
 	#dontquoteaddresses = yes
 
+	/*
+	 * The content type to use when sending emails.
+	 *
+	 * This directive is optional, and is generally only needed if you want to
+	 * use HTML or non UTF-8 text in your services emails.
+	 */
+	#content_type = "text/plain; charset=UTF-8"
+
 	/*
 	 * The subject and message of emails sent to users when they register accounts.
 	 *
@@ -1140,11 +1147,6 @@ module
 	 * This is only useful with very large databases, with hundreds
 	 * of thousands of objects, that have a noticeable delay from
 	 * writing databases.
-	 *
-	 * If your database is large enough cause a noticeable delay when
-	 * saving you should consider a more powerful alternative such
-	 * as db_sql or db_redis, which incrementally update their
-	 * databases asynchronously in real time.
 	 */
 	fork = no
 }
@@ -1160,7 +1162,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
@@ -1182,9 +1185,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

data/global.example.conf

@@ -71,7 +71,7 @@ module
 	 *
 	 * This directive is optional.
 	 */
-	#globaloncycledown = "Services are restarting, they will be back shortly - please be good while we're gone"
+	#globaloncycledown = "Services are restarting, they will be back shortly - please be good while they're gone"
 
 	/*
 	 * This is the global message that will be sent when Services (re)join the

data/modules.example.conf

@@ -403,10 +403,19 @@ module { name = "help" }
 /*
  * m_regex_pcre [EXTRA]
  *
- * Provides the regex engine regex/pcre, which uses the Perl Compatible Regular Expressions library.
+ * Provides the regex engine regex/pcre, which uses version 1 of the Perl Compatible Regular
+ * Expressions library. This can not be loaded at the same time as the m_regex_pcre2 module.
  */
 #module { name = "m_regex_pcre" }
 
+/*
+ * m_regex_pcre2 [EXTRA]
+ *
+ * Provides the regex engine regex/pcre, which uses version 2 of the Perl Compatible Regular
+ * Expressions library. This can not be loaded at the same time as the m_regex_pcre module.
+ */
+#module { name = "m_regex_pcre2" }
+
 /*
  * m_regex_posix [EXTRA]
  *

data/nickserv.example.conf

@@ -92,8 +92,10 @@ module
 	 *
 	 * The options are:
 	 * -   killprotect: Kill nick if not identified within 60 seconds
-	 * -    kill_quick: Kill nick if not identified within 20 seconds, this one overrides the above
-	 *                    option and the above must be specified with this one
+	 * -    kill_quick: Kill nick if not identified within 20 seconds, this one overrides the killprotect
+	 *                    option and the killprotect option must be specified with this one
+	 * -    kill_immed: Kill nick immediately if not identified, this one overrides both the killprotect
+	 *                    and kill_quick options and the killprotect option must be specified with this one
 	 * -     ns_secure: Enable nickname security, requiring the nick's password before any operations
 	 *                    can be done on it
 	 * -    ns_private: Hide the nick from NickServ's LIST command
@@ -108,12 +110,11 @@ module
 	 * -           msg: Services messages will be sent as PRIVMSGs instead of NOTICEs, requires
 	 *                    options:useprivmsg to be enabled as well
 	 * - ns_keep_modes: Enables keepmodes, which retains user modes across sessions
-	 * -  ns_no_expire: Enables no expire. Unconfirmed expire overrules this.
 	 *
 	 * This directive is optional, if left blank, the options will default to ns_secure, memo_signon, and
 	 * memo_receive. If you really want no defaults, use "none" by itself as the option.
 	 */
-	defaults = "ns_secure ns_private hide_email hide_mask memo_signon memo_receive autoop"
+	defaults = "killprotect ns_secure ns_private hide_email hide_mask memo_signon memo_receive autoop"
 
 	/*
 	 * The minimum length of time between consecutive uses of NickServ's REGISTER command. This
@@ -592,12 +593,13 @@ command { service = "NickServ"; name = "SASET NOEXPIRE"; command = "nickserv/sas
 module { name = "ns_set_misc" }
 command { service = "NickServ"; name = "SET URL"; command = "nickserv/set/misc"; misc_description = _("Associate a URL with your account"); }
 command { service = "NickServ"; name = "SASET URL"; command = "nickserv/saset/misc"; misc_description = _("Associate a URL with this account"); permission = "nickserv/saset/url"; group = "nickserv/admin"; }
-#command { service = "NickServ"; name = "SET ICQ"; command = "nickserv/set/misc"; misc_description = _("Associate an ICQ account with your account"); }
-#command { service = "NickServ"; name = "SASET ICQ"; command = "nickserv/saset/misc"; misc_description = _("Associate an ICQ account with this account"); permission = "nickserv/saset/icq"; group = "nickserv/admin"; }
-#command { service = "NickServ"; name = "SET TWITTER"; command = "nickserv/set/misc"; misc_description = _("Associate a Twitter account with your account"); }
-#command { service = "NickServ"; name = "SASET TWITTER"; command = "nickserv/saset/misc"; misc_description = _("Associate a Twitter account with this account"); permission = "nickserv/saset/twitter"; group = "nickserv/admin"; }
+#command { service = "NickServ"; name = "SET 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"; }
+
 
 /*
  * ns_status

data/operserv.example.conf

@@ -559,7 +559,7 @@ module
 	 *
 	 * This directive is required if os_session is loaded.
 	 */
-	defaultsessionlimit = 3
+	defaultsessionlimit = 5
 
 	/*
 	 * The maximum session limit that may be set for a host in an exception.

data/stats.standalone.example.conf

@@ -90,7 +90,7 @@
 define
 {
 	name = "stats.host"
-	value = "stats.localhost.net"
+	value = "stats.example.com"
 }
 
 /*
@@ -127,12 +127,12 @@ define
  * and serverinfo configuration would look like:
  *
  *     # This goes in inspircd.conf, *NOT* your Anope config!
- *     <link name="stats.localhost.net"
+ *     <link name="stats.example.com"
  *           ipaddr="127.0.0.1"
  *           port="7000"
  *           sendpass="mypassword"
  *           recvpass="mypassword">
- *     <uline server="stats.localhost.net" silent="yes">
+ *     <uline server="stats.example.com" silent="yes">
  *     <bind address="127.0.0.1" port="7000" type="servers">
  *
  * An example configuration for UnrealIRCd that is compatible with the below uplink
@@ -146,14 +146,14 @@ define
  *             serversonly;
  *         };
  *     };
- *     link stats.localhost.net {
+ *     link stats.example.com {
  *         incoming {
  *             mask *@127.0.0.1;
  *         };
  *         password "mypassword";
  *         class servers;
  *     };
- *     ulines { stats.localhost.net; };
+ *     ulines { stats.example.com; };
  */
 uplink
 {
@@ -206,7 +206,7 @@ serverinfo
 	 * other server names on the rest of your IRC network. Note that it does not have
 	 * to be an existing hostname, just one that isn't on your network already.
 	 */
-	name = "stats.localhost.net"
+	name = "stats.example.com"
 
 	/*
 	 * The text which should appear as the server's information in /WHOIS and similar
@@ -256,7 +256,7 @@ serverinfo
  *  - hybrid
  *  - inspircd12
  *  - inspircd20
- *  - inspircd3
+ *  - inspircd3 (for 3.x and 4.x)
  *  - ngircd
  *  - plexus
  *  - ratbox
@@ -265,7 +265,7 @@ serverinfo
  */
 module
 {
-	name = "inspircd20"
+	name = "inspircd3"
 }
 
 /*
@@ -371,12 +371,6 @@ options
 	 */
 	readtimeout = 5s
 
-	/*
-	 * Sets the interval between sending warning messages for program errors via
-	 * WALLOPS/GLOBOPS.
-	 */
-	warningtimeout = 4h
-
 	/*
 	 * If set, Services will only show /stats o to IRC Operators. This directive
 	 * is optional.

docs/BUGS

@@ -1 +1 @@
-For all bug reports / updates please see https://bugs.anope.org/
+For all bug reports / updates please see https://github.com/anope/anope/issues

docs/CODING

@@ -59,7 +59,7 @@ yet follows these. This will be rectified with time.
 4. Braces
 
    Always put braces opening and closing blocks on separate lines, see the
-   identation example. For example, place braces like this:
+   indentation example. For example, place braces like this:
      if (apples == "green")
      {
          cout << "Apples are green" << endl;

docs/Changes

@@ -1,3 +1,133 @@
+Anope Version 2.0.18
+--------------------
+Backported better sendmail error messages from 2.1.
+Backported the Windows CI fom 2.1.
+Fixed a CMake error when it encounters a hard to parse header file.
+Fixed being able to group guest nicknames.
+Fixed building Anope with CMake 4.
+Fixed compatibility with MariaDB.
+Fixed counting email addresses in ns_maxemail.
+Fixed importing user ICQ and URL data from 1.8.
+Fixed operserv/ignore not being prioritised first.
+Fixed resetting the stats with operserv/stats.
+Updated the Dutch translation.
+
+Anope Version 2.0.17
+--------------------
+Fixed importing large flatfile databases into SQL.
+Fixed marking channels as permanent.
+Fixed serialising unset boolean extension items.
+Fixed the documentation about how to import SQL databases.
+Fixed the documentation of options:usemail.
+Fixed the location of the geoipupdate CSV files.
+Fixed translating memo emails.
+Fixed unnecessary SQL updates caused by dereferencing user accounts.
+Increased the size of the chanstats letter and word count columns.
+Updated the location of the Anope IRC channels.
+
+Anope Version 2.0.16
+--------------------
+Added a workaround for users matching expired sqlines.
+Fixed a copy/paste error in webcpanel.
+Fixed a crash in db_flatfile caused by trying to serialize data without a type.
+Fixed duplicate messages when synconset/syncongroup is set.
+Fixed expiring channel suspensions.
+Fixed expiring forbids.
+Fixed expiring nick suspensions.
+Fixed feature detection on InspIRCd.
+Fixed InspIRCd account cloaks causing CHGHOST spam when a user also has a services vhost.
+Fixed joining users to channels with a key set on InspIRCd.
+Fixed logging users out fully when their nick gets suspended.
+Fixed marking boolean columns in SQL as TEXT instead of INT.
+Fixed matching extbans on InspIRCd and implement missing matchers.
+Fixed operserv/sqline expiry on UnrealIRCd
+Fixed respecting --noexpire in cs_suspend and ns_suspend.
+Fixed sending emails to nicks ending with a backslash.
+Fixed sending SVSTOPIC when topiclock is loaded on InspIRCd.
+Fixed some SQL tables taking up too much space on disk.
+Fixed the default config for channel suspensions.
+Fixed the TIME message on InspIRCd.
+Fixed trying to escape SQL data when not connected to MySQL.
+Fixed {ldap,sql}_authentication creating zombie accounts on expiry.
+
+Anope Version 2.0.15
+--------------------
+Fixed a race condition in changing the nick of a user.
+Fixed being able to reset the password of suspended accounts.
+Fixed chanserv/suspend info not being visible to regular users.
+Fixed removing entries by an alias in chanserv/access and chanserv/xop.
+Fixed various grammar issues in messages.
+Made the SASL PLAIN implementation more robust.
+Updated the Dutch translation.
+Updated the French translation.
+Updated the Turkish translation.
+
+Anope Version 2.0.14
+--------------------
+Added support for sqlining channels on UnrealIRCd.
+Fixed a crash when trying to access config for non-loaded modules.
+Fixed detection of the InspIRCd nopartmsg module.
+Fixed not getting memo notifications when authing with SASL.
+Fixed not serialising dontkickops/dontkickvoices in botserv/kick.
+Fixed sending emails with the wrong kind of line terminator.
+Fixed sending log messages from a renamed pseudoclient.
+Fixed telling users their passcode is incorrect when they need to authenticate in nickserv/confirm.
+Fixed the Config script freezing on some versions of util-linux.
+Updated the Windows packaging scripts to use dependencies from Conan.
+
+Anope Version 2.0.13
+--------------------
+Fixed a crash on some compilers when trying to call methods on a null pointer
+Fixed a crash when encountering an unterminated commented config block
+Fixed erroneously rejecting spaces in fantasy:name
+Fixed marking services pseudoclients as an oper on InspIRCd
+Fixed not checking user@ip as well as user@host when logging into an operator account
+Fixed setting the vhost/vident during SASL on UnrealIRCd
+Updated the German translation
+Updated the Italian translation
+
+Anope Version 2.0.12
+--------------------
+Added account confirmation to the web panel
+Added the regex_pcre2 module which provides regex/pcre with PCRE2
+Documented the cs_no_expire channel default
+Fixed config validation mistakenly allowing spaces in some fields
+Fixed the bahamut protocol module not knowing about halfops
+Fixed writing a flatfile database not being atomic
+Updated the hybrid protocol module for recent protocol changes
+
+Anope Version 2.0.11
+--------------------
+Fixed ldap on OpenLDAP 2.5+
+Fixed not using utf-8 encoding for outgoing email
+Fixed ns_resetpass not returning a response for XMLRPC
+Fixed some message params being sent as <middle> instead of <trailing>
+Fixed unsetting vhosts on unreal4
+Fixed username validity checking on ircd-hybrid
+Send the oper mode for services pseudoclients on InspIRCd
+Updated the pl_PL translation
+Updated unreal4 for various protocol changes
+
+Anope Version 2.0.10
+--------------------
+Add support for channel SQLines on InspIRCd
+Change default protocol module from inspircd20 to inspircd3
+Change the character set used by chanstats and irc2sql to utf8mb4
+Fix a ton of typos in messages
+Fix being able to override MAXLIST on InspIRCd
+Fix blocking on boot when trying to upgrade SQL databases without account identifiers
+Fix not flushing the ERROR message on squit
+Fix using an invalidated iterator when deleting bots
+Fix various harmless compiler warnings
+Fix webcpanel not using the forwarded IP
+Show the account name in nickserv/info
+
+Anope Version 2.0.9
+-------------------
+Fix a regression from 2.0.8 that prevented serialising to MySQL
+Send account identifiers to InspIRCd on SASL logins too
+Fix a query bug in irc2sql
+
 Anope Version 2.0.8
 -------------------
 Add +K channel mode for ircd-hybrid
@@ -74,7 +204,7 @@ Fix chankill to not add duplicate akills
 Allow nickserv/maxemail to disregard gmail style aliases when comparing emails
 Fix chanserv/mode when setting listmodes with CIDR ranges
 Fix reported expiry time when the time is divisible by 1 year
-Clearify botserv repeat kicker help and allow setting repeat times to 1
+Clarify botserv repeat kicker help and allow setting repeat times to 1
 Send vident/vhost with SASL login
 Add support for SASL reauth
 Fix log and database backup directories to be properly created by the installer
@@ -89,7 +219,7 @@ Show memo notify settings in ms_info
 Fix some actions bumping channels last used time that shouldn't have
 Add maxlogins configuration directive to limit the number of concurrent logins to one account
 Fix race with auto svsnick on ghost sometimes causing nick collisions instead
-Fix saset langauge reply
+Fix saset language reply
 Show akill/sxlines ids in VIEW
 Fix crash when an oper is configured in both the configuration and via os_oper
 Fix m_ldap reconnect logic not properly setting protocol and network timeout settings
@@ -156,7 +286,7 @@ A Added SQL logging support
 A Added Redis database support
 A Added ability to configure what privileges XOP commands give
 U Updated Dutch language file, from Robby <robby@chat.be>
-U Updated Spanish langauge file, from Isaac Fontal <i_fontal@hotmail.com>
+U Updated Spanish language file, from Isaac Fontal <i_fontal@hotmail.com>
 F Fix build on Solaris and OSX
 F Fixed setting BotServ's default settings in the config
 F Fixed some names of config items, including NickServ's kill protect
@@ -246,7 +376,7 @@ Anope Version 1.9.3
 A Added italics BotServ kicks support
 A Tell users when their nicks expire in /ns glist and /ns info
 A Added SSL support
-A Prevent negaitve mode changes, kicks, bans, and autokicks from affecting people with the 'god' user mode (On UnrealIRCd, usermode +q)
+A Prevent negative mode changes, kicks, bans, and autokicks from affecting people with the 'god' user mode (On UnrealIRCd, usermode +q)
 A Added nickserv/auxpex permission
 A Added nickserv ungroup command
 A Renamed the SGLINE to be SNLINE
@@ -258,15 +388,15 @@ A Added m_mysql which uses threads to execute queries
 A Added many subcommand modules for some commands, eg ns_set_autoop, ns_set_email, etc
 A Added a new logging system that is a bit more flexible
 A Added cs_set_misc and ns_set_misc to add miscellaneous set commands
-A Added os_modreload, which allows reloading some modules not normally unloable, like the protocol module
+A Added os_modreload, which allows reloading some modules not normally unloadable, like the protocol module
 A Added FOUNDER access level
 A Made OperServ, Global, MemoServ, and ChanServ optional
 F Shutting down if a config reload fails
 F Autoid to live through restarts on Unreal
 F Storing vhosts in MySQL
-F Not flushing the anope_extra table before rewriting databaes
+F Not flushing the anope_extra table before rewriting database
 F Anoperc start/stop to send the globaloncycle global, and fixed anoperc rehash to really rehash
-F Fixed a potential crash if HostServ or BotServ was disbled
+F Fixed a potential crash if HostServ or BotServ was disabled
 
 Anope Version 1.9.2
 -------------------
@@ -290,7 +420,7 @@ F Unban command to accept an optional nick arg
 F Some typos in services.conf
 F Crash when users change their host that are identified to a group, but not a nick
 F Host length checking in HS SET(ALL) and HS REQUEST
-F Only show if a user is online in NS INFO if they are really identiifed for the group of the nick they are on
+F Only show if a user is online in NS INFO if they are really identified for the group of the nick they are on
 F Crash when using BSSmartJoin
 F Converting access entries to access from xop when a users access is below voice
 F A bad pointer passed to the OnDelEvent which could cause some 3rd party modules to crash

docs/Changes.conf

@@ -1,3 +1,43 @@
+Anope Version 2.0.18
+--------------------
+No significant changes.
+
+Anope Version 2.0.17
+--------------------
+No significant changes.
+
+Anope Version 2.0.16
+--------------------
+No significant changes.
+
+Anope Version 2.0.15
+--------------------
+No significant changes.
+
+Anope Version 2.0.14
+--------------------
+Added mail:content_type to allow customizing the content type of emails.
+
+Anope Version 2.0.13
+--------------------
+No significant changes.
+
+Anope Version 2.0.12
+--------------------
+Added the regex_pcre2 module
+
+Anope Version 2.0.11
+--------------------
+No significant changes.
+
+Anope Version 2.0.10
+--------------------
+No significant changes.
+
+Anope Version 2.0.9
+-------------------
+No significant changes.
+
 Anope Version 2.0.8
 -------------------
 Fix ns_register:unconfirmedexpire not being used
@@ -56,7 +96,7 @@ mail:restrict removed
 
 Anope Version 1.9.9
 -------------------
-There is not many config changes betewen 1.9.8 and 1.9.9, however many of the
+There is not many config changes between 1.9.8 and 1.9.9, however many of the
 options have been moved around to make more sense, too many to list here,
 so get a new config.
 
@@ -157,7 +197,7 @@ options:enablelogchannel added to auto turn on the logchannel on startup
 options:mlock added to configure the default mlock modes on new channels
 options:database added for the database modules
 options:botmodes added to configure modes BotServ bots should use
-options:userlen added to configure maxiumum ident length
+options:userlen added to configure maximum ident length
 options:hostlen added to configure maximum hostname length
 options:database added to configure what database modules to use
 options:passlen added to specify the maximum length of passwords

docs/DEFCON

@@ -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.

docs/INSTALL

@@ -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.
 
@@ -80,7 +80,7 @@ Note: You should also read the README and FAQ files!
 
     The configuration varies depending on the IRCd, but you will probably need
     a link block (also called connect block, or C line), a U line (also called
-    a shared block), and be sure that the IRCd is listneing on the given port
+    a shared block), and be sure that the IRCd is listening on the given port
     in the link block.
 
     Example link configurations can be found in example.conf for some of the
@@ -88,10 +88,6 @@ Note: You should also read the README and FAQ files!
 
     Don't forget to /rehash your IRCd to apply changes.
 
-    You may also try our interactive link maker, which is located at:
-
-        https://www.anope.org/ilm.php
-
 4) Starting Anope
 
     Go into the directory where binaries were installed (by default, this is

docs/INSTALL.fr

@@ -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
@@ -96,11 +96,6 @@ Note : Vous devrez également lire les fichiers README et FAQ !
 
     Souvenez-vous de /rehash votre IRCd pour appliquer les changements.
 
-    Vous pouvez également essayer notre créateur de bloc link interactif
-    situé ici :
-
-        https://www.anope.org/ilm.php
-
 4) Mettre en route Anope
 
     Allez dans le répertoire où les fichiers binaires ont été installés

docs/LANGUAGE

@@ -1,9 +1,10 @@
-Anope Mutli Language Support
+Anope Multi Language Support
 ----------------------------
 
 1) Building Anope with gettext support
 2) Adding a new language
 3) Using languages with modules
+4) Updating a language file
 
 1) Building Anope with gettext support
 
@@ -18,6 +19,8 @@ Anope Mutli 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
@@ -31,12 +34,11 @@ Anope Mutli 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 e-mail and the language name). You'll of course get full credit for it.
+    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.
 
-    NOTE: There is no guarantee we will use your work so please do not be offended if we say no thanks.
-
-3) Using langages with modules
+3) Using languages with modules
 
     Module authors can easily add the ability to have their modules translated by adding _() around the strings they
     want translated (messages to the user, etc).
@@ -51,3 +53,14 @@ Anope Mutli Language Support
 
     All .po and .pot files should be placed in modules/third/language. Additionally an update script is provided there
     that will create .pot files and merge any changes to it with existing .po files.
+
+4) Updating a language file
+
+    Poedit (https://poedit.net/) is a popular po file editor, and we recommend using it or another editor designed to edit
+    po files (especially on Windows).
+
+    Before editing the relevant file in languages/, run `update.sh` in the languages/ folder, i.e. `cd` to it and run
+        ./update.sh
+    This will update the language file to contain all strings that need a translation.
+
+    Then commit only the changed .po files in git.

docs/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
 

docs/README

@@ -1,7 +1,7 @@
 Anope -- a set of IRC services for IRC networks
 -----------------------------------------------
 
-Anope is          2003-2020 Anope Team    <team@anope.org>.
+Anope is          2003-2024 Anope Team    <team@anope.org>.
 Based on Epona    2000-2002 PegSoft       <epona@pegsoft.net>.
 Based on Services 1996-1999 Andrew Church <achurch@achurch.org>.
 
@@ -92,7 +92,7 @@ Table of Contents
         * Lee Holmes <lethality@anope.org>
         * Lucas Nussbaum <lucas@lucas-nussbaum.net>
         * Mark Summers <mark@goopler.net>
-        * Matthew Beeching <jobe@invictachat.net>
+        * Matthew Beeching <jobe@mdbnet.co.uk>
         * Naram Qashat <cyberbotx@anope.org>
         * Phil Lavin <phil@anope.org>
         * Pieter Bootsma <geniusdex@anope.org>
@@ -245,14 +245,14 @@ 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.
 
     The more precise you are the sooner you'll be likely to get an answer.
 
     If you think you found a bug, add it to the bug tracking system
-    (https://bugs.anope.org/) and - again - be as precise as possible. Also say
-    whether the bug happens always or under what circumstances, and anything
+    (https://github.com/anope/anope/issues) and - again - be as precise as possible.
+    Also say whether the bug happens always or under what circumstances, and anything
     that could be useful to track your bug down. If you wrote a patch, send
     it over. :)

docs/REDIS

@@ -32,7 +32,7 @@ Table of Contents
 
         hash -  The keys in hash are the actual objects, stored as hashes. For
                 example, if I had just looked up all BotInfo ids and wanted to iterate
-                over all of them, I woulld start by:
+                over all of them, I would start by:
 
                 redis 127.0.0.1:6379> HGETALL hash:BotInfo:1
 
@@ -73,7 +73,7 @@ Table of Contents
     (https://redis.io/topics/notifications). This allows Redis to notify Anope of
     any external changes to objects in the database. Once notified, Anope will
     immediately update the object. Otherwise, Anope keeps all objects in memory
-    and will not regularly read from the databaes once started.
+    and will not regularly read from the database once started.
 
     You can use this to modify objects in Redis and have them immediately reflected
     back into Anope. Additionally you can use this feature to run multiple Anope
@@ -93,7 +93,7 @@ Table of Contents
 
     The key space ids and value are managed entirely by Anope, you do
     not (and should not) modify them. Once you modify the object (hash), Anope will
-    update them for you to correctly refelect any changes made to the object.
+    update them for you to correctly reflect any changes made to the object.
 
     Finally, always use atomic operations. If you are inserting a new object with
     multiple commands, or inserting multiple objects at once, specifically if the

docs/XMLRPC/xmlrpc.php

@@ -3,7 +3,7 @@
 /**
  * XMLRPC Functions
  *
- * (C) 2003-2020 Anope Team
+ * (C) 2003-2024 Anope Team
  * Contact us at team@anope.org
  */
 

include/CMakeLists.txt

@@ -3,11 +3,11 @@ set_source_files_properties(version.cpp PROPERTIES LANGUAGE CXX COMPILE_FLAGS "$
 # Generate version-bin executable to modify version.h, setting it's linker flags as well
 add_executable(version-bin version.cpp)
 set_target_properties(version-bin PROPERTIES LINKER_LANGUAGE CXX LINK_FLAGS "${LDFLAGS}")
-get_target_property(version_BINARY version-bin LOCATION)
+set(version_BINARY "$<TARGET_FILE:version-bin>")
 # Modify version.h from the above executable, with dependencies to version.cpp
 # and all of the source files in the main build
-add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/version_build
-  COMMAND ${version_BINARY} ${Anope_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/version.h ${CMAKE_CURRENT_BINARY_DIR}/build.h
+add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/version.h ${CMAKE_CURRENT_BINARY_DIR}/build.h
+  COMMAND version-bin ${Anope_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/version.h ${CMAKE_CURRENT_BINARY_DIR}/build.h
   DEPENDS version-bin ${SRC_SRCS}
 )
 # Add version-bin to list of files for CPack to ignore
@@ -61,4 +61,4 @@ if(USE_PCH AND CMAKE_COMPILER_IS_GNUCXX)
 endif(USE_PCH AND CMAKE_COMPILER_IS_GNUCXX)
 
 # Add a custom target to the above file
-add_custom_target(headers DEPENDS version-bin ${CMAKE_CURRENT_BINARY_DIR}/version_build ${PCH_SOURCES_GCH})
+add_custom_target(headers DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/version.h ${CMAKE_CURRENT_BINARY_DIR}/build.h ${PCH_SOURCES_GCH})

include/access.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2020 Anope Team
+ * (C) 2003-2025 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/account.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2020 Anope Team
+ * (C) 2003-2025 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
@@ -61,7 +61,7 @@ class CoreExport NickAlias : public Serializable, public Extensible
 	 * @param ident The ident
 	 * @param host The host
 	 * @param creator Who created the vhost
-	 * @param time When the vhost was craated
+	 * @param time When the vhost was created
 	 */
 	void SetVhost(const Anope::string &ident, const Anope::string &host, const Anope::string &creator, time_t created = Anope::CurTime);
 
@@ -130,7 +130,7 @@ class CoreExport NickCore : public Serializable, public Extensible
 	 */
 	Serialize::Checker<std::vector<NickAlias *> > aliases;
 
-	/* Set if this user is a services operattor. o->ot must exist. */
+	/* Set if this user is a services operator. o->ot must exist. */
 	Oper *o;
 
 	/* Unsaved data */
@@ -234,7 +234,7 @@ class CoreExport NickCore : public Serializable, public Extensible
 class CoreExport IdentifyRequest
 {
 	/* Owner of this request, used to cleanup requests if a module is unloaded
-	 * while a reqyest us pending */
+	 * while a request us pending */
 	Module *owner;
 	Anope::string account;
 	Anope::string password;
@@ -262,17 +262,17 @@ class CoreExport IdentifyRequest
 	 * for the request to complete. Multiple modules may hold a request at any time,
 	 * but the request is not complete until every module has released it. If you do not
 	 * require holding this (eg, your password check is done in this thread and immediately)
-	 * then you don't need to hold the request before Successing it.
+	 * then you don't need to hold the request before calling `Success()`.
 	 * @param m The module holding this request
 	 */
 	void Hold(Module *m);
 
 	/** Releases a held request
-	 * @param m The module releaseing the hold
+	 * @param m The module releasing the hold
 	 */
 	void Release(Module *m);
 
-	/** Called by modules when this IdentifyRequest has successeded successfully.
+	/** Called by modules when this IdentifyRequest has succeeded.
 	 * If this request is behind held it must still be Released after calling this.
 	 * @param m The module confirming authentication
 	 */

include/anope.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2020 Anope Team
+ * (C) 2003-2025 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
@@ -54,6 +54,9 @@ namespace Anope
 		string(const ci::string &_str) : _string(_str.c_str()) { }
 		string(const string &_str, size_type pos, size_type n = npos) : _string(_str._string, pos, n) { }
 		template <class InputIterator> string(InputIterator first, InputIterator last) : _string(first, last) { }
+#if __cplusplus >= 201103L
+		string(const string &) = default;
+#endif
 
 		/**
 		 * Assignment operators, so any type of string can be assigned to this class.
@@ -362,7 +365,7 @@ namespace Anope
 	 */
 	extern CoreExport int Debug;
 
-	/** Other comand line options.
+	/** Other command line options.
 	 */
 	extern CoreExport bool ReadOnly, NoFork, NoThird, NoExpire, ProtocolDebug;
 
@@ -403,7 +406,7 @@ namespace Anope
 
 	/** Used to "fork" the process and go into the background during initial startup
 	 * while we are AtTerm(). The actual fork is not done here, but earlier, and this
-	 * simply notifys the parent via kill() to exit().
+	 * simply notifies the parent via kill() to exit().
 	 */
 	extern void Fork();
 
@@ -413,7 +416,7 @@ namespace Anope
 
 	/** One of the first functions called, does general initialization such as reading
 	 * command line args, loading the configuration, doing the initial fork() if necessary,
-	 * initializating language support, loading modules, and loading databases.
+	 * initializing language support, loading modules, and loading databases.
 	 * @throws CoreException if something bad went wrong
 	 */
 	extern void Init(int ac, char **av);
@@ -545,6 +548,13 @@ namespace Anope
 	 */
 	extern Anope::string Resolve(const Anope::string &host, int type);
 
+	/** Does a blocking dns query and returns all IPs.
+	 * @param host host to look up
+	 * @param type inet addr type
+	 * @return A list of all IPs that the host resolves to
+	 */
+	extern std::vector<Anope::string> ResolveMultiple(const Anope::string &host, int type);
+
 	/** Generate a string of random letters and numbers
 	 * @param len The length of the string returned
 	 */
@@ -562,7 +572,7 @@ class CoreExport sepstream
 	/** Original string.
 	 */
 	Anope::string tokens;
-	/** Seperator value
+	/** Separator value
 	 */
 	char sep;
 	/** Current string position
@@ -574,7 +584,7 @@ class CoreExport sepstream
  public:
 	/** Create a sepstream and fill it with the provided data
 	 */
-	sepstream(const Anope::string &source, char seperator, bool allowempty = false);
+	sepstream(const Anope::string &source, char separator, bool allowempty = false);
 
 	/** Fetch the next token from the stream
 	 * @param token The next token from the stream is placed here
@@ -584,7 +594,7 @@ class CoreExport sepstream
 
 	/** Gets token number 'num' from the stream
 	 * @param token The token is placed here
-	 * @param num The token number to featch
+	 * @param num The token number to fetch
 	 * @return True if the token was able to be fetched
 	 */
 	bool GetToken(Anope::string &token, int num);
@@ -602,7 +612,7 @@ class CoreExport sepstream
 
 	/** Gets token number 'num' from the stream and all remaining tokens.
 	 * @param token The token is placed here
-	 * @param num The token number to featch
+	 * @param num The token number to fetch
 	 * @return True if the token was able to be fetched
 	 */
 	bool GetTokenRemainder(Anope::string &token, int num);
@@ -628,7 +638,7 @@ class CoreExport sepstream
 class commasepstream : public sepstream
 {
  public:
-	/** Initialize with comma seperator
+	/** Initialize with comma separator
 	 */
 	commasepstream(const Anope::string &source, bool allowempty = false) : sepstream(source, ',', allowempty) { }
 };
@@ -638,7 +648,7 @@ class commasepstream : public sepstream
 class spacesepstream : public sepstream
 {
  public:
-	/** Initialize with space seperator
+	/** Initialize with space separator
 	 */
 	spacesepstream(const Anope::string &source) : sepstream(source, ' ') { }
 };
@@ -659,7 +669,7 @@ class CoreException : public std::exception
 	 */
 	Anope::string source;
  public:
-	/** Default constructor, just uses the error mesage 'Core threw an exception'.
+	/** Default constructor, just uses the error message 'Core threw an exception'.
 	 */
 	CoreException() : err("Core threw an exception"), source("The core") { }
 	/** This constructor can be used to specify an error message before throwing.
@@ -691,7 +701,7 @@ class CoreException : public std::exception
 class ModuleException : public CoreException
 {
  public:
-	/** Default constructor, just uses the error mesage 'Module threw an exception'.
+	/** Default constructor, just uses the error message 'Module threw an exception'.
 	 */
 	ModuleException() : CoreException("Module threw an exception", "A Module") { }
 
@@ -766,7 +776,7 @@ template<typename T> inline T convertTo(const Anope::string &s, bool failIfLefto
 }
 
 /** Casts to be used instead of dynamic_cast, this uses dynamic_cast
- * for debug builds and static_cast on releass builds
+ * for debug builds and static_cast on release builds
  * to speed up the program because dynamic_cast relies on RTTI.
  */
 #ifdef DEBUG_BUILD

include/base.h

@@ -1,7 +1,7 @@
 /*
  *
  * (C) 2008-2011 Adam <Adam@anope.org>
- * (C) 2008-2020 Anope Team <team@anope.org>
+ * (C) 2008-2025 Anope Team <team@anope.org>
  *
  * Please read COPYING and README for further details.
  */

include/bots.h

@@ -1,7 +1,7 @@
 /*
  *
  * (C) 2008-2011 Robin Burchell <w00t@inspircd.org>
- * (C) 2008-2020 Anope Team <team@anope.org>
+ * (C) 2008-2025 Anope Team <team@anope.org>
  *
  * Please read COPYING and README for further details.
  */

include/channels.h

@@ -1,6 +1,6 @@
 /* Channel support
  *
- * (C) 2008-2020 Anope Team
+ * (C) 2008-2025 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
@@ -232,7 +232,7 @@ class CoreExport Channel : public Base, public Extensible
 	 * @param bi The sender, can be NULL for the service bot for this channel
 	 * @param u The user being kicked
 	 * @param reason The reason for the kick
-	 * @return true if the kick was scucessful, false if a module blocked the kick
+	 * @return true if the kick was successful, false if a module blocked the kick
 	 */
 	bool Kick(BotInfo *bi, User *u, const char *reason = NULL, ...);
 
@@ -249,7 +249,7 @@ class CoreExport Channel : public Base, public Extensible
 
 	/** Get a string of the modes set on this channel
 	 * @param complete Include mode parameters
-	 * @param plus If set to false (with complete), mode parameters will not be given for modes requring no parameters to be unset
+	 * @param plus If set to false (with complete), mode parameters will not be given for modes requiring no parameters to be unset
 	 * @return A mode string
 	 */
 	Anope::string GetModes(bool complete, bool plus);
@@ -289,6 +289,11 @@ class CoreExport Channel : public Base, public Extensible
 	 */
 	bool CheckKick(User *user);
 
+	/** Find which bot should send mode/topic/etc changes for this channel
+	 * @return The bot
+	 */
+	BotInfo *WhoSends() const;
+
 	/** Finds a channel
 	 * @param name The channel to find
 	 * @return The channel, if found

include/commands.h

@@ -1,6 +1,6 @@
 /* Declarations for command data.
  *
- * (C) 2003-2020 Anope Team
+ * (C) 2003-2025 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
@@ -40,7 +40,7 @@ struct CommandInfo
 	bool prepend_channel;
 };
 
-/* Where the replies from commands go to. User inheits from this and is the normal
+/* Where the replies from commands go to. User inherits from this and is the normal
  * source of a CommandReply
  */
 struct CoreExport CommandReply
@@ -101,7 +101,7 @@ class CoreExport Command : public Service
 	bool require_user;
 
  public:
-	/* Maximum paramaters accepted by this command */
+	/* Maximum parameters accepted by this command */
 	size_t max_params;
 	/* Minimum parameters required to use this command */
 	size_t min_params;
@@ -148,7 +148,7 @@ class CoreExport Command : public Service
 	 */
 	virtual void Execute(CommandSource &source, const std::vector<Anope::string> &params) = 0;
 
-	/** Called when HELP is requsted for the client this command is on.
+	/** Called when HELP is requested for the client this command is on.
 	 * @param source The source
 	 */
 	virtual void OnServHelp(CommandSource &source);
@@ -178,7 +178,7 @@ class CoreExport Command : public Service
 	 * Note that if the same command exists multiple places this will return the first one encountered
 	 * @param command_service The command service to lookup, eg, nickserv/register
 	 * @param bot If found, is set to the bot the command is on, eg NickServ
-	 * @param name If found, is set to the comand name, eg REGISTER
+	 * @param name If found, is set to the command name, eg REGISTER
 	 * @return true if the given command service exists
 	 */
 	static bool FindCommandFromService(const Anope::string &command_service, BotInfo* &bi, Anope::string &name);

include/config.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2020 Anope Team
+ * (C) 2003-2025 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
@@ -20,9 +20,11 @@
 
 namespace Configuration
 {
+	namespace Internal
+	{
 	class CoreExport Block
 	{
-		friend struct Conf;
+		friend struct Configuration::Conf;
 
 	 public:
 		typedef Anope::map<Anope::string> item_map;
@@ -34,13 +36,17 @@ namespace Configuration
 		block_map blocks;
 		int linenum;
 
+		/* Represents a missing tag. */
+		static Block EmptyBlock;
+
 	 public:
 		Block(const Anope::string &);
 		const Anope::string &GetName() const;
-		int CountBlock(const Anope::string &name);
-		Block* GetBlock(const Anope::string &name, int num = 0);
+		int CountBlock(const Anope::string &name) const;
+		const Block* GetBlock(const Anope::string &name, int num = 0) const;
+		Block* GetMutableBlock(const Anope::string &name, int num = 0);
 
-		template<typename T> inline T Get(const Anope::string &tag)
+		template<typename T> inline T Get(const Anope::string &tag) const
 		{
 			return this->Get<T>(tag, "");
 		}
@@ -66,6 +72,10 @@ namespace Configuration
 	template<> CoreExport const Anope::string Block::Get(const Anope::string &tag, const Anope::string& def) const;
 	template<> CoreExport time_t Block::Get(const Anope::string &tag, const Anope::string &def) const;
 	template<> CoreExport bool Block::Get(const Anope::string &tag, const Anope::string &def) const;
+	} // namespace Internal
+
+	typedef const Internal::Block Block;
+	typedef Internal::Block MutableBlock;
 
 	/** Represents a configuration file
 	 */
@@ -140,7 +150,7 @@ namespace Configuration
 
 		BotInfo *GetClient(const Anope::string &name);
 
-		Block *GetCommand(CommandSource &);
+		const Block *GetCommand(CommandSource &);
 	};
 
 	struct Uplink
@@ -165,7 +175,7 @@ namespace Configuration
 class ConfigException : public CoreException
 {
  public:
-	/** Default constructor, just uses the error mesage 'Config threw an exception'.
+	/** Default constructor, just uses the error message 'Config threw an exception'.
 	 */
 	ConfigException() : CoreException("Config threw an exception", "Config Parser") { }
 	/** This constructor can be used to specify an error message before throwing.

include/defs.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2020 Anope Team
+ * (C) 2003-2025 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/extensible.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2020 Anope Team
+ * (C) 2003-2025 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
@@ -190,7 +190,8 @@ class SerializableExtensibleItem<bool> : public PrimitiveExtensibleItem<bool>
 
 	void ExtensibleSerialize(const Extensible *e, const Serializable *s, Serialize::Data &data) const anope_override
 	{
-		data[this->name] << true;
+		data.SetType(this->name, Serialize::Data::DT_INT);
+		data[this->name] << this->HasExt(e);
 	}
 
 	void ExtensibleUnserialize(Extensible *e, Serializable *s, Serialize::Data &data) anope_override

include/hashcomp.h

@@ -1,7 +1,7 @@
 /*
  *
  * (C) 2002-2011 InspIRCd Development Team
- * (C) 2009-2020 Anope Team <team@anope.org>
+ * (C) 2009-2025 Anope Team <team@anope.org>
  *
  * Please read COPYING and README for further details.
  */
@@ -26,7 +26,7 @@ namespace Anope
 {
 	class string;
 
-	/* Casemap in use by Anope. ci::string's comparation functions use this (and thus Anope::string) */
+	/* Casemap in use by Anope. ci::string's comparison functions use this (and thus Anope::string) */
 	extern std::locale casemap;
 
 	extern void CaseMapRebuild();

include/language.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2008-2020 Anope Team
+ * (C) 2008-2025 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
@@ -40,7 +40,7 @@ namespace Language
 	extern CoreExport const char *Translate(const char *string);
 
 	/** Translates a string to the language of the given user.
-	 * @param u The user to transate the string for
+	 * @param u The user to translate the string for
 	 * @param string A string to translate
 	 * @return The translated string if found, else the original string.
 	 */
@@ -82,7 +82,7 @@ namespace Language
 #define CHAN_X_SUSPENDED		_("Channel %s is currently suspended.")
 #define CHAN_X_NOT_REGISTERED		_("Channel \002%s\002 isn't registered.")
 #define CHAN_X_NOT_IN_USE		_("Channel \002%s\002 doesn't exist.")
-#define NICK_IDENTIFY_REQUIRED		_("Password authentication required for that command.")
+#define NICK_IDENTIFY_REQUIRED		_("You must be logged into an account to use that command.")
 #define MAIL_X_INVALID			_("\002%s\002 is not a valid e-mail address.")
 #define UNKNOWN				_("<unknown>")
 #define NO_EXPIRE			_("does not expire")

include/lists.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2020 Anope Team
+ * (C) 2003-2025 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/logger.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2020 Anope Team
+ * (C) 2003-2025 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
@@ -17,9 +17,9 @@
 
 enum LogType
 {
-	/* Used whenever an administrator uses an administrative comand */
+	/* Used whenever an administrator uses an administrative command */
 	LOG_ADMIN,
-	/* Used whenever an administrator overides something, such as adding
+	/* Used whenever an administrator overrides something, such as adding
 	 * access to a channel where they don't have permission to.
 	 */
 	LOG_OVERRIDE,

include/mail.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2020 Anope Team
+ * (C) 2003-2025 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
@@ -26,15 +26,16 @@ namespace Mail
 	class Message : public Thread
 	{
 	 private:
+		Anope::string error;
 		Anope::string sendmail_path;
 		Anope::string send_from;
 		Anope::string mail_to;
 		Anope::string addr;
 		Anope::string subject;
 		Anope::string message;
+		Anope::string content_type;
 		bool dont_quote_addresses;
 
-		bool success;
 	 public:
 		/** Construct this message. Once constructed call Thread::Start to launch the mail sending.
 		 * @param sf Config->SendFrom

include/memo.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2020 Anope Team
+ * (C) 2003-2025 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/messages.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2020 Anope Team
+ * (C) 2003-2025 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/modes.h

@@ -1,7 +1,7 @@
 /* Mode support
  *
  * (C) 2008-2011 Adam <Adam@anope.org>
- * (C) 2008-2020 Anope Team <team@anope.org>
+ * (C) 2008-2025 Anope Team <team@anope.org>
  *
  * Please read COPYING and README for further details.
  */
@@ -96,7 +96,7 @@ class CoreExport UserModeParam : public UserMode
 class CoreExport ChannelMode : public Mode
 {
  public:
-	/* channel modes that can posssibly unwrap this mode */
+	/* channel modes that can possibly unwrap this mode */
 	std::vector<ChannelMode *> listeners;
 
 	/** constructor
@@ -160,7 +160,7 @@ class CoreExport ChannelModeList : public ChannelMode
 	virtual void OnDel(Channel *chan, const Anope::string &mask) { }
 };
 
-/** This is a mode with a paramater, eg +k/l. These modes should use/inherit from this
+/** This is a mode with a parameter, eg +k/l. These modes should use/inherit from this
 */
 class CoreExport ChannelModeParam : public ChannelMode
 {
@@ -221,7 +221,7 @@ class CoreExport ChannelModeVirtual : public T
 
 	ChannelMode *Wrap(Anope::string &param) anope_override;
 
-	ChannelMode *Unwrap(ChannelMode *cm, Anope::string &param) = 0;
+	ChannelMode *Unwrap(ChannelMode *cm, Anope::string &param) anope_override = 0;
 };
 
 /* The status a user has on a channel (+v, +h, +o) etc */
@@ -400,7 +400,7 @@ class CoreExport Entry
 
 	/** Constructor
 	 * @param mode What mode this host is for, can be empty for unknown/no mode
-	 * @param host A full or poartial nick!ident@host/cidr#real name mask
+	 * @param host A full or partial nick!ident@host/cidr#real name mask
 	 */
 	Entry(const Anope::string &mode, const Anope::string &host);
 

include/module.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2020 Anope Team
+ * (C) 2003-2025 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/modules.h

@@ -1,6 +1,6 @@
 /* Modular support
  *
- * (C) 2003-2020 Anope Team
+ * (C) 2003-2025 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
@@ -402,7 +402,6 @@ class CoreExport Module : public Extensible
 	virtual EventReturn OnLoadDatabase() { throw NotImplementedException(); }
 
 	/** Called when anope needs to check passwords against encryption
-	 *  see src/encrypt.c for detailed informations
 	 */
 	virtual EventReturn OnEncrypt(const Anope::string &src, Anope::string &dest) { throw NotImplementedException(); }
 	virtual EventReturn OnDecrypt(const Anope::string &hashm, const Anope::string &src, Anope::string &dest) { throw NotImplementedException(); }
@@ -507,7 +506,7 @@ class CoreExport Module : public Extensible
 	 */
 	virtual void OnChanExpire(ChannelInfo *ci) { throw NotImplementedException(); }
 
-	/** Called before Anope connecs to its uplink
+	/** Called before Anope connects to its uplink
 	 */
 	virtual void OnPreServerConnect() { throw NotImplementedException(); }
 
@@ -555,7 +554,7 @@ class CoreExport Module : public Extensible
 
 	/** Called before an exception is deleted
 	 * @param source The source deleting it
-	 * @param ex The exceotion
+	 * @param ex The exception
 	 */
 	virtual void OnExceptionDel(CommandSource &source, Exception *ex) { throw NotImplementedException(); }
 
@@ -776,7 +775,7 @@ class CoreExport Module : public Extensible
 	 */
 	virtual void OnNickSuspend(NickAlias *na) { throw NotImplementedException(); }
 
-	/** Called when a nick is unsuspneded
+	/** Called when a nick is unsuspended
 	 * @param na The nick alias
 	 */
 	virtual void OnNickUnsuspended(NickAlias *na) { throw NotImplementedException(); }
@@ -939,12 +938,12 @@ class CoreExport Module : public Extensible
 	 */
 	virtual void OnUserModeUnset(const MessageSource &setter, User *u, const Anope::string &mname) { throw NotImplementedException(); }
 
-	/** Called when a channel mode is introducted into Anope
+	/** Called when a channel mode is introduced into Anope
 	 * @param cm The mode
 	 */
 	virtual void OnChannelModeAdd(ChannelMode *cm) { throw NotImplementedException(); }
 
-	/** Called when a user mode is introducted into Anope
+	/** Called when a user mode is introduced into Anope
 	 * @param um The mode
 	 */
 	virtual void OnUserModeAdd(UserMode *um) { throw NotImplementedException(); }
@@ -1066,7 +1065,7 @@ class CoreExport Module : public Extensible
 	/** Called when a nickserv/set command is used.
 	 * @param source The source of the command
 	 * @param cmd The command
-	 * @param nc The nickcore being modifed
+	 * @param nc The nickcore being modified
 	 * @param setting The setting passed to the command. Probably ON/OFF.
 	 * @return EVENT_STOP to halt immediately
 	 */
@@ -1080,7 +1079,7 @@ class CoreExport Module : public Extensible
 	 */
 	virtual EventReturn OnMessage(MessageSource &source, Anope::string &command, std::vector<Anope::string> &param) { throw NotImplementedException(); }
 
-	/** Called to determine if a chnanel mode can be set by a user
+	/** Called to determine if a channel mode can be set by a user
 	 * @param u The user
 	 * @param cm The mode
 	 */
@@ -1093,13 +1092,20 @@ class CoreExport Module : public Extensible
 	 */
 	virtual void OnExpireTick() { throw NotImplementedException(); }
 
-	/** Called when a nick is validated. That is, to determine if a user is permissted
+	/** Called when a nick is validated. That is, to determine if a user is permitted
 	 * to be on the given nick.
 	 * @param u The user
 	 * @param na The nick they are on
 	 * @return EVENT_STOP to force the user off of the nick
 	 */
 	virtual EventReturn OnNickValidate(User *u, NickAlias *na) { throw NotImplementedException(); }
+
+	/** Called when a certain user has to be unbanned on a certain channel.
+	 * May be used to send protocol-specific messages.
+	 * @param u The user to be unbanned
+	 * @param c The channel that user has to be unbanned on
+	 */
+	virtual void OnChannelUnban(User *u, ChannelInfo *ci) { throw NotImplementedException(); }
 };
 
 enum Implementation
@@ -1125,7 +1131,7 @@ enum Implementation
 	I_OnPrivmsg, I_OnLog, I_OnLogMessage, I_OnDnsRequest, I_OnCheckModes, I_OnChannelSync, I_OnSetCorrectModes,
 	I_OnSerializeCheck, I_OnSerializableConstruct, I_OnSerializableDestruct, I_OnSerializableUpdate,
 	I_OnSerializeTypeCreate, I_OnSetChannelOption, I_OnSetNickOption, I_OnMessage, I_OnCanSet, I_OnCheckDelete,
-	I_OnExpireTick, I_OnNickValidate,
+	I_OnExpireTick, I_OnNickValidate, I_OnChannelUnban,
 	I_SIZE
 };
 
@@ -1177,7 +1183,7 @@ class CoreExport ModuleManager
 	/** Checks whether this version of Anope is at least major.minor.patch.build
 	 * Throws a ModuleException if not
 	 * @param major The major version
-	 * @param minor The minor vesion
+	 * @param minor The minor version
 	 * @param patch The patch version
 	 */
 	static void RequireVersion(int major, int minor, int patch);

include/modules/bs_badwords.h

@@ -1,6 +1,6 @@
 /* BotServ core functions
  *
- * (C) 2003-2020 Anope Team
+ * (C) 2003-2025 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/modules/bs_kick.h

@@ -1,6 +1,6 @@
 /* BotServ core functions
  *
- * (C) 2003-2020 Anope Team
+ * (C) 2003-2025 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/modules/cs_entrymsg.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2020 Anope Team
+ * (C) 2003-2025 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/modules/cs_log.h

@@ -1,6 +1,6 @@
 /* ChanServ core functions
  *
- * (C) 2003-2020 Anope Team
+ * (C) 2003-2025 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/modules/cs_mode.h

@@ -1,6 +1,6 @@
 /* ChanServ core functions
  *
- * (C) 2003-2020 Anope Team
+ * (C) 2003-2025 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/modules/dns.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2020 Anope Team
+ * (C) 2003-2025 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/modules/encryption.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2020 Anope Team
+ * (C) 2003-2025 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/modules/httpd.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2012-2020 Anope Team
+ * (C) 2012-2025 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
@@ -80,7 +80,7 @@ struct HTTPReply
 	}
 };
 
-/* A message from soneone */
+/* A message from someone */
 struct HTTPMessage
 {
 	std::map<Anope::string, Anope::string> headers;

include/modules/ldap.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2011-2020 Anope Team
+ * (C) 2011-2025 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/modules/ns_cert.h

@@ -1,6 +1,6 @@
 /* NickServ core functions
  *
- * (C) 2003-2020 Anope Team
+ * (C) 2003-2025 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
@@ -26,7 +26,7 @@ struct NSCertList
 
 	/** Get an entry from the nick's cert list by index
 	 *
-	 * @param entry Index in the certificaate list vector to retrieve
+	 * @param entry Index in the certificate list vector to retrieve
 	 * @return The fingerprint entry of the given index if within bounds, an empty string if the vector is empty or the index is out of bounds
 	 *
 	 * Retrieves an entry from the certificate list corresponding to the given index.

include/modules/os_forbid.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2011-2020 Anope Team
+ * (C) 2011-2025 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/modules/os_ignore.h

@@ -1,6 +1,6 @@
 /* OperServ ignore interface
  *
- * (C) 2003-2020 Anope Team
+ * (C) 2003-2025 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/modules/os_news.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2011-2020 Anope Team
+ * (C) 2011-2025 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/modules/os_session.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2011-2020 Anope Team
+ * (C) 2011-2025 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/modules/pseudoclients/chanserv.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2011-2020 Anope Team
+ * (C) 2011-2025 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/modules/pseudoclients/global.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2011-2020 Anope Team
+ * (C) 2011-2025 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/modules/pseudoclients/memoserv.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2011-2020 Anope Team
+ * (C) 2011-2025 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
@@ -25,7 +25,7 @@ class MemoServService : public Service
 	}
 
 	/** Sends a memo.
-	 * @param source The source of the memo, can be anythin.
+	 * @param source The source of the memo, can be anything.
 	 * @param target The target of the memo, nick or channel.
 	 * @param message Memo text
 	 * @param force true to force the memo, restrictions/delays etc are not checked

include/modules/pseudoclients/nickserv.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2011-2020 Anope Team
+ * (C) 2011-2025 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/modules/redis.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2020 Anope Team
+ * (C) 2003-2025 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/modules/sasl.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2014-2020 Anope Team
+ * (C) 2014-2025 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/modules/set_misc.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2020 Anope Team
+ * (C) 2003-2025 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/modules/sql.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2020 Anope Team
+ * (C) 2003-2025 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
@@ -149,7 +149,7 @@ namespace SQL
 
 		inline operator bool() const { return this->error.empty(); }
 
-		inline const unsigned int GetID() const { return this->id; }
+		inline unsigned int GetID() const { return this->id; }
 		inline const Query &GetQuery() const { return this->query; }
 		inline const Anope::string &GetError() const { return this->error; }
 

include/modules/ssl.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2010-2020 Anope Team
+ * (C) 2010-2025 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/modules/suspend.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2020 Anope Team
+ * (C) 2003-2025 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/modules/xmlrpc.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2010-2020 Anope Team
+ * (C) 2010-2025 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/opertype.h

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

include/protocol.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2020 Anope Team
+ * (C) 2003-2025 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
@@ -15,8 +15,9 @@
 #include "services.h"
 #include "anope.h"
 #include "service.h"
+#include "modes.h"
 
-/* Encapsultes the IRCd protocol we are speaking. */
+/* Encapsulates the IRCd protocol we are speaking. */
 class CoreExport IRCDProto : public Service
 {
 	Anope::string proto_name;
@@ -54,7 +55,7 @@ class CoreExport IRCDProto : public Service
 	bool CanSNLine;
 	/* Can we ban specific nicknames from being used? */
 	bool CanSQLine;
-	/* Can we ban sepcific channel names from being used? */
+	/* Can we ban specific channel names from being used? */
 	bool CanSQLineChannel;
 	/* Can we ban by IP? */
 	bool CanSZLine;
@@ -241,6 +242,7 @@ class CoreExport IRCDProto : public Service
 	 * Defaults to Config->ListSize
 	 */
 	virtual unsigned GetMaxListFor(Channel *c);
+	virtual unsigned GetMaxListFor(Channel *c, ChannelMode *cm);
 
 	virtual Anope::string NormalizeMask(const Anope::string &mask);
 };

include/regchannel.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2008-2020 Anope Team
+ * (C) 2008-2025 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
@@ -97,7 +97,7 @@ class CoreExport ChannelInfo : public Serializable, public Extensible
 	void Serialize(Serialize::Data &data) const anope_override;
 	static Serializable* Unserialize(Serializable *obj, Serialize::Data &);
 
-	/** Change the founder of the channek
+	/** Change the founder of the channel
 	 * @params nc The new founder
 	 */
 	void SetFounder(NickCore *nc);
@@ -135,7 +135,7 @@ class CoreExport ChannelInfo : public Serializable, public Extensible
 	AccessGroup AccessFor(const User *u, bool updateLastUsed = true);
 	AccessGroup AccessFor(const NickCore *nc, bool updateLastUsed = true);
 
-	/** Get the size of the accss vector for this channel
+	/** Get the size of the access vector for this channel
 	 * @return The access vector size
 	 */
 	unsigned GetAccessCount() const;

include/regexpr.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2020 Anope Team
+ * (C) 2003-2025 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/serialize.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2020 Anope Team
+ * (C) 2003-2025 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
@@ -46,7 +46,7 @@ namespace Serialize
 	template<typename T> class Reference;
 }
 
-/** A serialziable object. Serializable objects can be serialized into
+/** A serializable object. Serializable objects can be serialized into
  * abstract data types (Serialize::Data), and then reconstructed or
  * updated later at any time.
  */
@@ -105,7 +105,7 @@ class CoreExport Serializable : public virtual Base
 };
 
 /* A serializable type. There should be one of these classes for each type
- * of class that inherits from Serialiable. Used for unserializing objects
+ * of class that inherits from Serializable. Used for unserializing objects
  * of this type, as it requires a function pointer to a static member function.
  */
 class CoreExport Serialize::Type : public Base
@@ -123,7 +123,7 @@ class CoreExport Serialize::Type : public Base
 	 */
 	Module *owner;
 
-	/* The timesatmp for this type. All objects of this type are as up to date as
+	/* The timestamp for this type. All objects of this type are as up to date as
 	 * this timestamp. if curtime == timestamp then we have the most up to date
 	 * version of every object of this type.
 	 */

include/servers.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2020 Anope Team
+ * (C) 2003-2025 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
@@ -170,7 +170,7 @@ class CoreExport Server : public Extensible
 	 */
 	bool IsQuitting() const;
 
-	/** Send a message to alll users on this server
+	/** Send a message to all users on this server
 	 * @param source The source of the message
 	 * @param message The message
 	 */

include/service.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2020 Anope Team
+ * (C) 2003-2025 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
@@ -128,6 +128,10 @@ class ServiceReference : public Reference<T>
 	{
 	}
 
+	const Anope::string &GetServiceName() const { return name; }
+
+	const Anope::string &GetServiceType() const { return type; }
+
 	inline void operator=(const Anope::string &n)
 	{
 		this->name = n;

include/services.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2020 Anope Team
+ * (C) 2003-2025 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/socketengine.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2020 Anope Team
+ * (C) 2003-2025 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/sockets.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2020 Anope Team
+ * (C) 2003-2025 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/threadengine.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2020 Anope Team
+ * (C) 2003-2025 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/timers.h

@@ -1,6 +1,6 @@
 /* Timer include stuff.
  *
- * (C) 2003-2020 Anope Team
+ * (C) 2003-2025 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/uplink.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2020 Anope Team
+ * (C) 2003-2025 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/users.h

@@ -1,7 +1,7 @@
 /*
  *
  * (C) 2008-2011 Robin Burchell <w00t@inspircd.org>
- * (C) 2003-2020 Anope Team <team@anope.org>
+ * (C) 2003-2025 Anope Team <team@anope.org>
  *
  * Please read COPYING and README for further details.
  *
@@ -46,7 +46,7 @@ class CoreExport User : public virtual Base, public Extensible, public CommandRe
 	bool on_access;
 	/* Map of user modes and the params this user has (if any) */
 	ModeList modes;
-	/* NickCore account the user is currently loggged in as, if they are logged in */
+	/* NickCore account the user is currently logged in as, if they are logged in */
 	Serialize::Reference<NickCore> nc;
 
 	/* # of invalid password attempts */
@@ -161,13 +161,13 @@ class CoreExport User : public virtual Base, public Extensible, public CommandRe
 
 	/** Update the real ident (username) of a user record.
 	 * @param ident The new ident to give this user.
-	 * NOTE: Where possible, you should use the Get/SetVIdent() equivilants.
+	 * NOTE: Where possible, you should use the Get/SetVIdent() equivalents.
 	 */
 	void SetIdent(const Anope::string &ident);
 
 	/** Get the real ident (username) of this user.
 	 * @return The displayed ident of this user.
-	 * NOTE: Where possible, you should use the Get/SetVIdent() equivilants.
+	 * NOTE: Where possible, you should use the Get/SetVIdent() equivalents.
 	 */
 	const Anope::string &GetIdent() const;
 

include/version.cpp

@@ -1,6 +1,6 @@
 /* Build bumper
  *
- * (C) 2003-2020 Anope Team
+ * (C) 2003-2025 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/xline.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2008-2020 Anope Team
+ * (C) 2008-2025 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.