From 814173a4fb86125aff3ed878373039f49f934b2c Mon Sep 17 00:00:00 2001 From: Akamaru Date: Tue, 11 Oct 2016 16:44:31 +0200 Subject: [PATCH] Fixes --- .gitignore | 3 ++- miku/plugins/special.lua | 5 +---- miku/plugins/speedtest.lua | 4 +--- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 15714db..0a360d2 100644 --- a/.gitignore +++ b/.gitignore @@ -7,4 +7,5 @@ Bot-Kommandoliste.txt msg.txt merge.sh miku/plugins/link_warning.lua -luarocks \ No newline at end of file +luarocks +miku/plugins/gTrendDoge.lua \ No newline at end of file diff --git a/miku/plugins/special.lua b/miku/plugins/special.lua index 47d0485..bf39c48 100644 --- a/miku/plugins/special.lua +++ b/miku/plugins/special.lua @@ -33,8 +33,7 @@ special.triggers = { "^%(\\$", "^/[Ss][Cc][Hh][Ee][Ll][Ll][Ee]$", "^[Pp][Ii][Nn][Gg]$", - "^[Dd][Aa][Ss] [Ii][Ss][Tt]? [Nn][Ii][Cc][Hh][Tt]? [Ll][Uu][Ss][Tt][Ii][Gg]!?$", - "[Kk][Aa][Pp][Pp][Aa][Rr][Oo][Ss][Ss]" + "^[Dd][Aa][Ss] [Ii][Ss][Tt]? [Nn][Ii][Cc][Hh][Tt]? [Ll][Uu][Ss][Tt][Ii][Gg]!?$" } @@ -126,8 +125,6 @@ function special:action(msg, config, matches) output = 'Pong' elseif msg_text:match("^[Dd][Aa][Ss] [Ii][Ss][Tt]? [Nn][Ii][Cc][Hh][Tt]? [Ll][Uu][Ss][Tt][Ii][Gg]!?$") then output = 'Aber Funny!' - elseif msg_text:match("[Kk][Aa][Pp][Pp][Aa][Rr][Oo][Ss][Ss]") then - utilities.send_document(msg.chat.id, download_to_file('https://dl.dropboxusercontent.com/s/iew6d761gu43mil/is_des_so.webp'), nil, msg.message_id) end utilities.send_reply(msg, output) diff --git a/miku/plugins/speedtest.lua b/miku/plugins/speedtest.lua index d59b30e..457cd34 100644 --- a/miku/plugins/speedtest.lua +++ b/miku/plugins/speedtest.lua @@ -1,9 +1,7 @@ local speedtest = {} speedtest.triggers = { - "speedtest%.net/my%-result/(%d+)", - "speedtest%.net/my%-result/i/(%d+)", - "speedtest%.net/result/(%d+)" + "speedtest%.net/my%-result/?a?i?/(%d+)" } function speedtest:action(msg, config, matches)