Merge remote-tracking branch 'upstream/2.0' into 2.0

Author: siniStar7

.github/workflows/ci-linux.yml

@@ -2,6 +2,7 @@ name: Ubuntu CI
 on:
   - pull_request
   - push
+  - workflow_dispatch
 jobs:
   build:
     if: "!contains(github.event.head_commit.message, '[skip ubuntu ci]')"
@@ -10,7 +11,7 @@ jobs:
       CXX: ${{ matrix.compiler }}
       CXXFLAGS: -std=${{ matrix.standard }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
 
       - name: Install dependencies
         run: |

.github/workflows/ci-windows.yml

@@ -5,6 +5,7 @@ on:
   release:
     types:
       - published
+  workflow_dispatch:
 jobs:
   build:
     if: "!contains(github.event.head_commit.message, '[skip windows ci]')"
@@ -14,7 +15,7 @@ jobs:
       CONAN_USER_HOME: ${{ github.workspace }}/win/build
       CONAN_USER_HOME_SHORT: None
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
 
       - name: Setup NSIS
         run: |-
@@ -64,3 +65,10 @@ jobs:
           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@v5
+        with:
+          name: windows-installer
+          path: ${{ github.workspace }}\build\\anope-*.exe

modules/commands/cs_enforce.cpp

@@ -56,7 +56,8 @@ class CommandCSEnforce : public Command
 			if (user->IsProtected())
 				continue;
 
-			if (ci->AccessFor(user).empty())
+			AccessGroup access = ci->AccessFor(user);
+			if (!access.founder && access.empty())
 				users.push_back(user);
 		}
 
@@ -201,7 +202,8 @@ class CommandCSEnforce : public Command
 			if (user->IsProtected())
 				continue;
 
-			if (!ci->AccessFor(user).empty())
+			AccessGroup access = ci->AccessFor(user);
+			if (access.founder || !access.empty())
 				continue;
 
 			if (ci->c->users.size() - users.size() <= static_cast<unsigned>(l))

modules/commands/cs_mode.cpp

@@ -110,6 +110,9 @@ struct ModeLocksImpl : ModeLocks
 
 			if (m->name == mode->name)
 			{
+				if (m->set != status)
+					continue;
+
 				// For list or status modes, we must check the parameter
 				if (mode->type == MODE_LIST || mode->type == MODE_STATUS)
 					if (m->param != param)

modules/extra/stats/irc2sql/irc2sql.cpp

@@ -198,7 +198,7 @@ void IRC2SQL::OnSetDisplayedHost(User *u)
 void IRC2SQL::OnChannelCreate(Channel *c)
 {
 	query = "INSERT INTO `" + prefix + "chan` (channel, topic, topicauthor, topictime, modes) "
-		"VALUES (@channel@,@topic@,@topicauthor@,@topictime@,@modes@) "
+		"VALUES (@channel@,@topic@,@topicauthor@,FROM_UNIXTIME(@topictime@),@modes@) "
 		"ON DUPLICATE KEY UPDATE channel=VALUES(channel), topic=VALUES(topic),"
 			"topicauthor=VALUES(topicauthor), topictime=VALUES(topictime), modes=VALUES(modes)";
 	query.SetValue("channel", c->name);

modules/m_dns.cpp

@@ -1011,12 +1011,6 @@ class ModuleDNS : public Module
 {
 	MyManager manager;
 
-	Anope::string nameserver;
-	Anope::string ip;
-	int port;
-
-	std::vector<std::pair<Anope::string, short> > notify;
-
  public:
 	ModuleDNS(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, EXTRA | VENDOR), manager(this)
 	{
@@ -1039,14 +1033,15 @@ class ModuleDNS : public Module
 	{
 		Configuration::Block *block = conf->GetModule(this);
 
-		nameserver = block->Get<const Anope::string>("nameserver", "127.0.0.1");
-		timeout =  block->Get<time_t>("timeout", "5");
-		ip = block->Get<const Anope::string>("ip", "0.0.0.0");
-		port = block->Get<int>("port", "53");
+		Anope::string nameserver = block->Get<const Anope::string>("nameserver", "127.0.0.1");
+		timeout = block->Get<time_t>("timeout", "5");
+		Anope::string ip = block->Get<const Anope::string>("ip", "0.0.0.0");
+		int port = block->Get<int>("port", "53");
 		admin = block->Get<const Anope::string>("admin", "[email protected]");
 		nameservers = block->Get<const Anope::string>("nameservers", "ns1.example.com");
 		refresh = block->Get<int>("refresh", "3600");
 
+		std::vector<std::pair<Anope::string, short> > notify;
 		for (int i = 0; i < block->CountBlock("notify"); ++i)
 		{
 			Configuration::Block *n = block->GetBlock("notify", i);