From a1313ac28e05c397ca1f5b09cfc2b712c32c68f6 Mon Sep 17 00:00:00 2001 From: Akamaru Date: Wed, 8 Mar 2017 21:44:03 +0100 Subject: [PATCH] kleingkeiten --- miku/plugins/cleverbot.lua | 2 +- miku/plugins/mal_user.lua | 8 +++++--- miku/plugins/respond.lua | 18 +----------------- miku/plugins/special.lua | 12 ++++++++++-- 4 files changed, 17 insertions(+), 23 deletions(-) diff --git a/miku/plugins/cleverbot.lua b/miku/plugins/cleverbot.lua index 209730a..722891b 100644 --- a/miku/plugins/cleverbot.lua +++ b/miku/plugins/cleverbot.lua @@ -36,7 +36,7 @@ function cleverbot:action(msg, config, matches) utilities.send_reply(msg, 'Ich möchte jetzt nicht reden...') return end - + redis:set(hash, data.cs) utilities.send_reply(msg, data.output) end diff --git a/miku/plugins/mal_user.lua b/miku/plugins/mal_user.lua index 58f0751..8f20c53 100644 --- a/miku/plugins/mal_user.lua +++ b/miku/plugins/mal_user.lua @@ -20,7 +20,8 @@ function mal_user:get_infos(user) if not data then return nil end local name = ''..data.user_name..'' - local id = ' (ID '..data.user_id..')' + local id = data.user_id + local user_pic = ' (ID '..id..')' if data.user_watching == '1' then watching = ''..data.user_watching..' Anime' else @@ -36,7 +37,8 @@ function mal_user:get_infos(user) end local mal_url = 'Profil aufrufen' - local text = name..id..' schaut derzeit '..watching..', hat '..pause..', '..dropped..' und '..complete..'. '..planed..' auf der Watchlist.\n'..mal_url + local text = name..user_pic..' schaut derzeit '..watching..', hat '..pause..', '..dropped..' und '..complete..'. '..planed..' auf der Watchlist.\n'..mal_url + return text end @@ -47,7 +49,7 @@ function mal_user:action(msg, config, matches) utilities.send_reply(msg, config.errors.results) return end - utilities.send_reply(msg, text, 'HTML') + utilities.send_message(msg.chat.id, text, false, msg.message_id, 'html') end return mal_user \ No newline at end of file diff --git a/miku/plugins/respond.lua b/miku/plugins/respond.lua index dcd07a0..7888f8d 100644 --- a/miku/plugins/respond.lua +++ b/miku/plugins/respond.lua @@ -3,10 +3,6 @@ local respond = {} function respond:init(config) respond.triggers = { "/[Ss][Hh][Rr][Uu][Gg]", - "([Ff][Gg][Tt].? [Ss][Ww][Ii][Ff][Tt])", - "([Ee][Ii][Nn][Zz][Ii][Gg][Ss][Tt][Ee][Ss])", - "([Ee][Ii][Nn][Zz][Ii][Gg][Ss][Tt][Ee][Rr])", - "([Ee][Ii][Nn][Zz][Ii][Gg][Ss][Tt][Ee])", "^/([Ll][Oo][Dd])$", "/([Ll][Ff])", "^/([Kk][Aa])$", @@ -50,19 +46,7 @@ function respond:action(msg, config, matches) local BASE_URL = 'https://anditest.perseus.uberspace.de/plugins/respond' if user_name == "DefenderX" then user_name = "Deffu" end - if string.match(msg.text, "[Ff][Gg][Tt].? [Ss][Ww][Ii][Ff][Tt]") then - utilities.send_message(receiver, 'Dünnes Eis, '..user_name..'!') - return - elseif string.match(msg.text, "([Ee][Ii][Nn][Zz][Ii][Gg][Ss][Tt][Ee][Ss])") then - utilities.send_message(receiver, '*einziges') - return - elseif string.match(msg.text, "([Ee][Ii][Nn][Zz][Ii][Gg][Ss][Tt][Ee][Rr])") then - utilities.send_message(receiver, '*einziger') - return - elseif string.match(msg.text, "([Ee][Ii][Nn][Zz][Ii][Gg][Ss][Tt][Ee])") then - utilities.send_message(receiver, '*einzige') - return - elseif string.match(msg.text, "[Ll][Oo][Dd]") then + if string.match(msg.text, "[Ll][Oo][Dd]") then utilities.send_message(receiver, 'ಠ_ಠ') return elseif string.match(msg.text, "[Ll][Ff]") then diff --git a/miku/plugins/special.lua b/miku/plugins/special.lua index 09cac00..fcf5e98 100644 --- a/miku/plugins/special.lua +++ b/miku/plugins/special.lua @@ -20,8 +20,10 @@ special.triggers = { "^[Bb][Aa][Kk][Aa] [Bb][Oo][Tt]$", "^[Aa][Hh][Aa].[Pp][Nn][Gg]$", "^~?[Pp][Oo][Ii]$", - "[Yy][Oo][Ss][Hh][Ii] [Dd][Aa][Nn][Cc][Ee] [Gg][Ll][Ii][Tt][Cc][Hh]", - "[Yy][Oo][Ss][Hh][Ii] [Dd][Aa][Nn][Cc][Ee]", + "^[Yy][Oo][Ss][Hh][Ii] [Dd][Aa][Nn][Cc][Ee] [Gg][Ll][Ii][Tt][Cc][Hh]", + "^[Yy][Oo][Ss][Hh][Ii] [Dd][Aa][Nn][Cc][Ee]", + "^[Nn][Oo][Pp][Ee].[Aa][Vv][Ii]", + "^[Ss][Uu][Gg][Oo][Ii] [Dd][Ee][Ss][Uu] [Nn][Ee]", "^[Nn][Aa][Nn][Oo] [Hh][Aa][Kk][Aa][Ss][Ee]$", "^/[Tt][Hh][Yy][Mm][Ee]$", "^[Yy][Oo][Ll][Oo]$", @@ -104,6 +106,12 @@ function special:action(msg, config, matches) elseif msg_text:match("[Yy][Oo][Ss][Hh][Ii] [Dd][Aa][Nn][Cc][Ee]") then utilities.send_video(msg.chat.id, 'http://code.ponywave.de/workspace/test/fuck/YOSHI_DANCE.mp4', 'YOSHI DANCE!', msg.message_id) return + elseif msg_text:match("[Nn][Oo][Pp][Ee].[Aa][Vv][Ii]") then + utilities.send_video(msg.chat.id, 'http://code.ponywave.de/workspace/test/fuck/nope.mp4', nil, msg.message_id) + return + elseif msg_text:match("[Ss][Uu][Gg][Oo][Ii] [Dd][Ee][Ss][Uu] [Nn][Ee]") then + utilities.send_video(msg.chat.id, 'http://code.ponywave.de/workspace/test/fuck/sugoidesune.mp4', 'eeeeee!?\nSUGOI DESU NE?', msg.message_id) + return elseif msg_text:match("[Nn][Aa][Nn][Oo] [Hh][Aa][Kk][Aa][Ss][Ee]") then utilities.send_video(msg.chat.id, 'http://code.ponywave.de/workspace/test/fuck/nano-hakase-1.mp4', 'NANO! NANO! NANO! NANO! NANO! NANO!\nHAKASE! HAKASE! HAKASE! HAKASE! HAKASE! HAKASE!', msg.message_id) return