Merge branch 'insp3' into insp4.

.github/ISSUE_TEMPLATE/BUG_REPORT.md

@@ -12,7 +12,7 @@ The GitHub issue tracker is for bug reports ONLY. General support can be found a
 
 Discussions: https://github.com/inspircd/inspircd/discussions
 Docs: https://docs.inspircd.org
-IRC: irc.chatspike.net #inspircd
+IRC: irc.inspircd.org #inspircd
 Example configs (v3): https://github.com/inspircd/inspircd/tree/insp3/docs/conf
 Example configs (v4): https://github.com/inspircd/inspircd/tree/insp4/docs/conf
 -->

.github/ISSUE_TEMPLATE/FEATURE_REQUEST.md

@@ -10,7 +10,7 @@ The GitHub issue tracker is for feature requests ONLY. General support can be fo
 
 Discussions: https://github.com/inspircd/inspircd/discussions
 Docs: https://docs.inspircd.org
-IRC: irc.chatspike.net #inspircd
+IRC: irc.inspircd.org #inspircd
 Example configs (v3): https://github.com/inspircd/inspircd/tree/insp3/docs/conf
 Example configs (v4): https://github.com/inspircd/inspircd/tree/insp4/docs/conf
 -->

.github/SECURITY.md

@@ -18,6 +18,6 @@ Version | Supported
 
 ## Reporting a Vulnerability
 
-Please do not report security vulnerabilities on GitHub. Instead, get the attention of a developer in our development IRC channel at irc.chatspike.net #inspircd.dev and PM them the details.
+Please do not report security vulnerabilities on GitHub. Instead, get the attention of a developer in our development IRC channel at irc.inspircd.org #inspircd.dev 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/workflows/misspell-fixer.yml

@@ -31,7 +31,7 @@ jobs:
     - uses: sobolevn/misspell-fixer-action@master
       with:
         options: '-rvnfuRVD .'
-    - uses: peter-evans/create-pull-request@v6
+    - uses: peter-evans/create-pull-request@v7
       with:
         token: ${{ secrets.GITHUB_TOKEN }}
         branch: ${{ env.REF_BRANCH }}+fix-spellings-${{ env.DATE }}

README.md

@@ -44,6 +44,6 @@ InspIRCd is licensed under [version 2 of the GNU General Public License](https:/
 * [Documentation](https://docs.inspircd.org)
 * [GitHub](https://github.com/inspircd)
 * [Social Media](https://docs.inspircd.org/social)
-* Support IRC channel — \#inspircd on irc.chatspike.net
-* Development IRC channel — \#inspircd.dev on irc.chatspike.net
+* Support IRC channel — \#inspircd on irc.inspircd.org
+* Development IRC channel — \#inspircd.dev on irc.inspircd.org
 * InspIRCd test network — testnet.inspircd.org

docs/LICENSE.txt

@@ -2,7 +2,7 @@
 
       "Upgrading" to a later version of the GENERAL PUBLIC
       LICENSE is not permitted. For further information on
-      this, please contact us at irc.chatspike.net on #inspircd.
+      this, please contact us at irc.inspircd.org on #inspircd.
 
 ----------------------------------------------------------------------
 

docs/conf/motd.example.txt

@@ -24,7 +24,7 @@
       +---- To change this see \bmotd.example.txt\x ----+
       |                                             |
       |   * \bWeb:\x https://www.inspircd.org           |
-      |   * \bIRC:\x irc.chatspike.net #inspircd        |
+      |   * \bIRC:\x irc.inspircd.org #inspircd         |
       |   * \bDocs:\x https://docs.inspircd.org         |
       |   * \bIssues:\x https://git.io/JIuYi            |
       |   * \bDiscussions:\x https://git.io/JIuYv       |

docs/conf/opermotd.example.txt

@@ -24,7 +24,7 @@
       +-- To change this see \bopermotd.example.txt\x --+
       |                                             |
       |   * \bWeb:\x https://www.inspircd.org           |
-      |   * \bIRC:\x irc.chatspike.net #inspircd        |
+      |   * \bIRC:\x irc.inspircd.org #inspircd         |
       |   * \bDocs:\x https://docs.inspircd.org         |
       |   * \bIssues:\x https://git.io/JIuYi            |
       |   * \bDiscussions:\x https://git.io/JIuYv       |

include/usermanager.h

@@ -140,6 +140,9 @@ public:
 	 */
 	void RehashCloneCounts();
 
+	/** Rebuilds the list of services servers. Required when \<services> settings change. */
+	void RehashServices();
+
 	/** Return the number of local and global clones of this user
 	 * @param user The user to get the clone counts for
 	 * @return The clone counts of this user. The returned reference is volatile - you

make/configure.pm

@@ -179,7 +179,7 @@ non-interactive configuration is started and any omitted values are defaulted.
   <|BOLD INSPIRCD_VERBOSE=<0|1>|>        Shows additional information for debugging.
 
 If you have any problems with configuring InspIRCd then visit our IRC channel
-at irc.chatspike.net #InspIRCd or create a support discussion at
+at irc.inspircd.org #InspIRCd or create a support discussion at
 https://github.com/inspircd/inspircd/discussions.
 
 Packagers: see https://docs.inspircd.org/packaging/ for packaging advice.

make/directive.pm

@@ -161,7 +161,7 @@ sub __error {
 	push @message, '';
 
 	push @message, 'If you would like help with fixing this problem then visit our IRC';
-	push @message, 'channel at irc.chatspike.net #InspIRCd or create a support discussion';
+	push @message, 'channel at irc.inspircd.org #InspIRCd or create a support discussion';
 	push @message, 'at https://github.com/inspircd/inspircd/discussions.';
 	push @message, '';
 

make/template/help.txt

@@ -4,7 +4,7 @@ In order to get your server running you need to create config files. Examples
 can be found at `@EXAMPLE_DIR@`.
 
 If you need any help with this then you can visit our support channel at
-irc.chatspike.net #inspircd, open a support discussion at https://git.io/JIuYv,
+irc.inspircd.org #inspircd, open a support discussion at https://git.io/JIuYv,
 or refer to the the docs site:
 
 	https://docs.inspircd.org/@VERSION_MAJOR@/configuration

make/template/inspircd-testssl.1

@@ -41,6 +41,6 @@ The TCP port to connect to.
 Disables checking whether the server certificate is signed by a Certificate Authority.
 
 .SH "SUPPORT"
-IRC support for InspIRCd can be found at ircs://irc.chatspike.net/inspircd.
+IRC support for InspIRCd can be found at ircs://irc.inspircd.org/inspircd.
 
 Bug reports and feature requests can be filed at https://github.com/inspircd/inspircd/issues.

make/template/inspircd.1

@@ -61,6 +61,6 @@ Allow the server to start as root (not recommended).
 Displays the InspIRCd version and exits.
 
 .SH "SUPPORT"
-IRC support for InspIRCd can be found at ircs://irc.chatspike.net/inspircd.
+IRC support for InspIRCd can be found at ircs://irc.inspircd.org/inspircd.
 
 Bug reports and feature requests can be filed at https://github.com/inspircd/inspircd/issues.

src/configreader.cpp

@@ -754,6 +754,7 @@ void ConfigReaderThread::OnStop()
 
 		// The description of this server may have changed - update it for WHOIS etc.
 		ServerInstance->FakeClient->server->description = Config->ServerDesc;
+		ServerInstance->Users.RehashServices();
 
 		try
 		{

src/usermanager.cpp

@@ -350,6 +350,17 @@ void UserManager::RehashCloneCounts()
 		AddClone(u);
 }
 
+void UserManager::RehashServices()
+{
+	UserManager::ServiceList newservices;
+	for (const auto& [_, user] : ServerInstance->Users.GetUsers())
+	{
+		if (user->server->IsService())
+			newservices.push_back(user);
+	}
+	std::swap(ServerInstance->Users.all_services, newservices);
+}
+
 const UserManager::CloneCounts& UserManager::GetCloneCounts(User* user) const
 {
 	CloneMap::const_iterator it = clonemap.find(user->GetCIDRMask());

tools/testssl

@@ -170,5 +170,5 @@ You may also find running some of the following commands to be helpful:
    openssl s_client -connect $hostip:$port -debug -security_debug
 
 If you need any help working out what is wrong then visit our support channel
-at irc.chatspike.net #inspircd.
+at irc.inspircd.org #inspircd.
 EOM