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

.github/workflows/check-release.yml

@@ -0,0 +1,11 @@
+on: [push, pull_request]
+name: Check & Release
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@master
+      - name: lint
+        uses: Roang-zero1/factorio-mod-luacheck@master
+        with:
+          luacheckrc_url: https://raw.githubusercontent.com/minetest-mods/irc/master/.luacheckrc

.luacheckrc

@@ -2,7 +2,7 @@
 allow_defined_top = true
 
 read_globals = {
-	"minetest",
+	"minetest"
 }
 
 exclude_files = {

README.md

@@ -1,3 +1,4 @@
+[![](https://github.com/minetest-mods/irc/workflows/Check%20&%20Release/badge.svg)](https://github.com/minetest-mods/irc/actions)
 
 IRC Mod for Minetest
 ====================

botcmds.lua

@@ -139,7 +139,7 @@ irc.register_bot_command("whereis", {
 			return false, "There is no player named '"..args.."'"
 		end
 		local fmt = "Player %s is at (%.2f,%.2f,%.2f)"
-		local pos = player:getpos()
+		local pos = player:get_pos()
 		return true, fmt:format(args, pos.x, pos.y, pos.z)
 	end
 })

config.lua

@@ -7,7 +7,6 @@ irc.config = {}
 local function setting(stype, name, default, required)
 	local value
 	if minetest.settings and minetest.settings.get and minetest.settings.get_bool then
-		-- The current methods for getting settings
 		if stype == "bool" then
 			value = minetest.settings:get_bool("irc."..name)
 		elseif stype == "string" then
@@ -15,15 +14,6 @@ local function setting(stype, name, default, required)
 		elseif stype == "number" then
 			value = tonumber(minetest.settings:get("irc."..name))
 		end
-	else
-		-- The old methods for getting settings for backward compatibility. Deprecated on 0.4.16+
-		if stype == "bool" then
-			value = minetest.setting_getbool("irc."..name)
-		elseif stype == "string" then
-			value = minetest.setting_get("irc."..name)
-		elseif stype == "number" then
-			value = tonumber(minetest.setting_get("irc."..name))
-		end
 	end
 	if value == nil then
 		if required then

description.txt

@@ -1,4 +0,0 @@
-This mod is just a glue between IRC and Minetest.
-
-It provides two-way communication between the
-in-game chat, and an arbitrary IRC channel.

hooks.lua

@@ -120,6 +120,8 @@ function irc.hooks.channelChat(msg)
 		text:find("^%*%*%* ([^%s]+) joined the game$")
 	local foundleave, _, leavenick =
 		text:find("^%*%*%* ([^%s]+) left the game$")
+	local foundtimedout, _, timedoutnick =
+		text:find("^%*%*%* ([^%s]+) left the game %(Timed out%)$")
 	local foundaction, _, actionnick, actionmessage =
 		text:find("^%* ([^%s]+) (.*)$")
 
@@ -134,6 +136,9 @@ function irc.hooks.channelChat(msg)
 	elseif foundleave then
 		irc.sendLocal(("*** %s left %s")
 				:format(leavenick, msg.user.nick))
+	elseif foundtimedout then
+		irc.sendLocal(("*** %s left %s (Timed out)")
+				:format(timedoutnick, msg.user.nick))
 	elseif foundaction then
 		irc.sendLocal(("* %s@%s %s")
 				:format(actionnick, msg.user.nick, actionmessage))

init.lua

@@ -23,11 +23,18 @@ ie.package.path =
 -- /usr/local/share and /usr/local/lib but LuaSocket is often installed under
 -- /usr/share and /usr/lib.
 if not rawget(_G, "jit") and package.config:sub(1, 1) == "/" then
+
 	ie.package.path = ie.package.path..
 			";/usr/share/lua/5.1/?.lua"..
 			";/usr/share/lua/5.1/?/init.lua"
+
 	ie.package.cpath = ie.package.cpath..
-			";/usr/lib/lua/5.1/?.so"
+			";/usr/lib/lua/5.1/?.so"..
+			";/usr/lib64/lua/5.1/?.so"
+
+	ie.package.cpath = "/usr/lib/x86_64-linux-gnu/lua/5.1/?.so;"..ie.package.cpath
+
+
 end
 
 -- Temporarily set require so that LuaIRC can access it
@@ -104,7 +111,8 @@ end
 
 minetest.register_privilege("irc_admin", {
 	description = "Allow IRC administrative tasks to be performed.",
-	give_to_singleplayer = true
+	give_to_singleplayer = true,
+	give_to_admin = true,
 })
 
 local stepnum = 0

mod.conf

@@ -1 +1,5 @@
 name = irc
+description = """
+This mod is just a glue between IRC and Minetest.
+It provides two-way communication between the in-game chat, and an arbitrary IRC channel.
+"""

player_part.lua

@@ -13,6 +13,8 @@ end
 function irc.player_join(name)
 	if irc.joined_players[name] then
 		return false, "You are already in the channel"
+	elseif not minetest.get_player_by_name(name) then
+		return false, "You need to be in-game to join the channel"
 	end
 	irc.joined_players[name] = true
 	return true, "You joined the channel"