Merge remote-tracking branch 'upstream/master' into nalc-1.2-dev

.gitmodules

@@ -1,3 +1,3 @@
-[submodule "src/LuaIRC"]
+[submodule "irc"]
 	path = irc
-	url = https://github.com/ShadowNinja/LuaIRC.git
+	url = https://sys4.fr/gitea/mtcontrib/LuaIRC.git

botcmds.lua

@@ -169,10 +169,8 @@ irc.register_bot_command("players", {
 		for _, player in pairs(players) do
 			table.insert(names, player:get_player_name())
 		end
-		return true, string.format("%d connected player(s): %s",
-			#players,
-			table.concat(names, ", ")
-		)
+		return true, "Connected players: "
+				..table.concat(names, ", ")
 	end
 })
 

callback.lua

@@ -31,7 +31,7 @@ minetest.register_on_chat_message(function(name, message)
 	if nl then
 		message = message:sub(1, nl - 1)
 	end
-	irc.say(irc.playerMessage(name, minetest.strip_colors(message)))
+	irc.say(irc.playerMessage(name, core.strip_colors(message)))
 end)
 
 

hooks.lua

@@ -171,7 +171,7 @@ end
 
 
 function irc.hooks.notice(user, target, message)
-	if user and user.nick and target == irc.config.channel then
+	if user.nick and target == irc.config.channel then
 		irc.sendLocal("-"..user.nick.."@IRC- "..message)
 	end
 end

init.lua

@@ -224,3 +224,4 @@ function irc.queue(msg)
 	irc.conn:queue(msg)
 end
 
+minetest.log("action", "[irc] loaded.")

player_part.lua

@@ -47,7 +47,7 @@ minetest.register_chatcommand("who", {
 			out[n] = plname
 		end
 		table.sort(out)
-		return true, n.." player(s) in channel: "..table.concat(out, ", ")
+		return true, "Players in channel: "..table.concat(out, ", ")
 	end
 })