Add custom ChatCmdBuilder patterns

.luacheckrc

@@ -5,7 +5,8 @@ exclude_files = {"mods/mtg", "mods/libs/lib_chatcmdbuilder", "mods/areas"}
 
 globals = {
     "minetest", "company",
-    "areas", "sfinv"
+    "areas", "sfinv",
+    ChatCmdBuilder = {fields = {"types"}}
 }
 
 read_globals = {

mods/capitalism/banking/chatcmds.lua

@@ -3,7 +3,7 @@ minetest.register_privilege("banking_admin", {
 })
 
 ChatCmdBuilder.new("banking", function(cmd)
-	cmd:sub("give :owner :amount:int", function(name, owner, amount)
+	cmd:sub("give :owner:owner :amount:int", function(name, owner, amount)
 		if not minetest.check_player_privs(name, { banking_admin = true }) then
 			return false, "Missing privilege: banking_admin"
 		end
@@ -19,7 +19,7 @@ ChatCmdBuilder.new("banking", function(cmd)
 		return true, "Gave " .. acc.balance .. " to " .. owner
 	end)
 
-	cmd:sub("transfer :to :amount:int :reason:text", function(name, to, amount, reason)
+	cmd:sub("transfer :to:owner :amount:int :reason:text", function(name, to, amount, reason)
 		local comp = company.get_active(name)
 		if not comp then
 			return false, "You need to select a company to operate as using /company use <name>"

mods/capitalism/company/chatcmds.lua

@@ -1,5 +1,8 @@
 local adt = audit("company.cmd")
 
+ChatCmdBuilder.types.comp  = "(c:[a-z]+)"
+ChatCmdBuilder.types.owner = "(c?:?[a-z]+)"
+
 ChatCmdBuilder.new("company", function(cmd)
 	cmd:sub("list", function(name)
 		if #company._companies == 0 then
@@ -34,7 +37,7 @@ ChatCmdBuilder.new("company", function(cmd)
 		end
 	end)
 
-	cmd:sub("show :cname", function(name, cname)
+	cmd:sub("show :cname:comp", function(name, cname)
 		local comp = company.get_by_name(cname)
 		if not comp then
 			return false, "No company by the name '" .. cname  .. "' found"
@@ -49,7 +52,7 @@ ChatCmdBuilder.new("company", function(cmd)
 		return true, msg
 	end)
 
-	cmd:sub("use :cname", function(name, cname)
+	cmd:sub("use :cname:comp", function(name, cname)
 		if company.set_active(name, cname) then
 			return true, "You are now operating as " .. cname
 		else

mods/capitalism/land/chatcmds.lua

@@ -13,7 +13,7 @@ ChatCmdBuilder.new("land", function(cmd)
 		return true, "Showed land debug form"
 	end)
 
-	cmd:sub("owner :id:int :newowner", function(name, id, newowner)
+	cmd:sub("owner :id:int :newowner:owner", function(name, id, newowner)
 		return land.transfer(id, newowner, name)
 	end)
 

mods/libs/lib_chatcmdbuilder

@@ -1 +1 @@
-Subproject commit 4407c02bf533ccfc4aca517adacd836cd95c97d8
+Subproject commit c3e01dd7720fdfff54aba40bed2919bc9e9d32bf