diff --git a/miku/bot.lua b/miku/bot.lua index b1dec4a..7b859a9 100644 --- a/miku/bot.lua +++ b/miku/bot.lua @@ -157,6 +157,13 @@ function bot:on_msg_receive(msg, config) -- The fn run whenever a message is rec msg.text = string.gsub(msg.text, config.cmd_pat..'([A-Za-z0-9-_-]+)@'..self.info.username, "/%1") msg.text_lower = msg.text:lower() end + + if is_channel_disabled(msg)then + if not is_sudo(msg, config) or msg.text ~= "/channel enable" then + return + end + end + msg = pre_process_msg(self, msg, config) if not msg then return end -- deleted by banning @@ -318,10 +325,12 @@ end function pre_process_msg(self, msg, config) for n=1, #self.plugins do local plugin = self.plugins[n] - if plugin.pre_process and msg then - -- print('Preprocess '..plugin.name) -- remove comment to restore old behaviour - new_msg = plugin:pre_process(msg, config) - if not new_msg then return end -- Message was deleted + if plugin.pre_process and msg then + if not is_plugin_disabled_on_chat(plugin.name, msg, true) then + -- print('Preprocess '..plugin.name) -- remove comment to restore old behaviour + new_msg = plugin:pre_process(msg, config) + if not new_msg then return end -- Message was deleted + end end end return new_msg @@ -372,13 +381,15 @@ function match_plugins(self, msg, config, plugin) end end -function is_plugin_disabled_on_chat(plugin_name, msg) +function is_plugin_disabled_on_chat(plugin_name, msg, silent) local hash = get_redis_hash(msg, 'disabled_plugins') local disabled = redis:hget(hash, plugin_name) -- Plugin is disabled if disabled == 'true' then - print('Plugin '..plugin_name..' ist in diesem Chat deaktiviert') + if not silent then + print('Plugin '..plugin_name..' ist in diesem Chat deaktiviert') + end return true else return false diff --git a/miku/plugins/channels.lua b/miku/plugins/channels.lua index 4a2afd1..a0b88f8 100644 --- a/miku/plugins/channels.lua +++ b/miku/plugins/channels.lua @@ -11,18 +11,6 @@ function channels:init(config) ]]..config.cmd_pat..[[channel* __/__: Aktiviert/deaktiviert den Bot im Chat]] end --- Checks if bot was disabled on specific chat -function channels:is_channel_disabled(msg) - local hash = 'chat:'..msg.chat.id..':disabled' - local disabled = redis:get(hash) - - if not disabled or disabled == "false" then - return false - end - - return disabled -end - function channels:enable_channel(msg) local hash = 'chat:'..msg.chat.id..':disabled' local disabled = redis:get(hash) @@ -55,12 +43,7 @@ function channels:pre_process(msg, config) end end - if channels:is_channel_disabled(msg) then - print('Channel wurde deaktiviert') - return - end - - return msg + return msg end function channels:action(msg, config, matches) diff --git a/miku/plugins/reddit_post.lua b/miku/plugins/reddit_post.lua index fdc0ba1..84441dc 100644 --- a/miku/plugins/reddit_post.lua +++ b/miku/plugins/reddit_post.lua @@ -15,9 +15,9 @@ function reddit_post:get_reddit_data(subreddit, reddit_code) end function reddit_post:send_reddit_data(data) - local title = utilities.md_escape(data[1].data.children[1].data.title) - local author = utilities.md_escape(data[1].data.children[1].data.author) - local subreddit = utilities.md_escape(data[1].data.children[1].data.subreddit) + local title = data[1].data.children[1].data.title + local author = data[1].data.children[1].data.author + local subreddit = data[1].data.children[1].data.subreddit if string.len(data[1].data.children[1].data.selftext) > 300 then selftext = string.sub(unescape(data[1].data.children[1].data.selftext:gsub("%b<>", "")), 1, 300) .. '...' else @@ -30,7 +30,7 @@ function reddit_post:send_reddit_data(data) end local score = comma_value(data[1].data.children[1].data.score) local comments = comma_value(data[1].data.children[1].data.num_comments) - local text = '*'..author..'* in */r/'..subreddit..'* _('..score..' Upvotes - '..comments..' Kommentare)_:\n'..title..'\n'..selftext..url + local text = ''..author..' in /r/'..subreddit..' ('..score..' Upvotes - '..comments..' Kommentare):\n'..title..'\n'..selftext..url return text end @@ -44,7 +44,7 @@ function reddit_post:action(msg, config, matches) local text = reddit_post:send_reddit_data(data) if not text then utilities.send_reply(msg, config.errors.connection) return end - utilities.send_reply(msg, text, true) + utilities.send_reply(msg, text, 'HTML') end -return reddit_post +return reddit_post \ No newline at end of file diff --git a/miku/utilities.lua b/miku/utilities.lua index e364e87..64a4505 100644 --- a/miku/utilities.lua +++ b/miku/utilities.lua @@ -1118,4 +1118,16 @@ function table.contains(table, element) return false end +-- Checks if bot was disabled on specific chat +function is_channel_disabled(msg) + local hash = 'chat:'..msg.chat.id..':disabled' + local disabled = redis:get(hash) + + if not disabled or disabled == "false" then + return false + end + + return disabled +end + return utilities \ No newline at end of file