From 3a9ff2563fe5ad62f190b77171b9cc24d9b9ad98 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Oct 2024 13:17:49 +0000 Subject: [PATCH 1/3] Bump peter-evans/create-pull-request from 6 to 7 Bumps [peter-evans/create-pull-request](https://github.com/peter-evans/create-pull-request) from 6 to 7. - [Release notes](https://github.com/peter-evans/create-pull-request/releases) - [Commits](https://github.com/peter-evans/create-pull-request/compare/v6...v7) --- updated-dependencies: - dependency-name: peter-evans/create-pull-request dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/misspell-fixer.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/misspell-fixer.yml b/.github/workflows/misspell-fixer.yml index 61aac36c9..a106c5109 100644 --- a/.github/workflows/misspell-fixer.yml +++ b/.github/workflows/misspell-fixer.yml @@ -30,7 +30,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 }} From 522c202a9ca8f848fdc1f6c1223ca21699204625 Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Tue, 8 Oct 2024 01:29:56 +0100 Subject: [PATCH 2/3] Revert "Tell people to use the main ChatSpike domain not our alias". This reverts commit 78c4f3bd97d003d0f528d98752e0528023b27045. --- .github/ISSUE_TEMPLATE/BUG_REPORT.md | 2 +- .github/ISSUE_TEMPLATE/FEATURE_REQUEST.md | 2 +- .github/SECURITY.md | 2 +- README.md | 4 ++-- docs/LICENSE.txt | 2 +- docs/conf/motd.txt.example | 2 +- docs/conf/opermotd.txt.example | 2 +- make/configure.pm | 2 +- make/directive.pm | 2 +- make/template/help.txt | 2 +- make/template/inspircd-genssl.1 | 2 +- make/template/inspircd-testssl.1 | 2 +- make/template/inspircd.1 | 2 +- tools/testssl | 2 +- 14 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/BUG_REPORT.md b/.github/ISSUE_TEMPLATE/BUG_REPORT.md index 2a5e9cb09..e299326fb 100644 --- a/.github/ISSUE_TEMPLATE/BUG_REPORT.md +++ b/.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: https://github.com/inspircd/inspircd/tree/insp3/docs/conf --> diff --git a/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.md b/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.md index 34598fff0..12109cc5d 100644 --- a/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.md +++ b/.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: https://github.com/inspircd/inspircd/tree/insp3/docs/conf --> diff --git a/.github/SECURITY.md b/.github/SECURITY.md index 184c3c773..b39b39693 100644 --- a/.github/SECURITY.md +++ b/.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. diff --git a/README.md b/README.md index 1ced42357..24671618a 100644 --- a/README.md +++ b/README.md @@ -40,6 +40,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 diff --git a/docs/LICENSE.txt b/docs/LICENSE.txt index e8de3f876..6e2ceda85 100644 --- a/docs/LICENSE.txt +++ b/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. ---------------------------------------------------------------------- diff --git a/docs/conf/motd.txt.example b/docs/conf/motd.txt.example index 412451396..cd993e9a3 100644 --- a/docs/conf/motd.txt.example +++ b/docs/conf/motd.txt.example @@ -24,7 +24,7 @@ +---- To change this see \bmotd.txt.example\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 | diff --git a/docs/conf/opermotd.txt.example b/docs/conf/opermotd.txt.example index 40d49d7a5..b0d9b4816 100644 --- a/docs/conf/opermotd.txt.example +++ b/docs/conf/opermotd.txt.example @@ -24,7 +24,7 @@ +-- To change this see \bopermotd.txt.example\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 | diff --git a/make/configure.pm b/make/configure.pm index bf493d802..a31c6ee79 100644 --- a/make/configure.pm +++ b/make/configure.pm @@ -180,7 +180,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. diff --git a/make/directive.pm b/make/directive.pm index dfa3df59e..ed3f88fc2 100644 --- a/make/directive.pm +++ b/make/directive.pm @@ -153,7 +153,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, ''; diff --git a/make/template/help.txt b/make/template/help.txt index 160c9fbbd..c2d798d35 100644 --- a/make/template/help.txt +++ b/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 diff --git a/make/template/inspircd-genssl.1 b/make/template/inspircd-genssl.1 index 582db0814..e71806381 100644 --- a/make/template/inspircd-genssl.1 +++ b/make/template/inspircd-genssl.1 @@ -42,6 +42,6 @@ Generates certificates using GnuTLS. Generates certificates using OpenSSL. .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. diff --git a/make/template/inspircd-testssl.1 b/make/template/inspircd-testssl.1 index 02d48911e..c9125ac47 100644 --- a/make/template/inspircd-testssl.1 +++ b/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. diff --git a/make/template/inspircd.1 b/make/template/inspircd.1 index 40e8b37c2..7ddefd112 100644 --- a/make/template/inspircd.1 +++ b/make/template/inspircd.1 @@ -103,6 +103,6 @@ The server exited because it was unable to load a module on first run. The server exited because it received SIGTERM. .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. diff --git a/tools/testssl b/tools/testssl index d7fc4f2d8..543993cbd 100755 --- a/tools/testssl +++ b/tools/testssl @@ -176,5 +176,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 From 5eb21f239bf89b0615612cb7b7b8fa5f1e13fb73 Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Thu, 10 Oct 2024 14:47:24 +0100 Subject: [PATCH 3/3] When a server stops being ulined remove its users from the uline list. --- include/usermanager.h | 3 +++ src/configreader.cpp | 1 + src/usermanager.cpp | 13 +++++++++++++ 3 files changed, 17 insertions(+) diff --git a/include/usermanager.h b/include/usermanager.h index bf9567d43..681c5e059 100644 --- a/include/usermanager.h +++ b/include/usermanager.h @@ -141,6 +141,9 @@ class CoreExport UserManager : public fakederef */ void RehashCloneCounts(); + /** Rebuilds the list of services servers. Required when \ settings change. */ + void RehashULines(); + /** 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 diff --git a/src/configreader.cpp b/src/configreader.cpp index d1b55a113..f5f9f1ce8 100644 --- a/src/configreader.cpp +++ b/src/configreader.cpp @@ -733,6 +733,7 @@ void ConfigReaderThread::Finish() ServerInstance->FakeClient->server->description = Config->ServerDesc; ServerInstance->ISupport.Build(); + ServerInstance->Users.RehashULines(); ServerInstance->Logs->CloseLogs(); ServerInstance->Logs->OpenFileLogs(); diff --git a/src/usermanager.cpp b/src/usermanager.cpp index d410131f4..c20609a2c 100644 --- a/src/usermanager.cpp +++ b/src/usermanager.cpp @@ -353,6 +353,19 @@ void UserManager::RehashCloneCounts() } } +void UserManager::RehashULines() +{ + UserManager::ULineList newulines; + const user_hash& users = ServerInstance->Users.GetUsers(); + for (user_hash::const_iterator i = users.begin(); i != users.end(); ++i) + { + User* user = i->second; + if (user->server->IsULine()) + newulines.push_back(user); + } + std::swap(ServerInstance->Users.all_ulines, newulines); +} + const UserManager::CloneCounts& UserManager::GetCloneCounts(User* user) const { CloneMap::const_iterator it = clonemap.find(user->GetCIDRMask());