Fix a crash when FindFromService can not find a command.

Closes #583.

.BANNER

@@ -1,5 +1,5 @@
    ___
-  / _ \  http://www.anope.org
+  / _ \  https://www.anope.org/
  | /_\ | _ __  _ _  _ _   ___
  |  _  || '_ \/ _ \/ _ \ / _ \
  | | | || | |  |_|  |_| |  __/
@@ -7,12 +7,13 @@
                    | |
                    |_| IRC Services
                              CURVER
-This program will help you to compile your Services, and ask you
+This program will help you to compile your services, and ask you
 questions regarding the compile-time settings of it during the
 process. For more options type SOURCE_DIR/Config --help
 
-Anope is a set of Services for IRC networks that allows users to
+Anope is a set of services for IRC networks that allows users to
 manage their nicks and channels in a secure and efficient way,
 and administrators to manage their network with powerful tools.
 
-For all your Anope needs please visit our portal at www.anope.org
+For all your Anope needs please visit our portal at
+https://www.anope.org/

.github/ISSUE_TEMPLATE/BUG.yml

@@ -0,0 +1,44 @@
+---
+name: Bug report
+description: Report a non-security bug in Anope.
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to fill out this bug report! Please make sure to answer the questions properly and don't just enter the same text into every field as this will make it harder for us to fix your bug.
+
+        If you're looking for help with setting up your services please post on [our support forum](https://github.com/orgs/anope/discussions/categories/support) instead.
+
+        If you're reporting a crash or other security issue [please read our security policy](https://github.com/anope/anope/security/policy#reporting-a-vulnerability) for how to report security issues privately.
+
+  - type: textarea
+    attributes:
+      label: Description
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Steps to reproduce the issue
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Describe the results you received
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Describe the results you expected
+    validations:
+      required: true
+
+  - type: input
+    attributes:
+      label: Anope version
+      description: |-
+        Either the output of `services --version` (2.0) or `anope --version` (2.1).
+    validations:
+      required: true

.github/ISSUE_TEMPLATE/FEATURE.yml

@@ -0,0 +1,20 @@
+---
+name: Feature request
+description: Request that a new feature is added to Anope.
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to fill out this feature request!
+
+  - type: textarea
+    attributes:
+      label: Description
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Why this would be useful?
+    validations:
+      required: true

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,5 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Support forum
+    url: https://github.com/orgs/anope/discussions/categories/support
+    about: Please ask support questions here.

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,40 @@
+<!--
+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 -->
+
+## Checks
+
+<!--
+Tick the boxes for the checks you have made.
+-->
+
+I have ensured that:
+
+- [ ] The code I am submitting is my own work and/or I have permission from the author to share it.
+- [ ] Generative AI (Copilot, ChatGPT, etc) was not used to create any part of this pull request.
+- [ ] If the pull request contains a security fix I have followed the reporting rules mentioned in [the security policy](https://github.com/anope/anope/security/policy) (delete if not applicable).
+- [ ] I have documented any features added by this pull request (delete if not applicable).
+- [ ] This pull request does not introduce any incompatible API changes (stable branches only, delete if not applicable).

.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-alpine.yml

@@ -0,0 +1,69 @@
+name: Alpine CI
+on:
+  pull_request:
+  push:
+  schedule:
+    - cron: 0 0 * * 0
+  workflow_dispatch:
+jobs:
+  build:
+    if: "!contains(github.event.head_commit.message, '[skip alpine ci]')"
+    container: alpine:latest
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v6
+
+      - name: Install dependencies
+        run: |-
+          echo "http://dl-cdn.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories
+          apk update
+          apk add \
+            argon2-dev \
+            clang \
+            cmake \
+            g++ \
+            gettext \
+            git \
+            gnutls-dev \
+            mariadb-dev \
+            openldap-dev \
+            openssl-dev \
+            pcre2-dev \
+            samurai \
+            sqlite-dev \
+            tre-dev
+
+      - name: Enable extras
+        run: |-
+          for MODULE in enc_argon2 enc_posix ldap mysql regex_pcre2 regex_posix regex_tre sqlite ssl_gnutls ssl_openssl
+          do
+            ln -s $PWD/modules/extra/$MODULE.cpp $PWD/modules
+          done
+
+      - name: Run CMake
+        env:
+          CC: ${{ matrix.compiler.cc }}
+          CXX: ${{ matrix.compiler.cxx }}
+          CXXFLAGS: -Werror
+        run: |-
+          cmake -B "build" \
+                -D "CMAKE_BUILD_TYPE=Debug" \
+                -D "INSTDIR=$(readlink -f ../run)" \
+                -G "Ninja" \
+                -Wdeprecated \
+                -Wdev
+
+      - name: Build and install
+        env:
+          VERBOSE: ${{ runner.debug }}
+        run: |-
+          ninja -C "build" ${{ runner.debug == '1' && '-v' || '' }} install
+
+    strategy:
+      fail-fast: false
+      matrix:
+        compiler:
+          - cc: clang
+            cxx: clang++
+          - cc: gcc
+            cxx: g++

.github/workflows/ci-linux.yml

@@ -0,0 +1,66 @@
+name: Ubuntu CI
+on:
+  pull_request:
+  push:
+  schedule:
+    - cron: 0 0 * * 0
+  workflow_dispatch:
+jobs:
+  build:
+    if: "!contains(github.event.head_commit.message, '[skip ubuntu ci]')"
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v6
+
+      - name: Install dependencies
+        run: |-
+          sudo apt-get update --assume-yes
+          sudo apt-get install --assume-yes --no-install-recommends \
+            clang \
+            g++ \
+            gettext \
+            git \
+            libargon2-dev \
+            libgnutls28-dev \
+            libldap2-dev \
+            libmysqlclient-dev \
+            libpcre2-dev \
+            libsqlite3-dev \
+            libssl-dev \
+            libtre-dev \
+            ninja-build
+
+      - name: Enable extras
+        run: |-
+          for MODULE in enc_argon2 enc_posix ldap mysql regex_pcre2 regex_posix regex_tre sqlite ssl_gnutls ssl_openssl
+          do
+            ln -s ${{ github.workspace }}/modules/extra/$MODULE.cpp ${{ github.workspace }}/modules
+          done
+
+      - name: Run CMake
+        env:
+          CC: ${{ matrix.compiler.cc }}
+          CXX: ${{ matrix.compiler.cxx }}
+          CXXFLAGS: -Werror
+        run: |-
+          cmake -B "build" \
+                -D "CMAKE_BUILD_TYPE=Debug" \
+                -D "INSTDIR=${{ github.workspace }}/run" \
+                -G "Ninja" \
+                -Wdeprecated \
+                -Wdev
+
+      - name: Build and install
+        env:
+          VERBOSE: ${{ runner.debug }}
+        run: |-
+          ninja -C "build" ${{ runner.debug == '1' && '-v' || '' }} install
+
+    strategy:
+      fail-fast: false
+      matrix:
+        compiler:
+          - cc: clang
+            cxx: clang++
+          - cc: gcc
+            cxx: g++

.github/workflows/ci-windows.yml

@@ -0,0 +1,96 @@
+name: Windows CI
+on:
+  pull_request:
+  push:
+  release:
+    types:
+      - published
+  schedule:
+    - cron: 0 0 * * 0
+  workflow_dispatch:
+jobs:
+  build:
+    if: "!contains(github.event.head_commit.message, '[skip windows ci]')"
+    runs-on: windows-2025
+    env:
+      BUILD_PATH: ${{ github.workspace }}\build
+      BUILD_TYPE: ${{ github.event_name == 'release' && 'Release' || 'Debug' }}
+      CONAN_FILE: ${{ github.workspace }}\src\win32\conanfile.txt
+      CONAN_HOME: ${{ github.workspace }}\build\conan
+    steps:
+      - uses: actions/checkout@v6
+
+      - name: Setup MSVC
+        uses: TheMrMilchmann/setup-msvc-dev@v4
+        with:
+          arch: x64
+
+      - name: Setup NSIS
+        uses: negrutiu/nsis-install@v3
+        with:
+          distro: official
+
+      - name: Setup Conan
+        uses: turtlebrowser/get-conan@v1.2
+
+      - name: Create Conan configuration
+        run: |-
+          conan profile detect
+          (Get-Content ${{ env.CONAN_HOME }}\profiles\default).replace('build_type=Release', 'build_type=${{ env.BUILD_TYPE }}') | Set-Content ${{ env.CONAN_HOME }}\profiles\default
+          (Get-Content ${{ env.CONAN_HOME }}\profiles\default).replace('compiler.cppstd=14', 'compiler.cppstd=17') | Set-Content ${{ env.CONAN_HOME }}\profiles\default
+
+          Write-Output 'core.sources:download_urls=["origin", "https://c3i.jfrog.io/artifactory/conan-center-backup-sources/"]' | Out-File -Append ${{ env.CONAN_HOME }}\global.conf
+          Write-Output 'tools.cmake.cmaketoolchain:generator=Ninja' | Out-File -Append ${{ env.CONAN_HOME }}\global.conf
+          Write-Output 'user.openssl:windows_use_jom=True' | Out-File -Append ${{ env.CONAN_HOME }}\global.conf
+
+      - name: Try to restore libraries from the cache
+        if: github.event_name != 'release'
+        uses: actions/cache/restore@v5
+        id: library-cache
+        with:
+          key: Conan VS${{ env.VisualStudioVersion }} ${{ env.BUILD_TYPE }} ${{ hashFiles(env.CONAN_FILE) }}
+          path: ${{ env.CONAN_HOME }}/p
+
+      - name: Install libraries
+        working-directory: ${{ env.BUILD_PATH }}
+        run: |-
+          (Get-Content ${{ env.CONAN_FILE }}).replace('##', '') | Set-Content ${{ env.CONAN_FILE }}
+          conan install ${{ env.CONAN_FILE }} --build missing --deployer runtime_deploy --deployer-folder extradll --output-folder .
+          conan cache clean "*"
+
+      - name: Save libraries to the cache
+        if: steps.library-cache.outputs.cache-hit != 'true' && github.event_name != 'release'
+        uses: actions/cache/save@v5
+        with:
+          key: ${{ steps.library-cache.outputs.cache-primary-key }}
+          path: ${{ env.CONAN_HOME }}\p
+
+      - name: Run CMake
+        working-directory: ${{ env.BUILD_PATH }}
+        run: |-
+          cmake -D "CMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }}" `
+                -D "CMAKE_TOOLCHAIN_FILE=conan_toolchain.cmake" `
+                -G "Ninja Multi-Config" `
+                -S "${{ github.workspace }}" `
+                -Wdeprecated `
+                -Wdev
+
+      - name: Build installer
+        working-directory: ${{ env.BUILD_PATH }}
+        run: |-
+          ninja -f "build-${{ env.BUILD_TYPE }}.ninja" ${{ runner.debug == '1' && '-v' || '' }} package
+
+      - name: Upload installer
+        if: github.event_name == 'release'
+        working-directory: ${{ env.BUILD_PATH }}
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          gh release upload ${{ github.event.release.tag_name }} $(Get-ChildItem anope-*.exe)
+
+      - name: Upload artifact
+        if: github.event_name != 'release'
+        uses: actions/upload-artifact@v7
+        with:
+          name: windows-installer
+          path: ${{ github.workspace }}\build\\anope-*.exe

.gitignore

@@ -1,3 +1,20 @@
-config.cache
-include/sysconf.h
 build/
+config.cache
+docs/doxygen
+include/sysconf.h
+modules/enc_argon2.cpp
+modules/enc_posix.cpp
+modules/ldap.cpp
+modules/mysql.cpp
+modules/regex_pcre2.cpp
+modules/regex_posix.cpp
+modules/regex_tre.cpp
+modules/sqlite.cpp
+modules/ssl_gnutls.cpp
+modules/ssl_openssl.cpp
+modules/stats
+modules/xmlrpc.cpp
+run/
+*.diff
+*.mo
+*.pot

.mailmap

@@ -0,0 +1,60 @@
+(svnadmin) <svn@localhost> <svn svn@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864>
+Adam <adam@anope.org> <adam-@5417fbe8-f217-4b02-8779-1006273d7864>
+Adam <adam@anope.org> <adam@adam-laptop.(none)>
+Adam <adam@anope.org> <Adam@anope.org>
+Adam <adam@anope.org> <Adam@drink-coca-cola.info>
+Adam <adam@anope.org> <Adam@sigterm.info>
+Adam Kramer <ribosome@anope.org> <ribosome ribosome@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864>
+Alvaro Toledo <atoledo@keldon.org> <atoledo atoledo@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864>
+Attila Molnar <attilamolnar@hush.com>
+Björn Stiddien <keeper@anope.org> <keeper keeper@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864>
+Charles Kingsley <chaz@anope.org>
+Charles Kingsley <chaz@anope.org> <sjaz@5417fbe8-f217-4b02-8779-1006273d7864>
+Cronus <cronus@nite-serv.com>
+Daniel Engel <dane@zero.org> <dane dane@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864>
+David Robson <rob@anope.org> <rob rob@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864>
+David Robson <rob@anope.org> <robbeh@5417fbe8-f217-4b02-8779-1006273d7864>
+Dennis Friis <peavey@inspircd.org> <peavey peavey@inspircd.org@5417fbe8-f217-4b02-8779-1006273d7864>
+Fabio Scotoni <cculex@gmail.com>
+Filippo Cortigiani <simos@simosnap.org> <devel@devel.crtnet.it>
+Filippo Cortigiani <simos@simosnap.org> <simos@H7-25.fritz.box>
+Florian Schulze <certus@anope.org> <certus certus@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864>
+Gabriel Acevedo H. <drstein@anope.org> <drstein drstein@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864>
+Harakiri <harakiri@overstack.fr>
+Hendrik Jäger <gitcommit@henk.geekmail.org> <github@henk.geekmail.org>
+Jan Milants <viper@anope.org>
+Jan Milants <viper@anope.org> <jantje_85@5417fbe8-f217-4b02-8779-1006273d7864>
+Jan Milants <viper@anope.org> <viper viper@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864>
+Jens Voss <dukepyrolator@anope.org> <anope@s15355730.onlinehome-server.info>
+Jens Voss <dukepyrolator@anope.org> <DukePyrolator@5417fbe8-f217-4b02-8779-1006273d7864>
+Jens Voss <dukepyrolator@anope.org> <DukePyrolator@anope.org>
+Jens Voss <dukepyrolator@anope.org> <jens@pyrobook.(none)>
+k4be <k4be@pirc.pl> <34816207+k4bek4be@users.noreply.github.com>
+Lee Holmes <lethality@anope.org>
+Lee Holmes <lethality@anope.org> <lee@lethality.me.uk>
+Mark Summers <mark@goopler.net> <mark mark@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864>
+Matt Schatz <genius3000@g3k.solutions>
+Matt Ullman <matt@airraidsirens.com> <blindsight@gamesurge.net>
+Michael Hazell <michaelhazell@hotmail.com> <Techman-@users.noreply.github.com>
+Michael Stapelberg <michael@robustirc.net> <stapelberg@users.noreply.github.com>
+Michael Wobst <wobst.michael@web.de>
+Michael Wobst <wobst.michael@web.de> <michael@static.163.129.251.148.clients.your-server.de>
+Michael Wobst <wobst.michael@web.de> <michael@wobst.at>
+Naram Qashat <cyberbotx@anope.org> <cyberbotx@5417fbe8-f217-4b02-8779-1006273d7864>
+Naram Qashat <cyberbotx@anope.org> <cyberbotx@cyberbotx.com>
+Naram Qashat <cyberbotx@anope.org> <Naram Qashat cyberbotx@cyberbotx.com@5417fbe8-f217-4b02-8779-1006273d7864>
+PeGaSuS <droider.pc@gmail.com>
+PeGaSuS <droider.pc@gmail.com> <25697531+TehPeGaSuS@users.noreply.github.com>
+Pieter Bootsma <geniusdex@anope.org> <geniusdex geniusdex@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864>
+Robby <robby@chatbelgie.be> <robby@anope.org>
+Robby <robby@chatbelgie.be> <robby@chat.be>
+Robert Scheck <robert@fedoraproject.org> <robert-scheck@users.noreply.github.com>
+Robin Burchell <w00t@inspircd.org> <rburchell@5417fbe8-f217-4b02-8779-1006273d7864>
+Robin Burchell <w00t@inspircd.org> <Robin Burchell w00t@inspircd.org@5417fbe8-f217-4b02-8779-1006273d7864>
+Sadie Powell <sadie@sadiepowell.dev> <petpow@saberuk.com>
+Sadie Powell <sadie@sadiepowell.dev> <sadie@witchery.services>
+Sebastian Barfurth <github@afreshmelon.com>
+Sebastian V. <hal9000@denorastats.org>
+Sebastian V. <hal9000@denorastats.org> <pimpmylinux@5417fbe8-f217-4b02-8779-1006273d7864>
+Trystan S. Lee <trystan@nomadirc.net> <trystan trystan@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864>
+Val Lorentz <progval+git@progval.net> <progval+git@progval.net>

CMakeLists.txt

@@ -1,400 +1,185 @@
-# 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)
-endif(COMMAND cmake_policy)
+# This usage of CMake requires at least version 3.20
+cmake_minimum_required(VERSION 3.20 FATAL_ERROR)
 
-# If the Source dir and the Binary dir are the same, we are building in-source, which we will disallow due to Autotools being there (but only on non-Windows)
-if(${CMAKE_CURRENT_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_BINARY_DIR} AND NOT WIN32)
-  message(FATAL_ERROR "You can not use CMake to build Anope from the root of it's source tree! Remove the CMakeCache.txt file from this directory, then create a separate directory (either below this directory or elsewhere), and then re-run CMake from there.")
-endif(${CMAKE_CURRENT_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_BINARY_DIR} AND NOT WIN32)
-
-# Set the project as C++ primarily, but have C enabled for the checks required later
+# Set the project as C++ primarily
 project(Anope CXX)
-enable_language(C)
-
-# Detect the version of CMake for the later conditional checks
-execute_process(COMMAND ${CMAKE_COMMAND} --version OUTPUT_VARIABLE VERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
-string(REGEX REPLACE "cmake version 2\\.(.*)" "\\1" ONLY_VERSION "${VERSION}")
-string(REGEX MATCH "-patch .*$" HAS_PATCH "${ONLY_VERSION}")
-if(HAS_PATCH)
-  string(REGEX REPLACE "(.*)-patch .*" "\\1" MINOR_VERSION "${ONLY_VERSION}")
-  string(REGEX REPLACE ".*-patch (.*)" "\\1" PATCH_VERSION "${ONLY_VERSION}")
-else(HAS_PATCH)
-  string(REGEX MATCH "\\." HAS_DOT "${ONLY_VERSION}")
-  if(HAS_DOT)
-    string(REGEX REPLACE "(.*)\\..*" "\\1" MINOR_VERSION "${ONLY_VERSION}")
-    string(REGEX REPLACE ".*\\.(.*)" "\\1" PATCH_VERSION "${ONLY_VERSION}")
-  else(HAS_DOT)
-    string(REGEX REPLACE "(.*)-beta" "\\1" MINOR_VERSION "${ONLY_VERSION}")
-    if(MINOR_VERSION STREQUAL "4-1\n")
-      set(PATCH_VERSION 1)
-    else(MINOR_VERSION STREQUAL "4-1\n")
-      set(PATCH_VERSION 0)
-    endif(MINOR_VERSION STREQUAL "4-1\n")
-    set(MINOR_VERSION 4)
-  endif(HAS_DOT)
-endif(HAS_PATCH)
-
-# Detect is we are using CMake 2.6 or better, these versions include functions that require less work than CMake 2.4 does
-if(MINOR_VERSION GREATER 5)
-  set(CMAKE26_OR_BETTER TRUE)
-  set(CMAKE248_OR_BETTER TRUE)
-  set(CMAKE244_OR_BETTER TRUE)
-  set(CMAKE242_OR_BETTER TRUE)
-else(MINOR_VERSION GREATER 5)
-  set(CMAKE26_OR_BETTER FALSE)
-  # Also detect if we are using CMake 2.4.8 or better, the FIND sub-command of list() is non-existant in earlier versions
-  if(PATCH_VERSION GREATER 7)
-    set(CMAKE248_OR_BETTER TRUE)
-    set(CMAKE244_OR_BETTER TRUE)
-    set(CMAKE242_OR_BETTER TRUE)
-  else(PATCH_VERSION GREATER 7)
-    set(CMAKE248_OR_BETTER FALSE)
-    # Also detect if we are using CMake 2.4.4 or better, the CheckCXXCompilerFlag module and SORT sub-command of list() are non-existant in earlier versions
-    if(PATCH_VERSION GREATER 3)
-      set(CMAKE244_OR_BETTER TRUE)
-      set(CMAKE242_OR_BETTER TRUE)
-    else(PATCH_VERSION GREATER 3)
-      set(CMAKE244_OR_BETTER FALSE)
-      # ALSO detect if we are using CMake 2.4.2 or better, the APPEND sub-command of list() is non-existant in earlier versions
-      if(PATCH_VERSION GREATER 1)
-        set(CMAKE242_OR_BETTER TRUE)
-      else(PATCH_VERSION GREATER 1)
-        set(CMAKE242_OR_BETTER FALSE)
-      endif(PATCH_VERSION GREATER 1)
-    endif(PATCH_VERSION GREATER 3)
-  endif(PATCH_VERSION GREATER 7)
-endif(MINOR_VERSION GREATER 5)
-
-# Override the module include path to include our directory, for our Anope.cmake, as well as we are using our own version of the NSIS template
-set(CMAKE_MODULE_PATH ${Anope_SOURCE_DIR}/cmake)
-
-include(Anope)
 
 # Force the locale to C for later uses of things like gcc so the messages come up in English, not the user's default language
 set(ENV{LC_ALL} C)
 
-# Start with empty defaults for library and include directories, to be used by GNU compilers only
-set(DEFAULT_LIBRARY_DIRS)
-set(DEFAULT_INCLUDE_DIRS)
+# We require C++17 to build
+set(CMAKE_CXX_EXTENSIONS OFF)
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
-# 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
-if(CMAKE_COMPILER_IS_GNUCXX)
-  # First look for the compiler's default library directories
-  execute_process(COMMAND ${CMAKE_C_COMPILER} -print-search-dirs OUTPUT_VARIABLE LINES OUTPUT_STRIP_TRAILING_WHITESPACE)
-  # Find only the part after "libraries: "
-  string(REGEX REPLACE ".*\nlibraries: (.*)$" "\\1" LINE "${LINES}")
-  # Replace the colons in the list with semicolons (only when not on MinGW, which uses semicolons already), and if on MinGW, just copy the line
-  if(NOT MINGW)
-    string(REGEX REPLACE ":" ";" LIBRARIES ${LINE})
-  else(NOT MINGW)
-    set(LIBRARIES "${LINE}")
-  endif(NOT MINGW)
-  # Iterate through the libraries
-  foreach(LIBRARY ${LIBRARIES})
-    # Check if the first character is an equal sign, and skip that library directory as it is (I believe) the primary default and shows up later in the list anyways
-    string(SUBSTRING ${LIBRARY} 0 1 FIRST_CHAR)
-    if(NOT FIRST_CHAR STREQUAL "=")
-      # If the directory had no = in front of it, make sure it's absolute and add it to the list of default library directories
-      get_filename_component(LIBRARY ${LIBRARY} ABSOLUTE)
-      append_to_list(DEFAULT_LIBRARY_DIRS ${LIBRARY})
-    endif(NOT FIRST_CHAR STREQUAL "=")
-  endforeach(LIBRARY)
-  # Remove duplicate entries from the list
-  if(DEFAULT_LIBRARY_DIRS)
-    remove_list_duplicates(DEFAULT_LIBRARY_DIRS)
-  endif(DEFAULT_LIBRARY_DIRS)
-  # Create a temporary file to test for the default include directories
-  FILE(WRITE empty.cpp "")
-  # Next, we look for the compiler's default include directories
-  # Run the command to find the default include directories
-  execute_process(COMMAND ${CMAKE_C_COMPILER} -v -x c++ -E ${CMAKE_CURRENT_SOURCE_DIR}/empty.cpp ERROR_VARIABLE LINES OUTPUT_QUIET ERROR_STRIP_TRAILING_WHITESPACE)
-  # Remove the empty file, it is no longer needed
-  FILE(REMOVE empty.cpp)
-  # Convert the new lines to semicolons
-  string(REGEX REPLACE "\n" ";" LINES ${LINES})
-  # Temporary variable saying if we are in the search list or not
-  set(IN_SEARCH_LIST FALSE)
-  # Iterate through the lines
-  foreach(LINE ${LINES})
-    # If the line has the following on it, the next lines will contain directory names
-    if(LINE STREQUAL "#include <...> search starts here:")
-      set(IN_SEARCH TRUE)
-    else(LINE STREQUAL "#include <...> search starts here:")
-      # If the line has the following on it, we hit the end of the list
-      if(LINE STREQUAL "End of search list.")
-        set(IN_SEARCH FALSE)
-      else(LINE STREQUAL "End of search list.")
-        # If we are within the block between the above two lines...
-        if(IN_SEARCH)
-          # Get everything but the first character of the line
-          string(LENGTH ${LINE} LINE_LENGTH)
-          math(EXPR LINE_LENGTH "${LINE_LENGTH} - 1")
-          string(SUBSTRING ${LINE} 1 ${LINE_LENGTH} INCLUDE)
-          # Convert the path to an absolute one, just in case it wasn't
-          get_filename_component(INCLUDE ${INCLUDE} ABSOLUTE)
-          # Add that directory to the list of default include directories
-          append_to_list(DEFAULT_INCLUDE_DIRS ${INCLUDE})
-        endif(IN_SEARCH)
-      endif(LINE STREQUAL "End of search list.")
-    endif(LINE STREQUAL "#include <...> search starts here:")
-  endforeach(LINE)
-  # Remove duplicate entries from the list
-  if(DEFAULT_INCLUDE_DIRS)
-    remove_list_duplicates(DEFAULT_INCLUDE_DIRS)
-  endif(DEFAULT_INCLUDE_DIRS)
-endif(CMAKE_COMPILER_IS_GNUCXX)
+# Put modules in their own folder
+set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 
-# If we are using Visual Studio, locate the path of the Windows Server 2008 SDK or Windows Server 2003 Platform SDK, depending on which is installed
-if(MSVC)
-  # If the path comes up as "/registry" from any of these, the path wasn't found, otherwise, we'll set WSDK_PATH to the corresponding path
-  # Look for the 2008 SDK under HKLM first
-  get_filename_component(WSDK2008_PATH "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Microsoft SDKs\\Windows;CurrentInstallFolder]" ABSOLUTE CACHE)
-  if(WSDK2008_PATH STREQUAL "/registry")
-    # If not found, look for the 2003 SDK under HKLM
-    get_filename_component(WSDK2003_PATH "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\MicrosoftSDK\\InstalledSDKs\\D2FF9F89-8AA2-4373-8A31-C838BF4DBBE1;Install Dir]" ABSOLUTE CACHE)
-    if(WSDK2003_PATH STREQUAL "/registry")
-      # If not found, look for the 2008 SDK under HKCU
-      get_filename_component(WSDK2008_PATH "[HKEY_CURRENT_USER\\SOFTWARE\\Microsoft\\Microsoft SDKs\\Windows;CurrentInstallFolder]" ABSOLUTE CACHE)
-      if(WSDK2008_PATH STREQUAL "/registry")
-        # If not found, look for the 2003 SDK under HKCU
-        get_filename_component(WSDK2003_PATH "[HKEY_CURRENT_USER\\SOFTWARE\\Microsoft\\MicrosoftSDK\\InstalledSDKs\\D2FF9F89-8AA2-4373-8A31-C838BF4DBBE1;Install Dir]" ABSOLUTE CACHE)
-        if(WSDK2003_PATH STREQUAL "/regsitry")
-          # The SDK was never found, set the path to nothing
-          set(WSDK_PATH "")
-        else(WSDK2003_PATH STREQUAL "/regsitry")
-          set(WSDK_PATH "${WSDK2003_PATH}")
-        endif(WSDK2003_PATH STREQUAL "/regsitry")
-      else(WSDK2008_PATH STREQUAL "/registry")
-        set(WSDK_PATH "${WSDK2008_PATH}")
-      endif(WSDK2008_PATH STREQUAL "/registry")
-    else(WSDK2003_PATH STREQUAL "/registry")
-      set(WSDK_PATH "${WSDK2003_PATH}")
-    endif(WSDK2003_PATH STREQUAL "/registry")
-  else(WSDK2008_PATH STREQUAL "/registry")
-    set(WSDK_PATH "${WSDK2008_PATH}")
-  endif(WSDK2008_PATH STREQUAL "/registry")
-endif(MSVC)
-
-# If the user specifies -DCMAKE_BUILD_TYPE on the command line, take their definition
-# and dump it in the cache along with proper documentation, otherwise set CMAKE_BUILD_TYPE
-# to Debug
-# Only do this if not using Visual Studio
-if(NOT MSVC)
-  if(CMAKE_BUILD_TYPE)
-    set(CMAKE_BUILD_TYPE ${CMAKE_BUILD_TYPE} CACHE STRING "Choose the type of build, options are: None(CMAKE_CXX_FLAGS or CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel.")
-  else(CMAKE_BUILD_TYPE)
-    set(CMAKE_BUILD_TYPE DEBUG CACHE STRING "Choose the type of build, options are: None(CMAKE_CXX_FLAGS or CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel.")
-  endif(CMAKE_BUILD_TYPE)
-endif(NOT MSVC)
-
-# If running under MinGW, we have to force the resource compiler settings (hopefully this will be fixed in a later version of CMake)
-if(MINGW)
-  set(CMAKE_RC_COMPILER_INIT windres)
-  enable_language(RC)
-  set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> <FLAGS> <DEFINES> -o <OBJECT> <SOURCE>")
-endif(MINGW)
+if(CMAKE_BUILD_TYPE STREQUAL "")
+  message(STATUS "CMAKE_BUILD_TYPE has not been specified; defaulting to Debug")
+  set(CMAKE_BUILD_TYPE "Debug")
+endif()
 
 # Include the checking functions used later in this CMakeLists.txt
 include(CheckFunctionExists)
-include(CheckIncludeFile)
 include(CheckTypeSize)
 include(CheckLibraryExists)
-if(CMAKE244_OR_BETTER)
-  include(CheckCXXCompilerFlag)
-else(CMAKE244_OR_BETTER)
-  include(TestCXXAcceptsFlag)
-endif(CMAKE244_OR_BETTER)
+include(CheckCXXCompilerFlag)
 
-# If extra directories were specified, tell cmake about them.
+if(NOT WIN32)
+  include(FindPkgConfig)
+endif()
+
+# If extra include directories were specified, tell cmake about them.
 if(EXTRA_INCLUDE)
   include_directories(${EXTRA_INCLUDE})
-  link_directories(${EXTRA_INCLUDE})
-endif(EXTRA_INCLUDE)
+endif()
+
+# If extra library directories were specified, tell cmake about them.
+if(EXTRA_LIBS)
+  link_directories(${EXTRA_LIBS})
+endif()
 
 # Find gettext
 find_package(Gettext)
-
-# Add an optional variable for using run-cc.pl for building, Perl will be checked later regardless of this setting
-option(USE_RUN_CC_PL "Use run-cc.pl for building" OFF)
+find_package(Intl)
+if(Gettext_FOUND AND Intl_FOUND)
+  set(HAVE_LOCALIZATION ON)
+  include_directories(${Intl_INCLUDE_DIRS})
+  link_libraries(${Intl_LIBRARIES})
+else()
+  message(STATUS "Unable to find gettext and/or libintl -- read docs/LANGUAGE for how to enable localization")
+  set(HAVE_LOCALIZATION OFF)
+endif()
 
 # Use the following directories as includes
-# Note that it is important the binary include directory comes before the
-# source include directory so the precompiled headers work correctly.
-include_directories(${Anope_BINARY_DIR}/include ${Anope_SOURCE_DIR}/include ${Anope_BINARY_DIR}/language ${Anope_SOURCE_DIR}/modules/pseudoclients)
+include_directories(
+  ${Anope_BINARY_DIR}/include
+  ${Anope_SOURCE_DIR}/include
+  ${Anope_SOURCE_DIR}/vendor
+)
 
-# If using Windows, always add the _WIN32 define
 if(WIN32)
-  add_definitions(-D_WIN32)
-  # And include the windows specific folder for our anope_windows.h
+  # If using Windows, include the windows specific folder for anope_windows.h
   include_directories(${Anope_SOURCE_DIR}/src/win32)
-endif(WIN32)
+endif()
 
 # If using Visual Studio, set the C++ flags accordingly
 if(MSVC)
-  # Remove the default exception handling flags, also remove default warning level flag
-  string(REPLACE "/EHsc " "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
-  string(REPLACE "/GX " "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
-  string(REPLACE "/W3 " "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
-  # Set the compile flags to have warnings on the max setting (but disable a few annoying ones), exception handling turned on, the proper defines
-  set(CXXFLAGS "${CXXFLAGS} /W4 /wd4100 /wd4127 /wd4250 /wd4251 /wd4355 /wd4706 /wd4800 /wd4996 /EHs")
-  add_definitions(-DMSVCPP -D_CRT_SECURE_NO_WARNINGS)
+  # Set the compile flags to have warnings on the max setting (but disable a few annoying ones), exception handling turned on
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4 /wd4100 /wd4127 /wd4250 /wd4251 /wd4267 /wd4275 /wd4355 /wd4706 /wd4800 /wd4996 /EHs")
+  add_definitions(-D_CRT_SECURE_NO_WARNINGS)
 # Otherwise, we're not using Visual Studio
-else(MSVC)
+else()
   # Set the compile flags to have all warnings on (including shadowed variables)
-  set(CXXFLAGS "${CXXFLAGS} -Wall -Wshadow")
-  # If on a *nix system, also set the compile flags to remove GNU extensions (favor ISO C++) as well as reject non-ISO C++ code, also remove all leading underscores in exported symbols (only on GNU compiler)
-  if(UNIX)
-    set(CXXFLAGS "${CXXFLAGS} -ansi -pedantic")
-    if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-      set(CXXFLAGS "${CXXFLAGS} -Wno-long-long -fno-leading-underscore")
-    endif(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-  # If we aren't on a *nix system, we are using MinGW
-  else(UNIX)
-    # Also, if we are building under MinGW, add another define for MinGW
-    if(MINGW)
-      add_definitions(-DMINGW)
-    endif(MINGW)
-  endif(UNIX)
-endif(MSVC)
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden -fvisibility-inlines-hidden -Wall -Wextra -Wformat=2 -Wmissing-format-attribute -Wpedantic")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-format-nonliteral -Wno-format-y2k -Wno-format-zero-length -Wno-date-time -Wno-unused-parameter")
+endif()
 
 # If CMake has found that the given system requires a special library for dl* calls, include it with the linker flags
 if(CMAKE_DL_LIBS)
-  append_to_list(LINK_LIBS ${CMAKE_DL_LIBS})
-endif(CMAKE_DL_LIBS)
+  link_libraries(${CMAKE_DL_LIBS})
+endif()
 
-# Under MinGW, the -shared flag isn't properly set in the module-specific linker flags, add it from the C flags for shared libraries
-if(MINGW)
-  set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ${CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS}")
-endif(MINGW)
+# Find the linker flags required for using threads.
+find_package("Threads" REQUIRED)
+if(CMAKE_THREAD_LIBS_INIT)
+  link_libraries(${CMAKE_THREAD_LIBS_INIT})
+endif()
 
-# Under Windows, we set the executable name for Anope to be anope
+# On Windows, also link Anope to the memory library and Winsock.
 if(WIN32)
+  link_libraries("Ws2_32")
+  if(MSVC)
+    link_libraries("win32_memory")
+  endif()
+endif()
+
+if(NOT PROGRAM_NAME)
   set(PROGRAM_NAME anope)
-# Under *nix, we set the executable name for Anope to be services
-else(WIN32)
-  set(PROGRAM_NAME services)
-endif(WIN32)
+endif()
 
 # If we are not using Visual Studio, we'll run the following checks
 if(NOT MSVC)
   # Check if the C++ compiler can accept the -pipe flag, and add it to the compile flags if it works
-  if(CMAKE244_OR_BETTER)
-    # If using CMake 2.4.4 or better, we can use check_cxx_compiler_flag
-    check_cxx_compiler_flag(-pipe HAVE_PIPE_FLAG)
-  else(CMAKE244_OR_BETTER)
-    # If using CMake 2.4.3 or older, we will use check_cxx_accepts_flags instead
-    check_cxx_accepts_flag(-pipe HAVE_PIPE_FLAG)
-  endif(CMAKE244_OR_BETTER)
+  check_cxx_compiler_flag(-pipe HAVE_PIPE_FLAG)
   # If the flag was accepted, add it to the list of flags
   if(HAVE_PIPE_FLAG)
-    set(CXXFLAGS "${CXXFLAGS} -pipe")
-  endif(HAVE_PIPE_FLAG)
-
-  # The following are additional library checks, they are not required for Windows
-  if(NOT WIN32)
-    # Check if socket is within the socket library (if the library exists), and add it to the linker flags if needed
-    check_library_exists(socket socket "" HAVE_SOCKET_LIB)
-    if(HAVE_SOCKET_LIB)
-      append_to_list(LINK_LIBS socket)
-    endif(HAVE_SOCKET_LIB)
-    # Check if inet_addr is within the nsl library (if the library exists), and add it to the linker flags if needed
-    check_library_exists(nsl inet_addr "" HAVE_NSL_LIB)
-    if(HAVE_NSL_LIB)
-      append_to_list(LINK_LIBS nsl)
-    endif(HAVE_NSL_LIB)
-    # Check if pthread_create is within the pthread library (if the library exists), and add it to the linker flags if needed
-    check_library_exists(pthread pthread_create "" HAVE_PTHREAD)
-    if(HAVE_PTHREAD)
-      set(LDFLAGS "${LDFLAGS} -pthread")
-    else(HAVE_PTHREAD)
-      message(FATAL_ERROR "The pthread library is required to build Anope")
-    endif(HAVE_PTHREAD)
-  endif(NOT WIN32)
-endif(NOT MSVC)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pipe")
+  endif()
+endif()
 
 # If DEFUMASK wasn't passed to CMake, set a default depending on if RUNGROUP was passed in or not
 if(NOT DEFUMASK)
   if(RUNGROUP)
     set(DEFUMASK "007")
-  else(RUNGROUP)
+  else()
     set(DEFUMASK "077")
-  endif(RUNGROUP)
-endif(NOT DEFUMASK)
+  endif()
+endif()
 
 # Set the DEBUG_BUILD for sysconf.h
-if(CMAKE_BUILD_TYPE STREQUAL "DEBUG" OR CMAKE_BUILD_TYPE STREQUAL "RELWITHDEBINFO")
+if(CMAKE_BUILD_TYPE STREQUAL "Debug" OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
+  set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
   set(DEBUG_BUILD TRUE)
-endif(CMAKE_BUILD_TYPE STREQUAL "DEBUG" OR CMAKE_BUILD_TYPE STREQUAL "RELWITHDEBINFO")
+endif()
 
-# Check for the existance of the following include files
-check_include_file(cstdint HAVE_CSTDINT)
-check_include_file(stdint.h HAVE_STDINT_H)
-check_include_file(strings.h HAVE_STRINGS_H)
-
-# Check for the existance of the following functions
-check_function_exists(setgrent HAVE_SETGRENT)
-check_function_exists(strcasecmp HAVE_STRCASECMP)
-check_function_exists(stricmp HAVE_STRICMP)
+# Check for the existence of the following functions
+check_function_exists(clock_gettime HAVE_CLOCK_GETTIME)
 check_function_exists(umask HAVE_UMASK)
 check_function_exists(epoll_wait HAVE_EPOLL)
 check_function_exists(poll HAVE_POLL)
 check_function_exists(kqueue HAVE_KQUEUE)
 
-# Check if eventfd works
-try_run(EVENTFD_TEST_RUN_RESULT EVENTFD_TEST_COMPILE_RESULT ${CMAKE_CURRENT_BINARY_DIR} ${Anope_SOURCE_DIR}/cmake/eventfd_test.cpp)
-set(HAVE_EVENTFD FALSE)
-if (EVENTFD_TEST_COMPILE_RESULT AND EVENTFD_TEST_RUN_RESULT EQUAL 1)
-  set(HAVE_EVENTFD TRUE)
-endif(EVENTFD_TEST_COMPILE_RESULT AND EVENTFD_TEST_RUN_RESULT EQUAL 1)
-
-# Strip the leading and trailing spaces from the compile flags
-if(CXXFLAGS)
-  strip_string(${CXXFLAGS} CXXFLAGS)
-endif(CXXFLAGS)
-# Strip the leading and trailing spaces from the linker flags
-if(LDFLAGS)
-  strip_string(${LDFLAGS} LDFLAGS)
-endif(LDFLAGS)
-
 # Search for the following programs
-find_program(GREP grep)
-find_program(SH sh)
-find_program(CHGRP chgrp)
-find_program(CHMOD chmod)
-find_program(PERL perl)
+if(NOT WIN32 AND RUNGROUP)
+  find_program(CHGRP "chgrp" REQUIRED)
+  find_program(CHMOD "chmod" REQUIRED)
+endif()
 
-# If perl is included on the system and the user wants to use run-cc.pl, change the commands for compiling and linking
-if(PERL AND USE_RUN_CC_PL)
-  set(CMAKE_CXX_COMPILE_OBJECT "${PERL} ${Anope_SOURCE_DIR}/run-cc.pl -q ${CMAKE_CXX_COMPILE_OBJECT}")
-  set(CMAKE_CXX_LINK_EXECUTABLE "${PERL} ${Anope_SOURCE_DIR}/run-cc.pl -q ${CMAKE_CXX_LINK_EXECUTABLE}")
-  set(CMAKE_CXX_CREATE_SHARED_MODULE "${PERL} ${Anope_SOURCE_DIR}/run-cc.pl -q ${CMAKE_CXX_CREATE_SHARED_MODULE}")
-endif(PERL AND USE_RUN_CC_PL)
-
-# If a INSTDIR was passed in to CMake, use it as the install prefix, otherwise set the default install prefix to the services directory under the user's home directory
+# If a INSTDIR was passed in to CMake, use it as the install prefix, otherwise set the default install prefix to the anope directory under the user's home directory
 if(INSTDIR)
   set(CMAKE_INSTALL_PREFIX "${INSTDIR}")
-else(INSTDIR)
-  set(CMAKE_INSTALL_PREFIX "$ENV{HOME}/services")
-endif(INSTDIR)
+elseif(NOT CMAKE_INSTALL_PREFIX)
+  set(CMAKE_INSTALL_PREFIX "$ENV{HOME}/anope-${VERSION_MAJOR}-${VERSION_MINOR}")
+endif()
+
+# Set default paths for various directories if not already defined
+if(NOT BIN_DIR)
+  set(BIN_DIR "bin")
+endif()
+if(NOT DATA_DIR)
+  set(DATA_DIR "data")
+endif()
+if(NOT DOC_DIR)
+  set(DOC_DIR "doc")
+endif()
+if(NOT CONF_DIR)
+  set(CONF_DIR "conf")
+endif()
+if(NOT MODULE_DIR)
+  set(MODULE_DIR "modules")
+endif()
+if(NOT LOCALE_DIR)
+  set(LOCALE_DIR "locale")
+endif()
+if(NOT LOG_DIR)
+  set(LOG_DIR "logs")
+endif()
 
 # Version number processing
 # Find all lines in src/version.sh that start with VERSION_
-read_from_file(${Anope_SOURCE_DIR}/src/version.sh "^VERSION_" VERSIONS)
+file(STRINGS ${Anope_SOURCE_DIR}/src/version.sh VERSIONS REGEX "^VERSION_")
 # Iterate through the strings found
 foreach(VERSION_STR ${VERSIONS})
-  # Get the length of the string
-  string(LENGTH ${VERSION_STR} VERSION_LEN)
-  # Subtract 16 from the string's length (8 for VERSION_, 5 more for the type, 2 for the space and leading quote, 1 for the trailing quote)
-  math(EXPR VERSION_NUM_LEN "${VERSION_LEN} - 16")
-  # Extract the type from the string
-  string(SUBSTRING ${VERSION_STR} 8 5 VERSION_TYPE)
-  # Extract the actual value from the string
-  string(SUBSTRING ${VERSION_STR} 15 ${VERSION_NUM_LEN} VERSION)
-  # Set the version type to the value extract from above
-  set(VERSION_${VERSION_TYPE} ${VERSION})
-endforeach(VERSION_STR ${VERSIONS})
+  string(REGEX REPLACE "^VERSION_([A-Z]+)=\"?([^\"]*)\"?$" "\\1;\\2" VERSION_OUT ${VERSION_STR})
+  list(LENGTH VERSION_OUT VERSION_LEN)
+  list(GET VERSION_OUT 0 VERSION_TYPE)
+  if(${VERSION_LEN} GREATER 1)
+    list(GET VERSION_OUT 1 VERSION_DATA)
+    set(VERSION_${VERSION_TYPE} ${VERSION_DATA})
+  endif()
+endforeach()
 
 # Default build version to 0
 set(VERSION_BUILD 0)
@@ -402,7 +187,7 @@ set(VERSION_BUILD 0)
 # Only change the build number if version.h exists
 if(EXISTS "${Anope_SOURCE_DIR}/include/version.h")
   # Attempt to read the build number from include/version.h
-  read_from_file(${Anope_SOURCE_DIR}/include/version.h "^#define VERSION_BUILD" VERSIONS)
+  file(STRINGS ${Anope_SOURCE_DIR}/src/version.sh VERSIONS REGEX "^#define VERSION_BUILD")
   foreach(VERSION_STR ${VERSIONS})
     # Get the length of the string
     string(LENGTH ${VERSION_STR} VERSION_LEN)
@@ -412,8 +197,8 @@ if(EXISTS "${Anope_SOURCE_DIR}/include/version.h")
     string(SUBSTRING ${VERSION_STR} 22 ${VERSION_NUM_LEN} VERSION)
     # Set VERSION_BUILD correctly
     set(VERSION_BUILD ${VERSION})
-  endforeach(VERSION_STR ${VERSIONS})
-endif(EXISTS "${Anope_SOURCE_DIR}/include/version.h")
+  endforeach()
+endif()
 
 # Set the version variables based on what was found above
 set(VERSION_COMMA "${VERSION_MAJOR},${VERSION_MINOR},${VERSION_PATCH},${VERSION_BUILD}")
@@ -426,53 +211,35 @@ set(VERSION_FULL_NOBUILD "${VERSION_DOTTED_NOBUILD}${VERSION_EXTRA}")
 if(WIN32)
   # Generate the win32.rc file using the above variables
   configure_file(${Anope_SOURCE_DIR}/src/win32/win32.rc.cmake ${Anope_BINARY_DIR}/src/win32/win32.rc)
-endif(WIN32)
-
-# Add the initial files to ignore which will be ignored regardless of if you are building in-source or out-of-source
-add_to_cpack_ignored_files(".git\;config.cache\;CMakeFiles\;sysconf.h$\;build" TRUE)
-# Add the files we don't want the periods converted for
-add_to_cpack_ignored_files(".\\\\\\\\.so$;.\\\\\\\\.o$;.\\\\\\\\.s$;${Anope_SOURCE_DIR}/Makefile$")
-# If the two directories are the same, we are building in-source, thus we need to ignore more files from the build
-if(${Anope_SOURCE_DIR} STREQUAL ${Anope_BINARY_DIR})
-  # Add the files that need their periods converted
-  add_to_cpack_ignored_files("Makefile\;cmake_install.cmake\;sysconf.h$\;CMakeCache.txt\;install_manifest.txt" TRUE)
-  # Add the files we don't want the periods converted for
-  add_to_cpack_ignored_files(".\\\\\\\\.so$;CPack.;anope-${VERSION_FULL_NOBUILD}-source\\\\\\\\..")
-  # If using Visual Studio, add these files as well
-  if(MSVC)
-    add_to_cpack_ignored_files(".vcproj$\;.sln$\;.ncb$\;.suo$\;.dir$\;.ilk$\;.exp$\;.pdb$\;.lib$\;/debug$;/release$;/relwithdebinfo$;/minsizerel$" TRUE)
-  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)
+endif()
 
 # Get the filename of the Anope binary, to use later
-get_target_property(SERVICES_BINARY ${PROGRAM_NAME} LOCATION)
-get_filename_component(SERVICES_BINARY ${SERVICES_BINARY} NAME)
+set(SERVICES_BINARY "$<TARGET_FILE:${PROGRAM_NAME}>")
+cmake_path(GET SERVICES_BINARY FILENAME SERVICES_BINARY)
 
 # At install time, create the following additional directories
-install(CODE "file(MAKE_DIRECTORY \"\${CMAKE_INSTALL_PREFIX}/data/backups\")")
-install(CODE "file(MAKE_DIRECTORY \"\${CMAKE_INSTALL_PREFIX}/data/logs\")")
-install(CODE "file(MAKE_DIRECTORY \"\${CMAKE_INSTALL_PREFIX}/data/modules/runtime\")")
+file(REAL_PATH ${DATA_DIR} ABSOLUTE_DATA_DIR BASE_DIRECTORY ${CMAKE_INSTALL_PREFIX})
+file(REAL_PATH ${LOG_DIR} ABSOLUTE_LOG_DIR BASE_DIRECTORY ${CMAKE_INSTALL_PREFIX})
+install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ABSOLUTE_DATA_DIR}/backups\")")
+install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ABSOLUTE_LOG_DIR}\")")
+if(WIN32)
+  install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ABSOLUTE_DATA_DIR}/runtime\")")
+endif()
 # On non-Windows platforms, if RUNGROUP is set, change the permissions of the below directories, as well as the group of the data directory
 if(NOT WIN32 AND RUNGROUP)
-  install(CODE "execute_process(COMMAND ${CHMOD} 2775 \"\${CMAKE_INSTALL_PREFIX}/data/backups\")")
-  install(CODE "execute_process(COMMAND ${CHMOD} 2775 \"\${CMAKE_INSTALL_PREFIX}/data/logs\")")
-  install(CODE "execute_process(COMMAND ${CHMOD} 2775 \"\${CMAKE_INSTALL_PREFIX}/data/modules/runtime\")")
-  install(CODE "execute_process(COMMAND ${CHGRP} -R ${RUNGROUP} \"\${CMAKE_INSTALL_PREFIX}\")")
-endif(NOT WIN32 AND RUNGROUP)
+  install(CODE "execute_process(COMMAND ${CHMOD} 2775 \"\$ENV{DESTDIR}${ABSOLUTE_DATA_DIR}/backups\")")
+  install(CODE "execute_process(COMMAND ${CHMOD} 2775 \"\$ENV{DESTDIR}${ABSOLUTE_LOG_DIR}\")")
+  install(CODE "execute_process(COMMAND ${CHGRP} -R ${RUNGROUP} \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}\")")
+endif()
 # On Windows platforms, install extra files
 if(WIN32)
   install(FILES ${Anope_SOURCE_DIR}/src/win32/anope.bat
-    DESTINATION bin
+    DESTINATION ${BIN_DIR}
   )
-endif(WIN32)
+endif()
+
+file(REAL_PATH ${MODULE_DIR} ABSOLUTE_MODULE_DIR BASE_DIRECTORY ${CMAKE_INSTALL_PREFIX})
+install(CODE "file(REMOVE_RECURSE \"$ENV{DESTDIR}${ABSOLUTE_MODULE_DIR}\")")
 
 # Only process the CPack section if we have CPack
 if(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake")
@@ -483,11 +250,15 @@ if(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake")
   set(CPACK_PACKAGE_VERSION_MINOR ${VERSION_MINOR})
   set(CPACK_PACKAGE_VERSION_PATCH "${VERSION_PATCH}${VERSION_EXTRA}")
   set(CPACK_PACKAGE_FILE_NAME "anope-${VERSION_FULL_NOBUILD}")
-  set(CPACK_RESOURCE_FILE_LICENSE "${Anope_SOURCE_DIR}/docs/COPYING")
+  set(CPACK_RESOURCE_FILE_LICENSE "${Anope_SOURCE_DIR}/docs/LICENSE.txt")
   # The following doesn't actually do anything. :(
   #set(CPACK_RESOURCE_FILE_README "${Anope_SOURCE_DIR}/docs/README")
   # The following is primarily for NSIS
   if(WIN32)
+    # By default, do not warn when built on machines using only VS Express:
+    IF(NOT DEFINED CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_NO_WARNINGS)
+      SET(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_NO_WARNINGS ON)
+    ENDIF(NOT DEFINED CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_NO_WARNINGS)
     # Also for Windows, include installing the MSVCRT library
     include(InstallRequiredSystemLibraries)
     set(CPACK_GENERATOR "NSIS")
@@ -498,19 +269,26 @@ if(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake")
       "bin\\\\anope.bat\\\" \\\"-debug -nofork" "Anope IRC Services (Debug and Window Logging)"
       "bin\\\\anope.bat\\\" \\\"-nofork" "Anope IRC Services (Window Logging)"
       "bin\\\\anope.bat\\\" \\\"-nothird" "Anope IRC Services (No Third Party Modules)"
-      "http://www.anope.org/" "Anope Web Site"
+      "https://www.anope.org/" "Anope Web Site"
     )
     # The following doesn't work, but a bug report has been filed about it
     #set(CPACK_CREATE_DESKTOP_LINK_${SERVICES_BINARY} TRUE)
     set(CPACK_NSIS_MUI_ICON "${Anope_SOURCE_DIR}/src\\\\win32\\\\anope-icon.ico")
     set(CPACK_NSIS_MUI_UNIICON "${Anope_SOURCE_DIR}/src\\\\win32\\\\anope-icon.ico")
     set(CPACK_NSIS_INSTALLED_ICON_NAME "${SERVICES_BINARY}")
-    set(CPACK_NSIS_URL_INFO_ABOUT "http://www.anope.org/")
+    set(CPACK_NSIS_URL_INFO_ABOUT "https://www.anope.org/")
     set(CPACK_NSIS_COMPRESSOR "/SOLID lzma")
-  endif(WIN32)
+  endif()
   set(CPACK_SOURCE_PACKAGE_FILE_NAME "anope-${VERSION_FULL_NOBUILD}-source")
   set(CPACK_SOURCE_GENERATOR "TGZ")
-  set(CPACK_SOURCE_IGNORE_FILES "$ENV{CPACK_IGNORED_FILES}")
   set(CPACK_MONOLITHIC_INSTALL TRUE)
   include(CPack)
-endif(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake")
+endif()
+
+# Go into the following directories and run their CMakeLists.txt as well
+add_subdirectory(data)
+add_subdirectory(docs)
+add_subdirectory(language)
+add_subdirectory(src)
+add_subdirectory(modules)
+add_subdirectory(include)

Config

@@ -1,29 +1,21 @@
 #!/bin/sh
 #
-# Configuration script for Services.
+# Anope IRC Services <https://www.anope.org/>
 #
-# Anope (c) 2003-2011 Anope team
-# Contact us at team@anope.org
+# Copyright (C) 2003-2026 Anope Contributors
 #
-# This program is free but copyrighted software; see the file COPYING for
-# details.
+# Anope is free software. You can use, modify, and/or distribute it under the
+# terms of version 2 of the GNU General Public License. See docs/LICENSE.txt
+# for the complete terms of this license and docs/AUTHORS.txt for a list of
+# contributors.
 #
-# Based on the original code of Epona by PegSoft.
-# Based on the original code of Services by Andy Church.
+# Based on the original code of Epona by Lara
+# Based on the original code of Services by Andy Church
 #
-###########################################################################
+# SPDX-License-Identifier: GPL-2.0-only
 
-echo2 () {
-	$ECHO2 "$*$ECHO2SUF" # these are defined later
-}
-
-exists () { # because some shells don't have test -e
-	if [ -f $1 -o -d $1 -o -p $1 -o -c $1 -o -b $1 ] ; then
-		return 0
-	else
-		return 1
-	fi
-}
+SOURCE_DIR="$(cd "$(dirname "$0")" && pwd)"
+. $SOURCE_DIR/src/version.sh
 
 Load_Cache () {
 	if [ -f $SOURCE_DIR/config.cache -a -r $SOURCE_DIR/config.cache -a ! "$IGNORE_CACHE" ] ; then
@@ -37,96 +29,75 @@ Load_Cache () {
 }
 
 Run_Build_System () {
-	WITH_INST=""
-	WITH_RUN=""
-	WITH_PERM=""
-	RUN_CC_PL=""
-	GEN_TYPE=""
+	BUILD_DIR="${SOURCE_DIR}/build"
+	CMAKE_COMMAND="${CMAKE:-cmake} -B ${BUILD_DIR} -S ${SOURCE_DIR}"
 
 	if [ "$INSTDIR" != "" ] ; then
-		WITH_INST="-DINSTDIR:STRING=$INSTDIR"
+		CMAKE_COMMAND="${CMAKE_COMMAND} -D INSTDIR=$INSTDIR"
 	fi
 
 	if [ "$RUNGROUP" != "" ] ; then
-		WITH_RUN="-DRUNGROUP:STRING=$RUNGROUP"
+		CMAKE_COMMAND="${CMAKE_COMMAND} -D RUNGROUP=$RUNGROUP"
 	fi
 
 	if [ "$UMASK" != "" ] ; then
-		WITH_PERM="-DDEFUMASK:STRING=$UMASK"
+		CMAKE_COMMAND="${CMAKE_COMMAND} -D DEFUMASK=$UMASK"
 	fi
 
 	if [ "$DEBUG" = "yes" ] ; then
-		BUILD_TYPE="-DCMAKE_BUILD_TYPE:STRING=DEBUG"
+		CMAKE_COMMAND="${CMAKE_COMMAND} -D CMAKE_BUILD_TYPE=Debug"
 	else
-		BUILD_TYPE="-DCMAKE_BUILD_TYPE:STRING=RELEASE"
+		CMAKE_COMMAND="${CMAKE_COMMAND} -D CMAKE_BUILD_TYPE=Release"
 	fi
 
-	if [ "$USE_RUN_CC_PL" = "yes" ] ; then
-		RUN_CC_PL="-DUSE_RUN_CC_PL:BOOLEAN=ON"
-	else
-		RUN_CC_PL="-DUSE_RUN_CC_PL:BOOLEAN=OFF"
+	if [ "$EXTRA_INCLUDE_DIRS" != "" ] ; then
+		CMAKE_COMMAND="${CMAKE_COMMAND} -D EXTRA_INCLUDE=$EXTRA_INCLUDE_DIRS"
 	fi
 
-	case `uname -s` in
-		MINGW*)
-			GEN_TYPE="-G\"MSYS Makefiles\""
-			;;
-	esac
-
-	if [ "$SOURCE_DIR" = "." ] ; then
-		pwdsave=`pwd`
-		test -d build || mkdir build
-		cd "build"
-		REAL_SOURCE_DIR=".."
-	else
-		REAL_SOURCE_DIR="$SOURCE_DIR"
+	if [ "$EXTRA_LIB_DIRS" != "" ] ; then
+		CMAKE_COMMAND="${CMAKE_COMMAND} -D EXTRA_LIBS=$EXTRA_LIB_DIRS"
 	fi
 
-	echo "cmake $GEN_TYPE $WITH_INST $WITH_RUN $WITH_PERM $BUILD_TYPE $RUN_CC_PL $EXTRA_CONFIG_ARGS $REAL_SOURCE_DIR"
+	if [ "$EXTRA_CONFIG_ARGS" != "" ] ; then
+		CMAKE_COMMAND="${CMAKE_COMMAND} $EXTRA_CONFIG_ARGS"
+	fi
 
-	cmake $GEN_TYPE $WITH_INST $WITH_RUN $WITH_PERM $BUILD_TYPE $RUN_CC_PL $EXTRA_CONFIG_ARGS $REAL_SOURCE_DIR
+	echo $CMAKE_COMMAND
+	$CMAKE_COMMAND
+
+	if [ $? -ne 0 ]; then
+		echo "You should fix these issues and then run ./Config -quick to rerun CMake."
+		exit 1
+	fi
 
 	echo ""
-	if [ "$SOURCE_DIR" = "." ] ; then
-		echo "Now cd build, then run make to build Anope."
-		cd "$pwdsave"
-	else
-		echo "Now run make to build Anope."
-	fi
+	echo "Now run 'make -C ${BUILD_DIR#"$PWD/"} install' to build and install Anope."
 }
 
-ECHO2SUF=''
-if [ "`echo -n a ; echo -n b`" = "ab" ] ; then
-	ECHO2='echo -n'
-elif [ "`echo 'a\c' ; echo 'b\c'`" = "ab" ] ; then
-	ECHO2='echo' ; ECHO2SUF='\c'
-elif [ "`printf 'a' 2>&1 ; printf 'b' 2>&1`" = "ab" ] ; then
-	ECHO2='printf "%s"'
-else
-	# oh well...
-	ECHO2='echo'
-fi
-export ECHO2 ECHO2SUF
-
 ###########################################################################
 # Init values
 ###########################################################################
 
-INSTDIR=$HOME/services
+INSTDIR="${HOME}/anope-${VERSION_MAJOR}.${VERSION_MINOR}"
 RUNGROUP=
 UMASK=
-DEBUG="yes"
-USE_RUN_CC_PL="no"
+DEBUG="no"
+EXTRA_INCLUDE_DIRS=
+EXTRA_LIB_DIRS=
 EXTRA_CONFIG_ARGS=
 CAN_QUICK="no"
-SOURCE_DIR=`dirname $0`
 
 ###########################################################################
 # Check out the options
 ###########################################################################
 
 while [ $# -ge 1 ] ; do
-	if [ $1 = "--help" ] ; then
+	OPTION=$1
+	while [ "${OPTION#-}" != "$OPTION" ]; do
+		OPTION="${OPTION#-}"
+	done
+
+	if [ "$OPTION" = "--help" ] ; then
 		echo "Config utility for Anope"
 		echo "------------------------"
 		echo "Syntax: ./Config [options]"
@@ -134,11 +105,15 @@ while [ $# -ge 1 ] ; do
 		echo "-nointro     Skip intro (disclaimer, etc)"
 		echo "-quick       Skip questions, go straight to cmake"
 		exit 0
-	elif [ $1 = "-nocache" ] ; then
+	elif [ "$OPTION" = "devel" ] ; then
+		DEBUG="yes"
+		DEVEL="yes"
+		INSTDIR="$SOURCE_DIR/run"
+	elif [ "$OPTION" = "nocache" ] ; then
 		IGNORE_CACHE="1"
-	elif [ $1 = "-nointro" ] ; then
+	elif [ "$OPTION" = "nointro" ] ; then
 		NO_INTRO="1"
-	elif [ $1 = "-quick" -o $1 = "-q" ] ; then
+	elif [ "$OPTION" = "quick" -o "$OPTION" = "q" ] ; then
 		Load_Cache
 		if [ "$CAN_QUICK" = "yes" ] ; then
 			Run_Build_System
@@ -155,83 +130,25 @@ done
 # Check for CMake and (optionally) install it
 ###########################################################################
 
-which cmake > /dev/null
+cmake --version 2>&1 > /dev/null
 if [ $? -ne 0 ] ; then
 	clear
-	if exists "cmake-bin" ; then :
-	else
-		echo "Anope requires CMake 2.4 or newer, which can be downloaded at http://cmake.org"
-		echo "If you have installed CMake already, ensure it is in your PATH environment variable."
-
-		if [ `uname` = "Linux" ] ; then
-
-			echo ""
-			echo "Config can attempt to install CMake for you now, which"
-			echo "will take approximately 50 MB of disk space."
-			echo "Would you like to install CMake now?"
-			echo2 "[y] "
-			read YN
-			if [ "$YN" = "n" ] ; then
-				exit 0
-			fi
-
-			echo "Downloading CMake... this may take a minute or two."
-			wget -q http://anope.org/cmake/linux-i386.php -O cmake-bin.tar.gz
-			if [ $? -ne 0 ] ; then
-				rm -f cmake-bin.tar.gz
-				echo "Unable to download CMake"
-				exit 0
-			fi
-			mkdir -p cmake-bin
-			tar zxf cmake-bin.tar.gz -C cmake-bin
-			rm -f cmake-bin.tar.gz
-			echo "Done!"
-		else
-			exit 0
-		fi
-	fi
-
-	CMAKE_BIN=`find cmake-bin -name cmake`
-	CMAKE_BIN="`pwd`/`dirname $CMAKE_BIN`"
-	PATH="$PATH:$CMAKE_BIN"
+	echo "Anope requires CMake 3.20 or newer, which can be downloaded at https://cmake.org/ or through your system's package manager."
+	echo "If you have installed CMake already, ensure it is in your PATH environment variable."
+	exit 0
 fi
 
 ###########################################################################
 
 if [ ! "$NO_INTRO" ] ; then
-	case `uname -s` in
-		MINGW*)
-			PAGER=less
-			;;
-		*)
-			PAGER=more
-			clear
-			;;
-	esac
-	. $SOURCE_DIR/src/version.sh
-	if [ -d .git ] ; then
-		VERSION=`git describe --tags`
-		VERSION_BUILD=`echo "$VERSION" | cut -d'-' -f2`
-		if [ "$SOURCE_DIR" = "." ] ; then
-			test -d build || mkdir -p build/include
-			BUILD_DIR="build"
-		else
-			BUILD_DIR="."
-		fi
-		VERSION_EXTRA=`echo "$VERSION" | cut -d'-' -f3`
-		# Only do this if we are not on a tag, src/version.sh will be all we need then.
-		if [ "$VERSION_BUILD" != "$VERSION_EXTRA" ] ; then
-			echo "#define VERSION_BUILD	$VERSION_BUILD" > $BUILD_DIR/include/version.h
-			echo "#define VERSION_EXTRA	\"-$VERSION_EXTRA\"" >> $BUILD_DIR/include/version.h
-		fi
-	fi
-	cat $SOURCE_DIR/.BANNER | sed "s/CURVER/$VERSION/" | sed "s@SOURCE_DIR@$SOURCE_DIR@" | $PAGER
+	export MORE='-e'
+	cat $SOURCE_DIR/.BANNER | sed "s/CURVER/$VERSION_MAJOR.$VERSION_MINOR.$VERSION_PATCH$VERSION_EXTRA/" | sed "s@SOURCE_DIR@$SOURCE_DIR@" | more
 	echo ""
 else
 	echo ""
 fi
 
-echo "Beginning Services configuration."
+echo "Beginning Anope configuration."
 echo ""
 
 ###########################################################################
@@ -248,20 +165,47 @@ export ok INPUT
 
 ####
 
+TEMP_YN="n"
+if [ "$DEVEL" = "yes" ] ; then
+	TEMP_YN="y"
+fi
+echo "You are building the 2.1 development branch. This branch is not as well tested"
+echo "as the 2.0 stable branch and may have compatibility breaks without notice. Are"
+echo "you sure you want to use this version?"
+echo -n "[$TEMP_YN] "
+read YN
+if [ "$YN" ] ; then
+	if [ "$YN" = "y" ] ; then
+		DEVEL="yes"
+	else
+		DEVEL="no"
+	fi
+fi
+echo ""
+
+if [ "$DEVEL" != "yes" ] ; then
+	echo "If you are building from Git you can run \`git checkout 2.0\` to get the latest"
+	echo "stable code. Otherwise, you can download the latest 2.0 release tarball from"
+	echo "https://github.com/anope/anope/releases/latest"
+	exit 1
+fi
+
+####
+
 ok=0
-echo "In what directory do you want the binaries to be installed?"
+echo "In what directory should Anope be installed?"
 while [ $ok -eq 0 ] ; do
-	echo2 "[$INSTDIR] "
+	echo -n "[$INSTDIR] "
 	if read INPUT ; then : ; else echo "" ; exit 1 ; fi
 	if [ ! "$INPUT" ] ; then
 		INPUT=$INSTDIR
 	fi
 	if [ ! -d "$INPUT" ] ; then
-		if exists "$INPUT" ; then
+		if [ -e "$INPUT" ]; then
 			echo "$INPUT exists, but is not a directory!"
 		else
 			echo "$INPUT does not exist.  Create it?"
-			echo2 "[y] "
+			echo -n "[y] "
 			read YN
 			if [ "$YN" != "n" ] ; then
 				if mkdir -p $INPUT ; then
@@ -269,8 +213,8 @@ while [ $ok -eq 0 ] ; do
 				fi
 			fi
 		fi
-	elif exists "$INPUT/include/services.h" ; then
-		echo "You cannot use the Services source directory as a target directory."
+	elif [ -e "$INPUT/include/services.h" ]; then
+		echo "You cannot use the Anope source directory as a target directory."
 	else
 		ok=1
 	fi
@@ -282,15 +226,15 @@ echo ""
 
 OLD_RUNGROUP="$RUNGROUP"
 if [ "$RUNGROUP" ] ; then
-	echo "Which group should all Services data files be owned by?  (If Services"
+	echo "Which group should all Anope data files be owned by?  (If Anope"
 	echo "should not force files to be owned by a particular group, type \"none\""
 	echo "(without the quotes) and press Return.)"
 else
-	echo "Which group should all Services data files be owned by?  (If Services"
+	echo "Which group should all Anope data files be owned by?  (If Anope"
 	echo "should not force files to be owned by a particular group, just press"
 	echo "Return.)"
 fi
-echo2 "[$RUNGROUP] "
+echo -n "[$RUNGROUP] "
 if read INPUT ; then : ; else echo "" ; exit 1 ; fi
 if [ "$INPUT" ] ; then
 	if [ "$INPUT" = "none" ] ; then
@@ -315,7 +259,7 @@ ok=0
 echo "What should the default umask for data files be (in octal)?"
 echo "(077 = only accessible by owner; 007 = accessible by owner and group)"
 while [ $ok -eq 0 ] ; do
-	echo2 "[$UMASK] "
+	echo -n "[$UMASK] "
 	if read INPUT ; then : ; else echo "" ; exit 1 ; fi
 	if [ ! "$INPUT" ] ; then
 		INPUT=$UMASK
@@ -339,7 +283,7 @@ if [ "$DEBUG" = "yes" ] ; then
 	TEMP_YN="y"
 fi
 echo "Would you like to build a debug version of Anope?"
-echo2 "[$TEMP_YN] "
+echo -n "[$TEMP_YN] "
 read YN
 if [ "$YN" ] ; then
 	if [ "$YN" = "y" ] ; then
@@ -352,38 +296,52 @@ echo ""
 
 ####
 
-TEMP_YN="n"
-if [ "$USE_RUN_CC_PL" = "yes" ] ; then
-	TEMP_YN="y"
-fi
-echo "You can optionally have the build run through run-cc.pl, which will"
-echo "cause warnings and errors (if any) to be colored yellow and red,"
-echo "respectively. This relies on Perl being installed, so if you say yes"
-echo "to this without Perl, the option will be ignored."
-echo "NOTE: If you are using MinGW, it is NOT recommended to say yes to"
-echo "this, it may fail."
-echo "Would you like to utilize run-cc.pl?"
-echo2 "[$TEMP_YN] "
-read YN
-if [ "$YN" ] ; then
-	if [ "$YN" = "y" ] ; then
-		USE_RUN_CC_PL="yes"
+echo "Are there any extra include directories you wish to use?"
+echo "You may only need to do this if CMake is unable to locate"
+echo "missing dependencies without hints."
+echo "Separate directories with semicolons."
+echo "If you need no extra include directories, enter NONE in all caps."
+echo -n "[$EXTRA_INCLUDE_DIRS] "
+if read INPUT ; then : ; else echo "" ; exit 1 ; fi
+if [ "$INPUT" ] ; then
+	if [ "$INPUT" = "NONE" ] ; then
+		EXTRA_INCLUDE_DIRS=""
 	else
-		USE_RUN_CC_PL="no"
+		EXTRA_INCLUDE_DIRS=$INPUT
 	fi
 fi
 echo ""
 
 ####
 
-echo "Are there any extra arguments you wish to pass to cmake?"
-echo "You may only need to do this if cmake is unable to locate"
+echo "Are there any extra library directories you wish to use?"
+echo "You may only need to do this if CMake is unable to locate"
 echo "missing dependencies without hints."
-echo "You can do this by: -DEXTRA_INCLUDE:STRING=/path/to/files;/path/to/more/files"
-echo2 "[$EXTRA_CONFIG_ARGS] "
+echo "Separate directories with semicolons."
+echo "If you need no extra library directories, enter NONE in all caps."
+echo -n "[$EXTRA_LIB_DIRS] "
 if read INPUT ; then : ; else echo "" ; exit 1 ; fi
 if [ "$INPUT" ] ; then
-  EXTRA_CONFIG_ARGS=$INPUT
+	if [ "$INPUT" = "NONE" ] ; then
+		EXTRA_LIB_DIRS=""
+	else
+		EXTRA_LIB_DIRS=$INPUT
+	fi
+fi
+echo ""
+
+####
+
+echo "Are there any extra arguments you wish to pass to CMake?"
+echo "If you need no extra arguments to CMake, enter NONE in all caps."
+echo -n "[$EXTRA_CONFIG_ARGS] "
+if read INPUT ; then : ; else echo "" ; exit 1 ; fi
+if [ "$INPUT" ] ; then
+	if [ "$INPUT" = "NONE" ] ; then
+		EXTRA_CONFIG_ARGS=""
+	else
+		EXTRA_CONFIG_ARGS=$INPUT
+	fi
 fi
 echo ""
 
@@ -393,14 +351,16 @@ echo ""
 # Store values
 ################################################################################
 
-echo2 "Saving configuration results in config.cache... "
+echo -n "Saving configuration results in config.cache... "
 
 cat <<EOT >$SOURCE_DIR/config.cache
 INSTDIR="$INSTDIR"
 RUNGROUP="$RUNGROUP"
 UMASK=$UMASK
 DEBUG="$DEBUG"
-USE_RUN_CC_PL="$USE_RUN_CC_PL"
+DEVEL="$DEVEL"
+EXTRA_INCLUDE_DIRS="$EXTRA_INCLUDE_DIRS"
+EXTRA_LIB_DIRS="$EXTRA_LIB_DIRS"
 EXTRA_CONFIG_ARGS="$EXTRA_CONFIG_ARGS"
 EOT
 echo "done."

README.md

@@ -0,0 +1,46 @@
+## About
+
+Anope is an open source set of IRC services. It is highly modular, with a vast number of configurable parameters, and is the most used IRC services package. There are also many modules on the [modsite](https://modules.anope.org) to add additional features. It runs on Linux, BSD, and Windows, and supports many modern IRCds, including InspIRCd, UnrealIRCd, and ircd-hybrid. For more details, credits, command line options, and contact information see [docs/README](https://github.com/anope/anope/blob/2.0/docs/README).
+
+* [Website](https://anope.org)
+* [GitHub](https://github.com/anope)
+* IRC \#anope on irc.teranova.net
+
+## Installation
+
+### Linux/BSD
+Download the latest release off of the [releases page](https://github.com/anope/anope/releases).
+
+
+```
+$ ./Config
+$ cd build
+$ make
+$ make install
+```
+
+Now change to the directory where you installed Anope to, e.g. `$ cd ~/anope/`
+
+### Windows
+Download the latest release off of the [releases page](https://github.com/anope/anope/releases) and run the installer.
+
+
+## Configuration
+
+Copy conf/anope.example.conf to conf/anope.conf
+
+```
+$ cp conf/anope.example.conf conf/anope.conf
+```
+
+Edit anope.conf, configuring the uplink, serverinfo, and protocol module configurations. Example link blocks for popular IRCds are included in the the example.conf documentation. The [Anope wiki](https://wiki.anope.org) is also a good source of information. Our support channel is located at #anope on [irc.teranova.net](ircs://irc.teranova.net/anope).
+
+Note that the example configuration file includes other example configuration files. If you want to modify the other example configuration files, copy them (e.g. `modules.example.conf` to `modules.conf`) and modify the `include` directive in `anope.conf` to include the new file.
+
+## Running
+
+Run `$ ./bin/anope` to start Anope. If asked to provide logs for support, use the `--support` flag, e.g.: `$ ./bin/anope --support`
+
+## Installing extra modules
+
+Extra modules, which are usually modules which require extra libraries to use, such as m\_mysql, can be enabled with the `./extras` command from the source directory. Then re-run `Config`, `make` and `make install` again. Third party modules can be installed by placing them into the `modules/third` directory.

cmake/Anope.cmake

@@ -1,540 +0,0 @@
-###############################################################################
-# strip_string(<input string> <output string>)
-#
-# A macro to handle stripping the leading and trailing spaces from a string,
-#   uses string(STRIP) if using CMake 2.6.x or better, otherwise uses
-#   string(REGEX REPLACE).
-###############################################################################
-macro(strip_string INPUT_STRING OUTPUT_STRING)
-  if(CMAKE26_OR_BETTER)
-    # For CMake 2.6.x or better, we can just use the STRIP sub-command of string()
-    string(STRIP ${INPUT_STRING} ${OUTPUT_STRING})
-  else(CMAKE26_OR_BETTER)
-    # For CMake 2.4.x, we will have to use the REGEX REPLACE sub-command of string() instead
-    # First check if the input string is empty or not
-    if (${INPUT_STRING} STREQUAL "")
-      set(${OUTPUT_STRING} "")
-    else(${INPUT_STRING} STREQUAL "")
-      # Determine if the string is entirely empty or not
-      string(REGEX MATCH "^[ \t]*$" EMPTY_STRING "${INPUT_STRING}")
-      if(EMPTY_STRING)
-        set(${OUTPUT_STRING} "")
-      else(EMPTY_STRING)
-        # We detect if there is any leading whitespace and remove any if there is
-        string(SUBSTRING "${INPUT_STRING}" 0 1 FIRST_CHAR)
-        if(FIRST_CHAR STREQUAL " " OR FIRST_CHAR STREQUAL "\t")
-          string(REGEX REPLACE "^[ \t]+" "" TEMP_STRING "${INPUT_STRING}")
-        else(FIRST_CHAR STREQUAL " " OR FIRST_CHAR STREQUAL "\t")
-          set(TEMP_STRING "${INPUT_STRING}")
-        endif(FIRST_CHAR STREQUAL " " OR FIRST_CHAR STREQUAL "\t")
-        # Next we detect if there is any trailing whitespace and remove any if there is
-        string(LENGTH "${TEMP_STRING}" STRING_LEN)
-        math(EXPR STRING_LEN "${STRING_LEN} - 1")
-        string(SUBSTRING "${TEMP_STRING}" ${STRING_LEN} 1 LAST_CHAR)
-        if(LAST_CHAR STREQUAL " " OR LAST_CHAR STREQUAL "\t")
-          string(REGEX REPLACE "[ \t]+$" "" ${OUTPUT_STRING} "${TEMP_STRING}")
-        else(LAST_CHAR STREQUAL " " OR LAST_CHAR STREQUAL "\t")
-          set(${OUTPUT_STRING} "${TEMP_STRING}")
-        endif(LAST_CHAR STREQUAL " " OR LAST_CHAR STREQUAL "\t")
-      endif(EMPTY_STRING)
-    endif(${INPUT_STRING} STREQUAL "")
-  endif(CMAKE26_OR_BETTER)
-endmacro(strip_string)
-
-###############################################################################
-# append_to_list(<list> <args>...)
-#
-# A macro to handle appending to lists, uses list(APPEND) if using CMake 2.4.2
-#   or better, otherwise uses set() instead.
-###############################################################################
-macro(append_to_list LIST)
-  if(CMAKE242_OR_BETTER)
-    # For CMake 2.4.2 or better, we can just use the APPEND sub-command of list()
-    list(APPEND ${LIST} ${ARGN})
-  else(CMAKE242_OR_BETTER)
-    # For CMake 2.4.x before 2.4.2, we have to do this manually use set() instead
-    set(${LIST} ${${LIST}} ${ARGN})
-  endif(CMAKE242_OR_BETTER)
-endmacro(append_to_list)
-
-###############################################################################
-# find_in_list(<list> <value> <output variable>)
-#
-# A macro to handle searching within a list, will store the result in the
-#   given <output variable>, uses list(FIND) if using CMake 2.6.x or better
-#   (or CMake 2.4.8 or better), otherwise it iterates through the list to find
-#   the item.
-###############################################################################
-macro(find_in_list LIST ITEM_TO_FIND FOUND)
-  if(CMAKE248_OR_BETTER)
-    # For CMake 2.4.8 or better, we can use the FIND sub-command of list()
-    list(FIND ${LIST} ${ITEM_TO_FIND} ITEM_FOUND)
-  else(CMAKE248_OR_BETTER)
-    # For CMake 2.4.x before 2.4.8, we have to do this ourselves (NOTE: This is very slow due to a lack of break() as well)
-    # Firstly we set the position to -1 indicating nothing found, we also use a temporary position
-    set(ITEM_FOUND -1)
-    set(POS 0)
-    # Iterate through the list
-    foreach(ITEM ${${LIST}})
-      # If the item we are looking at is the item we are trying to find, set that we've found the item
-      if(${ITEM} STREQUAL ${ITEM_TO_FIND})
-        set(ITEM_FOUND ${POS})
-      endif(${ITEM} STREQUAL ${ITEM_TO_FIND})
-      # Increase the position value by 1
-      math(EXPR POS "${POS} + 1")
-    endforeach(ITEM)
-  endif(CMAKE248_OR_BETTER)
-  # Set the given FOUND variable to the result
-  set(${FOUND} ${ITEM_FOUND})
-endmacro(find_in_list)
-
-###############################################################################
-# remove_list_duplicates(<list>)
-#
-# A macro to handle removing duplicates from a list, uses
-#   list(REMOVE_DUPLICATES) if using CMake 2.6.x or better, otherwise it uses
-#   a slower method of creating a temporary list and only adding to it when
-#   a duplicate item hasn't been found.
-###############################################################################
-macro(remove_list_duplicates LIST)
-  if(CMAKE26_OR_BETTER)
-    # For CMake 2.6.x or better, this can be done automatically
-    list(REMOVE_DUPLICATES ${LIST})
-  else(CMAKE26_OR_BETTER)
-    # For CMake 2.4.x, we have to do this ourselves, firstly we'll clear a temporary list
-    set(NEW_LIST)
-    # Iterate through the old list
-    foreach(ITEM ${${LIST}})
-      # Check if the item is in the new list
-      find_in_list(NEW_LIST ${ITEM} FOUND_ITEM)
-      if(FOUND_ITEM EQUAL -1)
-        # If the item was not found, append it to the list
-        append_to_list(NEW_LIST ${ITEM})
-      endif(FOUND_ITEM EQUAL -1)
-    endforeach(ITEM)
-    # Replace the old list with the new list
-    set(${LIST} ${NEW_LIST})
-  endif(CMAKE26_OR_BETTER)
-endmacro(remove_list_duplicates)
-
-###############################################################################
-# remove_item_from_list(<list> <value>)
-#
-# A macro to handle removing a value from a list, uses list(REMOVE_ITEM) in
-#   both cases, but can remove the value itself using CMake 2.4.2 or better,
-#   while older versions use a slower method of iterating the list to find the
-#   index of the value to remove.
-###############################################################################
-macro(remove_item_from_list LIST VALUE)
-  if(CMAKE242_OR_BETTER)
-    # For CMake 2.4.2 or better, this can be done automatically
-    list(REMOVE_ITEM ${LIST} ${VALUE})
-  else(CMAKE242_OR_BETTER)
-    # For CMake 2.4.x before 2.4.2, we have to do this ourselves, firstly we set the index and a variable to indicate if the item was found
-    set(INDEX 0)
-    set(FOUND FALSE)
-    # Iterate through the old list
-    foreach(ITEM ${${LIST}})
-      # If the item hasn't been found yet, but the current item is the same, remove it
-      if(NOT FOUND)
-        if(ITEM STREQUAL ${VALUE})
-          set(FOUND TRUE)
-          list(REMOVE_ITEM ${LIST} ${INDEX})
-        endif(ITEM STREQUAL ${VALUE})
-      endif(NOT FOUND)
-      # Increase the index value by 1
-      math(EXPR INDEX "${INDEX} + 1")
-    endforeach(ITEM)
-  endif(CMAKE242_OR_BETTER)
-endmacro(remove_item_from_list)
-
-###############################################################################
-# sort_list(<list>)
-#
-# A macro to handle sorting a list, uses list(SORT) if using CMake 2.4.4 or
-#   better, otherwise it uses a slower method of creating a temporary list and
-#   adding elements in alphabetical order.
-###############################################################################
-macro(sort_list LIST)
-  if(CMAKE244_OR_BETTER)
-    # 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
-    set(NEW_LIST)
-    # Iterate through the old list
-    foreach(ITEM ${${LIST}})
-      # Temporary index position for the new list, as well as temporary value to store if the item was ever found
-      set(INDEX 0)
-      set(FOUND FALSE)
-      # Iterate through the new list
-      foreach(NEW_ITEM ${NEW_LIST})
-        # Compare the items, only if nothing was found before
-        if(NOT FOUND)
-          if(NEW_ITEM STRGREATER "${ITEM}")
-            set(FOUND TRUE)
-            list(INSERT NEW_LIST ${INDEX} ${ITEM})
-          endif(NEW_ITEM STRGREATER "${ITEM}")
-        endif(NOT FOUND)
-        # Increase the index value by 1
-        math(EXPR INDEX "${INDEX} + 1")
-      endforeach(NEW_ITEM)
-      # If the item was never found, just append it to the end
-      if(NOT FOUND)
-        append_to_list(NEW_LIST ${ITEM})
-      endif(NOT FOUND)
-    endforeach(ITEM)
-    # Replace the old list with the new list
-    set(${LIST} ${NEW_LIST})
-  endif(CMAKE244_OR_BETTER)
-endmacro(sort_list)
-
-###############################################################################
-# read_from_file(<filename> <regex> <output variable>)
-#
-# A macro to handle reading specific lines from a file, uses file(STRINGS) if
-#   using CMake 2.6.x or better, otherwise we read in the entire file and
-#   perform a string(REGEX MATCH) on each line of the file instead.  This
-#   macro can also be used to read in all the lines of a file if REGEX is set
-#   to "".
-###############################################################################
-macro(read_from_file FILE REGEX STRINGS)
-  if(CMAKE26_OR_BETTER)
-    # For CMake 2.6.x or better, we can just use the STRINGS sub-command to get the lines that match the given regular expression (if one is given, otherwise get all lines)
-    if(REGEX STREQUAL "")
-      file(STRINGS ${FILE} RESULT)
-    else(REGEX STREQUAL "")
-      file(STRINGS ${FILE} RESULT REGEX ${REGEX})
-    endif(REGEX STREQUAL "")
-  else(CMAKE26_OR_BETTER)
-    # For CMake 2.4.x, we need to do this manually, firstly we read the file in
-    execute_process(COMMAND ${CMAKE_COMMAND} -DFILE:STRING=${FILE} -P ${Anope_SOURCE_DIR}/ReadFile.cmake ERROR_VARIABLE ALL_STRINGS)
-    # Next we replace all newlines with semicolons
-    string(REGEX REPLACE "\n" ";" ALL_STRINGS ${ALL_STRINGS})
-    if(REGEX STREQUAL "")
-      # For no regular expression, just set the result to all the lines
-      set(RESULT ${ALL_STRINGS})
-    else(REGEX STREQUAL "")
-      # Clear the result list
-      set(RESULT)
-      # Iterate through all the lines of the file
-      foreach(STRING ${ALL_STRINGS})
-        # Check for a match against the given regular expression
-        string(REGEX MATCH ${REGEX} STRING_MATCH ${STRING})
-        # If we had a match, append the match to the list
-        if(STRING_MATCH)
-          append_to_list(RESULT ${STRING})
-        endif(STRING_MATCH)
-      endforeach(STRING)
-    endif(REGEX STREQUAL "")
-  endif(CMAKE26_OR_BETTER)
-  # Set the given STRINGS variable to the result
-  set(${STRINGS} ${RESULT})
-endmacro(read_from_file)
-
-###############################################################################
-# extract_include_filename(<line> <output variable> [<optional output variable of quote type>])
-#
-# This macro will take a #include line and extract the filename.
-###############################################################################
-macro(extract_include_filename INCLUDE FILENAME)
-  # Strip the leading and trailing spaces from the include line
-  strip_string(${INCLUDE} INCLUDE_STRIPPED)
-  # Make sure to only do the following if there is a string
-  if(INCLUDE_STRIPPED STREQUAL "")
-    set(FILE "")
-  else(INCLUDE_STRIPPED STREQUAL "")
-    # Extract the filename including the quotes or angle brackets
-    string(REGEX REPLACE "^.*([\"<].*[\">]).*$" "\\1" FILE "${INCLUDE_STRIPPED}")
-    # If an optional 3rd argument is given, we'll store if the quote style was quoted or angle bracketed
-    if(${ARGC} GREATER 2)
-      string(SUBSTRING ${FILE} 0 1 QUOTE)
-      if(QUOTE STREQUAL "<")
-        set(${ARGV2} "angle brackets")
-      else(QUOTE STREQUAL "<")
-        set(${ARGV2} "quotes")
-      endif(QUOTE STREQUAL "<")
-    endif(${ARGC} GREATER 2)
-    # Now remove the quotes or angle brackets
-    string(REGEX REPLACE "^[\"<](.*)[\">]$" "\\1" FILE "${FILE}")
-  endif(INCLUDE_STRIPPED STREQUAL "")
-  # Set the filename to the the given variable
-  set(${FILENAME} "${FILE}")
-endmacro(extract_include_filename)
-
-###############################################################################
-# find_includes(<source filename> <output variable>)
-#
-# This macro will search through a file for #include lines, regardless of
-#   whitespace, but only returns the lines that are valid for the current
-#   platform CMake is running on.
-###############################################################################
-macro(find_includes SRC INCLUDES)
-  # Read all lines from the file that start with #, regardless of whitespace before the #
-  read_from_file(${SRC} "^[ \t]*#.*$" LINES)
-  # Set that any #include lines found are valid, and create temporary variables for the last found #ifdef/#ifndef
-  set(VALID_LINE TRUE)
-  set(LAST_DEF)
-  set(LAST_CHECK)
-  # Create an empty include list
-  set(INCLUDES_LIST)
-  # Iterate through all the # lines
-  foreach(LINE ${LINES})
-    # Search for #ifdef, #ifndef, #else, #endif, and #include
-    string(REGEX MATCH "^[ \t]*#[ \t]*ifdef[ \t]*.*$" FOUND_IFDEF ${LINE})
-    string(REGEX MATCH "^[ \t]*#[ \t]*ifndef[ \t]*.*$" FOUND_IFNDEF ${LINE})
-    string(REGEX MATCH "^[ \t]*#[ \t]*else.*$" FOUND_ELSE ${LINE})
-    string(REGEX MATCH "^[ \t]*#[ \t]*endif.*$" FOUND_ENDIF ${LINE})
-    string(REGEX MATCH "^[ \t]*#[ \t]*include[ \t]*[\"<].*[\">][\ t]*.*$" FOUND_INCLUDE ${LINE})
-    # If we found a #ifdef on the line, extract the data after the #ifdef and set if the lines after it are valid based on the variables in CMake
-    if(FOUND_IFDEF)
-      # Extract the define
-      string(REGEX REPLACE "^[ \t]*#[ \t]*ifdef[ \t]*(.*)$" "\\1" DEFINE ${LINE})
-      # Replace _WIN32 with WIN32, so we can check if the WIN32 variable of CMake is set instead of _WIN32
-      if(DEFINE STREQUAL "_WIN32")
-        set(DEFINE WIN32)
-      endif(DEFINE STREQUAL "_WIN32")
-      # Set the last define to this one, and set the last check to true, so when #else is encountered, we can do an opposing check
-      set(LAST_DEF ${DEFINE})
-      set(LAST_CHECK TRUE)
-      # If the define is true (it either exists or is a non-false result), the lines following will be checked, otherwise they will be skipped
-      if(${DEFINE})
-        set(VALID_LINE TRUE)
-      else(${DEFINE})
-        set(VALID_LINE FALSE)
-      endif(${DEFINE})
-    else(FOUND_IFDEF)
-      # If we found a #ifndef on the line, the same thing as #ifdef is done, except with the checks in the opposite direction
-      if(FOUND_IFNDEF)
-        # Extract the define
-        string(REGEX REPLACE "^[ \t]*#[ \t]*ifndef[ \t]*(.*)$" "\\1" DEFINE ${LINE})
-        # Replace _WIN32 with WIN32, so we can check if the WIN32 variable of CMake is set instead of _WIN32
-        if(DEFINE STREQUAL "_WIN32")
-          set(DEFINE WIN32)
-        endif(DEFINE STREQUAL "_WIN32")
-        # Set the last define to this one, and set the last check to false, so when #else is encountered, we can do an opposing check
-        set(LAST_DEF ${DEFINE})
-        set(LAST_CHECK FALSE)
-        # If the define is not true (it either doesn't exists or is a false result), the lines following will be checked, otherwise they will be skipped
-        if(${DEFINE})
-          set(VALID_LINE FALSE)
-        else(${DEFINE})
-          set(VALUE_LINE TRUE)
-        endif(${DEFINE})
-      else(FOUND_IFNDEF)
-        # If we found a #else on the line, we check the last define in the opposite direction
-        if(FOUND_ELSE)
-          # When LAST_CHECK is true, we were inside a #ifdef, now act as if we are entering a #ifndef section by doing an opposing check
-          if(LAST_CHECK)
-            if(${LAST_DEF})
-              set(VALID_LINE FALSE)
-            else(${LAST_DEF})
-              set(VALID_LINE TRUE)
-            endif(${LAST_DEF})
-          # When LAST_CHECK is false, we were inside a #ifndef, now act as if we are entering a #ifdef section by doing an opposing check
-          else(LAST_CHECK)
-            if(${LAST_DEF})
-              set(VALID_LINE TRUE)
-            else(${LAST_DEF})
-              set(VALID_LINE FALSE)
-            endif(${LAST_DEF})
-          endif(LAST_CHECK)
-        else(FOUND_ELSE)
-          # If we found a #endif on the line, we'll assume everything following the line is valid until we meet another one of the above lines
-          if(FOUND_ENDIF)
-            set(VALID_LINE TRUE)
-          else(FOUND_ENDIF)
-            # If we found a #include on the line, add the entire line to the list of includes unless the line isn't valid
-            if(FOUND_INCLUDE)
-              if(VALID_LINE)
-                append_to_list(INCLUDES_LIST "${LINE}")
-              endif(VALID_LINE)
-            endif(FOUND_INCLUDE)
-          endif(FOUND_ENDIF)
-        endif(FOUND_ELSE)
-      endif(FOUND_IFNDEF)
-    endif(FOUND_IFDEF)
-  endforeach(LINE)
-  set(${INCLUDES} ${INCLUDES_LIST})
-endmacro(find_includes)
-
-###############################################################################
-# calculate_depends(<source filename> <output variable set to TRUE on fail> [<optional output variable for includes>])
-#
-# This macro is used in most of the src (sub)directories to calculate the
-#   header file dependencies for the given source file.
-###############################################################################
-macro(calculate_depends SRC SKIP)
-  # Temporarily set that we didn't get a 3nd argument before we actually check if we did get one or not
-  set(CHECK_ANGLE_INCLUDES FALSE)
-  # Check for a third argument
-  if(${ARGC} GREATER 2)
-    set(CHECK_ANGLE_INCLUDES TRUE)
-  endif(${ARGC} GREATER 2)
-  # Find all the lines in the given source file that have any form of #include on them, regardless of whitespace, but only if they are valid for the platform we are on
-  find_includes(${SRC} INCLUDES)
-  # Reset the list of headers to empty
-  set(HEADERS)
-  # Reset skip
-  set(${SKIP} FALSE)
-  # Iterate through the strings containing #include (if any)
-  foreach(INCLUDE ${INCLUDES})
-    # Extract the filename from the #include line
-    extract_include_filename(${INCLUDE} FILENAME QUOTE_TYPE)
-    if(QUOTE_TYPE STREQUAL "angle brackets")
-      # The following checks will only be done if there was a request for angle includes to be checked
-      if(CHECK_ANGLE_INCLUDES)
-        # Find the path of the include file
-        if(DEFAULT_INCLUDE_DIRS OR WSDK_PATH OR DEFINED $ENV{VCINSTALLDIR})
-          find_path(FOUND_${FILENAME}_INCLUDE NAMES ${FILENAME} PATHS ${DEFAULT_INCLUDE_DIRS} ${WSDK_PATH}/include $ENV{VCINSTALLDIR}/include ${EXTRA_INCLUDE})
-        else(DEFAULT_INCLUDE_DIRS OR WSDK_PATH OR DEFINED $ENV{VCINSTALLDIR})
-          find_path(FOUND_${FILENAME}_INCLUDE NAMES ${FILENAME} ${EXTRA_INCLUDE})
-        endif(DEFAULT_INCLUDE_DIRS OR WSDK_PATH OR DEFINED $ENV{VCINSTALLDIR})
-        # If the include file was found, add it's path to the list of include paths, but only if it doesn't already exist and isn't in the defaults for the compiler
-        if(FOUND_${FILENAME}_INCLUDE)
-          find_in_list(DEFAULT_INCLUDE_DIRS "${FOUND_${FILENAME}_INCLUDE}" FOUND_IN_DEFAULTS)
-          if(FOUND_IN_DEFAULTS EQUAL -1)
-            find_in_list(${ARGV2} "${FOUND_${FILENAME}_INCLUDE}" FOUND_IN_INCLUDES)
-            if(FOUND_IN_INCLUDES EQUAL -1)
-              append_to_list(${ARGV2} "${FOUND_${FILENAME}_INCLUDE}")
-            endif(FOUND_IN_INCLUDES EQUAL -1)
-          endif(FOUND_IN_DEFAULTS EQUAL -1)
-        else(FOUND_${FILENAME}_INCLUDE)
-          set(${SKIP} TRUE)
-          message("${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(FOUND_${FILENAME}_INCLUDE)
-      endif(CHECK_ANGLE_INCLUDES)
-    endif(QUOTE_TYPE STREQUAL "angle brackets")
-  endforeach(INCLUDE)
-endmacro(calculate_depends)
-
-###############################################################################
-# calculate_libraries(<source filename> <output variable set to TRUE on fail> <output variable for linker flags> <output variable for extra depends>)
-#
-# This macro is used in most of the module (sub)directories to calculate the
-#   library dependencies for the given source file.
-###############################################################################
-macro(calculate_libraries SRC SKIP SRC_LDFLAGS EXTRA_DEPENDS)
-  # Set up a temporary LDFLAGS for this file
-  set(THIS_LDFLAGS "${LDFLAGS}")
-  # Reset extra dependencies
-  set(EXTRA_DEPENDENCIES)
-  # Reset library paths
-  set(LIBRARY_PATHS)
-  # Reset libraries
-  set(LIBRARIES)
-  # Default to not skipping this file
-  set(${SKIP} FALSE)
-  # Check to see if there are any lines matching: /* RequiredLibraries: [something] */
-  read_from_file(${SRC} "/\\\\*[ \t]*RequiredLibraries:[ \t]*.*[ \t]*\\\\*/" REQUIRED_LIBRARIES)
-  # Iterate through those lines
-  foreach(REQUIRED_LIBRARY ${REQUIRED_LIBRARIES})
-    # Strip off the /* RequiredLibraries: and */ from the line
-    string(REGEX REPLACE "/\\*[ \t]*RequiredLibraries:[ \t]*([^ \t]*)[ \t]*\\*/" "\\1" REQUIRED_LIBRARY ${REQUIRED_LIBRARY})
-    # Replace all commas with semicolons
-    string(REGEX REPLACE "," ";" REQUIRED_LIBRARY ${REQUIRED_LIBRARY})
-    # Iterate through the libraries given
-    foreach(LIBRARY ${REQUIRED_LIBRARY})
-      # 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})
-      else(DEFAULT_LIBRARY_DIRS OR WSDK_PATH OR DEFINED $ENV{VCINSTALLDIR})
-        find_library(FOUND_${LIBRARY}_LIBRARY NAMES ${LIBRARY} ${EXTRA_INCLUDE})
-      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
-          append_to_list(LIBRARY_PATHS "${LIBRARY_PATH}")
-          append_to_list(LIBRARIES "${LIBRARY}")
-        endif(MSVC)
-      else(FOUND_${LIBRARY}_LIBRARY)
-        # Skip this file
-        set(${SKIP} TRUE)
-        # In the case of the library not being found, we fatally error so CMake stops trying to generate
-        message("${SRC} needs library ${LIBRARY} but we were unable to locate that library! Check that the library is within the search path of your OS.")
-      endif(FOUND_${LIBRARY}_LIBRARY)
-    endforeach(LIBRARY)
-  endforeach(REQUIRED_LIBRARY)
-  if(NOT ${SKIP})
-    # Remove duplicates from the library paths
-    if(LIBRARY_PATHS)
-      remove_list_duplicates(LIBRARY_PATHS)
-    endif(LIBRARY_PATHS)
-    # Remove diplicates from the libraries
-    if(LIBRARIES)
-      remove_list_duplicates(LIBRARIES)
-    endif(LIBRARIES)
-    # Iterate through library paths and add them to the linker flags
-    foreach(LIBRARY_PATH ${LIBRARY_PATHS})
-      find_in_list(DEFAULT_LIBRARY_DIRS "${LIBRARY_PATH}" FOUND_IN_DEFAULTS)
-      if(FOUND_IN_DEFAULTS EQUAL -1)
-        set(THIS_LDFLAGS "${THIS_LDFLAGS} -L${LIBRARY_PATH}")
-      endif(FOUND_IN_DEFAULTS EQUAL -1)
-    endforeach(LIBRARY_PATH)
-    # Iterate through libraries and add them to the linker flags
-    foreach(LIBRARY ${LIBRARIES})
-      append_to_list(EXTRA_DEPENDENCIES "${LIBRARY}")
-    endforeach(LIBRARY)
-    set(${SRC_LDFLAGS} "${THIS_LDFLAGS}")
-    set(${EXTRA_DEPENDS} "${EXTRA_DEPENDENCIES}")
-  endif(NOT ${SKIP})
-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.
-###############################################################################
-macro(check_functions SRC SUCCESS)
-  # Default to true
-  set(${SUCCESS} TRUE)
-  # Check to see if there are any lines matching: /* RequiredFunctions: [something] */
-  read_from_file(${SRC} "/\\\\*[ \t]*RequiredFunctions:[ \t]*.*[ \t]*\\\\*/" REQUIRED_FUNCTIONS)
-  # Iterate through those lines
-  foreach(REQUIRED_FUNCTION ${REQUIRED_FUNCTIONS})
-    # Strip off the /* RequiredFunctions: and */ from the line
-    string(REGEX REPLACE "/\\*[ \t]*RequiredFunctions:[ \t]*([^ \t]*)[ \t]*\\*/" "\\1" REQUIRED_FUNCTION ${REQUIRED_FUNCTION})
-    # Replace all commas with semicolons
-    string(REGEX REPLACE "," ";" REQUIRED_FUNCTION ${REQUIRED_FUNCTION})
-    # Iterate through the functions given
-    foreach(FUNCTION ${REQUIRED_FUNCTION})
-      # Check if the function exists
-      check_function_exists(${REQUIRED_FUNCTION} HAVE_${REQUIRED_FUNCTION})
-      # If we don't have the function warn the user and set SUCCESS to FALSE
-      if(NOT HAVE_${REQUIRED_FUNCTION})
-        message("${SRC} needs function ${REQUIRED_FUNCTION} but we were unable to locate that function!")
-        set(${SUCCESS} FALSE)
-      endif(NOT HAVE_${REQUIRED_FUNCTION})
-    endforeach(FUNCTION)
-  endforeach(REQUIRED_FUNCTION)
-endmacro(check_functions)
-
-###############################################################################
-# add_to_cpack_ignored_files(<item> [TRUE])
-#
-# A macro to update the environment variable CPACK_IGNORED_FILES which
-#   contains a list of files for CPack to ignore. If the optional 2nd argument
-#   of TRUE is given, periods will be converted to \\. for CPack.
-###############################################################################
-macro(add_to_cpack_ignored_files ITEM)
-  # Temporary copy of the orignal 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)
-    string(REPLACE "." "\\\\." REAL_ITEM ${REAL_ITEM})
-  endif(${ARGC} GREATER 1)
-  # If the environment variable is already defined, just tack the item to the end
-  if(DEFINED ENV{CPACK_IGNORED_FILES})
-    set(ENV{CPACK_IGNORED_FILES} "$ENV{CPACK_IGNORED_FILES};${REAL_ITEM}")
-  # Otherwise set the environment variable to the item
-  else(DEFINED ENV{CPACK_IGNORED_FILES})
-    set(ENV{CPACK_IGNORED_FILES} "${REAL_ITEM}")
-  endif(DEFINED ENV{CPACK_IGNORED_FILES})
-endmacro(add_to_cpack_ignored_files)

cmake/FindGettext.cmake

@@ -1,33 +0,0 @@
-# Find the header files, libs, and executables for gettext
-if(NOT WIN32)
-  find_path(GETTEXT_INCLUDE libintl.h /usr/include /usr/local/include ${EXTRA_INCLUDE})
-  find_library(GETTEXT_LIBRARY intl PATHS /usr/lib /usr/lib64 ${EXTRA_INCLUDE})
-  find_program(GETTEXT_MSGFMT msgfmt PATHS /usr/bin/ /usr/local/bin ${EXTRA_INCLUDE})
-  if(GETTEXT_INCLUDE AND GETTEXT_MSGFMT)
-    set(GETTEXT_FOUND TRUE)
-  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_INCLUDE})
-  find_library(ICONV_LIBRARY libiconv PATHS ${DEFAULT_LIBRARY_DIRS} ${WSDK_PATH}/lib $ENV{VCINSTALLDIR}/lib gettext/lib ${EXTRA_INCLUDE})
-  find_library(MINGWEX_LIBRARY libmingwex PATHS ${DEFAULT_LIBRARY_DIRS} ${WSDK_PATH}/lib $ENV{VCINSTALLDIR}/lib gettext/lib ${EXTRA_INCLUDE})
-  find_library(GCC_LIBRARY libgcc PATHS ${DEFAULT_LIBRARY_DIRS} ${WSDK_PATH}/lib $ENV{VCINSTALLDIR}/lib gettext/lib ${EXTRA_INCLUDE})
-  find_program(GETTEXT_MSGFMT msgfmt PATHS ${DEFAULT_INCLUDE_DIRS} ${WSDK_PATH}/bin $ENV{VCINSTALLDIR}/bin gettext/bin ${EXTRA_INCLUDE})
-  if(GETTEXT_INCLUDE AND GETTEXT_MSGFMT AND ICONV_LIBRARY AND MINGWEX_LIBRARY AND GCC_LIBRARY)
-    set(GETTEXT_FOUND TRUE)
-  endif(GETTEXT_INCLUDE AND GETTEXT_MSGFMT AND ICONV_LIBRARY AND MINGWEX_LIBRARY AND GCC_LIBRARY)
-endif(NOT WIN32)
-
-# If we found everything we need set variables correctly for lang/CMakeLists.txt to use
-if(GETTEXT_FOUND)
-  include_directories("${GETTEXT_INCLUDE}")
-  set(GETTEXT_MSGFMT_EXECUTABLE ${GETTEXT_MSGFMT})
-
-  if(WIN32)
-    set(GETTEXT_LIBRARIES libiconv libintl libmingwex libgcc)
-  else(WIN32)
-    if(GETTEXT_LIBRARY)
-      set(GETTEXT_LIBRARIES ${GETTEXT_LIBRARY})
-    endif(GETTEXT_LIBRARY)
-  endif(WIN32)
-endif(GETTEXT_FOUND)

cmake/NSIS.template.in

@@ -1,825 +0,0 @@
-; CPack install script designed for a nmake build
-
-;--------------------------------
-; You must define these values
-
-  !define VERSION "@CPACK_PACKAGE_VERSION@"
-  !define INST_DIR "@CPACK_TEMPORARY_DIRECTORY@"
-
-;--------------------------------
-;Variables
-
-  Var MUI_TEMP
-  Var STARTMENU_FOLDER
-  Var SV_ALLUSERS
-  Var START_MENU
-  Var DO_NOT_ADD_TO_PATH
-  Var ADD_TO_PATH_ALL_USERS
-  Var ADD_TO_PATH_CURRENT_USER
-  Var INSTALL_DESKTOP
-
-;--------------------------------
-;Include Modern UI
-
-  !include "MUI2.nsh"
-
-  ;Default installation folder
-  InstallDir "$PROGRAMFILES\@CPACK_PACKAGE_INSTALL_DIRECTORY@"
-
-;--------------------------------
-;General
-
-  ;Name and file
-  Name "@CPACK_PACKAGE_NAME@ @CPACK_PACKAGE_VERSION@"
-  OutFile "@CPACK_TOPLEVEL_DIRECTORY@/@CPACK_OUTPUT_FILE_NAME@"
-
-  ;Set compression
-  SetCompressor @CPACK_NSIS_COMPRESSOR@
-
-@CPACK_NSIS_DEFINES@
-
-  !include Sections.nsh
-
-;--- Component support macros: ---
-; The code for the add/remove functionality is from:
-;   http://nsis.sourceforge.net/Add/Remove_Functionality
-; It has been modified slightly and extended to provide
-; inter-component dependencies.
-Var AR_SecFlags
-Var AR_RegFlags
-@CPACK_NSIS_SECTION_SELECTED_VARS@
-
-; Loads the "selected" flag for the section named SecName into the
-; variable VarName.
-!macro LoadSectionSelectedIntoVar SecName VarName
- SectionGetFlags ${${SecName}} $${VarName}
- IntOp $${VarName} $${VarName} & ${SF_SELECTED}  ;Turn off all other bits
-!macroend
-
-; Loads the value of a variable... can we get around this?
-!macro LoadVar VarName
-  IntOp $R0 0 + $${VarName}
-!macroend
-
-; Sets the value of a variable
-!macro StoreVar VarName IntValue
-  IntOp $${VarName} 0 + ${IntValue}
-!macroend
-
-!macro InitSection SecName
-  ;  This macro reads component installed flag from the registry and
-  ;changes checked state of the section on the components page.
-  ;Input: section index constant name specified in Section command.
-
-  ClearErrors
-  ;Reading component status from registry
-  ReadRegDWORD $AR_RegFlags HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_NAME@\Components\${SecName}" "Installed"
-  IfErrors "default_${SecName}"
-    ;Status will stay default if registry value not found
-    ;(component was never installed)
-  IntOp $AR_RegFlags $AR_RegFlags & ${SF_SELECTED} ;Turn off all other bits
-  SectionGetFlags ${${SecName}} $AR_SecFlags  ;Reading default section flags
-  IntOp $AR_SecFlags $AR_SecFlags & 0xFFFE  ;Turn lowest (enabled) bit off
-  IntOp $AR_SecFlags $AR_RegFlags | $AR_SecFlags      ;Change lowest bit
-
-  ; Note whether this component was installed before
-  !insertmacro StoreVar ${SecName}_was_installed $AR_RegFlags
-  IntOp $R0 $AR_RegFlags & $AR_RegFlags
-
-  ;Writing modified flags
-  SectionSetFlags ${${SecName}} $AR_SecFlags
-
- "default_${SecName}:"
- !insertmacro LoadSectionSelectedIntoVar ${SecName} ${SecName}_selected
-!macroend
-
-!macro FinishSection SecName
-  ;  This macro reads section flag set by user and removes the section
-  ;if it is not selected.
-  ;Then it writes component installed flag to registry
-  ;Input: section index constant name specified in Section command.
-
-  SectionGetFlags ${${SecName}} $AR_SecFlags  ;Reading section flags
-  ;Checking lowest bit:
-  IntOp $AR_SecFlags $AR_SecFlags & ${SF_SELECTED}
-  IntCmp $AR_SecFlags 1 "leave_${SecName}"
-    ;Section is not selected:
-    ;Calling Section uninstall macro and writing zero installed flag
-    !insertmacro "Remove_${${SecName}}"
-    WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_NAME@\Components\${SecName}" \
-  "Installed" 0
-    Goto "exit_${SecName}"
-
- "leave_${SecName}:"
-    ;Section is selected:
-    WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_NAME@\Components\${SecName}" \
-  "Installed" 1
-
- "exit_${SecName}:"
-!macroend
-
-!macro RemoveSection SecName
-  ;  This macro is used to call section's Remove_... macro
-  ;from the uninstaller.
-  ;Input: section index constant name specified in Section command.
-
-  !insertmacro "Remove_${${SecName}}"
-!macroend
-
-; Determine whether the selection of SecName changed
-!macro MaybeSelectionChanged SecName
-  !insertmacro LoadVar ${SecName}_selected
-  SectionGetFlags ${${SecName}} $R1
-  IntOp $R1 $R1 & ${SF_SELECTED} ;Turn off all other bits
-
-  ; See if the status has changed:
-  IntCmp $R0 $R1 "${SecName}_unchanged"
-  !insertmacro LoadSectionSelectedIntoVar ${SecName} ${SecName}_selected
-
-  IntCmp $R1 ${SF_SELECTED} "${SecName}_was_selected"
-  !insertmacro "Deselect_required_by_${SecName}"
-  goto "${SecName}_unchanged"
-
-  "${SecName}_was_selected:"
-  !insertmacro "Select_${SecName}_depends"
-
-  "${SecName}_unchanged:"
-!macroend
-;--- End of Add/Remove macros ---
-
-;--------------------------------
-;Interface Settings
-
-  !define MUI_ABORTWARNING
-
-;----------------------------------------
-; based upon a script of "Written by KiCHiK 2003-01-18 05:57:02"
-;----------------------------------------
-!verbose 3
-!include "WinMessages.NSH"
-!verbose 4
-
-;====================================================
-; get_NT_environment
-;     Returns: the selected environment
-;     Output : head of the stack
-;====================================================
-!macro select_NT_profile UN
-Function ${UN}select_NT_profile
-   StrCmp $ADD_TO_PATH_ALL_USERS "1" 0 environment_single
-      DetailPrint "Selected environment for all users"
-      Push "all"
-      Return
-   environment_single:
-      DetailPrint "Selected environment for current user only."
-      Push "current"
-      Return
-FunctionEnd
-!macroend
-!insertmacro select_NT_profile ""
-!insertmacro select_NT_profile "un."
-;----------------------------------------------------
-!define NT_current_env 'HKCU "Environment"'
-!define NT_all_env     'HKLM "SYSTEM\CurrentControlSet\Control\Session Manager\Environment"'
-
-!ifndef WriteEnvStr_RegKey
-  !ifdef ALL_USERS
-    !define WriteEnvStr_RegKey \
-       'HKLM "SYSTEM\CurrentControlSet\Control\Session Manager\Environment"'
-  !else
-    !define WriteEnvStr_RegKey 'HKCU "Environment"'
-  !endif
-!endif
-
-; AddToPath - Adds the given dir to the search path.
-;        Input - head of the stack
-;        Note - Win9x systems requires reboot
-
-Function AddToPath
-  Exch $0
-  Push $1
-  Push $2
-  Push $3
-
-  # don't add if the path doesn't exist
-  IfFileExists "$0\*.*" "" AddToPath_done
-
-  ReadEnvStr $1 PATH
-  Push "$1;"
-  Push "$0;"
-  Call StrStr
-  Pop $2
-  StrCmp $2 "" "" AddToPath_done
-  Push "$1;"
-  Push "$0\;"
-  Call StrStr
-  Pop $2
-  StrCmp $2 "" "" AddToPath_done
-  GetFullPathName /SHORT $3 $0
-  Push "$1;"
-  Push "$3;"
-  Call StrStr
-  Pop $2
-  StrCmp $2 "" "" AddToPath_done
-  Push "$1;"
-  Push "$3\;"
-  Call StrStr
-  Pop $2
-  StrCmp $2 "" "" AddToPath_done
-
-  Call IsNT
-  Pop $1
-  StrCmp $1 1 AddToPath_NT
-    ; Not on NT
-    StrCpy $1 $WINDIR 2
-    FileOpen $1 "$1\autoexec.bat" a
-    FileSeek $1 -1 END
-    FileReadByte $1 $2
-    IntCmp $2 26 0 +2 +2 # DOS EOF
-      FileSeek $1 -1 END # write over EOF
-    FileWrite $1 "$\r$\nSET PATH=%PATH%;$3$\r$\n"
-    FileClose $1
-    SetRebootFlag true
-    Goto AddToPath_done
-
-  AddToPath_NT:
-    ReadRegStr $1 ${WriteEnvStr_RegKey} "PATH"
-    StrCmp $1 "" AddToPath_NTdoIt
-      Push $1
-      Call Trim
-      Pop $1
-      StrCpy $0 "$1;$0"
-    AddToPath_NTdoIt:
-      WriteRegExpandStr ${WriteEnvStr_RegKey} "PATH" $0
-      SendMessage ${HWND_BROADCAST} ${WM_WININICHANGE} 0 "STR:Environment" /TIMEOUT=5000
-
-  AddToPath_done:
-    Pop $3
-    Pop $2
-    Pop $1
-    Pop $0
-FunctionEnd
-
-
-; RemoveFromPath - Remove a given dir from the path
-;     Input: head of the stack
-
-Function un.RemoveFromPath
-  Exch $0
-  Push $1
-  Push $2
-  Push $3
-  Push $4
-  Push $5
-  Push $6
-
-  IntFmt $6 "%c" 26 # DOS EOF
-
-  Call un.IsNT
-  Pop $1
-  StrCmp $1 1 unRemoveFromPath_NT
-    ; Not on NT
-    StrCpy $1 $WINDIR 2
-    FileOpen $1 "$1\autoexec.bat" r
-    GetTempFileName $4
-    FileOpen $2 $4 w
-    GetFullPathName /SHORT $0 $0
-    StrCpy $0 "SET PATH=%PATH%;$0"
-    Goto unRemoveFromPath_dosLoop
-
-    unRemoveFromPath_dosLoop:
-      FileRead $1 $3
-      StrCpy $5 $3 1 -1 # read last char
-      StrCmp $5 $6 0 +2 # if DOS EOF
-        StrCpy $3 $3 -1 # remove DOS EOF so we can compare
-      StrCmp $3 "$0$\r$\n" unRemoveFromPath_dosLoopRemoveLine
-      StrCmp $3 "$0$\n" unRemoveFromPath_dosLoopRemoveLine
-      StrCmp $3 "$0" unRemoveFromPath_dosLoopRemoveLine
-      StrCmp $3 "" unRemoveFromPath_dosLoopEnd
-      FileWrite $2 $3
-      Goto unRemoveFromPath_dosLoop
-      unRemoveFromPath_dosLoopRemoveLine:
-        SetRebootFlag true
-        Goto unRemoveFromPath_dosLoop
-
-    unRemoveFromPath_dosLoopEnd:
-      FileClose $2
-      FileClose $1
-      StrCpy $1 $WINDIR 2
-      Delete "$1\autoexec.bat"
-      CopyFiles /SILENT $4 "$1\autoexec.bat"
-      Delete $4
-      Goto unRemoveFromPath_done
-
-  unRemoveFromPath_NT:
-    ReadRegStr $1 ${WriteEnvStr_RegKey} "PATH"
-    StrCpy $5 $1 1 -1 # copy last char
-    StrCmp $5 ";" +2 # if last char != ;
-      StrCpy $1 "$1;" # append ;
-    Push $1
-    Push "$0;"
-    Call un.StrStr ; Find `$0;` in $1
-    Pop $2 ; pos of our dir
-    StrCmp $2 "" unRemoveFromPath_done
-      ; else, it is in path
-      # $0 - path to add
-      # $1 - path var
-      StrLen $3 "$0;"
-      StrLen $4 $2
-      StrCpy $5 $1 -$4 # $5 is now the part before the path to remove
-      StrCpy $6 $2 "" $3 # $6 is now the part after the path to remove
-      StrCpy $3 $5$6
-
-      StrCpy $5 $3 1 -1 # copy last char
-      StrCmp $5 ";" 0 +2 # if last char == ;
-        StrCpy $3 $3 -1 # remove last char
-
-      WriteRegExpandStr ${WriteEnvStr_RegKey} "PATH" $3
-      SendMessage ${HWND_BROADCAST} ${WM_WININICHANGE} 0 "STR:Environment" /TIMEOUT=5000
-
-  unRemoveFromPath_done:
-    Pop $6
-    Pop $5
-    Pop $4
-    Pop $3
-    Pop $2
-    Pop $1
-    Pop $0
-FunctionEnd
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; Uninstall sutff
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-###########################################
-#            Utility Functions            #
-###########################################
-
-;====================================================
-; IsNT - Returns 1 if the current system is NT, 0
-;        otherwise.
-;     Output: head of the stack
-;====================================================
-; IsNT
-; no input
-; output, top of the stack = 1 if NT or 0 if not
-;
-; Usage:
-;   Call IsNT
-;   Pop $R0
-;  ($R0 at this point is 1 or 0)
-
-!macro IsNT un
-Function ${un}IsNT
-  Push $0
-  ReadRegStr $0 HKLM "SOFTWARE\Microsoft\Windows NT\CurrentVersion" CurrentVersion
-  StrCmp $0 "" 0 IsNT_yes
-  ; we are not NT.
-  Pop $0
-  Push 0
-  Return
-
-  IsNT_yes:
-    ; NT!!!
-    Pop $0
-    Push 1
-FunctionEnd
-!macroend
-!insertmacro IsNT ""
-!insertmacro IsNT "un."
-
-; StrStr
-; input, top of stack = string to search for
-;        top of stack-1 = string to search in
-; output, top of stack (replaces with the portion of the string remaining)
-; modifies no other variables.
-;
-; Usage:
-;   Push "this is a long ass string"
-;   Push "ass"
-;   Call StrStr
-;   Pop $R0
-;  ($R0 at this point is "ass string")
-
-!macro StrStr un
-Function ${un}StrStr
-Exch $R1 ; st=haystack,old$R1, $R1=needle
-  Exch    ; st=old$R1,haystack
-  Exch $R2 ; st=old$R1,old$R2, $R2=haystack
-  Push $R3
-  Push $R4
-  Push $R5
-  StrLen $R3 $R1
-  StrCpy $R4 0
-  ; $R1=needle
-  ; $R2=haystack
-  ; $R3=len(needle)
-  ; $R4=cnt
-  ; $R5=tmp
-  loop:
-    StrCpy $R5 $R2 $R3 $R4
-    StrCmp $R5 $R1 done
-    StrCmp $R5 "" done
-    IntOp $R4 $R4 + 1
-    Goto loop
-done:
-  StrCpy $R1 $R2 "" $R4
-  Pop $R5
-  Pop $R4
-  Pop $R3
-  Pop $R2
-  Exch $R1
-FunctionEnd
-!macroend
-!insertmacro StrStr ""
-!insertmacro StrStr "un."
-
-Function Trim ; Added by Pelaca
-	Exch $R1
-	Push $R2
-Loop:
-	StrCpy $R2 "$R1" 1 -1
-	StrCmp "$R2" " " RTrim
-	StrCmp "$R2" "$\n" RTrim
-	StrCmp "$R2" "$\r" RTrim
-	StrCmp "$R2" ";" RTrim
-	GoTo Done
-RTrim:
-	StrCpy $R1 "$R1" -1
-	Goto Loop
-Done:
-	Pop $R2
-	Exch $R1
-FunctionEnd
-
-Function ConditionalAddToRegisty
-  Pop $0
-  Pop $1
-  StrCmp "$0" "" ConditionalAddToRegisty_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:
-FunctionEnd
-
-;--------------------------------
-
-!ifdef CPACK_USES_DOWNLOAD
-Function DownloadFile
-    IfFileExists $INSTDIR\* +2
-    CreateDirectory $INSTDIR
-    Pop $0
-
-    ; Skip if already downloaded
-    IfFileExists $INSTDIR\$0 0 +2
-    Return
-
-    StrCpy $1 "@CPACK_DOWNLOAD_SITE@"
-
-  try_again:
-    NSISdl::download "$1/$0" "$INSTDIR\$0"
-
-    Pop $1
-    StrCmp $1 "success" success
-    StrCmp $1 "Cancelled" cancel
-    MessageBox MB_OK "Download failed: $1"
-  cancel:
-    Return
-  success:
-FunctionEnd
-!endif
-
-;--------------------------------
-; Installation types
-@CPACK_NSIS_INSTALLATION_TYPES@
-
-;--------------------------------
-; Component sections
-@CPACK_NSIS_COMPONENT_SECTIONS@
-
-;--------------------------------
-; Define some macro setting for the gui
-@CPACK_NSIS_INSTALLER_MUI_ICON_CODE@
-@CPACK_NSIS_INSTALLER_ICON_CODE@
-@CPACK_NSIS_INSTALLER_MUI_COMPONENTS_DESC@
-
-;--------------------------------
-;Pages
-  !define MUI_LANGDLL_REGISTRY_ROOT "SHCTX"
-  !define MUI_LANGDLL_REGISTRY_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_NAME@"
-  !define MUI_LANGDLL_REGISTRY_VALUENAME "NSIS:Language"
-
-  !insertmacro MUI_PAGE_WELCOME
-
-  !insertmacro MUI_PAGE_LICENSE "@CPACK_RESOURCE_FILE_LICENSE@"
-  !insertmacro MUI_PAGE_DIRECTORY
-
-  ;Start Menu Folder Page Configuration
-  !define MUI_STARTMENUPAGE_REGISTRY_ROOT "SHCTX"
-  !define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\@CPACK_PACKAGE_VENDOR@\@CPACK_PACKAGE_INSTALL_REGISTRY_KEY@"
-  !define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "Start Menu Folder"
-  !insertmacro MUI_PAGE_STARTMENU Application $STARTMENU_FOLDER
-
-  @CPACK_NSIS_PAGE_COMPONENTS@
-
-  !insertmacro MUI_PAGE_INSTFILES
-
-  !define MUI_FINISHPAGE_SHOWREADME "$INSTDIR\docs\README.txt"
-  !insertmacro MUI_PAGE_FINISH
-
-  !insertmacro MUI_UNPAGE_CONFIRM
-  !insertmacro MUI_UNPAGE_INSTFILES
-
-;--------------------------------
-;Languages
-
-  !insertmacro MUI_LANGUAGE "Dutch"
-  !insertmacro MUI_LANGUAGE "English"
-  !insertmacro MUI_LANGUAGE "French"
-  !insertmacro MUI_LANGUAGE "German"
-  !insertmacro MUI_LANGUAGE "Italian"
-  !insertmacro MUI_LANGUAGE "Portuguese"
-  !insertmacro MUI_LANGUAGE "Spanish"
-
-;--------------------------------
-;Installer Sections
-
-Section "-Core installation"
-  ;Use the entire tree produced by the INSTALL target.  Keep the
-  ;list of directories here in sync with the RMDir commands below.
-  SetOutPath "$INSTDIR"
-  @CPACK_NSIS_FULL_INSTALL@
-
-  ;Store installation folder
-  WriteRegStr SHCTX "Software\@CPACK_PACKAGE_VENDOR@\@CPACK_PACKAGE_INSTALL_REGISTRY_KEY@" "" $INSTDIR
-
-  ;Create uninstaller
-  WriteUninstaller "$INSTDIR\Uninstall.exe"
-  Push "DisplayName"
-  Push "@CPACK_NSIS_DISPLAY_NAME@"
-  Call ConditionalAddToRegisty
-  Push "DisplayVersion"
-  Push "@CPACK_PACKAGE_VERSION@"
-  Call ConditionalAddToRegisty
-  Push "Publisher"
-  Push "@CPACK_PACKAGE_VENDOR@"
-  Call ConditionalAddToRegisty
-  Push "UninstallString"
-  Push "$INSTDIR\Uninstall.exe"
-  Call ConditionalAddToRegisty
-  Push "NoRepair"
-  Push "1"
-  Call ConditionalAddToRegisty
-
-  !ifdef CPACK_NSIS_ADD_REMOVE
-  ;Create add/remove functionality
-  Push "ModifyPath"
-  Push "$INSTDIR\AddRemove.exe"
-  Call ConditionalAddToRegisty
-  !else
-  Push "NoModify"
-  Push "1"
-  Call ConditionalAddToRegisty
-  !endif
-
-  ; Optional registration
-  Push "DisplayIcon"
-  Push "$INSTDIR\@CPACK_NSIS_INSTALLED_ICON_NAME@"
-  Call ConditionalAddToRegisty
-  Push "HelpLink"
-  Push "@CPACK_NSIS_HELP_LINK@"
-  Call ConditionalAddToRegisty
-  Push "URLInfoAbout"
-  Push "@CPACK_NSIS_URL_INFO_ABOUT@"
-  Call ConditionalAddToRegisty
-  Push "Contact"
-  Push "@CPACK_NSIS_CONTACT@"
-  Call ConditionalAddToRegisty
-  !insertmacro MUI_STARTMENU_WRITE_BEGIN Application
-
-  ;Create shortcuts
-  CreateDirectory "$SMPROGRAMS\$STARTMENU_FOLDER"
-@CPACK_NSIS_CREATE_ICONS@
-@CPACK_NSIS_CREATE_ICONS_EXTRA@
-  CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Uninstall.lnk" "$INSTDIR\Uninstall.exe"
-
-  ; Write special uninstall registry entries
-  Push "StartMenu"
-  Push "$STARTMENU_FOLDER"
-  Call ConditionalAddToRegisty
-  Push "DoNotAddToPath"
-  Push "$DO_NOT_ADD_TO_PATH"
-  Call ConditionalAddToRegisty
-  Push "AddToPathAllUsers"
-  Push "$ADD_TO_PATH_ALL_USERS"
-  Call ConditionalAddToRegisty
-  Push "AddToPathCurrentUser"
-  Push "$ADD_TO_PATH_CURRENT_USER"
-  Call ConditionalAddToRegisty
-  Push "InstallToDesktop"
-  Push "$INSTALL_DESKTOP"
-  Call ConditionalAddToRegisty
-
-@CPACK_NSIS_EXTRA_INSTALL_COMMANDS@
-
-  !insertmacro MUI_STARTMENU_WRITE_END
-
-SectionEnd
-
-;--------------------------------
-; determine admin versus local install
-Function un.onInit
-
-  ClearErrors
-  UserInfo::GetName
-  IfErrors noLM
-  Pop $0
-  UserInfo::GetAccountType
-  Pop $1
-  StrCmp $1 "Admin" 0 +3
-    SetShellVarContext all
-    ;MessageBox MB_OK 'User "$0" is in the Admin group'
-    Goto done
-  StrCmp $1 "Power" 0 +3
-    SetShellVarContext all
-    ;MessageBox MB_OK 'User "$0" is in the Power Users group'
-    Goto done
-
-  noLM:
-    ;Get installation folder from registry if available
-
-  done:
-
-  !insertmacro MUI_UNGETLANGUAGE
-FunctionEnd
-
-;--- Add/Remove callback functions: ---
-!macro SectionList MacroName
-  ;This macro used to perform operation on multiple sections.
-  ;List all of your components in following manner here.
-@CPACK_NSIS_COMPONENT_SECTION_LIST@
-!macroend
-
-Section -FinishComponents
-  ;Removes unselected components and writes component status to registry
-  !insertmacro SectionList "FinishSection"
-
-!ifdef CPACK_NSIS_ADD_REMOVE
-  ; Get the name of the installer executable
-  System::Call 'kernel32::GetModuleFileNameA(i 0, t .R0, i 1024) i r1'
-  StrCpy $R3 $R0
-
-  ; Strip off the last 13 characters, to see if we have AddRemove.exe
-  StrLen $R1 $R0
-  IntOp $R1 $R0 - 13
-  StrCpy $R2 $R0 13 $R1
-  StrCmp $R2 "AddRemove.exe" addremove_installed
-
-  ; We're not running AddRemove.exe, so install it
-  CopyFiles $R3 $INSTDIR\AddRemove.exe
-
-  addremove_installed:
-!endif
-SectionEnd
-;--- End of Add/Remove callback functions ---
-
-;--------------------------------
-; Component dependencies
-Function .onSelChange
-  !insertmacro SectionList MaybeSelectionChanged
-FunctionEnd
-
-;--------------------------------
-;Uninstaller Section
-
-Section "Uninstall"
-  ReadRegStr $START_MENU SHCTX \
-   "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_NAME@" "StartMenu"
-  ;MessageBox MB_OK "Start menu is in: $START_MENU"
-  ReadRegStr $DO_NOT_ADD_TO_PATH SHCTX \
-    "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_NAME@" "DoNotAddToPath"
-  ReadRegStr $ADD_TO_PATH_ALL_USERS SHCTX \
-    "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_NAME@" "AddToPathAllUsers"
-  ReadRegStr $ADD_TO_PATH_CURRENT_USER SHCTX \
-    "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_NAME@" "AddToPathCurrentUser"
-  ;MessageBox MB_OK "Add to path: $DO_NOT_ADD_TO_PATH all users: $ADD_TO_PATH_ALL_USERS"
-  ReadRegStr $INSTALL_DESKTOP SHCTX \
-    "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_NAME@" "InstallToDesktop"
-  ;MessageBox MB_OK "Install to desktop: $INSTALL_DESKTOP "
-
-@CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS@
-
-  ;Remove files we installed.
-  ;Keep the list of directories here in sync with the File commands above.
-@CPACK_NSIS_DELETE_FILES@
-@CPACK_NSIS_DELETE_DIRECTORIES@
-
-!ifdef CPACK_NSIS_ADD_REMOVE
-  ;Remove the add/remove program
-  Delete "$INSTDIR\AddRemove.exe"
-!endif
-
-  ;Remove the uninstaller itself.
-  Delete "$INSTDIR\Uninstall.exe"
-  DeleteRegKey SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_NAME@"
-
-  ;Remove the installation directory if it is empty.
-  RMDir "$INSTDIR"
-
-  ; Remove the registry entries.
-  DeleteRegKey SHCTX "Software\@CPACK_PACKAGE_VENDOR@\@CPACK_PACKAGE_INSTALL_REGISTRY_KEY@"
-
-  ; Removes all optional components
-  !insertmacro SectionList "RemoveSection"
-
-  !insertmacro MUI_STARTMENU_GETFOLDER Application $MUI_TEMP
-
-  Delete "$SMPROGRAMS\$MUI_TEMP\Uninstall.lnk"
-@CPACK_NSIS_DELETE_ICONS@
-@CPACK_NSIS_DELETE_ICONS_EXTRA@
-
-  ;Delete empty start menu parent diretories
-  StrCpy $MUI_TEMP "$SMPROGRAMS\$MUI_TEMP"
-
-  startMenuDeleteLoop:
-    ClearErrors
-    RMDir $MUI_TEMP
-    GetFullPathName $MUI_TEMP "$MUI_TEMP\.."
-
-    IfErrors startMenuDeleteLoopDone
-
-    StrCmp "$MUI_TEMP" "$SMPROGRAMS" startMenuDeleteLoopDone startMenuDeleteLoop
-  startMenuDeleteLoopDone:
-
-  ; If the user changed the shortcut, then untinstall 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
-  StrCpy $MUI_TEMP "$SMPROGRAMS\$MUI_TEMP"
-
-  secondStartMenuDeleteLoop:
-    ClearErrors
-    RMDir $MUI_TEMP
-    GetFullPathName $MUI_TEMP "$MUI_TEMP\.."
-
-    IfErrors secondStartMenuDeleteLoopDone
-
-    StrCmp "$MUI_TEMP" "$SMPROGRAMS" secondStartMenuDeleteLoopDone secondStartMenuDeleteLoop
-  secondStartMenuDeleteLoopDone:
-
-  DeleteRegKey /ifempty SHCTX "Software\@CPACK_PACKAGE_VENDOR@\@CPACK_PACKAGE_INSTALL_REGISTRY_KEY@"
-
-  Push $INSTDIR\bin
-  StrCmp $DO_NOT_ADD_TO_PATH_ "1" doNotRemoveFromPath 0
-    Call un.RemoveFromPath
-  doNotRemoveFromPath:
-SectionEnd
-
-;--------------------------------
-; determine admin versus local install
-; Is install for "AllUsers" or "JustMe"?
-; Default to "JustMe" - set to "AllUsers" if admin or on Win9x
-; This function is used for the very first "custom page" of the installer.
-; This custom page does not show up visibly, but it executes prior to the
-; first visible page and sets up $INSTDIR properly...
-; Choose different default installation folder based on SV_ALLUSERS...
-; "Program Files" for AllUsers, "My Documents" for JustMe...
-
-Function .onInit
-  !insertmacro MUI_LANGDLL_DISPLAY
-  ; Reads components status for registry
-  !insertmacro SectionList "InitSection"
-
-  StrCpy $SV_ALLUSERS "JustMe"
-  StrCpy $INSTDIR "$DOCUMENTS\@CPACK_PACKAGE_INSTALL_DIRECTORY@"
-
-  ClearErrors
-  UserInfo::GetName
-  IfErrors noLM
-  Pop $0
-  UserInfo::GetAccountType
-  Pop $1
-  StrCmp $1 "Admin" 0 +3
-    SetShellVarContext all
-    ;MessageBox MB_OK 'User "$0" is in the Admin group'
-    StrCpy $SV_ALLUSERS "AllUsers"
-    Goto done
-  StrCmp $1 "Power" 0 +3
-    SetShellVarContext all
-    ;MessageBox MB_OK 'User "$0" is in the Power Users group'
-    StrCpy $SV_ALLUSERS "AllUsers"
-    Goto done
-
-  noLM:
-    StrCpy $SV_ALLUSERS "AllUsers"
-    ;Get installation folder from registry if available
-
-  done:
-  StrCmp $SV_ALLUSERS "AllUsers" 0 +2
-    StrCpy $INSTDIR "$PROGRAMFILES\@CPACK_PACKAGE_INSTALL_DIRECTORY@"
-
-FunctionEnd

cmake/ReadFile.cmake

@@ -1,5 +0,0 @@
-# This file is external to the read_from_file macro in Anope.cmake in order to
-# get around a possible memory leak in older versions of CMake.
-
-file(READ "${FILE}" RESULT)
-message("${RESULT}")

cmake/eventfd_test.cpp

@@ -1,8 +0,0 @@
-#include <sys/eventfd.h>
-
-int main()
-{
-	int i = eventfd(0, EFD_NONBLOCK);
-	return i >= 0 ? 1 : 0;
-}
-

data/CMakeLists.txt

@@ -1,6 +1,6 @@
-# Only install example.chk and example.conf from this directory
+# Only install cron.example.sh and anope.example.conf from this directory
 # NOTE: I would've had this just find all files in the directory, but that would include files not needed (like this file)
-set(DATA example.chk botserv.example.conf example.conf hostserv.example.conf modules.example.conf operserv.example.conf chanserv.example.conf global.example.conf memoserv.example.conf nickserv.example.conf)
+set(DATA cron.example.sh anope.example.conf botserv.example.conf hostserv.example.conf modules.example.conf operserv.example.conf chanserv.example.conf global.example.conf memoserv.example.conf nickserv.example.conf chanstats.example.conf)
 install(FILES ${DATA}
-  DESTINATION data
+  DESTINATION ${CONF_DIR}
 )

data/botserv.example.conf

@@ -3,12 +3,23 @@
  */
 
 /*
- * First, create the service.
+ * First, create the service. If you do not want to have a 'BotServ', but do want the ability to have
+ * ChanServ assigned to channels for the use of fantasy commands, you may delete the below 'service' block.
+ *
+ * Note that deleting a 'service' block for a pseudoclient that is already online will not remove the
+ * client, the client becomes no different from a normal service bot, so you will have to use botserv/bot
+ * to manually delete the client.
+ *
+ * You may then want to map some of the below commands to other services, like placing botserv/bot on
+ * OperServ so you can delete the below client, and mapping assign and unassign to ChanServ so users are
+ * able to control whether or not ChanServ is in the channel. You may also want to map botserv/set/nobot
+ * to OperServ so you can restrict who can assign the other core service clients.
  */
 service
 {
 	/*
-	 * The name of the BotServ client
+	 * The name of the BotServ client.
+	 * If you change this value, you probably want to change the client directive in the configuration for the botserv module too.
 	 */
 	nick = "BotServ"
 
@@ -20,12 +31,12 @@ service
 	/*
 	 * The hostname of the BotServ client.
 	 */
-	host = "services.host"
+	host = "${services.host}"
 
 	/*
 	 * The realname of the BotServ client.
 	 */
-	gecos = "Bot Service"
+	real = "Bot Service"
 
 	/*
 	 * The modes this client should use.
@@ -34,8 +45,8 @@ service
 	 * These modes are very IRCd specific. If left commented, sane defaults
 	 * are used based on what protocol module you have loaded.
 	 *
-	 * Note that setting this option incorrectly could potentially BREAK some if
-	 * not all usefulness of the client. We will not support you if this client is
+	 * Note that setting this option incorrectly could potentially BREAK some, if
+	 * not all, usefulness of the client. We will not support you if this client is
 	 * unable to do certain things if this option is enabled.
 	 */
 	#modes = "+o"
@@ -45,9 +56,20 @@ service
 	 * of log channels this is not very useful, as the service will just idle in the
 	 * specified channels, and will not accept any types of commands.
 	 *
-	 * Prefixes may be given to the channels in the form of mode character or prefix symbol.
+	 * Prefixes may be given to the channels in the form of mode characters or prefix symbols.
 	 */
 	#channels = "@#services,#mychan"
+
+	/*
+	 * The server alias that can be used to securely message this service. If
+	 * your IRC server does not have an alias for this service you can set this
+	 * to an empty string to tell users to use /msg instead.
+	 *
+	 * This setting is ignored when options:servicealias is disabled.
+	 *
+	 * Defaults to the nick of the service if not set.
+	 */
+	#alias = "BS"
 }
 
 /*
@@ -55,17 +77,16 @@ service
  *
  * Provides essential functionality for BotServ.
  */
-module { name = "botserv" }
-
-/*
- * Configuration for BotServ provided by bs_main.
- */
-botserv
+module
 {
+	name = "botserv"
+
 	/*
 	 * The name of the client that should be BotServ.
+	 *
+	 * This directive is optional.
 	 */
-	name = "BotServ"
+	client = "BotServ"
 
 	/*
 	 * The default bot options for newly registered channels. Note that changing these options
@@ -81,7 +102,7 @@ botserv
 	 *
 	 * This directive is optional, if left blank, there will be no defaults.
 	 */
-	defaults="greet fantasy"
+	defaults = "greet fantasy"
 
 	/*
 	 * The minimum number of users there must be in a channel before the bot joins it. The best
@@ -90,19 +111,6 @@ botserv
 	 */
 	minusers = 1
 
-	/*
-	 * The maximum number of entries a single bad words list can have. Setting it too high can
-	 * reduce performance slightly.
-	 */
-	badwordsmax = 32
-
-	/*
-	 * The amount of time that data for a user is valid in BotServ. If the data exceeds this time,
-	 * it is reset or deleted depending on the case. Do not set it too high, otherwise your
-	 * resources will be slightly affected.
-	 */
-	keepdata = 10m
-
 	/*
 	 * The bots are currently not affected by any modes or bans when they try to join a channel.
 	 * But some people may want to make it act like a real bot, that is, for example, remove all
@@ -115,26 +123,17 @@ botserv
 	#smartjoin = yes
 
 	/*
-	 * If set, the bots will use a kick reason that does not state the word when it is kicking.
-	 * This is especially useful if you have young people on your network.
+	 * Modes to set on service bots when they join channels, comment this out for no modes
 	 *
 	 * This directive is optional.
 	 */
-	gentlebadwordreason = yes
+	botmodes = "ao"
 
 	/*
-	 * If set, BotServ will use case sensitive checking for badwords.
-	 *
-	 * This directive is optional.
+	 * User modes to set on service bots. Read the comment about the service:modes directive
+	 * on why this can be a bad idea to set.
 	 */
-	#casesensitive = yes
-
-	/*
-	 * Defines the prefixs for fantasy commands in channels. One of these characters will have to be prepended
-	 * to all fantasy commands. If you choose "!", for example, fantasy commands will be "!kick",
-	 * "!op", etc. This directive is optional, if left out, the default fantasy character is "!".
-	 */
-	#fantasycharacter = "!."
+	#botumodes = "i"
 }
 
 /*
@@ -148,28 +147,33 @@ botserv
  * Sane defaults are provided below that do not need to be edited unless you wish to change the default behavior.
  */
 
-/* Give it a help command */
-command { service = "BotServ"; name = "HELP"; command = "generic/help"; }
+/* Give it a help command. */
+command { service = "BotServ"; name = "HELP"; command = "generic/help" }
 
 /*
  * bs_assign
  *
- * Provides the commands botserv/assign and botserv/unassign.
+ * Provides the commands:
+ *   botserv/assign - Used to assign BotServ bots to channels
+ *   botserv/unassign - Used to unassign BotServ bots
+ *   botserv/set/nobot - Used to prohibit channels from being assigned BotServ bots.
  *
  * Used for assigning and unassigning bots to channels.
  */
 module { name = "bs_assign" }
-command { service = "BotServ"; name = "ASSIGN"; command = "botserv/assign"; }
-command { service = "BotServ"; name = "UNASSIGN"; command = "botserv/unassign"; }
+command { service = "BotServ"; name = "ASSIGN"; command = "botserv/assign" }
+command { service = "BotServ"; name = "UNASSIGN"; command = "botserv/unassign" }
+command { service = "BotServ"; name = "SET NOBOT"; command = "botserv/set/nobot"; permission = "botserv/set/nobot" }
 
 /*
  * bs_autoassign
  *
  * Allows service bots to be automatically assigned to channels upon registration.
  */
-#module { name = "bs_autoassign" }
-bs_autoassign
+#module
 {
+	name = "bs_autoassign"
+
 	/*
 	 * Automatically assign ChanServ to channels upon registration.
 	 */
@@ -183,8 +187,23 @@ bs_autoassign
  *
  * Used for controlling the channel badword list.
  */
-module { name = "bs_badwords" }
-command { service = "BotServ"; name = "BADWORDS"; command = "botserv/badwords"; }
+module
+{
+	name = "bs_badwords"
+
+	/*
+	 * The maximum number of entries a single bad words list can have.
+	 */
+	badwordsmax = 50
+
+	/*
+	 * If set, BotServ will use case sensitive checking for badwords.
+	 *
+	 * This directive is optional.
+	 */
+	#casesensitive = yes
+}
+command { service = "BotServ"; name = "BADWORDS"; command = "botserv/badwords" }
 
 /*
  * bs_bot
@@ -194,7 +213,7 @@ command { service = "BotServ"; name = "BADWORDS"; command = "botserv/badwords";
  * Used for administrating BotServ bots.
  */
 module { name = "bs_bot" }
-command { service = "BotServ"; name = "BOT"; command = "botserv/bot"; }
+command { service = "BotServ"; name = "BOT"; command = "botserv/bot"; permission = "botserv/bot" }
 
 /*
  * bs_botlist
@@ -204,7 +223,7 @@ command { service = "BotServ"; name = "BOT"; command = "botserv/bot"; }
  * Used for listing all available bots.
  */
 module { name = "bs_botlist" }
-command { service = "BotServ"; name = "BOTLIST"; command = "botserv/botlist"; }
+command { service = "BotServ"; name = "BOTLIST"; command = "botserv/botlist" }
 
 /*
  * bs_control
@@ -214,8 +233,8 @@ command { service = "BotServ"; name = "BOTLIST"; command = "botserv/botlist"; }
  * Used for making the bot message a channel.
  */
 module { name = "bs_control" }
-command { service = "BotServ"; name = "ACT"; command = "botserv/act"; }
-command { service = "BotServ"; name = "SAY"; command = "botserv/say"; }
+command { service = "BotServ"; name = "ACT"; command = "botserv/act" }
+command { service = "BotServ"; name = "SAY"; command = "botserv/say" }
 
 /*
  * bs_info
@@ -225,25 +244,174 @@ command { service = "BotServ"; name = "SAY"; command = "botserv/say"; }
  * Used for getting information on bots or channels.
  */
 module { name = "bs_info" }
-command { service = "BotServ"; name = "INFO"; command = "botserv/info"; }
+command { service = "BotServ"; name = "INFO"; command = "botserv/info" }
 
 /*
  * bs_kick
  *
- * Provides the command botserv/kick.
+ * Provides the commands:
+ *   botserv/kick - Dummy help wrapper for the KICK command.
+ *   botserv/kick/amsg - Configures BotServ's AMSG kicker.
+ *   botserv/kick/badwords - Configures BotServ's badwords kicker.
+ *   botserv/kick/bolds - Configures BotServ's bold text kicker.
+ *   botserv/kick/caps - Configures BotServ's capital letters kicker.
+ *   botserv/kick/colors - Configures BotServ's color kicker.
+ *   botserv/kick/flood - Configures BotServ's flood kicker.
+ *   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 underline kicker.
+ *   botserv/set/dontkickops - Used for preventing BotServ from kicking channel operators.
+ *   botserv/set/dontkickvoices - Used for preventing BotServ from kicking voices.
  *
  * Used for configuring what bots should kick for.
  */
-module { name = "bs_kick" }
-command { service = "BotServ"; name = "KICK"; command = "botserv/kick"; }
+module
+{
+	name = "bs_kick"
+
+	/*
+	 * The amount of time that data for a user is valid in BotServ. If the data exceeds this time,
+	 * it is reset or deleted depending on the case. Do not set it too high, otherwise your
+	 * resources will be slightly affected.
+	 */
+	keepdata = 10m
+
+	/*
+	 * If set, the bots will use a kick reason that does not state the word when it is kicking.
+	 * This is especially useful if you have young people on your network.
+	 *
+	 * This directive is optional.
+	 */
+	gentlebadwordreason = yes
+}
+command { service = "BotServ"; name = "KICK"; command = "botserv/kick" }
+command { service = "BotServ"; name = "KICK AMSG"; command = "botserv/kick/amsg" }
+command { service = "BotServ"; name = "KICK BADWORDS"; command = "botserv/kick/badwords" }
+command { service = "BotServ"; name = "KICK BOLDS"; command = "botserv/kick/bolds" }
+command { service = "BotServ"; name = "KICK CAPS"; command = "botserv/kick/caps" }
+command { service = "BotServ"; name = "KICK COLORS"; command = "botserv/kick/colors" }
+command { service = "BotServ"; name = "KICK FLOOD"; command = "botserv/kick/flood" }
+command { service = "BotServ"; name = "KICK ITALICS"; command = "botserv/kick/italics" }
+command { service = "BotServ"; name = "KICK REPEAT"; command = "botserv/kick/repeat" }
+command { service = "BotServ"; name = "KICK REVERSES"; command = "botserv/kick/reverses" }
+command { service = "BotServ"; name = "KICK UNDERLINES"; command = "botserv/kick/underlines" }
+command { service = "BotServ"; name = "SET DONTKICKOPS"; command = "botserv/set/dontkickops" }
+command { service = "BotServ"; name = "SET DONTKICKVOICES"; command = "botserv/set/dontkickvoices" }
 
 /*
  * bs_set
  *
- * Provides the command botserv/set.
- *
- * Used for setting options such as kickers and fantasy replies.
+ * Provides the commands:
+ *   botserv/set/private - Used to prohibit specific BotServ bots from being assigned to channels.
  */
 module { name = "bs_set" }
-command { service = "BotServ"; name = "SET"; command = "botserv/set"; }
+command { service = "BotServ"; name = "SET"; command = "botserv/set" }
+command { service = "BotServ"; name = "SET BANEXPIRE"; command = "botserv/set/banexpire" }
+command { service = "BotServ"; name = "SET PRIVATE"; command = "botserv/set/private"; permission = "botserv/set/private" }
 
+/*
+ * greet
+ *
+ * Provides the commands:
+ *   botserv/set/greet - Used for enabling or disabling BotServ's greet messages in a channel.
+ *   nickserv/set/greet, nickserv/saset/greet - Used for changing a users greet message, which is displayed when they enter channels.
+ */
+module { name = "greet" }
+command { service = "BotServ"; name = "SET GREET"; command = "botserv/set/greet" }
+command { service = "NickServ"; name = "SET GREET"; command = "nickserv/set/greet" }
+command { service = "NickServ"; name = "SASET GREET"; command = "nickserv/saset/greet"; permission = "nickserv/saset/greet" }
+
+/*
+ * GREET privilege.
+ *
+ * Used by 'greet'.
+ *
+ * Users with this privilege have their greet shown when they join channels.
+ */
+privilege
+{
+	name = "GREET"
+	desc = _("Greet message displayed on join")
+	rank = 40
+	level = 5
+	flag = "g"
+	xop = "AOP"
+}
+
+/*
+ * fantasy
+ *
+ * Allows fantasy commands (e.g. !kick) to be used in channels.
+ *
+ * Provides the commands:
+ *   botserv/set/fantasy - Used for enabling or disabling BotServ's fantasy commands.
+ */
+module
+{
+	name = "fantasy"
+
+	/*
+	 * Defines the prefixes for fantasy commands in channels. One of these will
+	 * have to be prepended to all fantasy commands. For example, If you choose
+	 * "! ?" as your prefix fantasy commands will be "!kick", "?op", etc.
+	 *
+	 * This directive is optional, it defaults to "!" if not set.
+	 */
+	#prefix = "! ?"
+}
+command { service = "BotServ"; name = "SET FANTASY"; command = "botserv/set/fantasy" }
+
+/*
+ * Fantasy commands
+ *
+ * Fantasy commands can be executed in channels that have a BotServ bot assigned
+ * by prefixing the command with one of the fantasy characters configured in the
+ * {botserv}:prefix directive.
+ *
+ * Sane defaults are provided below that do not need to be edited unless you
+ * wish to change the default behavior.
+ */
+fantasy { name = "ACCESS"; command = "chanserv/access" }
+fantasy { name = "AKICK"; command = "chanserv/akick" }
+fantasy { name = "AOP"; command = "chanserv/xop" }
+fantasy { name = "BAN"; command = "chanserv/ban" }
+fantasy { name = "CLONE"; command = "chanserv/clone" }
+fantasy { name = "DEHALFOP"; command = "chanserv/modes" }
+fantasy { name = "DEOP"; command = "chanserv/modes" }
+fantasy { name = "DEOWNER"; command = "chanserv/modes" }
+fantasy { name = "DEPROTECT"; command = "chanserv/modes" }
+fantasy { name = "DEVOICE"; command = "chanserv/modes" }
+fantasy { name = "DOWN"; command = "chanserv/down" }
+fantasy { name = "ENFORCE"; command = "chanserv/enforce" }
+fantasy { name = "ENTRYMSG"; command = "chanserv/entrymsg" }
+fantasy { name = "FLAGS"; command = "chanserv/flags" }
+fantasy { name = "HALFOP"; command = "chanserv/modes" }
+fantasy { name = "HELP"; command = "generic/help"; prepend_channel = no; require_privilege = no }
+fantasy { name = "HOP"; command = "chanserv/xop" }
+fantasy { name = "INFO"; command = "chanserv/info"; prepend_channel = no }
+fantasy { name = "INVITE"; command = "chanserv/invite" }
+fantasy { name = "K"; command = "chanserv/kick" }
+fantasy { name = "KB"; command = "chanserv/ban" }
+fantasy { name = "KICK"; command = "chanserv/kick" }
+fantasy { name = "LEVELS"; command = "chanserv/levels" }
+fantasy { name = "LIST"; command = "chanserv/list"; prepend_channel = no }
+fantasy { name = "LOG"; command = "chanserv/log" }
+fantasy { name = "MODE"; command = "chanserv/mode" }
+fantasy { name = "MUTE"; command = "chanserv/ban"; kick = no; mode = "QUIET" }
+fantasy { name = "OP"; command = "chanserv/modes" }
+fantasy { name = "OWNER"; command = "chanserv/modes" }
+fantasy { name = "PROTECT"; command = "chanserv/modes" }
+fantasy { name = "QOP"; command = "chanserv/xop" }
+fantasy { name = "SEEN"; command = "chanserv/seen"; prepend_channel = no }
+fantasy { name = "SOP"; command = "chanserv/xop" }
+fantasy { name = "STATUS"; command = "chanserv/status" }
+fantasy { name = "SUSPEND"; command = "chanserv/suspend"; permission = "chanserv/suspend" }
+fantasy { name = "SYNC"; command = "chanserv/sync" }
+fantasy { name = "TOPIC"; command = "chanserv/topic" }
+fantasy { name = "UNBAN"; command = "chanserv/unban" }
+fantasy { name = "UNMUTE"; command = "chanserv/unban"; mode = "QUIET" }
+fantasy { name = "UNSUSPEND"; command = "chanserv/unsuspend"; permission = "chanserv/suspend" }
+fantasy { name = "UP"; command = "chanserv/up" }
+fantasy { name = "VOICE"; command = "chanserv/modes" }
+fantasy { name = "VOP"; command = "chanserv/xop" }

data/chanstats.example.conf

@@ -0,0 +1,49 @@
+/*
+ * Example configuration file for Chanstats.
+ *
+ * You can enable Chanstats by default by adding CS_STATS to {chanserv}:defaults
+ * and NS_STATS to {nickserv}:defaults.
+ *
+ * Make sure BotServ, ChanServ and NickServ are running.
+ */
+
+module
+{
+	name = "chanstats"
+
+	/*
+	 * The name of this engine.
+	 * This must match with the name of an SQL engine block.
+	 */
+
+	engine = "mysql/main"
+
+	/*
+	 * An optional prefix to prepended to the name of each created table.
+	 * Do not use the same prefix for other programs.
+	 */
+	#prefix = "chanstats21_"
+
+	smileyshappy = ":) :-) ;) ;-) :D :-D :P :-P"
+	smileyssad = ":( :-( ;( ;-("
+	smileysother = ":/ :-/"
+}
+command { service = "ChanServ"; name = "SET CHANSTATS"; command = "chanserv/set/chanstats" }
+command { service = "NickServ"; name = "SET CHANSTATS"; command = "nickserv/set/chanstats" }
+command { service = "NickServ"; name = "SASET CHANSTATS"; command = "nickserv/saset/chanstats"; permission = "nickserv/saset/chanstats" }
+
+module { name = "cs_fantasy_stats" }
+command { service = "ChanServ"; name = "STATS"; command = "chanserv/stats" }
+command { service = "ChanServ"; name = "GSTATS"; command = "chanserv/gstats" }
+fantasy { name = "STATS"; command = "chanserv/stats" }
+fantasy { name = "GSTATS"; command = "chanserv/gstats" }
+
+module { name = "cs_fantasy_top" }
+command { service = "ChanServ"; name = "TOP"; command = "chanserv/top" }
+command { service = "ChanServ"; name = "TOP10"; command = "chanserv/top10" }
+command { service = "ChanServ"; name = "GTOP"; command = "chanserv/gtop" }
+command { service = "ChanServ"; name = "GTOP10"; command = "chanserv/gtop10" }
+fantasy { name = "TOP"; command = "chanserv/top" }
+fantasy { name = "TOP10"; command = "chanserv/top10" }
+fantasy { name = "GTOP"; command = "chanserv/gtop" }
+fantasy { name = "GTOP10"; command = "chanserv/gtop10" }

data/cron.example.sh

@@ -9,16 +9,16 @@
 ###############################################################
 
 # Anope binary directory
-ANOPATH=/home/ircd/services/bin
+ANOPATH=/home/ircd/anope/bin
 
 # Anope data directory
-ANODATA=/home/ircd/services/data
+ANODATA=/home/ircd/anope/data
 
 # Name of the pid file
-ANOPIDF=services.pid
+ANOPIDF=anope.pid
 
 # Name of the executable
-ANOPROG=services
+ANOPROG=anope
 
 # Parameters to pass to the executable
 ANOARGS=""
@@ -37,7 +37,8 @@ cd $ANOPATH
 if [ -f "$ANODATA/$ANOPIDF" ]
 then
 	ANOPID=`cat "$ANODATA/$ANOPIDF"`
-	if [ `ps auwx | grep $ANOPROG | grep $ANOPID | grep -v -c grep` = 1 ]
+	kill -0 $ANOPID 2>/dev/null
+	if [ $? -eq 0 ]
 	then
 		exit
 	fi

data/global.example.conf

@@ -8,7 +8,8 @@
 service
 {
 	/*
-	 * The name of the Global client
+	 * The name of the Global client.
+	 * If you change this value, you probably want to change the client directive in the configuration for the global module too.
 	 */
 	nick = "Global"
 
@@ -20,12 +21,12 @@ service
 	/*
 	 * The hostname of the Global client.
 	 */
-	host = "services.host"
+	host = "${services.host}"
 
 	/*
 	 * The realname of the Global client.
 	 */
-	gecos = "Global Noticer"
+	real = "Global Noticer"
 
 	/*
 	 * The modes this client should use.
@@ -34,8 +35,8 @@ service
 	 * These modes are very IRCd specific. If left commented, sane defaults
 	 * are used based on what protocol module you have loaded.
 	 *
-	 * Note that setting this option incorrectly could potentially BREAK some if
-	 * not all usefulness of the client. We will not support you if this client is
+	 * Note that setting this option incorrectly could potentially BREAK some, if
+	 * not all, usefulness of the client. We will not support you if this client is
 	 * unable to do certain things if this option is enabled.
 	 */
 	#modes = "+o"
@@ -45,9 +46,20 @@ service
 	 * of log channels this is not very useful, as the service will just idle in the
 	 * specified channels, and will not accept any types of commands.
 	 *
-	 * Prefixes may be given to the channels in the form of mode character or prefix symbol.
+	 * Prefixes may be given to the channels in the form of mode characters or prefix symbols.
 	 */
 	#channels = "@#services,#mychan"
+
+	/*
+	 * The server alias that can be used to securely message this service. If
+	 * your IRC server does not have an alias for this service you can set this
+	 * to an empty string to tell users to use /msg instead.
+	 *
+	 * This setting is ignored when options:servicealias is disabled.
+	 *
+	 * Defaults to the nick of the service if not set.
+	 */
+	#alias = "GL"
 }
 
 /*
@@ -55,41 +67,33 @@ service
  *
  * Provides essential functionality for Global.
  */
-module { name = "global" }
-
-/*
- * Configuration for Global provided by gl_main.
- */
-global
+module
 {
+	name = "global"
+
 	/*
 	 * The name of the client that should be Global.
 	 */
-	name = "Global"
+	client = "Global"
 
 	/*
-	 * If set, Services will send global messages on starting up and shutting
-	 * down/restarting.
+	 * This is the global message that will be sent when Anope is being
+	 * shutdown/restarted.
 	 *
 	 * This directive is optional.
 	 */
-	#globaloncycle = yes
+	#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 are being
-	 * shutdown/restarted. This directive is only required if you enable
-	 * globaloncycle above.
+	 * This is the global message that will be sent when Anope (re)joins the
+	 * network.
+	 *
+	 * This directive is optional.
 	 */
-	globaloncycledown = "Services are restarting, they will be back shortly - please be good while we're gone"
+	#globaloncycleup = "Services are now back online - have a nice day"
 
 	/*
-	 * This is the global message that will be sent when Services (re)join the
-	 * network. This directive is only required if you enable globaloncycle above.
-	 */
-	globaloncycleup = "Services are now back online - have a nice day"
-
-	/*
-	 * If set, Services will hide the IRC operator's nick in a global
+	 * If set, Anope will hide the Services Operator's nick in a global
 	 * message/notice.
 	 *
 	 * This directive is optional.
@@ -108,8 +112,8 @@ global
  * Sane defaults are provided below that do not need to be edited unless you wish to change the default behavior.
  */
 
-/* Give it a help command */
-command { service = "Global"; name = "HELP"; command = "generic/help"; }
+/* Give it a help command. */
+command { service = "Global"; name = "HELP"; command = "generic/help" }
 
 /*
  * gl_global
@@ -119,6 +123,30 @@ command { service = "Global"; name = "HELP"; command = "generic/help"; }
  * Used for sending a message to every online user.
  */
 module { name = "gl_global" }
-command { service = "OperServ"; name = "GLOBAL"; command = "global/global"; permission = "operserv/global"; }
-command { service = "Global"; name = "GLOBAL"; command = "global/global"; permission = "global/global"; }
+command { service = "Global"; name = "GLOBAL"; command = "global/global"; permission = "global/global" }
 
+/*
+ * gl_queue
+ *
+ * Provides the command global/queue.
+ *
+ * Used for queuing messages to send to every online user.
+ */
+module
+{
+	name = "gl_queue"
+
+	/* The maximum number of messages in a message queue. Defaults to 10. */
+	maxqueue = 10
+}
+command { service = "Global"; name = "QUEUE"; command = "global/queue"; permission = "global/queue" }
+
+/*
+ * gl_server
+ *
+ * Provides the command global/server.
+ *
+ * Used for sending a message to every online user on a server.
+ */
+module { name = "gl_server" }
+command { service = "Global"; name = "SERVER"; command = "global/server"; permission = "global/server" }

data/hostserv.example.conf

@@ -8,7 +8,8 @@
 service
 {
 	/*
-	 * The name of the HostServ client
+	 * The name of the HostServ client.
+	 * If you change this value, you probably want to change the client directive in the configuration for the hostserv module too.
 	 */
 	nick = "HostServ"
 
@@ -20,12 +21,12 @@ service
 	/*
 	 * The hostname of the HostServ client.
 	 */
-	host = "services.host"
+	host = "${services.host}"
 
 	/*
 	 * The realname of the HostServ client.
 	 */
-	gecos = "vHost Service"
+	real = "Hostname Service"
 
 	/*
 	 * The modes this client should use.
@@ -34,8 +35,8 @@ service
 	 * These modes are very IRCd specific. If left commented, sane defaults
 	 * are used based on what protocol module you have loaded.
 	 *
-	 * Note that setting this option incorrectly could potentially BREAK some if
-	 * not all usefulness of the client. We will not support you if this client is
+	 * Note that setting this option incorrectly could potentially BREAK some, if
+	 * not all, usefulness of the client. We will not support you if this client is
 	 * unable to do certain things if this option is enabled.
 	 */
 	#modes = "+o"
@@ -45,9 +46,20 @@ service
 	 * of log channels this is not very useful, as the service will just idle in the
 	 * specified channels, and will not accept any types of commands.
 	 *
-	 * Prefixes may be given to the channels in the form of mode character or prefix symbol.
+	 * Prefixes may be given to the channels in the form of mode characters or prefix symbols.
 	 */
 	#channels = "@#services,#mychan"
+
+	/*
+	 * The server alias that can be used to securely message this service. If
+	 * your IRC server does not have an alias for this service you can set this
+	 * to an empty string to tell users to use /msg instead.
+	 *
+	 * This setting is ignored when options:servicealias is disabled.
+	 *
+	 * Defaults to the nick of the service if not set.
+	 */
+	#alias = "HS"
 }
 
 /*
@@ -55,45 +67,24 @@ service
  *
  * Provides essential functionality for HostServ.
  */
-module { name = "hostserv" }
-
-/*
- * Configuration for HostServ provided by hs_main.
- */
-hostserv
+module
 {
+	name = "hostserv"
+
 	/*
 	 * The name of the client that should be HostServ.
 	 */
-	name = "HostServ"
+	client = "HostServ"
 
 	/*
-	 * The characters allowed in a vhost. Changing this is not recommended unless
-	 * you know for sure your IRCd supports whatever characters you are wanting to use.
-	 * Telling services to set a vhost containing characters your IRCd disallows could
-	 * potentially break the IRCd and/or Services. Note these are 1 byte characters, so
-	 * UTF-8 characters will not work.
-	 *
-	 * It is recommended you DON'T change this.
+	 * If enabled, vhosts are activated on users immediately when they are set.
 	 */
-	vhost_chars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789.-"
+	activate_on_set = yes
 
 	/*
-	 * If set, allows vhosts to not contain dots (.).
-	 * Newer IRCds generally do not have a problem with this, but the same warning as
-	 * vhost_chars applies.
-	 *
-	 * It is recommended you DON'T change this.
+	 * If enabled, vhosts are activated on users immediately when they log out of an operator account.
 	 */
-	allow_undotted_vhosts = false
-
-	/*
-	 * The characters that are not allowed to be at the very beginning or very ending
-	 * of a vhost. The same warning as vhost_chars applies.
-	 *
-	 * It is recommended you DON'T change this.
-	 */
-	disallow_start_or_end = ".-"
+	activate_on_deoper = yes
 }
 
 /*
@@ -107,94 +98,145 @@ hostserv
  * Sane defaults are provided below that do not need to be edited unless you wish to change the default behavior.
  */
 
-/* Give it a help command */
-command { service = "HostServ"; name = "HELP"; command = "generic/help"; }
+/* Give it a help command. */
+command { service = "HostServ"; name = "HELP"; command = "generic/help" }
 
 /*
  * hs_del
  *
  * Provides the commands hostserv/del and hostserv/delall.
  *
- * Used for removing users vHosts.
+ * Used for removing users' vhosts.
  */
 module { name = "hs_del" }
-command { service = "HostServ"; name = "DEL"; command = "hostserv/del"; permission = "hostserv/del"; }
-command { service = "HostServ"; name = "DELALL"; command = "hostserv/delall"; permission = "hostserv/del"; }
+command { service = "HostServ"; name = "DEL"; command = "hostserv/del"; permission = "hostserv/del" }
+command { service = "HostServ"; name = "DELALL"; command = "hostserv/delall"; permission = "hostserv/del" }
 
 /*
  * hs_group
  *
  * Provides the command hostserv/group.
  *
- * Used for grouping one vHost to many nicks.
+ * Used for syncing one vhost to many nicks.
  */
-module { name = "hs_group" }
-command { service = "HostServ"; name = "GROUP"; command = "hostserv/group"; }
+module
+{
+	name = "hs_group"
+
+	/*
+	 * Upon nickserv/group, this option syncs the nick's main vhost to the grouped nick.
+	 */
+	syncongroup = yes
+
+	/*
+	 * This makes vhosts act as if they are per account.
+	 */
+	synconset = yes
+}
+command { service = "HostServ"; name = "GROUP"; command = "hostserv/group" }
 
 /*
  * hs_list
  *
  * Provides the command hostserv/list.
  *
- * Used for listing actively set vHosts.
+ * Used for listing actively set vhosts.
  */
 module { name = "hs_list" }
-command { service = "HostServ"; name = "LIST"; command = "hostserv/list"; permission = "hostserv/list"; }
+command { service = "HostServ"; name = "LIST"; command = "hostserv/list"; permission = "hostserv/list" }
 
 /*
  * hs_off
  *
  * Provides the command hostserv/off.
  *
- * Used for turning off your vHost.
+ * Used for turning off your vhost.
  */
 module { name = "hs_off" }
-command { service = "HostServ"; name = "OFF"; command = "hostserv/off"; }
+command { service = "HostServ"; name = "OFF"; command = "hostserv/off" }
+
+/*
+ * hs_offfer
+ *
+ * Provides the commands hostserv/offfer and hostserv/offerlist.
+ *
+ * Used to offer specialized vhosts to users, with template variables available.
+ */
+module
+{
+	name = "hs_offer"
+
+	/*
+	 * How long after a vhost is applied can another vhost be taken.
+	 */
+	takedelay = 7d
+}
+command { service = "HostServ"; name = "OFFER"; command = "hostserv/offer"; permission = "hostserv/offer" }
+command { service = "HostServ"; name = "OFFERLIST"; command = "hostserv/offerlist" }
 
 /*
  * hs_on
  *
  * Provides the command hostserv/on.
  *
- * Used for turning on your vHost.
+ * Used for turning on your vhost.
  */
 module { name = "hs_on" }
-command { service = "HostServ"; name = "ON"; command = "hostserv/on"; }
+command { service = "HostServ"; name = "ON"; command = "hostserv/on" }
 
 /*
  * hs_request
  *
- * Provides the commands hostserv/request, hostserv/active, hostserv/reject, and hostserv/waiting.
+ * Provides the commands:
+ *   hostserv/request  - Requests a vhost.
+ *   hostserv/activate - Approves a requested vhost.
+ *   hostserv/reject   - Rejects a requested vhost.
+ *   hostserv/waiting  - Lists pending vhost requests.
+ *   hostserv/validate - Allows self-service approval of vhosts using DNS
+ *                       validation (requires the dns module).
  *
  * Used to manage vhosts requested by users.
  */
-module { name = "hs_request" }
-command { service = "HostServ"; name = "REQUEST"; command = "hostserv/request"; }
-command { service = "HostServ"; name = "ACTIVATE"; command = "hostserv/activate"; permission = "hostserv/set"; }
-command { service = "HostServ"; name = "REJECT"; command = "hostserv/reject"; permission = "hostserv/set"; }
-command { service = "HostServ"; name = "WAITING"; command = "hostserv/waiting"; permission = "hostserv/set"; }
-hs_request
+module
 {
+	name = "hs_request"
+
 	/*
-	 * If set, Services will send a memo to the user requesting a vHost when it's been
+	 * If set, Anope will send a memo to the user requesting a vhost when it's been
 	 * approved or rejected.
 	 */
 	#memouser = yes
 
 	/*
-	 * If set, Services will send a memo to all Services staff when a new vHost is requested.
+	 * If set, Anope will send a memo to all services staff when a new vhost is requested.
 	 */
 	#memooper = yes
+
+	/*
+	 * If DNS validation is enabled, how long should users have to wait between
+	 * attempts at DNS validation. Defaults to 5 minutes.
+	 */
+	#validationcooldown = 5m
+
+	/*
+	 * If DNS validation is enabled, the TXT record to look for when determining
+	 * if the requester controls the domain. Defaults to anope-dns-validation.
+	 */
+	#validationrecord = "anope-dns-validation"
 }
+command { service = "HostServ"; name = "REQUEST"; command = "hostserv/request" }
+command { service = "HostServ"; name = "ACTIVATE"; command = "hostserv/activate"; permission = "hostserv/set" }
+command { service = "HostServ"; name = "REJECT"; command = "hostserv/reject"; permission = "hostserv/set" }
+command { service = "HostServ"; name = "WAITING"; command = "hostserv/waiting"; permission = "hostserv/set" }
+#command { service = "HostServ"; name = "VALIDATE"; command = "hostserv/validate" }
 
 /*
  * hs_set
  *
  * Provides the commands hostserv/set and hostserv/setall.
  *
- * Used for setting users vhosts.
+ * Used for setting users' vhosts.
  */
 module { name = "hs_set" }
-command { service = "HostServ"; name = "SET"; command = "hostserv/set"; permission = "hostserv/set"; }
-command { service = "HostServ"; name = "SETALL"; command = "hostserv/setall"; permission = "hostserv/set"; }
-
+command { service = "HostServ"; name = "SET"; command = "hostserv/set"; permission = "hostserv/set" }
+command { service = "HostServ"; name = "SETALL"; command = "hostserv/setall"; permission = "hostserv/set" }

data/memoserv.example.conf

@@ -8,7 +8,8 @@
 service
 {
 	/*
-	 * The name of the MemoServ client
+	 * The name of the MemoServ client.
+	 * If you change this value, you probably want to change the client directive in the configuration for the memoserv module too.
 	 */
 	nick = "MemoServ"
 
@@ -20,12 +21,12 @@ service
 	/*
 	 * The hostname of the MemoServ client.
 	 */
-	host = "services.host"
+	host = "${services.host}"
 
 	/*
 	 * The realname of the MemoServ client.
 	 */
-	gecos = "Memo Service"
+	real = "Memo Service"
 
 	/*
 	 * The modes this client should use.
@@ -34,8 +35,8 @@ service
 	 * These modes are very IRCd specific. If left commented, sane defaults
 	 * are used based on what protocol module you have loaded.
 	 *
-	 * Note that setting this option incorrectly could potentially BREAK some if
-	 * not all usefulness of the client. We will not support you if this client is
+	 * Note that setting this option incorrectly could potentially BREAK some, if
+	 * not all, usefulness of the client. We will not support you if this client is
 	 * unable to do certain things if this option is enabled.
 	 */
 	#modes = "+o"
@@ -45,9 +46,20 @@ service
 	 * of log channels this is not very useful, as the service will just idle in the
 	 * specified channels, and will not accept any types of commands.
 	 *
-	 * Prefixes may be given to the channels in the form of mode character or prefix symbol.
+	 * Prefixes may be given to the channels in the form of mode characters or prefix symbols.
 	 */
 	#channels = "@#services,#mychan"
+
+	/*
+	 * The server alias that can be used to securely message this service. If
+	 * your IRC server does not have an alias for this service you can set this
+	 * to an empty string to tell users to use /msg instead.
+	 *
+	 * This setting is ignored when options:servicealias is disabled.
+	 *
+	 * Defaults to the nick of the service if not set.
+	 */
+	#alias = "MS"
 }
 
 /*
@@ -55,18 +67,14 @@ service
  *
  * Provides essential functionality for MemoServ.
  */
-module { name = "memoserv" }
-
-/*
- * Configuration for MemoServ provided by ms_main.
- */
-memoserv
+module
 {
+	name = "memoserv"
 	/*
 	 * The name of the client that should be MemoServ. Clients are configured
 	 * with the service blocks.
 	 */
-	name = "MemoServ"
+	client = "MemoServ"
 
 	/*
 	 * The maximum number of memos a user is allowed to keep by default. Normal users may set the
@@ -81,22 +89,11 @@ memoserv
 	/*
 	 * The delay between consecutive uses of the MemoServ SEND command. This can help prevent spam
 	 * as well as denial-of-service attacks from sending large numbers of memos and filling up disk
-	 * space (and memory). The default 3-second wait means a maximum average of 150 bytes of memo
-	 * per second per user under the current IRC protocol.
+	 * space (and memory).
 	 *
 	 * This directive is optional, but recommended.
 	 */
-	senddelay = 3s
-
-	/*
-	 * Allow the use of memo receipts for the following groups:
-	 *
-	 * 1 - Opers Only
-	 * 2 - Everybody
-	 *
-	 * This directive is optional.
-	 */
-	#memoreceipt = 1
+	senddelay = 30s
 }
 
 /*
@@ -110,8 +107,8 @@ memoserv
  * Sane defaults are provided below that do not need to be edited unless you wish to change the default behavior.
  */
 
-/* Give it a help command */
-command { service = "MemoServ"; name = "HELP"; command = "generic/help"; }
+/* Give it a help command. */
+command { service = "MemoServ"; name = "HELP"; command = "generic/help" }
 
 /*
  * ms_cancel
@@ -121,7 +118,7 @@ command { service = "MemoServ"; name = "HELP"; command = "generic/help"; }
  * Used to cancel memos already sent but not yet read.
  */
 module { name = "ms_cancel" }
-command { service = "MemoServ"; name = "CANCEL"; command = "memoserv/cancel"; }
+command { service = "MemoServ"; name = "CANCEL"; command = "memoserv/cancel" }
 
 /*
  * ms_check
@@ -131,7 +128,7 @@ command { service = "MemoServ"; name = "CANCEL"; command = "memoserv/cancel"; }
  * Used to check if a sent memo has been read.
  */
 module { name = "ms_check" }
-command { service = "MemoServ"; name = "CHECK"; command = "memoserv/check"; }
+command { service = "MemoServ"; name = "CHECK"; command = "memoserv/check" }
 
 /*
  * ms_del
@@ -141,7 +138,7 @@ command { service = "MemoServ"; name = "CHECK"; command = "memoserv/check"; }
  * Used to delete your memos.
  */
 module { name = "ms_del" }
-command { service = "MemoServ"; name = "DEL"; command = "memoserv/del"; }
+command { service = "MemoServ"; name = "DEL"; command = "memoserv/del" }
 
 /*
  * ms_ignore
@@ -150,8 +147,18 @@ command { service = "MemoServ"; name = "DEL"; command = "memoserv/del"; }
  *
  * Used to ignore memos from specific users.
  */
-module { name = "ms_ignore" }
-command { service = "MemoServ"; name = "IGNORE"; command = "memoserv/ignore"; }
+module
+{
+	name = "ms_ignore"
+
+	/*
+	 * The maximum number of entries that may be on a memo ignore list.
+	 *
+	 * This directive is optional.
+	 */
+	max = 50
+}
+command { service = "MemoServ"; name = "IGNORE"; command = "memoserv/ignore" }
 
 /*
  * ms_info
@@ -161,7 +168,7 @@ command { service = "MemoServ"; name = "IGNORE"; command = "memoserv/ignore"; }
  * Used to show memo related information about an account or a channel.
  */
 module { name = "ms_info" }
-command { service = "MemoServ"; name = "INFO"; command = "memoserv/info"; }
+command { service = "MemoServ"; name = "INFO"; command = "memoserv/info" }
 
 /*
  * ms_list
@@ -171,7 +178,7 @@ command { service = "MemoServ"; name = "INFO"; command = "memoserv/info"; }
  * Used to list your current memos.
  */
 module { name = "ms_list" }
-command { service = "MemoServ"; name = "LIST"; command = "memoserv/list"; }
+command { service = "MemoServ"; name = "LIST"; command = "memoserv/list" }
 
 /*
  * ms_read
@@ -181,7 +188,7 @@ command { service = "MemoServ"; name = "LIST"; command = "memoserv/list"; }
  * Used to read your memos.
  */
 module { name = "ms_read" }
-command { service = "MemoServ"; name = "READ"; command = "memoserv/read"; }
+command { service = "MemoServ"; name = "READ"; command = "memoserv/read" }
 
 /*
  * ms_rsend
@@ -189,31 +196,39 @@ command { service = "MemoServ"; name = "READ"; command = "memoserv/read"; }
  * Provides the command memoserv/rsend.
  *
  * Used to send a memo requiring a receipt be sent back once it is read.
- * 
- * Requires configuring memoserv:memoreceipt.
  */
-#module { name = "ms_rsend" }
-#command { service = "MemoServ"; name = "RSEND"; command = "memoserv/rsend"; }
+#module
+{
+	name = "ms_rsend"
+
+	/*
+	 * Only allow Services Operators to use ms_rsend.
+	 *
+	 * This directive is optional.
+	 */
+	operonly = no
+}
+#command { service = "MemoServ"; name = "RSEND"; command = "memoserv/rsend" }
 
 /*
  * ms_send
  *
- * Provides the command memoserv/send
+ * Provides the command memoserv/send.
  *
  * Used to send memos.
  */
 module { name = "ms_send" }
-command { service = "MemoServ"; name = "SEND"; command = "memoserv/send"; }
+command { service = "MemoServ"; name = "SEND"; command = "memoserv/send" }
 
 /*
  * ms_sendall
  *
- * Provides the command memoserv/sendall
+ * Provides the command memoserv/sendall.
  *
  * Used to send a mass memo to every registered user.
  */
 module { name = "ms_sendall" }
-command { service = "MemoServ"; name = "SENDALL"; command = "memoserv/sendall"; permission = "memoserv/sendall"; }
+command { service = "MemoServ"; name = "SENDALL"; command = "memoserv/sendall"; permission = "memoserv/sendall" }
 
 /*
  * ms_set
@@ -223,7 +238,7 @@ command { service = "MemoServ"; name = "SENDALL"; command = "memoserv/sendall";
  * Used to set settings such as how you are notified of new memos, and your memo limit.
  */
 module { name = "ms_set" }
-command { service = "MemoServ"; name = "SET"; command = "memoserv/set"; }
+command { service = "MemoServ"; name = "SET"; command = "memoserv/set" }
 
 /*
  * ms_staff
@@ -233,5 +248,4 @@ command { service = "MemoServ"; name = "SET"; command = "memoserv/set"; }
  * Used to send a memo to all registered staff members.
  */
 module { name = "ms_staff" }
-command { service = "MemoServ"; name = "STAFF"; command = "memoserv/staff"; permission = "memoserv/staff"; }
-
+command { service = "MemoServ"; name = "STAFF"; command = "memoserv/staff"; permission = "memoserv/staff" }

data/operserv.example.conf

@@ -8,7 +8,8 @@
 service
 {
 	/*
-	 * The name of the OperServ client
+	 * The name of the OperServ client.
+	 * If you change this value, you probably want to change the client directive in the configuration for the operserv module too.
 	 */
 	nick = "OperServ"
 
@@ -20,12 +21,12 @@ service
 	/*
 	 * The hostname of the OperServ client.
 	 */
-	host = "services.host"
+	host = "${services.host}"
 
 	/*
 	 * The realname of the OperServ client.
 	 */
-	gecos = "Operator Service"
+	real = "Operator Service"
 
 	/*
 	 * The modes this client should use.
@@ -34,8 +35,8 @@ service
 	 * These modes are very IRCd specific. If left commented, sane defaults
 	 * are used based on what protocol module you have loaded.
 	 *
-	 * Note that setting this option incorrectly could potentially BREAK some if
-	 * not all usefulness of the client. We will not support you if this client is
+	 * Note that setting this option incorrectly could potentially BREAK some, if
+	 * not all, usefulness of the client. We will not support you if this client is
 	 * unable to do certain things if this option is enabled.
 	 */
 	#modes = "+o"
@@ -45,9 +46,20 @@ service
 	 * of log channels this is not very useful, as the service will just idle in the
 	 * specified channels, and will not accept any types of commands.
 	 *
-	 * Prefixes may be given to the channels in the form of mode character or prefix symbol.
+	 * Prefixes may be given to the channels in the form of mode characters or prefix symbols.
 	 */
 	#channels = "@#services,#mychan"
+
+	/*
+	 * The server alias that can be used to securely message this service. If
+	 * your IRC server does not have an alias for this service you can set this
+	 * to an empty string to tell users to use /msg instead.
+	 *
+	 * This setting is ignored when options:servicealias is disabled.
+	 *
+	 * Defaults to the nick of the service if not set.
+	 */
+	#alias = "OS"
 }
 
 /*
@@ -55,25 +67,14 @@ service
  *
  * Provides essential functionality for OperServ.
  */
-module { name = "operserv" }
-
-/*
- * Configuration for OperServ provided by os_main.
- */
-operserv
+module
 {
+	name = "operserv"
+
 	/*
 	 * The name of the client that should be OperServ.
 	 */
-	name = "OperServ"
-
-	/*
-	 * If set, Services Admins will be able to use SUPERADMIN [ON|OFF] which will temporarily grant
-	 * them extra privileges such as being a founder on ALL channels.
-	 *
-	 * This directive is optional.
-	 */
-	#superadmin = yes
+	client = "OperServ"
 
 	/*
 	 * These define the default expiration times for, respectively, AKILLs, CHANKILLs, SNLINEs,
@@ -83,10 +84,9 @@ operserv
 	chankillexpiry = 30d
 	snlineexpiry = 30d
 	sqlineexpiry = 30d
-	szlineexpiry = 30d
 
 	/*
-	 * If set, this option will make Services send an AKILL command immediately after it has been
+	 * If set, this option will make Anope send an AKILL command immediately after it has been
 	 * added with AKILL ADD. This eliminates the need for killing the user after the AKILL has
 	 * been added.
 	 *
@@ -95,111 +95,23 @@ operserv
 	akillonadd = yes
 
 	/*
-	 * If set, this option will make Services send an (SVS)KILL command immediately after SNLINE ADD.
+	 * If set, this option will make Anope send an (SVS)KILL command immediately after SNLINE ADD.
 	 * This eliminates the need for killing the user after the SNLINE has been added.
 	 *
-	 *This directive is optional.
+	 * This directive is optional.
 	 */
-	#killonsnline = yes
+	killonsnline = yes
 
 	/*
-	 * If set, this option will make Services send an (SVS)KILL command immediately after SQLINE ADD.
+	 * If set, this option will make Anope send an (SVS)KILL command immediately after SQLINE ADD.
 	 * This eliminates the need for killing the user after the SQLINE has been added.
 	 *
 	 * This directive is optional.
 	 */
-	#killonsqline = yes
+	killonsqline = yes
 
 	/*
-	 * Defines what actions should trigger notifications. The list must be separated by spaces.
-	 *
-	 * The notifications are:
-	 * -            oper: A user has become an IRC operator
-	 * -           bados: A non-IRCop attempts to use OperServ
-	 * -     akillexpire: An AKILL has expired
-	 * -    snlineexpire: An SNLINE has expired
-	 * -    sqlineexpire: An SQLINE has expired
-	 * - exceptionexpire: A session exception has expired
-	 *
-	 * This directive is optional, if left blank, there will be no notifications.
-	 */
-	notifications = "oper"
-
-	/*
-	 * Enables session limiting. Session limiting prevents users from connecting more than a certain
-	 * number of times from the same host at the same time - thus preventing most types of cloning.
-	 * Once a host reaches it's session limit, all clients attempting to connect from that host will
-	 * be killed. Exceptions to the default session limit can be defined via the exception list. It
-	 * should be noted that session limiting, along with a large exception list, can degrade Services'
-	 * performance.
-	 *
-	 * See the online help for more information about session limiting.
-	 *
-	 * This directive is optional.
-	 */
-	limitsessions = yes
-
-	/*
-	 * Default session limit per host. Once a host reaches it's session limit, all clients attempting
-	 * to connect from that host will be killed. A value of zero means an unlimited session limit.
-	 *
-	 * This directive is optional.
-	 * If not given and session limiting is enabled, it will default to no limit.
-	 */
-	defaultsessionlimit = 3
-
-	/*
-	 * The maximum session limit that may be set for a host in an exception.
-	 *
-	 * This directive is only required if session limiting is enabled.
-	 */
-	maxsessionlimit = 100
-
-	/*
-	 * Sets the default expiry time for session exceptions.
-	 *
-	 * This directive is only required if session limiting is enabled.
-	 */
-	exceptionexpiry = 1d
-
-	/*
-	 * The message that will be NOTICE'd to a user just before they are removed from the network because
-	 * their host's session limit has been exceeded. It may be used to give a slightly more descriptive
-	 * reason for the impending kill as opposed to simply "Session limit exceeded".
-	 *
-	 * This directive is optional, if not set, nothing will be sent.
-	 */
-	sessionlimitexceeded = "The session limit for your host %s has been exceeded."
-
-	/*
-	 * Same as above, but should be used to provide a website address where users can find out more
-	 * about session limits and how to go about applying for an exception.
-	 *
-	 * Note: This directive has been intentionally commented out in an effort to remind you to change
-	 * the URL it contains. It is recommended that you supply an address/URL where people can get help
-	 * regarding session limits.
-	 *
-	 * This directive is optional, if not set, nothing will be sent.
-	 */
-	#sessionlimitdetailsloc = "Please visit http://your.website.url/ for more information about session limits."
-
-	/*
-	 * If set and is not 0, this directive tells Services to add an AKILL the number of subsequent kills
-	 * for the same host exceeds this value, preventing the network from experiencing KILL floods.
-	 *
-	 * This directive is optional.
-	 */
-	maxsessionkill = 15
-
-	/*
-	 * Sets the expiry time for AKILLs set for hosts exceeding the maxsessionkill directive limit.
-	 *
-	 * This directive is optional, if not set, defaults to 30 minutes.
-	 */
-	sessionautokillexpiry = 30m
-
-	/*
-	 * Adds the nickname of the IRC Operator issuing an AKILL to the kill reason.
+	 * Adds the nickname of the Services Operator issuing an AKILL to the kill reason.
 	 *
 	 * This directive is optional.
 	 */
@@ -212,8 +124,7 @@ operserv
 	akillids = yes
 
 	/*
-	 * If set, only IRC Operators will be permitted to use OperServ, regardless of module-based command
-	 * access restrictions.
+	 * If set, only IRC Operators will be permitted to use OperServ, regardless of command access restrictions.
 	 *
 	 * This directive is optional, but recommended.
 	 */
@@ -231,8 +142,8 @@ operserv
  * Sane defaults are provided below that do not need to be edited unless you wish to change the default behavior.
  */
 
-/* Give it a help command */
-command { service = "OperServ"; name = "HELP"; command = "generic/help"; }
+/* Give it a help command. */
+command { service = "OperServ"; name = "HELP"; command = "generic/help" }
 
 /*
  * os_akill
@@ -242,7 +153,7 @@ command { service = "OperServ"; name = "HELP"; command = "generic/help"; }
  * Used to ban users from the network.
  */
 module { name = "os_akill" }
-command { service = "OperServ"; name = "AKILL"; command = "operserv/akill"; permission = "operserv/akill"; }
+command { service = "OperServ"; name = "AKILL"; command = "operserv/akill"; permission = "operserv/akill" }
 
 /*
  * os_chankill
@@ -252,22 +163,22 @@ command { service = "OperServ"; name = "AKILL"; command = "operserv/akill"; perm
  * Used to akill users from an entire channel.
  */
 module { name = "os_chankill" }
-command { service = "OperServ"; name = "CHANKILL"; command = "operserv/chankill"; permission = "operserv/chankill"; }
+command { service = "OperServ"; name = "CHANKILL"; command = "operserv/chankill"; permission = "operserv/chankill" }
 
 /*
  * os_defcon
  *
  * Provides the command operserv/defcon.
  *
- * Allows you to set services in defcon mode, which can be used to restrict services access
+ * Allows you to set services in DefCon mode, which can be used to restrict services access
  * during bot attacks.
  */
-#module { name = "os_defcon" }
-#command { service = "OperServ"; name = "DEFCON"; command = "operserv/defcon"; }
-defcon
+#module
 {
+	name = "os_defcon"
+
 	/*
-	 * Default DefCon level (1-5) to use when starting Services up. Level 5 constitutes normal operation
+	 * Default DefCon level (1-5) to use when starting Anope up. Level 5 constitutes normal operation
 	 * while level 1 constitutes the most restrictive operation. If this setting is left out or set to
 	 * 0, DefCon will be disabled and the rest of this block will be ignored.
 	 */
@@ -284,8 +195,8 @@ defcon
 	 * - forcechanmodes: Forces all channels to have the modes given in the later chanmodes directive
 	 * - reducedsessions: Reduces the session limit to the value given in the later sessionlimit directive
 	 * - nonewclients: KILL any new clients trying to connect
-	 * - operonly: Services will ignore all non-IRCops
-	 * - silentoperonly: Services will silently ignore all non-IRCops
+	 * - operonly: Ignore all non-IRCops
+	 * - silentoperonly: Silently ignore all non-IRCops
 	 * - akillnewclients: AKILL any new clients trying to connect
 	 * - nonewmemos: No new memos will be sent to block MemoServ attacks
 	 */
@@ -309,10 +220,10 @@ defcon
 	 * The channel modes to set on all channels when the DefCon channel mode system is in use.
 	 *
 	 * Note 1: Choose these modes carefully, because when DefCon switches to a level which does NOT have
-	 * the mode setting selected, Services will set the reverse on all channels, e.g. if this setting
+	 * the mode setting selected, Anope will set the reverse on all channels, e.g. if this setting
 	 * is +RN when DefCon is used, all channels will be set to +RN, when DefCon is removed, all
 	 * channels will be set to -RN. You don't want to set this to +k for example, because when DefCon
-	 * is removed all channels with -k.
+	 * is removed, all channels are set -k, removing the key from previously keyed channels.
 	 *
 	 * Note 2: MLOCKed modes will not be lost.
 	 */
@@ -327,14 +238,14 @@ defcon
 	#timeout = 15m
 
 	/*
-	 * If set, Services will send a global message on DefCon level changes.
+	 * If set, Anope will send a global message on DefCon level changes.
 	 *
 	 * This directive is optional.
 	 */
 	#globalondefcon = yes
 
 	/*
-	 * If set, Services will send the global message defined in the message directive on DefCon level
+	 * If set, Anope will send the global message defined in the message directive on DefCon level
 	 * changes.
 	 *
 	 * This directive is optional.
@@ -346,7 +257,7 @@ defcon
 	 *
 	 * This directive is required only when globalondefconmore is set.
 	 */
-	#message = "Put your message to send your users here. Dont forget to uncomment globalondefconmore"
+	#message = "Put your message to send your users here. Don't forget to uncomment globalondefconmore"
 
 	/*
 	 * Defines the message that will be sent when DefCon is returned to level 5. This directive is optional,
@@ -358,19 +269,70 @@ defcon
 	 * Defines the reason to use when clients are KILLed or AKILLed from the network while the proper
 	 * DefCon operation is in effect.
 	 */
-	#akillreason = "This network is currently not accepting connections, please try again later"
+	#akillreason = "This network is currently not accepting connections, please try again later."
 }
+#command { service = "OperServ"; name = "DEFCON"; command = "operserv/defcon"; permission = "operserv/defcon" }
 
 /*
- * os_list
+ * os_dns
  *
- * Provides the commands operserv/chanlist and operserv/userlist.
+ * Provides the command operserv/dns.
  *
- * Used to list and search the channels and users currently on the network.
+ * This module requires that dns is loaded.
+ *
+ * This module allows controlling a DNS zone. This is useful for
+ * controlling what servers users are placed on for load balancing,
+ * and to automatically remove split servers.
+ *
+ * To use this module you must set a nameserver record for services
+ * so that DNS queries go to services.
+ *
+ * Alternatively, you may use a secondary DNS server to hide services' IP,
+ * provide query caching, and provide better fault tolerance.
+ *
+ * To do this using BIND, configure similar to:
+ *
+ * options { max-refresh-time 60 };
+ * zone "irc.example.com" IN {
+ *   type secondary;
+ *   primaries { 127.0.0.1 port 5353 };
+ * };
+ *
+ * Where 127.0.0.1:5353 is the IP and port services are listening on.
+ * We recommend you externally firewall both UDP and TCP to the port
+ * Anope is listening on.
+ *
+ * Finally set a NS record for irc.example.com. to BIND or services.
  */
-module { name = "os_list" }
-command { service = "OperServ"; name = "CHANLIST"; command = "operserv/chanlist"; }
-command { service = "OperServ"; name = "USERLIST"; command = "operserv/userlist"; }
+#module
+{
+	name = "os_dns"
+
+	/* TTL for records. This should be very low if your records change often. */
+	ttl = 1m
+
+	/* If a server drops this many users the server is automatically removed from the DNS zone.
+	 * This directive is optional.
+	 */
+	user_drop_mark = 50
+
+	/* The time used for user_drop_mark. */
+	user_drop_time = 1m
+
+	/* When a server is removed from the zone for dropping users, it is readded after this time.
+	 * This directive is optional.
+	 */
+	user_drop_readd_time = 5m
+
+	/* If set, when a server splits, it is automatically removed from the zone. */
+	remove_split_servers = yes
+
+	/* If set, when a server connects to the network, it will be automatically added to
+	 * the zone if it is a known server.
+	 */
+	readd_connected_servers = no
+}
+#command { service = "OperServ"; name = "DNS"; command = "operserv/dns"; permission = "operserv/dns" }
 
 /*
  * os_config
@@ -380,7 +342,7 @@ command { service = "OperServ"; name = "USERLIST"; command = "operserv/userlist"
  * Used to view and set configuration options while services are running.
  */
 module { name = "os_config" }
-command { service = "OperServ"; name = "CONFIG"; command = "operserv/config"; permission = "operserv/config"; }
+command { service = "OperServ"; name = "CONFIG"; command = "operserv/config"; permission = "operserv/config" }
 
 /*
  * os_forbid
@@ -389,18 +351,55 @@ command { service = "OperServ"; name = "CONFIG"; command = "operserv/config"; pe
  *
  * Used to forbid specific nicks, channels, emails, etc. from being used.
  */
-module { name = "os_forbid" }
-command { service = "OperServ"; name = "FORBID"; command = "operserv/forbid"; permission = "operserv/forbid"; }
+module
+{
+	name = "os_forbid"
+
+	/*
+	 * Allows loading forbids from a file.
+	 */
+	#file
+	{
+		/*
+		 * The type of forbid to add. Can be set to "chan", "email", "nick",
+		 * "password", or "register".
+		 */
+		type = "email"
+
+		/*
+		 * The file to read forbids from. Each forbid should be placed on a new
+		 * line. Surrounding whitespace will be ignored.
+		 */
+		file = "temp-emails.txt"
+
+		/**
+		 * The reason why entries from this file are forbidden.
+		 */
+		reason = "Temporary email"
+	}
+
+}
+command { service = "OperServ"; name = "FORBID"; command = "operserv/forbid"; permission = "operserv/forbid" }
 
 /*
  * os_ignore
  *
  * Provides the command operserv/ignore.
  *
- * Used to make Services ignore users.
+ * Used to make Anope ignore users.
  */
 module { name = "os_ignore" }
-command { service = "OperServ"; name = "IGNORE"; command = "operserv/ignore"; permission = "operserv/ignore"; }
+command { service = "OperServ"; name = "IGNORE"; command = "operserv/ignore"; permission = "operserv/ignore" }
+
+/*
+ * os_info
+ *
+ * Provides the command operserv/info.
+ *
+ * Used to add oper only notes to users and channels.
+ */
+module { name = "os_info" }
+command { service = "OperServ"; name = "INFO"; command = "operserv/info"; permission = "operserv/info" }
 
 /*
  * os_jupe
@@ -410,7 +409,7 @@ command { service = "OperServ"; name = "IGNORE"; command = "operserv/ignore"; pe
  * Used to disconnect servers from the network and prevent them from relinking.
  */
 module { name = "os_jupe" }
-command { service = "OperServ"; name = "JUPE"; command = "operserv/jupe"; permission = "operserv/jupe"; }
+command { service = "OperServ"; name = "JUPE"; command = "operserv/jupe"; permission = "operserv/jupe" }
 
 /*
  * os_kick
@@ -420,7 +419,7 @@ command { service = "OperServ"; name = "JUPE"; command = "operserv/jupe"; permis
  * Used to kick users from channels.
  */
 module { name = "os_kick" }
-command { service = "OperServ"; name = "KICK"; command = "operserv/kick"; permission = "operserv/kick"; }
+command { service = "OperServ"; name = "KICK"; command = "operserv/kick"; permission = "operserv/kick" }
 
 /*
  * os_kill
@@ -430,7 +429,18 @@ command { service = "OperServ"; name = "KICK"; command = "operserv/kick"; permis
  * Used to forcibly disconnect users from the network.
  */
 module { name = "os_kill" }
-command { service = "OperServ"; name = "KILL"; command = "operserv/kill"; permission = "operserv/kill"; }
+command { service = "OperServ"; name = "KILL"; command = "operserv/kill"; permission = "operserv/kill" }
+
+/*
+ * os_list
+ *
+ * Provides the commands operserv/chanlist and operserv/userlist.
+ *
+ * Used to list and search the channels and users currently on the network.
+ */
+module { name = "os_list" }
+command { service = "OperServ"; name = "CHANLIST"; command = "operserv/chanlist"; permission = "operserv/chanlist" }
+command { service = "OperServ"; name = "USERLIST"; command = "operserv/userlist"; permission = "operserv/userlist" }
 
 /*
  * os_login
@@ -440,8 +450,26 @@ command { service = "OperServ"; name = "KILL"; command = "operserv/kill"; permis
  * Used to login to OperServ, only required if your oper block requires this.
  */
 module { name = "os_login" }
-command { service = "OperServ"; name = "LOGIN"; command = "operserv/login"; }
-command { service = "OperServ"; name = "LOGOUT"; command = "operserv/logout"; }
+command { service = "OperServ"; name = "LOGIN"; command = "operserv/login" }
+command { service = "OperServ"; name = "LOGOUT"; command = "operserv/logout" }
+
+/*
+ * os_logsearch
+ *
+ * Provides the command operserv/logsearch.
+ *
+ * Used to search services log files.
+ */
+module
+{
+	name = "os_logsearch"
+
+	/* The log file name to search. There should be a log{} block configured to log
+	 * to a file of this name.
+	 */
+	logname = "services.log"
+}
+command { service = "OperServ"; name = "LOGSEARCH"; command = "operserv/logsearch"; permission = "operserv/logsearch" }
 
 /*
  * os_mode
@@ -451,8 +479,8 @@ command { service = "OperServ"; name = "LOGOUT"; command = "operserv/logout"; }
  * Used to change user and channel modes.
  */
 module { name = "os_mode" }
-command { service = "OperServ"; name = "MODE"; command = "operserv/mode"; permission = "operserv/mode"; }
-command { service = "OperServ"; name = "UMODE"; command = "operserv/umode"; permission = "operserv/umode"; }
+command { service = "OperServ"; name = "UMODE"; command = "operserv/umode"; permission = "operserv/umode" }
+command { service = "OperServ"; name = "MODE"; command = "operserv/mode"; permission = "operserv/mode" }
 
 /*
  * os_modinfo
@@ -462,8 +490,8 @@ command { service = "OperServ"; name = "UMODE"; command = "operserv/umode"; perm
  * Used to show information about loaded modules.
  */
 module { name = "os_modinfo" }
-command { service = "OperServ"; name = "MODINFO"; command = "operserv/modinfo"; }
-command { service = "OperServ"; name = "MODLIST"; command = "operserv/modlist"; permission = "operserv/modlist"; }
+command { service = "OperServ"; name = "MODINFO"; command = "operserv/modinfo"; permission = "operserv/modinfo" }
+command { service = "OperServ"; name = "MODLIST"; command = "operserv/modlist"; permission = "operserv/modinfo" }
 
 /*
  * os_module
@@ -473,9 +501,9 @@ command { service = "OperServ"; name = "MODLIST"; command = "operserv/modlist";
  * Used to load, reload, and unload modules.
  */
 module { name = "os_module" }
-command { service = "OperServ"; name = "MODLOAD"; command = "operserv/modload"; permission = "operserv/modload"; }
-command { service = "OperServ"; name = "MODRELOAD"; command = "operserv/modreload"; permission = "operserv/modload"; }
-command { service = "OperServ"; name = "MODUNLOAD"; command = "operserv/modunload"; permission = "operserv/modload"; }
+command { service = "OperServ"; name = "MODLOAD"; command = "operserv/modload"; permission = "operserv/modload" }
+command { service = "OperServ"; name = "MODRELOAD"; command = "operserv/modreload"; permission = "operserv/modload" }
+command { service = "OperServ"; name = "MODUNLOAD"; command = "operserv/modunload"; permission = "operserv/modload" }
 
 /*
  * os_news
@@ -484,10 +512,34 @@ command { service = "OperServ"; name = "MODUNLOAD"; command = "operserv/modunloa
  *
  * Used to configure news notices shown to users when they connect, and opers when they oper.
  */
-module { name = "os_news" }
-command { service = "OperServ"; name = "LOGONNEWS"; command = "operserv/logonnews"; permission = "operserv/news"; }
-command { service = "OperServ"; name = "OPERNEWS"; command = "operserv/opernews"; permission = "operserv/news"; }
-command { service = "OperServ"; name = "RANDOMNEWS"; command = "operserv/randomnews"; permission = "operserv/news"; }
+module
+{
+	name = "os_news"
+
+	/*
+	 * The service bot names to use to send news to users on connection
+	 * and to opers when they oper.
+	 */
+	announcer = "Global"
+	oper_announcer = "OperServ"
+
+	/*
+	 * The number of LOGON/OPER news items to display when a user logs on.
+	 *
+	 * This directive is optional, if not set it will default to 3.
+	 */
+	#newscount = 3
+
+	/*
+	 * Whether to show the datetime at which the news entry was added.
+	 *
+	 * This directive is optional, if not set it will default to yes.
+	 */
+	#showdate = yes
+}
+command { service = "OperServ"; name = "LOGONNEWS"; command = "operserv/logonnews"; permission = "operserv/news" }
+command { service = "OperServ"; name = "OPERNEWS"; command = "operserv/opernews"; permission = "operserv/news" }
+command { service = "OperServ"; name = "RANDOMNEWS"; command = "operserv/randomnews"; permission = "operserv/news" }
 
 /*
  * os_noop
@@ -496,50 +548,112 @@ command { service = "OperServ"; name = "RANDOMNEWS"; command = "operserv/randomn
  *
  * Used to NOOP a server, which prevents users from opering on that server.
  */
-module { name = "os_noop" }
-command { service = "OperServ"; name = "NOOP"; command = "operserv/noop"; permission = "operserv/noop"; }
-
-/*
- * os_oline
- *
- * Provides the command operserv/oline.
- *
- * Used to set oper flags on users, and is specific to UnrealIRCd.
- * See /helpop ?svso on your IRCd for more information.
- */
-module { name = "os_oline" }
-command { service = "OperServ"; name = "OLINE"; command = "operserv/oline"; permission = "operserv/oline"; }
+#module { name = "os_noop" }
+command { service = "OperServ"; name = "NOOP"; command = "operserv/noop"; permission = "operserv/noop" }
 
 /*
  * os_oper
- * 
+ *
  * Provides the command operserv/oper.
  *
  * Used to configure opers and show information about opertypes.
  */
 module { name = "os_oper" }
-command { service = "OperServ"; name = "OPER"; command = "operserv/oper"; permission = "operserv/oper"; }
+command { service = "OperServ"; name = "OPER"; command = "operserv/oper"; permission = "operserv/oper" }
 
 /*
  * os_reload
  *
- * Provides the command operserv/relad.
+ * Provides the command operserv/reload.
  *
- * Used to reload the services.conf configuration file.
+ * Used to reload the anope.conf configuration file.
  */
 module { name = "os_reload" }
-command { service = "OperServ"; name = "RELOAD"; command = "operserv/reload"; permission = "operserv/reload"; }
+command { service = "OperServ"; name = "RELOAD"; command = "operserv/reload"; permission = "operserv/reload" }
 
 /*
  * os_session
  *
  * Provides the commands operserv/exception and operserv/session.
  *
+ * This module enables session limiting. Session limiting prevents users from connecting more than a certain
+ * number of times from the same IP at the same time - thus preventing most types of cloning.
+ * Once a host reaches its session limit, all clients attempting to connect from that host will
+ * be killed. Exceptions to the default session limit can be defined via the exception list.
+ *
  * Used to manage the session limit exception list, and view currently active sessions.
  */
-module { name = "os_session" }
-command { service = "OperServ"; name = "EXCEPTION"; command = "operserv/exception"; permission = "operserv/exception"; }
-command { service = "OperServ"; name = "SESSION"; command = "operserv/session"; permission = "operserv/session"; }
+module
+{
+	name = "os_session"
+
+	/*
+	 * Default session limit per host. Once a host reaches its session limit, all clients attempting
+	 * to connect from that host will be killed.
+	 *
+	 * This directive is required if os_session is loaded.
+	 */
+	defaultsessionlimit = 5
+
+	/*
+	 * The maximum session limit that may be set for a host in an exception.
+	 *
+	 * This directive is required if os_session is loaded.
+	 */
+	maxsessionlimit = 100
+
+	/*
+	 * Sets the default expiry time for session exceptions.
+	 */
+	#exceptionexpiry = 1d
+
+	/*
+	 * The message that will be NOTICE'd to a user just before they are removed from the network because
+	 * their host's session limit has been exceeded. It may be used to give a slightly more descriptive
+	 * reason for the impending kill as opposed to simply "Session limit exceeded".
+	 *
+	 * This directive is optional, if not set, nothing will be sent.
+	 */
+	sessionlimitexceeded = "The session limit for your IP {ip} has been exceeded."
+
+	/*
+	 * Same as above, but should be used to provide a website address where users can find out more
+	 * about session limits and how to go about applying for an exception.
+	 *
+	 * Note: This directive has been intentionally commented out in an effort to remind you to change
+	 * the URL it contains. It is recommended that you supply an address/URL where people can get help
+	 * regarding session limits.
+	 *
+	 * This directive is optional, if not set, nothing will be sent.
+	 */
+	#sessionlimitdetailsloc = "Please visit https://your.website.url/ for more information about session limits."
+
+	/*
+	 * If set and is not 0, this directive tells Anope to add an AKILL if the number of subsequent kills
+	 * for the same host exceeds this value, preventing the network from experiencing KILL floods.
+	 *
+	 * This directive is optional.
+	 */
+	maxsessionkill = 15
+
+	/*
+	 * Sets the expiry time for AKILLs set for hosts exceeding the maxsessionkill directive limit.
+	 *
+	 * This directive is optional, if not set, defaults to 30 minutes.
+	 */
+	sessionautokillexpiry = 30m
+
+	/*
+	 * Sets the CIDR value used to determine which IP addresses represent the same person.
+	 * By default this would limit 3 connections per IPv4 IP and 3 connections per IPv6 IP.
+	 * If you are receiving IPv6 clone attacks it may be useful to set session_ipv6_cidr to
+	 * 64 or 48.
+	 */
+	session_ipv4_cidr = 32
+	session_ipv6_cidr = 128
+}
+command { service = "OperServ"; name = "EXCEPTION"; command = "operserv/exception"; permission = "operserv/exception" }
+command { service = "OperServ"; name = "SESSION"; command = "operserv/session"; permission = "operserv/session" }
 
 /*
  * os_set
@@ -548,8 +662,19 @@ command { service = "OperServ"; name = "SESSION"; command = "operserv/session";
  *
  * Used to set various settings such as superadmin, debug mode, etc.
  */
-module { name = "os_set" }
-command { service = "OperServ"; name = "SET"; command = "operserv/set"; permission = "operserv/set"; }
+module
+{
+	name = "os_set"
+
+	/*
+	 * If set, Services Admins will be able to use SUPERADMIN [ON|OFF] which will temporarily grant
+	 * them extra privileges such as being a founder on ALL channels.
+	 *
+	 * This directive is optional.
+	 */
+	#superadmin = yes
+}
+command { service = "OperServ"; name = "SET"; command = "operserv/set"; permission = "operserv/set" }
 
 /*
  * os_shutdown
@@ -558,10 +683,20 @@ command { service = "OperServ"; name = "SET"; command = "operserv/set"; permissi
  *
  * Used to quit, restart, or shutdown services.
  */
-module { name = "os_shutdown" }
-command { service = "OperServ"; name = "QUIT"; command = "operserv/quit"; permission = "operserv/quit"; }
-command { service = "OperServ"; name = "RESTART"; command = "operserv/restart"; permission = "operserv/restart"; }
-command { service = "OperServ"; name = "SHUTDOWN"; command = "operserv/shutdown"; permission = "operserv/shutdown"; }
+module
+{
+	name = "os_shutdown"
+
+	/*
+	 * If enabled then server operators will be required to provide the network
+	 * name to confirm that they are quitting, restarting, or shutting down the
+	 * right server.
+	 */
+	requirename = yes
+}
+#command { service = "OperServ"; name = "QUIT"; command = "operserv/quit"; permission = "operserv/quit" }
+command { service = "OperServ"; name = "RESTART"; command = "operserv/restart"; permission = "operserv/restart" }
+command { service = "OperServ"; name = "SHUTDOWN"; command = "operserv/shutdown"; permission = "operserv/shutdown" }
 
 /*
  * os_stats
@@ -571,36 +706,37 @@ command { service = "OperServ"; name = "SHUTDOWN"; command = "operserv/shutdown"
  * Used to show statistics about services.
  */
 module { name = "os_stats" }
-command { service = "OperServ"; name = "STATS"; command = "operserv/stats"; permission = "operserv/stats"; }
+command { service = "OperServ"; name = "STATS"; command = "operserv/stats"; permission = "operserv/stats" }
 
 /*
- * os_svsnick
- * 
- * Provides the operserv/svsnick command.
+ * os_svs
  *
- * Used to force change user's nicks.
+ * Provides the commands operserv/svsnick, operserv/svsjoin, and operserv/svspart.
+ *
+ * Used to force users to change nicks, join and part channels.
  */
-module { name = "os_svsnick" }
-command { service = "OperServ"; name = "SVSNICK"; command = "operserv/svsnick"; permission = "operserv/svsnick"; }
+module { name = "os_svs" }
+command { service = "OperServ"; name = "SVSNICK"; command = "operserv/svsnick"; permission = "operserv/svs" }
+command { service = "OperServ"; name = "SVSJOIN"; command = "operserv/svsjoin"; permission = "operserv/svs" }
+command { service = "OperServ"; name = "SVSPART"; command = "operserv/svspart"; permission = "operserv/svs" }
 
 /*
  * os_sxline
  *
  * Provides the operserv/snline and operserv/sqline commands.
  *
- * Used to ban different things such as realnames, nicknames, and IPs.
+ * Used to ban real names, nick names, and possibly channels.
  */
 module { name = "os_sxline" }
-command { service = "OperServ"; name = "SNLINE"; command = "operserv/snline"; permission = "operserv/snline"; }
-command { service = "OperServ"; name = "SQLINE"; command = "operserv/sqline"; permission = "operserv/sqline"; }
+command { service = "OperServ"; name = "SNLINE"; command = "operserv/snline"; permission = "operserv/snline" }
+command { service = "OperServ"; name = "SQLINE"; command = "operserv/sqline"; permission = "operserv/sqline" }
 
 /*
  * os_update
  *
- * Provides the opersev/update command.
+ * Provides the operserv/update command.
  *
  * Use to immediately update the databases.
  */
 module { name = "os_update" }
-command { service = "OperServ"; name = "UPDATE"; command = "operserv/update"; permission = "operserv/update"; }
-
+command { service = "OperServ"; name = "UPDATE"; command = "operserv/update"; permission = "operserv/update" }

data/version.sh

@@ -1 +0,0 @@
-git log --pretty=format:"Revision %h - %cD - %s" > version.log

docs/ASTYLE

@@ -1 +0,0 @@
-astyle --style=java --indent=tab --brackets=break-closing --indent-switches --indent-cases --brackets=break

docs/AUTHORS.txt

@@ -0,0 +1,94 @@
+Since the first commit in March 2004 90 people have submitted patches, commits,
+and other useful contributions to Anope. These people, ordered by the number of
+contributions they have made, are:
+
+  * Adam <adam@anope.org>
+  * Sadie Powell <sadie@sadiepowell.dev>
+  * Robin Burchell <w00t@inspircd.org>
+  * Naram Qashat <cyberbotx@anope.org>
+  * Pieter Bootsma <geniusdex@anope.org>
+  * Jens Voss <dukepyrolator@anope.org>
+  * David Robson <rob@anope.org>
+  * Florian Schulze <certus@anope.org>
+  * Daniel Engel <dane@zero.org>
+  * Trystan S. Lee <trystan@nomadirc.net>
+  * Robby <robby@chatbelgie.be>
+  * Charles Kingsley <chaz@anope.org>
+  * Lee Holmes <lethality@anope.org>
+  * Gabriel Acevedo H. <drstein@anope.org>
+  * Jan Milants <viper@anope.org>
+  * Adam Kramer <ribosome@anope.org>
+  * Attila Molnar <attilamolnar@hush.com>
+  * Michael Wobst <wobst.michael@web.de>
+  * PeGaSuS <droider.pc@gmail.com>
+  * Matt Schatz <genius3000@g3k.solutions>
+  * Mark Summers <mark@goopler.net>
+  * Daniel Vassdal <shutter@canternet.org>
+  * MatthewM <mcm@they-got.us>
+  * Sebastian V. <hal9000@denorastats.org>
+  * Alvaro Toledo <atoledo@keldon.org>
+  * Björn Stiddien <keeper@anope.org>
+  * n0kS Phr33d0m <god@politeia.in>
+  * Hendrik Jäger <gitcommit@henk.geekmail.org>
+  * k4be <k4be@pirc.pl>
+  * Thomas Fargeix <t.fargeix@gmail.com>
+  * CaPa CuL <capacul@gmail.com>
+  * Val Lorentz <progval+git@progval.net>
+  * Bram Matthys <syzop@vulnscan.org>
+  * Federico G. Schwindt <fgsch@lodoss.net>
+  * Alexander Barton <alex@barton.de>
+  * Cronus <cronus@nite-serv.com>
+  * Dragone2 <dragone2@risposteinformatiche.it>
+  * H7-25 <simos@simosnap.org>
+  * Jyzee <jyzee.git@gmail.com>
+  * Sebastian Barfurth <github@afreshmelon.com>
+  * Zantox <jyoerger10@msn.com>
+  * Zoddo <zoddo.ino@gmail.com>
+  * Dominic Hargreaves <dom@earth.li>
+  * Michael Hazell <michaelhazell@hotmail.com>
+  * Robert Scheck <robert@fedoraproject.org>
+  * Dennis Friis <peavey@inspircd.org>
+  * Filippo Cortigiani <simos@simosnap.org>
+  * KidProtect
+  * Michał Zegan <webczat_200@poczta.onet.pl>
+  * AlphaTech <alphat3ch@icloud.com>
+  * Austin Ellis <siniStar@IRC4Fun.net>
+  * bonnedav <theD_2011@hotmail.com>
+  * Denis M. (Phr33d0m) <god@politeia.in>
+  * Harakiri <harakiri@overstack.fr>
+  * Marcin Łabanowski <marcin@6irc.net>
+  * Matt Ullman <matt@airraidsirens.com>
+  * Michael Stapelberg <michael@robustirc.net>
+  * Alexander Maassen <outsider@twingoversum.scarynet.org>
+  * artemiiav <artemiiav@gmail.com>
+  * blackbeard420 <blackbeard@blackbeard420.me>
+  * BoGu5 <bogus@onzin.org>
+  * Chris Langsenkamp <chris@langsenkamp.com>
+  * Clem Morton
+  * crazycatdevs
+  * Daniel Oaks <danneh@danneh.net>
+  * Fabio Scotoni <cculex@gmail.com>
+  * ItsOnlyBinary
+  * Jason Foster <retsofaj@gmail.com>
+  * Jeremy <jeremy@ssnet.ca>
+  * Josh Soref
+  * KindOne <ineedalifetoday@live.com>
+  * linuxdaemon
+  * Mantas Mikulėnas <grawity@gmail.com>
+  * Matthew Beeching <jobe@mdbnet.co.uk>
+  * Michael <michaelhazell@hotmail.com>
+  * Mingjie Shen <shen497@purdue.edu>
+  * nekoswag
+  * Peter Tseng <pht24@cornell.edu>
+  * Romain Rivière <lecoyote@lecoyote.org>
+  * Sam James (sam_c) <sam@cmpct.info>
+  * ShutterQuick <shutter@canternet.org>
+  * Sketch <denverfreeburn@outlook.com>
+  * Tim Gunter <tim@vanillaforums.com>
+  * Toni Kaija <diftraku@gmail.com>
+  * Victor Coss <gtaxl@gtaxl.net>
+  * VisioN <vision@myirc.us>
+  * westor <westor7@gmail.com>
+  * Wilson Birney <wpb@360scada.com>
+  * Yann Sionneau <yann@sionneau.net>
+  * Zach Bloomquist <zrbq@live.com>

docs/BUGS

@@ -1 +0,0 @@
-For all bug reports / updates please see http://bugs.anope.org

docs/C++CASTING

@@ -1,111 +0,0 @@
-C++-style Casting
-=================
-
-In C, you can cast in one of two ways:
-
-(type)var
-type(var)
-
-The problem with C-style casting is that it allows a programmer to get away
-with too much, and is also not designed to handle C++ classes.
-
-C++ has 4 types of casting in addition to allowing C-style casting.  They are:
-
-static_cast
-const_cast
-dynamic_cast
-reinterpret_cast
-
-The syntax is usually *_cast<type>(var).
-
-static_cast
------------
-
-From my expierence, this cast is closest to C-style casting for non-pointer
-types as well as between some (but not all) pointer types.  This type of cast,
-like C-style casting, is performed at compile-time.  static_cast can also do
-a downcast of a derived class to a base class, but only if the base class is
-not a virtual base class.  Sometimes the result of this cast can become
-undefined.  static_cast is a bit more strict that C-style casting, though.  It
-disallows certain class conversions that would've been allowed with a C-style
-cast.  static_cast also doesn't allow you to cast to an incomplete type.  In
-these cases, I would try either dynamic_cast or reinterpret_cast.
-
-const_cast
-----------
-
-This cast is mainly to add or remove const-ness or volatile-ness from a
-variable.  This is safer than using a C-style cast to change the const-ness
-of a variable.  In most cases if you try to use one of the other casts and it
-complains about const-ness, you will want to either use this cast instead or
-wrap the other cast around this cast.  An example:
-
-const int *a;
-static_cast<void *>(a); <-- This will fail.
-
-To remedy the above, you would might try this:
-
-const int *a;
-const_cast<void *>(a); <-- But this will still fail.
-
-The real solution is this:
-
-const int *a;
-static_cast<void *>(const_cast<int *>(a));
-
-It is not recommended to use const_cast on the this variable within a member
-function of a class that is declared const.  Instead you should use the mutable
-keyword on the variable in the class's definition.
-
-dynamic_cast
-------------
-
-This cast can only be used on pointers or references to classes.  It can cast a
-derived class to a base class, a derived class to another derived class
-(provided that both are children of the same base class), or a base class to a
-derived class.  You can also use this to cast a class to void *.  This cast is
-done at run-time as opposed to the other casts, and relies on C++'s RTTI to be
-enabled.  It is meant to be used on polymorphic classes, so use static_cast on
-non-polymorphic classes.
-
-derived-to-base conversions are actually done statically, so you use either
-dynamic_cast or static_cast on them, regardless of if the classes are
-polymorphic or not.
-
-derived-to-derived or base-to-derived conversions, however, rely on run-time
-type information, and this cast is used on those classes that are polymorphic.
-This is safer than C-style casting in that an invalid pointer conversion will
-return a NULL pointer, and an invalid reference conversion will throw a
-Bad_cast exception.
-
-Note that in Anope we prefer if Anope::debug_cast is used.
-This uses dynamic_cast (and checks for a NULL pointer return) on debug builds
-and static_cast on release builds, to speed up the program beacuse of dynamic_cast's
-reliance on RTTI.
-
-reinterpret_cast
-----------------
-
-This cast I would use only as a last resort if static_cast isn't allowed on a
-conversion.  It allows for conversions between two unrelated types, such as
-going from char * to int *.  It can also be used to convert a pointer to an
-integral type and vica versa.  The sites I've read mention how the result is
-non-portable, which I assume means the resulting object code is non-portable,
-so since the code is compiled on many systems anyways, I don't see this as
-being a huge issue.  It is recommended to only use this if necessary, though.
-
-Links
-=====
-
-The following links are web sites I've used to get this information, and might
-describe some of the above a bit better than I have. :P
-
-http://www.acm.org/crossroads/xrds3-1/ovp3-1.html
-http://www.cplusplus.com/doc/tutorial/typecasting.html
-http://www.codeguru.com/forum/showthread.php?t=312456
-http://www.cs.umd.edu/class/sum2003/cmsc311/Notes/BitOp/cast.html
-http://msdn.microsoft.com/en-us/library/5f6c9f8h(VS.80).aspx
-http://en.wikibooks.org/wiki/C%2B%2B_Programming/Type_Casting
-http://www.informit.com/guides/content.aspx?g=cplusplus&seqNum=134
-
--- CyberBotX, Nov 23, 2008

docs/CHANGES.md

@@ -0,0 +1,351 @@
+# Anope Change Log
+
+## Anope 2.1.25 (unreleased)
+
+### Changes
+
+* Fixed a crash when a temporary ban expires.
+
+* Fixed a potential crash caused by unusual timestamps being passed to `Anope::strftime`.
+
+* Fixed confirming accounts when `{ns_register}:registration` is set to "admin".
+
+* Fixed migrating access entries from xop to flags granting new privileges in cases where multiple privileges share the same flag.
+
+* Fixed migrating access entries sometimes giving the wrong flags.
+
+* Fixed not being able to update the description of a flags access entry.
+
+## Anope 2.1.24 (2026-04-01)
+
+### Breaking Changes
+
+* If a database contains duplicate corrupt entries from a prior write failure the oldest ones will now be purged from the database. This is a destructive action so make sure you take a manual backup of your database before upgrading.
+
+* Removed support for storing the Anope database in Redis. The Redis code was extremely bitrotted, had not been tested in years, and to our knowledge has almost no (if any) users. It is recommended that db_redis users migrate to db_json or db_sql.
+
+* SQL tables now use versioned prefixes by default. For the SQL database backends the default is `anope21_` and for ChanStats the default is `chanstats21_`. If you do not have a prefix explicitly set in your config you will need to add one it. Alternatively, you may also want to consider exporting to db_json and re-importing to update your SQL schema for the recent database layout changes.
+
+### Changes
+
+* Added some helper methods to `CommandSource` to allow quickly translting messages.
+
+* Changed the Config script to allow multiple dashes in front of options, i.e. `-quick` and `--quick` are now equivalent.
+
+* Converted some language strings to use format strings instead of concatenation.
+
+* Fixed a rare crash in the ns_cert module.
+
+* Fixed building Anope as a unity build.
+
+* Fixed the ns_cert module erasing certificate entries if using an old database.
+
+* Fixed users having the wrong real name in log messages on InspIRCd if it has been previously changed with `CHGNAME` or `SETNAME`.
+
+## Anope 2.1.23 (2026-04-01)
+
+### Changes
+
+* Added examples to several BotServ commands.
+
+* Added missing fields to the `RPL_STATSLINKINFO` output.
+
+* Added support for migrating access entries between systems (currently only `chanserv/flags` is supported).
+
+* Added the default levels to the `chanserv/levels` DESC help.
+
+* Changed access listing commands to only show their own access entries unless `ALL` is specified.
+
+* Fixed a non-translatable string which has been marked as translatable.
+
+* Fixed the missing AUTOLOGIN extension.
+
+* Fixed translating the help output when the flexible layout is used.
+
+* Improved the accuracy of the X-line expiry time in `operserv/stats`.
+
+* Updated the Portuguese translation.
+
+* Updated the Romanian translation.
+
+## Anope 2.1.22 (2026-03-01)
+
+### Breaking Changes
+
+* Automatic login using a known SSL fingerprint now requires the `AUTOLOGIN` option to be set on accounts with `/NS SET AUTOLOGIN ON`. Automatic login is largely obsolete now SASL EXTERNAL exists and is widely supported.
+
+* Conan 2 is now used for packaging dependencies on Windows. If you are building from source you will need to upgrade Conan.
+
+* Non-breaking spaces in translatable messages now use 0x1B instead of 0x1A due to recent msgfmt releases treating 0x1A as an EOF character. If you have an out of tree translation you will need to update it.
+
+* User TLS certificates are now stored in their own `NSCert` table instead of as a column in the `NickCore` table. If you are reading this information you will need to update your code.
+
+### Changes
+
+* Fixed `{botserv}:botmodes` erroneously allowing setting non-status modes on channels.
+
+* Fixed echoing message tags on Solanum.
+
+* Fixed handling incoming `FIDENT` messages on InspIRCd.
+
+* Fixed matching stacked extended bans on InspIRCd and UnrealIRCd.
+
+* Fixed parameter modes in `chanserv/mode` locks erroneously requiring a parameter to unset a lock.
+
+* Fixed restoring the object identifier when unserialising objects in db_json.
+
+* Fixed the consistency of indenting and line wrapping command examples in help output.
+
+* Redesigned the output of `nickserv/list` to show more relevant information.
+
+  ```
+  /NICKSERV LIST *
+  -NickServ- List of entries matching *:
+  -NickServ- alice (account: alice)
+  -NickServ- alice|work (account: alice)
+  -NickServ- bob -- Unconfirmed (account: bob)
+  -NickServ- mallory -- Suspended (account: mallory)
+  -NickServ- End of list - 4/4 matches shown.
+  ```
+
+* The cs_set_misc and ns_set_misc modules now can use a separate title from the command name.
+
+  ```
+  /NICKSERV SET MASTODON @example@mastodon.social
+  -NickServ- Mastodon for testuser set to @example@mastodon.social
+  ```
+
+* The cs_set_misc and ns_set_misc modules now support validation of user-specified data.
+
+  ```
+  /NICKSERV SET MASTODON example.mastodon.social
+  -NickServ- Mastodon syntax is invalid.
+  -NickServ- Syntax: SET MASTODON [@user@host.tld]
+  ```
+
+* The db_atheme module can now import arbitrary metadata to fields from the ns_set_misc module.
+
+* The local clock will now be checked for synchronisation with the IRCd clock on UnrealIRCd.
+
+* The `nickserv/cert` command will now show the time a TLS certificate was created and the nickname of the creator if the `VIEW` subcommand is used.
+
+  ```
+  /NICKSERV CERT VIEW
+  -NickServ- d41d8cd98f00b204e9800998ecf8427e -- created by nick1 at Wed 25 Feb 00:18:50 GMT
+  ```
+
+* The ns_set_misc module can now add account data to the WHOIS output of authenticated users on InspIRCd (with the swhois_ext module) and UnrealIRCd.
+
+  ```
+  /WHOIS nick1
+  * [nick1] (nick1@example.com): nick1
+  * [nick1] Mastodon: @example@mastodon.social
+  * [nick1] irc.example.com :Example-IRC server
+  ...
+  * [nick1] End of WHOIS list.
+  ```
+
+* The regex_posix module is now available on Windows (using the PCRE2 POSIX compatibility layer).
+
+* The regex_tre module is now available on Windows.
+
+* The Windows dependencies have been updated.
+
+## Anope 2.1.21 (2026-02-07)
+
+### Breaking Changes
+
+* `{fantasy}:fantasycharacter` has been replaced with `{fantasy}:prefix` which allows multiple-character fantasy prefixes. If you have multiple custom fantasy characters set you should separate them with a space when upgrading your config.
+
+* The db_json module will now terminate the process if it fails to write the database. This replicates the behaviour previously used by the db_flatfile module.
+
+* When adding an unregistered user to an access list you must now explicitly specify their hostmask. This prevents accidentally adding a hostmask which is too wide.
+
+### Changes
+
+* Added cleaning up of hostmasks when adding them to an access list and `{chanserv}:disallow_malformed_hostmask` to allow rejecting them instead.
+
+* Changed access commands to add the account of a user who is logged in to an account but not using a nickname belonging to that account.
+
+* Fixed a crash when clearing channel entry messages.
+
+* Fixed a memory leak when cloning akicks.
+
+* Fixed cleaning up ban masks.
+
+* Fixed confirming accounts using the webcpanel.
+
+* Fixed importing the time a nickname was used from Atheme.
+
+* Fixed limiting the number of accounts per email address.
+
+* Fixed locking modes that take a parameter when they are added.
+
+* Fixed the `chanserv/enforce` command erroneously enforcing against channel founders.
+
+* Fixed the syntax of the `chanserv/suspend` command.
+
+* Fixed the syntax of the `nickserv/suspend` command.
+
+* Improved password rehash detection in the enc_argon2 module.
+
+* Various minor improvements to how services work internally.
+
+## Anope 2.1.20 (2025-12-01)
+
+### Breaking Changes
+
+* Changed the registration of database types added by modules to be delayed until after the module constructor has been called. This might affect any custom modules you are using.
+
+* Moved akicks out of the core into cs_akick. Modules which depend on akicks now require the cs_akick module to be loaded.
+
+### Changes
+
+* Added `{db_json}:preserve_unknown_data` to configure whether unknown database types are kept in the JSON database. By default unknown database types from unloaded modules will be preserved in the database to allow reloading later. This setting can be used to disable this and prune the database.
+
+* Added support for forbidding passwords. This is intended to be used with file forbids (see below).
+
+  ```
+  /OPERSERV FORBID ADD PASSWORD +30d hunter2 This password is insecure
+  -OperServ- Added a forbid on hunter2 of type password to expire on Mon 29 Dec 2025 11:51:13 AM UTC (30 days from now).
+  ```
+
+* Added support for loading forbids from a file.
+
+  ```cpp
+  file
+  {
+    type = "email"
+    file = "temp-emails.txt"
+    reason = "Temporary email"
+  }
+  ```
+
+* Added support for the UnrealIRCd `+F` flood profile mode.
+
+* Added the `anope-mkpasswd` script to help generate passwords for use in the config.
+
+  ```
+  $ ./anope-mkpasswd argon2id hunter2
+  For use in the database:
+      argon2id:$argon2id$v=19$m=65536,t=3,p=4$AmGWdtn1OUT9WSKSqESsPw$iguvHs6oIi/hF7e3t/bGNwgqP41vl/J4qP3a/yH9SLo
+
+  For use in an oper:
+      password = "$argon2id$v=19$m=65536,t=3,p=4$AmGWdtn1OUT9WSKSqESsPw$iguvHs6oIi/hF7e3t/bGNwgqP41vl/J4qP3a/yH9SLo"
+      password_hash = "argon2id"
+
+  For use in an jsonrpc/xmlrpc token:
+      token = "$argon2id$v=19$m=65536,t=3,p=4$AmGWdtn1OUT9WSKSqESsPw$iguvHs6oIi/hF7e3t/bGNwgqP41vl/J4qP3a/yH9SLo"
+      token_hash = "argon2id"
+
+  Make sure you have the enc_argon2 module loaded!
+  ```
+
+* Added the DISPLAY flag to `nickserv/list` to only show account display nicknames.
+
+  ```
+  /NICKSERV LIST *
+  -NickServ- List of entries matching *:
+  -NickServ- nick1 (last mask: foo@example.com)
+  -NickServ- nick1|afk (last mask: bar@example.com)
+  -NickServ- nick2 (last mask: baz@example.com)
+  -NickServ- End of list - 3/3 matches shown.
+
+  /NICKSERV LIST * DISPLAY
+  -NickServ- List of entries matching *:
+  -NickServ- nick1 (last mask: foo@example.com)
+  -NickServ- nick2 (last mask: baz@example.com)
+  -NickServ- End of list - 2/2 matches shown.
+  ```
+
+* Added the hs_offer module which allows offering templated vhosts to users (based on a
+modsite module by @genius3000 on GitHub).
+
+  ```
+  /HOSTSERV OFFER ADD {account}.users.example.com
+
+  /HOSTSERV OFFERLIST
+  -HostServ- Current host offer list:
+  -HostServ- 2: {account}.users.example.com / FooBar.users.example.com -- does not expire
+  -HostServ- End of host offer list.
+  ```
+
+* Changed chanserv/mode lock messages to stack the responses into one message per type instead of sending one message per mode.
+
+  ```
+  /CHANSERV MODE #stest LOCK ADD +bb foo!foo@foo bar!bar@bar
+  -ChanServ- +bb foo!foo@foo bar!bar@bar has been locked on #stest.
+  ```
+
+* Changed database objects to rehook to their type when it becomes available again.
+
+* Changed the `nickserv/set/language` and `nickserv/set/timezone` commands to allow setting back to the default value by omitting the last parameter.
+
+  ```
+  /NICKSERV SET LANGUAGE
+  12:23 -NickServ- Language changed to English.
+
+  /NICKSERV SET TIMEZONE
+  12:24 -NickServ- Timezone changed to UTC.
+  ```
+
+* Changed the default install directory from `~/anope` to `~/anope-2.1`.
+
+* Changed the enc_sha1 module to use a vendored SHA-1 implementation.
+
+* Expanded password obscurity checks and added an event hook to allow modules to reject passwords.
+
+* Fixed the rpc_user module sending the "invalid account" and "invalid password" error codes inverted.
+
+* Fixed unintentionally reloading the core database when reloading a module that provides a database type.
+
+* Removed a bunch of obsolete build system cruft.
+
+## Anope 2.1.19 (2025-11-01)
+
+### Breaking Changes
+
+* `pkg-config` is now required to find dependencies for the following modules on UNIX systems:
+  - enc_argon2
+  - ldap
+  - mysql
+  - regex_pcre2
+  - regex_tre
+
+* Support for InspIRCd v3 has been dropped ahead of it going EOL in two months. Please migrate to InspIRCd v4 to keep using Anope 2.1 with InspIRCd.
+
+### Changes
+
+* Added a Romanian translation (contributed by @KidProtect on GitHub).
+
+* Added support for associating a timezone with an account to allow users to receive timestamps in their local timezone.
+
+  ```
+  /NICKSERV SET TIMEZONE Europe/London
+  -NickServ- Timezone changed to Europe/Berlin.
+
+  /NICKSERV INFO test
+  -NickServ- Account registered: Thu 09 Oct 2025 15:22:45 CEST (45 seconds ago)
+  ```
+
+  NOTE: This requires a compiler with C++20 timezone support.
+
+* Added support for IRCv3 message tags when using Solanum git.
+
+* Added support for language-specific time formats.
+
+  ```
+  /NICKSERV SET LANGUAGE tr_TR.UTF-8
+  -NickServ- Dil Türkçe olarak değiştirildi.
+  
+  /NICKSERV INFO test
+  -NickServ- Hesap kaydedildi: Prş 09 Eki 2025 15:22:45 (6 dakika, 16 saniye önce)
+  ```
+
+* Channel entry messages are now tagged with an IRCv3 time tag for the time they were created on supporting IRCds. This defaults to on but can be disabled using `{cs_entrymsg}:timestamp`.
+
+* Reordered the information in the `nickserv/info` command output to show the registration dates before the seen information.
+
+* Updated the Turkish translation (contributed by @CaPaCuL on GitHub).
+
+* Updated the vendored libraries.

docs/CMakeLists.txt

@@ -3,13 +3,9 @@ if(WIN32)
   # Only install given files from this directory
   # NOTE: I would've had this just find all files in the directory, but that would include files not needed (like this file)
   execute_process(COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/README ${CMAKE_CURRENT_BINARY_DIR}/README.txt)
-  if(IN_SOURCE)
-    # Add README.txt to list of files for CPack to ignore
-    add_to_cpack_ignored_files("README.txt$" TRUE)
-  endif(IN_SOURCE)
-  set(DOCS Changes Changes.conf DEFCON FAQ INSTALL LANGUAGE MODULES NEWS ${CMAKE_CURRENT_BINARY_DIR}/README.txt WIN32.txt)
+  set(DOCS CHANGES.md DEFCON FAQ INSTALL LANGUAGE MODULES ${CMAKE_CURRENT_BINARY_DIR}/README.txt WIN32.md)
   install(FILES ${DOCS}
-    DESTINATION docs
+    DESTINATION ${DOC_DIR}
   )
   set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${CMAKE_CURRENT_BINARY_DIR}/README.txt")
-endif(WIN32)
+endif()

docs/CODING

@@ -1,239 +0,0 @@
-Orginally pulled from: http://www.inspircd.org/wiki/Coding_Guidelines
-
----
-
-InspIRCd Coding Guidelines
-
-The following are a set of guidelines for writing patches to InspIRCd, or for
-creating modules for distribution with the official package. These guidelines
-were written a time after InspIRCd development started, and so not all code
-yet follows these. This will be rectified with time.
-
-
-1. Comments
-
-   * Multi Line
-     Multiple line comments should follow the C-style comment, for example:
-       /*
-        * This is a multiple line comment, huzzah..
-        */
-
-   * Single Line
-     Single line comments should also be in the C style, for example:
-       /* This is a boring one-line comment */
-
-   * Doxygen commenting
-     If you wish your comment to show in doxygen, the comment should be directly
-     above the item you are documenting (a class, function, enum, etc) and the
-     first line should be "/**". For example:
-       /** This is a doxygen multiline comment.
-	*  Description of thingymebob here.
-	*/
-
-     The first line after the "**" is used as the short description of the item
-     (up to the full stop) and everything afterwards as the detailed description.
-
-
-2. Indentation
-
-   Tabs. Tabs. ONLY TABS. Use a single tab for each level of indentation,
-   for example:
-     int main()
-     {
-     <tab>if (condition)
-     <tab>{
-     <tab><tab>code
-     <tab>}
-     }
-
-
-3. Separation
-
-   Always put a space in between a keyword like if/while and the condition,
-   for example:
-     if (foo == bar)
-    NOT
-     if(foo == bar)
-
-
-4. Braces
-
-   Always put braces opening and closing blocks on separate lines, see the
-   identation example. For example, place braces like this:
-     if (apples == "green")
-     {
-         cout << "Apples are green" << endl;
-     }
-
-   and not:
-     if (apples == "green") {
-         cout << "Apples are green" << endl;
-     }
-
-   The one exception to this is if you are declaring a class method which is
-   only one line long, in that case the following is acceptable in most cases:
-     class foo : public bar
-     {
-         foo() { }
-	 getrandomfoo() { return rand(); }
-     };
-
-
-5. Templates
-
-   Where possible, use templates rather than #defines. Avoid use of RTTI.
-
-
-6. Structs
-
-   Structs should be declared in the following fashion:
-     struct BodyPartBasket
-     {
-         int arms;
-	 int legs;
-	 int scrotalsacs;
-     };
-   and not like this:
-     typedef struct
-     {
-         int arms;
-	 int legs;
-	 int scrotalsacs;
-     } BodyPartBasket;
-
-    The second way is not required in C++ to be able to do this:
-      BodyPartBasket mybasket;
-
-    Plus, placing the name at the bottom of the declaration makes readability
-    more difficult (as you have to scroll down to the bottom of the struct to
-    find its name). (where possible, call them classes rather than structs.)
-
-
-7. Variable naming
-
-   Class and struct names should be in camel case with a leading capital letter,
-   for example "MyBagOfBones" and not "my_bag_of_bones" or "mybagofbones".
-   Variable names can be in either camel case with a leading capital letter or
-   alternatively all lower case, so long as the same naming convention is
-   adhered to throughout the class. No classes or variables should be named in
-   capitals unless this makes sense for the name (for example "class DNS").
-   Constants and enum values should always be completely in CAPITALS and
-   underscores may be used, for example:
-     enum DecayState
-     {
-         DECAYED_MOULDY  = 0,
-	 DECAYED_SMELLY  = 1,
-	 DECAYED_MAGGOTS = 2
-     };
-   All value names in an enum should be started with the same text which should
-   be related in some way to the enum's use. For example "DNS_CNAME, DNS_A,
-   DNS_AAAA".
-
-
-8. Use of references
-
-   Wherever possible, when dealing with any complex class, pass a const reference
-   rather than a copy of the class. For example:
-     MyThingy::MyThingy(const std::string &thingyvalue)
-     {
-     }
-   Of course, if you intended to change the string you can just omit the 'const'.
-
-
-9. Use of char pointers
-
-   Whenever you use char pointers (char*, char**) try to use const equivalents.
-   This is much safer and avoids ugly and dangerous casts. For example:
-     MyThingy::Thingify(const char* const* wotsits)
-     {
-     }
-   If it is possible without performance loss, consider avoiding char pointers
-   altogether and using std::string instead.
-
-
-10. Use of STL
-
-    For more information on use of STL in InspIRCd, please see the separate
-    STL FAQ.
-
-
-11. Making copies of data
-
-   Never ever make a copy of a piece of data unless it is absolutely necessary.
-   For example, don't use strlcpy() to make a copy of the const char* string
-   returned by std::string::c_str(), if the change can be done to the std::string
-   itself. The same goes for unnecessary variable assignments, especially those
-   which assign large classes.
-
-
-12. namespace std
-
-   Avoid the following:
-     using namespace std;
-   It might take a bit more typing, but things work better if you don't set
-   (then later assume) the namespace -- specify it explicitly when you want to
-   use it.
-
-
-13. Linefeeds
-
-   Unix linefeeds only please. We do not like to see our screens covered in ^M.
-
-
-14. Portability
-
-   Always make sure your code is portable to all supported operating systems,
-   remember of course that as of 1.1.8 this includes windows. Don't write code
-   that only works on windows, or only works on Linux. Test your code on all
-   platforms or ask for help from other developers who have the platforms you
-   want to test on.
-
-   * new() and delete(), malloc() and free()
-     Apart from the fact that using malloc() and free() is bad practice in C++
-     code, you must never use malloc() or free() in InspIRCd, within its modules
-     or within the core. This is because if you use malloc() or free() in windows,
-     the memory is claimed from the program's local heap.
-     In windows, each shared object (module, dll) has its own heap, which is
-     protected from other dlls and executables. To get around this issue and
-     allow more posix-like memory access from other dlls in the program (other
-     modules), InspIRCd overrides the operators new and delete to ensure that
-     memory allocated by them comes from the windows global heap. If you use
-     malloc() and free() for this, the ircd will segfault when another module
-     tries to access the memory you have allocated!
-
-   * strdup()
-     As with malloc(), above, strdup() should be avoided. Where strdup() is
-     absolutely necessary, use strnewdup() which is our strdup() implementation
-     that calls operator new instead of using malloc().
-     char arrays allocated by strnewdup() should be deleted with operator delete[].
-
-   * CoreExport and DllImport
-     Prefix all types you want to import or export to other modules with CoreExport
-     and DllImport macros. These do nothing in POSIX operating systems, however
-     in windows these are expanded to the instructions __declspec(dllimport) and
-     __declspec(dllexport) respectively depending on where they are used and how.
-
-
-15. External Dependencies
-
-   If a module is compiled as standard, or the code is part of the core, you must
-   not use any dependencies that are not available as standard on all supported
-   operating systems beyond libstdc++, libc, and whatever else is currently
-   required to build the core. Modules which use nonstandard dependencies belong
-   in the modules/extra directory.
-
-
-16. Profiling and Performance
-
-   It is one thing to assume that code performs bad, it is another thing to prove
-   that it actually is. A lot of experienced programmers talk about 'premature
-   optimisation', and here is what it means: if you have a piece of code called
-   once on startup that takes 10 seconds instead of one second to run, and a
-   piece of code that takes 0.05 seconds to run when it should take 0.01, and
-   it is called once per second, the second piece of code is the priority.
-
-   In other words, make sure that what you think is slow, and a performance
-   problem in Insp actually is.
-   To do this, use the callgrind tool from Valgrind (valgrind --tool=cachegrind
-   bin/inspircd -nofork -debug), and kcachegrind (or similar) to view the output
-   files.

docs/Changes

@@ -1,185 +0,0 @@
-Anope Version 1.9.6
---------------------
-A Added ability to configure emails sent by services
-A Added chanserv/up and chanserv/down
-A Added m_proxyscan
-A Added more configurability for what vhosts are valid
-A Added chanserv/log
-A Added ability to configure ChanServ privileges
-A Added a new database format
-A Added SQLite support
-A Added more verbose messages on startup
-A Added ability for chanserv/suspend and nickserv/suspend to take an expiry time
-A Added no nickname ownership config option
-A Added m_rewrite
-A Added akill IDs
-F Fixed crash in clearusers
-F Fixed crash in /os oper info
-F Fixed eventfd Config check to work properly on OpenVZ
-
-Anope Version 1.9.5
---------------------
-A Extended LDAP support
-A Added os_oper, os_kill, os_forbid, m_statusupdate, cs_sync, and bs_autoassign
-A Added a new configuration file format
-A Added a new commands system
-A Added a new access system, and cs_flags
-F Fixed not logging debug logs to file
-F Fixed the mail delay time
-F Fixed sending account data for unconfirmed nicks
-F Fixed poll() engine build on FreeBSD
-F Fixed really large HELP replies being truncated
-F Fixed sometimes appending !*@* to valid hosts on access lists
-F Fixed m_ssl sometimes failing connecting for no reason
-F Fixed crash in cs_entrymsg
-F Fixed setting -P on channels with only a botserv bot in it
-F Fixed modemanager complaining about prefixless modes on InspIRCd
-
-Anope Version 1.9.4
---------------------
-A Automatically set channel founder to the user with the highest access if there is no successor
-A /chanserv clone command to copy settings from one channel to another.
-A /chanserv mode command
-A Ability for users to delete their own access in channels
-A Added support for Plexus 3
-A Readded in support for /cs op/deop/etc to op/deop you in all channels
-A Added LDAP support
-A Added live SQL support
-A Added support for learning tracking/storing/locking all modes at runtime
-A Added m_alias
-A Added support for XMLRPC queries
-A Added /botserv set msg
-A Added /operserv config
-A Added /ns cert
-A Added /operserv login
-F Changed the GHOST command to not allow ghosting unidentified users if the RECOVER command exists
-F Some failed logic in /operserv exception that prevents proper exceptions from being added
-F Fixed the anope_os_sxlines MySQL table and code to work after restarting
-
-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 Added nickserv/auxpex permission
-A Added nickserv ungroup command
-A Renamed the SGLINE to be SNLINE
-A Added /chanserv saset command
-A Added threads for mail sending
-A Added m_dnsbl and an asynchronous DNS system
-A Added a new language system that uses gettext
-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 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 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
-
-Anope Version 1.9.2
---------------------
-A K alias to chanserv kick command
-A KB alias to chanserv ban command
-A The ability to register empty nonregistered channels
-A Flatfile plaintext databases and removed old binary ones
-A Added in live updating SQL and the ability to execute commands through SQL (see docs/MYSQL)
-A Added support for many more modes into Anope and the ability to have generic support for modes unknown to Anope
-A Added a mode stacker to combine many mode changes into fewer
-A Added in the CS SET PERSIST command which can be used to keep service bots in channels even when the channel is empty
-A Added AUTOOWNER OWNER and OWNERME into CS LEVELS
-A Added ns_resetpass module to the core
-A CS ACCESS VIEW which shows who added the access and last time used
-A Last used time to CS AKICK VIEW
-A Added a sha_256 encryption module
-A Added the ability to load multiple encryption modules, and the ability to seamlessly convert your database between diferent encryptions
-A Added configuration options to allow Anope to reconnect if it disconnects from the uplink instead of dieing
-A Added support for linking with IPv6
-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 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
-F CS FORBID allows to you forbid unregistered channels
-F The -nothird command line option to work
-F ms_rsend to really work
-F SQUITing juped servers on InspIRCd1.2+
-
-Anope Version 1.9.1
---------------------
-F Don't enforce akick/forbidden/etc.-restrictions on clients on ulined servers.
-F Remove modules_unload_all fini + hack that goes with it.
-F Signal handling cleanup.
-A Seamless fantasy support on all ChanServ commands, instead of requiring bs_fantasy_*.
-F Allow fantasy to be disabled on some commands (e.g. FORBID).
-F Some commands (e.g. !help) need to strip the pre-provided channelname from them.
-D HelpServ removed
-F Command parser cleanup: mod_current_buffer removed and replaced with proper parser. Commands now indicate how they want the buffer split.
-F Make NS ENFORCE/RELEASE stuff more sane, redo timers.
-A Opertypes (similar to InspIRCd's opertypes)
-
-Provided by Ankit <ankit@nevitus.com> - 2009
-F Segfault on shutdown
-
-Provided by Adam <adam@anope.org> - 2009
-F NickServ registration is sometimes denied.
-F Applied patch from Adam to fix some potential screwups
-F More fixes to bs_bot from Adam, plus an extra fix within DoAdd not covered in Adam's patch.
-F Fix bs_bot to use the correct parameters, patch from Adam.
-F Fix for bug #1004, based from second half of patch from Adam.
-F Partial patch by Adam, commenting fix for #1006 for future reference.
-F Forward-port r1946:  Patch by Adam fixing #1006 (originally caused by #922): modes set by ChanServ are reversed. Thanks!
-
-Provided by DukePyrolator <dukepyrolator@gmx.de> - 2009
-F Patch converting all match calls to new method, thanks!
-F Add 'w' and 'y' support to dotime(), also prevent an overflow.
-F Allow NS STATUS from unregistered users, thanks DP!
-F Wild pointers do not a happy Anope make. Thanks DP :)
-F Allow NS REGISTER to unregistered nicks, silly oversight. Thanks DP! :)
-F Fix call order, thanks to DP
-F Pass the right array to do_umode(), fixes mode tracking on Unreal. Thanks to DukePyrolator (yet again :P)
-F Fix bs_set help, thanks to DukePyrolator! :)
-F Fix two segfaults, noted by DukePyrolator. Thanks!
-F Fix part one of #1010, reported by DukePyrolator. (Language settings are not respected in message sending.) Thanks!
-F Memory leak on +beI modes.
-
-Provided by Liber <Liber@jasonirc.net> - 2009
-F Support operoverride and such things (stop reversing changes from nonopped people where unnecessary)
-
-Anope Version 1.9.0
---------------------
-F Modified compile to use g++
-F Improve protocol modules support (classes, virtual methods, etc)
-F Move core services to use BotInfo
-F Move BotInfo and related methods into a class
-F Move modules into a class
-F Fixed ns resending of passcode issue
-F Modules now delete themselves
-F additional field where users' masked host can be stored so both masked IP and vhost are available instead of just one.
-F No struct Uid, ugly, and, unnecessary that we store UID in BotInfo.
-F Prevent deletion of core services via /bs bot
-F Module subsystem cleanup ('modules' branch)
-F Move modules to use classes somewhat (AnopeInit, AnopeFini)
-F Change MODULE_INIT to return a pointer
-F Remove duplicate module creation.. have loadModule return a pointer rather than creating one
-F Remove buffered loading/unloading, this makes os_modunload perm, but who cares
-F Remove 'delayed' loading, this is necessary because of before/after connected to ircd (ircd is before, rest after), I'm sure this can be done better.
-A Remove old config, replace with insp-inspired (albeit bind format) config (CBX)
-F Clean up protocol modules a bit
-A InspIRCd 1.2 support
-F Remove old (prior to 1.8.0) db compat
-F Establish a proper base for services pseudoclients
-F Add ss_main StatServ Hal9000 to play with :)
-F Burn automake with fire (CBX)
-
-Provided by mooncup <mooncup@anonnet.org> - 2009
-F Automatically reapply vhost on hs off for unreal.

docs/Changes.conf

@@ -1,122 +0,0 @@
-Anope Version 1.9.6
--------------------
-service:channels added to join services to channels
-mail block modified to allow configuring of email messages
-oper:host and oper:vhost added
-oper:require_oper added
-options:nonicknameownership added
-operserv:akillids added
-nickserv/access oper privilege added
-
-Anope Version 1.9.5
--------------------
-Don't even try it, get a new config and start over.
-
-Anope Version 1.9.4
--------------------
-** ADDED    CONFIGURATION DIRECTIVES **
-memoserv:modules added ms_ignore
-chanserv:modules added cs_clone and cs_mode
-nickserv:suspendexpire and nickserv:forbidexpire added
-chanserv:suspendexpire and chanserv:forbidexpire added
-module added cs_entrymsg
-nickserv:modules added ns_ajoin, ns_cert
-options:nomlock added
-log:target added globops
-nickserv:confirmemailchanges added
-operserv:modules added os_config, os_login
-
-** MODIFIED CONFIGURATION DIRECTIVES **
-operserv:notifications removed osglobal, osmode, oskick, osakill, ossnline, ossqline, osszline, osnoop, osjupe, getpass, setpass, forbid, drop
-renamed nickserv:preregexpire to nickserv:unconfirmedexpire
-
-** DELETED  CONFIGURATION DIRECTIVES **
-opertype:commands removed operserv/umode
-operserv:modules removed os_umode
-
-Anope Version 1.9.3
-------------------
-** ADDED    CONFIGURATION DIRECTIVES **
-nickserv/auspex privilege added
-SSL module added for SSL support
-opertype:inherits added to allow opertypes to inherit commands and privs from other opertypes
-Various nickserv/saset/* and chanserv/saset/* opertype command privileges added
-nickserv:modules added many new ns_set_command modules
-chanserv:modules added many new cs_set_command modules
-opertype:commands added nickserv/saset/* and chanserv/saset/*
-options:socketengine added to choose what socket engine to use
-module:cs_set_misc and module:ns_set_misc added to replace the old set url/icq/email modules
-options:hideprivilegedcommands added to hide privileged commands from normal users
-log block added to customize logging
-dns block added to configure dns settings
-m_dnsbl added
-mysql configuration block added
-
-** MODIFIED CONFIGURATION DIRECTIVES **
-opertype:commands changed operserv/sgline to opserv/snline
-operserv:modules changed os_sgline to os_snline
-operserv:modules added os_modreload
-operserv:sglineexpiry changed to operserv:snlineexpiry
-operserv:killonsgline changed to operserv:killonsnline
-operserv:notifications ossgline changed ossnline
-memoserv was made optional
-moved operserv:global configuration into its own global block
-chanserv was made optional
-
-** DELETED  CONFIGURATION DIRECTIVES **
-serverinfo:helpchannel removed because it has been readded in m_helpchan
-networkinfo:logchannel, logbot, logusers, logmaxusers, logchannel, and options:keeplogs removed because of the log block
-dumpcore because it really didn't do anything
-
-Anope Version 1.9.2
---------------------
-** ADDED    CONFIGURATION DIRECTIVES **
-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: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
-uplink:ipv6 added to enable IPv6 connectivity
-options:maxretries added to specify the number of reconnect attempts allowed
-options:retrywait added to specify how long to wait between reconnect attempts
-opertype command chanserv/aop/list removed as it was unnecessary, use chanserv/access/list instead
-
-** MODIFIED CONFIGURATION DIRECTIVES **
-options:encryption added enc_sha256
-chanserv:modules added cs_unban
-nickserv:modules added ns_resetpass
-
-** DELETED  CONFIGURATION DIRECTIVES **
-nickserv:database deleted because of new database system
-nickserv:prenickdatabase deleted because of new database system
-chanserv:database deleted because of the new database system
-botserv:database deleted because of the new database system
-hostserv:database deleted because of the new database system
-operserv:database deleted because of the new database system
-operserv:newsdatabase deleted because of the new database system
-operserv:exceptiondatabase deleted because of the new database system
-hs_request:database deleted because of the new database system
-os_ignore:database deleted because of the new database system
-serverinfo:localport deleted
-
-Anope Version 1.9.1
--------------------
-** ADDED    CONFIGURATION DIRECTIVES **
-Opertypes have been added, through the opertype blocks.
-Services Operators are now specified in the oper blocks.
-
-** MODIFIED CONFIGURATION DIRECTIVES **
-botserv:modules no longer contains bs_fantasy* modules, fantasy is now seamless.
-operserv:modules has replaced os_logonnews, os_opernews, and os_randomnews with os_news.
-operserv:modules no longer contains os_admin and os_oper modules, removed in favor of oper blocks.
-operserv:notifications no longer contains osraw due to removal of OS RAW.
-
-** DELETED  CONFIGURATION DIRECTIVES **
-Nick tracking has been removed as an option.
-Restricting of NS GETPASS and CS GETPASS removed in favor of opertypes.
-Host Setters were removed in favor of opertypes.
-HelpServ has been removed entirely.
-operserv:disableraw removed due to removal of OS RAW.

docs/DEFCON

@@ -1,4 +1,4 @@
-Anope DefCon 
+Anope DefCon
 ------------
 
 1) Introduction
@@ -10,8 +10,8 @@ Anope DefCon
 
 1) Introduction
 
-    Anope 1.6 onwards supports a unique protection mechanism based on the
-    military "Defense Readiness Condition" (DefCon) system. It is based on 
+    Anope supports a unique protection mechanism based on the
+    military "Defense Readiness Condition" (DefCon) system. It is based on
     5 levels of defense readiness defined as:
 
     DEFCON5 Normal peacetime readiness
@@ -23,9 +23,9 @@ Anope DefCon
     These are configurable levels that mandates what actions Anope should
     take in case of emergency and change in readiness status.
 
-    It is used to prevent abuse to both Services, and the ircd on which they 
+    It is used to prevent abuse to both Anope, and the IRCd on which they
     are running. Also to protect the users, primarily in the event of Clones
-    and/or FloodBOT attacks. 
+    and/or FloodBOT attacks.
 
 2) Installation
 
@@ -44,26 +44,26 @@ Anope DefCon
 
     Pre-defined DefCon actions:
 
-    No new channel registrations 
-    No New Nick Registrations 
+    No new channel registrations
+    No New Nick Registrations
     No Mode Lock changes
-    Force Chan Mode 
-    Use Reduced Session Limit 
-    KILL any new clients trying to connect 
-    Services will ignore everyone but opers 
-    Services will silently ignore everyone but opers 
-    AKILL all new clients trying to connect 
+    Force Chan Mode
+    Use Reduced Session Limit
+    KILL any new clients trying to connect
+    Ignore everyone but opers
+    Silently ignore everyone but opers
+    AKILL all new clients trying to connect
     No new memos sent to block MemoServ attacks
-    
+
     Information regarding how to enable this for specific defcon levels can
     be found in operserv.conf
 
 4) Usage
 
-    Anope starts up in DEFCON5 (normal readiness). To change the Defcon level 
-    in action use: 
-    
-    /msg OperServ DEFCON 1|2|3|4|5 
+    Anope starts up in DEFCON5 (normal readiness). To change the Defcon level
+    in action use:
+
+    /msg OperServ DEFCON 1|2|3|4|5
 
 5) Usage Example
 
@@ -89,6 +89,5 @@ 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.
-
+    You might get DefCon support by posting on our online forum, or maybe on
+    our #anope channel at /server irc.teranova.net.

docs/Doxyfile

@@ -0,0 +1,313 @@
+DOXYFILE_ENCODING      = UTF-8
+PROJECT_NAME           = "Anope"
+PROJECT_NUMBER         = 2.0
+PROJECT_BRIEF          =
+PROJECT_LOGO           =
+PROJECT_ICON           = src/win32/anope-icon.ico
+OUTPUT_DIRECTORY       = docs/doxygen
+CREATE_SUBDIRS         = NO
+CREATE_SUBDIRS_LEVEL   = 8
+ALLOW_UNICODE_NAMES    = NO
+OUTPUT_LANGUAGE        = English
+BRIEF_MEMBER_DESC      = YES
+REPEAT_BRIEF           = YES
+ABBREVIATE_BRIEF       = "The $name class" \
+                         "The $name widget" \
+                         "The $name file" \
+                         is \
+                         provides \
+                         specifies \
+                         contains \
+                         represents \
+                         a \
+                         an \
+                         the
+ALWAYS_DETAILED_SEC    = NO
+INLINE_INHERITED_MEMB  = NO
+FULL_PATH_NAMES        = YES
+STRIP_FROM_PATH        =
+STRIP_FROM_INC_PATH    =
+SHORT_NAMES            = NO
+JAVADOC_AUTOBRIEF      = NO
+JAVADOC_BANNER         = NO
+QT_AUTOBRIEF           = NO
+MULTILINE_CPP_IS_BRIEF = NO
+PYTHON_DOCSTRING       = YES
+INHERIT_DOCS           = YES
+SEPARATE_MEMBER_PAGES  = NO
+TAB_SIZE               = 4
+ALIASES                =
+OPTIMIZE_OUTPUT_FOR_C  = NO
+OPTIMIZE_OUTPUT_JAVA   = NO
+OPTIMIZE_FOR_FORTRAN   = NO
+OPTIMIZE_OUTPUT_VHDL   = NO
+OPTIMIZE_OUTPUT_SLICE  = NO
+EXTENSION_MAPPING      =
+MARKDOWN_SUPPORT       = YES
+TOC_INCLUDE_HEADINGS   = 5
+MARKDOWN_ID_STYLE      = GITHUB
+AUTOLINK_SUPPORT       = YES
+AUTOLINK_IGNORE_WORDS  =
+BUILTIN_STL_SUPPORT    = YES
+CPP_CLI_SUPPORT        = NO
+SIP_SUPPORT            = NO
+IDL_PROPERTY_SUPPORT   = YES
+DISTRIBUTE_GROUP_DOC   = NO
+GROUP_NESTED_COMPOUNDS = NO
+SUBGROUPING            = YES
+INLINE_GROUPED_CLASSES = NO
+INLINE_SIMPLE_STRUCTS  = NO
+TYPEDEF_HIDES_STRUCT   = NO
+LOOKUP_CACHE_SIZE      = 0
+NUM_PROC_THREADS       = 0
+TIMESTAMP              = NO
+EXTRACT_ALL            = YES
+EXTRACT_PRIVATE        = NO
+EXTRACT_PRIV_VIRTUAL   = NO
+EXTRACT_PACKAGE        = NO
+EXTRACT_STATIC         = NO
+EXTRACT_LOCAL_CLASSES  = NO
+EXTRACT_LOCAL_METHODS  = NO
+EXTRACT_ANON_NSPACES   = NO
+RESOLVE_UNNAMED_PARAMS = YES
+HIDE_UNDOC_MEMBERS     = NO
+HIDE_UNDOC_CLASSES     = NO
+HIDE_UNDOC_NAMESPACES  = YES
+HIDE_FRIEND_COMPOUNDS  = NO
+HIDE_IN_BODY_DOCS      = NO
+INTERNAL_DOCS          = NO
+CASE_SENSE_NAMES       = SYSTEM
+HIDE_SCOPE_NAMES       = NO
+HIDE_COMPOUND_REFERENCE= NO
+SHOW_HEADERFILE        = YES
+SHOW_INCLUDE_FILES     = YES
+SHOW_GROUPED_MEMB_INC  = NO
+FORCE_LOCAL_INCLUDES   = NO
+INLINE_INFO            = YES
+SORT_MEMBER_DOCS       = YES
+SORT_BRIEF_DOCS        = NO
+SORT_MEMBERS_CTORS_1ST = NO
+SORT_GROUP_NAMES       = NO
+SORT_BY_SCOPE_NAME     = NO
+STRICT_PROTO_MATCHING  = NO
+GENERATE_TODOLIST      = YES
+GENERATE_TESTLIST      = YES
+GENERATE_BUGLIST       = YES
+GENERATE_DEPRECATEDLIST= YES
+ENABLED_SECTIONS       =
+MAX_INITIALIZER_LINES  = 30
+SHOW_USED_FILES        = YES
+SHOW_FILES             = YES
+SHOW_NAMESPACES        = YES
+FILE_VERSION_FILTER    =
+LAYOUT_FILE            =
+CITE_BIB_FILES         =
+EXTERNAL_TOOL_PATH     =
+QUIET                  = NO
+WARNINGS               = YES
+WARN_IF_UNDOCUMENTED   = NO
+WARN_IF_DOC_ERROR      = YES
+WARN_IF_INCOMPLETE_DOC = YES
+WARN_NO_PARAMDOC       = NO
+WARN_IF_UNDOC_ENUM_VAL = NO
+WARN_LAYOUT_FILE       = YES
+WARN_AS_ERROR          = NO
+WARN_FORMAT            = "$file:$line: $text"
+WARN_LINE_FORMAT       = "at line $line of file $file"
+WARN_LOGFILE           =
+INPUT                  = README.md \
+                         include
+INPUT_ENCODING         = UTF-8
+INPUT_FILE_ENCODING    =
+FILE_PATTERNS          =
+RECURSIVE              = YES
+EXCLUDE                =
+EXCLUDE_SYMLINKS       = YES
+EXCLUDE_PATTERNS       =
+EXCLUDE_SYMBOLS        =
+EXAMPLE_PATH           =
+EXAMPLE_PATTERNS       =
+EXAMPLE_RECURSIVE      = NO
+IMAGE_PATH             =
+INPUT_FILTER           =
+FILTER_PATTERNS        =
+FILTER_SOURCE_FILES    = NO
+FILTER_SOURCE_PATTERNS =
+USE_MDFILE_AS_MAINPAGE = README.md
+IMPLICIT_DIR_DOCS      = YES
+FORTRAN_COMMENT_AFTER  = 72
+SOURCE_BROWSER         = NO
+INLINE_SOURCES         = NO
+STRIP_CODE_COMMENTS    = YES
+REFERENCED_BY_RELATION = NO
+REFERENCES_RELATION    = NO
+REFERENCES_LINK_SOURCE = YES
+SOURCE_TOOLTIPS        = YES
+USE_HTAGS              = NO
+VERBATIM_HEADERS       = YES
+ALPHABETICAL_INDEX     = YES
+IGNORE_PREFIX          =
+GENERATE_HTML          = YES
+HTML_OUTPUT            = html
+HTML_FILE_EXTENSION    = .html
+HTML_HEADER            =
+HTML_FOOTER            =
+HTML_STYLESHEET        =
+HTML_EXTRA_STYLESHEET  =
+HTML_EXTRA_FILES       =
+HTML_COLORSTYLE        = AUTO_LIGHT
+HTML_COLORSTYLE_HUE    = 220
+HTML_COLORSTYLE_SAT    = 100
+HTML_COLORSTYLE_GAMMA  = 80
+HTML_DYNAMIC_MENUS     = YES
+HTML_DYNAMIC_SECTIONS  = NO
+HTML_CODE_FOLDING      = YES
+HTML_COPY_CLIPBOARD    = YES
+HTML_PROJECT_COOKIE    =
+HTML_INDEX_NUM_ENTRIES = 100
+GENERATE_DOCSET        = NO
+DOCSET_FEEDNAME        = "Doxygen generated documentation"
+DOCSET_FEEDURL         =
+DOCSET_BUNDLE_ID       = org.doxygen.Project
+DOCSET_PUBLISHER_ID    = org.doxygen.Publisher
+DOCSET_PUBLISHER_NAME  = Publisher
+GENERATE_HTMLHELP      = NO
+CHM_FILE               =
+HHC_LOCATION           =
+GENERATE_CHI           = NO
+CHM_INDEX_ENCODING     =
+BINARY_TOC             = NO
+TOC_EXPAND             = NO
+SITEMAP_URL            =
+GENERATE_QHP           = NO
+QCH_FILE               =
+QHP_NAMESPACE          = org.doxygen.Project
+QHP_VIRTUAL_FOLDER     = doc
+QHP_CUST_FILTER_NAME   =
+QHP_CUST_FILTER_ATTRS  =
+QHP_SECT_FILTER_ATTRS  =
+QHG_LOCATION           =
+GENERATE_ECLIPSEHELP   = NO
+ECLIPSE_DOC_ID         = org.doxygen.Project
+DISABLE_INDEX          = NO
+GENERATE_TREEVIEW      = NO
+FULL_SIDEBAR           = NO
+ENUM_VALUES_PER_LINE   = 4
+SHOW_ENUM_VALUES       = NO
+TREEVIEW_WIDTH         = 250
+EXT_LINKS_IN_WINDOW    = NO
+OBFUSCATE_EMAILS       = YES
+HTML_FORMULA_FORMAT    = png
+FORMULA_FONTSIZE       = 10
+FORMULA_MACROFILE      =
+USE_MATHJAX            = NO
+MATHJAX_VERSION        = MathJax_2
+MATHJAX_FORMAT         = HTML-CSS
+MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
+MATHJAX_EXTENSIONS     =
+MATHJAX_CODEFILE       =
+SEARCHENGINE           = YES
+SERVER_BASED_SEARCH    = NO
+EXTERNAL_SEARCH        = NO
+SEARCHENGINE_URL       =
+SEARCHDATA_FILE        = searchdata.xml
+EXTERNAL_SEARCH_ID     =
+EXTRA_SEARCH_MAPPINGS  =
+GENERATE_LATEX         = NO
+LATEX_OUTPUT           = latex
+LATEX_CMD_NAME         =
+MAKEINDEX_CMD_NAME     = makeindex
+LATEX_MAKEINDEX_CMD    = makeindex
+COMPACT_LATEX          = NO
+PAPER_TYPE             = a4
+EXTRA_PACKAGES         =
+LATEX_HEADER           =
+LATEX_FOOTER           =
+LATEX_EXTRA_STYLESHEET =
+LATEX_EXTRA_FILES      =
+PDF_HYPERLINKS         = YES
+USE_PDFLATEX           = YES
+LATEX_BATCHMODE        = NO
+LATEX_HIDE_INDICES     = NO
+LATEX_BIB_STYLE        = plainnat
+LATEX_EMOJI_DIRECTORY  =
+GENERATE_RTF           = NO
+RTF_OUTPUT             = rtf
+COMPACT_RTF            = NO
+RTF_HYPERLINKS         = NO
+RTF_STYLESHEET_FILE    =
+RTF_EXTENSIONS_FILE    =
+RTF_EXTRA_FILES        =
+GENERATE_MAN           = NO
+MAN_OUTPUT             = man
+MAN_EXTENSION          = .3
+MAN_SUBDIR             =
+MAN_LINKS              = NO
+GENERATE_XML           = NO
+XML_OUTPUT             = xml
+XML_PROGRAMLISTING     = YES
+XML_NS_MEMB_FILE_SCOPE = NO
+GENERATE_DOCBOOK       = NO
+DOCBOOK_OUTPUT         = docbook
+GENERATE_AUTOGEN_DEF   = NO
+GENERATE_SQLITE3       = NO
+SQLITE3_OUTPUT         = sqlite3
+SQLITE3_RECREATE_DB    = YES
+GENERATE_PERLMOD       = NO
+PERLMOD_LATEX          = NO
+PERLMOD_PRETTY         = YES
+PERLMOD_MAKEVAR_PREFIX =
+ENABLE_PREPROCESSING   = YES
+MACRO_EXPANSION        = YES
+EXPAND_ONLY_PREDEF     = NO
+SEARCH_INCLUDES        = YES
+INCLUDE_PATH           =
+INCLUDE_FILE_PATTERNS  =
+PREDEFINED             = CoreExport=/**/ \
+                         ATTR_NOT_NULL(...)=/**/
+EXPAND_AS_DEFINED      =
+SKIP_FUNCTION_MACROS   = YES
+TAGFILES               =
+GENERATE_TAGFILE       =
+ALLEXTERNALS           = NO
+EXTERNAL_GROUPS        = YES
+EXTERNAL_PAGES         = YES
+HIDE_UNDOC_RELATIONS   = YES
+HAVE_DOT               = NO
+DOT_NUM_THREADS        = 0
+DOT_COMMON_ATTR        = "fontname=Helvetica,fontsize=10"
+DOT_EDGE_ATTR          = "labelfontname=Helvetica,labelfontsize=10"
+DOT_NODE_ATTR          = "shape=box,height=0.2,width=0.4"
+DOT_FONTPATH           =
+CLASS_GRAPH            = YES
+COLLABORATION_GRAPH    = YES
+GROUP_GRAPHS           = YES
+UML_LOOK               = NO
+UML_LIMIT_NUM_FIELDS   = 10
+DOT_UML_DETAILS        = NO
+DOT_WRAP_THRESHOLD     = 17
+TEMPLATE_RELATIONS     = NO
+INCLUDE_GRAPH          = YES
+INCLUDED_BY_GRAPH      = YES
+CALL_GRAPH             = NO
+CALLER_GRAPH           = NO
+GRAPHICAL_HIERARCHY    = YES
+DIRECTORY_GRAPH        = YES
+DIR_GRAPH_MAX_DEPTH    = 1
+DOT_IMAGE_FORMAT       = png
+INTERACTIVE_SVG        = NO
+DOT_PATH               =
+DOTFILE_DIRS           =
+DIA_PATH               =
+DIAFILE_DIRS           =
+PLANTUML_JAR_PATH      =
+PLANTUML_CFG_FILE      =
+PLANTUML_INCLUDE_PATH  =
+PLANTUMLFILE_DIRS      =
+DOT_GRAPH_MAX_NODES    = 50
+MAX_DOT_GRAPH_DEPTH    = 0
+DOT_MULTI_TARGETS      = NO
+GENERATE_LEGEND        = YES
+DOT_CLEANUP            = YES
+MSCGEN_TOOL            =
+MSCFILE_DIRS           =

docs/EVENTS

@@ -1,42 +0,0 @@
-Anope Internal Events
----------------------
-
-1) Intro
-2) Using Events
-
-1) Introduction to Internal Events
-
-    Internal Events are setup to give module developers more information
-    about what the core is doing at different times. This information can
-    be as complex as data we are feeding to the uplink, to simple triggered
-    events such as the databases being saved. 
-
-    Additionally there is a module included with the core
-    which can  provide some clue as to how to use the code in your modules.
-    The rest of this document assumes that you are used to writing modules.
-
-2) Using Events
-
-    Anope is told about modules wanting to hook to events by the function
-    ModuleManager::Attach(EventName, Module*);, eg:
-
-    ModuleManager::Attach(I_OnJoinChannel, this);
-
-    You can also specifcy an array of events:
-
-    Implementation i[] = { I_OnJoinChannel, I_OnPartChannel };
-    ModuleManager::Attach(i, this, 2);
-    Where 2 is the number of events in the list
-
-    You must then overload these functions in your main modules class.
-    The full list of functions and parameters are in modules.h. In this
-    case, you would be overloading OnJoinChannel() and OnPartChannel() like so:
-
-    void OnJoinChannel(User *u, Channel *c) { }
-    void OnPartChannel(User *u, Channel *c) { }
-
-    Some of these events can be used to prevent or allow things to happen that
-    would normally not be allowed or denied. You can also use ModuleManager
-    (not explained here) to set control which order the modules are queried
-    (when multiple modules hook to the same event).
-

docs/FAQ

@@ -1,10 +1,10 @@
 Frequently Asked Questions (FAQ) concerning Anope
-------------------------------------------------
- 
-The information in the 1.9 FAQ is subject to change at any
+-------------------------------------------------
+
+The information in the 2.0 FAQ is subject to change at any
 moment due to new developments. Please visit our website
 for the most up to date information.
- 
+
 An updated version of the FAQ can be found here:
 
-http://wiki.anope.org/index.php/FAQ
+https://wiki.anope.org/index.php/2.0/FAQ

docs/INSTALL

@@ -19,159 +19,88 @@ Note: You should also read the README and FAQ files!
     The very first thing you need to do is to get the Anope package (if not
     already done). You can find it at:
 
-        http://www.anope.org/
+        https://www.anope.org/
 
-    Anope can be built one of two ways. The recommended way is to use CMake.
-    You can check if CMake is already installed on your system using the
-    command:
+    Anope requires cmake to build. You can check if CMake is already
+    installed on your system using the command:
 
         cmake --version
 
     If it's installed, you will get a line that says something similar to
-    "cmake version 2.6-patch 1". If the version is less than 2.4 or you get
+    "cmake version 3.28.3". If the version is less than 3.20.0 or you get
     an error saying the command was not found, you will not be able to use
     CMake unless you install it yourself into your home directory. CMake
     can be downloaded from:
 
-        http://www.cmake.org/cmake/resources/software.html
-
-    If you are unable to install CMake yourself (either due to lack of space
-    or restrictions by your hosting provider), you still have the alternative
-    to use the provided configure script. This option is not recommended and
-    will eventually be phased out, but is provided for compatibility for those
-    lacking CMake.
+        https://cmake.org/download/
 
     Next, unpack the package in your home directory, and go into the created
     directory.
 
+    If there are any extra modules you want to enable, such as mysql, run
+    the 'extras' script to enable them. If you do not know you can come back
+    later and enable them.
+
     Now type ./Config to start the configuration script. It will ask you a
     few questions, and figure out how to compile Anope on your system. If
     you are unsure about the answer to a question, use the default value.
-    The question to using configure or cmake depends on your decision from
-    above. If you have CMake and wish to use it, answer with cmake, otherwise
-    answer with configure.
 
-    You can now type make to compile Anope. If there are errors in the
-    Makefile, *try to use gmake* instead. If it still doesn't work, you (or
-    the system administrator if it's a shell) must install GNU make. You may
-    find it at ftp://prep.ai.mit.edu/pub/gnu/.
-
-    Now type make install (or gmake install; see above). This will install
+    Now cd build and type make and make install. This will install
     all the needed files in the paths you specified with the configure
     script, and setup file permissions. You should ensure that the data
     directory is not accessible by other users, as malicious users may
     cause trouble on your network if passwords are not encrypted, or read
     the memos of any user.
 
-    If you see errors during this process, please mail us with the *complete*
-    error output, and don't forget to mention your OS, compiler and C++ library
-    versions.
-
-    Now go into the data directory (by default, ~/services/data). Copy the example
-    configuration file (example.conf) to services.conf, and open the latter
+    Now go into the conf directory (by default, ~/anope/conf). Copy the example
+    configuration file (anope.example.conf) to anope.conf, and open the latter
     with your favorite text editor. It contains all the configuration
     directives Anope will use at startup. Read the instructions contained in
     the file carefully. Using the default values is NOT a good idea, and will
     most likely not work!
 
-    If you need help, you should subscribe to the Anope mailing list and mail
-    there to get help from other users. See the README file for more
-    information.
+    If you need help, you should visit https://forum.anope.org/ or #anope on
+    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.
 
 2) Upgrading Anope
 
-    If you got a .diff file and want to patch the old Anope sources with it,
-    do the following:
-
-        * Copy the .diff file into the root Anope sources directory.
-        * Type patch -p1 <file.diff
-
-    Note that upgrading anope with a patchfile isn't recommended. You should
-    download a new, clean source package, as this will give the best results.
-
     To upgrade Anope, just follow the installation instructions described in
     section 1. There are however a few specific guidelines:
 
         * IMPORTANT: Back up your old databases!
         * If you are upgrading to a new major release, ALWAYS restart a
-          fresh configuration file from example.conf.
+          fresh configuration file from anope.example.conf.
 
 3) Setting up the IRCd
 
-    Services acts as an IRC server with pseudo-clients on it. To link them to
-    your network, you'll need to add some lines in the ircd.conf of their hub
-    server (as stated in the RemoteServer configuration directive).
+    Anope acts as an IRC server with pseudo-clients on it. To link them to
+    your network, you'll need to configure your IRCd to allow services to link.
 
-    For samples below we'll take services.localhost.net as the name of the
-    Services (as stated in the ServerName configuration directive). Note that
-    this samples are made to be as generic as possible, but there might be
-    small variations, depending on your IRCd. For IRCd-specific help with
-    configuration, read near the end of this section.
+    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 listening on the given port
+    in the link block.
 
-    First, the C/N lines, that allow Services to link. They also need a
-    Y:line to work correctly.
-
-        Y:27:180:0:0:4000000
-        C:127.0.0.1:mypass:services.localhost.net::30
-        N:127.0.0.1:mypass:services.localhost.net::30
-
-    "mypass" is the same password you mentioned in the RemoteServer
-    configuration directive. 127.0.0.1 is the IP from which Services connect
-    from (linking in localhost is the most efficient way to run Services).
-
-    Then, you have to set-up an U:line, that will allow Services to change
-    channel modes, topics, and much more without being opped in the channel.
-
-        U:services.localhost.net:*:*
-
-    NOTE: if you have more than one server in your network, this line MUST
-          be added on ALL servers, or things won't work correctly.
-
-    Finally, you'll need to add an H:line, to make the OperServ JUPE command
-    work correctly.
-
-        H:*::Services.LocalHost.Net
+    Example link configurations can be found in anope.example.conf for some of the
+    popular IRCds.
 
     Don't forget to /rehash your IRCd to apply changes.
 
-    A new trend in ircd configuration is popping all over the place, good
-    examples are the latest Hybrid, Unreal and Bahamut, which use a more
-    "readable" form of configuration. For those, use something like:
-
-        link services.localhost.net
-        {
-            username        *;
-            hostname        localhost;
-            bind-ip         *;
-            port            6667;
-            hub             *;
-            password-connect "mypass";
-            password-receive "mypass";
-            class           servers;
-        };
-
-    Note that this block-style configuration files differ heavily, depending
-    on the IRCd. Consult the interactive link maker (link is below) for more
-    details on the exact configuration used by your IRCd.
-
-    If you're unable to get a link with your IRCd after reading this section,
-    you might try the interactive link maker, which is located at:
-
-        http://anope.org/ilm.php
-
 4) Starting Anope
 
     Go into the directory where binaries were installed (by default, this is
-    ~/services/bin). Type ./services to launch Anope.
+    ~/anope/bin). Type ./anope to launch Anope.
 
     If there are syntax errors in the configuration file they will be
     displayed on the screen. Correct them until there are no errors anymore.
     A successful startup won't generate any message.
 
-    Give Services at least one minute to link to your network, as certain
+    Give Anope at least one minute to link to your network, as certain
     IRCds on some OSes may be really slow for the link process. If nothing
     happens after about a minute, it is probably a configuration problem. Try
-    to launch Anope with ./services -debug -nofork to see any errors that it
+    to launch Anope with ./anope -debug -nofork to see any errors that it
     encounters, and try to correct them.
 
     If you need help to solve errors, feel free to subscribe to the Anope
@@ -182,17 +111,17 @@ Note: You should also read the README and FAQ files!
     A crontab entry will allow you to check periodically whether Anope is
     still running, and restart it if not.
 
-    First rename the example.chk script that is in Anope path (by default,
-    this is ~/services/data) to services.chk and edit it. You'll need to 
-    modify the CONFIGURATION part of the file. Then ensure that the file is 
-    marked as executable by typing chmod +x services.chk, and try to launch the
+    First rename the cron.example.sh script that is in Anope path (by default,
+    this is ~/anope/conf) to cron.sh and edit it. You'll need to
+    modify the CONFIGURATION part of the file. Then ensure that the file is
+    marked as executable by typing chmod +x cron.sh, and try to launch the
     script to see if it works (Anope must not be running when you do this ;))
 
     When this is done, you'll have to add the crontab entry. Type crontab -e.
     This will open the default text editor with the crontab file. Enter the
     following (with correct path):
 
-        */5 * * * * /home/ircd/services/data/services.chk >/dev/null 2>&1
+        */5 * * * * /home/ircd/anope/conf/cron.sh >/dev/null 2>&1
 
     The */5 at the beginning means "check every 5 minutes". You may replace
     the 5 with other another number if you want (but less than 60). Consult

docs/INSTALL.fr

@@ -1,209 +1,144 @@
-Installation et instructions d'anope
-------------------------------------
+Instructions d'installation d'Anope
+-----------------------------------
 
-1) Instalation d'anope
-2) Mise à jour d'anope
-3) Configuration de l'ircd
-4) Mise en route de anope
-5) Mise en place d'un fichier crontab
+1) Installation d'Anope
+2) Mettre à jour Anope
+3) Configuration de l'IRCd
+4) Mettre en route Anope
+5) Mettre en place un crontab
 
-Note: Vous devrez également lire les fichiers README et FAQ !
+Note : Vous devrez également lire les fichiers README et FAQ !
 
-1) Installation de anope
+1) Installation d'Anope
 
-      Note importante: il n'est pas recommandé d'utiliser (et même d'installer)
-                     Anope en tant que root.
-                     Utilisez un utilisateur non privilégié,
+    NOTE IMPORTANTE : il est déconseillé d'utiliser (et même d'installer)
+                      Anope en tant que root. Utilisez un utilisateur non
+                      privilégié. Celui que vous utilisez pour l'IRCd ou
+		              un utilisateur dédié suffira.
 
+    La première chose que vous devez faire est d'obtenir le package Anope
+    (si ce n'est déjà fait). Vous pouvez le trouver ici :
 
-La première chose que vous devez faire est d'obtenir le package Anope (si ce n'est déjà fait).
+        https://www.anope.org/
 
-Vous pouvez le trouver ici  http://www.anope.org/
+    Anope nécessite cmake pour être compilé. Vous pouvez vérifier si CMake
+    est déjà installé sur votre système avec la commande :
 
+        cmake --version
 
+    Si CMake est installé, vous aurez une ligne qui dit quelque chose comme
+    "cmake version 3.28.3". Si la version est inférieure à 3.20.0 ou si vous
+    obtenez une erreur disant que la commande n'a pas été trouvée, vous ne
+    pourrez pas utiliser CMake à moins de l'installer vous-même dans votre
+    répertoire home. CMake peut être téléchargé ici :
 
-Anope peut être installer de deux façons.
+        https://cmake.org/download/
 
- 1.  La méthode recommandée est d'utiliser CMake.
-     Vous pouvez vérifier si CMake est déjà installé sur votre système en utilisant la
+    Ensuite, décompressez le package dans votre répertoire home, et allez
+    dans le répértoire qui vient d'être créé.
 
-     commande:  cmake --version ( sur votre vps ou dedier etre loggué en root )
+    Si il y a des modules facultatifs que vous voulez activer comme mysql,
+    exécuter le script 'extras' pour les activer. Si vous ne savez pas, vous
+    pouvez les activer plus tard.
 
+    Maintenant, tapez ./Config pour lancer le script de configuration. Il
+    va vous poser quelques questions, et déterminer comment compiler Anope
+    sur votre système. Si vous ne savez pas comment répondre à une question,
+    utilisez la valeur par défaut.
 
-     Si c'est installé, vous aurez une ligne qui dit quelque chose qui ressemble à
+    Allez dans le dossier build (cd build) et tapez make et make install.
+    Ceci va installer tous les fichiers nécessaires dans les dossiers que
+    vous avez indiqués avec le script Config et régler les permissions des
+    fichiers. Vous devez vous assurer que le répertoire data n'est pas
+    accessible par les autres utilisateurs, car des utilisateurs
+    malveillants pourraient causer des problèmes sur votre réseau, si les
+    mots de passe ne sont pas chiffrés, ou lire les mémos de tous les
+    utilisateurs.
 
-     «version 2.6 cmake-patch 1".
+    Allez maintenant dans le répertoire conf (par défaut, ~/anope/conf).
+    Copiez l'exemple de fichier de configuration (anope.example.conf) en
+    anope.conf et ouvrez ce dernier avec votre éditeur de texte favori.
+    Il contient toutes les directives de configuration qu'Anope va utiliser
+    en démarrant. Lisez attentivement les instructions contenues dans le
+    fichier. L'utilisation des valeurs par défaut n'est pas toujours
+    recommandée, et Anope ne fonctionnera probablement pas !
 
-     Si la version est inférieure à 2,4 ou si vous obtenez une erreur disant que la commande n'a pas été trouvé,
-     vous ne serez pas en mesure d'utiliser CMake,
+    Si vous avez besoin d'aide, vous pouvez aller sur le site
+    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
+    pour plus d'informations.
 
-     sauf si vous installez vous-même dans votre répertoire home. CMake
-     vous pouvez le téléchargé ici >  http://www.cmake.org/cmake/resources/software.html
+2) Mettre à jour Anope
 
+    Pour mettre à jour Anope, suivez simplement les instructions
+    d'installation décrites dans la section 1. Prenez garde cependant :
 
-     Si vous n'arrivez pas à installer (soit en raison du manque d'espace
-     ou de restrictions par votre fournisseur d'hébergement),
-     vous pouvez encore utiliser le script de configuration fournis.
-     Cette option n'est pas recommandée et finira par être retiré, mais il est fourni pour la compatibilité de ces
-     manque de CMake.
+        * IMPORTANT : Sauvegardez vos anciennes bases de données !
+        * Si vous mettez à jour vers une nouvelle version majeure,
+          recommencez *toujours* toute votre configuration à partir du
+          fichier anope.example.conf.
 
+3) Configuration de l'IRCd
 
+    Anope agit comme un serveur IRC avec des pseudo-clients.
+    Pour les relier à votre réseau, vous aurez besoin de configurer votre
+    IRCd pour permettre aux services de se connecter.
 
-    Ensuite, décompressez le package dans votre répertoire home, et allez dans le répértoire
-    qui viens d'être crée.
+    La configuration dépend de l'IRCd utilisé, mais vous aurez probablement
+    besoin d'un bloc link (aussi appelé connect block, ou C:line) et un
+    U:line (aussi appelé shared block). Assurez-vous que l'IRCd écoute
+    sur le port donné dans le bloc link.
 
-    Maintenant, tapez ./Config pour lancer le script de configuration. Il va vous poser
-    quelques questions, et compiler Anope sur votre système.
+    Des exemples de configurations de bloc link peuvent être trouvés dans
+    le fichier anope.example.conf pour certains des IRCd les plus populaires.
 
-    Si vous ne savez pas repondre à une question, utilisez la valeur par défaut.
+    Souvenez-vous de /rehash votre IRCd pour appliquer les changements.
 
+4) Mettre en route Anope
 
-    Vous pouvez maintenant taper make pour compiler Anope. S'il ya des erreurs dans la
-    Makefile, * essayez d'utiliser * gmake au lieu. Si cela ne fonctionne toujours pas, vous (ou
-    votre fournisseur ) doit installer GNU make. Vous pouvez
-    le Trouvez sur ftp://prep.ai.mit.edu/pub/gnu/.
+    Allez dans le répertoire où les fichiers binaires ont été installés
+    (par défaut, ~/anope/bin). Tapez ./anope pour lancer Anope.
 
-    Maintenant, tapez make install (ou gmake install; voir ci-dessus). Cela permet d'installer
-    tous les fichiers nécessaires dans les chemins que vous avez spécifié dans la configuration 
-    script, et les permissions du fichier de configuration. Vous devez vous assurer que les données
-    répertoire ne sont pas accessible par d'autres utilisateurs, que des utilisateurs malveillants peuvent
-    causer des problèmes sur votre réseau, si les mots de passe ne sont pas cryptés, ou de lire
-    les mémos de tout utilisateur.
+    S'il y a des erreurs de syntaxe dans le fichier de configuration, elles
+    seront affichées à l'écran. Corrigez-les jusqu'à ce qu'il n'y en ait
+    plus. Un démarrage réussi ne générera pas de message.
 
-    Si vous voyez des erreurs lors de ce processus, s'il vous plaît nous envoyer un mail avec le * complet *
-    sortie d'erreur, et n'oubliez pas de mentionner votre OS, compilateur et bibliothèque C + +
-    versions.
+    Donnez aux services au moins une minute pour se connecter à votre
+    réseau, car certains IRCds sur certains systèmes peuvent être très
+    lents pour le processus de liaison. Si rien ne se passe après environ
+    une minute, il y a probablement un problème de configuration. Essayez
+    de lancer Anope en mode debug avec ./anope -debug -nofork pour voir
+    toutes les erreurs rencontrées et essayez de les corriger.
 
-    Maintenant, allez dans le répertoire de données (par défaut, cd ~/services/data). ouvrer exemple.conf
-    avec votre éditeur de texte favori. Il contient toute la configuration
-    directives. Anope va l'utiliser au démarrage. Lisez attentivement les instructions contenues dans
-    le fichier. l'utilisation des valeurs par defauld n'est pas recomment et anope ne risque pas de fonctionner
-
-
-    Si vous avez besoin d'aide, vous devez vous abonner à la mailing list et par courrier Anope
-    pour se faire aider par d'autres utilisateurs. Voir le fichier README pour plus de
-    informations.
-
-2) Mise à jour Anope
-
-    Si vous avez un fichier .Diff et que vous voulez patcher les ancienne sources Anope avec,
-    effectuer les opérations suivantes:
-
-        * Copiez le fichier .Diff dans le répertoire racine des sources Anope.
-        * Type de patch-p1 <file.diff
-
-   Notez que la mise à jour anope avec un fichier patch n'est pas recommandé. 
-   Vous devez télécharger une nouvelle source propre, car cela vous donnera les meilleurs résultats..
-
-    Pour mettre à jour Anope, suivez simplement les instructions d'installation décrites dans
-    l'article 1. Il y a cependant quelques règles spécifiques:
-
-        * IMPORTANT: Sauvegardez vos anciennes bases de données!
-        * Si vous mettez à jour vers une nouvelle version majeure, toujours redémarrer avec un 
-          fichier de configuration neuve example.conf.
-
-
-
-3) Mise en place du IRCd
-
-    Ce Services agit comme un serveur IRC avec des pseudo-clients sur elle. Pour les relier à
-    votre réseau, vous aurez besoin d'ajouter quelques lignes dans le ircd.conf de leur plate-forme
-    serveur (comme indiqué dans la directive de configuration RemoteServer).
-
-    Pour les échantillons ci-dessous, nous allons prendre services.localhost.net que le nom de la
-    Services (comme indiqué dans la directive de configuration ServerName). Notez que
-    présente des échantillons sont faites pour être aussi générique que possible, mais il pourrait y avoir
-    de petites variations, en fonction de votre IRCd. Pour IRCd aide spécifique aux
-    de configuration, lire près de la fin de cette section.
-
-    Tout d'abord, les lignes C / N, qui permettent aux services de crée un lien. Ils ont également besoin d'un
-    Y: ligne fonctionne correctement.
-
-        Y: 27:180:0:0:4000000
-        C: 127.0.0.1: mypass: services.localhost.net: 30
-        N: 127.0.0.1: mypass: services.localhost.net: 30
-
-    "mot de pass" est le même mot de passe que vous avez mentionné dans le RemoteServer
-    directive de configuration. 127.0.0.1 est l'adresse IP à partir de laquelle les services se connecterons
-    à partir de (reliant en localhost est le moyen le plus efficace pour exécuter les services).
-
-    Ensuite, vous avez à mettre en place un U:ligne, qui permettra aux services de changer
-    modes de canal, de sujets, et bien plus encore, sans être op sur le canal.
-
-        U: services.localhost.net: *: *
-
-    REMARQUE: si vous avez plus d'un serveur dans votre réseau, cette ligne doit
-          être ajouté sur tous les autres serveurs, où cela ne risque pas de fonctionner correctement.
-
-    Enfin, vous aurez besoin d'ajouter un H:ligne, pour permttre la commande OperServ JUPE
-    de fonctionner correctement.
-
-        H:*::Services.LocalHost.Net
-
-    Ne pas oublier de /rehash votre IRCd pour appliquer les modifications.
-
-   Une nouvelle tendance dans la configuration ircd  hybride, Unreal et Bahamut, qui utilisent une approche plus
-    «Lisibles» sous forme de configuration. Pour ceux, utiliser quelque chose comme:
-
-        link services.localhost.net
-        {
-            username        *;
-            hostname        localhost;
-            bind-ip         *;
-            port            6667;
-            hub             *;
-            password-connect "mypass";
-            password-receive "mypass";
-            class           servers;
-        };
-
-    Notez que ce bloc de fichiers de configuration de style est diffèrent 
-    sur le IRCd. Consultez le fabricant de lien interactif (le lien est ci-dessous) pour plus
-    détails sur la configuration exacte utilisée par votre IRCd.
-
-    Si vous êtes incapable d'obtenir un lien avec votre IRCd après la lecture de cet article,
-    vous pouvez essayer le fabricant lien interactif, qui est situé au:
-
-        http://anope.org/ilm.php
-
-4) A partir Anope
-
-    Allez dans le répertoire où les fichiers binaires ont été installés (par défaut, ce n'est
-    ~/ Services/ bin). Tapez. /Services à lancer Anope.
-
-    S'il ya des erreurs de syntaxe dans le fichier de configuration, ils seront
-    affiche sur l'écran. Corrigez-les jusqu'à ce qu'il n'y à plus d'erreur.
-    Un démarrage réussi ne générera pas de message.
-
-    Donner aux services au moins une minute pour se connecté à votre réseau, comme certains
-    IRCds sur certains OS peut être très lent pour le processus de liaison. Si rien n'arrive après environ une minute,
-    il y a probablement un problème de configuration. Essayez
-    de lancer Anope en mode debug  ./services-debug-nofork pour voir toutes les erreurs qu'il
-    rencontres, et d'essayer de les corriger.
-
-    Si vous avez besoin d'aide pour résoudre des erreurs, n'hésitez pas à vous abonner à la Anope
-    liste de diffusion et de poser là. Voir le fichier README pour plus de détails.
+    Si vous avez besoin d'aide pour résoudre des erreurs, n'hésitez pas à
+    vous abonner à la liste de diffusion Anope et d'y poser vos question.
+    Voir le fichier README pour plus de détails.
 
 5) Mettre en place un crontab
 
-    Une entrée crontab vous permettra de vérifier périodiquement que Anope est
-    toujours en cours, et redémarrez-le s'il n'est pas.
+    Une entrée crontab vous permettra de vérifier périodiquement si Anope
+    est toujours en cours d'exécution et de le redémarrer s'il n'est pas.
 
-    D'abord renommer le script example.chk qui est dans le chemin de Anope (par défaut,
-    cela est ~/services/data) pour services.chk et le modifier. Vous aurez besoin de
-    modifier la partie configuration du fichier. Assurez-vous ensuite que le fichier est
-    marqué comme exécutable en tapant chmod + x services.chk, et essayer de lancer le
-    script pour voir si cela fonctionne (Anope ne doit pas être en marche lorsque vous faites cela ;))
+    D'abord renommez le script cron.example.sh qui est dans les dossiers
+    d'Anope (par défaut, ~/anope/conf) en cron.sh et modifiez-le.
+    Vous aurez besoin de modifier la partie CONFIGURATION du fichier.
+    Assurez-vous ensuite que le fichier est marqué comme exécutable en
+    tapant chmod +x cron.sh et essayez de lancer le script pour voir
+    si cela fonctionne (Anope ne doit pas être en marche lorsque vous
+    testez cela ;))
 
-    Lorsque cela est fait, vous devrez ajouter l'entrée crontab. Type de crontab-e. 
-    Cela va ouvrir l'éditeur de texte par défaut avec le fichier crontab. Entrez le chemin
-    suivant (avec le chemin correct):
+    Lorsque c'est fait, vous devrez ajouter l'entrée crontab. Entrez
+    crontab -e. Cela va ouvrir l'éditeur de texte par défaut avec le
+    fichier crontab. Entrez la ligne suivante (avec le chemin correct) :
 
-        * / 5 * * * * /home/ircd/services/data/services.chk> /dev/nul 2> & 1
+        */5 * * * * /home/ircd/anope/conf/cron.sh > /dev/null 2>&1
 
-    Le * / 5 au commencement signifie "vérifier toutes les 5 minutes". Vous pouvez remplacer
-    le 5 avec un autre numéro si vous voulez (mais moins de 60). Consulter
-    pages de manuel de votre système pour plus de détails sur la syntaxe de la crontab
-    fichier. Intéressant pages de manuel sont crontab (5), crontab (1) et cron (8).
+    Le */5 au début signifie "vérifier toutes les 5 minutes". Vous pouvez
+    remplacer le 5 par un autre numéro si vous voulez (mais moins de 60).
+    Consultez les pages de manuel de votre système pour plus de détails sur
+    la  syntaxe du fichier crontab. Les pages de manuel intéressantes sont
+    crontab(5), crontab(1) et cron(8).
 
-    Sauvegarder et quitter, et il est installé.
+    Sauvegardez, quittez, et c'est installé !

docs/IRCD

@@ -1,202 +0,0 @@
-How To Add IRCd Support
------------------------
-
-1) Files to Edit
-2) The Code
-3) The IRCDVar struct
-4) Modes
-5) Functions / Events
-6) CAPAB/PROTOCTL 
-7) IRCDProto Class
-
-1) Files to Edit
-
-    When preparing to add supprt to Anope for your IRCd, you need to edit
-    the following files
-
-    A) Make a copy of the .cpp file of the IRCd that matches the IRCd that
-       you are attempting to add support for best.
-    B) Add your IRCd into the supported IRCds in example.conf
-
-2) The Code
-
-    Here is where the code of the .cpp file comes in. Be prepared to spend at
-    least an hour, if not longer, going over the code and getting it right;
-    Especially if you are setting up an ircd that is completely different
-    than the one you used as a base. This section covers the majority of the
-    code that is in use. 
-
-    The first bit of code you will face is the IRCDVar structure, This is one
-    of two structs which holds your IRCd information; This allows you to quickly
-    setup your specific ircd.
-
-        IRCDVar myIrcd[] = { };
-
-    This struct contains your basic IRCd functions. Your base source file has
-    the list of all available variables; note that you should not swap any
-    around, or you will break stuff. Here is a brief description of the usage
-    of each.
-
-    1) Name: This member tells Anope about the IRCD's name. It may contain
-             text about it's name and version. This is used to identify the
-             build on startup.
-
-    2) Pseudo Client Mode: This is the user mode set by Anope on all BotServ
-                           bots. Normally you want this to be a some form of
-                           service or bot flag; you can use + for no mode at
-                           all.
-
-    3) Max Channelmode Symbols: This is the total number of possible channel
-                                 modes that can appear before a nick. Do
-                                 remember to count each possible mode, so +ov
-                                 is 2.
-
-    4) SVSNICK: Can the ircd use SVSNICK to change some ones nick? Otherwise,
-                 KILL is used. Use 1 for yes, 0 for no.
-
-    5) VHOST: Can a user's host be changed on the fly? Enabling this allow
-               HostServ online. Use 1 for yes, 0 for no.
-
-    6) SNLINE: Does the IRCd support realname (geocs) bans? Use 1 for yes,
-                0 for no.
-
-    7) SQLINE: Does the IRCd support nick bans? Use 1 for yes, 0 for no.
-
-    8) SZLINE: Does the IRCd support SZLINES? Use 1 for yes, 0 for no.
-
-    10) Join to Message: Services must join a channel to send any message to
-                         that channel (cannot override +n). Use 1 for yes,
-                         0 for no.
-
-    11) SQline Channels: The IRCd's supports banning channel names via
-                         SQLINES. Use 1 for yes, 0 for no.
-
-    12) Quit On Kill: When we (SVS)KILL a user, does the IRCd send back a
-                      QUIT message for that user? Use 1 for yes, 0 for no.
-
-    13) SVSMODE UNBAN: We can use SVSMODE to unban hosts from a channel. Use
-                    1 for yes, 0 for no.
-
-    14) Reverse: We can do a reverse check when unbanning. For use with 
-                 DreamForge based IRCd's. Use 1 for yes, 0 for no.
-
-    15) vIdent: Support for including a user's ident in their vHost. Use
-                1 for yes, 0 for no.
-
-    16) SVSHOLD: Support for temporarily 'holding' a nick, instead of using
-                 a nick enforcer client. Use 1 for yes, 0 for no.
-
-    17) TS on MODE: We need to send a timestamp when modes are being changed.
-                    Use 1 for yes, 0 for no.
-
-    18) Umode: We can use OperServ to change a user's mode. Use 1 for yes,
-               0 for no.
-
-    19) OMODE: We can use OperServ to give some user a temporary O:LINE.
-               Use 1 for yes, 0 for no.
-
-    20) No Knock Requires +i: Does the No Knock channel mode require invite
-                              only channels? Use 1 for yes, 0 for no.
-    
-    21) SVSMODE UCMODE: Can we clear user channel modes with SVSMODE? Use
-                        1 for yes, 0 for no.
-
-    22) SGline Enforce: Does the IRCd enforce SNLINES for us or do we need to
-                        do so? Use 1 for yes, 0 for no.
-
-    23) TS6: Does the IRCd support TS6? Use 1 for yes, 0 for no.
-
-    24) Global TLD Prefix: Prefix used to send global messages, should probably
-                           be "$"
-
-    25) Max Modes: The max number of mode changes we can send in one line
-
-3) Modes 
-
-   Anope is told about modes in the protocol module.
-   For the most part, the syntax for adding channel and user modes are:
-   
-   ModeManager::AddUserMode(new UserMode(UMODE_NETADMIN, "UMODE_NETADMIN", 'N'));
-   Where 'N' is the char for the mode, and UMODE_NETADMIN shows what the
-   mode does. Or:
-
-   ModeManager::AddChannelMode(new ChannelMode(CMODE_BLOCKCOLOR, "CMODE_BLOCKCOLOR", 'c'));
-   Where 'c' is the char for the mode and CMODE_BLOCKCOLOR shows what
-   the mode does
-
-   A full list of valid mode names for the second param can be found
-   in services.h in the enum for ChannelModeName and UserModeName
-   If necessary, you can add additional modes to this list.
-
-   Adding simple modes with parameters is similar, instead adding a
-   'new ChannelMode', use 'new ChannelModeParam', set the third optional
-   arg of ChannelModeParam to false if the param should NOT be sent when unsetting
-   it. Eg:
-
-   ModeManager::AddChannelMode(new ChannelModeParam(CMODE_JOINFLOOD, "CMODE_JOINFLOOD", 'j', true));
-
-   Anope will internally track the params, and they can be retrieved through
-   Channel::GetParam();
-
-   If you want to make param validity checking for a mode, you must create a new
-   class which inherits from ChannelModeParam and overload the IsValid function.
-   Modes CMODE_OPERONLY, CMODE_ADMINONLY, and CMODE_REGISTERED already exist
-   internally as classes, to overload the CanSet function to disable non opers
-   from mlocking (or in CMODE_REGISTERED's case, anyone) from setting them.
-   This should be added like:
-
-   ModeManager::AddChannelMode(new ChannelModeOper('O'));
-
-4) Functions and Events
-
-    A brief word about functions and events. All events are captured by creating a Message struct
-    with the name of the message and the callback function:
-
-    Message my_message("MESSAGE", do_my_messsage);
-
-    Each message should have a message handler if its important enough to be
-    processed by services. All event functions should be formed like this:
-
-	bool do_my_message(const Anope::string &source, const std::vector<Anope::string> &params)
-        {
-		return true;
-        }
-
-    They will receive the source; this can be empty at times depending on the
-    event. Next, params holds the arguments for the event. Events are likely to
-    pass to various upper level event handlers; see the previous ircd source for
-    how they handle these events.
-
-5) CAPAB/PROTOCTL
-
-    Most IRCDs send a CAPAB or PROTOCTL line so that they can work out what
-    the other end of the connection is capable of doing. The protocol module should
-    handle all of these without the cores knowledge with the exception of the following:
-    
-       --------------------------------------------------------------------------
-       Define          |  Description
-       ----------------|---------------------------------------------------------
-       CAPAB_NOQUIT    |  NOQUIT protocol support
-       CAPAB_TSMODE    |  Chanmodes are timestamped
-       CAPAB_UNCONNECT |  UNCONNECT protocol support
-       CAPAB_QS        |  Quitstorm - same as NOQUIT
-
-   You can override the default OnCapab method in IRCdMessage if required.
-
-6) IRCDProto Class
-
-    The IRCDProto class is set up like:
-
-    class MyIRCdProto : public IRCDProto { } ircdproto;
-
-    And told to Anope through the
-
-    pmodule_ircd_proto(&ircd_proto);
-
-    function.
-
-    This is used for sending out specific messages from Anope to your IRCd.
-    A list of all of the valid function names to overload and their args
-    are in services.h. If the protocol module you are editing is similar enough
-    to the IRCd you are adding support for, many of these probably won't need to
-    be changed.

docs/LANGUAGE

@@ -1,46 +1,63 @@
-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
 
     To build Anope with gettext support, gettext and its development libraries must be installed on the system.
-    Anope does not require locales to be installed or enabled on the system, but does require the locales-all
-    package on Debian and Debian based systems.
 
-    Building Anope on Windows with gettext support is explained in docs/WIN32.txt
+    On Debian-based systems install the locales-all package.
+
+    On RHEL-based systems run `yum list glibc-langpack-*` and install the languages you want to enable.
+
+    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.md
 
 2) Adding a new language
 
-    Anope uses gettext (http://www.gnu.org/software/gettext/) to translate messages for users. To add a new language
+    Anope uses gettext (https://www.gnu.org/software/gettext/) to translate messages for users. To add a new language
     install gettext and run `msginit -l language -o anope.language.po -i anope.pot`. For example if I was translating to
     Spanish I could run `msginit -l es_ES -o anope.es_ES.po -i anope.pot`. Open the newly generating .po file and start
-    translating. Once you are done simply rerun ./Config; make && make install and add the language to your services.conf.
-    Note that on Windows it is not quite this simple, windows.cpp must be edited and Anope recompiled and restarted.
+    translating. Once you are done simply rerun ./Config; make && make install and add the language to your anope.conf.
 
-    Poedit (http://www.poedit.net/) is a popular po file editor, and we recommend using it or another editor designed to edit
+    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.
+    There are several control characters within the messages. These are mostly IRC formatting codes (https://modern.ircdocs.horse/formatting)
+    but 0x1B is special to Anope and is used to prevent the automatic linewrapper from breaking messages in the middle of
+    text that should not be split (e.g. commands). Your editor may not show these so be careful you don't delete them!
 
-    NOTE: There is no guarantee we will use your work so please do not be offended if we say no thanks.
+    If you have finished a language file translation and you want others to use it, please file a pull request on GitHub.
+    You'll of course get full credit for it.
 
-3) Using langages with modules
+3) Using languages with modules
 
-    Module authors can easially add the ability to have their modules translated by adding _() around the strings they
+    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).
 
     If you want to translate a module someone has made, first generate a .pot file if there isn't one already using
-    `xgettext -s -d modulename -o modulename.pot --from-code=utf-8 modulename.cpp`.
+    `xgettext -s -d modulename -o modulename.pot --from-code=utf-8 --keyword --keyword=_ modulename.cpp`.
     The .pot file is a template of all of the language strings extracted from the source file.
 
     Next, run msginit on the .pot file with
     `msginit -l language -o modulename.language.po -i modulename.pot`.
     Translate the new .po file and rerun ./Config; make && make install.
 
-    All .po and .pot files should be placed in modules/language/third. Additionally an update script is provided there
+    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/LICENSE.txt

@@ -1,12 +1,12 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
 
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                          675 Mass Ave, Cambridge, MA 02139, USA
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ <https://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
-			    Preamble
+                            Preamble
 
   The licenses for most software are designed to take away your
 freedom to share and change it.  By contrast, the GNU General Public
@@ -15,7 +15,7 @@ software--to make sure the software is free for all its users.  This
 General Public License applies to most of the Free Software
 Foundation's software and to any other program whose authors commit to
 using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
+the GNU Lesser General Public License instead.)  You can apply it to
 your programs, too.
 
   When we speak of free software, we are referring to freedom, not
@@ -55,8 +55,8 @@ patent must be licensed for everyone's free use or not licensed at all.
 
   The precise terms and conditions for copying, distribution and
 modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
+
+                    GNU GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
   0. This License applies to any program or other work which contains
@@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions:
     License.  (Exception: if the Program itself is interactive but
     does not normally print such an announcement, your work based on
     the Program is not required to print an announcement.)
-
+
 These requirements apply to the modified work as a whole.  If
 identifiable sections of that work are not derived from the Program,
 and can be reasonably considered independent and separate works in
@@ -168,7 +168,7 @@ access to copy from a designated place, then offering equivalent
 access to copy the source code from the same place counts as
 distribution of the source code, even though third parties are not
 compelled to copy the source along with the object code.
-
+
   4. You may not copy, modify, sublicense, or distribute the Program
 except as expressly provided under this License.  Any attempt
 otherwise to copy, modify, sublicense or distribute the Program is
@@ -225,7 +225,7 @@ impose that choice.
 
 This section is intended to make thoroughly clear what is believed to
 be a consequence of the rest of this License.
-
+
   8. If the distribution and/or use of the Program is restricted in
 certain countries either by patents or by copyrighted interfaces, the
 original copyright holder who places the Program under this License
@@ -255,7 +255,7 @@ make exceptions for this.  Our decision will be guided by the two goals
 of preserving the free status of all derivatives of our free software and
 of promoting the sharing and reuse of software generally.
 
-			    NO WARRANTY
+                            NO WARRANTY
 
   11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
 FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
@@ -277,9 +277,9 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
 PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.
 
-		     END OF TERMS AND CONDITIONS
-
-	Appendix: How to Apply These Terms to Your New Programs
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
 
   If you develop a new program, and you want it to be of the greatest
 possible use to the public, the best way to achieve this is to make it
@@ -291,7 +291,7 @@ convey the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
     <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) 19yy  <name of author>
+    Copyright (C) <year>  <name of author>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -303,16 +303,15 @@ the "copyright" line and a pointer to where the full notice is found.
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, see <https://www.gnu.org/licenses/>.
 
 Also add information on how to contact you by electronic and paper mail.
 
 If the program is interactive, make it output a short notice like this
 when it starts in an interactive mode:
 
-    Gnomovision version 69, Copyright (C) 19yy name of author
+    Gnomovision version 69, Copyright (C) year name of author
     Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.
@@ -329,11 +328,11 @@ necessary.  Here is a sample; alter the names:
   Yoyodyne, Inc., hereby disclaims all copyright interest in the program
   `Gnomovision' (which makes passes at compilers) written by James Hacker.
 
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
+  <signature of Moe Ghoul>, 1 April 1989
+  Moe Ghoul, President of Vice
 
 This General Public License does not permit incorporating your program into
 proprietary programs.  If your program is a subroutine library, you may
 consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
+library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.

docs/MODULES

@@ -12,7 +12,7 @@ Anope Modules
 
 1) Introduction
 
-    Anope 1.6 onwards supports external modules. External modules are pieces
+    Anope supports external modules. External modules are pieces
     of code that can be attached to a running Anope process dynamically. These
     modules can serve several purposes, and perform all kind of operations to
     enhance your network.
@@ -22,16 +22,16 @@ Anope Modules
     1. If modules are supported by your system, they will be configured
        automatically when you run ./Config. The modules will be installed
        to the modules directory in your data path (by default this will
-       be ~/services/modules).
+       be ~/anope/data/modules).
 
-       Note: you might need to run "make distclean" prior to running ./Config
+    2. Compile Anope as usual using ./Config. The "make" process will now
+       compile module support into Anope, and compile the default sample
+       modules, and any other module located in the modules folder or any
+       of its sub-directories, eg. modules/extra.
 
-    2. Compile Anope as usual. The (g)make process will now compile module
-       support into Anope, and compile the default sample modules, and/or
-       any other module located on the modules folder ("src/modules/").
-
-    3. Install Anope as usual. The install process will place the compiled
-       modules in their runtime location, making them available for loading.
+    3. Install Anope as usual. The "make install" process will place the
+       compiled modules in their runtime location, making them available
+       for loading.
 
     4. Start or restart services to make use of the new Anope executable.
        Note that you do not need to restart to load new or changed modules,
@@ -42,59 +42,64 @@ Anope Modules
     All module manipulation commands are done through OperServ. These are:
 
        MODLOAD     Load a module
-       MODUNLOAD   Un-Load a module
+       MODRELOAD   Reload a module
+       MODUNLOAD   Unload a module
        MODLIST     List loaded modules
        MODINFO     Info about a loaded module
 
-    These commands available to Service Roots only.
+    Access to the above commands require the operserv/modload and modlist
+    permissions. Refer to operserv.example.conf.
 
     You can also load (and pre-load) Modules automatically by loading them
-    on startup. To do so, edit your services.conf file and change the values
-    of "ModuleAutoload" and "ModuleDelayedAutoload" to include the modules
-    you want to load every time Anope starts.
+    on startup. To do so, edit any one of the configuration files (you may
+    want to use modules.conf for third-party/extra modules, or a config
+    file relevant to the *Serv your module operates on, eg. hostserv.conf),
+    and use the following method to load a module on startup or reload:
+        module { name="hs_modname" }
 
 4) Usage Example
 
-    /msg OperServ modload hs_moo
-    *** Global -- from OperServ: dengel loaded module hs_moo
-    -OperServ- Module hs_moo loaded
+    /msg OperServ modload ns_identify
+    -OperServ- Module ns_identify loaded
 
-    /msg OperServ modinfo hs_moo
-    -OperServ- Module: hs_moo Version: 1.1 Author: Anope loaded: Mar 21 10:54:37 2004 CLT
-    -OperServ- Providing command: /msg HostServ moo
+    /msg OperServ modinfo ns_identify
+    -OperServ- Module: ns_identify Version: 1.9.7 Author: Anope loaded: Jun 17 18:43:08 2012 BST (2 minutes ago)
+    -OperServ-    Providing service: nickserv/identify
+    -OperServ-    Command ID on NickServ is linked to nickserv/identify
+    -OperServ-    Command IDENTIFY on NickServ is linked to nickserv/identify
 
-    /msg HostServ moo
-    -HostServ- MOO! - This command was loaded via a module!
+    /msg OperServ modreload ns_identify
+    -OperServ- Module ns_identify reloaded
 
-    /msg OperServ modunload hs_moo
-    *** Global -- from OperServ: dengel unloaded module hs_moo
-    -OperServ- Module hs_moo unloaded
+    /msg OperServ modunload ns_identify
+    -OperServ- Module ns_identify unloaded
 
-    /msg HostServ moo
-    -HostServ- Unknown command moo. "/msg HostServ HELP" for help.
+    /msg NickServ IDENTIFY
+    -NickServ- Unknown command identify. "/msg NickServ HELP" for help.
+    NOTE: Doing the above, with the command still existing in a config file,
+          will result in a log message, similar to the following:
+          <@NickServ> Command IDENTIFY exists on me, but its service nickserv/identify was not found!
 
-    * Note that the name of the module file is "hs_moo.c", yet we load
-      and reference the module as "hs_moo" only. By naming convention
+    * Note that the name of the module source file is "ns_identify.cpp", yet we
+      load and reference the module as "ns_identify" only. By naming convention
       modules have an abbreviated service name they attach to (hs_ for
       HostServ, cs_ for ChanServ, etc) followed by a descriptive keyword.
 
 5) More Modules
 
-    Anope ships with three sample modules that only illustrates some of the
-    implemented module capabilities. They don't really do much or anything
-    useful.
-
-    You can download more useful modules from http://modules.anope.org/. Just
-    grab the module file (usually with a .c extension). Place the module
-    file in your modules (src/modules) folder; the same folder that contains
-    both hs_moo.c and catserv.c module files.
+    You can download more useful modules from https://modules.anope.org/. Just
+    grab the module file (usually with a .cpp extension). Place the module
+    file in your modules (anope-1.9.x/modules/third) folder; although any of
+    the other folders within the modules directory will work.
 
     The new modules need to be compiled and installed before you can make
     use of them:
-    
+
     1. Make sure you're in the main source directory. (usually anope-1.X.XX/)
-    2. Run `make modules` to compile any new or changed modules.
-    3. Run `make install` to install the modules.
+    2. Run ./Config to find and configure modules, then `cd build`.
+    3. Run `make` to compile Anope, and any modules.
+    4. Run `make install` to copy the compiled binaries to the ~/anope/
+       directory.
 
     You can now use /msg OperServ MODLOAD to load the new modules.
 
@@ -106,19 +111,18 @@ 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
 
     There are a number of useful documents on the Anope Wiki. The Anope Wiki
     can be reached at:
-    
-    * http://wiki.anope.org/
 
+    * https://wiki.anope.org/
 
 8) Modules Repository
 
-    You can find modules at http://modules.anope.org
+    You can find modules at https://modules.anope.org/
 
     These modules are 3rd party and as such are not supported by the Anope Team.
     Contact the Module Author directly with problems, not the Anope Team.

docs/NEWS

@@ -1,7 +0,0 @@
-Highlighted News in Anope 1.9
-=============================
-
-* Added in live updating SQL and the ability to execute commands through SQL
-* Re-designed configuration file
-* Code refresh / rewrite into C++
-

docs/README

@@ -1,16 +1,14 @@
 Anope -- a set of IRC services for IRC networks
 -----------------------------------------------
 
-Anope is          2003-2012 Anope Team    <team@anope.org>.
+Anope is          2003-2026 Anope Team    <team@anope.org>.
 Based on Epona    2000-2002 PegSoft       <epona@pegsoft.net>.
 Based on Services 1996-1999 Andrew Church <achurch@achurch.org>.
 
 This program is free but copyrighted software; see the file COPYING for
 details.
 
-Information about Anope may be found at http://www.anope.org/
-Information about Epona may be found at http://www.epona.org/
-Information about Services may be found at http://www.ircservices.esper.net/
+Information about Anope may be found at https://www.anope.org/
 
 Table of Contents
 -----------------
@@ -19,7 +17,7 @@ Table of Contents
 3) Installation
 4) Command Line Options
 5) Messages Translation
-6) Contact and Mailing List
+6) Contact
 
 1) Credits
 
@@ -94,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>
@@ -107,18 +105,22 @@ Table of Contents
 
     Anope Translations:
 
-        * GeniusDex <geniusdex@anope.org> (nl.l)
-        * Kein <kein-of@yandex.ru> (ru.l)
-        * Maik Funke <Han@mefalcon.org> (de.l)
-        * Gabriel Acevedo H. <drstein@anope.org> (es.l)
-        * Janos Kapitany <sarkanyka@cjbchat.hu>  (hun.l)
-        * Szymon S'wierkosz <szymek@adres.pl> (pl.l)
-        * Christopher N. <saka@epiknet.org> (fr.l)
-        * Yusuf Kurekci <ysfm.20@gmail.com> (tr.l)
+        * Robby <robby@chatbelgie.be> (nl_NL)
+        * Kein <kein-of@yandex.ru> (ru_RU)
+        * Maik Funke <Han@mefalcon.org> (de_DE)
+        * Isaac Fontal <i_fontal@hotmail.com> (es_ES)
+        * Janos Kapitany <sarkanyka@cjbchat.hu> (hu_HU)
+        * Szymon S'wierkosz <szymek@adres.pl> (pl_PL)
+        * Christopher N. <saka@epiknet.org> (fr_FR)
+        * Yusuf Kurekci <ysfm.20@gmail.com> (tr_TR)
+
+    Anope Web panel:
+
+       * Denis M. (Phr33d0m) <god@politeia.in>
 
 2) Presentation
 
-    Anope is a set of Services for IRC networks that allows users to manage
+    Anope is a set of services for IRC networks that allows users to manage
     their nicks and channels in a secure and efficient way, and administrators
     to manage their network with powerful tools.
 
@@ -158,17 +160,19 @@ Table of Contents
           they log on, to set modes and to kick users from any channel, to
           send notices quickly to the entire network, and much more!
 
-        * HostServ, a neat service that allows users to show custom vHosts
+        * HostServ, a neat service that allows users to show custom vhosts
           (virtual hosts) instead of their real IP address; this only works
           on daemons supporting ip cloaking, such as UnrealIRCd.
 
     Anope currently works with:
 
-        * Bahamut 1.4.27 or later (including 1.8)
-        * InspIRCd 1.1, 1.2, or 2.0
-        * Ratbox 2.0.6 or later
-        * UnrealIRCd 3.2 or later
+        * InspIRCd 4 or later
+        * ircd-hybrid 8.2.34 or later
+        * ircd-ratbox 3 or later
+        * ngIRCd 19.2 or later
         * Plexus 3 or later
+        * Solanum (all versions)
+        * UnrealIRCd 6 or later
 
     Anope could also work with some of the daemons derived by the ones listed
     above, but there's no support for them if they work or don't work.
@@ -195,10 +199,10 @@ Table of Contents
         --version       Display the version of Anope
         --nothird       Do not load the non-core modules specified
         --protocoldebug Debug each incoming message after protocol parsing
-        --support       Used for support, same as -debug -nofork -nothird
+        --support       Used for support, same as --debug --nofork --nothird
 
     Upon starting, Anope will parse its command-line parameters then
-    (assuming the -nofork option is not given) detach itself and run in the
+    (assuming the --nofork option is not given) detach itself and run in the
     background. If Anope encounters a problem reading the database files or
     cannot connect to its uplink server, it will terminate immediately;
     otherwise, it will run until the connection is terminated (or a QUIT,
@@ -220,7 +224,7 @@ Table of Contents
     the log file; if you send a bug report, PLEASE include an excerpt from
     the log file WITH DEBUGGING ACTIVE; we cannot emphasize enough how
     important this is to tracking down problems. (You can also enable
-    debugging while Services is running using OperServ's SET DEBUG command.)
+    debugging while Anope is running using OperServ's SET DEBUG command.)
     If you repeat use --debug=<level>, the debugging level will be increased,
     which provides more detailed information but may also slow Anope down
     considerably and make the log file grow dramatically faster. In general,
@@ -235,19 +239,19 @@ Table of Contents
 6) Contact
 
     For announcements and discussions about Anope, please visit our
-    Portal and Forums at http://www.anope.org/ -- make sure you register
+    Portal and Forums at https://www.anope.org/ -- make sure you register
     yourself to get full benefits.
 
     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. 
+    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
-    (http://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/RPC/jsonrpc.js

@@ -0,0 +1,270 @@
+// SPDX-License-Identifier: CC0-1.0
+"use strict";
+
+/** Implements methods for accessing an Anope JSON-RPC server. */
+class AnopeRPC {
+
+	/**
+	 * Initializes a new AnopeRPC instance with the specified RPC host.
+	 *
+	 * @param {string} host The RPC host base URL.
+	 * @param {string} token The bearer token for authorizing with the RPC interface.
+	 */
+	constructor(host, token = "") {
+		this.host = host;
+		this.token = token;
+	}
+
+	/**
+	 * Executes an arbitrary RPC query.
+	 *
+	 * @param {string} method The name of the method to execute.
+	 * @param {...*} params The parameters pass to the method.
+	 * @returns {*} The result of the RPC query.
+	 */
+	async run(method, ...params) {
+		const body = JSON.stringify({
+			"jsonrpc": "2.0",
+			"method": method,
+			"params": params.map((p) => p.toString()),
+			"id": Math.random().toString(36).slice(2)
+		});
+		const headers = new Headers();
+		if (this.token) {
+			headers.append("Authorization", `Bearer ${btoa(this.token)}`);
+		}
+		const response = await fetch(this.host, {
+			method: 'POST',
+			headers: headers,
+			body: body
+		});
+		if (!response.ok) {
+			throw new Error(`HTTP returned ${response.status}`)
+		}
+		const json = await response.json();
+		if ("error" in json) {
+			throw new Error(`JSON-RPC returned ${json.error.code}: ${json.error.message}`)
+		}
+		if ("result" in json) {
+			return json.result;
+		}
+		return null;
+	}
+
+	/**
+	 * Retrieves a list of accounts.
+	 *
+	 * Requires the rpc_data module to be loaded.
+	 *
+	 * @param {string} detail The level of detail to request.
+	 * @returns {(array|object)} A list of accounts.
+	 */
+	listAccounts(detail = "name") {
+		return this.run("anope.listAccounts", detail);
+	}
+
+	/**
+	 * Retrieves information about the specified account.
+	 *
+	 * Requires the rpc_data module to be loaded.
+	 *
+	 * @param {string} name The name of the account.
+	 * @returns {object} An object containing information about the account.
+	 */
+	account(name) {
+		return this.run("anope.account", name);
+	}
+
+	/**
+	 * Retrieves a list of channels.
+	 *
+	 * Requires the rpc_data module to be loaded.
+	 *
+	 * @param {string} detail The level of detail to request.
+	 * @returns {(array|object)} A list of channels.
+	 */
+	listChannels(detail = "name") {
+		return this.run("anope.listChannels", detail);
+	}
+
+	/**
+	 * Retrieves information about the specified channel.
+	 *
+	 * Requires the rpc_data module to be loaded.
+	 *
+	 * @param {string} name The name of the channel.
+	 * @returns {object} An object containing information about the channel.
+	 */
+	channel(name) {
+		return this.run("anope.channel", name);
+	}
+
+	/**
+	 * Retrieves a list of services operators.
+	 *
+	 * Requires the rpc_data module to be loaded.
+	 *
+	 * @param {string} detail The level of detail to request.
+	 * @returns {(array|object)} A list of services operators.
+	 */
+	listOpers(detail = "name") {
+		return this.run("anope.listOpers", detail);
+	}
+
+	/**
+	 * Retrieves information about the specified services operator.
+	 *
+	 * Requires the rpc_data module to be loaded.
+	 *
+	 * @param {string} name The name of the services operator.
+	 * @returns {object} An object containing information about the services operator.
+	 */
+	oper(name) {
+		return this.run("anope.oper", name);
+	}
+
+	/**
+	 * Retrieves a list of servers.
+	 *
+	 * Requires the rpc_data module to be loaded.
+	 *
+	 * @param {string} detail The level of detail to request.
+	 * @returns {(array|object)} A list of servers.
+	 */
+	listServers(detail = "name") {
+		return this.run("anope.listServers", detail);
+	}
+
+	/**
+	 * Retrieves information about the specified server.
+	 *
+	 * Requires the rpc_data module to be loaded.
+	 *
+	 * @param {string} name The name of the server.
+	 * @returns {object} An object containing information about the server.
+	 */
+	server(name) {
+		return this.run("anope.server", name);
+	}
+
+	/**
+	 * Retrieves a list of users.
+	 *
+	 * Requires the rpc_data module to be loaded.
+	 *
+	 * @param {string} detail The level of detail to request.
+	 * @returns {(array|object)} A list of users.
+	 */
+	listUsers(detail = "name") {
+		return this.run("anope.listUsers", detail);
+	}
+
+	/**
+	 * Retrieves information about the specified user.
+	 *
+	 * Requires the rpc_data module to be loaded.
+	 *
+	 * @param {string} nick The nick of the user.
+	 * @returns {object} An object containing information about the user.
+	 */
+	user(nick) {
+		return this.run("anope.user", nick);
+	}
+
+	/**
+	 * Sends a message to every user on the network.
+	 *
+	 * Requires the rpc_message module to be loaded.
+	 *
+	 * @param {...*} messages One or more messages to send.
+	 */
+	messageNetwork(...messages) {
+		return this.run("anope.messageNetwork", ...messages);
+	}
+
+	/**
+	 * Sends a message to every user on the specified server.
+	 *
+	 * Requires the rpc_message module to be loaded.
+	 *
+	 * @param {string} name The name of the server.
+	 * @param {...*} messages One or more messages to send.
+	 */
+	messageServer(server, ...messages) {
+		return this.run("anope.messageServer", server, ...messages);
+	}
+
+	/**
+	 * Sends a message to the specified user.
+	 *
+	 * Requires the rpc_message module to be loaded.
+	 *
+	 * @param {string} source The source pseudoclient to send the message from.
+	 * @param {string} target The target user to send the message to.
+	 * @param {...*} messages One or more messages to send.
+	 */
+	messageUser(source, target, ...messages) {
+		return this.run("anope.messageUser", source, target, ...messages);
+	}
+
+	/**
+	 * Checks whether the specified credentials are valid.
+	 *
+	 * Requires the rpc_user module to be loaded.
+	 *
+	 * @param {string} account A nickname belonging to the account to check.
+	 * @param {string} password  The password for the specified account.
+	 * @returns {object} An object containing basic information about the account.
+	 */
+	checkCredentials(account, password) {
+		return this.run("anope.checkCredentials", account, password);
+	}
+
+	/**
+	 * Identifies an IRC user to the specified account.
+	 *
+	 * Requires the rpc_user module to be loaded.
+	 *
+	 * @param {string} account Either an account identifier or nickname belonging to the account to
+	 *                         identify to.
+	 * @param {string} password The nickname of the IRC user to identify to the account.
+	 */
+	identify(account, user) {
+		return this.run("anope.identify", account, user);
+	}
+
+	/**
+	 * Lists all commands that exist on the network.
+	 *
+	 * Requires the rpc_user module to be loaded.
+	 *
+	 * @param {...*} services The nicknames of the services to list commands for.
+	 * @returns {object} An object containing information about the available commands.
+	 */
+	listCommands(...services) {
+		return this.run("anope.listCommands", ...services);
+	}
+
+	/**
+	 * Lists all commands that exist on the network.
+	 *
+	 * Requires the rpc_user module to be loaded.
+	 *
+	 * @param {string} account If non-empty then the account to execute the command as.
+	 * @param {string} service The service which the command exists on.
+	 * @param {...*} command The the command to execute and any parameters to pass to it.
+	 * @returns {object} An object containing information about the available commands.
+	 */
+	command(account, service, ...command) {
+		return this.run("anope.command", account, service, ...command);
+	}
+}
+
+/*
+const arpc = new AnopeRPC("http://127.0.0.1:8080/jsonrpc");
+arpc.listServers("full").then(servers => {
+	console.log(servers);
+}).catch (error => {
+	console.log(error);
+});
+*/

docs/RPC/jsonrpc.rb

@@ -0,0 +1,242 @@
+# SPDX-License-Identifier: CC0-1.0
+
+require "base64"
+require "json"
+require "net/http"
+
+# Implements methods for accessing an Anope JSON-RPC server.
+class AnopeRPC
+
+	# The RPC host base URL.
+	attr_accessor :host
+
+	# The bearer token for authorizing with the RPC interface.
+	attr_accessor :token
+
+	# Initializes a new AnopeRPC instance with the specified RPC host.
+	#
+	# @param host [String] The RPC host base URL.
+	# @param token [String] The bearer token for authorizing with the RPC interface.
+	def initialize(host, token = nil)
+		@host = URI(host)
+		@token = token
+	end
+
+	# Executes an arbitrary RPC query.
+	#
+	# @param method [String] The name of the method to execute.
+	# @param params [Object] The parameters pass to the method.
+	# @return [Object] The result of the RPC query.
+	private def run(method, *params)
+		body = {
+			jsonrpc: "2.0",
+			method: method,
+			params: params.map(&:to_s),
+			id: rand(36**16).to_s(36)
+		}.to_json
+
+		headers = {}
+		headers["Authorization"] = "Bearer #{Base64.strict_encode64(@token)}" if @token
+
+		response = Net::HTTP.post(@host, body, headers)
+		raise "HTTP returned #{response.status}" unless response.is_a?(Net::HTTPSuccess)
+
+		json = JSON.parse(response.body, symbolize_names: true)
+		raise "JSON-RPC returned #{json[:error][:code]}: #{json[:error][:message]}" if json.key?(:error)
+
+		json.dig(:result)
+	end
+
+	# Retrieves a list of accounts.
+	#
+	# Requires the rpc_data module to be loaded.
+	#
+	# @param detail [Symbol] detail The level of detail to request.
+	# @return [Array] If the detail level is set to :name then an array of account names.
+	# @return [Hash] If the detail level is set to :full then a hash of information about the
+	#                accounts.
+	def list_accounts(detail = :name)
+		self.run("anope.listAccounts", detail)
+	end
+
+	# Retrieves information about the specified account.
+	#
+	# Requires the rpc_data module to be loaded.
+	#
+	# @param name [String] The name of the account.
+	# @return [Hash] A hash containing information about the account.
+	def account(name)
+		self.run("anope.account", name)
+	end
+
+	# Retrieves a list of channels.
+	#
+	# Requires the rpc_data module to be loaded.
+	#
+	# @param detail [Symbol] detail The level of detail to request.
+	# @return [Array] If the detail level is set to :name then an array of channel names.
+	# @return [Hash] If the detail level is set to :full then a hash of information about the
+	#                channels.
+	def list_channels(detail = :name)
+		self.run("anope.listChannels", detail)
+	end
+
+	# Retrieves information about the specified channel.
+	#
+	# Requires the rpc_data module to be loaded.
+	#
+	# @param name [String] The name of the channel.
+	# @return [Hash] A hash containing information about the channel.
+	def channel(name)
+		self.run("anope.channel", name)
+	end
+
+	# Retrieves a list of services operators.
+	#
+	# Requires the rpc_data module to be loaded.
+	#
+	# @param detail [Symbol] detail The level of detail to request.
+	# @return [Array] If the detail level is set to :name then an array of services operator names.
+	# @return [Hash] If the detail level is set to :full then a hash of information about the
+	#                services operators.
+	def list_opers(detail = :name)
+		self.run("anope.listOpers", detail)
+	end
+
+	# Retrieves information about the specified services operator.
+	#
+	# Requires the rpc_data module to be loaded.
+	#
+	# @param name [String] The name of the services operator.
+	# @return [Hash] A hash containing information about the services operator.
+	def oper(name)
+		self.run("anope.oper", name)
+	end
+
+	# Retrieves a list of servers.
+	#
+	# Requires the rpc_data module to be loaded.
+	#
+	# @param detail [Symbol] detail The level of detail to request.
+	# @return [Array] If the detail level is set to :name then an array of server names.
+	# @return [Hash] If the detail level is set to :full then a hash of information about the
+	#                servers.
+	def list_servers(detail = :name)
+		self.run("anope.listServers", detail)
+	end
+
+	# Retrieves information about the specified server.
+	#
+	# Requires the rpc_data module to be loaded.
+	#
+	# @param name [String] The name of the server.
+	# @return [Hash] A hash containing information about the server.
+	def server(name)
+		self.run("anope.server", name)
+	end
+
+	# Retrieves a list of users.
+	#
+	# Requires the rpc_data module to be loaded.
+	#
+	# @param detail [Symbol] detail The level of detail to request.
+	# @return [Array] If the detail level is set to :name then an array of user nicknames.
+	# @return [Hash] If the detail level is set to :full then a hash of information about the
+	#                users.
+	def list_users(detail = :name)
+		self.run("anope.listUsers", detail)
+	end
+
+	# Retrieves information about the specified user.
+	#
+	# Requires the rpc_data module to be loaded.
+	#
+	# @param name [String] The name of the user.
+	# @return [Hash] A hash containing information about the user.
+	def user(name)
+		self.run("anope.user", name)
+	end
+
+	# Sends a message to every user on the network.
+	#
+	# Requires the rpc_message module to be loaded.
+	#
+	# @param messages [Array<String>] One or more messages to send.
+	def message_network(*messages)
+		self.run("anope.messageNetwork", *messages)
+	end
+
+	# Sends a message to every user on the specified server.
+	#
+	# Requires the rpc_message module to be loaded.
+	#
+	# @param name [String] The name of the server.
+	# @param messages [Array<String>] One or more messages to send.
+	def message_server(server, *messages)
+		self.run("anope.messageServer", server, *messages)
+	end
+
+	# Sends a message to the specified user.
+	#
+	# Requires the rpc_message module to be loaded.
+	#
+	# @param source [String] The source pseudoclient to send the message from.
+	# @param target [String] The target user to send the message to.
+	# @param messages [Array<String>] One or more messages to send.
+	def message_user(source, target, *messages)
+		self.run("anope.messageUser", source, target, *messages)
+	end
+
+	# Checks whether the specified credentials are valid.
+	#
+	# Requires the rpc_user module to be loaded.
+	#
+	# @param account [String] A nickname belonging to the account to check.
+	# @param password [String] The password for the specified account.
+	# @return [Hash] A hash containing basic information about the account.
+	def check_credentials(account, password)
+		self.run("anope.checkCredentials", account, password)
+	end
+
+	# Identifies an IRC user to the specified account.
+	#
+	# Requires the rpc_user module to be loaded.
+	#
+	# @param account [String] Either an account identifier or nickname belonging to the account to
+	#                         identify to.
+	# @param password [String] The nickname of the IRC user to identify to the account.
+	def identify(account, user)
+		self.run("anope.identify", account, user)
+	end
+
+	# Lists all commands that exist on the network.
+	#
+	# Requires the rpc_user module to be loaded.
+	#
+	# @param services [Array<String>] The nicknames of the services to list commands for.
+	# @return [Hash] A hash containing information about the available commands.
+	def list_commands(*services)
+		self.run("anope.listCommands", *services)
+	end
+
+	# Lists all commands that exist on the network.
+	#
+	# Requires the rpc_user module to be loaded.
+	#
+	# @param account [String] If non-empty then the account to execute the command as.
+	# @param service [String] The service which the command exists on.
+	# @param command [Array<String>] The the command to execute and any parameters to pass to it.
+	# @return [Hash] A hash containing information about the available commands.
+	def command(account, service, *command)
+		self.run("anope.command", account, service, *command)
+	end
+end
+
+=begin
+arpc = AnopeRPC.new("http://127.0.0.1:8080/jsonrpc")
+begin
+	pp arpc.list_servers(:full)
+rescue StandardError => err
+	STDERR.puts err
+end
+=end

docs/RPC/rpc_data.md

@@ -0,0 +1,463 @@
+# Anope `rpc_data` RPC interface
+
+## `anope.listAccounts`
+
+Lists all accounts that exist on the network.
+
+### Parameters
+
+Index | Description
+----- | -----------
+0     | If specified then the level of detail to retrieve. Can be set to "full" to retrieve all information or "name" to just retrieve the account names. Defaults to "name".
+
+### Errors
+
+Code   | Description
+------ | -----------
+-32099 | The specified detail level does not exist.
+
+### Result
+
+If the detail level is not specified or is "name" then an array of account names.
+
+If the detail level is "full" then a mapping of account names to information about the account. See `anope.account` for more information on the data structure.
+
+#### Example
+
+```json
+["account1", "account2", "account3"]
+```
+
+## `anope.account`
+
+Retrieves information about the specified account.
+
+### Parameters
+
+Index | Description
+----- | -----------
+0     | Either a nickname belonging to the account or an account identifier.
+
+### Errors
+
+Code   | Description
+------ | -----------
+-32099 | The specified account does not exist.
+
+### Result
+
+Returns a map containing information about the account.
+
+Key                    | Type           | Description
+---                    | ----           | -----------
+display                | string         | The display nickname of the account.
+email                  | string or null | The email address associated with the account or null if one has not been specified.
+extensions             | map            | A key-value map of the extensions set on this account by modules.
+language               | string or null | The language associated with the account or null if the account uses the default language.
+lastmail               | int            | The time at which an email was last sent for this account.
+nicks                  | map            | Information about nicknames that belong to the account keyed by the nickname.
+nicks.\*.extensions    | map            | A key-value map of the extensions set on this nickname by modules.
+nicks.\*.lastseen      | int            | The time at which this nickname was last used.
+nicks.\*.registered    | int            | The time at which this nickname was registered.
+nicks.\*.vhost         | map or null    | The vhost associated with the account or null if the user has no vhost.
+nicks.\*.vhost.created | int            | The time at which the vhost was created.
+nicks.\*.vhost.creator | string         | The nickname of the creator of the vhost.
+nicks.\*.vhost.host    | string         | The host segment of the vhost.
+nicks.\*.vhost.ident   | string or null | The ident segment of the vhost or null if there is not one.
+nicks.\*.vhost.mask    | string         | The user@host or host mask of the vhost.
+opertype               | map or null    | The oper type associated with the account or null if they are not a services operator.
+opertype.commands      | array[string]  | The commands that the services operator type can use.
+opertype.name          | string         | The name of the services operator type.
+opertype.privileges    | array[string]  | The privileges that the services operator type has.
+registered             | int            | The time at which the account was registered.
+uniqueid               | uint           | The unique immutable identifier of the account.
+users                  | array[string]  | The IRC users who are currently logged in to this account.
+
+#### Example
+
+```json
+{
+	"display": "foo",
+	"email": "example@example.com",
+	"extensions": {
+		"AUTOOP": true,
+		"HIDE_EMAIL": true,
+		"HIDE_MASK": true,
+		"MEMO_RECEIVE": true,
+		"MEMO_SIGNON": true,
+		"NS_PRIVATE": true,
+		"PROTECT": true,
+		"PROTECT_AFTER": 69
+	},
+	"language": null,
+	"lastmail": 1745071858,
+	"nicks": {
+		"foo": {
+			"extensions": {
+				"NS_NO_EXPIRE": true
+			},
+			"lastseen": 1745074153,
+			"registered": 1745071857,
+			"vhost": null
+		},
+		"bar": {
+			"extensions": {},
+			"lastseen": 1745072602,
+			"registered": 1745071857,
+			"vhost": {
+				"created": 1745072653,
+				"creator": "foo",
+				"host": "bar.baz",
+				"ident": "foo",
+				"mask": "foo@bar.baz"
+			}
+		}
+	},
+	"opertype": {
+		"commands": ["hostserv/*", "operserv/session"],
+		"name": "Helper",
+		"privileges": ["chanserv/no-register-limit"]
+	},
+	"registered": 1745071857,
+	"uniqueid": 11085415958920757000,
+	"users": [
+		"foo"
+	]
+}
+```
+## `anope.listChannels`
+
+Lists all channels that exist on the network.
+
+### Parameters
+
+Index | Description
+----- | -----------
+0     | If specified then the level of detail to retrieve. Can be set to "full" to retrieve all information or "name" to just retrieve the channel names. Defaults to "name".
+
+### Errors
+
+Code   | Description
+------ | -----------
+-32099 | The specified detail level does not exist.
+
+### Result
+
+If the detail level is not specified or is "name" then an array of channel names.
+
+If the detail level is "full" then a mapping of channel names to information about the channel. See `anope.channel` for more information on the data structure.
+
+#### Example
+
+```json
+["#chan1", "#chan2", "#chan3"]
+```
+
+## `anope.channel`
+
+Retrieves information about the specified channel.
+
+### Parameters
+
+Index | Description
+----- | -----------
+0     | The name of the channel.
+
+### Errors
+
+Code   | Description
+------ | -----------
+-32099 | The specified channel does not exist.
+
+### Result
+
+Returns a map containing information about the channel.
+
+Key         | Type          | Description
+---         | ----          | -----------
+created     | int           | The UNIX time at which the channel was originally created.
+listmodes   | map           | List modes which are set on the channel keyed by the mode character.
+modes       | array[string] | Flag and parameter modes which are set on the channel.
+name        | string        | The name of the channel.
+registered  | boolean       | Whether the channel is registered.
+topic       | map or null   | The channel topic or null if no topic is set.
+topic.setat | int           | The time at which the topic was set.
+topic.setby | string        | The nick or nuh of the user who set the topic.
+topic.value | string        | The text of the topic.
+users       | array[string] | The users that are current in the channel prefixed by their status mode prefixes.
+
+#### Example
+
+```json
+{
+	"created": 1740402691,
+	"listmodes": {
+		"b": ["foo!bar@baz", "account:bax"],
+	},
+	"modes": ["+knrt", "secret"],
+	"name": "#chan1",
+	"registered": true,
+	"topic": {
+		"setat": 1740404706,
+		"setby": "nick1",
+		"value": "Example channel topic"
+	},
+	"users": ["@nick1", "nick2"]
+}
+```
+
+## `anope.listOpers`
+
+Lists all services operators that exist on the network.
+
+### Parameters
+
+Index | Description
+----- | -----------
+0     | If specified then the level of detail to retrieve. Can be set to "full" to retrieve all information or "name" to just retrieve the services operator nicknames. Defaults to "name".
+
+### Errors
+
+Code   | Description
+------ | -----------
+-32099 | The specified detail level does not exist.
+
+### Result
+
+If the detail level is not specified or is "name" then an array of services operator names.
+
+If the detail level is "full" then a mapping of services operator names to information about the services operator. See `anope.oper` for more information on the data structure.
+
+#### Example
+
+```json
+["nick1", "nick2", "nick3"]
+```
+
+## `anope.oper`
+
+Retrieves information about the specified services operator.
+
+### Parameters
+
+Index | Description
+----- | -----------
+0     | The name of the services operator.
+
+### Errors
+
+Code   | Description
+------ | -----------
+-32099 | The specified services operator does not exist.
+
+### Result
+
+Returns a map containing information about the services operator.
+
+Key                 | Type                  | Description
+---                 | ----                  | -----------
+fingerprints        | array[string] or null | The client certificate fingerprints that a user must be using to log in as this services operator or null if there are no client certificate restrictions.
+hosts               | array[string] or null | The user@ip and user@ip masks that a user must be connecting from to log in as this services operator or null if there are no host restrictions.
+name                | string                | The name of the services operator.
+operonly            | boolean               | Whether a user has to be a server operator to log in as this services operator.
+opertype            | map                   | The oper type associated with the services operator.
+opertype.commands   | array[string]         | The commands that the services operator type can use.
+opertype.name       | string                | The name of the services operator type.
+opertype.privileges | array[string]         | The privileges that the services operator type has.
+password            | boolean               | Whether a user has to specify a password to log in as the services operator.
+vhost               | string or null        | The vhost of the services operator or null if there is no vhost.
+
+#### Example
+
+```json
+{
+	"fingerprints": null,
+	"hosts": ["*@*.example.com"],
+	"name": "stest",
+	"operonly": true,
+	"opertype": {
+		"commands": ["hostserv/*", "operserv/session"],
+		"name": "Helper",
+		"privileges": ["chanserv/no-register-limit"]
+	},
+	"password": false,
+	"vhost": null
+}
+```
+
+## `anope.listServers`
+
+Lists all servers that exist on the network.
+
+### Parameters
+
+Index | Description
+----- | -----------
+0     | If specified then the level of detail to retrieve. Can be set to "full" to retrieve all information or "name" to just retrieve the server names. Defaults to "name".
+
+### Errors
+
+Code   | Description
+------ | -----------
+-32099 | The specified detail level does not exist.
+
+### Result
+
+If the detail level is not specified or is "name" then an array of server names.
+
+If the detail level is "full" then a mapping of server names to information about the server. See `anope.server` for more information on the data structure.
+
+#### Example
+
+```json
+["irc1.example.com", "irc2.example.com", "services.example.com"]
+```
+
+## `anope.server`
+
+Retrieves information about the specified server.
+
+### Parameters
+
+Index | Description
+----- | -----------
+0     | The name of the server.
+
+### Errors
+
+Code   | Description
+------ | -----------
+-32099 | The specified server does not exist.
+
+### Result
+
+Returns a map containing information about the server.
+
+Key         | Type           | Description
+---         | ----           | -----------
+description | string         | The description of the server.
+downlinks   | array[string]  | The servers which are behind this server
+juped       | boolean        | Whether the server has been juped.
+name        | string         | The name of the server.
+sid         | string or null | The unique immutable identifier of the server or null if the IRCd does not use SIDs.
+synced      | boolean        | Whether the server has finished syncing.
+ulined      | boolean        | Whether the server is U-lined.
+uplink      | string or null | The server in front of this server or null if it is the services server.
+
+#### Example
+
+```json
+{
+	"description": "Anope IRC Services",
+	"downlinks": ["irc.example.com"],
+	"juped": false,
+	"name": "services.example.com",
+	"sid": "00B",
+	"synced": true,
+	"ulined": true,
+	"uplink": null
+}
+```
+
+## `anope.listUsers`
+
+Lists all users that exist on the network.
+
+### Parameters
+
+Index | Description
+----- | -----------
+0     | If specified then the level of detail to retrieve. Can be set to "full" to retrieve all information or "name" to just retrieve the user nicknames. Defaults to "name".
+
+### Errors
+
+Code   | Description
+------ | -----------
+-32099 | The specified detail level does not exist.
+
+### Result
+
+If the detail level is not specified or is "name" then an array of user nicknames.
+
+If the detail level is "full" then a mapping of user nicknames to information about the user. See `anope.user` for more information on the data structure.
+
+#### Example
+
+```json
+["nick1", "nick2", "nick3"]
+```
+
+## `anope.user`
+
+Retrieves information about the specified user.
+
+### Parameters
+
+Index | Description
+----- | -----------
+0     | The nickname of the user.
+
+### Errors
+
+Code   | Description
+------ | -----------
+-32099 | The specified user does not exist.
+
+### Result
+
+Returns a map containing information about the user.
+
+Key              | Type           | Description
+---              | ----           | -----------
+account          | map or null    | The user's account or null if they are not logged in to an account.
+account.display  | string         | The display nickname of the account.
+account.opertype | string or null | The account's oper type or null if the account is not a services operator.
+account.uniqueid | uint           | The unique immutable identifier of the account.
+address          | string         | The IP address the user is connecting from.
+away             | map or null    | The user's away state or null if they are not away.
+away.message     | string         | The away message specified by the user.
+away.time        | int            | The UNIX time at which the user went away.
+channels         | array[string]  | The channels that the user is in prefixed by their status mode prefixes.
+chost            | string or null | The cloaked hostname of the user or null if they have no cloak.
+fingerprint      | string or null | The fingerprint of the user's client certificate or null if they are not using one.
+host             | string         | The real hostname of the user.
+ident            | string         | The username (ident) of the user.
+modes            | array[string]  | Flag and parameter modes which are set on the user.
+nick             | string         | The nickname of the user.
+nickchanged      | int            | The time at which the user last changed their nickname.
+real             | string         | The real name of the user.
+server           | string         | The server that the user is connected to.
+signon           | int            | The time at which the user connected to the network.
+tls              | bool           | Whether the user is connected using TLS (SSL).
+uid              | string or null | The unique immutable identifier of the user or null if the IRCd does not use UIDs.
+vhost            | string or null | The virtual host of the user or null if they have no vhost.
+vident           | string or null | The virtual ident (username) of the user or null if they have no vident.
+
+#### Example
+
+```json
+{
+	"account": {
+		"display": "nick1",
+		"opertype": "Services Root",
+		"uniqueid": "17183514657819486040"
+	},
+	"address": "127.0.0.1",
+	"away": null,
+	"channels": ["@#chan1", "#chan2"],
+	"chost": "localhost",
+	"fingerprint": null,
+	"host": "localhost",
+	"id": "9TSAAAAAA",
+	"ident": "user1",
+	"modes": ["+r"],
+	"nick": "nick1",
+	"nickchanged": 1740408318,
+	"real": "An IRC User",
+	"server": "irc.example.com",
+	"signon": 1740408296,
+	"tls": true,
+	"vhost": "staff.example.com",
+	"vident": null,
+}
+```

docs/RPC/rpc_message.md

@@ -0,0 +1,67 @@
+# Anope `rpc_message` RPC interface
+
+## `anope.messageNetwork`
+
+Sends a message to all users on the network.
+
+### Parameters
+
+Index | Description
+----- | -----------
+0+    | One or more messages to send.
+
+### Errors
+
+Code   | Description
+------ | -----------
+-32099 | The global service is not available.
+
+### Result
+
+This procedure returns no result.
+
+## `anope.messageServer`
+
+Sends a message to all users on the specified server.
+
+### Parameters
+
+Index | Description
+----- | -----------
+0     | The name of the server to message users on.
+1+    | One or more messages to send.
+
+### Errors
+
+Code   | Description
+------ | -----------
+-32099 | The global service is not available.
+-32098 | The specified server does not exist.
+
+### Result
+
+This procedure returns no result.
+
+## `anope.messageUser`
+
+Sends a message to the specified user.
+
+### Parameters
+
+Index | Description
+----- | -----------
+0     | The source pseudoclient to send the message from.
+1     | The target user to send the message to.
+2+    | One or more messages to send.
+
+### Errors
+
+Code   | Description
+------ | -----------
+-32099 | The specified source does not exist.
+-32098 | The specified target does not exist.
+
+### Result
+
+This procedure returns no result.
+

docs/RPC/rpc_user.md

@@ -0,0 +1,175 @@
+# Anope `rpc_user` RPC interface
+
+## `anope.checkCredentials`
+
+Checks whether the specified credentials are valid.
+
+### Parameters
+
+Index | Description
+----- | -----------
+0     | A nickname belonging to the account to check.
+1     | The password for the specified account.
+
+### Errors
+
+Code   | Description
+------ | -----------
+-32099 | The specified account does not exist.
+-32098 | The specified password is not correct.
+-32097 | The specified account is suspended.
+
+### Result
+
+Returns a map containing basic information about the account. More information about the account can be found by calling [the `anope.account` event using the value from the `uniqueid` field (requires the rpc_data module)](./rpc_user.md).
+
+Key       | Type    | Description
+---       | ----    | -----------
+account   | string  | The display nickname of the account.
+confirmed | boolean | Whether the account has been confirmed.
+uniqueid  | uint    | The unique immutable identifier of the account.
+
+#### Example
+
+```json
+{
+	"account": "foo",
+	"confirmed": true,
+	"uniqueid": 11085415958920757000,
+}
+```
+
+## `anope.identify`
+
+Identifies an IRC user to the specified account.
+
+### Parameters
+
+Index | Description
+----- | -----------
+0     | Either an account identifier or nickname belonging to the account to identify to.
+1     | The nickname of the IRC user to identify to the account.
+
+### Errors
+
+Code   | Description
+------ | -----------
+-32099 | The specified account does not exist.
+-32098 | The specified IRC user does not exist.
+
+### Result
+
+This procedure returns no result.
+
+## `anope.listCommands`
+
+Lists all commands that exist on the network.
+
+### Parameters
+
+Index | Description
+----- | -----------
+0...n | The nicknames of the services to list commands for. If none are specified then all commands are returned.
+
+### Errors
+
+Code   | Description
+------ | -----------
+-32098 | The specified service does not exist.
+
+### Result
+
+Returns a map containing information about the available commands.
+
+Key                   | Type           | Description
+---                   | ----           | -----------
+\*                    | map            | A key-value map of services to the commands that exist on them.
+\*.\*                 | string         | A key-value map of commands to information about the commands.
+\*.\*.group           | string or null | The group that the command belongs to or null if the command is not grouped.
+\*.\*.hidden          | boolean        | Whether the command is visible in the help output.
+\*.\*.maxparams       | uint or null   | The maximum number of parameters that the command accepts or null if there is no limit.
+\*.\*.minparams       | uint           | The minimum number of parameters that the command accepts.
+\*.\*.permission      | string or null | The services operator permission required to execute the command or null if no permissions are required.
+\*.\*.requiresaccount | boolean        | Whether a caller must be logged into an account to execute the command.
+\*.\*.requiresuser    | boolean        | Whether an IRC user is required to execute the command.
+
+#### Example
+
+```json
+{
+	"Global": {
+		"GLOBAL": {
+			"group": null,
+			"hidden": false,
+			"maxparams": 1,
+			"minparams": 0,
+			"permission": "global/global",
+			"requiresaccount": true,
+			"requiresuser": false
+		},
+		"HELP": {
+			"group": null,
+			"hidden": false,
+			"maxparams": null,
+			"minparams": 0,
+			"permission": null,
+			"requireaccount": false,
+			"requireuser": false
+		},
+		"QUEUE": {
+			"group": null,
+			"hidden": false,
+			"maxparams": 2,
+			"minparams": 1,
+			"permission": "global/queue",
+			"requireaccount": true,
+			"requireuser": false
+		},
+		"SERVER": {
+			"group": null,
+			"hidden": false,
+			"maxparams": 2,
+			"minparams": 1,
+			"permission": "global/server",
+			"requireaccount": true,
+			"requireuser": false
+		}
+	}
+}
+```
+
+## `anope.commands`
+
+Executes the specified command.
+
+### Parameters
+
+Index | Description
+----- | -----------
+0     | If non-empty then the account to execute the command as.
+1     | The service which the command exists on.
+2...n | The the command to execute and any parameters to pass to it.
+
+### Errors
+
+Code   | Description
+------ | -----------
+-32099 | The specified account does not exist.
+-32098 | The specified service does not exist.
+-32097 | The specified command does not exist.
+
+### Result
+
+Returns an array of messages returned by the command.
+
+#### Example
+
+```json
+[
+  "Global commands:",
+  "    GLOBAL    Send a message to all users",
+  "    HELP      Displays this list and give information about commands",
+  "    QUEUE     Manages your pending message queue.",
+  "    SERVER    Send a message to all users on a server"
+]
+```

docs/TODO

@@ -1,25 +0,0 @@
-Legend:
-	x = done
-	? = unsure
-	+ = in progress
-
-Future
-------
-[ ] NS IDENTIFY changes
-  [?] Last failed identify? Maybe more useful for sopers only, so users don't get unnecessarily worried
-  [?] Last successful login time/ip? perhaps both of these should be a new nick setting
-[ ] NS SUSPEND: show suspender and reason, probably to sopers only (see CS SUSPEND)
-[ ] Allow channel founders to change the fantasy trigger for their channel.
-[+] CIDR Akills, session exceptions, etc
-[?] Language charset stuff, including collation (1.9.1? phoenix?)
-[?] a way for a module to queue itself (or even another module) for unloading
-[+] Useful/common "third party" modules to core distro
-  [x] NS AJOIN
-  [x] CS ENTRYMSG
-[?] Don't allow soper accounts to expire
-[?] Reason for CS SET RESTRICTED
-[ ] Unique IDs on each AKILL/blah so that networks may use them as ticket IDs
-[ ] HS ACTIVATE -ALL (rob sez this all needs reviewing)
-[ ] No nickname ownership?
-[ ] More commands need to be split up such as /bs bot, /ms set, /bs kick, /bs set, /os set? etc.
-[ ] Customize email messages

docs/TOOLS

@@ -1,27 +0,0 @@
-Anope Bundled Tools
--------------------
-
-1) Anope SMTP Client
-
-    Provided with Anope is a simple SMTP client which can be used instead of
-    programs like SendMail in some cases.
-
-    The SMTP client can be used instead of sendmail for use with Anope's mail
-    options. To use the SMTP client instead of sendmail, find the line in your
-    services configuration file (services.conf) that defines sendmailpath. On
-    that line, change the path to your services installation directory, then
-    followed by "bin/anopesmtp" and the IP address of a valid SMTP server. It
-    should look like this:
-
-        sendmailpath = "/home/anope/services/bin/anopesmtp 127.0.0.1"
-
-    If the SMTP client doesn't send mail, or if there's an other problem with
-    it, you can compile it in debug mode. To do this, open anopesmtp.cpp, and look
-    for "smtp_debug" near the top. Change this from 0 to 1 and recompile
-    the code. This should generate a log file of what happened when it tried
-    to connect to the SMTP server.
-
-        Credits:
-    Originally written by  Dominick Meglio    <codemastr@unrealircd.com>
-    Ported to *nix by      Trystan Scott Lee  <trystan@nomadirc.net>
-

docs/WIN32.md

@@ -0,0 +1,57 @@
+# Building Anope on Windows
+
+## Dependencies
+
+You will need the following software installed to build Anope:
+
+* [CMake 3.20 or newer](https://cmake.org/download/#latest)
+* [Conan 2 or newer](https://conan.io/downloads) (optional if you don't want to build extra modules)
+* [NSIS 3 or newer](https://nsis.sourceforge.io/Download)
+* [Visual Studio 2022 or newer](https://visualstudio.microsoft.com/downloads/) (*NOT* Visual Studio Code)
+
+## Building
+
+First you need to download the latest version of the Anope source code from [the releases page](https://github.com/anope/anope/releases) and unpack it using Windows Explorer.
+
+---
+
+Once you have the source code unpacked you need open the Command Prompt and move to the directory in which Anope has been unpacked. You can do this by pressing Control+R and then entering `cmd.exe` and pressing enter. Once the terminal opens you can move to the directory using the following command (assuming you unpacked to `C:\Users\Example\Downloads\anope-2.1`):
+
+```cmd
+cd C:\Users\Example\Downloads\anope-2.1
+```
+
+---
+
+If you want to build with multiple-language support or want to use the enc_argon2, mysql, regex_pcre2, regex_posix, regex_tre, sqlite, or ssl_openssl extra modules you will now need to install the third-party dependencies using Conan. Before you can do this you need to create a Conan profile for C++17 using the following command:
+
+```cmd
+conan profile detect
+notepad ~\.conan2\profiles\default
+```
+
+When Notepad opens you should find the line beginning with `compiler.cppstd=` and replace the entire line with `compiler.cppstd=17` and save the file.
+
+Now you're ready to install the third-party dependencies using the following command:
+
+
+```cmd
+conan install .\src\win32 --build missing --deployer runtime_deploy --deployer-folder .\build\extradll --output-folder .
+call .\conanbuild.bat
+```
+
+This will probably take a long time if its the first time you have run it.
+
+---
+
+Now you're ready to build Anope.
+
+```cmd
+cd .\build
+cmake -A x64 -D "CMAKE_BUILD_TYPE=Release" -D "CMAKE_TOOLCHAIN_FILE=conan_toolchain.cmake" ..
+msbuild PACKAGE.vcxproj /P:Configuration=Release /P:Platform=x64 /VERBOSITY:MINIMAL
+```
+
+Once the build finishes the installer will be available in the build directory. You can install this by opening the directory in Windows Explorer and then running it as you would with most Windows installers.
+
+Once installed Anope will be available at `C:\Program Files\Anope`.

docs/WIN32.txt

@@ -1,172 +0,0 @@
-Anope for Windows
------------------
-
-1) Building the Source
-2) Installation
-3) Compiling Modules
-4) Other compile options
-5) Credits
-
-1) Building the Source
-
-    NOTE: If you have downloaded one of the pre-compiled installers, you do
-          NOT need to complete this step, and you can proceed to step 2.
-
-    If you want to build Anope from source on a Win32 system, you will need
-    to follow this instructions:
-
-    1) Download the required files:
-
-        * Current Anope source:
-            http://sourceforge.net/project/showfiles.php?group_id=94081
-
-        * CMake:
-            http://www.cmake.org/cmake/resources/software.html
-
-        (NOTE: When installing, tell CMake to add itself to the PATH.)
-
-        If you have Visual C++ 10 (2010) skip ahead to step 2, else you
-        need to download the following free component from Microsoft. Once
-        downloaded, install these packages.
-
-        * Microsoft Visual C++ 2010 Express Edition:
-            http://www.microsoft.com/express/vc/
-
-    2) Unpack the Anope tarball with your favorite uncompression program
-       (WinZip or WinRAR, etc).
-
-    3) Bring up the Visual C++ Command Prompt; This will launch a
-       DOS Command Prompt like window, which will set the environment
-       properties needed to make Anope.
-
-       Create a new directory, which will be used to hold the build files. You can make it
-       be a directory under the source directory unpacked in step 2, or somewhere else entirely.
-
-       Change directories to this new folder, by typing:
-
-          cd <path to build directory>
-
-          e.g.
-
-          cd c:\anope-build
-
-    4) You now need to configure Anope to your requirements. At the prompt type:
-
-        <path to source directory>\Config.exe
-
-       NOTE: If you run an Anti-Virus program such as McAfee or Norton, you may
-       be unable to run this command due to the protection in place. Some Anti-
-       Virus programs may detect the Anope Configuration Tool as a worm, however
-       this is not the case. If you are prompted to allow or deny execution of
-       the script, you should choose allow. If the script fails to run, and no
-       notice is displayed, please check your Anti-Virus settings before seeking
-       assistance.
-
-       An interactive configuration program should guide you through the install
-       options. You will be given a choice to use NMake or not. NMake will compile
-       inside the command prompt window you are in. If you want to build within
-       the Visual C++ IDE, say no to that option, and it'll create a Solution for
-       you to open up.
-
-       If you cannot find whats causing the error, please visit our forums or
-       our IRC Support channel for assistance.
-
-       Some Anope modules require third party libraries, such as m_mysql and
-       m_ssl. If these libraries are installed in nonstandard locations, cmake
-       will probably not find them and should be told where they are by passing
-       additional search paths to the last question in Config, such as:
-
-       -DEXTRA_INCLUDES:STRING=c:/openssl/include;c:/openssl/lib
-
-       Which would have cmake search both C:\openssl\include and
-       C:\openssl\lib.
-
-       Building Anope with gettext requires libintl, libiconv, libgcc and
-       libmingex. We have precompiled these libraries for you that you may
-       use if you want. They are avaiable at http://anope.org/downloads/anope-extra.zip
-       The OpenSSL, MySQL, and OpenLDAP header files and libraries are also included in
-       this package. Once downloaded and extracted, you should run install.bat
-       then give Config the path to the new 'installed' directory.
-
-    5) You are now ready to compile. If you said you wanted to use NMake in step 4,
-       at the prompt type:
-
-        nmake
-
-       Once you are back at the command prompt again, if there have been no
-       errors, you are ready to go.
-
-       If instead you decided to use the Visual C++ IDE, open up the Anope.sln
-       file. After the IDE has fully loaded, hit F7 to build everything.
-
-       Should you encounter errors with the installation process, check the
-       messages displayed for advice on resolving them. If you are unable to
-       resolve the issues yourself, seek assistance on our forums or in our
-       IRC Support channel.
-
-    6) Finally you will need to install Anope. If you said you wanted to use NMake
-       in step 4, at the prompt type:
-
-        nmake install
-
-       Otherwise, if you decided to use the Visual C++ IDE, find the project called
-       INSTALL within the Solution Explorer. Right-click on INSTALL and choose Build.
-
-       When you have done this, all the files will be installed to where they belong.
-       The only thing you need to do is rename "data/example.conf" to be "data/services.conf",
-       and then follow the steps to set up Anope.
-
-    You have now completed the building phase of Anope for Windows. You can
-    now move on to the next section, which is related to setting up Anope.
-
-2) Installation
-
-    Since Anope for Windows does not use a visual interface, you must do the
-    configuration with a text editor before proceeding with running Anope
-    itself.
-
-    NOTE: You may need to open the configuration file with Wordpad, or a text
-    editor which supports UNIX line endings. Opening the configuration file in
-    Notepad will cause strange characters to appear, and you may not be able to
-    edit the file correctly.
-
-    Open services.conf, and read through it carefully and adjust the settings
-    you think you need to adjust.
-
-    If you are unsure of the settings, you can go to the dos command prompt
-    and run "anope.exe --nofork --debug" and watch the information as it
-    attempts to connect.
-
-    You can launch services in two ways. If you are sure that the entered
-    configuration information is correct, simply double clicking the Anope
-    executable will cause it to start; no window will pop up. If you'd rather
-    have a more textual output, you can start at the dos prompt and type in
-    "anope.exe". If services are successfully started up the dos prompt will
-    seem to hang; at this point you can safely close the dos window.
-
-3) Compiling Modules
-
-    If you want to build other modules than the ones shipped by default, you
-    will need to rerun Config.exe
-
-4) Other compile options
-
-    A) If you have trouble recompiling Anope, you should delete all files and folders
-       within the build folder you created in step 3 of section 1. Afterwards, follow
-       the directions from step 4 of section 1 down.
-
-5) Credits
-
-    Anope is based on Epona and IRCServices. See CREDITS for more credits and
-    a complete list of all developers.
-
-    Anope's Windows-specific code is provided by:
-
-        * Dominick Meglio       <codemastr@unrealircd.com>
-        * Trystan Scott Lee     <trystan@nomadirc.net>
-        * Chris Hogben          <heinz@anope.org>
-
-    Anope's Windows Installer was made using:
-
-        * NSIS 2.20          <http://nsis.sourceforge.net>
-

docs/XMLRPC/XMLRPC

@@ -1,26 +0,0 @@
-Starting with Anope 1.9.4 XMLRPC using PHP's xmlrpc_encode_request and xmlrpc_decode functions is supported.
-This allows external applications, such as websites, to execute remote procedure calls to Anope in real time.
-
-Currently there are 5 supported XMLRPC calls, provided by m_xmlrpc_main:
-
-checkAuthetication - Takes two parameters, an account name and a password. Checks if the account name is valid and the password
-                     is correct for the account name, useful for making login pages on websites.
-
-command - Takes three parameters, a service name (BotServ, ChanServ, NickServ), a user name (whether online or not), and the command
-          to execute. This will execute a the given command to Anope using the given service name. If the user given is online, the
-	  command reply will go to them, if not it is returned by XMLRPC.
-
-stats - Takes no parameters, returns miscellaneous stats that can be found in the /operserv stats command.
-
-channel - Takes one parameter, a channel name, and returns real time information regarding that channel, such as users, modes
-          (ban lists and such), topic etc.
-
-user - Takes one parameter, a user name, and returns real time information regarding that user.
-
-XMLRPC was designed to be used with db_mysql, and will not return any information that can be pulled from the SQL
-database, such as accounts and registered channel information. It is instead used for pulling realtime data such
-as users and channels currently onlive. For examples on how to use these calls in PHP, see xmlrpc.php in docs/XMLRPC.
-          
-Also note that the parameter named "id" is reserved for query ID. If you pass a query to Anope containing a value for id. it will
-be stored by Anope and the same id will be passed back in the result.
-

docs/XMLRPC/xmlrpc.php

@@ -1,101 +0,0 @@
-<?php
-/* XMLRPC Functions
- *
- * (C) 2003-2012 Anope Team
- * Contact us at team@anope.org
- *
- */
-
-class AnopeXMLRPC
-{
-	private $Host, $Bind, $Port;
-
-	private $Socket;
-
-	function __construct($Host, $Port, $Bind = NULL)
-	{
-		$this->Host = $Host;
-		$this->Port = $Port;
-		$this->Bind = $Bind;
-
-		$this->Socket = socket_create(AF_INET, SOCK_STREAM, SOL_TCP);
-		if ($Bind && socket_bind($this->Socket, $this->Bind) == false)
-			$his->Socket = false;
-		if (socket_connect($this->Socket, $this->Host, $this->Port) == false)
-			$this->Socket = false;
-	}
-
-	function __destruct()
-	{
-		@socket_close($this->Socket);
-	}
-
-	/** Run an XMLRPC command. Name should be a query name and params an array of parameters, eg:
-	 * $this->RunXMLRPC("checkAuthentication", array("adam", "qwerty"));
-	 * If successful returns back an array of useful information.
-	 *
-	 * Note that $params["id"] is reserved for query ID, you may set it to something if you wish.
-	 * If you do, the same ID will be passed back with the reply from Anope.
-	 */
-	function RunXMLRPC($name, $params)
-	{
-		$xmlquery = xmlrpc_encode_request($name, $params);
-		socket_write($this->Socket, $xmlquery);
-
-		$inbuf = socket_read($this->Socket, 4096);
-		$inbuf = substr($inbuf, strpos($inbuf, "\r\n\r\n") + 4);
-		$response = xmlrpc_decode($inbuf);
-
-		if (isset($response[0]))
-			return $response[0];
-		return NULL;
-	}
-
-	/** Do Command on Service as User, eg:
-	 * $anope->DoCommand("ChanServ", "Adam", "REGISTER #adam");
-	 * Returns an array of information regarding the command execution, if
-	 * If 'online' is set to yes, then the reply to the command was sent to the user on IRC.
-	 * If 'online' is set to no, then the reply to the command is in the array member 'return'
-	 */
-	function DoCommand($Service, $User, $Command)
-	{
-		return $this->RunXMLRPC("command", array($Service, $User, $Command));
-	}
-
-	/** Check an account/nick name and password to see if they are valid
-	 * Returns the account display name if valid
-	 */
-	function CheckAuthentication($Account, $Pass)
-	{
-		$ret = $this->RunXMLRPC("checkAuthentication", array($Account, $Pass));
-
-		if ($ret && $ret["result"] == "Success")
-			return $ret["account"];
-		return NULL;
-	}
-
-	/* Returns an array of misc stats regarding Anope
-	 */
-	function DoStats()
-	{
-		return $this->RunXMLRPC("stats", NULL);
-	}
-
-	/* Look up data for a channel
-	 * Returns an array containing channel information, or an array of size one
-	 * (just containing the name) if the channel does not exist
-	 */
-	function DoChannel($Channel)
-	{
-		return $this->RunXMLRPC("channel", NULL);
-	}
-
-	/* Like DoChannel(), but different.
-	 */
-	function DoUser($User)
-	{
-		return $this->RunXMLRPC("user", array($User));
-	}
-}
-
-?>

docs/old/changes.txt

@@ -0,0 +1,326 @@
+Anope Version 2.1.18
+--------------------
+Added a check that a non-deprecated database module is loaded.
+Added support for flexible and monospace layouts to make text easier to read on clients that use a variable-width font.
+Added support for logging about deprecated modules on boot.
+Added support for per-IRCd hints when a link fails.
+Added support for self-service validation of vhosts using DNS TXT records.
+Added support for separate bad password limits for pre-connection SASL authentication.
+Added support for SRV and TXT records to the dns module.
+Added the --nodb option to disable database and encrytption module checks.
+Added the nickname registration date to the nickserv/glist output.
+Changed db_flatfile to be import-only (migrate to db_json).
+Changed the default registration confirmation type to code validation.
+Changed the fantasy !help command to not require the FANTASY privilege by default.
+Changed various length measurement code to be UTF-8 aware.
+Disabled the nickname registration delay by default.
+Fixed reporting the MySQL version that the mysql module was built against.
+Improved the layout of the nickserv/info command.
+Modularised the ns_sasl module to make it easier to pick SASL mechanisms.
+Moved duration rounding logic from Anope::Expires to Anope::Duration.
+Removed support for importing old databases from 1.8.
+Removed support for verifying "old MD5" passwords from 1.7.
+Reworked how memory is allocated when formatting messages.
+
+Anope Version 2.1.17
+--------------------
+Allowed opers to resend passwords for users in nickserv/resend.
+Fixed HostServ using a different valid username character set to the protocol module.
+Fixed losing the channel and nickname registration time when upgrading from an earlier 2.1 release.
+Improved the messages sent when a user is forced off a protected nickname.
+Simplified copying modules to the runtime directory on Windows.
+
+Anope Version 2.1.16
+--------------------
+Added support for on-IRC code confirmation.
+Added the ability for fantasy commands to be executable without the FANTASY privilege.
+Added the ability to prepend to topics as well as appending to them.
+Changed various fields to serialize to the database as a string not an integer.
+Disabled db_flatfile by default in preparation for becoming import-only.
+Fixed a memory leak in the db_json module.
+Fixed building on OpenSSL 1.1.1 (for now).
+Fixed removed and later re-added temporary bans being removed automatically.
+Fixed sometimes sending malformed LMODE messages on InspIRCd.
+Fixed the "did you mean" message suggesting unloaded commands.
+Fixed various issues with the example config files.
+Marked db_json as the recommended database module.
+Moved the BAN, UNBAN, and KICK commands to the chanserv/management group.
+Removed support for the 1.8-style seen command.
+Reworked confirmation to allow confirmation of multiple account actions.
+When dropping a display nickname the new display will now be the oldest in the group.
+
+Anope Version 2.1.15
+--------------------
+Added a workaround to the jsonrpc module for JavaScript truncating big integers.
+Added an example Ruby library for accessing the RPC interface.
+Added away state and tls usage to the anope.user RPC event.
+Added support for looking up accounts by identifier in the anope.account RPC event.
+Added support for storing the setter and set time and setter of list modes and restoring them on InspIRCd and Solanum.
+Added support for token authentication to the RPC modules.
+Added the anope.checkCredentials, anope.identify, anope.listCommands, and anope.command RPC events to the new rpc_user module.
+Bumped the minimum supported version of ircd-hybrid to 8.2.34.
+Deprecated irc2sql in favour of rpc_data.
+Dropped support for Bahamut as it has no known users.
+Fixed creating duplicate Stats rows on some servers.
+Fixed loading databases in db_json.
+Fixed restoring cloaked hosts on InspIRCd when the cloak module is not loaded.
+Fixed some variable shadowing that potentially caused issues with the SQL database backends.
+Fixed sometimes writing accounts to the database without a unique identifier.
+Fixed various documentation issues with the example JavaScript JSON-RPC client.
+Improved CTCP handling and added support for more CTCP types.
+
+Anope Version 2.1.14
+--------------------
+Added a detail specifier to the anope.list{Channels,Opers,Servers,Users} RPC methods.
+Added a matcher for the InspIRCd oper extban.
+Added support for hashed operator passwords.
+Added support for hiding the date news was added in os_news.
+Added support for local password comparison to the sql_authentication module.
+Added support for monthly backups to db_json.
+Added support for unbanning virtual modes using cs_unban.
+Added the !unmute fantasy command.
+Added the anope.account and anope.listAccounts RPC methods to the rpc_data module.
+Added the protection time to the INFO output.
+Allowed unprivileged channel successors to remove themselves from succession.
+Bumped the minimum required CMake version to 3.20.
+Changed deletion callbacks to specify the mask that was deleted if only one was.
+Changed nickserv/alist to show all permissions not just the highest ranked one.
+Fixed NEVEROP not being respected in chanserv/set/founder and chanserv/set/successor.
+Fixed stripping IRC formatting codes from messages.
+Messages are now automatically line wrapped to options:linelength.
+Redocumented the ns_sasl module.
+Removed hardcoded command names from several messages.
+Updated the Windows CI to Windows Server 2025 and Visual Studio 2022.
+
+Anope Version 2.1.13
+--------------------
+Added a Config check to ensure users actually want to use the development branch.
+Added a flag to the version string when Anope is compiled in reproducible mode.
+Added a warning on rehash when the max password is longer than the maximum bcrypt password length.
+Added an ALLTIME handler on InspIRCd.
+Added an opt-out for extended XML-RPC types.
+Added RPC messages for sending global messages.
+Added support for importing cs_set_misc and ns_set_misc data from Atheme.
+Added support for importing news from Atheme.
+Added support for oper-only quit messages.
+Added support for the experimental "services cloak" system from the InspIRCd development branch.
+Added support for using defines from the environment.
+Added support for using defines within the value of a variable.
+Blacklisted an old version of an UnrealIRCd module that is known to send malformed S2S messages.
+Changed RPC events to be registered as core services.
+Changed the database to refer to accounts by their account identifier instead of their display nick.
+Changed the syntax of defines from "foo" to "${foo}".
+Deduplicated JSON generation code in the jsonrpc module.
+Fixed a warning when importing an Atheme account that uses external authentication.
+Fixed counting email addresses in ns_maxemail.
+Fixed db_atheme creating duplicate accounts, bots, and nicks when importing over an existing database.
+Fixed deleting old database backups after Anope has been restarted.
+Fixed importing user metadata from Anope 1.8.
+Fixed including a port in uplink messages when connecting to a UNIX socket endpoint.
+Fixed memo ignores being erroneously case sensitive.
+Fixed modules with third-party dependencies writing generic log messages instead of module log messages.
+Fixed not performing SQL database updates in some rare circumstances.
+Fixed sending global messages with the default sender.
+Imported mkauthors from InspIRCd and used it to generate docs/AUTHORS.txt
+Moved around a bunch of module headers.
+Moved database serialization from the serializable to the serializable type.
+Moved the SASL protocol interface to its own service.
+Refactored handling S2S metadata on InspIRCd.
+Updated more messages to use gettext plural forms.
+
+Anope Version 2.1.12
+--------------------
+Added an example JavaScript library for accessing the RPC interface.
+Added an option to require specifying the server name when running destructive network commands like restart or shutdown.
+Added support for importing X-line identifiers from Atheme.
+Added support for JSON-RPC to the RPC interface.
+Added support for killing SASL users that fail to log in repeatedly.
+Added support for more RPC response types to the RPC interface.
+Added support for multiple targets in chanserv/modes.
+Added support for SSL client certificate fallback fingerprints on InspIRCd.
+Added the anope. prefix to the channel and user RPC events and moved them to the rpc_data module.
+Added the anope.listChannels, anope.listServers, anope.listUsers, and anope.server RPC events to the new rpc_data module.
+Added the OPERONLY, UNUSED and VANITY filters to botserv/botlist.
+Added the system.listMethods RPC event to the new rpc_system module.
+Deprecated support for InspIRCd v3 (scheduled to be removed in around a year).
+Fixed enc_bcrypt silently truncating passwords longer than 71 characters.
+Fixed ns_set_language being able to be loaded when Anope was built without language support.
+Fixed sql_authentication not being able to use the IP address of a RPC, SASL, or web user in SQL queries.
+Made modules that use third-party libraries log the version in use on load.
+Redesigned the RPC interface to add support for emitting multiple data types.
+Replaced the opers RPC event with rpc.listOpers and rpc.oper events in the new rpc_data module.
+Updated the Dutch translation.
+
+Anope Version 2.1.11
+--------------------
+Added support for database migrations to the mysql module.
+Added support for renicking users to their UID when enforcing nickname protection.
+Added support for sending channel URLs to joining users.
+Allowed selecting languages using a shorter version of their name.
+Changed various messages to use human-readable durations instead of seconds.
+Improved the creation of expiry and duration messages.
+Improved the translation system with support for plural forms.
+Reworked how guest nicknames are generated.
+Simplified how account identifiers are allocated.
+
+Anope Version 2.1.10
+--------------------
+Added support for NEXTBANS on UnrealIRCd.
+Changed hostmask access entries added by nick to use that nick as the default description.
+Changed modes to be handled internally in their split form.
+Changed ns_cert to notify a user that their certificate is being automatically added to their account.
+Fixed matching users against extended bans.
+Fixed parsing name-only extended bans on InspIRCd.
+Fixed respecting the preferred extended ban format on InspIRCd.
+Fixed the name of the cron script in the docs.
+Updated the list of supported IRCds.
+Updated the location of the Anope IRC channels
+
+Anope Version 2.1.9
+-------------------
+Bumped the minimum supported version of UnrealIRCd to 6.
+Fixed granting IRC operator status to services operators.
+Fixed making users an IRC operator on InspIRCd.
+Fixed nonicknameownership on InspIRCd v4.
+Fixed some messages not being translatable.
+Fixed the Argon2 module not having test vectors.
+Increased the default nickname expiry period to one year.
+
+Anope Version 2.1.8
+-------------------
+Added account identifiers to the nickserv/info output.
+Added support for bool, float, and uint SQL columns.
+Added the ability to automatically determine SQL column types based on the native type.
+Added UNIX socket support to mysql module.
+Changed smartjoin to use SendClearBans where available.
+Dropped support for MinGW in favour of native builds.
+Fixed parsing named extbans on InspIRCd.
+Fixed parsing SVSMODE and SVS2MODE from UnrealIRCd.
+Fixed sending global messages to remotely linked servers.
+Removed the services server name from the CTCP version response.
+
+Anope Version 2.1.7
+-------------------
+Added importing of akick reasons, forbid reasons, opers and session exceptions to db_atheme.
+Added support for sending tag messages.
+Added the ability to look up account information of an authenticated user.
+Fixed a crash in ns_cert when an IRC user is not present during a nick registration.
+Fixed a null pointer dereference in the global module.
+Fixed a rare memory leak in os_akill and os_sxline.
+Improved the performance of some code that looks up the primary nick from an account.
+Removed the broken Catalan, Hungarian, and Russian translations.
+Reworked the protocol interface for sending messages.
+Updated the Turkish translation.
+
+Anope Version 2.1.6
+-------------------
+Added opportunistic upgrading of TLS fingerprints to more secure algorithms on InspIRCd.
+Added support for logging out partially connected users on Plexus.
+Added the account registration time to nickserv/info.
+Changed ns_cert to automatically add a TLS fingerprint to new accounts if available.
+Clarified that a non-deprecated encryption module must be loaded.
+Fixed creating the runtime directory on Windows.
+Fixed mistakenly allowing badpasslimit to be set to a negative value.
+Fixed parsing backup TLS fingerprints on InspIRCd.
+Fixed parsing the flood mode on UnrealIRCd.
+Fixed parsing the history mode on UnrealIRCd.
+Fixed various iterator invalidation issues.
+Partially rewrote the Portuguese translation.
+Removed some incorrect strings from the Turkish translation.
+Renamed the --modulesdir option to --moduledir to match the name of other path options.
+
+Anope Version 2.1.5
+-------------------
+Added an example systemd unit file.
+Added support for BIGLINES on UnrealIRCd.
+Bumped the minimum supported version of Bahamut to 2.0.
+Fixed truncating messages in global/global and global/server.
+Improved building Anope for use as a system package.
+Updated the Turkish translation.
+
+Anope Version 2.1.4
+-------------------
+Added a check for a non-deprecated encryption module on start.
+Added a way for protocol modules to report an error to the uplink.
+Added more account settings to the webcpanel.
+Added self-test functionality for all encryption modules.
+Added support for challenge authentication on InspIRCd.
+Added support for importing databases from Atheme.
+Added support for sending client tags on UnrealIRCd.
+Added support for the InspIRCd 1206 (v4) protocol.
+Added the --nopid option to disable writing a pid file.
+Added the enc_argon2 module to encrypt passwords with Argon2.
+Added the enc_sha2 module to encrypt passwords with HMAC-SHA-2.
+Added the global/queue command for queueing multi-line messages.
+Added the global/server command for sending messages to an individual server.
+Added the PASSWORD category to operserv/stats to view password encryption methods.
+Added the verify-only enc_posix module to validate passwords from Atheme that were encrypted with Argon2.
+Changed nickserv/drop to use confirmation codes to confirm a nickname drop.
+Changed various paths to be relative to the data and config directories.
+Converted some IRCDProto member functions to variables.
+Converted the enc_md5, enc_none, enc_old, enc_sha1, and enc_sha256 modules to be verify-only.
+Deduplicated page headers and footers in the webcpanel templates.
+Deprecated the enc_sha256 module.
+Fixed inconsistent spelling/casing of email, vhost, and vident.
+Fixed various bugs in the inspircd module.
+Improved portability of email sending.
+Improved protocol debug messages.
+Improved the performance and reliability of internal conversion logic.
+Improved the randomness of randomly generated numbers.
+Refactored the enc_bcrypt module and exposed it as an encryption context.
+Removed several duplicate translation strings.
+Replaced the custom MD5 implementation in enc_md5 with a vendored one.
+Replaced the custom SHA256 implementation in enc_sha256 with a vendored one.
+The ldap_authentication, ldap_oper, sql_authentication, sql_log, and sql_oper modules are now always enabled.
+
+Anope Version 2.1.3
+-------------------
+Added alternate command suggestions when a user runs an invalid command.
+Added support for the IRCv3 +draft/channel-context tag.
+Added support for the IRCv3 +draft/reply tag.
+Allow using more than one fingerprint in an oper block.
+Changed chanserv/drop to use confirmation codes to confirm a channel drop.
+Cleaned up more of the codebase to use Modern C++17.
+Enabled using more field limits sent by the IRC server instead of requiring the user to configure them.
+Fixed NickServ lying about the minimum password length.
+Fixed a crash when sending emails.
+Fixed bs_kick not using the correct kick message for automatic kicks.
+Increased the security of randomly generated confirmation codes.
+Removed the ns_access module and associated cs_secure and ns_secure options.
+Removed the ns_status module.
+Reworked how messages are sent in protocol modules to allow sending message tags.
+
+Anope Version 2.1.2
+-------------------
+Bumped the minimum OpenSSL version to 1.1.0.
+Bumped the minimum GnuTLS version to 3.0.0.
+Disabled SSLv3 support in the m_ssl_openssl module.
+Modernized mutex and thread code to use Modern C++.
+Normalised the program exit codes.
+Updated the Dutch translation.
+Updated the French translation.
+
+Anope Version 2.1.1
+-------------------
+Added the UNBANME privilege to allow users to unban themselves.
+Fixed building on Windows systems without chgrp/chmod.
+Fixed creating sockets in the m_dns, m_httpd, m_proxyscan, and m_redis modules.
+Fixed reading the values of command line arguments.
+Moved core privilege descriptions to the example configs.
+Updated the Italian translation.
+Updated the Polish translation.
+
+Anope Version 2.1.0
+-------------------
+Added support for access list entry descriptions.
+Added support for linking over a UNIX socket.
+Added support for server-initiated logins and logouts on UnrealIRCd.
+Added support for server-initiated logouts on InspIRCd.
+Added support for the ANONYMOUS SASL mechanism.
+Allowed users to opt-out of being added to channel access lists.
+Cleaned up the codebase to use Modern C++17.
+Modernized the build system to use a modern version of CMake.
+Removed support for using insecure encryption methods as the primary method.
+Removed the Windows-only anopesmtp tool.
+Removed the two day X-line cap.
+Updated all references to IRCServices to refer to Anope instead.

docs/old/config-changes.txt

@@ -0,0 +1,204 @@
+Anope Version 2.1.18
+--------------------
+Added the hostserv/validate command.
+Added the nickserv/saset/layout command.
+Added the nickserv/set/layout command.
+Added the ns_sasl_anonymous module.
+Added the ns_sasl_external module.
+Added the ns_sasl_plain module.
+Added the ns_set_layout module.
+Added the ns_set_op module.
+Added {hs_request}:validationcooldown (defaults to 5 minutes).
+Added {hs_request}:validationrecord (defaults to "anope-dns-validation").
+Added {ns_sasl}:badpasslimit (defaults to options:badpasslimit).
+Added {ns_sasl}:badpasstimeout (defaults to options:badpasstimeout).
+Moved nickserv/set/autoop and nickserv/saset/autoop to the ns_set_op module.
+Moved nickserv/set/display and nickserv/saset/display to the ns_set_group module.
+Moved nickserv/set/neverop and nickserv/saset/neverop to the ns_set_op module.
+Removed the db_old module.
+Removed the enc_old module.
+Removed {db_flatfile}:fork (module is now import-only).
+Removed {db_flatfile}:keepbackups (module is now import-only).
+Removed {db_flatfile}:nobackupokay (module is now import-only).
+
+Anope Version 2.1.17
+--------------------
+Added the nickserv/resend oper privilege.
+
+Anope Version 2.1.16
+--------------------
+Added fantasy:require_privilege (defaults to yes).
+Added the nickserv/confirm/email command.
+Added the nickserv/confirm/email oper privilege.
+Added the nickserv/confirm/register command.
+Added the ns_confirm module.
+Added {ns_email}:changeexpire (defaults to 1 day).
+Added {ns_resetpass}:resetexpire (defaults to 1 day).
+Removed the irc2sql module (migrate to JSON-RPC instead).
+Removed {ns_seen}:simple (1.8-style seen has been removed).
+Renamed the nickserv/confirm oper privilege to nickserv/confirm/register.
+
+Anope Version 2.1.15
+--------------------
+Added the ns_email module.
+Added the rpc_user module.
+Added {jsonrpc}:integer_bits (defaults to 64).
+Added {jsonrpc}:token.
+Added {nickserv}:enforcerreal (defaults to "Services Enforcer").
+Added {xmlrpc}:token.
+Moved nickserv/set/email and nickserv/saset/email to the ns_email module.
+Removed the bahamut module.
+Removed the ns_getemail module (load ns_email instead).
+Removed the ns_maxemail module (load ns_email instead).
+Removed the rpc_main module (migrate to the other RPC modules).
+Removed {chanstats}:cs_def_chanstats (add CS_STATS to {chanserv}:defaults instead).
+Removed {chanstats}:ns_def_chanstats (add NS_STATS to {nickserv}:defaults instead).
+Renamed service:gecos to service:real.
+
+Anope Version 2.1.14
+--------------------
+Added oper:password_hash.
+Added options:codelength (defaults to 15).
+Added {os_news}:showdate (defaults to yes).
+Added {sql_authentication}:password_field (defaults to "password").
+Added {sql_authentication}:password_hash.
+Changed the default value for options:linelength to "100".
+Changed the default value for {enc_sha2}:algorithm to "sha512".
+Changed the default value for {ns_seen}:purgetime to "90d".
+Changed the syntax for template variables in mail:emailchange_message, mail:emailchange_subject, mail:memo_message, mail:memo_subject, mail:registration_message, mail:registration_subject, mail:reset_message, mail:reset_subject, {chanserv}:signkickformat, {dnsbl}:blacklist:reason, {ldap_authentication}:search_filter, {ldap_oper}:binddn, {ldap_oper}:filter, {nickserv}:unregistered_notice, {os_session}:sessionlimitexceeded, {proxyscan}:proxyscan:reason.
+
+Anope Version 2.1.13
+--------------------
+Added options:linelength (defaults to 120).
+Added the db_json module.
+Added the rpc_message module.
+Added {nickserv}:defaultprotect (defaults to 1m).
+Added {nickserv}:maxprotect (defaults to 10m).
+Added {nickserv}:minprotect (defaults to 10s)
+Added {xmlrpc}:enable_i8 (defaults to yes).
+Added {xmlrpc}:enable_nil (defaults to yes).
+Changed the syntax for using defines (all existing defines will need to be updated).
+Removed {nickserv}:kill (replaced by custom protection timer durations).
+Removed {nickserv}:killquick (replaced by custom protection timer durations).
+Removed {ns_set_kill}:allowkillimmed (replaced by custom protection timer durations).
+Renamed the nickserv/saset/kill command to nickserv/saset/protect.
+Renamed the nickserv/saset/kill oper privilege to nickserv/saset/protect.
+Renamed the nickserv/set/kill command to nickserv/set/protect.
+Renamed the ns_set_kill module to ns_set_protect.
+Renamed the sasl module to ns_sasl and moved it to nickserv.example.conf.
+
+Anope Version 2.1.12
+--------------------
+Added the jsonrpc module.
+Added the rpc_data module.
+Added the rpc_system module.
+Added {hostserv}:activate_on_deoper (defaults to yes).
+Added {os_shutdown}:requirename (defaults to yes).
+Moved nickserv/set/keepmodes and nickserv/saset/keepmodes to the ns_set_keepmodes module.
+Moved the xmlrpc module to extra.
+Renamed the xmlrpc_main module to rpc_main.
+
+Anope Version 2.1.11
+--------------------
+Moved nickserv/set/kill and nickserv/saset/kill to the ns_set_kill module.
+Moved {ns_set}:allowkillimmed to {ns_set_kill}:allowkillimmed.
+Replaced {nickserv}:guestnickprefix with {nickserv}:guestnick (defaults to Guest####).
+
+Anope Version 2.1.10
+--------------------
+Added options:servicealias (defaults to no)
+Moved nickserv/set/message and nickserv/saset/message to the ns_set_message module.
+Removed options:useprivmsg (replaced by loading the ns_set_message module to enable).
+Removed options:usestrictprivmsg (feature unusable on modern servers, consider migrating to options:servicealias instead).
+
+Anope Version 2.1.9
+-------------------
+No significant changes.
+
+Anope Version 2.1.8
+-------------------
+Added the nickserv/drop/display oper privilege.
+Added {nickserv}:preservedisplay (defaults to no).
+
+Anope Version 2.1.7
+-------------------
+Moved nickserv/set/language and nickserv/saset/language to the ns_set_language module.
+Renamed the FANTASIA channel privilege to FANTASY.
+Renamed {cs_suspend}:expire to {cs_suspend}:suspendexpire.
+
+Anope Version 2.1.6
+-------------------
+Added {ns_cert}:automatic (defaults to yes).
+Removed {hybrid,inspircd,solanum,unrealircd}:use_server_side_mlock (now always enabled).
+Removed {inspircd}:use_server_side_topiclock (now always enabled).
+
+Anope Version 2.1.5
+-------------------
+Added the nickserv/drop/override and chanserv/drop/override oper privileges.
+
+Anope Version 2.1.4
+-------------------
+Added the db_atheme module.
+Added the enc_argon2 module.
+Added the enc_posix module.
+Added the enc_sha2 module.
+Added the gl_queue module.
+Added the gl_server module.
+Added the global/queue oper privilege.
+Added the global/server oper privilege.
+Changed serverinfo:motd to be relative to the config directory.
+Changed serverinfo:pid to be relative to the data directory.
+Changed the default value of mail:sendmailpath to "/usr/sbin/sendmail -it".
+Changed the default value of {chanserv}:accessmax to 1000.
+Changed the default value of {chanserv}:inhabit to 1 minute.
+Changed the default value of {cs_mode}:max to 50.
+Changed the default value of {ms_ignore}:max to 50.
+Removed options:seed (not needed with modern random number generation).
+Replaced {webcpanel}:template with {webcpanel}:template_dir (defaults to webcpanel/templates/default).
+
+Anope Version 2.1.3
+-------------------
+Added options:didyoumeandifference (defaults to 4).
+Added support for multiple SSL fingerprints in oper:certfp.
+Added the chanserv/cert oper privilege for modifying other user's certificate lists.
+Changed networkinfo:chanlen to default to 32 if not set.
+Changed networkinfo:hostlen to default to 64 if not set.
+Changed networkinfo:modelistsize to default to 100 if not set.
+Changed networkinfo:nicklen to default to 31 if not set.
+Changed networkinfo:userlen to default to 10 if not set.
+Increased the default maximum password length to 50 characters.
+Increased the default minimum password length to 10 characters.
+Removed the cs_secure option in {chanserv}:defaults (now always enabled as support for nick access lists has been removed).
+Removed the nickserv/saset/secure command (support for nick access lists has been removed).
+Removed the nickserv/saset/secure oper privilege (support for nick access lists has been removed).
+Removed the nickserv/set/secure command (support for nick access lists has been removed).
+Removed the nickserv/status command (obsolete with modern IRCv3 extensions and the removal of nick access lists).
+Removed the ns_access module (support for nick access lists has been removed).
+Removed the ns_secure option in {nickserv}:defaults (now always enabled as support for nick access lists has been removed).
+
+Anope Version 2.1.2
+-------------------
+Added {ssl_openssl}:tlsv10 for configuring whether TLSv1.0 is usable (defaults to no).
+Added {ssl_openssl}:tlsv11 for configuring whether TLSv1.1 is usable (defaults to yes).
+Added {ssl_openssl}:tlsv12 for configuring whether TLSv1.2 is usable (defaults to yes).
+Removed the m_ prefix from the names of the chanstats, dns, dnsbl, helpchan, httpd, ldap, ldap_oper, mysql, proxyscan, redis, regex_pcre2, regex_posix, regex_stdlib, regex_tre, rewrite, sasl, sql_log, sql_oper, sqlite, ssl_gnutls, ssl_openssl, xmlrpc, and xmlrpc_main modules.
+Removed {ssl_openssl}:sslv3 (now always disabled).
+
+Anope Version 2.1.1
+-------------------
+Added the m_regex_stdlib module.
+Removed the m_regex_pcre module (use m_regex_pcre2 instead).
+
+Anope Version 2.1.0
+-------------------
+Added {nickserv}:minpasslen for configuring the minimum password length (defaults to 8).
+Removed {nickserv}:strictpasswords (obsolete now {nickserv}:minpasslen exists).
+Removed the inspircd12 and inspircd20 modules (use inspircd instead).
+Removed the ns_getpass module (no supported encryption modules).
+Removed the os_oline module (no supported IRCds).
+Removed the unreal module (use unrealircd instead).
+Renamed {nickserv}:passlen to {nickserv}:maxpasslen.
+Renamed the charybdis module to solanum.
+Renamed the inspircd3 module to inspircd.
+Renamed the unreal4 module to unrealircd.
+Replaced uplink:ipv6 with uplink:protocol (defaults to ipv4).

extras

@@ -0,0 +1,168 @@
+#!/usr/bin/env perl
+
+#
+# Script taken from InspIRCd, https://www.inspircd.org/
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+# details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+#
+
+
+BEGIN { require 5.8.0; }
+
+use strict;
+use warnings FATAL => qw(all);
+
+use File::Copy ();
+use Cwd;
+
+sub list_extras ();
+sub enable_extras (@);
+sub disable_extras (@);
+
+# Routine to list out the extra/ modules that have been enabled.
+# Note: when getting any filenames out and comparing, it's important to lc it if the
+# file system is not case-sensitive (== Epoc, MacOS, OS/2 (incl DOS/DJGPP), VMS, Win32
+# (incl NetWare, Symbian)). Cygwin may or may not be case-sensitive, depending on
+# configuration, however, File::Spec does not currently tell us (it assumes Unix behavior).
+sub list_extras () {
+	use File::Spec;
+	# @_ not used
+	my $srcdir = File::Spec->catdir("modules");
+	my $abs_srcdir = File::Spec->rel2abs($srcdir);
+	local $_;
+	my $dd;
+	opendir $dd, File::Spec->catdir($abs_srcdir, "extra") or die (File::Spec->catdir($abs_srcdir, "extra") . ": $!\n");
+	my @extras = map { File::Spec->case_tolerant() ? lc($_) : $_ } (readdir($dd));
+	closedir $dd;
+	undef $dd;
+	opendir $dd, $abs_srcdir or die "$abs_srcdir: $!\n";
+	my @sources = map { File::Spec->case_tolerant() ? lc($_) : $_ } (readdir($dd));
+	closedir $dd;
+	undef $dd;
+	my $maxlen = (sort { $b <=> $a } (map {length($_)} (@extras)))[0];
+	my %extras = ();
+EXTRA:	for my $extra (@extras) {
+		next if (File::Spec->curdir() eq $extra || File::Spec->updir() eq $extra);
+		my $abs_extra = File::Spec->catfile($abs_srcdir, "extra", $extra);
+		my $abs_source = File::Spec->catfile($abs_srcdir, $extra);
+		next unless ($extra =~ m/\.(cpp|h)$/ || (-d $abs_extra)); # C++ Source/Header, or directory
+		if (-l $abs_source) {
+			# Symlink, is it in the right place?
+			my $targ = readlink($abs_source);
+			my $abs_targ = File::Spec->rel2abs($targ, $abs_srcdir);
+			if ($abs_targ eq $abs_extra) {
+				$extras{$extra} = "\e[32;1menabled\e[0m";
+			} else {
+				$extras{$extra} = sprintf("\e[31;1mwrong symlink target (%s)\e[0m", $abs_targ);
+			}
+		} elsif (-e $abs_source) {
+			my ($devext, $inoext) = stat($abs_extra);
+			my ($devsrc, $inosrc, undef, $lnksrc) = stat($abs_source);
+			if ($lnksrc > 1) {
+				if ($devsrc == $devext && $inosrc == $inoext) {
+					$extras{$extra} = "\e[32;1menabled\e[0m";
+				} else {
+					$extras{$extra} = sprintf("\e[31;1mwrong hardlink target (%d:%d)\e[0m", $devsrc, $inosrc);
+				}
+			} else {
+				open my $extfd, "<", $abs_extra;
+				open my $srcfd, "<", $abs_source;
+				local $/ = undef;
+				if (scalar(<$extfd>) eq scalar(<$srcfd>)) {
+					$extras{$extra} = "\e[32;1menabled\e[0m";
+				} else {
+					$extras{$extra} = sprintf("\e[31;1mout of synch (re-copy)\e[0m");
+				}
+			}
+		} else {
+			$extras{$extra} = "\e[33;1mdisabled\e[0m";
+		}
+	}
+
+	for my $extra (sort {$a cmp $b} keys(%extras)) {
+		my $text = $extras{$extra};
+		if ($text =~ m/needed by/ && $text !~ m/enabled/) {
+			printf "\e[31;1;5m%-*s = %s%s\e[0m\n", $maxlen, $extra, $text, ($text =~ m/needed by/ ? ")" : "");
+		} else {
+			printf "%-*s = %s%s\n", $maxlen, $extra, $text, ($text =~ m/needed by/ ? "\e[0m)" : "");
+		}
+	}
+	return keys(%extras) if wantarray; # Can be used by manage_extras.
+}
+
+sub enable_extras (@) {
+	my (@extras) = @_;
+	for my $extra (@extras) {
+		my $extrapath = "modules/extra/$extra";
+		if (!-e $extrapath) {
+			print STDERR "Cannot enable \e[32;1m$extra\e[0m : No such file or directory in modules/extra\n";
+			next;
+		}
+		my $source = "modules/$extra";
+		if (-e $source) {
+			print STDERR "Cannot enable \e[32;1m$extra\e[0m : destination in modules exists (might already be enabled?)\n";
+			next;
+		}
+		print "Enabling $extra ... \n";
+		symlink "extra/$extra", $source or print STDERR "$source: Cannot link to 'extra/$extra': $!\n";
+	}
+}
+
+sub disable_extras (@)
+{
+	opendir my $dd, "modules/extra/";
+	my @files = readdir($dd);
+	closedir $dd;
+	my (@extras) = @_;
+EXTRA:	for my $extra (@extras) {
+		my $extrapath = "modules/extra/$extra";
+		my $source = "modules/$extra";
+		if (!-e $extrapath) {
+			print STDERR "Cannot disable \e[32;1m$extra\e[0m : Is not an extra\n";
+			next;
+		}
+		if ((! -l $source) || readlink($source) ne "extra/$extra") {
+			print STDERR "Cannot disable \e[32;1m$extra\e[0m : Source is not a link or doesn't refer to the right file. Remove manually if this is in error.\n";
+			next;
+		}
+		# Now remove.
+		print "Disabling $extra ... \n";
+		unlink "modules/$extra" or print STDERR "Cannot disable \e[32;1m$extra\e[0m : $!\n";
+	}
+}
+
+my $clearscreen = `clear`;
+print $clearscreen;
+while (1)
+{
+	list_extras;     # print the module list
+	print "\nPlease enter the name of the module or type 'q' to quit.: ";
+	my $input = <STDIN>;
+	chop($input); # remove the trailing \n from the user input
+
+	if ($input eq "q") {
+		if (-e "build/CMakeFiles") {
+			system("cmake", "build/.");
+			print "\nNow cd build, then run make to build Anope.\n\n";
+		} else {
+			print "\nBuild directory not found. You should run ./Config now.\n\n"
+		}
+		exit 0;
+	}
+	print $clearscreen;
+	if ($input eq "") {
+		next;
+	}
+
+	if (-e "modules/$input") {
+		disable_extras($input)
+	} else {
+		enable_extras($input)
+	}
+}

include/CMakeLists.txt

@@ -1,48 +1,18 @@
-# Set version.cpp to use C++ as well as set its compile flags
-set_source_files_properties(version.cpp PROPERTIES LANGUAGE CXX COMPILE_FLAGS "${CXXFLAGS}")
-# Generate version executable to modify version.h, setting it's linker flags as well
-add_executable(version version.cpp)
-set_target_properties(version PROPERTIES LINKER_LANGUAGE CXX LINK_FLAGS "${LDFLAGS}")
-get_target_property(version_BINARY version LOCATION)
+# Generate sysconf.h from the earlier configuration
+configure_file(
+  "${CMAKE_CURRENT_SOURCE_DIR}/sysconf.h.cmake"
+  "${CMAKE_CURRENT_BINARY_DIR}/sysconf.h"
+)
+
+# Generate version-bin executable to modify version.h, setting it's linker flags as well
+add_executable(version-bin version.cpp)
+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}/src/version.sh ${CMAKE_CURRENT_BINARY_DIR}/version.h
-  DEPENDS version ${SRC_SRCS}
+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 to list of files for CPack to ignore
-get_filename_component(version_BINARY ${version_BINARY} NAME)
-add_to_cpack_ignored_files("${version_BINARY}$" TRUE)
-if(NOT WIN32)
-  add_to_cpack_ignored_files("version.h$" TRUE)
-endif(NOT WIN32)
-
-set(PCH_SOURCES_GCH "")
-if(CMAKE_COMPILER_IS_GNUCXX)
-  string(REPLACE " " ";" PCH_CXXFLAGS ${CXXFLAGS})
-  file(GLOB INCLUDE_SRCS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.h")
-  remove_item_from_list(INCLUDE_SRCS "version.h")
-
-  set(PCH_SOURCES "module.h;modules.h;services.h")
-  foreach(PCH_SOURCE ${PCH_SOURCES})
-    set(PCH_EXTRAFLAGS "")
-    if(DEBUG_BUILD)
-      set(PCH_EXTRAFLAGS "-g")
-    endif(DEBUG_BUILD)
-    if(PCH_SOURCE STREQUAL "module.h")
-      set(PCH_EXTRAFLAGS ${PCH_EXTRAFLAGS} -fPIC)
-    endif(PCH_SOURCE STREQUAL "module.h")
-    if(GETTEXT_INCLUDE)
-	set(PCH_GETTEXT_INCLUDE "-I${GETTEXT_INCLUDE}")
-    endif(GETTEXT_INCLUDE)
-
-    set(PCH_SOURCES_GCH "${PCH_SOURCES_GCH};${CMAKE_CURRENT_BINARY_DIR}/${PCH_SOURCE}.gch")
-    add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${PCH_SOURCE}.gch
-      COMMAND ${CMAKE_CXX_COMPILER} ARGS ${PCH_CXXFLAGS} ${PCH_EXTRAFLAGS} ${PCH_GETTEXT_INCLUDE} -I${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/${PCH_SOURCE} -o ${CMAKE_CURRENT_BINARY_DIR}/${PCH_SOURCE}.gch
-      DEPENDS ${INCLUDE_SRCS} VERBATIM
-    )
-  endforeach(PCH_SOURCE ${PCH_SOURCES})
-endif(CMAKE_COMPILER_IS_GNUCXX)
 
 # Add a custom target to the above file
-add_custom_target(headers DEPENDS version ${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)

include/access.h

@@ -1,5 +1,23 @@
-#ifndef ACCESS_H
-#define ACCESS_H
+// Anope IRC Services <https://www.anope.org/>
+//
+// Copyright (C) 2003-2026 Anope Contributors
+//
+// Anope is free software. You can use, modify, and/or distribute it under the
+// terms of version 2 of the GNU General Public License. See docs/LICENSE.txt
+// for the complete terms of this license and docs/AUTHORS.txt for a list of
+// contributors.
+//
+// Based on the original code of Epona by Lara
+// Based on the original code of Services by Andy Church
+//
+// SPDX-License-Identifier: GPL-2.0-only
+
+#pragma once
+
+#include "services.h"
+#include "anope.h"
+#include "serialize.h"
+#include "service.h"
 
 enum
 {
@@ -7,20 +25,26 @@ enum
 	ACCESS_FOUNDER = 10001
 };
 
-struct CoreExport Privilege
+/* A privilege, probably configured using a privilege{} block. Most
+ * commands require specific privileges to be executed. The AccessProvider
+ * backing each ChanAccess determines whether that ChanAccess has a given
+ * privilege.
+ */
+struct CoreExport Privilege final
 {
 	Anope::string name;
 	Anope::string desc;
+	/* Rank relative to other privileges */
 	int rank;
 
-	Privilege(const Anope::string &n, const Anope::string &d, int r);
+	Privilege(const Anope::string &name, const Anope::string &desc, int rank);
 	bool operator==(const Privilege &other) const;
 };
 
-class CoreExport PrivilegeManager
+class CoreExport PrivilegeManager final
 {
-	static std::vector<Privilege> privs;
- public:
+	static std::vector<Privilege> Privileges;
+public:
 	static void AddPrivilege(Privilege p);
 	static void RemovePrivilege(Privilege &p);
 	static Privilege *FindPrivilege(const Anope::string &name);
@@ -28,58 +52,136 @@ class CoreExport PrivilegeManager
 	static void ClearPrivileges();
 };
 
-class ChanAccess;
-
-class CoreExport AccessProvider : public Service
+/* A provider of access. Only used for creating ChanAccesses, as
+ * they contain pure virtual functions.
+ */
+class CoreExport AccessProvider
+	: public Service
 {
- public:
-	AccessProvider(Module *o, const Anope::string &n);
+public:
+	AccessProvider(Module *owner, const Anope::string &name);
 	virtual ~AccessProvider();
+
+	/** Creates a new ChanAccess entry using this provider.
+	 * @return The new entry
+	 */
 	virtual ChanAccess *Create() = 0;
+
+	virtual void GetAccess(CommandSource& source, const Privilege *p, Anope::map<Anope::string> &access) = 0;
+	static void SendAccess(CommandSource &source, const Anope::string &pname);
+
+private:
+	static std::list<AccessProvider *> Providers;
+public:
+	static const std::list<AccessProvider *>& GetProviders();
 };
 
-class CoreExport ChanAccess : public Serializable
+/* Represents one entry of an access list on a channel. */
+class CoreExport ChanAccess
+	: public Serializable
 {
- public:
-	AccessProvider *provider;
-	ChannelInfo *ci;
+public:
+	struct Type final
+		: public Serialize::Type
+	{
+		Type();
+		void Serialize(Serializable *obj, Serialize::Data &data) const override;
+		Serializable *Unserialize(Serializable *obj, Serialize::Data &data) const override;
+	};
+
+private:
 	Anope::string mask;
+	/* account this access entry is for, if any */
+	Serialize::Reference<NickCore> nc;
+
+public:
+	typedef std::vector<ChanAccess *> Path;
+
+	/* The provider that created this access entry */
+	AccessProvider *provider;
+	/* Channel this access entry is on */
+	Serialize::Reference<ChannelInfo> ci;
 	Anope::string creator;
+	Anope::string description;
 	time_t last_seen;
 	time_t created;
 
 	ChanAccess(AccessProvider *p);
 	virtual ~ChanAccess();
 
-	Anope::string serialize_name() const;
-	serialized_data serialize();
-	static void unserialize(serialized_data &);
+	void SetMask(const Anope::string &mask, ChannelInfo *ci);
+	const Anope::string &Mask() const;
+	NickCore *GetAccount() const;
 
-	virtual bool Matches(User *u, NickCore *nc);
+	static const unsigned int MAX_DEPTH = 4;
+
+	/** Check if this access entry matches the given user or account
+	 * @param u The user
+	 * @param nc The account
+	 * @param next Next channel to check if any
+	 */
+	virtual bool Matches(const User *u, const NickCore *nc, ChannelInfo *&next) const;
+
+	/** Check if this access entry has the given privilege.
+	 * @param name The privilege name
+	 */
 	virtual bool HasPriv(const Anope::string &name) const = 0;
-	virtual Anope::string Serialize() = 0;
-	virtual void Unserialize(const Anope::string &data) = 0;
 
-	bool operator>(const ChanAccess &other) const;
-	bool operator<(const ChanAccess &other) const;
+	/** Serialize the access given by this access entry into a human
+	 * readable form. chanserv/access will return a number, chanserv/xop
+	 * will be AOP, SOP, etc.
+	 */
+	virtual Anope::string AccessSerialize() const = 0;
+
+	/** Unserialize this access entry from the given data. This data
+	 * will be fetched from AccessSerialize.
+	 */
+	virtual void AccessUnserialize(const Anope::string &data) = 0;
+
+	/* Comparison operators to other Access entries */
+	virtual bool operator>(const ChanAccess &other) const;
+	virtual bool operator<(const ChanAccess &other) const;
 	bool operator>=(const ChanAccess &other) const;
 	bool operator<=(const ChanAccess &other) const;
 };
 
-class CoreExport AccessGroup : public std::vector<ChanAccess *>
+/* A group of access entries. This is used commonly, for example with ChannelInfo::AccessFor,
+ * to show what access a user has on a channel because users can match multiple access entries.
+ */
+class CoreExport AccessGroup final
 {
- public:
- 	ChannelInfo *ci;
-	NickCore *nc;
-	bool SuperAdmin, Founder;
+public:
+	/* access entries + paths */
+	std::vector<ChanAccess::Path> paths;
+	/* Channel these access entries are on */
+	const ChannelInfo *ci;
+	/* Account these entries affect, if any */
+	const NickCore *nc;
+	/* super_admin always gets all privs. founder is a special case where ci->founder == nc */
+	bool super_admin, founder;
+
 	AccessGroup();
+
+	/** Check if this access group has a certain privilege. Eg, it
+	 * will check every ChanAccess entry of this group for any that
+	 * has the given privilege.
+	 * @param priv The privilege
+	 * @return true if any entry has the given privilege
+	 */
 	bool HasPriv(const Anope::string &priv) const;
-	ChanAccess *Highest() const;
+
+	/** Get the "highest" access entry from this group of entries.
+	 * The highest entry is determined by the entry that has the privilege
+	 * with the highest rank (see Privilege::rank).
+	 * @return The "highest" entry
+	 */
+	const ChanAccess *Highest() const;
+
+	/* Comparison operators to other AccessGroups */
 	bool operator>(const AccessGroup &other) const;
 	bool operator<(const AccessGroup &other) const;
 	bool operator>=(const AccessGroup &other) const;
 	bool operator<=(const AccessGroup &other) const;
+
+	inline bool empty() const { return paths.empty(); }
 };
-
-#endif
-

include/account.h

@@ -1,318 +1,271 @@
-#ifndef ACCOUNT_H
-#define ACCOUNT_H
+// Anope IRC Services <https://www.anope.org/>
+//
+// Copyright (C) 2003-2026 Anope Contributors
+//
+// Anope is free software. You can use, modify, and/or distribute it under the
+// terms of version 2 of the GNU General Public License. See docs/LICENSE.txt
+// for the complete terms of this license and docs/AUTHORS.txt for a list of
+// contributors.
+//
+// Based on the original code of Epona by Lara
+// Based on the original code of Services by Andy Church
+//
+// SPDX-License-Identifier: GPL-2.0-only
 
+#pragma once
+
+#include "extensible.h"
+#include "serialize.h"
 #include "anope.h"
+#include "memo.h"
+#include "base.h"
 
-class NickAlias;
-class NickCore;
+typedef Anope::unordered_map<NickAlias *> nickalias_map;
+typedef Anope::unordered_map<NickCore *> nickcore_map;
+typedef std::unordered_map<uint64_t, NickCore *> nickcoreid_map;
 
-typedef Anope::insensitive_map<NickAlias *> nickalias_map;
-typedef Anope::insensitive_map<NickCore *> nickcore_map;
+extern CoreExport Serialize::Checker<nickalias_map> NickAliasList;
+extern CoreExport Serialize::Checker<nickcore_map> NickCoreList;
+extern CoreExport Serialize::Checker<nickcoreid_map> NickCoreIdList;
 
-extern CoreExport nickalias_map NickAliasList;
-extern CoreExport nickcore_map NickCoreList;
-
-/* NickServ nickname structures. */
-
-/** Flags set on NickAliases
+/* A registered nickname.
+ * It matters that Base is here before Extensible (it is inherited by Serializable)
  */
-enum NickNameFlag
+class CoreExport NickAlias final
+	: public Serializable
+	, public Extensible
 {
-	NS_BEGIN,
+public:
+	struct Type final
+		: public Serialize::Type
+	{
+		Type();
+		void Serialize(Serializable *obj, Serialize::Data &data) const override;
+		Serializable *Unserialize(Serializable *obj, Serialize::Data &data) const override;
+	};
 
-	/* Nick never expires */
-	NS_NO_EXPIRE,
-	/* This nick is being held after a kill by an enforcer client
-	 * or is being SVSHeld. Used by ns_release to determin if something
-	 * should be allowed to be released
-	 */
-	NS_HELD,
-	/* We are taking over this nick, either by SVSNICK or KILL.
-	 * We are waiting for the confirmation of either of these actions to
-	 * proceed. This is checked in NickAlias::OnCancel
-	 */
-	NS_COLLIDED,
+private:
+	Anope::string vhost_ident, vhost_host, vhost_creator;
+	time_t vhost_created = 0;
 
-	NS_END
-};
+public:
+	Anope::string nick;
+	Anope::string last_quit;
+	/* Last cloaked user@host this nick was seen using. */
+	Anope::string last_userhost;
+	/* Last real user@host this nick was seen using. */
+	Anope::string last_userhost_real;
+	time_t registered = Anope::CurTime;
+	time_t last_seen = Anope::CurTime;
 
-const Anope::string NickNameFlagStrings[] = {
-	"BEGIN", "NO_EXPIRE", "HELD", "COLLIDED", ""
-};
+	/* Account this nick is tied to. Multiple nicks can be tied to a single account. */
+	Serialize::Reference<NickCore> nc;
 
-/** Flags set on NickCores
- */
-enum NickCoreFlag
-{
-	NI_BEGIN,
-
-	/* Kill others who take this nick */
-	NI_KILLPROTECT,
-	/* Dont recognize unless IDENTIFIED */
-	NI_SECURE,
-	/* Use PRIVMSG instead of NOTICE */
-	NI_MSG,
-	/* Don't allow user to change memo limit */
-	NI_MEMO_HARDMAX,
-	/* Notify of memos at signon and un-away */
-	NI_MEMO_SIGNON,
-	/* Notify of new memos when sent */
-	NI_MEMO_RECEIVE,
-	/* Don't show in LIST to non-servadmins */
-	NI_PRIVATE,
-	/* Don't show email in INFO */
-	NI_HIDE_EMAIL,
-	/* Don't show last seen address in INFO */
-	NI_HIDE_MASK,
-	/* Don't show last quit message in INFO */
-	NI_HIDE_QUIT,
-	/* Kill in 20 seconds instead of in 60 */
-	NI_KILL_QUICK,
-	/* Kill immediatly */
-	NI_KILL_IMMED,
-	/* User gets email on memo */
-	NI_MEMO_MAIL,
-	/* Don't show services access status */
-	NI_HIDE_STATUS,
-	/* Nickname is suspended */
-	NI_SUSPENDED,
-	/* Autoop nickname in channels */
-	NI_AUTOOP,
-	/* This nickcore is forbidden, which means the nickalias for it is aswell */
-	NI_FORBIDDEN,
-	/* If set means the nick core does not have their email addrses confirmed.
-	 */
-	NI_UNCONFIRMED,
-
-	NI_END
-};
-
-const Anope::string NickCoreFlagStrings[] = {
-	"BEGIN", "KILLPROTECT", "SECURE", "MSG", "MEMO_HARDMAX", "MEMO_SIGNON", "MEMO_RECEIVE",
-	"PRIVATE", "HIDE_EMAIL", "HIDE_MASK", "HIDE_QUIT", "KILL_QUICK", "KILL_IMMED",
-	"MEMO_MAIL", "HIDE_STATUS", "SUSPENDED", "AUTOOP", "FORBIDDEN", "UNCONFIRMED", ""
-};
-
-class CoreExport NickAlias : public Extensible, public Flags<NickNameFlag, NS_END>, public Serializable
-{
- public:
- 	/** Default constructor
+	/** Constructor
 	 * @param nickname The nick
-	 * @param nickcore The nickcofe for this nick
+	 * @param nickcore The nickcore for this nick
 	 */
 	NickAlias(const Anope::string &nickname, NickCore *nickcore);
-
-	/** Default destructor
-	 */
 	~NickAlias();
 
-	Anope::string nick;				/* Nickname */
-	Anope::string last_quit;		/* Last quit message */
-	Anope::string last_realname;	/* Last realname */
-	Anope::string last_usermask;	/* Last usermask */
-	Anope::string last_realhost;	/* Last uncloaked usermask, requires nickserv/auspex to see */
-	time_t time_registered;			/* When the nick was registered */
-	time_t last_seen;				/* When it was seen online for the last time */
-	NickCore *nc;					/* I'm an alias of this */
-	HostInfo hostinfo;
-
-	Anope::string serialize_name() const;
-	serialized_data serialize();
-	static void unserialize(serialized_data &);
-
-	/** Release a nick
-	 * See the comment in users.cpp
+	/** Set a vhost for the user
+	 * @param ident The ident
+	 * @param host The host
+	 * @param creator Who created the vhost
+	 * @param time When the vhost was created
 	 */
-	void Release();
+	void SetVHost(const Anope::string &ident, const Anope::string &host, const Anope::string &creator, time_t created = Anope::CurTime);
 
-	/** This function is called when a user on this nick either disconnects or changes nick.
-	 * Note that the user isnt necessarially identified to this nick
-	 * See the comment in users.cpp
-	 * @param u The user
+	/** Remove a users vhost
+	 **/
+	void RemoveVHost();
+
+	/** Check if the user has a vhost
+	 * @return true or false
 	 */
-	void OnCancel(User *u);
+	bool HasVHost() const;
+
+	/** Retrieve the vhost ident
+	 * @return the ident
+	 */
+	const Anope::string &GetVHostIdent() const;
+
+	/** Retrieve the vhost host
+	 * @return the host
+	 */
+	const Anope::string &GetVHostHost() const;
+
+	/** Retrieve the vhost mask
+	 * @param the mask
+	 */
+	Anope::string GetVHostMask() const;
+
+	/** Retrieve the vhost creator
+	 * @return the creator
+	 */
+	const Anope::string &GetVHostCreator() const;
+
+	/** Retrieve when the vhost was created
+	 * @return the time it was created
+	 */
+	time_t GetVHostCreated() const;
+
+	/** Update the last seen time for the nickname.
+	 * @param u The user who is using the nickname.
+	 */
+	void UpdateSeen(User *u);
+
+	/** Finds a registered nick
+	 * @param nick The nick to lookup
+	 * @return the nick, if found
+	 */
+	static NickAlias *Find(const Anope::string &nick);
+	static NickAlias *FindId(uint64_t uid);
 };
 
-class CoreExport NickCore : public Extensible, public Flags<NickCoreFlag, NI_END>, public Serializable
+/* A registered account. Each account must have a NickAlias with the same nick as the
+ * account's display.
+ * It matters that Base is here before Extensible (it is inherited by Serializable)
+ */
+class CoreExport NickCore final
+	: public Serializable
+	, public Extensible
 {
- public:
-	/** Default constructor
-	 * @param display The display nick
-	 */
-	NickCore(const Anope::string &nickdisplay);
+public:
+	struct Type final
+		: public Serialize::Type
+	{
+		Type();
+		void Serialize(Serializable *obj, Serialize::Data &data) const override;
+		Serializable *Unserialize(Serializable *obj, Serialize::Data &data) const override;
+	};
 
-	/** Default destructor
-	 */
-	~NickCore();
-
-	std::list<User *> Users;
-
-	Anope::string display;	/* How the nick is displayed */
-	Anope::string pass;		/* Password of the nicks */
-	Anope::string email;	/* E-mail associated to the nick */
-	Anope::string greet;	/* Greet associated to the nick */
-	Anope::string language;	/* Language name */
-	std::vector<Anope::string> access; /* Access list, vector of strings */
-	std::vector<Anope::string> cert; /* ssl certificate list, vector of strings */
+private:
+	/* Channels which reference this core in some way (this is on their access list, akick list, is founder, successor, etc) */
+	Serialize::Checker<std::map<ChannelInfo *, int> > chanaccess;
+	/* Unique identifier for the account. */
+	uint64_t uniqueid;
+public:
+	/* Name of the account. Find(display)->nc == this. */
+	Anope::string display;
+	/* User password in form of hashm:data */
+	Anope::string pass;
+	Anope::string email;
+	/* Locale name of the language of the user. Empty means default language */
+	Anope::string language;
+	/* Last time an email was sent to this user */
+	time_t lastmail = 0;
+	/* The time this account was registered */
+	time_t registered = Anope::CurTime;
 	MemoInfo memos;
+	std::map<Anope::string, ModeData> last_modes;
 
-	Oper *o;
+	/* Nicknames registered that are grouped to this account.
+	 * for n in aliases, n->nc == this.
+	 */
+	Serialize::Checker<std::vector<NickAlias *> > aliases;
+
+	/* Set if this user is a services operator. o->ot must exist. */
+	Oper *o = nullptr;
 
 	/* Unsaved data */
-	uint16_t channelcount; /* Number of channels currently registered */
-	time_t lastmail;				/* Last time this nick record got a mail */
-	std::list<NickAlias *> aliases;	/* List of aliases */
 
-	Anope::string serialize_name() const;
-	serialized_data serialize();
-	static void unserialize(serialized_data &);
+	/** The display nick for this account. */
+	Serialize::Reference<NickAlias> na;
+	/* Number of channels registered by this account */
+	uint16_t channelcount = 0;
+	/* Users online now logged into this account */
+	std::list<User *> users;
+
+	/** Constructor
+	 * @param display The display nick
+	 * @param id The account id
+	 */
+	NickCore(const Anope::string &nickdisplay, uint64_t nickid = 0);
+	~NickCore();
+
+	/** Changes the display for this account
+	 * @param na The new display, must be grouped to this account.
+	 */
+	void SetDisplay(NickAlias *na);
 
 	/** Checks whether this account is a services oper or not.
 	 * @return True if this account is a services oper, false otherwise.
 	 */
-	virtual bool IsServicesOper() const;
+	bool IsServicesOper() const;
 
-	/** Add an entry to the nick's access list
-	 *
-	 * @param entry The nick!ident@host entry to add to the access list
-	 *
-	 * Adds a new entry into the access list.
+	/** Retrieves the account id for this user */
+	uint64_t GetId();
+
+	/** Finds an account
+	 * @param nick The account name to find
+	 * @return The account, if it exists
 	 */
-	void AddAccess(const Anope::string &entry);
-
-	/** Get an entry from the nick's access list by index
-	 *
-	 * @param entry Index in the access list vector to retrieve
-	 * @return The access list 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 access list corresponding to the given index.
-	 */
-	Anope::string GetAccess(unsigned entry) const;
-
-	/** Find an entry in the nick's access list
-	 *
-	 * @param entry The nick!ident@host entry to search for
-	 * @return True if the entry is found in the access list, false otherwise
-	 *
-	 * Search for an entry within the access list.
-	 */
-	bool FindAccess(const Anope::string &entry);
-
-	/** Erase an entry from the nick's access list
-	 *
-	 * @param entry The nick!ident@host entry to remove
-	 *
-	 * Removes the specified access list entry from the access list.
-	 */
-	void EraseAccess(const Anope::string &entry);
-
-	/** Clears the entire nick's access list
-	 *
-	 * Deletes all the memory allocated in the access list vector and then clears the vector.
-	 */
-	void ClearAccess();
-
-	/** Add an entry to the nick's certificate list
-	 *
-	 * @param entry The fingerprint to add to the cert list
-	 *
-	 * Adds a new entry into the cert list.
-	 */
-	void AddCert(const Anope::string &entry);
-
-	/** Get an entry from the nick's cert list by index
-	 *
-	 * @param entry Index in the certificaate 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.
-	 */
-	Anope::string GetCert(unsigned entry) const;
-
-	/** Find an entry in the nick's cert list
-	 *
-	 * @param entry The fingerprint to search for
-	 * @return True if the fingerprint is found in the cert list, false otherwise
-	 *
-	 * Search for an fingerprint within the cert list.
-	 */
-	bool FindCert(const Anope::string &entry);
-
-	/** Erase a fingerprint from the nick's certificate list
-	 *
-	 * @param entry The fingerprint to remove
-	 *
-	 * Removes the specified fingerprint from the cert list.
-	 */
-	void EraseCert(const Anope::string &entry);
-
-	/** Clears the entire nick's cert list
-	 *
-	 * Deletes all the memory allocated in the certificate list vector and then clears the vector.
-	 */
-	void ClearCert();
+	static NickCore *Find(const Anope::string &nick);
+	static NickCore *FindId(uint64_t uid);
 
+	void AddChannelReference(ChannelInfo *ci);
+	void RemoveChannelReference(ChannelInfo *ci);
+	void GetChannelReferences(std::deque<ChannelInfo *> &queue);
 };
 
-/** Timer for colliding nicks to force people off of nicknames
+/* A request to check if an account/password is valid. These can exist for
+ * extended periods due to the time some authentication modules take.
  */
-class CoreExport NickServCollide : public Timer
+class CoreExport IdentifyRequest
 {
-	dynamic_reference<User> u;
-	Anope::string nick;
+	/* Owner of this request, used to cleanup requests if a module is unloaded
+	 * while a request us pending */
+	Module *owner;
+	Anope::string account;
+	Anope::string password;
+	Anope::string address;
 
- public:
-	/** Default constructor
-	 * @param nick The nick we're colliding
-	 * @param delay How long to delay before kicking the user off the nick
-	 */
-	NickServCollide(User *user, time_t delay);
+	std::set<Module *> holds;
+	bool dispatched = false;
+	bool success = false;
 
-	/** Default destructor
-	 */
-	virtual ~NickServCollide();
+	static std::set<IdentifyRequest *> Requests;
 
-	/** Called when the delay is up
-	 * @param t The current time
+protected:
+	IdentifyRequest(Module *o, const Anope::string &acc, const Anope::string &pass, const Anope::string &ip);
+	virtual ~IdentifyRequest();
+
+public:
+	/* One of these is called when the request goes through */
+	virtual void OnSuccess(NickAlias *na) = 0;
+	virtual void OnFail() = 0;
+
+	Module *GetOwner() const { return owner; }
+	const Anope::string &GetAccount() const { return account; }
+	const Anope::string &GetPassword() const { return password; }
+	const Anope::string &GetAddress() const { return address; }
+
+	/* Holds this request. When a request is held it must be Released later
+	 * for the request to complete. Multiple modules may hold a request at any time,
+	 * 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 calling `Success()`.
+	 * @param m The module holding this request
 	 */
-	void Tick(time_t t);
+	void Hold(Module *m);
+
+	/** Releases a held request
+	 * @param m The module releasing the hold
+	 */
+	void Release(Module *m);
+
+	/** 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
+	 */
+	void Success(Module *m, NickAlias *na);
+
+	/** Used to either finalize this request or marks
+	 * it as dispatched and begins waiting for the module(s)
+	 * that have holds to finish.
+	 */
+	void Dispatch();
+
+	static void ModuleUnload(Module *m);
 };
-
-/** Timers for removing HELD status from nicks.
- */
-class NickServHeld : public Timer
-{
-	dynamic_reference<NickAlias> na;
-	Anope::string nick;
- public:
- 	NickServHeld(NickAlias *n, long t);
-
-	~NickServHeld();
-
-	void Tick(time_t);
-};
-
-/** Timers for releasing nicks to be available for use
- */
-class CoreExport NickServRelease : public User, public Timer
-{
-	Anope::string nick;
-
- public:
-	/** Default constructor
-	 * @param na The nick
-	 * @param delay The delay before the nick is released
-	 */
-	NickServRelease(NickAlias *na, time_t delay);
-
-	/** Default destructor
-	 */
-	virtual ~NickServRelease();
-
-	/** Called when the delay is up
-	 * @param t The current time
-	 */
-	void Tick(time_t t);
-};
-
-#endif // ACCOUNT_H

include/anope.h

@@ -1,42 +1,42 @@
-/*
- * (C) 2003-2012 Anope Team
- * Contact us at team@anope.org
- *
- * Please read COPYING and README for further details.
- *
- * Based on the original code of Epona by Lara.
- * Based on the original code of Services by Andy Church.
- */
+// Anope IRC Services <https://www.anope.org/>
+//
+// Copyright (C) 2003-2026 Anope Contributors
+//
+// Anope is free software. You can use, modify, and/or distribute it under the
+// terms of version 2 of the GNU General Public License. See docs/LICENSE.txt
+// for the complete terms of this license and docs/AUTHORS.txt for a list of
+// contributors.
+//
+// Based on the original code of Epona by Lara
+// Based on the original code of Services by Andy Church
+//
+// SPDX-License-Identifier: GPL-2.0-only
 
-#ifndef ANOPE_H
-#define ANOPE_H
+#pragma once
+
+#include <signal.h>
 
-#include <string>
-#include <vector>
-#include <set>
 #include "hashcomp.h"
 
-class Message;
+#define UTF_CPP_CPLUSPLUS 201703L
+#include "utfcpp/unchecked.h"
 
 namespace Anope
 {
-	template<typename T> class map : public std::map<string, T> { };
-	template<typename T> class insensitive_map : public std::map<string, T, ci::less> { };
-
 	/**
 	 * A wrapper string class around all the other string classes, this class will
 	 * allow us to only require one type of string everywhere that can be converted
 	 * at any time to a specific type of string.
 	 */
-	class string
+	class CoreExport string final
 	{
-	 private:
+	private:
 		/**
 		 * The actual string is stored in an std::string as it can be converted to
-		 * ci::string, irc::string, or a C-style string at any time.
+		 * ci::string, or a C-style string at any time.
 		 */
 		std::string _string;
-	 public:
+	public:
 		/**
 		 * Extras.
 		 */
@@ -45,6 +45,7 @@ namespace Anope
 		typedef std::string::reverse_iterator reverse_iterator;
 		typedef std::string::const_reverse_iterator const_reverse_iterator;
 		typedef std::string::size_type size_type;
+		typedef std::string::value_type value_type;
 		static const size_type npos = static_cast<size_type>(-1);
 
 		/**
@@ -54,11 +55,13 @@ namespace Anope
 		string(char chr) : _string() { _string = chr; }
 		string(size_type n, char chr) : _string(n, chr) { }
 		string(const char *_str) : _string(_str) { }
+		string(const char *_str, size_type n) : _string(_str, n) { }
 		string(const std::string &_str) : _string(_str) { }
 		string(const ci::string &_str) : _string(_str.c_str()) { }
-		string(const irc::string &_str) : _string(_str.c_str()) { }
-		string(const string &_str, size_type pos = 0, size_type n = npos) : _string(_str._string, pos, n) { }
+		string(const std::string_view &_sv) : _string(_sv.begin(), _sv.end()) { }
+		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) { }
+		string(const string &) = default;
 
 		/**
 		 * Assignment operators, so any type of string can be assigned to this class.
@@ -66,8 +69,6 @@ namespace Anope
 		inline string &operator=(char chr) { this->_string = chr; return *this; }
 		inline string &operator=(const char *_str) { this->_string = _str; return *this; }
 		inline string &operator=(const std::string &_str) { this->_string = _str; return *this; }
-		inline string &operator=(const ci::string &_str) { this->_string = _str.c_str(); return *this; }
-		inline string &operator=(const irc::string &_str) { this->_string = _str.c_str(); return *this; }
 		inline string &operator=(const string &_str) { if (this != &_str) this->_string = _str._string; return *this; }
 
 		/**
@@ -75,35 +76,21 @@ namespace Anope
 		 */
 		inline bool operator==(const char *_str) const { return this->_string == _str; }
 		inline bool operator==(const std::string &_str) const { return this->_string == _str; }
-		inline bool operator==(const ci::string &_str) const { return ci::string(this->_string.c_str()) == _str; }
-		inline bool operator==(const irc::string &_str) const { return irc::string(this->_string.c_str()) == _str; }
 		inline bool operator==(const string &_str) const { return this->_string == _str._string; }
 
 		inline bool equals_cs(const char *_str) const { return this->_string == _str; }
 		inline bool equals_cs(const std::string &_str) const { return this->_string == _str; }
-		inline bool equals_cs(const ci::string &_str) const { return this->_string == _str.c_str(); }
-		inline bool equals_cs(const irc::string &_str) const { return this->_string == _str.c_str(); }
 		inline bool equals_cs(const string &_str) const { return this->_string == _str._string; }
 
 		inline bool equals_ci(const char *_str) const { return ci::string(this->_string.c_str()) == _str; }
 		inline bool equals_ci(const std::string &_str) const { return ci::string(this->_string.c_str()) == _str.c_str(); }
-		inline bool equals_ci(const ci::string &_str) const { return _str == this->_string.c_str(); }
-		inline bool equals_ci(const irc::string &_str) const { return ci::string(this->_string.c_str()) == _str.c_str(); }
 		inline bool equals_ci(const string &_str) const { return ci::string(this->_string.c_str()) == _str._string.c_str(); }
 
-		inline bool equals_irc(const char *_str) const { return irc::string(this->_string.c_str()) == _str; }
-		inline bool equals_irc(const std::string &_str) const { return irc::string(this->_string.c_str()) == _str.c_str(); }
-		inline bool equals_irc(const ci::string &_str) const { return irc::string(this->_string.c_str()) == _str.c_str(); }
-		inline bool equals_irc(const irc::string &_str) const { return _str == this->_string.c_str(); }
-		inline bool equals_irc(const string &_str) const { return irc::string(this->_string.c_str()) == _str._string.c_str(); }
-
 		/**
 		 * Inequality operators, exact opposites of the above.
 		 */
 		inline bool operator!=(const char *_str) const { return !operator==(_str); }
 		inline bool operator!=(const std::string &_str) const { return !operator==(_str); }
-		inline bool operator!=(const ci::string &_str) const { return !operator==(_str); }
-		inline bool operator!=(const irc::string &_str) const { return !operator==(_str); }
 		inline bool operator!=(const string &_str) const { return !operator==(_str); }
 
 		/**
@@ -112,8 +99,6 @@ namespace Anope
 		inline string &operator+=(char chr) { this->_string += chr; return *this; }
 		inline string &operator+=(const char *_str) { this->_string += _str; return *this; }
 		inline string &operator+=(const std::string &_str) { this->_string += _str; return *this; }
-		inline string &operator+=(const ci::string &_str) { this->_string += _str.c_str(); return *this; }
-		inline string &operator+=(const irc::string &_str) { this->_string += _str.c_str(); return *this; }
 		inline string &operator+=(const string &_str) { if (this != &_str) this->_string += _str._string; return *this; }
 
 		/**
@@ -122,15 +107,11 @@ namespace Anope
 		inline const string operator+(char chr) const { return string(*this) += chr; }
 		inline const string operator+(const char *_str) const { return string(*this) += _str; }
 		inline const string operator+(const std::string &_str) const { return string(*this) += _str; }
-		inline const string operator+(const ci::string &_str) const { return string(*this) += _str; }
-		inline const string operator+(const irc::string &_str) const { return string(*this) += _str; }
 		inline const string operator+(const string &_str) const { return string(*this) += _str; }
 
 		friend const string operator+(char chr, const string &str);
 		friend const string operator+(const char *_str, const string &str);
 		friend const string operator+(const std::string &_str, const string &str);
-		friend const string operator+(const ci::string &_str, const string &str);
-		friend const string operator+(const irc::string &_str, const string &str);
 
 		/**
 		 * Less-than operator.
@@ -141,10 +122,10 @@ namespace Anope
 		 * The following functions return the various types of strings.
 		 */
 		inline const char *c_str() const { return this->_string.c_str(); }
+		inline const char *data() const { return this->_string.data(); }
 		inline std::string &str() { return this->_string; }
 		inline const std::string &str() const { return this->_string; }
 		inline ci::string ci_str() const { return ci::string(this->_string.c_str()); }
-		inline irc::string irc_str() const { return irc::string(this->_string.c_str()); }
 
 		/**
 		 * Returns if the string is empty or not.
@@ -155,6 +136,7 @@ namespace Anope
 		 * Returns the string's length.
 		 */
 		inline size_type length() const { return this->_string.length(); }
+		inline size_type utf8length() const { return utf8::unchecked::distance(str().begin(), str().end()); }
 
 		/**
 		 * Returns the size of the currently allocated storage space in the string object.
@@ -167,6 +149,9 @@ namespace Anope
 		 */
 		inline void push_back(char c) { return this->_string.push_back(c); }
 
+		inline string &append(const string &s) { this->_string.append(s.str()); return *this; }
+		inline string &append(const char *s, size_t n) { this->_string.append(s, n); return *this; }
+
 		/**
 		 * Resizes the string content to n characters.
 		 */
@@ -182,12 +167,26 @@ namespace Anope
 		/**
 		 * Trim leading and trailing white spaces from the string.
 		 */
-		inline void trim()
+
+		inline string &ltrim(const Anope::string &what = " \t\r\n")
 		{
-			while (!this->_string.empty() && isspace(this->_string[0]))
+			while (!this->_string.empty() && what.find(this->_string[0]) != Anope::string::npos)
 				this->_string.erase(this->_string.begin());
-			while (!this->_string.empty() && isspace(this->_string[this->_string.length() - 1]))
+			return *this;
+		}
+
+		inline string &rtrim(const Anope::string &what = " \t\r\n")
+		{
+			while (!this->_string.empty() && what.find(this->_string[this->_string.length() - 1]) != Anope::string::npos)
 				this->_string.erase(this->_string.length() - 1);
+			return *this;
+		}
+
+		inline string &trim(const Anope::string &what = " \t\r\n")
+		{
+			this->ltrim(what);
+			this->rtrim(what);
+			return *this;
 		}
 
 		/**
@@ -220,12 +219,24 @@ namespace Anope
 		inline size_type find_last_not_of(const string &_str, size_type pos = npos) const { return this->_string.find_last_not_of(_str._string, pos); }
 		inline size_type find_last_not_of_ci(const string &_str, size_type pos = npos) const { return ci::string(this->_string.c_str()).find_last_not_of(ci::string(_str._string.c_str()), pos); }
 
+		inline int compare(size_t pos, size_t len, const string &str) const { return ci::string(this->_string.c_str()).compare(pos, len, ci::string(str.c_str())); }
+		inline int compare(size_t pos, size_t len, const string &str, size_t subpos, size_type sublen = npos) const { return ci::string(this->_string.c_str()).compare(pos, len, ci::string(str.c_str()), subpos, sublen); }
+		inline int compare(size_t pos, size_t len, const char *s, size_type n = npos) const { return ci::string(this->_string.c_str()).compare(pos, len, s, n); }
+
 		/**
 		 * Determine if string consists of only numbers.
 		 */
 		inline bool is_number_only() const { return this->find_first_not_of("0123456789.-") == npos; }
 		inline bool is_pos_number_only() const { return this->find_first_not_of("0123456789.") == npos; }
 
+		/**
+		 * In IRC messages we use a substitute (ASCII 0x1B) instead of a space
+		 * (ASCII 0x20) so it doesn't get line wrapped when put into a message.
+		 * The line wrapper will convert this to a space before it is sent to
+		 * clients.
+		 */
+		inline Anope::string nobreak() const { return this->replace_all_cs("\x20", "\x1B"); }
+
 		/**
 		 * Replace parts of the string.
 		 */
@@ -235,7 +246,7 @@ namespace Anope
 		inline string replace(iterator first, iterator last, const string &_str) { return string(this->_string.replace(first, last, _str._string)); }
 		inline string replace(iterator first, iterator last, size_type n, char chr) { return string(this->_string.replace(first, last, n, chr)); }
 		template <class InputIterator> inline string replace(iterator first, iterator last, InputIterator f, InputIterator l) { return string(this->_string.replace(first, last, f, l)); }
-		inline string replace_all_cs(const string &_orig, const string &_repl)
+		inline string replace_all_cs(const string &_orig, const string &_repl) const
 		{
 			Anope::string new_string = *this;
 			size_type pos = new_string.find(_orig), orig_length = _orig.length(), repl_length = _repl.length();
@@ -246,7 +257,7 @@ namespace Anope
 			}
 			return new_string;
 		}
-		inline string replace_all_ci(const string &_orig, const string &_repl)
+		inline string replace_all_ci(const string &_orig, const string &_repl) const
 		{
 			Anope::string new_string = *this;
 			size_type pos = new_string.find_ci(_orig), orig_length = _orig.length(), repl_length = _repl.length();
@@ -261,22 +272,22 @@ namespace Anope
 		/**
 		 * Get the string in lowercase.
 		 */
-		inline string lower()
+		inline string lower() const
 		{
 			Anope::string new_string = *this;
-			for (size_type i = 0; i < new_string.length(); ++i)
-				new_string[i] = static_cast<char>(tolower(new_string[i]));
+			for (auto &chr : new_string)
+				chr = Anope::tolower(chr);
 			return new_string;
 		}
 
 		/**
 		 * Get the string in uppercase.
 		 */
-		inline string upper()
+		inline string upper() const
 		{
 			Anope::string new_string = *this;
-			for (size_type i = 0; i < new_string.length(); ++i)
-				new_string[i] = static_cast<char>(toupper(new_string[i]));
+			for (auto &chr : new_string)
+				chr = Anope::toupper(chr);
 			return new_string;
 		}
 
@@ -307,59 +318,144 @@ namespace Anope
 		 * Stream insertion operator, must be friend because they cannot be inside the class.
 		 */
 		friend std::ostream &operator<<(std::ostream &os, const string &_str);
-	};
-
-	/** Hash an Anope::string for unorderd_map, passed as the third template arg to unordered_map
-	 */
-	struct hash
-	{
-		/* VS 2008 specific code */
-		enum { bucket_size = 4, min_buckets = 8 };
-		bool operator()(const string &s1, const string &s2) const;
-		/* End of 2008 specific code */
-
-		/** Hash an Anope::string for unordered_map
-		 * @param s The string
-		 * @return A hash value for the string
-		 */
-		bool operator()(const string &s) const;
+		friend std::istream &operator>>(std::istream &is, string &_str);
 	};
 
 	inline std::ostream &operator<<(std::ostream &os, const string &_str) { return os << _str._string; }
+	/* This is not standard to make operator>> behave like operator<< in that it will allow extracting a whole line, not just one word */
+	inline std::istream &operator>>(std::istream &is, string &_str) { return std::getline(is,  _str._string); }
 
 	inline const string operator+(char chr, const string &str) { string tmp(chr); tmp += str; return tmp; }
 	inline const string operator+(const char *_str, const string &str) { string tmp(_str); tmp += str; return tmp; }
 	inline const string operator+(const std::string &_str, const string &str) { string tmp(_str); tmp += str; return tmp; }
-	inline const string operator+(const ci::string &_str, const string &str) { string tmp(_str); tmp += str; return tmp; }
-	inline const string operator+(const irc::string &_str, const string &str) { string tmp(_str); tmp += str; return tmp; }
 
+	struct hash_ci final
+	{
+		inline size_t operator()(const string &s) const
+		{
+			return std::hash<std::string>()(s.lower().str());
+		}
+	};
+
+	struct hash_cs final
+	{
+		inline size_t operator()(const string &s) const
+		{
+			return std::hash<std::string>()(s.str());
+		}
+	};
+
+	struct compare final
+	{
+		inline bool operator()(const string &s1, const string &s2) const
+		{
+			return s1.equals_ci(s2);
+		}
+	};
+
+	template<typename T>
+	using map = std::map<string, T, ci::less>;
+
+	template<typename T>
+	using multimap = std::multimap<string, T, ci::less>;
+
+	template<typename T>
+	using unordered_map = std::unordered_map<string, T, hash_ci, compare>;
+
+#if !REPRODUCIBLE_BUILD
 	static const char *const compiled = __TIME__ " " __DATE__;
+#endif
+
+	/** The time Anope started.
+	 */
+	extern CoreExport time_t StartTime;
+
+	/** The value to return from main()
+	 */
+	extern int ReturnValue;
+
+	extern sig_atomic_t Signal;
+	extern CoreExport bool Quitting;
+	extern CoreExport bool Restarting;
+	extern CoreExport Anope::string QuitReason;
 
 	/** The current system time, which is pretty close to being accurate.
 	 * Use this unless you need very specific time checks
 	 */
 	extern CoreExport time_t CurTime;
+	extern CoreExport long long CurTimeNs;
 
+	/** The debug level we are running at.
+	 */
+	extern CoreExport unsigned Debug;
+
+	/** Other command line options.
+	 */
+	extern CoreExport bool ReadOnly, NoFork, NoThird, NoDB, NoPID, NoExpire, ProtocolDebug;
+
+	/** The root of the Anope installation. Usually ~/anope
+	 */
+	extern CoreExport Anope::string ServicesDir;
+
+	/** Anope binary name (eg anope)
+	 */
+	extern CoreExport Anope::string ServicesBin;
+
+	/** Various directory paths. These can be set at runtime by command line args
+	 */
+	extern CoreExport Anope::string ConfigDir;
+	extern CoreExport Anope::string DataDir;
+	extern CoreExport Anope::string ModuleDir;
+	extern CoreExport Anope::string LocaleDir;
+	extern CoreExport Anope::string LogDir;
+
+	/** The uplink we are currently connected to
+	 */
+	extern CoreExport size_t CurrentUplink;
+
+	/** Various methods to determine the Anope version running
+	 */
 	extern CoreExport string Version();
 	extern CoreExport string VersionShort();
 	extern CoreExport string VersionBuildString();
-	extern CoreExport int VersionMajor();
-	extern CoreExport int VersionMinor();
-	extern CoreExport int VersionPatch();
-	extern CoreExport int VersionBuild();
+	extern CoreExport unsigned VersionMajor();
+	extern CoreExport unsigned VersionMinor();
+	extern CoreExport unsigned VersionPatch();
+
+	/** Determines if we are still attached to the terminal, and can print
+	 * messages to the user via stderr/stdout.
+	 * @return true if still attached
+	 */
+	extern bool AtTerm();
+
+	/** 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 notifies the parent via kill() to exit().
+	 */
+	extern void Fork();
+
+	/** Does something with the signal in Anope::Signal
+	 */
+	extern void HandleSignal();
+
+	/** One of the first functions called, does general initialization such as reading
+	 * command line args, loading the configuration, doing the initial fork() if necessary,
+	 * initializing language support, loading modules, and loading databases.
+	 * @throws CoreException if something bad went wrong
+	 */
+	extern bool Init(int ac, char **av);
+
+	/** Calls the save database event
+	 */
+	extern CoreExport void SaveDatabases();
 
 	/** Check whether two strings match.
 	 * @param str The string to check against the pattern (e.g. foobar)
 	 * @param mask The pattern to check (e.g. foo*bar)
 	 * @param case_sensitive Whether or not the match is case sensitive, default false.
+	 * @param use_regex Whether or not to try regex. case_sensitive is not used in regex.
 	 */
-	extern CoreExport bool Match(const Anope::string &str, const Anope::string &mask, bool case_sensitive = false);
-
-	/** Find a message in the message table
-	 * @param name The name of the message were looking for
-	 * @return NULL if we cant find it, or a pointer to the Message if we can
-	 */
-	extern CoreExport std::vector<Message *> FindMessage(const string &name);
+	extern CoreExport bool Match(const string &str, const string &mask, bool case_sensitive = false, bool use_regex = false);
 
 	/** Converts a string to hex
 	 * @param the data to be converted
@@ -372,29 +468,14 @@ namespace Anope
 	 * @param src The data to be converted
 	 * @param dest The destination string
 	 */
-	extern CoreExport void Unhex(const Anope::string &src, Anope::string &dest);
-	extern CoreExport void Unhex(const Anope::string &src, char *dest);
-	
-	/** Base 64 encode a string
-	 * @param src The string to encode
-	 * @param target Where the encoded string is placed
-	 */
-	extern CoreExport void B64Encode(const Anope::string &src, Anope::string &target);
-	
-	/** Base 64 decode a string
-	 * @param src The base64 encoded string
-	 * @param target The plain text result
-	 */
-	extern CoreExport void B64Decode(const Anope::string &src, Anope::string &target);
+	extern CoreExport void Unhex(const string &src, string &dest);
+	extern CoreExport void Unhex(const string &src, char *dest, size_t sz);
 
-	/** Returns a sequence of data formatted as the format argument specifies.
-	 ** After the format parameter, the function expects at least as many
-	 ** additional arguments as specified in format.
-	 * @param fmt Format of the Message
-	 * @param ... any number of parameters
-	 * @return a Anope::string
+	/** Encrypts what is in 'src' to 'dest'
+	 * @param src The source string to encrypt
+	 * @param dest The destination where the encrypted string is placed
 	 */
-	extern CoreExport string printf(const char *fmt, ...);
+	extern CoreExport bool Encrypt(const Anope::string &src, Anope::string &dest);
 
 	/** Return the last error code
 	 * @return The error code
@@ -404,162 +485,251 @@ namespace Anope
 	/** Return the last error, uses errno/GetLastError() to determine this
 	 * @return An error message
 	 */
-	extern CoreExport const Anope::string LastError();
+	extern CoreExport string LastError();
+
+	/** Determines if a path is a file
+	 */
+	extern CoreExport bool IsFile(const Anope::string &file);
+
+	/** Converts a string into seconds
+	 * @param s The string, eg 3d
+	 * @return The time represented by the string, eg 259,200
+	 */
+	extern CoreExport time_t DoTime(const Anope::string &s);
+
+	/** Retrieves a human readable string representing the time in seconds
+	 * @param seconds The time on seconds, eg 60
+	 * @param nc The account to use language settings for to translate this string, if applicable
+	 * @param round Whether to round the duration to produce a shorter output.
+	 * @return A human readable string, eg "1 minute"
+	 */
+	extern CoreExport Anope::string Duration(time_t seconds, const NickCore *nc = nullptr, bool round = false);
+
+	/** Generates a human readable string of type "expires in ..."
+	 * @param expires time in seconds
+	 * @param nc The account to use language settings for to translate this string, if applicable
+	 * @return A human readable string, eg "expires in 5 days"
+	 */
+	extern CoreExport Anope::string Expires(time_t seconds, const NickCore *nc = NULL);
+
+	/** Converts a time in seconds (epoch) to a human readable format.
+	 * @param t The time
+	 * @param nc The account to use language settings for to translate this string, if applicable
+	 * @param short_output If true, the output is just a date (eg, "Apr 12 20:18:22 2009 MSD"), else it includes the date and how long ago/from now that date is, (eg "Apr 12 20:18:22 2009 MSD (1313 days, 9 hours, 32 minutes ago)"
+	 */
+	extern CoreExport Anope::string strftime(time_t t, const NickCore *nc = NULL, bool short_output = false);
+
+	/** Parses a raw message from the uplink and calls its command handler.
+	 * @param message Raw message from the uplink
+	 */
+	extern void Process(const Anope::string &message);
+
+	/** Calls the command handler for an already parsed message.
+	 * @param source Source of the message.
+	 * @param command Command name.
+	 * @param params Any extra parameters.
+	 * @param tags IRCv3 message tags.
+	 */
+	extern CoreExport void ProcessInternal(MessageSource &src, const Anope::string &command, const std::vector<Anope::string> &params, const Anope::map<Anope::string> & tags);
+
+	/** Does a blocking dns query and returns the first IP.
+	 * @param host host to look up
+	 * @param type inet addr type
+	 * @return the IP if it was found, else the host
+	 */
+	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
+	 */
+	extern CoreExport Anope::string Random(size_t len);
+
+	/** Generate a random number. */
+	extern CoreExport int RandomNumber();
+
+	/** Update the current time. */
+	extern CoreExport void UpdateTime();
 }
 
-/** sepstream allows for splitting token seperated lists.
+/** sepstream allows for splitting token separated lists.
  * Each successive call to sepstream::GetToken() returns
  * the next token, until none remain, at which point the method returns
  * an empty string.
  */
 class CoreExport sepstream
 {
- private:
+private:
 	/** Original string.
 	 */
 	Anope::string tokens;
-	/** Last position of a seperator token
-	 */
-	Anope::string::iterator last_starting_position;
-	/** Current string position
-	 */
-	Anope::string::iterator n;
-	/** Seperator value
+	/** Separator value
 	 */
 	char sep;
- public:
+	/** Current string position
+	 */
+	size_t pos = 0;
+	/** If set then GetToken() can return an empty string
+	 */
+	bool allow_empty;
+public:
 	/** Create a sepstream and fill it with the provided data
 	 */
-	sepstream(const Anope::string &source, char seperator);
-	virtual ~sepstream() { }
+	sepstream(const Anope::string &source, char separator, bool allowempty = false);
+
+	/** Retrieves the underlying string. */
+	const auto &GetString() const { return tokens; }
 
 	/** Fetch the next token from the stream
 	 * @param token The next token from the stream is placed here
 	 * @return True if tokens still remain, false if there are none left
 	 */
-	virtual bool GetToken(Anope::string &token);
+	bool GetToken(Anope::string &token);
+
+	/** Gets token number 'num' from the stream
+	 * @param token The token is placed here
+	 * @param num The token number to fetch
+	 * @return True if the token was able to be fetched
+	 */
+	bool GetToken(Anope::string &token, int num);
+
+	/** Gets every token from this stream
+	 * @param token Tokens are pushed back here
+	 */
+	template<typename T> void GetTokens(T &token)
+	{
+		token.clear();
+		Anope::string t;
+		while (this->GetToken(t))
+			token.push_back(t);
+	}
+
+	/** Gets token number 'num' from the stream and all remaining tokens.
+	 * @param token The token is placed here
+	 * @param num The token number to fetch
+	 * @return True if the token was able to be fetched
+	 */
+	bool GetTokenRemainder(Anope::string &token, int num);
+
+	/** Determines the number of tokens in this stream.
+	 * @return The number of tokens in this stream
+	 */
+	int NumTokens();
 
 	/** Fetch the entire remaining stream, without tokenizing
 	 * @return The remaining part of the stream
 	 */
-	virtual const Anope::string GetRemaining();
+	Anope::string GetRemaining();
 
 	/** Returns true if the end of the stream has been reached
 	 * @return True if the end of the stream has been reached, otherwise false
 	 */
-	virtual bool StreamEnd();
+	bool StreamEnd();
 };
 
-/** A derived form of sepstream, which seperates on commas
+/** A derived form of sepstream, which separates on commas
  */
-class commasepstream : public sepstream
+class commasepstream final
+	: public sepstream
 {
- public:
-	/** Initialize with comma seperator
+public:
+	/** Initialize with comma separator
 	 */
-	commasepstream(const Anope::string &source) : sepstream(source, ',') { }
+	commasepstream(const Anope::string &source, bool allowempty = false) : sepstream(source, ',', allowempty) { }
 };
 
-/** A derived form of sepstream, which seperates on spaces
+/** A derived form of sepstream, which separates on spaces
  */
-class spacesepstream : public sepstream
+class spacesepstream final
+	: public sepstream
 {
- public:
-	/** Initialize with space seperator
+public:
+	/** Initialize with space separator
 	 */
 	spacesepstream(const Anope::string &source) : sepstream(source, ' ') { }
 };
 
-/** The base class that most classes in Anope inherit from
+/** This class can be used on its own to represent an exception, or derived to represent a module-specific exception.
+ * When a module whishes to abort, e.g. within a constructor, it should throw an exception using ModuleException or
+ * a class derived from ModuleException. If a module throws an exception during its constructor, the module will not
+ * be loaded. If this happens, the error message returned by ModuleException::GetReason will be displayed to the user
+ * attempting to load the module, or dumped to the console if the ircd is currently loading for the first time.
  */
-class dynamic_reference_base;
-class CoreExport Base
+class CoreExport CoreException
+	: public std::exception
 {
-	/* References to this base class */
-	std::set<dynamic_reference_base *> References;
- public:
-	Base();
-	virtual ~Base();
-	void AddReference(dynamic_reference_base *r);
-	void DelReference(dynamic_reference_base *r);
-};
-
-class dynamic_reference_base
-{
- protected:
-	bool invalid;
- public:
-	dynamic_reference_base() : invalid(false) { }
-	virtual ~dynamic_reference_base() { }
-	inline void Invalidate() { this->invalid = true; }
-};
-
-template<typename T>
-class dynamic_reference : public dynamic_reference_base
-{
- protected:
-	T *ref;
- public:
-	dynamic_reference(T *obj) : ref(obj)
+protected:
+	/** Holds the error message to be displayed
+	 */
+	Anope::string err;
+	/** Source of the exception
+	 */
+	Anope::string source;
+public:
+	/** This constructor can be used to specify an error message before throwing.
+	 */
+	CoreException(const Anope::string &message) : err(message), source("The core") { }
+	/** This constructor can be used to specify an error message before throwing,
+	 * and to specify the source of the exception.
+	 */
+	CoreException(const Anope::string &message, const Anope::string &src) : err(message), source(src) { }
+	/** This destructor solves world hunger, cancels the world debt, and causes the world to end.
+	 * Actually no, it does nothing. Never mind.
+	 * @throws Nothing!
+	 */
+	virtual ~CoreException() noexcept = default;
+	/** Returns the reason for the exception.
+	 * The module should probably put something informative here as the user will see this upon failure.
+	 */
+	virtual const Anope::string &GetReason() const
 	{
-		if (ref)
-			ref->AddReference(this);
+		return err;
 	}
 
-	dynamic_reference(const dynamic_reference<T> &obj) : ref(obj.ref)
+	virtual const Anope::string &GetSource() const
 	{
-		if (ref)
-			ref->AddReference(this);
-	}
-
-	virtual ~dynamic_reference()
-	{
-		if (this->invalid)
-		{
-			this->invalid = false;
-			this->ref = NULL;
-		}
-		else if (this->operator bool())
-			ref->DelReference(this);
-	}
-
-	virtual operator bool()
-	{
-		if (this->invalid)
-		{
-			this->invalid = false;
-			this->ref = NULL;
-		}
-		return this->ref != NULL;
-	}
-
-	virtual inline operator T*()
-	{
-		if (this->operator bool())
-			return this->ref;
-		return NULL;
-	}
-
-	virtual inline T *operator->()
-	{
-		if (this->operator bool())
-			return this->ref;
-		return NULL;
-	}
-
-	virtual inline void operator=(T *newref)
-	{
-		if (this->invalid)
-		{
-			this->invalid = false;
-			this->ref = NULL;
-		}
-		else if (this->operator bool())
-			this->ref->DelReference(this);
-		this->ref = newref;
-		if (this->operator bool())
-			this->ref->AddReference(this);
+		return source;
 	}
 };
 
-#endif // ANOPE_H
+class CoreExport ModuleException
+	: public CoreException
+{
+public:
+	/** This constructor can be used to specify an error message before throwing.
+	 */
+	ModuleException(const Anope::string &message) : CoreException(message, "A Module") { }
+	/** This destructor solves world hunger, cancels the world debt, and causes the world to end.
+	 * Actually no, it does nothing. Never mind.
+	 * @throws Nothing!
+	 */
+	virtual ~ModuleException() noexcept = default;
+};
+
+/** Casts to be used instead of dynamic_cast, this uses dynamic_cast
+ * for debug builds and static_cast on release builds
+ * to speed up the program because dynamic_cast relies on RTTI.
+ */
+#ifdef DEBUG_BUILD
+# include <typeinfo>
+template<typename T, typename O> inline T anope_dynamic_static_cast(O ptr)
+{
+	T ret = dynamic_cast<T>(ptr);
+	if (ptr != NULL && ret == NULL)
+		throw CoreException(Anope::string("anope_dynamic_static_cast<") + typeid(T).name() + ">(" + typeid(O).name() + ") fail");
+	return ret;
+}
+#else
+template<typename T, typename O> inline T anope_dynamic_static_cast(O ptr)
+{
+	return static_cast<T>(ptr);
+}
+#endif
+
+#include "convert.h"

include/base.h

@@ -0,0 +1,145 @@
+// Anope IRC Services <https://www.anope.org/>
+//
+// Copyright (C) 2003-2026 Anope Contributors
+// Copyright (C) 2008-2011 Adam <Adam@anope.org>
+//
+// Anope is free software. You can use, modify, and/or distribute it under the
+// terms of version 2 of the GNU General Public License. See docs/LICENSE.txt
+// for the complete terms of this license and docs/AUTHORS.txt for a list of
+// contributors.
+//
+// Based on the original code of Epona by Lara
+// Based on the original code of Services by Andy Church
+//
+// SPDX-License-Identifier: GPL-2.0-only
+
+#pragma once
+
+#include "services.h"
+
+/** The base class that most classes in Anope inherit from
+ */
+class CoreExport Base
+{
+	/* References to this base class */
+	std::set<ReferenceBase *> *references = nullptr;
+public:
+	virtual ~Base();
+
+	/** Adds a reference to this object. Eg, when a Reference
+	 * is created referring to this object this is called. It is used to
+	 * cleanup references when this object is destructed.
+	 */
+	void AddReference(ReferenceBase *r);
+
+	void DelReference(ReferenceBase *r);
+};
+
+class ReferenceBase
+{
+protected:
+	bool invalid = false;
+public:
+	ReferenceBase() = default;
+	ReferenceBase(const ReferenceBase &other) : invalid(other.invalid) { }
+	virtual ~ReferenceBase() = default;
+	inline void Invalidate() { this->invalid = true; }
+};
+
+/** Used to hold pointers to objects that may be deleted. A Reference will
+ * no longer be valid once the object it refers is destructed.
+ */
+template<typename T>
+class Reference
+	: public ReferenceBase
+{
+protected:
+	T *ref = nullptr;
+public:
+	Reference() = default;
+
+	Reference(T *obj) : ref(obj)
+	{
+		if (ref)
+			ref->AddReference(this);
+	}
+
+	Reference(const Reference<T> &other) : ReferenceBase(other), ref(other.ref)
+	{
+		if (operator bool())
+			ref->AddReference(this);
+	}
+
+	virtual ~Reference()
+	{
+		if (operator bool())
+			ref->DelReference(this);
+	}
+
+	inline Reference<T>& operator=(const Reference<T> &other)
+	{
+		if (this != &other)
+		{
+			if (*this)
+				this->ref->DelReference(this);
+
+			this->ref = other.ref;
+			this->invalid = other.invalid;
+
+			if (*this)
+				this->ref->AddReference(this);
+		}
+		return *this;
+	}
+
+	/* We explicitly call operator bool here in several places to prevent other
+	 * operators, such operator T*, from being called instead, which will mess
+	 * with any class inheriting from this that overloads this operator.
+	 */
+	virtual operator bool()
+	{
+		if (!this->invalid)
+			return this->ref != NULL;
+		return false;
+	}
+
+	inline operator T*()
+	{
+		if (operator bool())
+			return this->ref;
+		return NULL;
+	}
+
+	inline T *operator->()
+	{
+		if (operator bool())
+			return this->ref;
+		return NULL;
+	}
+
+	inline T *operator*()
+	{
+		if (operator bool())
+			return this->ref;
+		return NULL;
+	}
+
+	/** Note that we can't have an operator< that returns this->ref < other.ref
+	 * because this function is used to sort objects in containers (such as set
+	 * or map), and if the references themselves can change if the object they
+	 * refer to is invalidated or changed, then this screws with the order that
+	 * the objects would be in the container without properly adjusting the
+	 * container, resulting in weird stuff.
+	 *
+	 * As such, we don't allow storing references in containers that require
+	 * operator<, because they would not be able to compare what the references
+	 * actually referred to.
+	 */
+
+	inline bool operator==(const Reference<T> &other)
+	{
+		if (!this->invalid)
+			return this->ref == other;
+		return false;
+	}
+};

include/bots.h

@@ -1,48 +1,69 @@
-/*
- * Copyright (C) 2008-2011 Robin Burchell <w00t@inspircd.org>
- * Copyright (C) 2008-2012 Anope Team <team@anope.org>
- *
- * Please read COPYING and README for further details.
- */
+// Anope IRC Services <https://www.anope.org/>
+//
+// Copyright (C) 2003-2026 Anope Contributors
+// Copyright (C) 2008-2011 Robin Burchell <w00t@inspircd.org>
+//
+// Anope is free software. You can use, modify, and/or distribute it under the
+// terms of version 2 of the GNU General Public License. See docs/LICENSE.txt
+// for the complete terms of this license and docs/AUTHORS.txt for a list of
+// contributors.
+//
+// Based on the original code of Epona by Lara
+// Based on the original code of Services by Andy Church
+//
+// SPDX-License-Identifier: GPL-2.0-only
 
-#ifndef BOTS_H
-#define BOTS_H
 
-class BotInfo;
 
-extern CoreExport Anope::insensitive_map<BotInfo *> BotListByNick;
-extern CoreExport Anope::map<BotInfo *> BotListByUID;
-typedef Anope::insensitive_map<BotInfo *> botinfo_map;
+#pragma once
 
-/** Flags settable on a bot
- */
-enum BotFlag
+#include "users.h"
+#include "anope.h"
+#include "serialize.h"
+#include "commands.h"
+
+
+typedef Anope::map<BotInfo *> botinfo_map;
+
+extern CoreExport Serialize::Checker<botinfo_map> BotListByNick, BotListByUID;
+
+/* A service bot (NickServ, ChanServ, a BotServ bot, etc). */
+class CoreExport BotInfo final
+	: public User
+	, public Serializable
 {
-	BI_BEGIN,
+public:
+	struct Type final
+		: public Serialize::Type
+	{
+		Type();
+		void Serialize(Serializable *obj, Serialize::Data &data) const override;
+		Serializable *Unserialize(Serializable *obj, Serialize::Data &data) const override;
+	};
 
-	/* This bot is a core bot. NickServ, ChanServ, etc */
-	BI_CORE,
-	/* This bot can only be assigned by IRCops */
-	BI_PRIVATE,
-	/* This bot is defined in the config */
-	BI_CONF,
-
-	BI_END
-};
-
-static const Anope::string BotFlagString[] = { "BEGIN", "CORE", "PRIVATE", "CONF", "" };
-
-class CoreExport BotInfo : public User, public Flags<BotFlag, BI_END>, public Serializable
-{
- public:
-	uint32_t chancount;
-	time_t created;			/* Birth date ;) */
-	time_t lastmsg;			/* Last time we said something */
-	typedef Anope::insensitive_map<CommandInfo> command_map;
-	command_map commands; /* Commands, actual name to service name */
-	Anope::string botmodes;		/* Modes the bot should have as configured in service:modes */
-	std::vector<Anope::string> botchannels;	/* Channels the bot should be in as configured in service:channels */
-	bool introduced;		/* Whether or not this bot is introduced */
+private:
+	/* Channels this bot is assigned to */
+	Serialize::Checker<std::set<ChannelInfo *> > channels;
+public:
+	time_t created;
+	/* Last time this bot said something (via privmsg) */
+	time_t lastmsg;
+	/* Map of actual command names -> service name/permission required */
+	CommandInfo::map commands;
+	/** CTCP responses this bot can send. */
+	Anope::map<std::function<void(BotInfo *, User *, const Anope::string &)>> ctcps;
+	/* The server-side alias used to message this bot. */
+	Anope::string alias;
+	/* Modes the bot should have as configured in service:modes */
+	Anope::string botmodes;
+	/* Channels the bot should be in as configured in service:channels */
+	std::vector<Anope::string> botchannels;
+	/* Whether or not this bot is introduced to the network */
+	bool introduced;
+	/* Bot can only be assigned by irc ops */
+	bool oper_only;
+	/* Bot is defined in the configuration file */
+	bool conf;
 
 	/** Create a new bot.
 	 * @param nick The nickname to assign to the bot.
@@ -57,21 +78,21 @@ class CoreExport BotInfo : public User, public Flags<BotFlag, BI_END>, public Se
 	 */
 	virtual ~BotInfo();
 
-	Anope::string serialize_name() const;
-	serialized_data serialize();
-	static void unserialize(serialized_data &);
+	void Serialize(Serialize::Data &data) const;
+	static Serializable *Unserialize(Serializable *obj, Serialize::Data &);
 
 	void GenerateUID();
 
+	void OnKill();
+
 	/** Change the nickname for the bot.
 	 * @param newnick The nick to change to
 	 */
 	void SetNewNick(const Anope::string &newnick);
 
-	/** Rejoins all channels that this bot is assigned to.
-	 * Used on /kill, rename, etc.
+	/** Return the channels this bot is assigned to
 	 */
-	void RejoinAll();
+	const std::set<ChannelInfo *> &GetChannels() const;
 
 	/** Assign this bot to a given channel, removing the existing assigned bot if one exists.
 	 * @param u The user assigning the bot, or NULL
@@ -85,6 +106,10 @@ class CoreExport BotInfo : public User, public Flags<BotFlag, BI_END>, public Se
 	 */
 	void UnAssign(User *u, ChannelInfo *ci);
 
+	/** Get the number of channels this bot is assigned to
+	 */
+	unsigned GetChannelCount() const;
+
 	/** Join this bot to a channel
 	 * @param c The channel
 	 * @param status The status the bot should have on the channel
@@ -106,21 +131,31 @@ class CoreExport BotInfo : public User, public Flags<BotFlag, BI_END>, public Se
 	/** Called when a user messages this bot
 	 * @param u The user
 	 * @param message The users' message
+	 * @params tags Message tags
 	 */
-	virtual void OnMessage(User *u, const Anope::string &message);
+	void OnMessage(User *u, const Anope::string &message, const Anope::map<Anope::string> &tags);
 
 	/** Link a command name to a command in services
 	 * @param cname The command name
 	 * @param sname The service name
 	 * @param permission Permission required to execute the command, if any
+	 * @return The commandinfo for the newly created command
 	 */
-	void SetCommand(const Anope::string &cname, const Anope::string &sname, const Anope::string &permission = "");
+	CommandInfo &SetCommand(const Anope::string &cname, const Anope::string &sname, const Anope::string &permission = "");
 
 	/** Get command info for a command
 	 * @param cname The command name
 	 * @return A struct containing service name and permission
 	 */
 	CommandInfo *GetCommand(const Anope::string &cname);
-};
 
-#endif // BOTS_H
+	/** Get the command that users can use to send a message to this bot. */
+	Anope::string GetQueryCommand(const Anope::string &command = "", const Anope::string &extra = "") const;
+
+	/** Find a bot by nick
+	 * @param nick The nick
+	 * @param nick_only True to only look by nick, and not by UID
+	 * @return The bot, if it exists
+	 */
+	static BotInfo *Find(const Anope::string &nick, bool nick_only = false);
+};

include/channels.h

@@ -1,77 +1,103 @@
-/* Channel support
- *
- * (C) 2008-2012 Anope Team
- * Contact us at team@anope.org
- *
- * Please read COPYING and README for further details.
- */
+// Anope IRC Services <https://www.anope.org/>
+//
+// Copyright (C) 2003-2026 Anope Contributors
+//
+// Anope is free software. You can use, modify, and/or distribute it under the
+// terms of version 2 of the GNU General Public License. See docs/LICENSE.txt
+// for the complete terms of this license and docs/AUTHORS.txt for a list of
+// contributors.
+//
+// Based on the original code of Epona by Lara
+// Based on the original code of Services by Andy Church
+//
+// SPDX-License-Identifier: GPL-2.0-only
 
-#ifndef CHANNELS_H
-#define CHANNELS_H
+#pragma once
+
+#include "anope.h"
+#include "extensible.h"
+#include "modes.h"
+#include "serialize.h"
+
+typedef Anope::unordered_map<Channel *> channel_map;
 
-typedef Anope::insensitive_map<Channel *> channel_map;
 extern CoreExport channel_map ChannelList;
 
-struct UserContainer : public Extensible
+/* A user's membership to a channel, there is one of these per user per channel. */
+struct Membership final
+	: public Extensible
 {
 	User *user;
-	ChannelStatus *Status;
+	Channel *chan;
+	/* Status the user has in the channel */
+	ChannelStatus status;
 
-	UserContainer(User *u) : user(u) { }
-	virtual ~UserContainer() { }
+	Membership(User *u, Channel *c)
+		: user(u)
+		, chan(c)
+	{
+	}
 };
 
-typedef std::list<UserContainer *> CUserList;
-
-enum ChannelFlag
+class CoreExport Channel final
+	: public Base
+	, public Extensible
 {
-	/* ChanServ is currently holding the channel */
-	CH_INHABIT,
-	/* Channel still exists when emptied */
-	CH_PERSIST,
-	/* If set the channel is syncing users (channel was just created) and it should not be deleted */
-	CH_SYNCING
-};
+	static std::vector<Channel *> deleting;
 
-const Anope::string ChannelFlagString[] = { "CH_INABIT", "CH_PERSIST", "CH_SYNCING", "" };
-
-class CoreExport Channel : public Extensible, public Flags<ChannelFlag, 3>
-{
- public:
-	typedef std::multimap<ChannelModeName, Anope::string> ModeList;
- private:
+public:
+	typedef std::multimap<Anope::string, ModeData> ModeList;
+private:
 	/** A map of channel modes with their parameters set on this channel
 	 */
 	ModeList modes;
 
- public:
-	/** Default constructor
+public:
+	/* Channel name */
+	Anope::string name;
+	/* Set if this channel is registered. ci->c == this. Contains information relevant to the registered channel */
+	Serialize::Reference<ChannelInfo> ci;
+	/* When the channel was created */
+	time_t created;
+	/* If the channel has just been created in a netjoin */
+	bool syncing = false;
+	/* Is configured in the conf as a channel bots should be in */
+	bool botchannel = false;
+
+	/* Users in the channel */
+	typedef std::map<User *, Membership *> ChanUserList;
+	ChanUserList users;
+
+	/* Current topic of the channel */
+	Anope::string topic;
+	/* Who set the topic */
+	Anope::string topic_setter;
+	/* The timestamp associated with the topic. Not necessarily anywhere close to Anope::CurTime.
+	 * This is the time the topic was *originally set*. When we restore the topic we want to change the TS back
+	 * to this, but we can only do this on certain IRCds.
+	 */
+	time_t topic_ts = 0;
+	/* The actual time the topic was set, probably close to Anope::CurTime */
+	time_t topic_time = 0;
+
+	time_t server_modetime = 0;		/* Time of last server MODE */
+	time_t chanserv_modetime = 0;	/* Time of last check_modes() */
+	int16_t server_modecount = 0;	/* Number of server MODEs this second */
+	int16_t chanserv_modecount = 0;	/* Number of check_mode()'s this sec */
+	bool bouncy_modes = false;		/* Did we fail to set modes here? */
+
+private:
+	/** Constructor
 	 * @param name The channel name
 	 * @param ts The time the channel was created
 	 */
 	Channel(const Anope::string &nname, time_t ts = Anope::CurTime);
 
-	/** Default destructor
+public:
+	/** Destructor
 	 */
 	~Channel();
 
-	Anope::string name;		/* Channel name */
-	ChannelInfo *ci;		/* Corresponding ChannelInfo */
-	time_t creation_time;	/* When channel was created */
-
-	/* List of users in the channel */
-	CUserList users;
-
-	Anope::string topic;		/* Current topic of the channel */
-	Anope::string topic_setter;	/* Who set the topic */
-	time_t topic_time;		/* When the topic was set*/
-
-	time_t server_modetime;		/* Time of last server MODE */
-	time_t chanserv_modetime;	/* Time of last check_modes() */
-	int16_t server_modecount;	/* Number of server MODEs this second */
-	int16_t chanserv_modecount;	/* Number of check_mode()'s this sec */
-	int16_t bouncy_modes;		/* Did we fail to set modes here? */
-
 	/** Call if we need to unset all modes and clear all user status (internally).
 	 * Only useful if we get a SJOIN with a TS older than what we have here
 	 */
@@ -81,10 +107,20 @@ class CoreExport Channel : public Extensible, public Flags<ChannelFlag, 3>
 	 */
 	void Sync();
 
+	/** Check if a channels modes are correct.
+	 */
+	void CheckModes();
+
+	/** Check if this channel should be deleted
+	 */
+	bool CheckDelete();
+
 	/** Join a user internally to the channel
 	 * @param u The user
+	 * @param status The status to give the user, if any
+	 * @return The membership for the user
 	 */
-	void JoinUser(User *u);
+	Membership *JoinUser(User *u, const ChannelStatus *status);
 
 	/** Remove a user internally from the channel
 	 * @param u The user
@@ -93,135 +129,151 @@ class CoreExport Channel : public Extensible, public Flags<ChannelFlag, 3>
 
 	/** Check if the user is on the channel
 	 * @param u The user
-	 * @return A user container if found, else NULL
+	 * @return A membership if found, else NULL
 	 */
-	UserContainer *FindUser(User *u);
+	Membership *FindUser(User *u) const;
 
 	/** Check if a user has a status on a channel
 	 * @param u The user
 	 * @param cms The status mode, or NULL to represent no status
 	 * @return true or false
 	 */
-	bool HasUserStatus(User *u, ChannelModeStatus *cms) const;
+	bool HasUserStatus(User *u, ChannelModeStatus *cms);
 
 	/** Check if a user has a status on a channel
 	 * Use the overloaded function for ChannelModeStatus* to check for no status
 	 * @param u The user
-	 * @param Name The Mode name, eg CMODE_OP, CMODE_VOICE
+	 * @param name The mode name, eg CMODE_OP, CMODE_VOICE
 	 * @return true or false
 	 */
-	bool HasUserStatus(User *u, ChannelModeName Name) const;
+	bool HasUserStatus(User *u, const Anope::string &name);
 
 	/** See if a channel has a mode
-	 * @param Name The mode name
+	 * @param name The mode name
 	 * @return The number of modes set
- 	 * @param param The optional mode param
+	 * @param param The optional mode param
 	 */
-	size_t HasMode(ChannelModeName Name, const Anope::string &param = "");
-
-	/** Get a list of modes on a channel
-	 * @param Name A mode name to get the list of
-	 * @return a pair of iterators for the beginning and end of the list
-	 */
-	std::pair<ModeList::iterator, ModeList::iterator> GetModeList(ChannelModeName Name);
+	size_t HasMode(const Anope::string &name, const Anope::string &param = "");
 
 	/** Set a mode internally on a channel, this is not sent out to the IRCd
+	 * @param setter The setter
 	 * @param cm The mode
-	 * @param param The param
-	 * @param EnforceMLock true if mlocks should be enforced, false to override mlock
+	 * @param data Data about the mode.
+	 * @param enforce_mlock true if mlocks should be enforced, false to override mlock
 	 */
-	void SetModeInternal(ChannelMode *cm, const Anope::string &param = "", bool EnforceMLock = true);
+	void SetModeInternal(MessageSource &source, ChannelMode *cm, const ModeData &data = {}, bool enforce_mlock = true);
 
 	/** Remove a mode internally on a channel, this is not sent out to the IRCd
+	 * @param setter The Setter
 	 * @param cm The mode
 	 * @param param The param
-	 * @param EnforceMLock true if mlocks should be enforced, false to override mlock
+	 * @param enforce_mlock true if mlocks should be enforced, false to override mlock
 	 */
-	void RemoveModeInternal(ChannelMode *cm, const Anope::string &param = "", bool EnforceMLock = true);
+	void RemoveModeInternal(MessageSource &source, ChannelMode *cm, const Anope::string &param = "", bool enforce_mlock = true);
 
 	/** Set a mode on a channel
 	 * @param bi The client setting the modes
 	 * @param cm The mode
-	 * @param param Optional param arg for the mode
-	 * @param EnforceMLock true if mlocks should be enforced, false to override mlock
+	 * @param data Data about the mode
+	 * @param enforce_mlock true if mlocks should be enforced, false to override mlock
 	 */
-	void SetMode(BotInfo *bi, ChannelMode *cm, const Anope::string &param = "", bool EnforceMLock = true);
+	void SetMode(BotInfo *bi, ChannelMode *cm, const ModeData &data = {}, bool enforce_mlock = true);
 
 	/**
 	 * Set a mode on a channel
 	 * @param bi The client setting the modes
-	 * @param Name The mode name
-	 * @param param Optional param arg for the mode
-	 * @param EnforceMLock true if mlocks should be enforced, false to override mlock
+	 * @param name The mode name
+	 * @param data Data about the mode
+	 * @param enforce_mlock true if mlocks should be enforced, false to override mlock
 	 */
-	void SetMode(BotInfo *bi, ChannelModeName Name, const Anope::string &param = "", bool EnforceMLock = true);
+	void SetMode(BotInfo *bi, const Anope::string &name, const ModeData &data = {}, bool enforce_mlock = true);
 
 	/** Remove a mode from a channel
 	 * @param bi The client setting the modes
 	 * @param cm The mode
 	 * @param param Optional param arg for the mode
-	 * @param EnforceMLock true if mlocks should be enforced, false to override mlock
+	 * @param enforce_mlock true if mlocks should be enforced, false to override mlock
 	 */
-	void RemoveMode(BotInfo *bi, ChannelMode *cm, const Anope::string &param = "", bool EnforceMLock = true);
+	void RemoveMode(BotInfo *bi, ChannelMode *cm, const Anope::string &param = "", bool enforce_mlock = true);
 
 	/**
 	 * Remove a mode from a channel
 	 * @param bi The client setting the modes
-	 * @param Name The mode name
+	 * @param name The mode name
 	 * @param param Optional param arg for the mode
-	 * @param EnforceMLock true if mlocks should be enforced, false to override mlock
+	 * @param enforce_mlock true if mlocks should be enforced, false to override mlock
 	 */
-	void RemoveMode(BotInfo *bi, ChannelModeName Name, const Anope::string &param = "", bool EnforceMLock = true);
+	void RemoveMode(BotInfo *bi, const Anope::string &name, const Anope::string &param = "", bool enforce_mlock = true);
 
-	/** Get a param from the channel
-	 * @param Name The mode
-	 * @param Target a string to put the param into
-	 * @return true on success
+	/** Get a modes parameter for the channel
+	 * @param name The mode
+	 * @param target a string to put the param into
+	 * @return true if the parameter was fetched, false if on error (mode not set) etc.
 	 */
-	bool GetParam(ChannelModeName Name, Anope::string &Target) const;
+	bool GetParam(const Anope::string &name, Anope::string &target) const;
 
 	/** Set a string of modes on the channel
 	 * @param bi The client setting the modes
-	 * @param EnforceMLock Should mlock be enforced on this mode change
+	 * @param enforce_mlock Should mlock be enforced on this mode change
 	 * @param cmodes The modes to set
 	 */
-	void SetModes(BotInfo *bi, bool EnforceMLock, const char *cmodes, ...);
+	void SetModes(BotInfo *bi, bool enforce_mlock, const char *cmodes, ...) ATTR_FORMAT(4, 5);
+	void SetModes(BotInfo *bi, bool enforce_mlock, const Anope::string &cmodes);
 
 	/** Set a string of modes internally on a channel
-	 * @param setter the setter (if it is a user)
+	 * @param source The setter
 	 * @param mode the modes
-	 * @param EnforceMLock true to enforce mlock
+	 * @param enforce_mlock true to enforce mlock
 	 */
-	void SetModesInternal(User *setter, const Anope::string &mode, bool EnforceMLock = true);
+	void SetModesInternal(MessageSource &source, const Anope::string &modes, const std::vector<Anope::string> &params, time_t ts = 0, bool enforce_mlock = true);
+
+	/** Does the given user match the given list? (CMODE_BAN, CMODE_EXCEPT, etc, a list mode)
+	 * @param u The user
+	 * @param list The mode of the list to check (eg CMODE_BAN)
+	 * @return true if the user matches the list
+	 */
+	bool MatchesList(User *u, const Anope::string &list);
 
 	/** Kick a user from a channel internally
 	 * @param source The sender of the kick
 	 * @param nick The nick being kicked
 	 * @param reason The reason for the kick
 	 */
-	void KickInternal(const Anope::string &source, const Anope::string &nick, const Anope::string &reason);
+	void KickInternal(const MessageSource &source, const Anope::string &nick, const Anope::string &reason);
 
 	/** Kick a user from the channel
 	 * @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, ...);
+	bool Kick(BotInfo *bi, User *u, const char *reason = NULL, ...) ATTR_FORMAT(4, 5);
+	bool Kick(BotInfo *bi, User *u, const Anope::string &reason);
+
+	/** Get all modes set on this channel, excluding status modes.
+	 * @return a map of modes and their optional parameters.
+	 */
+	const ModeList &GetModes() const;
+
+	/** Get a list of modes on a channel
+	 * @param name A mode name to get the list of
+	 * @return a vector of the list mode entries
+	 */
+	std::vector<Anope::string> GetModeList(const Anope::string &name);
 
 	/** 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);
 
 	/** Update the topic of the channel internally, and reset it if topiclock etc says to
-	 * @param user THe user setting the new topic
+	 * @param user The user setting the new topic
 	 * @param newtopic The new topic
 	 * @param ts The time the new topic is being set
 	 */
-	void ChangeTopicInternal(const Anope::string &user, const Anope::string &newtopic, time_t ts = Anope::CurTime);
+	void ChangeTopicInternal(User *u, const Anope::string &user, const Anope::string &newtopic, time_t ts = Anope::CurTime);
 
 	/** Update the topic of the channel, and reset it if topiclock etc says to
 	 * @param user The user setting the topic
@@ -229,6 +281,47 @@ class CoreExport Channel : public Extensible, public Flags<ChannelFlag, 3>
 	 * @param ts The time when the new topic is being set
 	 */
 	void ChangeTopic(const Anope::string &user, const Anope::string &newtopic, time_t ts = Anope::CurTime);
-};
 
-#endif // CHANNELS_H
+	/** Set the correct modes, or remove the ones granted without permission,
+	 * for the specified user.
+	 * @param user The user to give/remove modes to/from
+	 * @param give_modes if true modes may be given to the user
+	 */
+	void SetCorrectModes(User *u, bool give_modes);
+
+	/** Unbans a user from this channel.
+	 * @param u The user to unban
+	 * @param mode The mode to unban
+	 * @param full Whether or not to match using the user's real host and IP
+	 * @return whether or not a ban was removed
+	 */
+	bool Unban(User *u, const Anope::string &mode, bool full = false);
+
+	/** Check whether a user is permitted to be on this channel
+	 * @param u The user
+	 * @return true if they are allowed, false if they aren't and were kicked
+	 */
+	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
+	 */
+	static Channel *Find(const Anope::string &name);
+
+	/** Finds or creates a channel
+	 * @param name The channel name
+	 * @param created Set to true if the channel was just created
+	 * @param ts The time the channel was created
+	 */
+	static Channel *FindOrCreate(const Anope::string &name, bool &created, time_t ts = Anope::CurTime);
+
+	void QueueForDeletion();
+
+	static void DeleteChannels();
+};

include/commands.h

@@ -1,77 +1,128 @@
-/* Declarations for command data.
- *
- * (C) 2003-2012 Anope Team
- * Contact us at team@anope.org
- *
- * Please read COPYING and README for further details.
- *
- * Based on the original code of Epona by Lara.
- * Based on the original code of Services by Andy Church.
- */
+// Anope IRC Services <https://www.anope.org/>
+//
+// Copyright (C) 2003-2026 Anope Contributors
+//
+// Anope is free software. You can use, modify, and/or distribute it under the
+// terms of version 2 of the GNU General Public License. See docs/LICENSE.txt
+// for the complete terms of this license and docs/AUTHORS.txt for a list of
+// contributors.
+//
+// Based on the original code of Epona by Lara
+// Based on the original code of Services by Andy Church
+//
+// SPDX-License-Identifier: GPL-2.0-only
 
-#ifndef COMMAND_H
-#define COMMAND_H
+#pragma once
 
-#include "services.h"
+#include "service.h"
+#include "anope.h"
+#include "channels.h"
+#include "textproc.h"
 
-class Module;
-class BotInfo;
-class Command;
-
-enum CommandFlag
+struct CommandGroup final
 {
-	CFLAG_ALLOW_UNREGISTERED,
-	CFLAG_STRIP_CHANNEL
+	Anope::string name, description;
 };
 
-const Anope::string CommandFlagStrings[] = {
-	"CFLAG_ALLOW_UNREGISTERED",
-	"CFLAG_STRIP_CHANNEL",
-	""
-};
-
-struct CommandInfo
+/* Used in BotInfo::commands */
+struct CommandInfo final
 {
+	typedef Anope::map<CommandInfo> map;
+
+	/* Service name of the command */
 	Anope::string name;
+	/* Permission required to execute the command */
 	Anope::string permission;
+	/* Group this command is in */
+	Anope::string group;
+	/* Whether to hide this command in help and suggestions */
+	bool hide = false;
+	/* Whether to prepend the channel name (only used with fantasy) */
+	bool prepend_channel = false;
+	/* Whether to require the FANTASY privilege (only used with fantasy) */
+	bool require_privilege = true;
+};
+
+/* Where the replies from commands go to. User inherits from this and is the normal
+ * source of a CommandReply
+ */
+struct CoreExport CommandReply
+{
+	virtual ~CommandReply() = default;
+	virtual void SendMessage(BotInfo *source, const Anope::string &msg) = 0;
+	virtual void SendMessage(CommandSource &source, const Anope::string &msg);
 };
 
 /* The source for a command */
-struct CoreExport CommandSource
+class CoreExport CommandSource final
 {
-	/* User executing the command */
-	User *u;
+	/* The nick executing the command */
+	Anope::string nick;
+	/* User executing the command, may be NULL */
+	Reference<User> u;
+public:
+	/* The account executing the command */
+	Reference<NickCore> nc;
+	/* for web clients */
+	Anope::string ip;
+	/* Where the reply should go */
+	CommandReply *reply;
 	/* Channel the command was executed on (fantasy) */
-	Channel *c;
+	Reference<Channel> c = nullptr;
 	/* The service this command is on */
-	BotInfo *owner;
-	/* The service the reply should come from, *not* necessarily the service the command is on */
-	BotInfo *service;
+	Reference<BotInfo> service;
 	/* The actual name of the command being executed */
 	Anope::string command;
 	/* The permission of the command being executed */
 	Anope::string permission;
+	/* The unique identifier of the executing message. */
+	Anope::string msgid;
 
-	void Reply(const char *message, ...);
+	CommandSource(const Anope::string &n, User *user, NickCore *core, CommandReply *reply, BotInfo *bi, const Anope::string &m = "");
+
+	const Anope::string &GetNick() const;
+	User *GetUser();
+	NickCore *GetAccount();
+	AccessGroup AccessFor(ChannelInfo *ci);
+	bool IsFounder(ChannelInfo *ci);
+
+	void Reply(const char *message, ...) ATTR_FORMAT(2, 3);
+	void Reply(int count, const char *singular, const char *plural, ...) ATTR_FORMAT(4, 5);
 	void Reply(const Anope::string &message);
+
+	const char *Translate(const char *message);
+	const char *Translate(const Anope::string &message);
+	const char *Translate(int count, const char *single, const char *plural);
+	const char *Translate(int count, const Anope::string &single, const Anope::string &plural);
+
+	bool HasCommand(const Anope::string &cmd);
+	bool HasPriv(const Anope::string &cmd);
+	bool IsServicesOper();
+	bool IsOper();
 };
 
 /** Every services command is a class, inheriting from Command.
  */
-class CoreExport Command : public Service, public Flags<CommandFlag>
+class CoreExport Command
+	: public Service
 {
 	Anope::string desc;
-	std::vector<Anope::string> syntax;
+	std::vector<std::pair<Anope::string, std::function<bool(CommandSource&)>>> syntax;
+	/* Allow unregistered users to use this command */
+	bool allow_unregistered = false;
+	/* Command requires that a user is executing it */
+	bool require_user = false;
 
- public:
- 	/* Maximum paramaters accepted by this command */
-	size_t MaxParams;
+public:
+	/* Maximum parameters accepted by this command */
+	size_t max_params;
 	/* Minimum parameters required to use this command */
-	size_t MinParams;
+	size_t min_params;
 
 	/* Module which owns us */
 	Module *module;
 
+protected:
 	/** Create a new command.
 	 * @param owner The owner of the command
 	 * @param sname The command name
@@ -81,20 +132,28 @@ class CoreExport Command : public Service, public Flags<CommandFlag>
 	 */
 	Command(Module *owner, const Anope::string &sname, size_t min_params, size_t max_params = 0);
 
-	virtual ~Command();
+public:
+	virtual ~Command() = default;
 
- protected:
+protected:
 	void SetDesc(const Anope::string &d);
 
 	void ClearSyntax();
-	void SetSyntax(const Anope::string &s);
-	void SendSyntax(CommandSource &);
-	void SendSyntax(CommandSource &, const Anope::string &syntax);
- public:
- 	/** Get the command description
+	void SetSyntax(const Anope::string &s, const std::function<bool(CommandSource&)> &p = nullptr);
+	virtual void SendSyntax(CommandSource &);
+
+	void AllowUnregistered(bool b);
+	void RequireUser(bool b);
+
+public:
+	inline bool AllowUnregistered() const { return this->allow_unregistered; }
+	inline bool RequireUser() const { return this->require_user; }
+
+	/** Get the command description
+	 * @param source The source wanting the command description
 	 * @return The commands description
 	 */
- 	const Anope::string &GetDesc() const;
+	virtual Anope::string GetDesc(CommandSource &source) const;
 
 	/** Execute this command.
 	 * @param source The source
@@ -102,10 +161,10 @@ class CoreExport Command : public Service, public Flags<CommandFlag>
 	 */
 	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);
+	virtual void OnServHelp(CommandSource &source, HelpWrapper &help);
 
 	/** Requested when the user is requesting help on this command. Help on this command should be sent to the user.
 	 * @param source The source
@@ -119,6 +178,21 @@ class CoreExport Command : public Service, public Flags<CommandFlag>
 	 * @param subcommand The subcommand the user tried to use
 	 */
 	virtual void OnSyntaxError(CommandSource &source, const Anope::string &subcommand);
-};
 
-#endif // COMMANDS_H
+	/** Runs a command
+	 * @param source The source of the command
+	 * @param message The full message to run, the command is at the beginning of the message
+	 */
+	static bool Run(CommandSource &source, const Anope::string &message);
+
+	bool Run(CommandSource &source, const Anope::string &, const CommandInfo &, std::vector<Anope::string> &params);
+
+	/** Looks up a command name from the service name.
+	 * 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 command name, eg REGISTER
+	 * @return true if the given command service exists
+	 */
+	static bool FindFromService(const Anope::string &command_service, BotInfo *&bi, Anope::string &name);
+};

include/config.h

@@ -1,657 +1,157 @@
-#ifndef CONFIG_H
-#define CONFIG_H
+// Anope IRC Services <https://www.anope.org/>
+//
+// Copyright (C) 2003-2026 Anope Contributors
+//
+// Anope is free software. You can use, modify, and/or distribute it under the
+// terms of version 2 of the GNU General Public License. See docs/LICENSE.txt
+// for the complete terms of this license and docs/AUTHORS.txt for a list of
+// contributors.
+//
+// Based on the original code of Epona by Lara
+// Based on the original code of Services by Andy Church
+//
+// SPDX-License-Identifier: GPL-2.0-only
 
-#include <string>
-#include <fstream>
-#include <sstream>
-#include <vector>
-#include <map>
-#include <deque>
+#pragma once
 
-#include "anope.h"
+#include "account.h"
+#include "regchannel.h"
+#include "users.h"
+#include "opertype.h"
+#include "miscutils.h"
 
-/** A configuration key and value pair
- */
-typedef std::pair<Anope::string, Anope::string> KeyVal;
-
-/** A list of related configuration keys and values
- */
-typedef std::vector<KeyVal> KeyValList;
-
-/** An entire config file, built up of KeyValLists
- */
-typedef std::multimap<Anope::string, KeyValList> ConfigDataHash;
-
-// Required forward definitions
-class ServerConfig;
-
-/** Types of data in the core config
- */
-enum ConfigDataType
+namespace Configuration
 {
-	DT_NOTHING, // No data
-	DT_INTEGER, // Integer
-	DT_UINTEGER, // Unsigned Integer
-	DT_LUINTEGER, // Long Unsigned Integer
-	DT_STRING, // Anope::string
-	DT_BOOLEAN, // Boolean
-	DT_HOSTNAME, // Hostname syntax
-	DT_NOSPACES, // No spaces
-	DT_IPADDRESS, // IP address (v4, v6)
-	DT_TIME, // Time value
-	DT_NORELOAD = 32, // Item can't be reloaded after startup
-	DT_ALLOW_WILD = 64, // Allow wildcards/CIDR in DT_IPADDRESS
-	DT_ALLOW_NEWLINE = 128, // New line characters allowed in DT_STRING
-	DT_ALLOW_EMPTY = 256 // Allow empty value
-};
-
-/** Holds a config value, either string, integer or boolean.
- * Callback functions receive one or more of these, either on
- * their own as a reference, or in a reference to a deque of them.
- * The callback function can then alter the values of the ValueItem
- * classes to validate the settings.
- */
-class CoreExport ValueItem
-{
- private:
-	/** Actual data */
-	Anope::string v;
- public:
- 	/** Initialize with nothing */
- 	ValueItem();
-	/** Initialize with an int */
-	ValueItem(int);
-	/** Initialize with a bool */
-	ValueItem(bool);
-	/** Initialize with an Anope::string */
-	ValueItem(const Anope::string &);
-	/** Initialize with a long */
-	ValueItem(long);
-	/** Change value to an Anope::string */
-	void Set(const Anope::string &);
-	/** Change value to an int */
-	void Set(int);
-	/** Get value as an int */
-	int GetInteger() const;
-	/** Get value as a string */
-	const char *GetString() const;
-	/** Get value as an Anope::string */
-	inline const Anope::string &GetValue() const { return v; }
-	/** Get value as a bool */
-	bool GetBool() const;
-};
-
-/** The base class of the container 'ValueContainer'
- * used internally by the core to hold core values.
- */
-class ValueContainerBase
-{
- public:
-	/** Constructor */
-	ValueContainerBase() { }
-	/** Destructor */
-	virtual ~ValueContainerBase() { }
-};
-
-/** ValueContainer is used to contain pointers to different
- * core values such as the server name, maximum number of
- * clients etc.
- * It is specialized to hold a data type, then pointed at
- * a value in the ServerConfig class. When the value has been
- * read and validated, the Set method is called to write the
- * value safely in a type-safe manner.
- */
-template<typename T> class ValueContainer : public ValueContainerBase
-{
- private:
-	/** Contained item */
-	T val;
- public:
-	/** Initialize with nothing */
-	ValueContainer() : ValueContainerBase(), val(NULL) { }
-	/** Initialize with a value of type T */
-	ValueContainer(T Val) : ValueContainerBase(), val(Val) { }
-	/** Initialize with a copy */
-	ValueContainer(const ValueContainer &Val) : ValueContainerBase(), val(Val.val) { }
-	ValueContainer &operator=(const ValueContainer &Val)
+	class CoreExport Block
 	{
-		val = Val.val;
-		return *this;
-	}
-	/** Change value to type T of size s */
-	void Set(const T newval, size_t s)
+		friend class Configuration::Conf;
+
+	public:
+		typedef Anope::map<Anope::string> ItemMap;
+		typedef Anope::multimap<Block> BlockMap;
+		typedef Anope::iterator_range<BlockMap::const_iterator> BlockList;
+
+	private:
+		Anope::string name;
+		ItemMap items;
+		BlockMap blocks;
+		unsigned linenum;
+
+		/* Represents a missing tag. */
+		static Block EmptyBlock;
+
+	public:
+		Block(const Anope::string &);
+		const Anope::string &GetName() const;
+		size_t CountBlock(const Anope::string &name) const;
+		BlockList GetBlocks(const Anope::string &name) const;
+		const Block &GetBlock(const Anope::string &name, size_t num = 0) const;
+		Block *GetMutableBlock(const Anope::string &name, size_t num = 0);
+
+		template<typename T> T Get(const Anope::string &tag, const Anope::string &def = "") const
+		{
+			return Anope::TryConvert<T>(this->Get<const Anope::string>(tag, def)).value_or(T());
+		}
+
+		bool Set(const Anope::string &tag, const Anope::string &value);
+		const ItemMap &GetItems() const;
+	};
+
+	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;
+
+	/** Represents a configuration file
+	 */
+	class File final
 	{
-		memcpy(val, newval, s);
-	}
-};
+		Anope::string name;
+		bool executable;
+		FILE *fp = nullptr;
+	public:
+		File(const Anope::string &, bool);
+		~File();
+		const Anope::string &GetName() const;
+		Anope::string GetPath() const;
 
-/** This a specific version of ValueContainer to handle Anope::string specially
- */
-template<> class ValueContainer<Anope::string *> : public ValueContainerBase
-{
- private:
-	/** Contained item */
-	Anope::string *val;
- public:
-	/** Initialize with nothing */
-	ValueContainer() : ValueContainerBase(), val(NULL) { }
-	/** Initialize with an std::string */
-	ValueContainer(Anope::string *Val) : ValueContainerBase(), val(Val) { }
-	/** Initialize with a copy */
-	ValueContainer(const ValueContainer &Val) : ValueContainerBase(), val(Val.val) { }
-	ValueContainer &operator=(const ValueContainer &Val)
+		bool IsOpen() const;
+		bool Open();
+		void Close();
+		bool End() const;
+		Anope::string Read();
+	};
+
+	struct Uplink;
+
+	class CoreExport Conf final
+		: public Block
 	{
-		val = Val.val;
-		return *this;
-	}
+	private:
+		/** Replaces defined variables within a string. */
+		Anope::string ReplaceVars(const Anope::string &str, const File &file, unsigned linenumber);
 
-	/** Change value to given Anope::string */
-	void Set(const Anope::string &newval)
+	public:
+		/* options:readtimeout */
+		time_t ReadTimeout;
+		/* If we should default to privmsging clients */
+		bool DefPrivmsg;
+		/* Default language */
+		Anope::string DefLanguage;
+		/* options:timeoutcheck */
+		time_t TimeoutCheck;
+		/* options:servicealias */
+		bool ServiceAlias;
+		/* networkinfo:nickchars */
+		Anope::string NickChars;
+
+		/* List of uplink servers to try and connect to */
+		std::vector<Uplink> Uplinks;
+		/* A vector of our logfile options */
+		std::vector<LogInfo> LogInfos;
+		/* Array of ulined servers */
+		std::vector<Anope::string> Ulines;
+		/* List of available opertypes */
+		std::vector<OperType *> MyOperTypes;
+		/* List of pairs of opers and their opertype from the config */
+		std::vector<Oper *> Opers;
+		/* Map of fantasy commands */
+		CommandInfo::map Fantasy;
+		/* Command groups */
+		std::vector<CommandGroup> CommandGroups;
+		/* List of modules to autoload */
+		std::vector<Anope::string> ModulesAutoLoad;
+
+		/* module configuration blocks */
+		std::map<Anope::string, Block *> modules;
+		Anope::map<Anope::string> bots;
+
+		Conf();
+		~Conf();
+
+		void LoadConf(File &file);
+		void Post(Conf *old);
+
+		Block &GetModule(const Module *);
+		Block &GetModule(const Anope::string &name);
+
+		BotInfo *GetClient(const Anope::string &name);
+
+		const Block &GetCommand(CommandSource &);
+	};
+
+	struct Uplink final
 	{
-		*val = newval;
-	}
-	/** Change value to given char pointer */
-	void Set(const char *newval)
-	{
-		*val = newval;
-	}
-};
+		Anope::string host;
+		unsigned port;
+		Anope::string password;
+		int protocol;
 
-/** A specialization of ValueContainer to hold a pointer to a bool
- */
-typedef ValueContainer<bool *> ValueContainerBool;
-
-/** A specialization of ValueContainer to hold a pointer to
- * an unsigned int
- */
-typedef ValueContainer<unsigned *> ValueContainerUInt;
-
-/** A specialization of ValueContainer to hold a pointer to
- * a long unsigned int
- */
-typedef ValueContainer<long unsigned *> ValueContainerLUInt;
-
-/** A specialization of ValueContainer to hold a pointer to
- * an int
- */
-typedef ValueContainer<int *> ValueContainerInt;
-
-/** A specialization of ValueContainer to hold a pointer to
- * a time_t
- */
-typedef ValueContainer<time_t *> ValueContainerTime;
-
-/** A specialization of ValueContainer to hold a pointer to
- * an Anope::string
- */
-typedef ValueContainer<Anope::string *> ValueContainerString;
-
-/** A set of ValueItems used by multi-value validator functions
- */
-typedef std::deque<ValueItem> ValueList;
-
-/** A callback for validating a single value
- */
-typedef bool (*Validator)(ServerConfig *, const Anope::string &, const Anope::string &, ValueItem &);
-/** A callback for validating multiple value entries
- */
-typedef bool (*MultiValidator)(ServerConfig *, const Anope::string &, const Anope::string *, ValueList &, int *);
-/** A callback indicating the end of a group of entries
- */
-typedef bool (*MultiNotify)(ServerConfig *, const Anope::string &);
-
-bool ValidateNotEmpty(ServerConfig *, const Anope::string &tag, const Anope::string &value, ValueItem &data);
-bool ValidateNotZero(ServerConfig *, const Anope::string &tag, const Anope::string &value, ValueItem &data);
-bool ValidateEmailReg(ServerConfig *config, const Anope::string &tag, const Anope::string &value, ValueItem &data);
-bool ValidatePort(ServerConfig *, const Anope::string &tag, const Anope::string &value, ValueItem &data);
-bool ValidateGuestPrefix(ServerConfig *conf, const Anope::string &tag, const Anope::string &value, ValueItem &data);
-bool ValidateBantype(ServerConfig *, const Anope::string &, const Anope::string &, ValueItem &data);
-bool ValidateChanServ(ServerConfig *config, const Anope::string &tag, const Anope::string &value, ValueItem &data);
-bool ValidateMemoServ(ServerConfig *config, const Anope::string &tag, const Anope::string &value, ValueItem &data);
-bool ValidateBotServ(ServerConfig *config, const Anope::string &tag, const Anope::string &value, ValueItem &data);
-bool ValidateHostServ(ServerConfig *config, const Anope::string &tag, const Anope::string &value, ValueItem &data);
-bool ValidateLimitSessions(ServerConfig *config, const Anope::string &tag, const Anope::string &value, ValueItem &data);
-bool ValidateOperServ(ServerConfig *config, const Anope::string &tag, const Anope::string &value, ValueItem &data);
-bool ValidateGlobal(ServerConfig *config, const Anope::string &tag, const Anope::string &value, ValueItem &data);
-bool ValidateNickLen(ServerConfig *, const Anope::string &, const Anope::string &, ValueItem &data);
-bool ValidateMail(ServerConfig *config, const Anope::string &tag, const Anope::string &value, ValueItem &data);
-bool ValidateGlobalOnCycle(ServerConfig *config, const Anope::string &tag, const Anope::string &value, ValueItem &data);
-
-/** Represents a configuration file
- */
-class ConfigurationFile
-{
-	Anope::string name;
-	bool executable;
-	FILE *fp;
- public:
-	ConfigurationFile(const Anope::string &, bool);
-	~ConfigurationFile();
-	const Anope::string &GetName() const;
-
-	bool IsOpen() const;
-	bool Open();
-	void Close();
-	bool End() const;
-	Anope::string Read();
-};
-
-/** Holds all of the core configuration items
- */
-class CoreExport ConfigItems
-{
- public:
-	/** Holds a core configuration item and its callbacks
-	 */
-	struct Item
-	{
-		/** Tag name */
-		Anope::string tag;
-		/** Value name */
-		Anope::string value;
-		/** Default, if not defined */
-		Anope::string default_value;
-		/** Value containers */
-		ValueContainerBase *val;
-		/** Data types */
-		int datatype;
-		/** Validation function */
-		Validator validation_function;
-	} *Values;
-
-	/** Holds a core configuration item and its callbacks
-	 * where there may be more than one item
-	 */
-	struct MultiItem
-	{
-		/** Tag name */
-		Anope::string tag;
-		/** One or more items within tag */
-		Anope::string items[17];
-		/** One or more defaults for items within tags */
-		Anope::string items_default[17];
-		/** One or more data types */
-		int datatype[17];
-		/** Initialization function */
-		MultiNotify init_function;
-		/** Validation function */
-		MultiValidator validation_function;
-		/** Completion function */
-		MultiNotify finish_function;
-	} *MultiValues;
-
-	ConfigItems(ServerConfig *conf);
-	~ConfigItems();
-};
-
-/** This class holds the bulk of the runtime configuration for Anope.
- * It allows for reading new config values, accessing configuration files,
- * and storage of the configuration data needed to run Anope.
- */
-class CoreExport ServerConfig
-{
- private:
-	/** Check that there is only one of each configuration item
-	 */
-	bool CheckOnce(const Anope::string &);
- public:
-	/** This holds all the information in the config file,
-	 * it's indexed by tag name to a vector of key/values.
-	 */
-	ConfigDataHash config_data;
-	/** Construct a new ServerConfig
-	 */
-	ServerConfig();
-
-	/** Read the entire configuration into memory
-	 * and initialize this class. All other methods
-	 * should be used only by the core.
-	 */
-	void Read();
-	/** Load the configuration file into 'this'. With the new config parser everything is parsed into
-	 * tag/key/value at load-time rather than at read-value time.
-	 */
-	void LoadConf(ConfigurationFile &file);
-	// Both these return true if the value existed or false otherwise
-	/** Writes 'length' chars into 'result' as a string
-	 */
-	bool ConfValue(ConfigDataHash &, const Anope::string &, const Anope::string &, int, Anope::string &, bool = false);
-	/** Writes 'length' chars into 'result' as a string
-	 */
-	bool ConfValue(ConfigDataHash &, const Anope::string &, const Anope::string &, const Anope::string &, int, Anope::string &, bool = false);
-	/** Tries to convert the value to an integer and write it to 'result'
-	 */
-	bool ConfValueInteger(ConfigDataHash &, const Anope::string &, const Anope::string &, int, int &);
-	/** Tries to convert the value to an integer and write it to 'result'
-	 */
-	bool ConfValueInteger(ConfigDataHash &, const Anope::string &, const Anope::string &, const Anope::string &, int, int &);
-	/** Returns true if the value exists and has a true value, false otherwise
-	 */
-	bool ConfValueBool(ConfigDataHash &, const Anope::string &, const Anope::string &, int);
-	/** Returns true if the value exists and has a true value, false otherwise
-	 */
-	bool ConfValueBool(ConfigDataHash &, const Anope::string &, const Anope::string &, const Anope::string &, int);
-	/** Returns the number of occurences of tag in the config file
-	 */
-	int ConfValueEnum(const ConfigDataHash &, const Anope::string &);
-	/** Returns the numbers of vars inside the index'th 'tag in the config file
-	 */
-	int ConfVarEnum(ConfigDataHash &, const Anope::string &, int);
-	void ValidateHostname(const Anope::string &, const Anope::string &, const Anope::string &) const;
-	void ValidateIP(const Anope::string &p, const Anope::string &, const Anope::string &, bool) const;
-	void ValidateNoSpaces(const Anope::string &, const Anope::string &, const Anope::string &) const;
-
-	/** Below here is a list of variables which contain the config files values
-	 */
-	/* Host to bind to */
-	Anope::string LocalHost;
-	/* List of uplink servers to try and connect to */
-	std::vector<Uplink *> Uplinks;
-
-	/* Our server name */
-	Anope::string ServerName;
-	/* Our servers description */
-	Anope::string ServerDesc;
-
-	/* Name of the network were on */
-	Anope::string NetworkName;
-	/* The max legnth of nicks */
-	unsigned NickLen;
-	/* Max length of idents */
-	unsigned UserLen;
-	/* Max lenght of hostnames */
-	unsigned HostLen;
-
-	/* Max length of passwords */
-	unsigned PassLen;
-
-	/* Filename for the PID file */
-	Anope::string PIDFilename;
-	/* MOTD filename */
-	Anope::string MOTDFilename;
-
-	Anope::string BotServ;
-	Anope::string ChanServ;
-	Anope::string Global;
-	Anope::string HostServ;
-	Anope::string NickServ;
-	Anope::string OperServ;
-	Anope::string MemoServ;
-
-	/* True if its ok to not be able to save backs */
-	bool NoBackupOkay;
-	/* Do password checking when new people register */
-	bool StrictPasswords;
-	/* How many times you're allowed to give a bad password before being killed */
-	unsigned BadPassLimit;
-	/* How long before bad passwords are forgotten */
-	time_t BadPassTimeout;
-	/* Delay between automatic database updates */
-	time_t UpdateTimeout;
-	/* Delay between checks for expired nicks and channels */
-	time_t ExpireTimeout;
-	/* How long to wait for something from the uplink, this is passed to select() */
-	time_t ReadTimeout;
-	/* How often to send program errors */
-	time_t WarningTimeout;
-	/* How long to process things such as timers to see if there is anything to calll */
-	time_t TimeoutCheck;
-	/* Number of days backups are kept */
-	int KeepBackups;
-	/* Forbidding requires a reason */
-	bool ForceForbidReason;
-	/* Services should use privmsgs instead of notices */
-	bool UsePrivmsg;
-	/* Services only respond to full PRIVMSG client@services.server.name messages */
-	bool UseStrictPrivMsg;
-	/* This is not a configurable option.
-	 * Config::Config will set it depending on the value of UseStrictPrivMsg */
-	Anope::string UseStrictPrivMsgString;
-	/* Number of seconds between consecutive uses of the REGISTER command
-	 * Not to be confused with NSRegDelay */
-	unsigned NickRegDelay;
-	/* Max number if news items allowed in the list */
-	unsigned NewsCount;
-	/* Default mlock modes */
-	Anope::string MLock;
-	/* Unmlockable modes */
-	Anope::string NoMLock;
-	/* Default botmodes on channels, defaults to ao */
-	Anope::string BotModes;
-	/* THe actual modes */
-	ChannelStatus BotModeList;
-	/* How long to wait between connection attempts */
-	int RetryWait;
-	/* If services should hide unprivileged commands */
-	bool HidePrivilegedCommands;
-	/* If set, nicks cant be owned/everything is entirely account based */
-	bool NoNicknameOwnership;
-
-	/* A vector of our logfile options */
-	std::vector<LogInfo *> LogInfos;
-
-	/* Services can use email */
-	bool UseMail;
-	/* Path to the sendmail executable */
-	Anope::string SendMailPath;
-	/* Address to send from */
-	Anope::string SendFrom;
-	/* Only opers can have services send mail */
-	bool RestrictMail;
-	/* Delay between sending mail */
-	time_t MailDelay;
-	/* Don't quote the To: address */
-	bool DontQuoteAddresses;
-	/* Mail messages to send */
-	Anope::string MailRegistrationSubject, MailRegistrationMessage;
-	Anope::string MailResetSubject, MailResetMessage;
-	Anope::string MailSendpassSubject, MailSendpassMessage;
-	Anope::string MailEmailchangeSubject, MailEmailchangeMessage;
-	Anope::string MailMemoSubject, MailMemoMessage;
-
-	/* Nameserver to use for resolving hostnames */
-	Anope::string NameServer;
-	/* TIme before a DNS query is considered dead */
-	time_t DNSTimeout;
-
-	/* Prefix of guest nicks when a user gets forced off of a nick */
-	Anope::string NSGuestNickPrefix;
-	/* Allow users to set kill immed on */
-	bool NSAllowKillImmed;
-	/* Don't allow nicks to use /ns group to regroup nicks */
-	bool NSNoGroupChange;
-	/* Default flags for newly registered nicks */
-	Flags<NickCoreFlag, NI_END> NSDefFlags;
-	/* All languages Anope is aware about */
-	Anope::string Languages;
-	/* Default language used by services */
-	Anope::string NSDefLanguage;
-	/* Users must be connected this long before they can register
-	 * Not to be confused with NickRegDelay */
-	time_t NSRegDelay;
-	/* Time before the registering mail will be resent */
-	time_t NSResendDelay;
-	/* How long before nicks expire */
-	time_t NSExpire;
-	/* How long before suspended nicks expire */
-	time_t NSSuspendExpire;
-	/* Time before unconfirmed nicks expire */
-	time_t NSUnconfirmedExpire;
-	/* Force email when registering */
-	bool NSForceEmail;
-	/* Force users to validate new email addresses */
-	bool NSConfirmEmailChanges;
-	/* Max number of nicks in a group */
-	unsigned NSMaxAliases;
-	/* Max number of allowed strings on the access list */
-	unsigned NSAccessMax;
-	/* Enforcer client user name */
-	Anope::string NSEnforcerUser;
-	/* Enforcer client hostname */
-	Anope::string NSEnforcerHost;
-	/* How long before recovered nicks are released */
-	time_t NSReleaseTimeout;
-	/* Max number of entries that can be returned from the list command */
-	unsigned NSListMax;
-	/* Only allow usermode +a etc on real services admins */
-	bool NSSecureAdmins;
-	/* Services opers must be /operd on the ircd aswell */
-	bool NSStrictPrivileges;
-	/* Use email to verify new users registering */
-	bool NSEmailReg;
-	/* Core NickServ modules */
-	Anope::string NickCoreModules;
-	/* Set the proper channel modes on users when they identify */
-	bool NSModeOnID;
-	/* Add the users hostnask their access list when they register */
-	bool NSAddAccessOnReg;
-	/* Maximum number of channels on AJoin */
-	unsigned AJoinMax;
-
-	/* Core ChanServ modules */
-	Anope::string ChanCoreModules;
-	/* Default flags for newly registered channels */
-	Flags<ChannelInfoFlag, CI_END> CSDefFlags;
-	/* Max number of channels a user can own */
-	unsigned CSMaxReg;
-	/* Time before a channel expires */
-	time_t CSExpire;
-	/* How long before suspended channels expire */
-	time_t CSSuspendExpire;
-	/* How long before forbidden channels expire */
-	time_t CSForbidExpire;
-	/* Default ban type to use for channels */
-	int CSDefBantype;
-	/* Max number of entries allowed on channel access lists */
-	unsigned CSAccessMax;
-	/* Max number of entries allowed on autokick lists */
-	unsigned CSAutokickMax;
-	/* Default autokick reason */
-	Anope::string CSAutokickReason;
-	/* Time ChanServ should stay in the channel to hold it to keep users from getting in */
-	time_t CSInhabit;
-	/* Max number of entries allowed to be returned from the LIST command */
-	unsigned CSListMax;
-	/* true to make ChanServ oper only */
-	bool CSOpersOnly;
-
-	/* Max number of memos allowed */
-	unsigned MSMaxMemos;
-	/* Time you must wait between sending memos */
-	time_t MSSendDelay;
-	/* Notify all of the aliases of the core the memo was sent to */
-	bool MSNotifyAll;
-	/* Who can use memos reciepts */
-	unsigned MSMemoReceipt;
-
-	/* Valid chars allowed in vhosts */
-	Anope::string VhostChars;
-	/* Allow undotted vhosts? */
-	bool VhostUndotted;
-	/* Chars disallowed at the beginning or end of vhosts */
-	Anope::string VhostDisallowBE;
-
-	/* Core BotServ modules */
-	Anope::string BotCoreModules;
-	/* Default BotServ flags */
-	Flags<BotServFlag> BSDefFlags;
-	/* How long before botserv forgets a user. This is used for flood kickers etc */
-	time_t BSKeepData;
-	/* Min number of users to have in the channel before the service bot joins */
-	unsigned BSMinUsers;
-	/* Max number of words allowed on the badwordslist */
-	unsigned BSBadWordsMax;
-	/* BotServ bot only joins if it would normally allowed to, abides by bans etc */
-	bool BSSmartJoin;
-	/* Dont tell users what badword they used */
-	bool BSGentleBWReason;
-	/* Case sensitive badwords matching */
-	bool BSCaseSensitive;
-	/* Char to use for the fantasy char, eg ! */
-	Anope::string BSFantasyCharacter;
-
-	/* Only show /stats o to opers */
-	bool HideStatsO;
-	/* Send out a global when services shut down or restart */
-	bool GlobalOnCycle;
-	/* Don't include the opers name in globals */
-	bool AnonymousGlobal;
-	/* Dont allow users to register nicks with oper names in them */
-	bool RestrictOperNicks;
-	/* Message to send when shutting down */
-	Anope::string GlobalOnCycleMessage;
-	/* Message to send when starting up */
-	Anope::string GlobalOnCycleUP;
-	/* Super admin is allowed */
-	bool SuperAdmin;
-	/* Default expiry time for akills */
-	time_t AutokillExpiry;
-	/* Default expiry time for chan kills */
-	time_t ChankillExpiry;
-	/* Default expiry time for SNLine Expire */
-	time_t SNLineExpiry;
-	/* Default expiry time for SQLines */
-	time_t SQLineExpiry;
-	/* Actually akill the user when the akill is added */
-	bool AkillOnAdd;
-	/* Kill users on SNLine */
-	bool KillonSNline;
-	/* Kill users on SQline */
-	bool KillonSQline;
-	/* Send a WALLOPS/GLOBOPS when a user opers */
-	bool WallOper;
-	/* Send a WALLOPS/GLOBOPS when a nonoper tries to use OperServ */
-	bool WallBadOS;
-	/* Send a WALLOPS/GLOBOPS when an akill expires */
-	bool WallAkillExpire;
-	/* Send a WALLOPS/GLOBOPS when SNLines expire */
-	bool WallSNLineExpire;
-	/* Send a WALLOPS/GLOBOPS when SQLines expire */
-	bool WallSQLineExpire;
-	/* Send a WALLOPS/GLOBOPS when exceptions expire */
-	bool WallExceptionExpire;
-	/* Add the akillers nick to the akill reason */
-	bool AddAkiller;
-	/* Add akill ids to akill reason */
-	bool AkillIds;
-
-	/* Limit sessions */
-	bool LimitSessions;
-	/* The default session limit */
-	unsigned DefSessionLimit;
-	/* How long before exceptions expire */
-	time_t ExceptionExpiry;
-	/* How many times to kill before adding an KILL */
-	unsigned MaxSessionKill;
-	/* Max limit that can be used for exceptions */
-	unsigned MaxSessionLimit;
-	/* How long session akills should last */
-	time_t SessionAutoKillExpiry;
-	/* Reason to use for session kills */
-	Anope::string SessionLimitExceeded;
-	/* Optional second reason */
-	Anope::string SessionLimitDetailsLoc;
-	/* OperServ requires you to be an operator */
-	bool OSOpersOnly;
-
-	/* List of modules to autoload */
-	std::list<Anope::string> ModulesAutoLoad;
-
-	/* User keys to use for generating random hashes for pass codes etc */
-	unsigned long UserKey1;
-	unsigned long UserKey2;
-	unsigned long UserKey3;
-
-	/* Numeric */
-	Anope::string Numeric;
-	/* Array of ulined servers */
-	std::list<Anope::string> Ulines;
-
-	/* List of available opertypes */
-	std::list<OperType *> MyOperTypes;
-	/* List of pairs of opers and their opertype from the config */
-	std::vector<Oper *> Opers;
-};
+		Uplink(const Anope::string &_host, int _port, const Anope::string &_password, int _protocol) : host(_host), port(_port), password(_password), protocol(_protocol) { }
+		inline bool operator==(const Uplink &other) const { return host == other.host && port == other.port && password == other.password && protocol == other.protocol; }
+		inline bool operator!=(const Uplink &other) const { return !(*this == other); }
+		Anope::string str() const;
+	};
+}
 
 /** This class can be used on its own to represent an exception, or derived to represent a module-specific exception.
  * When a module whishes to abort, e.g. within a constructor, it should throw an exception using ModuleException or
@@ -659,10 +159,11 @@ class CoreExport ServerConfig
  * be loaded. If this happens, the error message returned by ModuleException::GetReason will be displayed to the user
  * attempting to load the module, or dumped to the console if the ircd is currently loading for the first time.
  */
-class ConfigException : public CoreException
+class CoreExport ConfigException final
+	: public CoreException
 {
- public:
-	/** Default constructor, just uses the error mesage 'Config threw an exception'.
+public:
+	/** 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.
@@ -672,109 +173,8 @@ class ConfigException : public CoreException
 	 * Actually no, it does nothing. Never mind.
 	 * @throws Nothing!
 	 */
-	virtual ~ConfigException() throw() { }
+	virtual ~ConfigException() noexcept = default;
 };
 
-#define CONF_NO_ERROR 0x000000
-#define CONF_NOT_A_NUMBER 0x000010
-#define CONF_INT_NEGATIVE 0x000080
-#define CONF_VALUE_NOT_FOUND 0x000100
-#define CONF_FILE_NOT_FOUND 0x000200
-
-/** Allows reading of values from configuration files
- * This class allows a module to read from either the main configuration file (inspircd.conf) or from
- * a module-specified configuration file. It may either be instantiated with one parameter or none.
- * Constructing the class using one parameter allows you to specify a path to your own configuration
- * file, otherwise, inspircd.conf is read.
- */
-class CoreExport ConfigReader
-{
- protected:
-	/** True if an error occured reading the config file
-	 */
-	bool readerror;
-	/** Error code
-	 */
-	long error;
- public:
-	/** Default constructor.
-	 * This constructor initialises the ConfigReader class to read the configuration file(s).
-	 */
-	ConfigReader();
-	/** Overloaded constructor.
-	 * This constructor initialises the ConfigReader class to read a user-specified config file
-	 */
-	ConfigReader(const Anope::string &);
-	/** Default destructor.
-	 * This method destroys the ConfigReader class.
-	 */
-	~ConfigReader();
-	/** Retrieves a value from the config file.
-	 * This method retrieves a value from the config file. Where multiple copies of the tag
-	 * exist in the config file, index indicates which of the values to retrieve.
-	 */
-	Anope::string ReadValue(const Anope::string &, const Anope::string &, int, bool = false);
-	/** Retrieves a value from the config file.
-	 * This method retrieves a value from the config file. Where multiple copies of the tag
-	 * exist in the config file, index indicates which of the values to retrieve. If the
-	 * tag is not found the default value is returned instead.
-	 */
-	Anope::string ReadValue(const Anope::string &, const Anope::string &, const Anope::string &, int, bool = false);
-	/** Retrieves a boolean value from the config file.
-	 * This method retrieves a boolean value from the config file. Where multiple copies of the tag
-	 * exist in the config file, index indicates which of the values to retrieve. The values "1", "yes"
-	 * and "true" in the config file count as true to ReadFlag, and any other value counts as false.
-	 */
-	bool ReadFlag(const Anope::string &, const Anope::string &, int);
-	/** Retrieves a boolean value from the config file.
-	 * This method retrieves a boolean value from the config file. Where multiple copies of the tag
-	 * exist in the config file, index indicates which of the values to retrieve. The values "1", "yes"
-	 * and "true" in the config file count as true to ReadFlag, and any other value counts as false.
-	 * If the tag is not found, the default value is used instead.
-	 */
-	bool ReadFlag(const Anope::string &, const Anope::string &, const Anope::string &, int);
-	/** Retrieves an integer value from the config file.
-	 * This method retrieves an integer value from the config file. Where multiple copies of the tag
-	 * exist in the config file, index indicates which of the values to retrieve. Any invalid integer
-	 * values in the tag will cause the objects error value to be set, and any call to GetError() will
-	 * return CONF_INVALID_NUMBER to be returned. need_positive is set if the number must be non-negative.
-	 * If a negative number is placed into a tag which is specified positive, 0 will be returned and GetError()
-	 * will return CONF_INT_NEGATIVE. Note that need_positive is not suitable to get an unsigned int - you
-	 * should cast the result to achieve that effect.
-	 */
-	int ReadInteger(const Anope::string &, const Anope::string &, int, bool);
-	/** Retrieves an integer value from the config file.
-	 * This method retrieves an integer value from the config file. Where multiple copies of the tag
-	 * exist in the config file, index indicates which of the values to retrieve. Any invalid integer
-	 * values in the tag will cause the objects error value to be set, and any call to GetError() will
-	 * return CONF_INVALID_NUMBER to be returned. needs_unsigned is set if the number must be unsigned.
-	 * If a signed number is placed into a tag which is specified unsigned, 0 will be returned and GetError()
-	 * will return CONF_NOT_UNSIGNED. If the tag is not found, the default value is used instead.
-	 */
-	int ReadInteger(const Anope::string &, const Anope::string &, const Anope::string &, int, bool);
-	/** Returns the last error to occur.
-	 * Valid errors can be found by looking in modules.h. Any nonzero value indicates an error condition.
-	 * A call to GetError() resets the error flag back to 0.
-	 */
-	long GetError();
-	/** Counts the number of times a given tag appears in the config file.
-	 * This method counts the number of times a tag appears in a config file, for use where
-	 * there are several tags of the same kind, e.g. with opers and connect types. It can be
-	 * used with the index value of ConfigReader::ReadValue to loop through all copies of a
-	 * multiple instance tag.
-	 */
-	int Enumerate(const Anope::string &) const;
-	/** Returns true if a config file is valid.
-	 * This method is partially implemented and will only return false if the config
-	 * file does not exist or could not be opened.
-	 */
-	bool Verify();
-	/** Returns the number of items within a tag.
-	 * For example if the tag was &lt;test tag="blah" data="foo"&gt; then this
-	 * function would return 2. Spaces and newlines both qualify as valid seperators
-	 * between values.
-	 */
-	int EnumerateValues(const Anope::string &, int);
-};
-
-#endif // CONFIG_H
+extern Configuration::File ServicesConf;
+extern CoreExport Configuration::Conf *Config;

include/convert.h

@@ -0,0 +1,135 @@
+// Anope IRC Services <https://www.anope.org/>
+//
+// Copyright (C) 2003-2026 Anope Contributors
+//
+// Anope is free software. You can use, modify, and/or distribute it under the
+// terms of version 2 of the GNU General Public License. See docs/LICENSE.txt
+// for the complete terms of this license and docs/AUTHORS.txt for a list of
+// contributors.
+//
+// Based on the original code of Epona by Lara
+// Based on the original code of Services by Andy Church
+//
+// SPDX-License-Identifier: GPL-2.0-only
+
+#pragma once
+
+#include <optional>
+
+namespace Anope
+{
+	/** Attempts to convert a string to any type.
+	 * @param in The value to convert.
+	 * @param leftover If non-nullptr then the location to store leftover data.
+	 */
+	template<typename T>
+	inline std::optional<T> TryConvert(const Anope::string &in, Anope::string *leftover = nullptr)
+	{
+		std::istringstream tmp(in.str());
+		T out;
+		if (!(tmp >> out))
+			return std::nullopt;
+
+		if (leftover)
+		{
+			leftover->clear();
+			std::getline(tmp, leftover->str());
+		}
+		else
+		{
+			char extra;
+			if (tmp >> extra)
+				return std::nullopt;
+		}
+		return out;
+	}
+
+	/** Converts a string to any type.
+	 * @param in The value to convert.
+	 * @param def The default to use if the conversion failed.
+	 * @param leftover If non-nullptr then the location to store leftover data.
+	 */
+	template<typename T>
+	inline T Convert(const Anope::string &in, T def, Anope::string *leftover = nullptr)
+	{
+		return TryConvert<T>(in, leftover).value_or(def);
+	}
+
+	/** Attempts to convert any type to a string.
+	 * @param in The value to convert.
+	 */
+	template <class T>
+	inline std::optional<Anope::string> TryString(const T &in)
+	{
+		std::ostringstream tmp;
+		if (!(tmp << in))
+			return std::nullopt;
+		return tmp.str();
+	}
+
+	/** No-op function that returns the string that was passed to it.
+	 * @param in The string to return.
+	 */
+	inline const string &ToString(const string &in)
+	{
+		return in;
+	}
+
+	/** Converts a std::string to a string.
+	 * @param in The value to convert.
+	 */
+	inline string ToString(const std::string &in)
+	{
+		return in;
+	}
+
+	/** Converts a char array to a string.
+	 * @param in The value to convert.
+	 */
+	inline string ToString(const char *in)
+	{
+		return string(in);
+	}
+
+	/** Converts a char to a string.
+	 * @param in The value to convert.
+	 */
+	inline string ToString(char in)
+	{
+		return string(1, static_cast<string::value_type>(in));
+	}
+
+	/** Converts an unsigned char to a string.
+	 * @param in The value to convert.
+	 */
+	inline string ToString(unsigned char in)
+	{
+		return string(1, static_cast<string::value_type>(in));
+	}
+
+	/** Converts a bool to a string.
+	 * @param in The value to convert.
+	 */
+	inline string ToString(bool in)
+	{
+		return (in ? "1" : "0");
+	}
+
+	/** Converts a type that std::to_string is implemented for to a string.
+	 * @param in The value to convert.
+	 */
+	template<typename Stringable>
+	inline std::enable_if_t<std::is_arithmetic_v<Stringable>, string> ToString(const Stringable &in)
+	{
+		return std::to_string(in);
+	}
+
+	/** Converts any type to a string.
+	 * @param in The value to convert.
+	 */
+	template <class T>
+	inline std::enable_if_t<!std::is_arithmetic_v<T>, string> ToString(const T &in)
+	{
+		return TryString(in).value_or(Anope::string());
+	}
+}

include/defs.h

@@ -0,0 +1,58 @@
+// Anope IRC Services <https://www.anope.org/>
+//
+// Copyright (C) 2003-2026 Anope Contributors
+//
+// Anope is free software. You can use, modify, and/or distribute it under the
+// terms of version 2 of the GNU General Public License. See docs/LICENSE.txt
+// for the complete terms of this license and docs/AUTHORS.txt for a list of
+// contributors.
+//
+// Based on the original code of Epona by Lara
+// Based on the original code of Services by Andy Church
+//
+// SPDX-License-Identifier: GPL-2.0-only
+
+#pragma once
+
+class AccessGroup;
+class BotInfo;
+namespace BotServ { class BadWord; }
+class ChanAccess;
+class Channel;
+class ChannelInfo;
+class ChannelStatus;
+namespace ChanServ { class AutoKick; class ModeLock; }
+class ClientSocket;
+class Command;
+class CommandSource;
+namespace Configuration { class Conf; }
+class ConnectionSocket;
+namespace DNS { struct Query; }
+class Entry;
+class IdentifyRequest;
+class InfoFormatter;
+class IRCDProto;
+class ListenSocket;
+class Log;
+struct Membership;
+class Memo;
+struct MemoInfo;
+class MessageSource;
+struct ModeData;
+class Module;
+class NickAlias;
+class NickCore;
+namespace NickServ { struct Cert; }
+struct Oper;
+namespace OperServ { struct Exception; }
+class OperType;
+class ReferenceBase;
+class Regex;
+namespace SASL { struct Message; }
+class Serializable;
+class Server;
+class Socket;
+class Thread;
+class User;
+class XLine;
+class XLineManager;

include/dns.h

@@ -1,188 +0,0 @@
-#ifndef DNS_H
-#define DNS_H
-
-/** Valid query types
- */
-enum QueryType
-{
-	/* Nothing */
-	DNS_QUERY_NONE,
-	/* A simple A lookup */
-	DNS_QUERY_A = 1,
-	/* A CNAME lookup */
-	DNS_QUERY_CNAME = 5,
-	/* Reverse DNS lookup */
-	DNS_QUERY_PTR = 12,
-	/* IPv6 AAAA lookup */
-	DNS_QUERY_AAAA = 28
-};
-
-/** Flags that can be AND'd into DNSPacket::flags to receive certain values
- */
-enum
-{
-	DNS_QUERYFLAGS_QR = 0x8000,
-	DNS_QUERYFLAGS_OPCODE = 0x7800,
-	DNS_QUERYFLAGS_AA = 0x400,
-	DBS_QUERYFLAGS_TC = 0x200,
-	DNS_QUERYFLAGS_RD = 0x100,
-	DNS_QUERYFLAGS_RA = 0x80,
-	DNS_QUERYFLAGS_Z = 0x70,
-	DNS_QUERYFLAGS_RCODE = 0xF
-};
-
-enum DNSError
-{
-	DNS_ERROR_NONE,
-	DNS_ERROR_UNKNOWN,
-	DNS_ERROR_UNLOADED,
-	DNS_ERROR_TIMEOUT,
-	DNS_ERROR_NOT_AN_ANSWER,
-	DNS_ERROR_NONSTANDARD_QUERY,
-	DNS_ERROR_FORMAT_ERROR,
-	DNS_ERROR_SERVER_FAILURE,
-	DNS_ERROR_DOMAIN_NOT_FOUND,
-	DNS_ERROR_NOT_IMPLEMENTED,
-	DNS_ERROR_REFUSED,
-	DNS_ERROR_NO_RECORDS,
-	DNS_ERROR_INVALIDTYPE
-};
-
-class Module;
-struct DNSQuery;
-class DNSPacket;
-
-struct CoreExport Question
-{
-	Anope::string name;
-	QueryType type;
-	unsigned short qclass;
-
-	Question();
-	Question(const Anope::string &, QueryType, unsigned short = 1);
-};
-
-struct CoreExport ResourceRecord : public Question
-{
-	unsigned int ttl;
-	Anope::string rdata;
-	time_t created;
-
-	ResourceRecord(const Anope::string &, QueryType, unsigned short = 1);
-	ResourceRecord(const Question &);
-};
-
-struct CoreExport DNSQuery
-{
-	std::vector<Question> questions;
-	std::vector<ResourceRecord> answers, authorities, additional;
-	DNSError error;
-
-	DNSQuery();
-	DNSQuery(const Question &q);
-	DNSQuery(const DNSPacket &p);
-};
-
-/** The request
- */
-class CoreExport DNSRequest : public Timer, public Question
-{
-	/* Use result cache if available */
-	bool use_cache;
-
- public:
-	/* Request id */
- 	unsigned short id;
- 	/* Creator of this request */
-	Module *creator;
-
-	DNSRequest(const Anope::string &addr, QueryType qt, bool cache = false, Module *c = NULL);
-
-	virtual ~DNSRequest();
-
-	void Process();
-
-	virtual void OnLookupComplete(const DNSQuery *r) = 0;
-
-	virtual void OnError(const DNSQuery *r);
-	
-	void Tick(time_t);
-};
-
-/** A full packet sent or recieved to/from the nameserver, may contain multiple queries
- */
-class DNSPacket : public DNSQuery
-{
-	static const int DNS_POINTER = 0xC0;
-	static const int DNS_LABEL = 0x3F;
-
-	void PackName(unsigned char *output, unsigned short output_size, unsigned short &pos, const Anope::string &name);
-	Anope::string UnpackName(const unsigned char *input, unsigned short input_size, unsigned short &pos);
-	
-	Question UnpackQuestion(const unsigned char *input, unsigned short input_size, unsigned short &pos);
-	ResourceRecord UnpackResourceRecord(const unsigned char *input, unsigned short input_size, unsigned short &poss);
- public:
-	static const int HEADER_LENGTH = 12;
-
-	/* Our 16-bit id for this header */
-	unsigned short id;
-	/* Flags on the query */
-	unsigned short flags;
-
-	DNSPacket();
-	void Fill(const unsigned char *input, const unsigned short len);
-	unsigned short Pack(unsigned char *output, unsigned short output_size);
-};
-
-/** DNS manager, manages all requests
- */
-class CoreExport DNSManager : public Timer, public Socket
-{
-	typedef std::multimap<Anope::string, ResourceRecord, ci::less> cache_map;
-	cache_map cache;
-	sockaddrs addrs;
- public:
-	std::deque<DNSPacket *> packets;
-	std::map<short, DNSRequest *> requests;
-
-	static const int DNSPort = 53;
-
-	DNSManager(const Anope::string &nameserver, int port);
-
-	~DNSManager();
-
-	bool ProcessRead();
-
-	bool ProcessWrite();
-
-	/** Add a record to the dns cache
-	 * @param r The record
-	 */
-	void AddCache(DNSQuery &r);
-
-	/** Check the DNS cache to see if request can be handled by a cached result
-	 * @return true if a cached result was found.
-	 */
-	bool CheckCache(DNSRequest *request);
-
-	/** Tick this timer, used to clear the DNS cache.
-	 */
-	void Tick(time_t now);
-
-	/** Cleanup all pending DNS queries for a module
-	 * @param mod The module
-	 */
-	void Cleanup(Module *mod);
-
-	/** Does a BLOCKING DNS query and returns the first IP.
-	 * Only use this if you know what you are doing. Unless you specifically
-	 * need a blocking query use the DNSRequest system
-	 */
-	static DNSQuery BlockingQuery(const Anope::string &mask, QueryType qt);
-};
-
-extern DNSManager *DNSEngine;
-
-#endif // DNS_H
-
-

include/extensible.h

@@ -1,127 +1,270 @@
-/*
- * Copyright (C) 2008-2012 Anope Team <team@anope.org>
- *
- * Please read COPYING and README for further details.
- */
+// Anope IRC Services <https://www.anope.org/>
+//
+// Copyright (C) 2003-2026 Anope Contributors
+//
+// Anope is free software. You can use, modify, and/or distribute it under the
+// terms of version 2 of the GNU General Public License. See docs/LICENSE.txt
+// for the complete terms of this license and docs/AUTHORS.txt for a list of
+// contributors.
+//
+// Based on the original code of Epona by Lara
+// Based on the original code of Services by Andy Church
+//
+// SPDX-License-Identifier: GPL-2.0-only
 
-#ifndef EXTENSIBLE_H
-#define EXTENSIBLE_H
+#pragma once
 
 #include "anope.h"
-#include "hashcomp.h"
+#include "serialize.h"
+#include "service.h"
+#include "logger.h"
 
-class CoreExport ExtensibleItem
+class Extensible;
+
+class CoreExport ExtensibleBase
+	: public Service
 {
- public:
- 	ExtensibleItem();
-	virtual ~ExtensibleItem();
-	virtual void OnDelete();
+protected:
+	std::map<Extensible *, void *> items;
+
+	ExtensibleBase(Module *m, const Anope::string &n);
+	~ExtensibleBase();
+
+public:
+	virtual void Unset(Extensible *obj) = 0;
+
+	/* called when an object we are keep track of is serializing */
+	virtual void ExtensibleSerialize(const Extensible *, const Serializable *, Serialize::Data &) const { }
+	virtual void ExtensibleUnserialize(Extensible *, Serializable *, Serialize::Data &) { }
 };
 
-class ExtensibleString : public Anope::string, public ExtensibleItem
+class CoreExport Extensible
 {
- public:
-	ExtensibleString(const Anope::string &s) : Anope::string(s), ExtensibleItem() { }
+public:
+	std::set<ExtensibleBase *> extension_items;
+
+	virtual ~Extensible();
+
+	void UnsetExtensibles();
+
+	template<typename T> T *GetExt(const Anope::string &name) const;
+	bool HasExt(const Anope::string &name) const;
+
+	template<typename T> T *Extend(const Anope::string &name, const T &what);
+	template<typename T> T *Extend(const Anope::string &name);
+	template<typename T> T *Require(const Anope::string &name);
+	template<typename T> void Shrink(const Anope::string &name);
+
+	static void ExtensibleSerialize(const Extensible *, const Serializable *, Serialize::Data &data);
+	static void ExtensibleUnserialize(Extensible *, Serializable *, Serialize::Data &data);
 };
 
-class CoreExport Extensible : public Base
+template<typename T>
+class BaseExtensibleItem
+	: public ExtensibleBase
 {
- private:
- 	typedef Anope::map<ExtensibleItem *> extensible_map;
-	extensible_map extension_items;
+protected:
+	virtual T *Create(Extensible *) = 0;
 
- public:
-	/** Default constructor, does nothing
-	 */
-	Extensible() { }
+public:
+	BaseExtensibleItem(Module *m, const Anope::string &n) : ExtensibleBase(m, n) { }
 
-	/** Default destructor, deletes all of the extensible items in this object
-	 * then clears the map
-	 */
-	virtual ~Extensible()
+	~BaseExtensibleItem()
 	{
-		for (extensible_map::iterator it = extension_items.begin(), it_end = extension_items.end(); it != it_end; ++it)
-			if (it->second)
-				it->second->OnDelete();
-		extension_items.clear();
-	}
-
-	/** Extend an Extensible class.
-	 *
-	 * @param key The key parameter is an arbitary string which identifies the extension data
-	 * @param p This parameter is a pointer to an ExtensibleItem or ExtensibleItemBase derived class
-	 *
-	 * You must provide a key to store the data as via the parameter 'key'.
-	 * The data will be inserted into the map. If the data already exists, you may not insert it
-	 * twice, Extensible::Extend will return false in this case.
-	 *
-	 * @return Returns true on success, false if otherwise
-	 */
-	void Extend(const Anope::string &key, ExtensibleItem *p)
-	{
-		this->Shrink(key);
-		this->extension_items[key] = p;
-	}
-
-	/** Shrink an Extensible class.
-	 *
-	 * @param key The key parameter is an arbitary string which identifies the extension data
-	 *
-	 * You must provide a key name. The given key name will be removed from the classes data. If
-	 * you provide a nonexistent key (case is important) then the function will return false.
-	 * @return Returns true on success.
-	 */
-	bool Shrink(const Anope::string &key)
-	{
-		extensible_map::iterator it = this->extension_items.find(key);
-		if (it != this->extension_items.end())
+		while (!items.empty())
 		{
-			if (it->second != NULL)
-				it->second->OnDelete();
-			/* map::size_type map::erase( const key_type& key );
-			 * returns the number of elements removed, std::map
-			 * is single-associative so this should only be 0 or 1
-			 */
-			return this->extension_items.erase(key) > 0;
-		}
+			std::map<Extensible *, void *>::iterator it = items.begin();
+			Extensible *obj = it->first;
+			T *value = static_cast<T *>(it->second);
 
-		return false;
+			obj->extension_items.erase(this);
+			items.erase(it);
+			delete value;
+		}
 	}
 
-	/** Get an extension item.
-	 *
-	 * @param key The key parameter is an arbitary string which identifies the extension data
-	 * @return The item found
-	 */
-	template<typename T> T GetExt(const Anope::string &key)
+	T *Set(Extensible *obj, const T &value)
 	{
-		extensible_map::iterator it = this->extension_items.find(key);
-		if (it != this->extension_items.end())
-			return debug_cast<T>(it->second);
+		T *t = Set(obj);
+		if (t)
+			*t = value;
+		return t;
+	}
 
+	T *Set(Extensible *obj)
+	{
+		T *t = Create(obj);
+		Unset(obj);
+		items[obj] = t;
+		obj->extension_items.insert(this);
+		return t;
+	}
+
+	void Unset(Extensible *obj) override
+	{
+		T *value = Get(obj);
+		items.erase(obj);
+		obj->extension_items.erase(this);
+		delete value;
+	}
+
+	T *Get(const Extensible *obj) const
+	{
+		std::map<Extensible *, void *>::const_iterator it = items.find(const_cast<Extensible *>(obj));
+		if (it != items.end())
+			return static_cast<T *>(it->second);
 		return NULL;
 	}
 
-	/** Check if an extension item exists.
-	 *
-	 * @param key The key parameter is an arbitary string which identifies the extension data
-	 * @return True if the item was found.
-	 */
-	bool HasExt(const Anope::string &key)
+	bool HasExt(const Extensible *obj) const
 	{
-		return this->extension_items.count(key) > 0;
+		return items.find(const_cast<Extensible *>(obj)) != items.end();
 	}
 
-	/** Get a list of all extension items names.
-	 * @param list A deque of strings to receive the list
-	 * @return This function writes a list of all extension items stored
-	 *	 in this object by name into the given deque and returns void.
-	 */
-	void GetExtList(std::deque<Anope::string> &list)
+	T *Require(Extensible *obj)
 	{
-		for (extensible_map::iterator it = extension_items.begin(), it_end = extension_items.end(); it != it_end; ++it)
-			list.push_back(it->first);
+		T *t = Get(obj);
+		if (t)
+			return t;
+
+		return Set(obj);
 	}
 };
 
-#endif // EXTENSIBLE_H
+template<typename T>
+class ExtensibleItem
+	: public BaseExtensibleItem<T>
+{
+protected:
+	T *Create(Extensible *obj) override
+	{
+		return new T(obj);
+	}
+public:
+	ExtensibleItem(Module *m, const Anope::string &n) : BaseExtensibleItem<T>(m, n) { }
+};
+
+template<typename T>
+class PrimitiveExtensibleItem
+	: public BaseExtensibleItem<T>
+{
+protected:
+	T *Create(Extensible *obj) override
+	{
+		return new T();
+	}
+public:
+	PrimitiveExtensibleItem(Module *m, const Anope::string &n) : BaseExtensibleItem<T>(m, n) { }
+};
+
+template<>
+class PrimitiveExtensibleItem<bool> : public BaseExtensibleItem<bool>
+{
+protected:
+	bool *Create(Extensible *) override
+	{
+		return NULL;
+	}
+public:
+	PrimitiveExtensibleItem(Module *m, const Anope::string &n) : BaseExtensibleItem<bool>(m, n) { }
+};
+
+template<typename T>
+class SerializableExtensibleItem
+	: public PrimitiveExtensibleItem<T>
+{
+public:
+	SerializableExtensibleItem(Module *m, const Anope::string &n) : PrimitiveExtensibleItem<T>(m, n) { }
+
+	void ExtensibleSerialize(const Extensible *e, const Serializable *s, Serialize::Data &data) const override
+	{
+		T *t = this->Get(e);
+		data.Store(this->name, *t);
+	}
+
+	void ExtensibleUnserialize(Extensible *e, Serializable *s, Serialize::Data &data) override
+	{
+		T t;
+		if (data.TryLoad(this->name, t))
+			this->Set(e, t);
+		else
+			this->Unset(e);
+	}
+};
+
+template<>
+class SerializableExtensibleItem<bool> : public PrimitiveExtensibleItem<bool>
+{
+public:
+	SerializableExtensibleItem(Module *m, const Anope::string &n) : PrimitiveExtensibleItem<bool>(m, n) { }
+
+	void ExtensibleSerialize(const Extensible *e, const Serializable *s, Serialize::Data &data) const override
+	{
+		data.Store(this->name, this->HasExt(e));
+	}
+
+	void ExtensibleUnserialize(Extensible *e, Serializable *s, Serialize::Data &data) override
+	{
+		if (data.Load<bool>(this->name))
+			this->Set(e);
+		else
+			this->Unset(e);
+	}
+};
+
+template<typename T>
+struct ExtensibleRef final
+	: ServiceReference<BaseExtensibleItem<T> >
+{
+	ExtensibleRef(const Anope::string &n) : ServiceReference<BaseExtensibleItem<T> >("Extensible", n) { }
+};
+
+template<typename T>
+T *Extensible::GetExt(const Anope::string &name) const
+{
+	ExtensibleRef<T> ref(name);
+	if (ref)
+		return ref->Get(this);
+
+	Log(LOG_DEBUG) << "GetExt for nonexistent type " << name << " on " << static_cast<const void *>(this);
+	return NULL;
+}
+
+template<typename T>
+T *Extensible::Extend(const Anope::string &name, const T &what)
+{
+	T *t = Extend<T>(name);
+	if (t)
+		*t = what;
+	return t;
+}
+
+template<typename T>
+T *Extensible::Extend(const Anope::string &name)
+{
+	ExtensibleRef<T> ref(name);
+	if (ref)
+		return ref->Set(this);
+
+	Log(LOG_DEBUG) << "Extend for nonexistent type " << name << " on " << static_cast<void *>(this);
+	return NULL;
+}
+
+template<typename T>
+T *Extensible::Require(const Anope::string &name)
+{
+	if (HasExt(name))
+		return GetExt<T>(name);
+	else
+		return Extend<T>(name);
+}
+
+template<typename T>
+void Extensible::Shrink(const Anope::string &name)
+{
+	ExtensibleRef<T> ref(name);
+	if (ref)
+		ref->Unset(this);
+	else
+		Log(LOG_DEBUG) << "Shrink for nonexistent type " << name << " on " << static_cast<void *>(this);
+}

include/extern.h

@@ -1,241 +0,0 @@
-/* Prototypes and external variable declarations.
- *
- * (C) 2003-2012 Anope Team
- * Contact us at team@anope.org
- *
- * Please read COPYING and README for further details.
- *
- * Based on the original code of Epona by Lara.
- * Based on the original code of Services by Andy Church.
- */
-
-#ifndef EXTERN_H
-#define EXTERN_H
-
-#define E extern CoreExport
-#define EI extern DllExport
-
-#include "hashcomp.h"
-
-/* IRC Variables */
-
-E IRCDVar *ircd;
-E IRCDProto *ircdproto;
-E IRCdMessage *ircdmessage;
-
-/**** actions.c ****/
-
-E bool bad_password(User *u);
-E void common_unban(ChannelInfo *ci, User *u, bool full = false);
-
-/**** botserv.c ****/
-
-E BotInfo *findbot(const Anope::string &nick);
-
-E void bot_raw_ban(User *requester, ChannelInfo *ci, const Anope::string &nick, const Anope::string &reason);
-E void bot_raw_kick(User *requester, ChannelInfo *ci, const Anope::string &nick, const Anope::string &reason);
-
-/**** channels.c ****/
-
-
-E Channel *findchan(const Anope::string &chan);
-
-E User *nc_on_chan(Channel *c, const NickCore *nc);
-
-E void do_cmode(const Anope::string &source, const Anope::string &channel, const Anope::string &modes, const Anope::string &ts);
-E void do_join(const Anope::string &source, const Anope::string &channels, const Anope::string &ts);
-E void do_kick(const Anope::string &source, const Anope::string &channel, const Anope::string &users, const Anope::string &reason);
-E void do_part(const Anope::string &source, const Anope::string &channels, const Anope::string &reason);
-
-E void chan_set_correct_modes(User *user, Channel *c, int give_modes);
-
-/**** chanserv.c ****/
-
-E void check_modes(Channel *c);
-
-E ChannelInfo *cs_findchan(const Anope::string &chan);
-E bool IsFounder(User *user, ChannelInfo *ci);
-E void update_cs_lastseen(User *user, ChannelInfo *ci);
-E int get_idealban(ChannelInfo *ci, User *u, Anope::string &ret);
-
-/**** config.c ****/
-
-E ConfigurationFile services_conf;
-E ServerConfig *Config;
-
-/**** encrypt.c ****/
-E void enc_encrypt(const Anope::string &src, Anope::string &dest);
-E bool enc_decrypt(const Anope::string &src, Anope::string &dest);
-
-/**** hostserv.c  ****/
-
-/**** init.c ****/
-
-E void introduce_user(const Anope::string &user);
-E bool GetCommandLineArgument(const Anope::string &name, char shortname = 0);
-E bool GetCommandLineArgument(const Anope::string &name, char shortname, Anope::string &param);
-E bool AtTerm();
-E void Fork();
-E void Init(int ac, char **av);
-
-/**** ircd.c ****/
-E void pmodule_ircd_proto(IRCDProto *);
-E void pmodule_ircd_var(IRCDVar *ircdvar);
-E void pmodule_ircd_message(IRCdMessage *message);
-
-/**** language.cpp ****/
-E std::vector<Anope::string> languages;
-E std::vector<Anope::string> domains;
-E void InitLanguages();
-E const char *translate(const char *string);
-E const char *translate(User *u, const char *string);
-E const char *translate(NickCore *nc, const char *string);
-E const char *anope_gettext(const char *lang, const char *string);
-
-/**** main.c ****/
-
-E Anope::string services_dir;
-E Anope::string services_bin;
-E int debug;
-E bool readonly;
-E bool nofork;
-E bool nothird;
-E bool noexpire;
-E bool protocoldebug;
-
-E bool quitting;
-E int return_code;
-E bool restarting;
-E Anope::string quitmsg;
-E time_t start_time;
-
-class UplinkSocket : public ConnectionSocket, public BufferedSocket
-{
- public:
-	UplinkSocket();
-	~UplinkSocket();
-	bool Read(const Anope::string &);
-	void OnConnect();
-	void OnError(const Anope::string &);
-	
-	class CoreExport Message
-	{
-		Anope::string source;
-		std::stringstream buffer;
-	 public:
-	 	Message();
-	 	Message(const Anope::string &);
-	 	~Message();
-		template<typename T> Message &operator<<(const T &val)
-		{
-			this->buffer << val;
-			return *this;
-		}
-	};
-};
-E UplinkSocket *UplinkSock;
-E int CurrentUplink;
-
-E void save_databases();
-E void sighandler(int signum);
-
-/**** messages.cpp ****/
-
-E void init_core_messages();
-
-E bool OnStats(const Anope::string &source, const std::vector<Anope::string> &);
-E bool OnTime(const Anope::string &source, const std::vector<Anope::string> &);
-E bool OnVersion(const Anope::string &source, const std::vector<Anope::string> &);
-
-E bool On436(const Anope::string &, const std::vector<Anope::string> &);
-E bool OnAway(const Anope::string &, const std::vector<Anope::string> &);
-E bool OnJoin(const Anope::string &, const std::vector<Anope::string> &);
-E bool OnKick(const Anope::string &, const std::vector<Anope::string> &);
-E bool OnKill(const Anope::string &, const std::vector<Anope::string> &);
-E bool OnMode(const Anope::string &, const std::vector<Anope::string> &);
-E bool OnNick(const Anope::string &, const std::vector<Anope::string> &);
-E bool OnUID(const Anope::string &, const std::vector<Anope::string> &);
-E bool OnPart(const Anope::string &, const std::vector<Anope::string> &);
-E bool OnPing(const Anope::string &, const std::vector<Anope::string> &);
-E bool OnPrivmsg(const Anope::string &, const std::vector<Anope::string> &);
-E bool OnQuit(const Anope::string &, const std::vector<Anope::string> &);
-E bool OnServer(const Anope::string &, const std::vector<Anope::string> &);
-E bool OnSQuit(const Anope::string &, const std::vector<Anope::string> &);
-E bool OnTopic(const Anope::string &, const std::vector<Anope::string> &);
-E bool OnWhois(const Anope::string &, const std::vector<Anope::string> &);
-E bool OnCapab(const Anope::string &, const std::vector<Anope::string> &);
-E bool OnSJoin(const Anope::string &, const std::vector<Anope::string> &);
-E bool OnError(const Anope::string &, const std::vector<Anope::string> &);
-
-/**** misc.c ****/
-
-E bool IsFile(const Anope::string &filename);
-
-E time_t dotime(const Anope::string &s);
-E Anope::string duration(const time_t &seconds, NickCore *nc = NULL);
-E Anope::string expire_left(NickCore *nc, time_t expires);
-E Anope::string do_strftime(const time_t &t, NickCore *nc = NULL, bool short_output = false);
-E bool IsValidIdent(const Anope::string &ident);
-E bool IsValidHost(const Anope::string &host);
-
-E Anope::string myStrGetToken(const Anope::string &str, char dilim, int token_number);
-E Anope::string myStrGetTokenRemainder(const Anope::string &str, char dilim, int token_number);
-E int myNumToken(const Anope::string &str, char dilim);
-E bool nickIsServices(const Anope::string &nick, bool bot);
-
-E void add_entropy_userkeys();
-E void rand_init();
-E unsigned char getrandom8();
-E uint16_t getrandom16();
-E uint32_t getrandom32();
-
-E std::list<Anope::string> BuildStringList(const Anope::string &, char = ' ');
-E std::vector<Anope::string> BuildStringVector(const Anope::string &, char = ' ');
-
-E bool str_is_wildcard(const Anope::string &str);
-E bool str_is_pure_wildcard(const Anope::string &str);
-E Anope::string normalizeBuffer(const Anope::string &);
-
-/**** modes.cpp ****/
-/* Number of generic modes we support */
-E unsigned GenericChannelModes, GenericUserModes;
-E std::multimap<ChannelModeName, ModeLock> def_mode_locks;
-E void SetDefaultMLock(ServerConfig *config);
-
-/**** nickserv.c ****/
-
-E void change_core_display(NickCore *nc);
-E void change_core_display(NickCore *nc, const Anope::string &newdisplay);
-
-E NickAlias *findnick(const Anope::string &nick);
-E NickCore *findcore(const Anope::string &nick);
-E bool is_on_access(const User *u, const NickCore *nc);
-
-/**** process.c ****/
-
-E void process(const Anope::string &buf);
-
-/**** sockets.cpp ****/
-
-E int32_t TotalRead;
-E int32_t TotalWritten;
-E SocketIO normalSocketIO;
-
-/**** users.c ****/
-
-E int32_t opcnt;
-E uint32_t maxusercnt, usercnt;
-E time_t maxusertime;
-
-E User *finduser(const Anope::string &nick);
-
-E User *do_nick(const Anope::string &source, const Anope::string &nick, const Anope::string &username, const Anope::string &host, const Anope::string &server, const Anope::string &realname, time_t ts, const Anope::string &ip, const Anope::string &vhost, const Anope::string &uid, const Anope::string &modes);
-
-E void do_umode(const Anope::string &user, const Anope::string &modes);
-E void do_kill(User *user, const Anope::string &reason);
-
-E bool matches_list(Channel *c, User *user, ChannelModeName mode);
-
-E Anope::string create_mask(User *u);
-
-#endif /* EXTERN_H */

include/hashcomp.h

@@ -1,157 +1,85 @@
-/*
- * Copyright (C) 2002-2011 InspIRCd Development Team
- * Copyright (C) 2009-2012 Anope Team <team@anope.org>
- *
- * Please read COPYING and README for further details.
- *
- * These classes have been copied from InspIRCd and modified
- * for use in Anope.
- *
- *
- */
+// Anope IRC Services <https://www.anope.org/>
+//
+// Copyright (C) 2003-2026 Anope Contributors
+// Copyright (C) 2009-2011 InspIRCd Development Team
+//
+// Anope is free software. You can use, modify, and/or distribute it under the
+// terms of version 2 of the GNU General Public License. See docs/LICENSE.txt
+// for the complete terms of this license and docs/AUTHORS.txt for a list of
+// contributors.
+//
+// Based on the original code of Epona by Lara
+// Based on the original code of Services by Andy Church
+//
+// SPDX-License-Identifier: GPL-2.0-only
 
-#ifndef HASHCOMP_H
-#define HASHCOMP_H
-
-#ifdef _WIN32
-# ifdef MODULE_COMPILE
-#  define CoreExport __declspec(dllimport)
-#  define DllExport __declspec(dllexport)
-# else
-#  define CoreExport __declspec(dllexport)
-#  define DllExport __declspec(dllimport)
-# endif
-#else
-# define CoreExport
-# define DllExport
-#endif
+#pragma once
 
 #include <string>
+#include <locale>
+#include <unordered_map>
+
+#include "services.h"
 
 namespace Anope
 {
 	class string;
-}
 
-/*******************************************************
- * This file contains classes and templates that deal
- * with the comparison and hashing of 'irc strings'.
- * An 'irc string' is a string which compares in a
- * case insensitive manner, and as per RFC 1459 will
- * treat [ identical to {, ] identical to }, and \
- * as identical to |.
- *
- * Our hashing functions are designed  to accept
- * std::string and compare/hash them as type irc::string
- * by converting them internally. This makes them
- * backwards compatible with other code which is not
- * aware of irc::string.
- *******************************************************/
+	/* Casemap in use by Anope. ci::string's comparison functions use this (and thus Anope::string) */
+	extern std::locale casemap;
 
-/** A mapping of uppercase to lowercase, including scandinavian
- * 'oddities' as specified by RFC1459, e.g. { -> [, and | -> \
- */
-unsigned const char rfc_case_insensitive_map[256] = {
-	0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19,                                   /* 0-19 */
-	20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39,                         /* 20-39 */
-	40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59,                         /* 40-59 */
-	60, 61, 62, 63, 64, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,             /* 60-79 */
-	112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 94, 95, 96, 97, 98, 99,           /* 80-99 */
-	100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119,     /* 100-119 */
-	120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139,     /* 120-139 */
-	140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159,     /* 140-159 */
-	160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179,     /* 160-179 */
-	180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199,     /* 180-199 */
-	200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219,     /* 200-219 */
-	220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239,     /* 220-239 */
-	240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255                          /* 240-255 */
-};
+	extern CoreExport void CaseMapRebuild();
+	extern CoreExport unsigned char tolower(unsigned char);
+	extern CoreExport unsigned char toupper(unsigned char);
 
-/** Case insensitive map, ASCII rules.
- * That is;
- * [ != {, but A == a.
- */
-unsigned const char ascii_case_insensitive_map[256] = {
-	0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19,                                   /* 0-19 */
-	20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39,                         /* 20-39 */
-	40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59,                         /* 40-59 */
-	60, 61, 62, 63, 64, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,             /* 60-79 */
-	112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 91, 92, 93, 94, 95, 96, 97, 98, 99,              /* 80-99 */
-	100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119,     /* 100-119 */
-	120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139,     /* 120-139 */
-	140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159,     /* 140-159 */
-	160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179,     /* 160-179 */
-	180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199,     /* 180-199 */
-	200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219,     /* 200-219 */
-	220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239,     /* 220-239 */
-	240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255                          /* 240-255 */
-};
-
-/** The irc namespace contains a number of helper classes.
- */
-namespace irc
-{
-	/** The irc_char_traits class is used for RFC-style comparison of strings.
-	 * This class is used to implement irc::string, a case-insensitive, RFC-
-	 * comparing string class.
-	 */
-	struct irc_char_traits : std::char_traits<char>
+	/* ASCII case insensitive ctype. */
+	template<typename char_type>
+	class ascii_ctype
+		: public std::ctype<char_type>
 	{
-		/** Check if two chars match.
-		 * @param c1st First character
-		 * @param c2nd Second character
-		 * @return true if the characters are equal
-		 */
-		static bool eq(char c1st, char c2nd);
+	public:
+		char_type do_toupper(char_type c) const override
+		{
+			if (c >= 'a' && c <= 'z')
+				return c - 32;
+			else
+				return c;
+		}
 
-		/** Check if two chars do NOT match.
-		 * @param c1st First character
-		 * @param c2nd Second character
-		 * @return true if the characters are unequal
-		 */
-		static bool ne(char c1st, char c2nd);
-
-		/** Check if one char is less than another.
-		 * @param c1st First character
-		 * @param c2nd Second character
-		 * @return true if c1st is less than c2nd
-		 */
-		static bool lt(char c1st, char c2nd);
-
-		/** Compare two strings of size n.
-		 * @param str1 First string
-		 * @param str2 Second string
-		 * @param n Length to compare to
-		 * @return similar to strcmp, zero for equal, less than zero for str1
-		 * being less and greater than zero for str1 being greater than str2.
-		 */
-		static int compare(const char *str1, const char *str2, size_t n);
-
-		/** Find a char within a string up to position n.
-		 * @param s1 String to find in
-		 * @param n Position to search up to
-		 * @param c Character to search for
-		 * @return Pointer to the first occurance of c in s1
-		 */
-		static const char *find(const char *s1, int n, char c);
+		char_type do_tolower(char_type c) const override
+		{
+			if (c >= 'A' && c <= 'Z')
+				return c + 32;
+			else
+				return c;
+		}
 	};
 
-	/** This typedef declares irc::string based upon irc_char_traits.
-	 */
-	typedef std::basic_string<char, irc_char_traits, std::allocator<char> > string;
-
-	struct CoreExport less
+	/* rfc1459 case insensitive ctype, { = [, } = ], and | = \ */
+	template<typename char_type>
+	class rfc1459_ctype final
+		: public ascii_ctype<char_type>
 	{
-		/** Compare two Anope::strings as irc::strings and find which one is less
-		 * @param s1 The first string
-		 * @param s2 The second string
-		 * @return true if s1 < s2, else false
-		 */
-		bool operator()(const Anope::string &s1, const Anope::string &s2) const;
+	public:
+		char_type do_toupper(char_type c) const override
+		{
+			if (c == '{' || c == '}' || c == '|')
+				return c - 32;
+			else
+				return ascii_ctype<char_type>::do_toupper(c);
+		}
+
+		char_type do_tolower(char_type c) const override
+		{
+			if (c == '[' || c == ']' || c == '\\')
+				return c + 32;
+			else
+				return ascii_ctype<char_type>::do_tolower(c);
+		}
 	};
 }
 
-/** The ci namespace contains a number of helper classes.
+/** The ci namespace contains a number of helper classes relevant to case insensitive strings.
  */
 namespace ci
 {
@@ -159,7 +87,8 @@ namespace ci
 	 * This class is used to implement ci::string, a case-insensitive, ASCII-
 	 * comparing string class.
 	 */
-	struct CoreExport ci_char_traits : std::char_traits<char>
+	struct CoreExport ci_char_traits final
+		: std::char_traits<char>
 	{
 		/** Check if two chars match.
 		 * @param c1st First character
@@ -195,7 +124,7 @@ namespace ci
 		 * @param s1 String to find in
 		 * @param n Position to search up to
 		 * @param c Character to search for
-		 * @return Pointer to the first occurance of c in s1
+		 * @return Pointer to the first occurrence of c in s1
 		 */
 		static const char *find(const char *s1, int n, char c);
 	};
@@ -204,7 +133,7 @@ namespace ci
 	 */
 	typedef std::basic_string<char, ci_char_traits, std::allocator<char> > string;
 
-	struct CoreExport less
+	struct CoreExport less final
 	{
 		/** Compare two Anope::strings as ci::strings and find which one is less
 		 * @param s1 The first string
@@ -215,26 +144,6 @@ namespace ci
 	};
 }
 
-/* Define operators for + and == with irc::string to std::string for easy assignment
- * and comparison
- *
- * Operator +
- */
-inline std::string operator+(std::string &leftval, irc::string &rightval)
-{
-	return leftval + std::string(rightval.c_str());
-}
-
-/* Define operators for + and == with irc::string to std::string for easy assignment
- * and comparison
- *
- * Operator +
- */
-inline irc::string operator+(irc::string &leftval, std::string &rightval)
-{
-	return leftval + irc::string(rightval.c_str());
-}
-
 /* Define operators for + and == with ci::string to std::string for easy assignment
  * and comparison
  *
@@ -255,46 +164,6 @@ inline ci::string operator+(ci::string &leftval, std::string &rightval)
 	return leftval + ci::string(rightval.c_str());
 }
 
-/* Define operators for + and == with irc::string to ci::string for easy assignment
- * and comparison
- *
- * Operator +
- */
-inline irc::string operator+(irc::string &leftval, ci::string &rightval)
-{
-	return leftval + irc::string(rightval.c_str());
-}
-
-/* Define operators for + and == with irc::string to ci::string for easy assignment
- * and comparison
- *
- * Operator +
- */
-inline ci::string operator+(ci::string &leftval, irc::string &rightval)
-{
-	return leftval + ci::string(rightval.c_str());
-}
-
-/* Define operators for + and == with irc::string to std::string for easy assignment
- * and comparison
- *
- * Operator ==
- */
-inline bool operator==(const std::string &leftval, const irc::string &rightval)
-{
-	return leftval.c_str() == rightval;
-}
-
-/* Define operators for + and == with irc::string to std::string for easy assignment
- * and comparison
- *
- * Operator ==
- */
-inline bool operator==(const irc::string &leftval, const std::string &rightval)
-{
-	return leftval == rightval.c_str();
-}
-
 /* Define operators for + and == with ci::string to std::string for easy assignment
  * and comparison
  *
@@ -315,40 +184,6 @@ inline bool operator==(const ci::string &leftval, const std::string &rightval)
 	return leftval == rightval.c_str();
 }
 
-/* Define operators for + and == with irc::string to ci::string for easy assignment
- * and comparison
- *
- * Operator ==
- */
-inline bool operator==(const ci::string &leftval, const irc::string &rightval)
-{
-	return leftval.c_str() == rightval;
-}
-
-/* Define operators for + and == with irc::string to ci::string for easy assignment
- * and comparison
- *
- * Operator ==
- */
-inline bool operator==(const irc::string &leftval, const ci::string &rightval)
-{
-	return leftval == rightval.c_str();
-}
-
-/* Define operators != for irc::string to std::string for easy comparison
- */
-inline bool operator!=(const irc::string &leftval, const std::string &rightval)
-{
-	return !(leftval == rightval.c_str());
-}
-
-/* Define operators != for std::string to irc::string for easy comparison
- */
-inline bool operator!=(const std::string &leftval, const irc::string &rightval)
-{
-	return !(leftval.c_str() == rightval);
-}
-
 /* Define operators != for ci::string to std::string for easy comparison
  */
 inline bool operator!=(const ci::string &leftval, const std::string &rightval)
@@ -356,25 +191,9 @@ inline bool operator!=(const ci::string &leftval, const std::string &rightval)
 	return !(leftval == rightval.c_str());
 }
 
-/* Define operators != for ci::string to irc::string for easy comparison
+/* Define operators != for std::string to ci::string for easy comparison
  */
 inline bool operator!=(const std::string &leftval, const ci::string &rightval)
 {
 	return !(leftval.c_str() == rightval);
 }
-
-/* Define operators != for irc::string to ci::string for easy comparison
- */
-inline bool operator!=(const irc::string &leftval, const ci::string &rightval)
-{
-	return !(leftval == rightval.c_str());
-}
-
-/* Define operators != for irc::string to ci::string for easy comparison
- */
-inline bool operator!=(const ci::string &leftval, const irc::string &rightval)
-{
-	return !(leftval.c_str() == rightval);
-}
-
-#endif // HASHCOMP_H

include/language.h

@@ -1,85 +1,180 @@
-/* Commonly used language strings
- *
- * (C) 2008-2012 Anope Team
- * Contact us at team@anope.org
- *
- * Please read COPYING and README for further details.
- */
+// Anope IRC Services <https://www.anope.org/>
+//
+// Copyright (C) 2003-2026 Anope Contributors
+//
+// Anope is free software. You can use, modify, and/or distribute it under the
+// terms of version 2 of the GNU General Public License. See docs/LICENSE.txt
+// for the complete terms of this license and docs/AUTHORS.txt for a list of
+// contributors.
+//
+// Based on the original code of Epona by Lara
+// Based on the original code of Services by Andy Church
+//
+// SPDX-License-Identifier: GPL-2.0-only
 
-#define MORE_INFO			_("\002%s%s HELP %s\002 for more information.")
-#define BAD_USERHOST_MASK		_("Mask must be in the form \037user\037@\037host\037.")
-#define BAD_EXPIRY_TIME			_("Invalid expiry time.")
-#define USERHOST_MASK_TOO_WIDE		_("%s coverage is too wide; Please use a more specific mask.")
-#define READ_ONLY_MODE			_("Services are in read-only mode!")
-#define PASSWORD_INCORRECT		_("Password incorrect.")
-#define ACCESS_DENIED			_("Access denied.")
-#define MORE_OBSCURE_PASSWORD		_("Please try again with a more obscure password. Passwords should be at least\n" \
-						"five characters long, should not be something easily guessed\n" \
-						"(e.g. your real name or your nick), and cannot contain the space or tab characters.")
-#define PASSWORD_TOO_LONG		_("Your password is too long. Please try again with a shorter password.")
-#define NICK_NOT_REGISTERED		_("Your nick isn't registered.")
-#define NICK_X_NOT_REGISTERED		_("Nick \002%s\002 isn't registered.")
-#define NICK_X_NOT_IN_USE		_("Nick \002%s\002 isn't currently in use.")
-#define NICK_X_NOT_ON_CHAN		_("\002%s\002 is not currently on channel %s.")
-#define NICK_X_SUSPENDED		_("Nick %s is currently suspended.")
-#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 MAIL_X_INVALID			_("\002%s\002 is not a valid e-mail address.")
-#define NO_REASON			_("No reason")
-#define UNKNOWN				_("<unknown>")
-#define NO_EXPIRE			_("does not expire")
-#define LIST_INCORRECT_RANGE		_("Incorrect range specified. The correct syntax is \002#\037from\037-\037to\037\002.")
-#define UNKNOWN_OPTION			_("Unknown option \002%s\002.\n" \
-						"Type %s%s HELP %s for more information.")
-#define NICK_IS_REGISTERED		_("This nick is owned by someone else.  Please choose another.\n" \
-						"(If this is your nick, type \002%s%s IDENTIFY \037password\037\002.)")
-#define NICK_IS_SECURE			_("This nickname is registered and protected.  If it is your\n" \
-						"nick, type \002%s%s IDENTIFY \037password\037\002.  Otherwise,\n" \
-						"please choose a different nick.")
-#define FORCENICKCHANGE_NOW		_("This nickname has been registered; you may not use it.")
-#define NICK_CANNOT_BE_REGISTERED	_("Nickname \002%s\002 may not be registered.")
-#define NICK_ALREADY_REGISTERED		_("Nickname \002%s\002 is already registered!")
-#define NICK_SET_SYNTAX			_("SET \037option\037 \037parameters\037")
-#define NICK_SET_DISABLED		_("Sorry, nickname option setting is temporarily disabled.")
-#define NICK_SET_UNKNOWN_OPTION		_("Unknown SET option \002%s%s\002.")
-#define NICK_SET_DISPLAY_CHANGED	_("The new display is now \002%s\002.")
-#define NICK_LIST_SYNTAX		_("LIST \037pattern\037")
-#define NICK_RECOVERED			_("User claiming your nick has been killed.\n" \
-						"\002%s%s RELEASE %s\002 to get it back before %s timeout.")
-#define NICK_REQUESTED			_("This nick has already been requested, please check your e-mail address for the pass code")
-#define NICK_CONFIRM_INVALID		_("Invalid passcode has been entered, please check the e-mail again, and retry")
-#define CHAN_NOT_ALLOWED_TO_JOIN	_("You are not permitted to be on this channel.")
-#define CHAN_X_INVALID			_("Channel %s is not a valid channel.")
-#define CHAN_REACHED_CHANNEL_LIMIT	_("Sorry, you have already reached your limit of \002%d\002 channels.")
-#define CHAN_EXCEEDED_CHANNEL_LIMIT	_("Sorry, you have already exceeded your limit of \002%d\002 channels.")
-#define CHAN_SYMBOL_REQUIRED		_("Please use the symbol of \002#\002 when attempting to register")
-#define CHAN_SET_DISABLED		_("Sorry, channel option setting is temporarily disabled.")
-#define CHAN_SETTING_CHANGED		_("%s for %s set to %s.")
-#define CHAN_SETTING_UNSET		_("%s for %s unset.")
-#define CHAN_SET_MLOCK_DEPRECATED	_("MLOCK is deprecated. Use \002%s%s HELP MODE\002 instead.")
-#define CHAN_ACCESS_LEVEL_RANGE		_("Access level must be between %d and %d inclusive.")
-#define CHAN_INFO_HEADER		_("Information for channel \002%s\002:")
-#define CHAN_EXCEPTED			_("\002%s\002 matches an except on %s and cannot be banned until the except have been removed.")
-#define MEMO_NEW_X_MEMO_ARRIVED		_("There is a new memo on channel %s.\n" \
-						"Type \002%s%s READ %s %d\002 to read it.")
-#define MEMO_NEW_MEMO_ARRIVED		_("You have a new memo from %s.\n" \
-						"Type \002%s%s READ %d\002 to read it.")
-#define MEMO_HAVE_NO_MEMOS		_("You have no memos.")
-#define MEMO_X_HAS_NO_MEMOS		_("%s has no memos.")
-#define MEMO_SEND_SYNTAX		_("SEND {\037nick\037 | \037channel\037} \037memo-text\037")
-#define MEMO_SEND_DISABLED		_("Sorry, memo sending is temporarily disabled.")
-#define MEMO_HAVE_NO_NEW_MEMOS		_("You have no new memos.")
-#define MEMO_X_HAS_NO_NEW_MEMOS		_("%s has no new memos.")
-#define BOT_DOES_NOT_EXIST		_("Bot \002%s\002 does not exist.")
-#define BOT_NOT_ASSIGNED		_("You must assign a bot to the channel before using this command.")
-#define BOT_NOT_ON_CHANNEL		_("Bot is not on channel \002%s\002.")
-#define BOT_ASSIGN_READONLY		_("Sorry, bot assignment is temporarily disabled.")
-#define HOST_SET_ERROR			_("A vhost must be in the format of a valid hostmask.")
-#define HOST_SET_IDENT_ERROR		_("A vhost ident must be in the format of a valid ident")
-#define HOST_SET_TOOLONG		_("Error! The vhost is too long, please use a host shorter than %d characters.")
-#define HOST_SET_IDENTTOOLONG		_("Error! The Ident is too long, please use an ident shorter than %d characters.")
-#define HOST_NOT_ASSIGNED		_("Please contact an Operator to get a vhost assigned to this nick.")
-#define HOST_NO_VIDENT			_("Your IRCD does not support vIdent's, if this is incorrect, please report this as a possible bug")
+#pragma once
 
+#include "anope.h"
+
+namespace Language
+{
+
+	/* Languages we support as configured in anope.conf. They are
+	 * added to this list if we detect a language exists in the correct
+	 * location for each language.
+	 */
+	extern CoreExport std::vector<Anope::string> Languages;
+
+	/* Domains to search when looking for translations other than the
+	 * default "anope domain. This is used by modules who add their own
+	 * language files (and thus domains) to Anope. If a module is loaded
+	 * and we detect a language file exists for at least one of the supported
+	 * languages for the module, then we add the module's domain (its name)
+	 * here.
+	 *
+	 * When strings are translated they are checked against all domains.
+	 */
+	extern std::vector<Anope::string> Domains;
+
+	/** Initialize the language system. Finds valid language files and
+	 * populates the Languages list.
+	 */
+	extern void InitLanguages();
+
+	/** Sets the locale to the specified language.
+	 * @param lang The language to translate to.
+	 */
+	extern CoreExport void SetLocale(const char *lang);
+
+	/** Sets the locale back to the default. */
+	extern CoreExport void ResetLocale();
+
+	/** Translates a string to the default language.
+	 * @param string A string to translate
+	 * @return The translated string if found, else the original string.
+	 */
+	extern CoreExport const char *Translate(const char *string);
+
+	/** Translates a string to the language of the given user.
+	 * @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.
+	 */
+	extern CoreExport const char *Translate(User *u, const char *string);
+
+	/** Translates a string to the language of the given account.
+	 * @param nc The account to translate the string for
+	 * @param string A string to translate
+	 * @return The translated string if count, else the original string
+	 */
+	extern CoreExport const char *Translate(const NickCore *nc, const char *string);
+
+	/** Translates a string to the given language.
+	 * @param lang The language to translate to
+	 * @param string The string to translate
+	 * @return The translated string if found, else the original string.
+	 */
+	extern CoreExport const char *Translate(const char *lang, const char *string);
+
+	/** Translates a plural string to the default language.
+	 * @param count The number of items the string is counting.
+	 * @param singular The string to translate if there is one of \p count
+	 * @param plural The string to translate if there is multiple of \p count
+	 * @return The translated string if found, else the original string.
+	 */
+	extern CoreExport const char *Translate(int count, const char *singular, const char *plural);
+
+	/** Translates a plural string to the language of the given user.
+	 * @param u The user to translate the string for
+	 * @param count The number of items the string is counting.
+	 * @param singular The string to translate if there is one of \p count
+	 * @param plural The string to translate if there is multiple of \p count
+	 * @return The translated string if found, else the original string.
+	 */
+	extern CoreExport const char *Translate(User *u, int count, const char *singular, const char *plural);
+
+	/** Translates a plural string to the language of the given account.
+	 * @param nc The account to translate the string for
+	 * @param count The number of items the string is counting.
+	 * @param singular The string to translate if there is one of \p count
+	 * @param plural The string to translate if there is multiple of \p count
+	 * @return The translated string if count, else the original string
+	 */
+	extern CoreExport const char *Translate(const NickCore *nc, int count, const char *singular, const char *plural);
+
+	/** Translates a plural string to the given language.
+	 * @param lang The language to translate to
+	 * @param count The number of items the string is counting.
+	 * @param singular The string to translate if there is one of \p count
+	 * @param plural The string to translate if there is multiple of \p count
+	 * @return The translated string if found, else the original string.
+	 */
+	extern CoreExport const char *Translate(const char *lang, int count, const char *singular, const char *plural);
+
+} // namespace Language
+
+/* Commonly used language strings */
+#define ACCESS_DENIED                _("Access denied.")
+#define BAD_EXPIRY_TIME              _("Invalid expiry time.")
+#define BAD_USERHOST_MASK            _("Mask must be in the form \037user\037@\037host\037.")
+#define CONFIRM_DROP                 _("Please confirm that you want to drop \002%s\002 with \002%s\033%s\033%s\002")
+#define CONFIRM_REGISTER_ADMIN       _("All new accounts must be confirmed by an administrator. Please wait for your registration to be confirmed.")
+#define CONFIRM_REGISTER_CODE        _("All new accounts must be confirmed. To confirm your account, type \002%s\002.")
+#define CONFIRM_REGISTER_MAIL        _("All new accounts must be confirmed. To confirm your account, follow the instructions that were emailed to you.")
+#define LIST_INCORRECT_RANGE         _("Incorrect range specified. The correct syntax is \002#\037from\037-\037to\037\002.")
+#define MAIL_X_INVALID               _("\002%s\002 is not a valid email address.")
+#define MORE_INFO                    _("Type \002%s\002 for more information.")
+#define NO_EXPIRE                    _("does not expire")
+#define PASSWORD_INCORRECT           _("Password incorrect.")
+#define READ_ONLY_MODE               _("Services are temporarily in read-only mode.")
+#define TIME_NEVER                   _("Never")
+#define TIME_NOW                     _("Now")
+#define TIME_UNKNOWN                 _("Unknown")
+#define TRY_AGAIN_LATER              _("The \002%s\002 command is temporarily unavailable. Please try again later.")
+#define USERHOST_MASK_TOO_WIDE       _("%s coverage is too wide; Please use a more specific mask.")
+
+#define BOT_DOES_NOT_EXIST           _("Bot \002%s\002 does not exist.")
+#define BOT_NOT_ASSIGNED             _("You must assign a bot to the channel before using this command.")
+#define BOT_NOT_ON_CHANNEL           _("Bot is not on channel \002%s\002.")
+
+#define CHAN_ACCESS_LIMIT           N_("You can only have %u access entry on a channel.", "You can only have %u access entries on a channel.")
+#define CHAN_ACCESS_LIMIT_DEEP      N_("You can only have %u access entry on a channel, including access entries from other channels.", "You can only have %u access entries on a channel, including access entries from other channels.")
+#define CHAN_ACCESS_LEVEL_RANGE      _("Access level must be between %d and %d inclusive.")
+#define CHAN_ACCESS_MALFORMED        _("You cannot add a malformed mask to an access list. Did you mean to add %s instead?")
+#define CHAN_ACCESS_FOREIGN         N_("%u access entry from other access systems not shown; use \002%s\033ALL\002 to view all access entries.", "%u access entries from other access systems not shown; use \002%s\033ALL\002 to view all access entries.")
+#define CHAN_EXCEPTED                _("\002%s\002 matches an except on %s and cannot be banned until the except has been removed.")
+#define CHAN_INFO_HEADER             _("Information about channel \002%s\002:")
+#define CHAN_LIMIT_EXCEEDED          _("You have already exceeded your limit of \002%d\002 channels.")
+#define CHAN_LIMIT_REACHED           _("You have already reached your limit of \002%d\002 channels.")
+#define CHAN_NOT_ALLOWED_TO_JOIN     _("You are not permitted to be on this channel.")
+#define CHAN_SETTING_CHANGED         _("%s for %s set to %s.")
+#define CHAN_SETTING_INVALID         _("%s syntax is invalid.")
+#define CHAN_SETTING_UNSET           _("%s for %s unset.")
+#define CHAN_SYMBOL_REQUIRED         _("Please use the symbol of \002#\002 when attempting to register.")
+#define CHAN_X_INVALID               _("Channel %s is not a valid channel.")
+#define CHAN_X_NOT_IN_USE            _("Channel \002%s\002 doesn't exist.")
+#define CHAN_X_NOT_REGISTERED        _("Channel \002%s\002 isn't registered.")
+#define CHAN_X_SUSPENDED             _("Channel %s is currently suspended.")
+
+#define HOST_NO_VIDENT               _("Your IRCd does not support vidents. If this is incorrect please report this as a possible bug.")
+#define HOST_NOT_ASSIGNED            _("Please contact an Operator to get a vhost assigned to this nick.")
+#define HOST_SET_VHOST_ERROR         _("A vhost must be in the format of a valid hostname.")
+#define HOST_SET_VHOST_TOO_LONG      _("Error! The vhost is too long, please use a hostname shorter than %zu characters.")
+#define HOST_SET_VIDENT_ERROR        _("A vident must be in the format of a valid ident.")
+#define HOST_SET_VIDENT_TOO_LONG     _("Error! The vident is too long, please use an ident shorter than %zu characters.")
+
+#define MEMO_HAVE_NO_MEMOS           _("You have no memos.")
+#define MEMO_HAVE_NO_NEW_MEMOS       _("You have no new memos.")
+#define MEMO_NEW_MEMO_ARRIVED        _("You have a new memo from %s. Type \002%s\033%zu\002 to read it.")
+#define MEMO_NEW_X_MEMO_ARRIVED      _("There is a new memo on channel %s. Type \002%s\033%s\033%zu\002 to read it.")
+#define MEMO_X_HAS_NO_MEMOS          _("%s has no memos.")
+#define MEMO_X_HAS_NO_NEW_MEMOS      _("%s has no new memos.")
+
+#define NICK_ALREADY_REGISTERED      _("Nickname \002%s\002 is already registered!")
+#define NICK_CANNOT_BE_REGISTERED    _("Nickname \002%s\002 may not be registered.")
+#define NICK_IDENTIFY_REQUIRED       _("You must be logged into an account to use that command.")
+#define NICK_SET_DISPLAY_CHANGED     _("The new display is now \002%s\002.")
+#define NICK_X_NOT_IN_USE            _("Nick \002%s\002 isn't currently in use.")
+#define NICK_X_NOT_ON_CHAN           _("\002%s\002 is not currently on channel %s.")
+#define NICK_X_NOT_REGISTERED        _("Nick \002%s\002 isn't registered.")
+#define NICK_X_SUSPENDED             _("Nick %s is currently suspended.")

include/lists.h

@@ -0,0 +1,62 @@
+// Anope IRC Services <https://www.anope.org/>
+//
+// Copyright (C) 2003-2026 Anope Contributors
+//
+// Anope is free software. You can use, modify, and/or distribute it under the
+// terms of version 2 of the GNU General Public License. See docs/LICENSE.txt
+// for the complete terms of this license and docs/AUTHORS.txt for a list of
+// contributors.
+//
+// Based on the original code of Epona by Lara
+// Based on the original code of Services by Andy Church
+//
+// SPDX-License-Identifier: GPL-2.0-only
+
+#pragma once
+
+#include "services.h"
+#include "anope.h"
+
+/** A class to process numbered lists (passed to most DEL/LIST/VIEW commands).
+ * The function HandleNumber is called for every number in the list. Note that
+ * if descending is true it gets called in descending order. This is so deleting
+ * the index passed to the function from an array will not cause the other indexes
+ * passed to the function to be incorrect. This keeps us from having to have an
+ * 'in use' flag on everything.
+ */
+class CoreExport NumberList
+{
+private:
+	bool is_valid = true;
+
+	std::set<unsigned> numbers;
+
+	bool desc;
+public:
+	/** Processes a numbered list
+	 * @param list The list
+	 * @param descending True to make HandleNumber get called with numbers in descending order
+	 */
+	NumberList(const Anope::string &list, bool descending);
+
+	/** Destructor, does nothing
+	 */
+	virtual ~NumberList() = default;
+
+	/** Should be called after the constructors are done running. This calls the callbacks.
+	 */
+	void Process();
+
+	/** Called with a number from the list
+	 * @param number The number
+	 */
+	virtual void HandleNumber(unsigned number);
+
+	/** Called when there is an error with the numbered list
+	 * Return false to immediately stop processing the list and return
+	 * This is all done before we start calling HandleNumber, so no numbers will have been processed yet
+	 * @param list The list
+	 * @return false to stop processing
+	 */
+	virtual bool InvalidRange(const Anope::string &list);
+};

include/logger.h

@@ -1,14 +1,36 @@
-#ifndef LOGGER_H
-#define LOGGER_H
+// Anope IRC Services <https://www.anope.org/>
+//
+// Copyright (C) 2003-2026 Anope Contributors
+//
+// Anope is free software. You can use, modify, and/or distribute it under the
+// terms of version 2 of the GNU General Public License. See docs/LICENSE.txt
+// for the complete terms of this license and docs/AUTHORS.txt for a list of
+// contributors.
+//
+// Based on the original code of Epona by Lara
+// Based on the original code of Services by Andy Church
+//
+// SPDX-License-Identifier: GPL-2.0-only
+
+#pragma once
+
+#include "anope.h"
+#include "defs.h"
 
 enum LogType
 {
+	/* Used whenever an administrator uses an administrative command */
 	LOG_ADMIN,
+	/* Used whenever an administrator overrides something, such as adding
+	 * access to a channel where they don't have permission to.
+	 */
 	LOG_OVERRIDE,
+	/* Any other command usage */
 	LOG_COMMAND,
 	LOG_SERVER,
 	LOG_CHANNEL,
 	LOG_USER,
+	LOG_MODULE,
 	LOG_NORMAL,
 	LOG_TERMINAL,
 	LOG_RAWIO,
@@ -18,52 +40,68 @@ enum LogType
 	LOG_DEBUG_4
 };
 
-struct LogFile
+struct LogFile final
 {
 	Anope::string filename;
-
- public:
 	std::ofstream stream;
 
 	LogFile(const Anope::string &name);
-	Anope::string GetName() const;
+	~LogFile();
+	const Anope::string &GetName() const;
 };
 
-class Command;
-
-class CoreExport Log
+/* Represents a single log message */
+class CoreExport Log final
 {
- public:
-	BotInfo *bi;
-	User *u;
-	Command *c;
-	Channel *chan;
-	ChannelInfo *ci;
-	Server *s;
-	LogType Type;
-	Anope::string Category;
-	std::list<Anope::string> Sources;
+public:
+	/* Bot that should log this message */
+	BotInfo *bi = nullptr;
+	/* For commands, the user executing the command, but might not always exist */
+	User *u = nullptr;
+	/* For commands, the account executing the command, but will not always exist */
+	NickCore *nc = nullptr;
+	/* For commands, the command being executed */
+	Command *c = nullptr;
+	/* For commands, the command source */
+	CommandSource *source = nullptr;
+	/* Used for LOG_CHANNEL */
+	Channel *chan = nullptr;
+	/* For commands, the channel the command was executed on, will not always exist */
+	const ChannelInfo *ci = nullptr;
+	/* For LOG_SERVER */
+	Server *s = nullptr;
+	/* For LOG_MODULE */
+	Module *m = nullptr;
+	LogType type;
+	Anope::string category;
 
 	std::stringstream buf;
 
 	Log(LogType type = LOG_NORMAL, const Anope::string &category = "", BotInfo *bi = NULL);
 
 	/* LOG_COMMAND/OVERRIDE/ADMIN */
-	Log(LogType type, User *u, Command *c, ChannelInfo *ci = NULL);
+	Log(LogType type, CommandSource &source, Command *c, ChannelInfo *ci = NULL);
 
 	/* LOG_CHANNEL */
 	Log(User *u, Channel *c, const Anope::string &category = "");
 
 	/* LOG_USER */
-	explicit Log(User *u, const Anope::string &category = "");
+	Log(User *u, const Anope::string &category = "", BotInfo *bi = NULL);
 
 	/* LOG_SERVER */
-	Log(Server *s, const Anope::string &category = "");
+	Log(Server *s, const Anope::string &category = "", BotInfo *bi = NULL);
 
 	Log(BotInfo *b, const Anope::string &category = "");
 
+	Log(Module *m, const Anope::string &category = "", BotInfo *bi = NULL);
+
 	~Log();
 
+private:
+	Anope::string FormatSource() const;
+	Anope::string FormatCommand() const;
+
+public:
 	Anope::string BuildPrefix() const;
 
 	template<typename T> Log &operator<<(T val)
@@ -73,33 +111,34 @@ class CoreExport Log
 	}
 };
 
-class CoreExport LogInfo
+/* Configured in the configuration file, actually does the message logging */
+class CoreExport LogInfo final
 {
- public:
-	std::list<Anope::string> Targets;
-	std::map<Anope::string, LogFile *> Logfiles;
-	std::list<Anope::string> Sources;
-	int LogAge;
-	std::list<Anope::string> Admin;
-	std::list<Anope::string> Override;
-	std::list<Anope::string> Commands;
-	std::list<Anope::string> Servers;
-	std::list<Anope::string> Users;
-	std::list<Anope::string> Channels;
-	std::list<Anope::string> Normal;
-	bool RawIO;
-	bool Debug;
+public:
+	BotInfo *bot = nullptr;
+	std::vector<Anope::string> targets;
+	std::vector<LogFile *> logfiles;
+	int last_day = 0;
+	std::vector<Anope::string> sources;
+	int log_age;
+	std::vector<Anope::string> admin;
+	std::vector<Anope::string> override;
+	std::vector<Anope::string> commands;
+	std::vector<Anope::string> servers;
+	std::vector<Anope::string> users;
+	std::vector<Anope::string> channels;
+	std::vector<Anope::string> normal;
+	bool raw_io;
+	bool debug;
 
 	LogInfo(int logage, bool rawio, bool debug);
 
 	~LogInfo();
 
-	void AddType(std::list<Anope::string> &list, const Anope::string &type);
+	void OpenLogFiles();
 
 	bool HasType(LogType ltype, const Anope::string &type) const;
 
+	/* Logs the message l if configured to */
 	void ProcessMessage(const Log *l);
 };
-
-#endif // LOGGER_H
-

include/mail.h

@@ -1,28 +1,58 @@
-#ifndef MAIL_H
-#define MAIL_H
+// Anope IRC Services <https://www.anope.org/>
+//
+// Copyright (C) 2003-2026 Anope Contributors
+//
+// Anope is free software. You can use, modify, and/or distribute it under the
+// terms of version 2 of the GNU General Public License. See docs/LICENSE.txt
+// for the complete terms of this license and docs/AUTHORS.txt for a list of
+// contributors.
+//
+// Based on the original code of Epona by Lara
+// Based on the original code of Services by Andy Church
+//
+// SPDX-License-Identifier: GPL-2.0-only
+
+#pragma once
 
 #include "anope.h"
+#include "threadengine.h"
+#include "serialize.h"
 
-extern CoreExport bool Mail(User *u, NickCore *nc, BotInfo *service, const Anope::string &subject, const Anope::string &message);
-extern CoreExport bool Mail(NickCore *nc, const Anope::string &subject, const Anope::string &message);
-extern CoreExport bool MailValidate(const Anope::string &email);
-
-class MailThread : public Thread
+namespace Mail
 {
- private:
-	Anope::string MailTo;
-	Anope::string Addr;
-	Anope::string Subject;
-	Anope::string Message;
-	bool DontQuoteAddresses;
+	extern CoreExport bool Send(User *from, NickCore *to, BotInfo *service, const Anope::string &subject, const Anope::string &message);
+	extern CoreExport bool Send(NickCore *to, const Anope::string &subject, const Anope::string &message);
+	extern CoreExport bool Validate(const Anope::string &email);
 
-	bool Success;
- public:
-	MailThread(const Anope::string &mailto, const Anope::string &addr, const Anope::string &subject, const Anope::string &message);
+	/* A email message being sent */
+	class Message final
+		: 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;
 
-	~MailThread();
+	public:
+		/** Construct this message. Once constructed call Thread::Start to launch the mail sending.
+		 * @param sf Config->SendFrom
+		 * @param mailto Name of person being mailed (u->nick, nc->display, etc)
+		 * @param addr Destination address to mail
+		 * @param subject Message subject
+		 * @param message The actual message
+		 */
+		Message(const Anope::string &sf, const Anope::string &mailto, const Anope::string &addr, const Anope::string &subject, const Anope::string &message);
 
-	void Run();
-};
+		~Message();
 
-#endif // MAIL_H
+		/* Called from within the thread to actually send the mail */
+		void Run() override;
+	};
+
+} // namespace Mail

include/memo.h

@@ -0,0 +1,61 @@
+// Anope IRC Services <https://www.anope.org/>
+//
+// Copyright (C) 2003-2026 Anope Contributors
+//
+// Anope is free software. You can use, modify, and/or distribute it under the
+// terms of version 2 of the GNU General Public License. See docs/LICENSE.txt
+// for the complete terms of this license and docs/AUTHORS.txt for a list of
+// contributors.
+//
+// Based on the original code of Epona by Lara
+// Based on the original code of Services by Andy Church
+//
+// SPDX-License-Identifier: GPL-2.0-only
+
+#pragma once
+
+#include "anope.h"
+#include "serialize.h"
+
+class CoreExport Memo final
+	: public Serializable
+{
+public:
+	struct Type final
+		: public Serialize::Type
+	{
+		Type();
+		void Serialize(Serializable *obj, Serialize::Data &data) const override;
+		Serializable *Unserialize(Serializable *obj, Serialize::Data &data) const override;
+	};
+
+	MemoInfo *mi;
+	bool unread;
+	bool receipt;
+	Memo();
+	~Memo();
+
+	Anope::string owner;
+	/* When it was sent */
+	time_t time;
+	Anope::string sender;
+	Anope::string text;
+};
+
+/* Memo info structures.  Since both nicknames and channels can have memos,
+ * we encapsulate memo data in a MemoInfo to make it easier to handle.
+ */
+struct CoreExport MemoInfo final
+{
+	int16_t memomax = 0;
+	Serialize::Checker<std::vector<Memo *> > memos;
+	std::set<Anope::string, ci::less> ignores;
+
+	MemoInfo();
+	Memo *GetMemo(unsigned index) const;
+	unsigned GetIndex(Memo *m) const;
+	void Del(unsigned index);
+	bool HasIgnore(User *u);
+
+	static MemoInfo *GetMemoInfo(const Anope::string &targ, bool &is_chan);
+};

include/messages.h

@@ -0,0 +1,206 @@
+// Anope IRC Services <https://www.anope.org/>
+//
+// Copyright (C) 2003-2026 Anope Contributors
+//
+// Anope is free software. You can use, modify, and/or distribute it under the
+// terms of version 2 of the GNU General Public License. See docs/LICENSE.txt
+// for the complete terms of this license and docs/AUTHORS.txt for a list of
+// contributors.
+//
+// Based on the original code of Epona by Lara
+// Based on the original code of Services by Andy Church
+//
+// SPDX-License-Identifier: GPL-2.0-only
+
+#pragma once
+
+#include "protocol.h"
+
+/* Common IRCD messages.
+ * Protocol modules may chose to include some, none, or all of these handlers
+ * as they see fit.
+ */
+
+namespace Message
+{
+
+	struct CoreExport Away
+		: IRCDMessage
+	{
+		Away(Module *creator, const Anope::string &mname = "AWAY") : IRCDMessage(creator, mname, 0) { SetFlag(FLAG_REQUIRE_USER); SetFlag(FLAG_SOFT_LIMIT); }
+
+		void Run(MessageSource &source, const std::vector<Anope::string> &params, const Anope::map<Anope::string> &tags) override;
+	};
+
+	struct CoreExport Capab
+		: IRCDMessage
+	{
+		Capab(Module *creator, const Anope::string &mname = "CAPAB") : IRCDMessage(creator, mname, 1) { SetFlag(FLAG_SOFT_LIMIT); }
+
+		void Run(MessageSource &source, const std::vector<Anope::string> &params, const Anope::map<Anope::string> &tags) override;
+	};
+
+	struct CoreExport Error
+		: IRCDMessage
+	{
+		Error(Module *creator, const Anope::string &mname = "ERROR") : IRCDMessage(creator, mname, 1) { }
+
+		void Run(MessageSource &source, const std::vector<Anope::string> &params, const Anope::map<Anope::string> &tags) override;
+	};
+
+	struct CoreExport Ignore final
+		: IRCDMessage
+	{
+		Ignore(Module *creator, const Anope::string &mname);
+		void Run(MessageSource &source, const std::vector<Anope::string> &params, const Anope::map<Anope::string> &tags) override;
+	};
+
+	struct CoreExport Invite
+		: IRCDMessage
+	{
+		Invite(Module *creator, const Anope::string &mname = "INVITE") : IRCDMessage(creator, mname, 2) { SetFlag(FLAG_REQUIRE_USER); SetFlag(FLAG_SOFT_LIMIT); }
+
+		void Run(MessageSource &source, const std::vector<Anope::string> &params, const Anope::map<Anope::string> &tags) override;
+	};
+
+	struct CoreExport Join
+		: IRCDMessage
+	{
+		Join(Module *creator, const Anope::string &mname = "JOIN") : IRCDMessage(creator, mname, 1) { SetFlag(FLAG_REQUIRE_USER); SetFlag(FLAG_SOFT_LIMIT); }
+
+		void Run(MessageSource &source, const std::vector<Anope::string> &params, const Anope::map<Anope::string> &tags) override;
+
+		typedef std::pair<ChannelStatus, User *> SJoinUser;
+
+		/** Handle a SJOIN.
+		 * @param source The source of the SJOIN
+		 * @param chan The channel the users are joining to
+		 * @param ts The TS for the channel
+		 * @param modes The mode letters sent with the SJOIN, if any
+		 * @param modeparams The mode parameters sent with the SJOIN, if any
+		 * @param users The users and their status, if any
+		 */
+		static void SJoin(MessageSource &source, const Anope::string &chan, time_t ts, const Anope::string &modes, const std::vector<Anope::string> &modeparams, const std::list<SJoinUser> &users);
+	};
+
+	struct CoreExport Kick
+		: IRCDMessage
+	{
+		Kick(Module *creator, const Anope::string &mname = "KICK") : IRCDMessage(creator, mname, 2) { SetFlag(FLAG_SOFT_LIMIT); }
+
+		void Run(MessageSource &source, const std::vector<Anope::string> &params, const Anope::map<Anope::string> &tags) override;
+	};
+
+	struct CoreExport Kill
+		: IRCDMessage
+	{
+		Kill(Module *creator, const Anope::string &mname = "KILL") : IRCDMessage(creator, mname, 2) { }
+
+		void Run(MessageSource &source, const std::vector<Anope::string> &params, const Anope::map<Anope::string> &tags) override;
+	};
+
+	struct CoreExport Mode
+		: IRCDMessage
+	{
+		Mode(Module *creator, const Anope::string &mname = "MODE") : IRCDMessage(creator, mname, 2) { SetFlag(FLAG_SOFT_LIMIT); }
+
+		void Run(MessageSource &source, const std::vector<Anope::string> &params, const Anope::map<Anope::string> &tags) override;
+	};
+
+	struct CoreExport MOTD
+		: IRCDMessage
+	{
+		MOTD(Module *creator, const Anope::string &mname = "MOTD") : IRCDMessage(creator, mname, 1) { }
+
+		void Run(MessageSource &source, const std::vector<Anope::string> &params, const Anope::map<Anope::string> &tags) override;
+	};
+
+	struct CoreExport Notice
+		: IRCDMessage
+	{
+		Notice(Module *creator, const Anope::string &mname = "NOTICE") : IRCDMessage(creator, mname, 2) { SetFlag(FLAG_REQUIRE_USER); }
+
+		void Run(MessageSource &source, const std::vector<Anope::string> &params, const Anope::map<Anope::string> &tags) override;
+	};
+
+	struct CoreExport Part
+		: IRCDMessage
+	{
+		Part(Module *creator, const Anope::string &mname = "PART") : IRCDMessage(creator, mname, 1) { SetFlag(FLAG_REQUIRE_USER); SetFlag(FLAG_SOFT_LIMIT); }
+
+		void Run(MessageSource &source, const std::vector<Anope::string> &params, const Anope::map<Anope::string> &tags) override;
+	};
+
+	struct CoreExport Ping
+		: IRCDMessage
+	{
+		Ping(Module *creator, const Anope::string &mname = "PING") : IRCDMessage(creator, mname, 1) { SetFlag(FLAG_SOFT_LIMIT); }
+
+		void Run(MessageSource &source, const std::vector<Anope::string> &params, const Anope::map<Anope::string> &tags) override;
+	};
+
+	struct CoreExport Privmsg
+		: IRCDMessage
+	{
+		Privmsg(Module *creator, const Anope::string &mname = "PRIVMSG") : IRCDMessage(creator, mname, 2) { SetFlag(FLAG_REQUIRE_USER); }
+
+		void Run(MessageSource &source, const std::vector<Anope::string> &params, const Anope::map<Anope::string> &tags) override;
+	};
+
+	struct CoreExport Quit
+		: IRCDMessage
+	{
+		Quit(Module *creator, const Anope::string &mname = "QUIT") : IRCDMessage(creator, mname, 1) { SetFlag(FLAG_REQUIRE_USER); }
+
+		void Run(MessageSource &source, const std::vector<Anope::string> &params, const Anope::map<Anope::string> &tags) override;
+	};
+
+	struct CoreExport SQuit
+		: IRCDMessage
+	{
+		SQuit(Module *creator, const Anope::string &mname = "SQUIT") : IRCDMessage(creator, mname, 2) { }
+
+		void Run(MessageSource &source, const std::vector<Anope::string> &params, const Anope::map<Anope::string> &tags) override;
+	};
+
+	struct CoreExport Stats
+		: IRCDMessage
+	{
+		Stats(Module *creator, const Anope::string &mname = "STATS") : IRCDMessage(creator, mname, 1) { SetFlag(FLAG_REQUIRE_USER); SetFlag(FLAG_SOFT_LIMIT); }
+
+		void Run(MessageSource &source, const std::vector<Anope::string> &params, const Anope::map<Anope::string> &tags) override;
+	};
+
+	struct CoreExport Time
+		: IRCDMessage
+	{
+		Time(Module *creator, const Anope::string &mname = "TIME") : IRCDMessage(creator, mname, 0) { SetFlag(FLAG_SOFT_LIMIT); }
+
+		void Run(MessageSource &source, const std::vector<Anope::string> &params, const Anope::map<Anope::string> &tags) override;
+	};
+
+	struct CoreExport Topic
+		: IRCDMessage
+	{
+		Topic(Module *creator, const Anope::string &mname = "TOPIC") : IRCDMessage(creator, mname, 2) { SetFlag(FLAG_REQUIRE_USER); }
+
+		void Run(MessageSource &source, const std::vector<Anope::string> &params, const Anope::map<Anope::string> &tags) override;
+	};
+
+	struct CoreExport Version
+		: IRCDMessage
+	{
+		Version(Module *creator, const Anope::string &mname = "VERSION") : IRCDMessage(creator, mname, 0) { SetFlag(FLAG_SOFT_LIMIT); }
+
+		void Run(MessageSource &source, const std::vector<Anope::string> &params, const Anope::map<Anope::string> &tags) override;
+	};
+
+	struct CoreExport Whois
+		: IRCDMessage
+	{
+		Whois(Module *creator, const Anope::string &mname = "WHOIS") : IRCDMessage(creator, mname, 1) { SetFlag(FLAG_SOFT_LIMIT); }
+
+		void Run(MessageSource &source, const std::vector<Anope::string> &params, const Anope::map<Anope::string> &tags) override;
+	};
+
+} // namespace Message

include/miscutils.h

@@ -0,0 +1,87 @@
+// Anope IRC Services <https://www.anope.org/>
+//
+// Copyright (C) 2003-2026 Anope Contributors
+//
+// Anope is free software. You can use, modify, and/or distribute it under the
+// terms of version 2 of the GNU General Public License. See docs/LICENSE.txt
+// for the complete terms of this license and docs/AUTHORS.txt for a list of
+// contributors.
+//
+// Based on the original code of Epona by Lara
+// Based on the original code of Services by Andy Church
+//
+// SPDX-License-Identifier: GPL-2.0-only
+
+#pragma once
+
+#include <iterator>
+#include <utility>
+
+namespace Anope
+{
+	template <typename Iterator>
+	class iterator_range;
+
+	/** Returns a range containing all elements equivalent to \p value.
+	 * @param collection The collection to search within.
+	 * @param value The value to search for.
+	 */
+	template <typename Collection, typename Value>
+	auto equal_range(const Collection& collection, const Value& value)
+	{
+		return iterator_range(collection.equal_range(value));
+	}
+
+	/** Returns a range representing a reverse iterator for the specified colleciton.
+	 * @param collection The collection to create a reverse iterator for.
+	 */
+	template <typename Collection>
+	auto reverse_range(const Collection& collection)
+	{
+		return iterator_range(collection.rbegin(), collection.rend());
+	}
+}
+
+/** Represents a range of iterators. */
+template <typename Iterator>
+class Anope::iterator_range final
+{
+private:
+	/** An iterator which points to the start of the range. */
+	const Iterator begini;
+
+	/* An iterator which points to one past the end of the range. */
+	const Iterator endi;
+
+public:
+	/** Initialises a new iterator range with the specified iterators.
+	 * @param begin An iterator which points to the start of the range.
+	 * @param end An iterator which points to one past the end of the range.
+	 */
+	explicit iterator_range(Iterator begin, Iterator end)
+		: begini(begin)
+		, endi(end)
+	{
+	}
+
+	/** Initialises a new iterator range from a pair of iterators.
+	 * @param range A pair of iterators in the format [first, last).
+	 */
+	explicit iterator_range(std::pair<Iterator, Iterator> range)
+		: begini(range.first)
+		, endi(range.second)
+	{
+	}
+
+	/** Determines whether the iterator range is empty. */
+	bool empty() const { return begini == endi; }
+
+	/** Retrieves an iterator which points to the start of the range. */
+	const Iterator& begin() const { return begini; }
+
+	/** Retrieves an iterator which points to one past the end of the range. */
+	const Iterator& end() const { return endi; }
+
+	/** Retrieves the number of hops within the iterator range. */
+	typename std::iterator_traits<Iterator>::difference_type count() const { return std::distance(begini, endi); }
+};

include/modes.h

@@ -1,88 +1,22 @@
-/* Mode support
- *
- * Copyright (C) 2008-2011 Adam <Adam@anope.org>
- * Copyright (C) 2008-2012 Anope Team <team@anope.org>
- *
- * Please read COPYING and README for further details.
- */
+// Anope IRC Services <https://www.anope.org/>
+//
+// Copyright (C) 2003-2026 Anope Contributors
+// Copyright (C) 2008-2011 Adam <Adam@anope.org>
+//
+// Anope is free software. You can use, modify, and/or distribute it under the
+// terms of version 2 of the GNU General Public License. See docs/LICENSE.txt
+// for the complete terms of this license and docs/AUTHORS.txt for a list of
+// contributors.
+//
+// Based on the original code of Epona by Lara
+// Based on the original code of Services by Andy Church
+//
+// SPDX-License-Identifier: GPL-2.0-only
 
-#ifndef MODES_H
-#define MODES_H
-
-/** All of the valid user mode names
- */
-enum UserModeName
-{
-	UMODE_BEGIN,
-
-	UMODE_SERV_ADMIN, UMODE_BOT, UMODE_CO_ADMIN, UMODE_FILTER, UMODE_HIDEOPER, UMODE_NETADMIN,
-	UMODE_REGPRIV, UMODE_PROTECTED, UMODE_NO_CTCP, UMODE_WEBTV, UMODE_WEBIRC, UMODE_WHOIS, UMODE_ADMIN, UMODE_DEAF,
-	UMODE_GLOBOPS, UMODE_HELPOP, UMODE_INVIS, UMODE_OPER, UMODE_PRIV, UMODE_GOD, UMODE_REGISTERED,
-	UMODE_SNOMASK, UMODE_VHOST, UMODE_WALLOPS, UMODE_CLOAK, UMODE_SSL, UMODE_SOFTCALLERID, UMODE_CALLERID,
-	UMODE_COMMONCHANS, UMODE_HIDDEN, UMODE_STRIPCOLOR, UMODE_INVISIBLE_OPER, UMODE_RESTRICTED, UMODE_HIDEIDLE,
-
-	UMODE_END
-};
-
-const Anope::string UserModeNameStrings[] = {
-	"UMODE_BEGIN",
-
-	"UMODE_SERV_ADMIN", "UMODE_BOT", "UMODE_CO_ADMIN", "UMODE_FILTER", "UMODE_HIDEOPER", "UMODE_NETADMIN",
-	"UMODE_REGPRIV", "UMODE_PROTECTED", "UMODE_NO_CTCP", "UMODE_WEBTV", "UMODE_WEBIRC", "UMODE_WHOIS", "UMODE_ADMIN", "UMODE_DEAF",
-	"UMODE_GLOBOPS", "UMODE_HELPOP", "UMODE_INVIS", "UMODE_OPER", "UMODE_PRIV", "UMODE_GOD", "UMODE_REGISTERED",
-	"UMODE_SNOMASK", "UMODE_VHOST", "UMODE_WALLOPS", "UMODE_CLOAK", "UMODE_SSL", "UMODE_SOFTCALLERID", "UMODE_CALLERID",
-	"UMODE_COMMONCHANS", "UMODE_HIDDEN", "UMODE_STRIPCOLOR", "UMODE_INVISIBLE_OPER", "UMODE_RESTRICTED", "UMODE_HIDEIDLE",
-
-	""
-};
-
-/** All of the valid channel mode names
- */
-enum ChannelModeName
-{
-	CMODE_BEGIN,
-
-	/* Channel modes */
-	CMODE_BLOCKCOLOR, CMODE_FLOOD, CMODE_INVITE, CMODE_KEY, CMODE_LIMIT, CMODE_MODERATED, CMODE_NOEXTERNAL,
-	CMODE_PRIVATE, CMODE_REGISTERED, CMODE_SECRET, CMODE_TOPIC, CMODE_AUDITORIUM, CMODE_SSL, CMODE_ADMINONLY,
-	CMODE_NOCTCP, CMODE_FILTER, CMODE_NOKNOCK, CMODE_REDIRECT, CMODE_REGMODERATED, CMODE_NONICK, CMODE_OPERONLY,
-	CMODE_NOKICK, CMODE_REGISTEREDONLY, CMODE_STRIPCOLOR, CMODE_NONOTICE, CMODE_NOINVITE, CMODE_ALLINVITE,
-	CMODE_BLOCKCAPS, CMODE_PERM, CMODE_NICKFLOOD, CMODE_JOINFLOOD, CMODE_DELAYEDJOIN, CMODE_NOREJOIN,
-	CMODE_BANDWIDTH,
-
-	/* b/e/I */
-	CMODE_BAN, CMODE_EXCEPT,
-	CMODE_INVITEOVERRIDE,
-
-	/* v/h/o/a/q */
-	CMODE_VOICE, CMODE_HALFOP, CMODE_OP,
-	CMODE_PROTECT, CMODE_OWNER,
-
-	CMODE_END
-};
-
-const Anope::string ChannelModeNameStrings[] = {
-	"CMODE_BEGIN",
-
-	/* Channel modes */
-	"CMODE_BLOCKCOLOR", "CMODE_FLOOD", "CMODE_INVITE", "CMODE_KEY", "CMODE_LIMIT", "CMODE_MODERATED", "CMODE_NOEXTERNAL",
-	"CMODE_PRIVATE", "CMODE_REGISTERED", "CMODE_SECRET", "CMODE_TOPIC", "CMODE_AUDITORIUM", "CMODE_SSL", "CMODE_ADMINONLY",
-	"CMODE_NOCTCP", "CMODE_FILTER", "CMODE_NOKNOCK", "CMODE_REDIRECT", "CMODE_REGMODERATED", "CMODE_NONICK", "CMODE_OPERONLY",
-	"CMODE_NOKICK", "CMODE_REGISTEREDONLY", "CMODE_STRIPCOLOR", "CMODE_NONOTICE", "CMODE_NOINVITE", "CMODE_ALLINVITE",
-	"CMODE_BLOCKCAPS", "CMODE_PERM", "CMODE_NICKFLOOD", "CMODE_JOINFLOOD", "CMODE_DELAYEDJOIN", "CMODE_NOREJOIN",
-	"CMODE_BANDWIDTH",
-
-	/* b/e/I */
-	"CMODE_BAN", "CMODE_EXCEPT",
-	"CMODE_INVITEOVERRIDE",
-
-	/* v/h/o/a/q */
-	"CMODE_VOICE", "CMODE_HALFOP", "CMODE_OP",
-	"CMODE_PROTECT", "CMODE_OWNER",
-
-	""
-};
+#pragma once
 
+#include "anope.h"
+#include "base.h"
 
 /** The different types of modes
 */
@@ -102,125 +36,138 @@ enum ModeType
  */
 enum ModeClass
 {
-	/* Channel mode */
 	MC_CHANNEL,
-	/* User mode */
 	MC_USER
 };
 
+struct ModeData final
+{
+	Anope::string value;
+	Anope::string set_by;
+	time_t set_at;
+
+	ModeData(const Anope::string &v = "", const Anope::string &s = "", time_t t = 0)
+		: value(v)
+		, set_by(s)
+		, set_at(t)
+	{
+	}
+};
+
 /** This class is the basis of all modes in Anope
  */
-class CoreExport Mode : public Base
+class CoreExport Mode
+	: public Base
 {
- public:
-	/* Class of mode this is */
-	ModeClass Class;
-	/* Mode char for this */
-	char ModeChar;
-	/* Type of mode this is */
-	ModeType Type;
+public:
+	/* Mode name */
+	Anope::string name;
+	/* Class of mode this is (user/channel) */
+	ModeClass mclass;
+	/* Mode char for this, eg 'b' */
+	char mchar;
+	/* Type of mode this is, eg MODE_LIST */
+	ModeType type;
 
-	/** Default constructor
-	 * @param mClass The type of mode this is
-	 * @param modeChar The mode char
+	/** constructor
+	 * @param mname The mode name
+	 * @param mclass The type of mode this is
+	 * @param mc The mode char
 	 * @param type The mode type
 	 */
-	Mode(ModeClass mClass, char modeChar, ModeType type);
-
-	/** Default destructor
-	 */
-	virtual ~Mode();
+	Mode(const Anope::string &mname, ModeClass mclass, char mc, ModeType type);
+	virtual ~Mode() = default;
 };
 
 /** This class is a user mode, all user modes use this/inherit from this
  */
-class CoreExport UserMode : public Mode
+class CoreExport UserMode
+	: public Mode
 {
- public:
-	/* Mode name */
-	UserModeName Name;
-
-	/** Default constructor
-	 * @param nName The mode name
-	 * @param modeChar The mode char
+public:
+	/** constructor
+	 * @param name The mode name
+	 * @param mc The mode char
 	 */
-	UserMode(UserModeName mName, char modeChar);
+	UserMode(const Anope::string &name, char mc);
 
-	/** Default destructor
+	/** Can a user set this mode, used for mlock
+	 * @param source The user who is setting the mode.
+	 * @param target The user the mode is being set on.
 	 */
-	virtual ~UserMode();
-
-	/** Returns the mode name as a string
-	 */
-	const Anope::string NameAsString();
+	virtual bool CanSet(User *source, User *target) const { return true; }
 };
 
-class CoreExport UserModeParam : public UserMode
+class CoreExport UserModeParam
+	: public UserMode
 {
- public:
- 	/** Default constructor
-	 * @param mName The mode name
-	 * @param modeChar The mode char
+public:
+	/** constructor
+	 * @param name The mode name
+	 * @param mc The mode char
 	 */
-	UserModeParam(UserModeName mName, char modeChar);
+	UserModeParam(const Anope::string &name, char mc);
 
 	/** Check if the param is valid
 	 * @param value The param
 	 * @return true or false
 	 */
-	virtual bool IsValid(const Anope::string &value) const { return true; }
+	virtual bool IsValid(Anope::string &value) const { return true; }
 };
 
 /** This class is a channel mode, all channel modes use this/inherit from this
  */
-class CoreExport ChannelMode : public Mode
+class CoreExport ChannelMode
+	: public Mode
 {
- public:
-	/* Mode name */
-	ChannelModeName Name;
+public:
+	/* channel modes that can possibly unwrap this mode */
+	std::vector<ChannelMode *> listeners;
 
-	/** Default constructor
-	 * @param mName The mode name
-	 * @param modeChar The mode char
+	/** constructor
+	 * @param name The mode name
+	 * @param mc The mode char
 	 */
-	ChannelMode(ChannelModeName mName, char modeChar);
-
-	/** Default destructor
-	 */
-	virtual ~ChannelMode();
+	ChannelMode(const Anope::string &name, char mc);
 
 	/** Can a user set this mode, used for mlock
-	 * NOTE: User CAN be NULL, this is for checking if it can be locked with defcon
-	 * @param u The user, or NULL
+	 * @param u The user who is setting the mode.
+	 * @param c The channel the mode is being set on.
 	 */
-	virtual bool CanSet(User *u) const;
+	virtual bool CanSet(User *u, Channel *c) const;
 
-	/** Returns the mode name as a string
+	virtual void Check() { }
+
+	/** 'wrap' this channel mode and param to the underlying mode and param
 	 */
-	const Anope::string NameAsString();
+	virtual ChannelMode *Wrap(Anope::string &param);
+
+	/** 'unwrap' this mode to our internal representation
+	 */
+	ChannelMode *Unwrap(Anope::string &param);
+
+	/** called when a mode is being unwrapped, and is asking us if we can unwrap it
+	 */
+	virtual ChannelMode *Unwrap(ChannelMode *, Anope::string &param);
 };
 
-
 /** This is a mode for lists, eg b/e/I. These modes should inherit from this
  */
-class CoreExport ChannelModeList : public ChannelMode
+class CoreExport ChannelModeList
+	: public ChannelMode
 {
- public:
-	/** Default constructor
-	 * @param mName The mode name
-	 * @param modeChar The mode char
+public:
+	/** constructor
+	 * @param name The mode name
+	 * @param mc The mode char
 	 */
-	ChannelModeList(ChannelModeName mName, char modeChar);
-
-	/** Default destructor
-	 */
-	virtual ~ChannelModeList();
+	ChannelModeList(const Anope::string &name, char mc);
 
 	/** Is the mask valid
 	 * @param mask The mask
 	 * @return true for yes, false for no
 	 */
-	virtual bool IsValid(const Anope::string &mask) const { return true; }
+	virtual bool IsValid(Anope::string &mask) const;
 
 	/** Checks if mask affects user
 	 * Should only be used for extbans or other weird ircd-specific things.
@@ -243,177 +190,160 @@ 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
+class CoreExport ChannelModeParam
+	: public ChannelMode
 {
- public:
-	/** Default constructor
-	 * @param mName The mode name
-	 * @param modeChar The mode char
-	 * @param MinusArg true if this mode sends no arg when unsetting
+public:
+	/** constructor
+	 * @param name The mode name
+	 * @param mc The mode char
+	 * @param minus_no_arg true if this mode sends no arg when unsetting
 	 */
-	ChannelModeParam(ChannelModeName mName, char modeChar, bool MinusArg = false);
-
-	/** Default destructor
-	 */
-	virtual ~ChannelModeParam();
+	ChannelModeParam(const Anope::string &name, char mc, bool minus_no_arg = false);
 
 	/* Should we send an arg when unsetting this mode? */
-	bool MinusNoArg;
+	bool minus_no_arg;
 
 	/** Is the param valid
 	 * @param value The param
 	 * @return true for yes, false for no
 	 */
-	virtual bool IsValid(const Anope::string &value) const { return true; }
+	virtual bool IsValid(Anope::string &value) const { return true; }
 };
 
 /** This is a mode that is a channel status, eg +v/h/o/a/q.
 */
-class CoreExport ChannelModeStatus : public ChannelMode
+class CoreExport ChannelModeStatus
+	: public ChannelMode
 {
- public:
+public:
 	/* The symbol, eg @ % + */
-	char Symbol;
+	char symbol;
 	/* The "level" of the mode, used to compare with other modes.
 	 * Used so we know op > halfop > voice etc.
 	 */
-	unsigned short Level;
+	unsigned level;
 
-	/** Default constructor
-	 * @param mName The mode name
-	 * @param modeChar The mode char
-	 * @param mSymbol The symbol for the mode, eg @ % 
-	 * @param mLevel A level for the mode, which is usually determined by the PREFIX capab
+	/** constructor
+	 * @param name The mode name
+	 * @param mc The mode char
+	 * @param msymbol The symbol for the mode, eg @ %
+	 * @param mlevel A level for the mode, which is usually determined by the PREFIX capab
 	 */
-	ChannelModeStatus(ChannelModeName mName, char modeChar, char mSymbol, unsigned short mLevel = 0);
+	ChannelModeStatus(const Anope::string &name, char mc, char msymbol, unsigned mlevel);
+};
 
-	/** Default destructor
-	 */
-	virtual ~ChannelModeStatus();
+/** A virtual mode. This mode doesn't natively exist on the IRCd (like extbans),
+ * but we still have a representation for it.
+ */
+template<typename T>
+class CoreExport ChannelModeVirtual
+	: public T
+{
+protected:
+	Anope::string base;
+	ChannelMode *basech;
+
+public:
+	ChannelModeVirtual(const Anope::string &mname, const Anope::string &basename);
+
+	~ChannelModeVirtual();
+
+	void Check() override;
+
+	ChannelMode *Wrap(Anope::string &param) override;
+
+	ChannelMode *Unwrap(ChannelMode *cm, Anope::string &param) override = 0;
+};
+
+/* The status a user has on a channel (+v, +h, +o) etc */
+class CoreExport ChannelStatus final
+{
+private:
+	std::set<ChannelMode *> modes;
+	static bool IsValidMode(ChannelMode *cm);
+
+public:
+	ChannelStatus() = default;
+	ChannelStatus(const Anope::string &modes);
+	void AddMode(char c);
+	void AddMode(ChannelMode *cm);
+	void DelMode(ChannelMode *cm);
+	bool HasMode(ChannelMode *cm) const;
+	bool Empty() const;
+	void Clear();
+	const auto &Modes() const { return modes; }
+	Anope::string BuildModePrefixList() const;
+};
+
+class CoreExport UserModeOperOnly
+	: public UserMode
+{
+public:
+	UserModeOperOnly(const Anope::string &mname, char um) : UserMode(mname, um) { }
+
+	bool CanSet(User *source, User *target) const override;
+};
+
+class CoreExport UserModeNoone
+	: public UserMode
+{
+public:
+	UserModeNoone(const Anope::string &mname, char um) : UserMode(mname, um) { }
+
+	bool CanSet(User *source, User *target) const override;
 };
 
 /** Channel mode +k (key)
  */
-class CoreExport ChannelModeKey : public ChannelModeParam
+class CoreExport ChannelModeKey
+	: public ChannelModeParam
 {
- public:
-	ChannelModeKey(char modeChar) : ChannelModeParam(CMODE_KEY, modeChar) { }
+public:
+	ChannelModeKey(char mc) : ChannelModeParam("KEY", mc) { }
 
-	bool IsValid(const Anope::string &value) const;
+	bool IsValid(Anope::string &value) const override;
 };
 
-/** This class is used for channel mode +A (Admin only)
- * Only opers can mlock it
+/** This class is used for oper only channel modes
  */
-class CoreExport ChannelModeAdmin : public ChannelMode
+class CoreExport ChannelModeOperOnly
+	: public ChannelMode
 {
- public:
-	ChannelModeAdmin(char modeChar) : ChannelMode(CMODE_ADMINONLY, modeChar) { }
+public:
+	ChannelModeOperOnly(const Anope::string &mname, char mc) : ChannelMode(mname, mc) { }
 
 	/* Opers only */
-	bool CanSet(User *u) const;
+	bool CanSet(User *u, Channel *c) const override;
 };
 
-/** This class is used for channel mode +O (Opers only)
- * Only opers can mlock it
+/** This class is used for channel modes only servers may set
  */
-class CoreExport ChannelModeOper : public ChannelMode
+class CoreExport ChannelModeNoone
+	: public ChannelMode
 {
- public:
-	ChannelModeOper(char modeChar) : ChannelMode(CMODE_OPERONLY, modeChar) { }
+public:
+	ChannelModeNoone(const Anope::string &mname, char mc) : ChannelMode(mname, mc) { }
 
-	/* Opers only */
-	bool CanSet(User *u) const;
+	bool CanSet(User *u, Channel *c) const override;
 };
 
-/** This class is used for channel mode +r (registered channel)
- * No one may mlock r
- */
-class CoreExport ChannelModeRegistered : public ChannelMode
-{
- public:
-	ChannelModeRegistered(char modeChar) : ChannelMode(CMODE_REGISTERED, modeChar) { }
-
-	/* No one mlocks +r */
-	bool CanSet(User *u) const;
-};
-
-enum StackerType
-{
-	ST_CHANNEL,
-	ST_USER
-};
-
-class StackerInfo
-{
- public:
-	/* Modes to be added */
-	std::list<std::pair<Base *, Anope::string> > AddModes;
-	/* Modes to be deleted */
-	std::list<std::pair<Base *, Anope::string> > DelModes;
-	/* The type of object this stacker info is for */
-	StackerType Type;
-	/* Bot this is sent from */
-	BotInfo *bi;
-
-	/** Add a mode to this object
-	 * @param mode The mode
-	 * @param Set true if setting, false if unsetting
-	 * @param Param The param for the mode
-	 */
-	void AddMode(Mode *mode, bool Set, const Anope::string &Param);
-};
-
-/** This is mode manager
+/** This is the mode manager
  * It contains functions for adding modes to Anope so Anope can track them
  * and do things such as MLOCK.
  * This also contains a mode stacker that will combine multiple modes and set
- * them on a channel all at once
+ * them on a channel or user at once
  */
-class CoreExport ModeManager
+class CoreExport ModeManager final
 {
- protected:
-	class ModePipe : public Pipe
-	{
-	 public:
-	 	/** Called when there are modes to be set
-		 */
-		void OnNotify();
-	};
+public:
+	using Change = std::multimap<Mode *, std::pair<bool, ModeData>>;
 
-	static ModePipe *mpipe;
-
-	/* List of pairs of user/channels and their stacker info */
-	static std::list<std::pair<Base *, StackerInfo *> > StackerObjects;
-
-	/** Get the stacker info for an item, if one doesnt exist it is created
-	 * @param Item The user/channel etc
-	 * @return The stacker info
-	 */
-	static StackerInfo *GetInfo(Base *Item);
-
-	/** Build a list of mode strings to send to the IRCd from the mode stacker
-	 * @param info The stacker info for a channel or user
-	 * @return a list of strings
-	 */
-	static std::list<Anope::string> BuildModeStrings(StackerInfo *info);
-
-	/** Really add a mode to the stacker, internal use only
-	 * @param bi The client to set the modes from
-	 * @param Object The object, user/channel
-	 * @param mode The mode
-	 * @param Set Adding or removing?
-	 * @param Param A param, if there is one
-	 * @param Type The type this is, user or channel
-	 */
-	static void StackerAddInternal(BotInfo *bi, Base *Object, Mode *mode, bool Set, const Anope::string &Param, StackerType Type);
-
- public:
- 	/* List of all modes Anope knows about */
-	static std::vector<ChannelMode *> ChannelModes;
-	static std::vector<UserMode *> UserModes;
+	/* Number of generic channel and user modes we are tracking */
+	static unsigned GenericChannelModes;
+	static unsigned GenericUserModes;
 
 	/** Add a user mode to Anope
 	 * @param um A UserMode or UserMode derived class
@@ -427,74 +357,109 @@ class CoreExport ModeManager
 	 */
 	static bool AddChannelMode(ChannelMode *cm);
 
-	/** Find a channel mode
-	 * @param Mode The mode
-	 * @return The mode class
+	/** Remove a user mode from Anope
+	 * @param um A UserMode to remove
 	 */
-	static ChannelMode *FindChannelModeByChar(char Mode);
+	static void RemoveUserMode(UserMode *um);
 
-	/** Find a user mode
-	 * @param Mode The mode
-	 * @return The mode class
+	/** Remove a channel mode from Anope
+	 * @param um A ChanneMode to remove
 	 */
-	static UserMode *FindUserModeByChar(char Mode);
+	static void RemoveChannelMode(ChannelMode *cm);
 
 	/** Find a channel mode
-	 * @param Mode The modename
+	 * @param mode The mode
 	 * @return The mode class
 	 */
-	static ChannelMode *FindChannelModeByName(ChannelModeName Name);
+	static ChannelMode *FindChannelModeByChar(char mode);
 
 	/** Find a user mode
-	 * @param Mode The modename
+	 * @param mode The mode
 	 * @return The mode class
 	 */
-	static UserMode *FindUserModeByName(UserModeName Name);
+	static UserMode *FindUserModeByChar(char mode);
 
-	/** Find channel mode by string
-	 * @param name The mode name
-	 * @return The mode
+	/** Find a channel mode
+	 * @param name The modename
+	 * @return The mode class
 	 */
-	static ChannelMode *FindChannelModeByString(const Anope::string &name);
+	static ChannelMode *FindChannelModeByName(const Anope::string &name);
 
-	/** Find user mode by string
-	 * @param name The mode name
-	 * @return The mode
+	/** Find a user mode
+	 * @param name The modename
+	 * @return The mode class
 	 */
-	static UserMode *FindUserModeByString(const Anope::string &name);
+	static UserMode *FindUserModeByName(const Anope::string &name);
 
 	/** Gets the channel mode char for a symbol (eg + returns v)
-	 * @param Value The symbol
+	 * @param symbol The symbol
 	 * @return The char
 	 */
-	static char GetStatusChar(char Value);
+	static char GetStatusChar(char symbol);
+
+	static const std::vector<ChannelMode *> &GetChannelModes();
+	static const std::vector<UserMode *> &GetUserModes();
+	static const std::vector<ChannelModeStatus *> &GetStatusChannelModesByRank();
+	static void RebuildStatusModes();
 
 	/** Add a mode to the stacker to be set on a channel
 	 * @param bi The client to set the modes from
 	 * @param c The channel
 	 * @param cm The channel mode
-	 * @param Set true for setting, false for removing
-	 * @param Param The param, if there is one
+	 * @param set true for setting, false for removing
+	 * @param data Data about the mode.
 	 */
-	static void StackerAdd(BotInfo *bi, Channel *c, ChannelMode *cm, bool Set, const Anope::string &Param = "");
+	static void StackerAdd(BotInfo *bi, Channel *c, ChannelMode *cm, bool set, const ModeData &data = {});
 
 	/** Add a mode to the stacker to be set on a user
 	 * @param bi The client to set the modes from
 	 * @param u The user
 	 * @param um The user mode
-	 * @param Set true for setting, false for removing
-	 * @param param The param, if there is one
+	 * @param set true for setting, false for removing
+	 * @param data Data about the mode.
 	 */
-	static void StackerAdd(BotInfo *bi, User *u, UserMode *um, bool Set, const Anope::string &Param = "");
+	static void StackerAdd(BotInfo *bi, User *u, UserMode *um, bool set, const ModeData &data = {});
 
 	/** Process all of the modes in the stacker and send them to the IRCd to be set on channels/users
 	 */
 	static void ProcessModes();
 
-	/** Delete a user or channel from the stacker
-	 * @param b The user/channel
+	/** Delete a user, channel, or mode from the stacker
 	 */
-	static void StackerDel(Base *b);
+	static void StackerDel(User *u);
+	static void StackerDel(Channel *c);
+	static void StackerDel(Mode *m);
 };
 
-#endif // MODES_H
+/** Represents a mask set on a channel (b/e/I)
+ */
+class CoreExport Entry final
+{
+	Anope::string name;
+	Anope::string mask;
+public:
+	unsigned short cidr_len = 0;
+	int family = 0;
+	Anope::string nick, user, host, real;
+
+	/** Constructor
+	 * @param mask A full or partial nick!ident@host/cidr#real name mask
+	 * @param mode What mode this host is for, can be empty for unknown/no mode
+	 * @Param real Whether to allow a real name in the mask.
+	 */
+	Entry(const Anope::string &mask, const Anope::string &mode = "", bool real = true);
+
+	/** Get the banned mask for this entry
+	 * @return The mask
+	 */
+	Anope::string GetMask() const;
+
+	Anope::string GetCleanMask() const;
+
+	/** Check if this entry matches a user
+	 * @param u The user
+	 * @param full True to match against a users real host and IP
+	 * @return true on match
+	 */
+	bool Matches(User *u, bool full = false) const;
+};

include/module.h

@@ -1,9 +1,50 @@
-#ifndef MODULE_H
-#define MODULE_H
+// Anope IRC Services <https://www.anope.org/>
+//
+// Copyright (C) 2003-2026 Anope Contributors
+//
+// Anope is free software. You can use, modify, and/or distribute it under the
+// terms of version 2 of the GNU General Public License. See docs/LICENSE.txt
+// for the complete terms of this license and docs/AUTHORS.txt for a list of
+// contributors.
+//
+// Based on the original code of Epona by Lara
+// Based on the original code of Services by Andy Church
+//
+// SPDX-License-Identifier: GPL-2.0-only
 
-#include "services.h"
-#include "modules.h"
-#include "oper.h"
+#pragma once
+
+#include "access.h"
+#include "account.h"
+#include "anope.h"
+#include "base.h"
+#include "bots.h"
+#include "channels.h"
 #include "commands.h"
-
-#endif // MODULE_H
+#include "config.h"
+#include "extensible.h"
+#include "hashcomp.h"
+#include "language.h"
+#include "lists.h"
+#include "logger.h"
+#include "mail.h"
+#include "memo.h"
+#include "messages.h"
+#include "modes.h"
+#include "modules.h"
+#include "opertype.h"
+#include "protocol.h"
+#include "regexpr.h"
+#include "regchannel.h"
+#include "serialize.h"
+#include "servers.h"
+#include "service.h"
+#include "services.h"
+#include "socketengine.h"
+#include "sockets.h"
+#include "textproc.h"
+#include "threadengine.h"
+#include "timers.h"
+#include "uplink.h"
+#include "users.h"
+#include "xline.h"

include/modules/botserv/badwords.h

@@ -0,0 +1,85 @@
+// Anope IRC Services <https://www.anope.org/>
+//
+// Copyright (C) 2003-2026 Anope Contributors
+//
+// Anope is free software. You can use, modify, and/or distribute it under the
+// terms of version 2 of the GNU General Public License. See docs/LICENSE.txt
+// for the complete terms of this license and docs/AUTHORS.txt for a list of
+// contributors.
+//
+// Based on the original code of Epona by Lara
+// Based on the original code of Services by Andy Church
+//
+// SPDX-License-Identifier: GPL-2.0-only
+
+#pragma once
+
+#define BOTSERV_BAD_WORDS_EXT "badwords"
+#define BOTSERV_BAD_WORDS_TYPE "BadWord"
+
+namespace BotServ
+{
+	class BadWord;
+	struct BadWords;
+
+	/** Flags for badwords. */
+	enum BadWordType
+	{
+		/* Always kicks if the word is said */
+		BW_ANY,
+		/* User must way the entire word */
+		BW_SINGLE,
+		/* The word has to start with the badword */
+		BW_START,
+		/* The word has to end with the badword */
+		BW_END
+	};
+}
+
+/* Structure used to contain bad words. */
+class BotServ::BadWord
+{
+protected:
+	BadWord() = default;
+
+public:
+	Anope::string chan;
+	Anope::string word;
+	BotServ::BadWordType type;
+
+	virtual ~BadWord() = default;
+};
+
+struct BotServ::BadWords
+{
+	virtual ~BadWords() = default;
+
+	/** Add a badword to the badword list
+	 * @param word The badword
+	 * @param type The type (SINGLE START END)
+	 * @return The badword
+	 */
+	virtual BotServ::BadWord *AddBadWord(const Anope::string &word, BotServ::BadWordType type) = 0;
+
+	/** Get a badword structure by index
+	 * @param index The index
+	 * @return The badword
+	 */
+	virtual BotServ::BadWord *GetBadWord(unsigned index) const = 0;
+
+	/** Get how many badwords are on this channel
+	 * @return The number of badwords in the vector
+	 */
+	virtual unsigned GetBadWordCount() const = 0;
+
+	/** Remove a badword
+	 * @param index The index of the badword
+	 */
+	virtual void EraseBadWord(unsigned index) = 0;
+
+	/** Clear all badwords from the channel
+	 */
+	virtual void ClearBadWords() = 0;
+
+	virtual void Check() = 0;
+};

include/modules/botserv/kick.h

@@ -0,0 +1,57 @@
+// Anope IRC Services <https://www.anope.org/>
+//
+// Copyright (C) 2003-2026 Anope Contributors
+//
+// Anope is free software. You can use, modify, and/or distribute it under the
+// terms of version 2 of the GNU General Public License. See docs/LICENSE.txt
+// for the complete terms of this license and docs/AUTHORS.txt for a list of
+// contributors.
+//
+// Based on the original code of Epona by Lara
+// Based on the original code of Services by Andy Church
+//
+// SPDX-License-Identifier: GPL-2.0-only
+
+#pragma once
+
+#define BOTSERV_KICKER_DATA_EXT "kickerdata"
+
+namespace BotServ
+{
+	class KickerData;
+
+	/* Indices for TTB (Times To Ban) */
+	enum
+	{
+		TTB_BOLDS,
+		TTB_COLORS,
+		TTB_REVERSES,
+		TTB_UNDERLINES,
+		TTB_BADWORDS,
+		TTB_CAPS,
+		TTB_FLOOD,
+		TTB_REPEAT,
+		TTB_ITALICS,
+		TTB_AMSGS,
+		TTB_SIZE
+	};
+}
+
+
+class BotServ::KickerData
+{
+protected:
+	KickerData() = default;
+
+public:
+	bool amsgs, badwords, bolds, caps, colors, flood, italics, repeat, reverses, underlines;
+	int16_t ttb[BotServ::TTB_SIZE];                    /* Times to ban for each kicker */
+	int16_t capsmin, capspercent;	          /* For CAPS kicker */
+	int16_t floodlines, floodsecs;            /* For FLOOD kicker */
+	int16_t repeattimes;                      /* For REPEAT kicker */
+
+	bool dontkickops, dontkickvoices;
+
+	virtual ~KickerData() = default;
+	virtual void Check(ChannelInfo *ci) = 0;
+};

include/modules/chanserv/akick.h

@@ -0,0 +1,108 @@
+// Anope IRC Services <https://www.anope.org/>
+//
+// Copyright (C) 2003-2026 Anope Contributors
+//
+// Anope is free software. You can use, modify, and/or distribute it under the
+// terms of version 2 of the GNU General Public License. See docs/LICENSE.txt
+// for the complete terms of this license and docs/AUTHORS.txt for a list of
+// contributors.
+//
+// Based on the original code of Epona by Lara
+// Based on the original code of Services by Andy Church
+//
+// SPDX-License-Identifier: GPL-2.0-only
+
+#pragma once
+
+#define CHANSERV_AUTO_KICK_TYPE "AutoKick"
+#define CHANSERV_AUTO_KICK_SERVICE "ChanServ::AutoKickService"
+
+namespace ChanServ
+{
+	class AutoKick;
+	class AutoKickService;
+
+	ServiceReference<AutoKickService> akick_service(CHANSERV_AUTO_KICK_SERVICE, CHANSERV_AUTO_KICK_SERVICE);
+}
+
+class ChanServ::AutoKickService
+	: public Service
+{
+public:
+	AutoKickService(Module *m)
+		: Service(m, CHANSERV_AUTO_KICK_SERVICE, CHANSERV_AUTO_KICK_SERVICE)
+	{
+	}
+
+	/** Add an akick entry to the channel by NickCore
+	 * @param user The user who added the akick
+	 * @param akicknc The nickcore being akicked
+	 * @param reason The reason for the akick
+	 * @param t The time the akick was added, defaults to now
+	 * @param lu The time the akick was last used, defaults to never
+	 */
+	virtual AutoKick *AddAKick(ChannelInfo *ci, const Anope::string &user, NickCore *akicknc, const Anope::string &reason, time_t t = Anope::CurTime, time_t lu = 0) = 0;
+
+	/** Add an akick entry to the channel by reason
+	 * @param user The user who added the akick
+	 * @param mask The mask of the akick
+	 * @param reason The reason for the akick
+	 * @param t The time the akick was added, defaults to now
+	 * @param lu The time the akick was last used, defaults to never
+	 */
+	virtual AutoKick *AddAKick(ChannelInfo *ci, const Anope::string &user, const Anope::string &mask, const Anope::string &reason, time_t t = Anope::CurTime, time_t lu = 0)  = 0;
+
+	/** Get an entry from the channel akick list
+	 * @param index The index in the akick vector
+	 * @return The akick structure, or NULL if not found
+	 */
+	virtual AutoKick *GetAKick(ChannelInfo *ci, unsigned index) = 0;
+
+	/** Get the size of the akick vector for this channel
+	 * @return The akick vector size
+	 */
+	virtual unsigned GetAKickCount(ChannelInfo *ci) = 0;
+
+	/** Erase an entry from the channel akick list
+	 * @param index The index of the akick
+	 */
+	virtual void EraseAKick(ChannelInfo *ci, unsigned index) = 0;
+	virtual void EraseAKick(ChannelInfo *ci, AutoKick *akick) = 0;
+
+	/** Clear the whole akick list
+	 */
+	virtual void ClearAKick(ChannelInfo *ci) = 0;
+};
+
+class ChanServ::AutoKick final
+	: public Serializable
+{
+public:
+	/* Channel this autokick is on */
+	Serialize::Reference<ChannelInfo> ci;
+
+	Anope::string mask;
+	Serialize::Reference<NickCore> nc;
+
+	Anope::string reason;
+	Anope::string creator;
+	time_t addtime;
+	time_t last_used;
+
+	AutoKick()
+		: Serializable(CHANSERV_AUTO_KICK_TYPE)
+	{
+	}
+
+	~AutoKick()
+	{
+		if (!this->ci)
+			return;
+
+		if (ChanServ::akick_service)
+			ChanServ::akick_service->EraseAKick(this->ci, this);
+
+		if (this->nc)
+			this->nc->RemoveChannelReference(this->ci);
+	}
+};

include/modules/chanserv/entrymsg.h

@@ -0,0 +1,57 @@
+// Anope IRC Services <https://www.anope.org/>
+//
+// Copyright (C) 2003-2026 Anope Contributors
+//
+// Anope is free software. You can use, modify, and/or distribute it under the
+// terms of version 2 of the GNU General Public License. See docs/LICENSE.txt
+// for the complete terms of this license and docs/AUTHORS.txt for a list of
+// contributors.
+//
+// Based on the original code of Epona by Lara
+// Based on the original code of Services by Andy Church
+//
+// SPDX-License-Identifier: GPL-2.0-only
+
+#pragma once
+
+#define CHANSERV_ENTRY_MESSAGE_EXT "entrymsg"
+#define CHANSERV_ENTRY_MESSAGE_TYPE "EntryMsg"
+
+namespace ChanServ
+{
+	class EntryMessage;
+	class EntryMessageList;
+}
+
+class ChanServ::EntryMessage
+{
+protected:
+	EntryMessage() = default;
+
+public:
+	Anope::string chan;
+	Anope::string creator;
+	Anope::string message;
+	time_t when = 0;
+
+	virtual ~EntryMessage() = default;
+};
+
+class ChanServ::EntryMessageList
+	: public Serialize::Checker<std::vector<ChanServ::EntryMessage *>>
+{
+protected:
+	EntryMessageList()
+		: Serialize::Checker<std::vector<ChanServ::EntryMessage *>>(CHANSERV_ENTRY_MESSAGE_TYPE)
+	{
+	}
+
+public:
+	virtual ~EntryMessageList()
+	{
+		for (auto i = (*this)->size(); i > 0; --i)
+			delete (*this)->at(i - 1);
+	}
+
+	virtual ChanServ::EntryMessage *Create() = 0;
+};