From 9c26bb8670a3f04d7021ccc2f958c7c3afece74c Mon Sep 17 00:00:00 2001 From: AliasAlreadyTaken Date: Fri, 25 Feb 2022 18:39:26 +0100 Subject: [PATCH] Localize settings --- config.lua | 11 ----------- init.lua | 11 +++++++---- 2 files changed, 7 insertions(+), 15 deletions(-) delete mode 100644 config.lua diff --git a/config.lua b/config.lua deleted file mode 100644 index 47999c9..0000000 --- a/config.lua +++ /dev/null @@ -1,11 +0,0 @@ - --- Setting a configuration, switch the order in which the settings shall take precedence. First valid one taken. - -yl_matterbridge.address = minetest.settings:get("yl_matterbridge.address") or "error" -yl_matterbridge.port = minetest.settings:get("yl_matterbridge.port") or "error" -yl_matterbridge.gateway = minetest.settings:get("yl_matterbridge.gateway") or "error" -yl_matterbridge.token = minetest.settings:get("yl_matterbridge.token") or "error" - ---yl_matterbridge.save_path = "yl_matterbridge" or minetest.settings:get("yl_matterbridge.save_path") or "default" - ---yl_matterbridge.admin_priv = "admin_priv" or minetest.settings:get("yl_matterbridge.admin_priv") or "server" \ No newline at end of file diff --git a/init.lua b/init.lua index 4e24517..75bb607 100644 --- a/init.lua +++ b/init.lua @@ -20,18 +20,21 @@ yl_matterbridge.information.license = "MIT" yl_matterbridge.information.name = "yl_matterbridge" yl_matterbridge.information.additional = "Additional information" -dofile(yl_matterbridge.modpath .. "config.lua") +local address = minetest.settings:get("yl_matterbridge.address") or false +local port = minetest.settings:get("yl_matterbridge.port") or false +local gateway = minetest.settings:get("yl_matterbridge.gateway") or false +local token = minetest.settings:get("yl_matterbridge.token") or "" local http = minetest.request_http_api() function send(user_name, message_text) - local url = "http://" .. yl_matterbridge.address .. ":" .. yl_matterbridge.port .. "/api/message" + local url = "http://" .. address .. ":" .. port .. "/api/message" local post_headers = {"Content-Type: application/json"} local timeout = 10 local data = { text = message_text, username = user_name, - gateway = yl_matterbridge.gateway + gateway = gateway } http.fetch( @@ -61,7 +64,7 @@ minetest.register_on_chat_message( ) local gs = function(dtime) - local url = "http://" .. yl_matterbridge.address .. ":" .. yl_matterbridge.port .. "/api/messages" + local url = "http://" .. address .. ":" .. port .. "/api/messages" local timeout = 0 http.fetch(