From 74b130f21ec9aaada96f8610ae0e8eb6845877b4 Mon Sep 17 00:00:00 2001 From: Andreas Bielawski Date: Wed, 15 Jun 2016 20:10:30 +0200 Subject: [PATCH] - Portiere AFK-Plugin - Portiere pre_process() - GImages: GIFs werden als Dokumente gesendet --- otouto/bot.lua | 12 ++++ otouto/plugins/afk.lua | 121 +++++++++++++++++++++++++++++++++++++ otouto/plugins/gImages.lua | 6 +- 3 files changed, 138 insertions(+), 1 deletion(-) create mode 100644 otouto/plugins/afk.lua diff --git a/otouto/bot.lua b/otouto/bot.lua index bb1aa67..e02224b 100644 --- a/otouto/bot.lua +++ b/otouto/bot.lua @@ -63,12 +63,14 @@ function bot:on_msg_receive(msg, config) -- The fn run whenever a message is rec if msg.date < os.time() - 5 then return end -- Do not process old messages. msg = utilities.enrich_message(msg) + if msg.text:match('^'..config.cmd_pat..'start .+') then msg.text = config.cmd_pat .. utilities.input(msg.text) msg.text_lower = msg.text:lower() end + pre_process_msg(self, msg) for _, plugin in ipairs(self.plugins) do for _, trigger in pairs(plugin.triggers) do if string.match(msg.text_lower, trigger) then @@ -144,6 +146,16 @@ function bot:run(config) print('Halted.') end +-- Apply plugin.pre_process function +function pre_process_msg(self, msg) + for number,plugin in ipairs(self.plugins) do + if plugin.pre_process and msg then + print('Preprocess #'..number) + plugin:pre_process(msg, self) + end + end +end + function load_cred() if redis:exists("telegram:credentials") == false then -- If credentials hash doesnt exists diff --git a/otouto/plugins/afk.lua b/otouto/plugins/afk.lua new file mode 100644 index 0000000..9ba5e75 --- /dev/null +++ b/otouto/plugins/afk.lua @@ -0,0 +1,121 @@ +-- original plugin by Akamaru [https://ponywave.de] +-- I added Redis and automatic online switching back in 2015 + +local afk = {} + +local utilities = require('otouto.utilities') +local redis = (loadfile "./otouto/redis.lua")() + +function afk:init(config) + afk.triggers = { + "^/([A|a][F|f][K|k])$", + "^/([A|a][F|f][K|k]) (.*)$" + } + afk.doc = [[* +]]..config.cmd_pat..[[afk* _[Text]_: Setzt Status auf AFK mit optionalem Text]] +end + +afk.command = 'afk [Text]' + +function afk:is_offline(hash) + local afk = redis:hget(hash, 'afk') + if afk == "true" then + return true + else + return false + end +end + +function afk:get_afk_text(hash) + local afk_text = redis:hget(hash, 'afk_text') + if afk_text ~= nil and afk_text ~= "" and afk_text ~= "false" then + return afk_text + else + return false + end +end + +function afk:switch_afk(user_name, user_id, chat_id, timestamp, text) + local hash = 'afk:'..chat_id..':'..user_id + + if afk:is_offline(hash) then + local afk_text = afk:get_afk_text(hash) + if afk_text then + return 'Du bist bereits AFK ('..afk_text..')!' + else + return 'Du bist bereits AFK!' + end + end + + print('Setting redis hash afk in '..hash..' to true') + redis:hset(hash, 'afk', true) + print('Setting redis hash timestamp in '..hash..' to '..timestamp) + redis:hset(hash, 'time', timestamp) + + if text then + print('Setting redis hash afk_text in '..hash..' to '..text) + redis:hset(hash, 'afk_text', text) + return user_name..' ist AFK ('..text..')' + else + return user_name..' ist AFK' + end +end + +function afk:pre_process(msg, self) + if msg.chat.type == "private" then + -- Ignore + return + end + + local user_name = get_name(msg) + local user_id = msg.from.id + local chat_id = msg.chat.id + local hash = 'afk:'..chat_id..':'..user_id + + + if afk:is_offline(hash) then + local afk_text = afk:get_afk_text(hash) + + -- calculate afk time + local timestamp = redis:hget(hash, 'time') + local current_timestamp = msg.date + local afk_time = current_timestamp - timestamp + local seconds = afk_time % 60 + local minutes = math.floor(afk_time / 60) + local minutes = minutes % 60 + local hours = math.floor(afk_time / 3600) + if minutes == 00 and hours == 00 then + duration = seconds..' Sekunden' + elseif hours == 00 and minutes ~= 00 then + duration = string.format("%02d:%02d", minutes, seconds)..' Minuten' + elseif hours ~= 00 then + duration = string.format("%02d:%02d:%02d", hours, minutes, seconds)..' Stunden' + end + + redis:hset(hash, 'afk', false) + if afk_text then + redis:hset(hash, 'afk_text', false) + utilities.send_message(self, msg.chat.id, user_name..' ist wieder da (war: '..afk_text..' für '..duration..')!') + else + utilities.send_message(self, msg.chat.id, user_name..' ist wieder da (war '..duration..' weg)!') + end + end + + return +end + +function afk:action(msg) + if msg.chat.type == "private" then + utilities.send_reply(self, msg, "Mir ist's egal, ob du AFK bist ._.") + return + end + + local user_id = msg.from.id + local chat_id = msg.chat.id + local user_name = get_name(msg) + local timestamp = msg.date + + utilities.send_reply(self, msg, afk:switch_afk(user_name, user_id, chat_id, timestamp, matches[2])) +end + +return afk \ No newline at end of file diff --git a/otouto/plugins/gImages.lua b/otouto/plugins/gImages.lua index 3fab5b3..8ecc088 100644 --- a/otouto/plugins/gImages.lua +++ b/otouto/plugins/gImages.lua @@ -68,7 +68,11 @@ function gImages:action(msg, config) local img_url = jdat.items[i].link local file = download_to_file(img_url) - utilities.send_photo(self, msg.chat.id, file, img_url) + if string.ends(img_url, ".gif") then + utilities.send_document(self, msg.chat.id, file, img_url) + else + utilities.send_photo(self, msg.chat.id, file, img_url) + end end return gImages