diff --git a/plugins/9gag.lua b/plugins/9gag.lua index f50384b..3427604 100644 --- a/plugins/9gag.lua +++ b/plugins/9gag.lua @@ -31,7 +31,7 @@ end return { description = "9GAG", - usage = "/9gag", + usage = {"/9gag"}, patterns = {"^/9gag$"}, run = run } diff --git a/plugins/afk.lua b/plugins/afk.lua index fb08fe6..fd9f524 100644 --- a/plugins/afk.lua +++ b/plugins/afk.lua @@ -6,7 +6,7 @@ end return { description = "Sagt dass ihr afk seid", - usage = "/afk", + usage = {"/afk"}, patterns = {"^/afk(.*)$"}, run = run } diff --git a/plugins/aha.png.lua b/plugins/aha.png.lua index 03da8b2..d812af0 100644 --- a/plugins/aha.png.lua +++ b/plugins/aha.png.lua @@ -1,10 +1,10 @@ function run(msg, matches) -send_photo(get_receiver(msg), "pictures/aha.png", ok_cb, false) + send_photo(get_receiver(msg), "pictures/aha.png", ok_cb, false) end return { description = "Aha", - usage = "aha.png", + usage = {"aha.png"}, patterns = {"^aha.png"}, run = run } diff --git a/plugins/baka_bot.lua b/plugins/baka_bot.lua index e8d6612..6a284fc 100644 --- a/plugins/baka_bot.lua +++ b/plugins/baka_bot.lua @@ -1,16 +1,13 @@ function run(msg, matches) - return "Gomen'nasai 😣" + local user_name = get_name(msg) + return "Gomen'nasai "..user_name.."-sempai 😣" end return { description = "So ein dummer Bot", - usage = "Baka Bot", - patterns = {"^baka bot", - "Baka bot", - "baka Bot", - "Baka Bot", - "BAKA BOT"}, + usage = {"Baka Bot","baka bot","Baka bot","baka Bot","BAKA BOT"}, + patterns = {"baka bot","Baka bot","baka Bot","Baka Bot","BAKA BOT"}, run = run } --by Akamaru \ No newline at end of file diff --git a/plugins/barusamikosu.lua b/plugins/barusamikosu.lua index 6820892..c4677fe 100644 --- a/plugins/barusamikosu.lua +++ b/plugins/barusamikosu.lua @@ -4,10 +4,8 @@ end return { description = "Balsamiko Essig!", - usage = "/barusamiko", - patterns = {"^/barusamiko", - "^/barusamikosu", - "^/Balsamiko Essig"}, + usage = {"/barusamiko","/barusamikosu","/Balsamiko Essig"}, + patterns = {"^/barusamiko","^/barusamikosu","^/Balsamiko Essig"}, run = run } --by Akamaru \ No newline at end of file diff --git a/plugins/boersedown.lua b/plugins/boersedown.lua index 7ae9f49..acc298b 100644 --- a/plugins/boersedown.lua +++ b/plugins/boersedown.lua @@ -17,7 +17,7 @@ end return { description = "Checkt ob Boerse.to online ist", - usage = "", + usage = {"Hierfür gibt es kein Befehl"}, patterns = {}, run = nil, cron = cron diff --git a/plugins/boobs.lua b/plugins/boobs.lua index c68d4f3..2685b58 100644 --- a/plugins/boobs.lua +++ b/plugins/boobs.lua @@ -59,14 +59,8 @@ end return { description = "Sendet ein zufälliges Boobs/Butts Bild", - usage = { - "/boobs", - "/butts" - }, - patterns = { - "^/boobs$", - "^/butts$" - }, + usage = {"/boobs","/butts"}, + patterns = {"^/boobs$","^/butts$"}, run = run } diff --git a/plugins/channels.lua b/plugins/channels.lua index 1154b4d..30fdb13 100644 --- a/plugins/channels.lua +++ b/plugins/channels.lua @@ -68,10 +68,8 @@ end return { description = "", - usage = {""}, - patterns = { - "^/channel? (enable)", - "^/channel? (disable)" }, + usage = {"Das kann nur Akamaru"}, + patterns = {"^/channel? (enable)","^/channel? (disable)" }, run = run, privileged = true, pre_process = pre_process diff --git a/plugins/chucknorris.lua b/plugins/chucknorris.lua index 0a4a6a8..2a86052 100644 --- a/plugins/chucknorris.lua +++ b/plugins/chucknorris.lua @@ -7,7 +7,7 @@ end function run(msg, matches) local j = getChuckNorris() if (j == nil) then - return "Zzzzz..." + return "Huch, da lief was falsch!" else return j end @@ -15,7 +15,7 @@ end return { description = "Sendet Chuck Norris Witze (Englisch)", - usage = "/cn", + usage = {"/cn"}, patterns = {"^/cn$"}, run = run } \ No newline at end of file diff --git a/plugins/dicks.lua b/plugins/dicks.lua index cf2d98f..d89dfbe 100644 --- a/plugins/dicks.lua +++ b/plugins/dicks.lua @@ -1,4 +1,3 @@ - do @@ -24,21 +23,16 @@ function run(msg, matches) local receiver = get_receiver(msg) send_photo_from_url(receiver, url) else - return 'Error getting dicks for you, please try again later.' + return 'Huch, da lief was falsch.' end end return { - description = "Gets a random dicks pic", - usage = { - "/dicks: Get a dicks NSFW image. 🔞" - }, - patterns = { - "^/dicks$" - }, + description = "Das dümmste Plugin ever [NSFW]", + usage = {"/dicks"}, + patterns = {"^/dicks$"}, run = run } - -end +end \ No newline at end of file diff --git a/plugins/echo.lua b/plugins/echo.lua index 973f665..cab4716 100644 --- a/plugins/echo.lua +++ b/plugins/echo.lua @@ -5,7 +5,7 @@ end return { description = "Wiederholt euch", - usage = "/echo [Satz]", - patterns = {"^/echo (.*)$"}, + usage = {"/echo [Satz]","/Echo [Satz]"}, + patterns = {"^/echo (.*)$","^/Echo (.*)$"}, run = run } diff --git a/plugins/emoticons.lua b/plugins/emoticons.lua index a60d192..2f1654a 100644 --- a/plugins/emoticons.lua +++ b/plugins/emoticons.lua @@ -5,9 +5,8 @@ end return { description = "Sendet alle Emoticons", - usage = "/emoticons", - patterns = {"^/emoticons", - "^/Emoticons"}, + usage = {"/emoticons","/Emoticons"}, + patterns = {"^/emoticons","^/Emoticons"}, run = run } --by Akamaru \ No newline at end of file diff --git a/plugins/facepalm.lua b/plugins/facepalm.lua index 055e417..b41d654 100644 --- a/plugins/facepalm.lua +++ b/plugins/facepalm.lua @@ -3,10 +3,9 @@ function run(msg, matches) end return { - description = "Facepalm", - usage = "/facepalm", - patterns = {"^/facepalm", - "^/Facepalm"}, + description = "Sendet ein Facepalm-Sticker", + usage = {"/facepalm","/Facepalm"}, + patterns = {"^/facepalm","^/Facepalm"}, run = run } --by Akamaru \ No newline at end of file diff --git a/plugins/giphy.lua b/plugins/giphy.lua index f5ddc3a..c780d4c 100644 --- a/plugins/giphy.lua +++ b/plugins/giphy.lua @@ -70,16 +70,8 @@ end return { description = "Sucht und sendet ein GIF von Giphy", - usage = { - "/gif (Begriff)", - "/giphy (Begriff)" - }, - patterns = { - "^/gif$", - "^/gif (.*)", - "^/giphy (.*)", - "^/giphy$" - }, + usage = {"/gif [Begriff]","/giphy [Begriff]"}, + patterns = {"^/gif$","^/gif (.*)","^/giphy (.*)","^/giphy$"}, run = run } diff --git a/plugins/google.lua b/plugins/google.lua index 9537b1b..54415da 100644 --- a/plugins/google.lua +++ b/plugins/google.lua @@ -32,10 +32,7 @@ end return { description = "Durchsucht Google und sendet die ersten 5 Ergebnisse", - usage = "/google [Begriff]", - patterns = { - "^/google (.*)$", - "^%.[g|G]oogle (.*)$" - }, + usage = {"/google [Begriff]","/Google [Begriff]"}, + patterns = {"^/google (.*)$","^/Google (.*)$"}, run = run } diff --git a/plugins/hallo.lua b/plugins/hallo.lua index ca84f8e..3f0b3a2 100644 --- a/plugins/hallo.lua +++ b/plugins/hallo.lua @@ -5,12 +5,9 @@ function run(msg, matches) end return { - description = "Sagt hallo zu euch", - usage = "hallo", - patterns = { - "^Hallo(.*)$", - "^hallo(.*)$" - }, - run = run + description = "Miku sagt Hallo zu euch", + usage = {"Hallo","hallo"}, + patterns = {"^Hallo$","^hallo$"}, +run = run } --by Akamaru \ No newline at end of file diff --git a/plugins/hdf.lua b/plugins/hdf.lua index 57b6b58..1a9805b 100644 --- a/plugins/hdf.lua +++ b/plugins/hdf.lua @@ -19,8 +19,8 @@ end end return { - description = "Sendet eins von 4 Katzenbilder", - usage = "/hdf", + description = "Einfach mal die Fresse halten!", + usage = {"/hdf"}, patterns = {"^/hdf"}, run = run } diff --git a/plugins/help.lua b/plugins/help.lua index 2292f85..ff18984 100644 --- a/plugins/help.lua +++ b/plugins/help.lua @@ -61,13 +61,9 @@ local function run(msg, matches) end return { - description = "", - usage = {""}, - patterns = { - "^/hilfe$", - "^/hilfe all", - "^/hilfe (.+)" - }, + description = "Zeigt die Plugins und Befehle", + usage = {"/hilfe","/hilfe all","/hilfe [Plugin]"}, + patterns = {"^/hilfe$","^/hilfe all","^/hilfe (.+)"}, run = run } diff --git a/plugins/images.lua b/plugins/images.lua index 0941ac0..3b3db33 100644 --- a/plugins/images.lua +++ b/plugins/images.lua @@ -8,12 +8,8 @@ end return { description = "Wenn ein Link zu einem Bild gesendet wird, läd und sendet der Bot das Bild.", - usage = "Link zum Bild", - patterns = { - "(https?://[%w-_%.%?%.:/%+=&]+%.png)$", - "(https?://[%w-_%.%?%.:/%+=&]+%.jpg)$", - "(https?://[%w-_%.%?%.:/%+=&]+%.jpeg)$", - }, + usage = {"Link zum Bild"}, + patterns = {"(https?://[%w-_%.%?%.:/%+=&]+%.png)$","(https?://[%w-_%.%?%.:/%+=&]+%.jpg)$","(https?://[%w-_%.%?%.:/%+=&]+%.jpeg)$",}, run = run } diff --git a/plugins/img_google.lua b/plugins/img_google.lua index 794475e..ec63ec2 100644 --- a/plugins/img_google.lua +++ b/plugins/img_google.lua @@ -43,7 +43,7 @@ end return { description = "Sucht Bild mit Google-API und versendet es (SafeSearch aktiv)", - usage = "/img [Suchbegriff]", + usage = {"/img [Suchbegriff]"}, patterns = {"^/img (.*)$"}, run = run } diff --git a/plugins/img_google_nsfw.lua b/plugins/img_google_nsfw.lua index 24e2e3b..f048091 100644 --- a/plugins/img_google_nsfw.lua +++ b/plugins/img_google_nsfw.lua @@ -41,10 +41,9 @@ function run(msg, matches) end return { - description = "Sucht Bild mit Google-API und versendet es (SafeSearch aktiv)", - usage = "/img2 [Suchbegriff]", - patterns = {"^/img2 (.*)$", - "^/nsfwimg (.*)$"}, + description = "Sucht Bild mit Google-API und versendet es [NSFW]", + usage = {"/img2 [Suchbegriff]","/nsfwimg [Suchbegriff]"}, + patterns = {"^/img2 (.*)$","^/nsfwimg (.*)$"}, run = run } diff --git a/plugins/justkitten.lua b/plugins/justkitten.lua index 163474c..cd001a0 100644 --- a/plugins/justkitten.lua +++ b/plugins/justkitten.lua @@ -17,7 +17,7 @@ end return { description = "Sendet eins von 6 Just Kitten Bilder", - usage = "/jk", + usage = {"/jk"}, patterns = {"^/jk"}, run = run } diff --git a/plugins/kitty.lua b/plugins/kitty.lua index 8158b44..53aa2f0 100644 --- a/plugins/kitty.lua +++ b/plugins/kitty.lua @@ -13,12 +13,8 @@ end return { description = "Sendet eins von 4 Katzenbilder", - usage = "/kitty", - patterns = {"^/kitty", - "^/katze", - "^/cat", - "^/neko", - "^/kadse"}, + usage = {"/kitty","/katze","/cat","/neko","/kadse"}, + patterns = {"^/kitty$","^/katze$","^/cat$","^/neko$","^/kadse$"}, run = run } --by Akamaru \ No newline at end of file diff --git a/plugins/lucky_star.lua b/plugins/lucky_star.lua index 7afa39a..b241dea 100644 --- a/plugins/lucky_star.lua +++ b/plugins/lucky_star.lua @@ -19,15 +19,8 @@ end return { description = "Sendet ein Bild von den Lucky Star Chars", - usage = "/kagami, /konata, /tsukasa oder /miyuki", - patterns = {"^/kagami", - "^/Kagami", - "^/konata", - "^/Konata", - "^/miyuki", - "^/Miyuki", - "^/tsukasa", - "^/Tsukasa"}, + usage = {"/Kagami","/kagami","/Konata","/konata","/Tsukasa","/tsukasa","/Miyuki","/miyuki"}, + patterns = {"^/kagami$","^/Kagami$","^/konata$","^/Konata$","^/miyuki$","^/Miyuki$","^/tsukasa$","^/Tsukasa$"}, run = run } --by Akamaru \ No newline at end of file diff --git a/plugins/lyrics.lua b/plugins/lyrics.lua index 4b1894a..efc1036 100644 --- a/plugins/lyrics.lua +++ b/plugins/lyrics.lua @@ -39,7 +39,7 @@ end return { description = "Liedertext bekommen", - usage = "/lyrics [Lied]", + usage = {"/lyrics [Lied]"}, patterns = {"^/lyrics (.*)$"}, run = run } diff --git a/plugins/magische_miesmuschel.lua b/plugins/magische_miesmuschel.lua index 8d6716b..23cb8d0 100644 --- a/plugins/magische_miesmuschel.lua +++ b/plugins/magische_miesmuschel.lua @@ -8,13 +8,8 @@ end return { description = "Beantwortet euch eine Frage (100% Wahrheit!)", - usage = "Magische Miesmuschel [Frage]", - patterns = { - "^Magische Miesmuschel(.*)$", - "^magische Miesmuschel(.*)$", - "^Magische miesmuschel(.*)$", - "^magische miesmuschel(.*)$" - }, + usage = {"Magische Miesmuschel [Frage]","magische Miesmuschel [Frage]","Magische miesmuschel [Frage]","magische miesmuschel [Frage]"}, + patterns = {"^Magische Miesmuschel(.*)$","^magische Miesmuschel(.*)$","^Magische miesmuschel(.*)$","^magische miesmuschel(.*)$"}, run = run } end diff --git a/plugins/media.lua b/plugins/media.lua index 87f4b10..7a98745 100644 --- a/plugins/media.lua +++ b/plugins/media.lua @@ -39,7 +39,7 @@ end return { description = "Wenn ein User eine Medien-Datei sendet (gif, mp4, pdf, etc.), wird es gedownloadet und gesendet.", - usage = "", + usage = {"Irgendeine Datei"}, patterns = { "(https?://[%w-_%.%?%.:/%+=&]+%.(gif))$", "(https?://[%w-_%.%?%.:/%+=&]+%.(mp4))$", diff --git a/plugins/media_download.lua b/plugins/media_download.lua index da462b3..4665530 100644 --- a/plugins/media_download.lua +++ b/plugins/media_download.lua @@ -32,8 +32,8 @@ local function pre_process(msg) end return { - description = "When bot receives a media msg, download the media.", - usage = "", + description = "Wenn eine Datei gesendet wird, läd Mikubot sie runter.", + usage = {"Irgendeine Datei"}, run = run, patterns = { '%[(document)%]', diff --git a/plugins/moepse.lua b/plugins/moepse.lua index f6010fb..95516c4 100644 --- a/plugins/moepse.lua +++ b/plugins/moepse.lua @@ -5,11 +5,8 @@ end return { description = "Möpse? Meepse?", - usage = "möp oder meep", - patterns = {"^möp", - "Möp", - "meep", - "Meep"}, + usage = {"möp","Möp","meep","Meep"}, + patterns = {"^möp","Möp","meep","Meep"}, run = run } --by Akamaru \ No newline at end of file diff --git a/plugins/myid.lua b/plugins/myid.lua index dff592a..272d4a7 100644 --- a/plugins/myid.lua +++ b/plugins/myid.lua @@ -4,7 +4,7 @@ end return { description = 'Zeigt deine Telegram ID', - usage = '/myid', + usage = {"/myid"}, patterns = {'^/myid$'}, run = run } diff --git a/plugins/naira_derp.lua b/plugins/naira_derp.lua index 7b7a3bc..4d91115 100644 --- a/plugins/naira_derp.lua +++ b/plugins/naira_derp.lua @@ -4,9 +4,8 @@ end return { description = "Naira Derp", - usage = "/nairad", - patterns = {"^/nairad", - "^/Nairad"}, + usage = {"/nairad","/Nairad"}, + patterns = {"^/nairad","^/Nairad"}, run = run } --by Akamaru \ No newline at end of file diff --git a/plugins/nau.lua b/plugins/nau.lua index 82fb345..efc4f16 100644 --- a/plugins/nau.lua +++ b/plugins/nau.lua @@ -4,7 +4,7 @@ end return { description = "RTL Nau", - usage = "/nau", + usage = {"/nau"}, patterns = {"^/nau"}, run = run } diff --git a/plugins/neorame.lua b/plugins/neorame.lua index eec2cc3..8f2f9ba 100644 --- a/plugins/neorame.lua +++ b/plugins/neorame.lua @@ -4,7 +4,7 @@ end return { description = "NeoRame is best pony!", - usage = "/neorame", + usage = {"/neorame"}, patterns = {"^/neorame"}, run = run } diff --git a/plugins/niissan.lua b/plugins/niissan.lua index 926f950..7568807 100644 --- a/plugins/niissan.lua +++ b/plugins/niissan.lua @@ -4,11 +4,8 @@ end return { description = "Nii-san <3", - usage = "nii-san, Nii-san, nissan oder Nissan", - patterns = {"^nii-san", - "^Nii-san", - "^nissan", - "^Nissan"}, + usage = {"nii-san","Nii-san","nissan","Nissan"}, + patterns = {"^nii-san","^Nii-san","^nissan","^Nissan"}, run = run } --by Akamaru \ No newline at end of file diff --git a/plugins/nope.avi.lua b/plugins/nope.avi.lua index 615cfad..667bd7c 100644 --- a/plugins/nope.avi.lua +++ b/plugins/nope.avi.lua @@ -1,11 +1,12 @@ function run(msg, matches) - return 'https://www.youtube.com/watch?v=gvdf5n-zI14' + send_video(get_receiver(msg), "videos/nope.avi", ok_cb, false) + return 'Video wird gesendet...' end return { - description = 'Sendet ein YouTube Video namens "nope.avi"', - usage = "nope.avi", + description = 'Sendet ein Video namens "nope.avi"', + usage = {"nope.avi"}, patterns = {"^nope.avi"}, run = run } diff --git a/plugins/nyu.lua b/plugins/nyu.lua index 23e6660..7b5e4f5 100644 --- a/plugins/nyu.lua +++ b/plugins/nyu.lua @@ -4,9 +4,8 @@ end return { description = "Nyu?", - usage = "nyu", - patterns = {"^nyu", - "^Nyu"}, + usage = {"nyu","Nyu"}, + patterns = {"^nyu","^Nyu"}, run = run } --by Akamaru \ No newline at end of file diff --git a/plugins/plugins.lua b/plugins/plugins.lua index 5f042c2..78f71f4 100644 --- a/plugins/plugins.lua +++ b/plugins/plugins.lua @@ -162,15 +162,9 @@ local function run(msg, matches) end return { - description = "", - usage = { "" }, - patterns = { - "^/plugins$", - "^/plugins? (enable) ([%w_%.%-]+)$", - "^/plugins? (disable) ([%w_%.%-]+)$", - "^/plugins? (enable) ([%w_%.%-]+) (chat)", - "^/plugins? (disable) ([%w_%.%-]+) (chat)", - "^/plugins? (reload)$" }, + description = "Plugin Verwaltung", + usage = { "Das kann nur Akamaru" }, + patterns = {"^/plugins$","^/plugins? (enable) ([%w_%.%-]+)$","^/plugins? (disable) ([%w_%.%-]+)$","^/plugins? (enable) ([%w_%.%-]+) (chat)","^/plugins? (disable) ([%w_%.%-]+) (chat)","^/plugins? (reload)$" }, run = run, privileged = true } diff --git a/plugins/pornhub.lua b/plugins/pornhub.lua index 362ad6e..0385f6e 100644 --- a/plugins/pornhub.lua +++ b/plugins/pornhub.lua @@ -42,8 +42,7 @@ end return { description = "Sendet ein PornHub Video", - usage = "/pornhub", - patterns = {"^/pornhub (.*)$", - "^/ph (.*)$"}, + usage = {"/pornhub [Suchwort]","/ph [Suchwort]"}, + patterns = {"^/pornhub (.*)$","^/ph (.*)$"}, run = run } \ No newline at end of file diff --git a/plugins/rechner.lua b/plugins/rechner.lua index 1a13d39..921cc1d 100644 --- a/plugins/rechner.lua +++ b/plugins/rechner.lua @@ -6,7 +6,7 @@ end return { description = "Ein simpler Taschenrechner", - usage = "/calc [Rechnung]", + usage = {"/calc [Rechnung]"}, patterns = {"^/calc (.*)$"}, run = run } \ No newline at end of file diff --git a/plugins/rich_bitch.lua b/plugins/rich_bitch.lua index 1631c14..822a015 100644 --- a/plugins/rich_bitch.lua +++ b/plugins/rich_bitch.lua @@ -5,12 +5,8 @@ end return { description = "Sagt euch dass Akamaru nicht reich ist", - usage = "rich bitch", - patterns = {"^Rich Bitch", - "^rich bitch", - "^rich Bitch", - "^Rich bitch", - "^RICH BITCH"}, + usage = {"Rich Bitch","rich bitch","rich Bitch","Rich bitch","RICH BITCH"}, + patterns = {"^Rich Bitch","^rich bitch","^rich Bitch","^Rich bitch","^RICH BITCH"}, run = run } --by Akamaru \ No newline at end of file diff --git a/plugins/sakurasou.lua b/plugins/sakurasou.lua index a3a6d1a..ff81796 100644 --- a/plugins/sakurasou.lua +++ b/plugins/sakurasou.lua @@ -30,22 +30,9 @@ function run(msg, matches) end return { - description = "", - usage = "", - patterns = {"^/shiina", - "^/Shiina", - "^/chihiro", - "^/Chihiro", - "^/jin", - "^/Jin", - "^/misaki", - "^/Misaki", - "^/nanami", - "^/Nanami", - "^/ryuunosuke", - "^/Ryuunosuke", - "^/sorata", - "^/Sorata"}, + description = "Sendet euch ein Char aus Sakurasou no Pet na Kanojo", + usage = {"/shiina","/Shiina","/chihiro","/Chihiro","/jin","/Jin","/misaki","/Misaki","/nanami","/Nanami","/ryuunosuke","/Ryuunosuke","/sorata","/Sorata"}, + patterns = {"^/shiina","^/Shiina","^/chihiro","^/Chihiro","^/jin","^/Jin","^/misaki","^/Misaki","^/nanami","^/Nanami","^/ryuunosuke","^/Ryuunosuke","^/sorata","^/Sorata"}, run = run } --by Akamaru \ No newline at end of file diff --git a/plugins/search_youtube.lua b/plugins/search_youtube.lua index 3beffed..78d5682 100644 --- a/plugins/search_youtube.lua +++ b/plugins/search_youtube.lua @@ -39,11 +39,8 @@ end return { description = "Sucht YouTube-Video und sendet es", - usage = "/youtube [Suchbegriff]", - patterns = { - "^/youtube", - "^/yt" - }, + usage = {"/youtube [Suchbegriff]","/yt [Suchbegriff]"}, + patterns = {"^/youtube","^/yt"}, run = run } diff --git a/plugins/senran_kagura.lua b/plugins/senran_kagura.lua index 983a6a6..8003249 100644 --- a/plugins/senran_kagura.lua +++ b/plugins/senran_kagura.lua @@ -42,28 +42,9 @@ function run(msg, matches) end return { - description = "", - usage = "", - patterns = {"^/asuka", - "^/Asuka", - "^/hibari", - "^/Hibari", - "^/ikaruga", - "^/Ikaruga", - "^/katsuragi", - "^/Katsuragi", - "^/yagyuu", - "^/Yagyuu", - "^/haruka", - "^/Haruka", - "^/hikage", - "^/Hikage", - "^/homura", - "^/Homura", - "^/mirai", - "^/Mirai", - "^/yomi", - "^/Yomi"}, + description = "Sendet euch ein Senran Kagura Char", + usage = {"/asuka","/Asuka","/hibari","/Hibari","/ikaruga","/Ikaruga","/katsuragi","/Katsuragi","/yagyuu","/Yagyuu","/haruka","/Haruka","/hikage","/Hikage","/homura","/Homura","/mirai","/Mirai","/yomi","/Yomi"}, + patterns = {"^/asuka","^/Asuka","^/hibari","^/Hibari","^/ikaruga","^/Ikaruga","^/katsuragi","^/Katsuragi","^/yagyuu","^/Yagyuu","^/haruka","^/Haruka","^/hikage","^/Hikage","^/homura","^/Homura","^/mirai","^/Mirai","^/yomi","^/Yomi"}, run = run } --by Akamaru \ No newline at end of file diff --git a/plugins/sh.lua b/plugins/sh.lua index e16b5c7..2299e16 100644 --- a/plugins/sh.lua +++ b/plugins/sh.lua @@ -32,7 +32,7 @@ end return { description = "Führt Befehle in der Konsole aus", - usage = "", + usage = {"Das kann nur Akamaru"}, patterns = {"^/uptime", "^/sh (.*)$"}, run = run, privileged = true diff --git a/plugins/stats.lua b/plugins/stats.lua index 3ccc9f7..394d3bc 100644 --- a/plugins/stats.lua +++ b/plugins/stats.lua @@ -105,12 +105,9 @@ end _stats = read_file_stats() return { - description = "", - usage = "", - patterns = { - "^/(stats)", - ".*" - }, + description = "Zeigt wieviel ihr spamt", + usage = {"/stats"}, + patterns = {"^/(stats)",}, run = run, cron = save_stats } diff --git a/plugins/steam.lua b/plugins/steam.lua index cce518c..45ab5c5 100644 --- a/plugins/steam.lua +++ b/plugins/steam.lua @@ -68,10 +68,8 @@ end return { description = "Grabs Steam info for Steam links.", - usage = "", - patterns = { - "http://store.steampowered.com/app/([0-9]+)", - }, + usage = {"store.steampowered.com Link"}, + patterns = {"http://store.steampowered.com/app/([0-9]+)",}, run = run } diff --git a/plugins/stille.lua b/plugins/stille.lua index b900523..d4ce695 100644 --- a/plugins/stille.lua +++ b/plugins/stille.lua @@ -12,11 +12,8 @@ end return { description = "Es ist so still hier", - usage = "stille", - patterns = {"^Stille", - "^stille", - "^*stille*", - "^*Stille*"}, + usage = {"Stille","stille","*stille*","*Stille*"}, + patterns = {"^Stille","^stille","^*stille*","^*Stille*"}, run = run } end diff --git a/plugins/translate.lua b/plugins/translate.lua index 9ba6668..f9b7f06 100644 --- a/plugins/translate.lua +++ b/plugins/translate.lua @@ -67,12 +67,8 @@ end return { description = "Übersetze Text", - usage = "/translate [Text]", - patterns = { - "^/translate ([%w]+),([%a]+) (.+)", - "^/translate ([%w]+) (.+)", - "^/translate (.+)", - }, + usage = {"/translate [Text]"}, + patterns = {"^/translate ([%w]+),([%a]+) (.+)","^/translate ([%w]+) (.+)","^/translate (.+)",}, run = run } diff --git a/plugins/urban_dictionary.lua b/plugins/urban_dictionary.lua index 0e7b982..62e0d85 100644 --- a/plugins/urban_dictionary.lua +++ b/plugins/urban_dictionary.lua @@ -33,7 +33,7 @@ end return { description = "Zeigt eine Urban Dictionary Definition", - usage = "/ud [topic]", + usage = {"/ud [Begriff]"}, patterns = {"^/ud (.*)$"}, run = run } \ No newline at end of file diff --git a/plugins/url_title.lua b/plugins/url_title.lua index f3fa57b..8d26ede 100644 --- a/plugins/url_title.lua +++ b/plugins/url_title.lua @@ -28,7 +28,7 @@ function run(msg, matches) local title = getTitle(result) --Ignoring 301, 302, 404 and more - if title == "301 Moved Permanently" or + if title == "301 Moved Permanently" or title == "" or title == "404 Not Found" or title == "302 Found" or @@ -38,7 +38,7 @@ function run(msg, matches) string.match(title, "deviantArt") or string.match(title, "twitch") or string.match(title, "eBay") or - string.match(title, "Twitch") then + string.match(title, "Twitch") then print('Invalide, da "'..title..'"') else return title @@ -47,7 +47,7 @@ function run(msg, matches) return { description = "Postet URL-Titel", - usage = "Irgendein Link", + usage = {"Irgendein Link"}, patterns = {"^(https?://[%w-_%.%?%.:,/%+=&]+)$",}, run = run } diff --git a/plugins/version.lua b/plugins/version.lua index fa4fc32..50d738b 100644 --- a/plugins/version.lua +++ b/plugins/version.lua @@ -6,10 +6,8 @@ end return { description = "Zeigt die Bot Version", - usage = "/version", - patterns = { - "^/version$" - }, + usage = {"/version","/v"}, + patterns = {"^/version$","^/v$"}, run = run } end diff --git a/plugins/wallpaper.lua b/plugins/wallpaper.lua index d32c222..34aef3d 100644 --- a/plugins/wallpaper.lua +++ b/plugins/wallpaper.lua @@ -33,7 +33,7 @@ function run(msg, matches) local url = getWallpaper(text) if not url then - return "Kein Bild gefunden." + return "Kein Wallpaper gefunden." end print("Bilder-URL: ", url) @@ -42,9 +42,10 @@ function run(msg, matches) end return { - description = "Sucht Bild mit Google-API und versendet es (SafeSearch aktiv)", - usage = "/wallpaper [Suchbegriff]", + description = "Sucht Wallpaper mit Google und versendet es (SafeSearch aktiv)", + usage = {"/wallpaper [Suchbegriff]","/wp [Suchbegriff]"}, patterns = {"^/wallpaper (.*)$","^/wp (.*)$"}, run = run } end +-- Original by yagop ; Modified by Akamaru \ No newline at end of file diff --git a/plugins/wallpaper_nsfw.lua b/plugins/wallpaper_nsfw.lua index f6bb8b8..04f0387 100644 --- a/plugins/wallpaper_nsfw.lua +++ b/plugins/wallpaper_nsfw.lua @@ -1,4 +1,3 @@ - do function getWallpaper2(text) @@ -33,7 +32,7 @@ function run(msg, matches) local url = getWallpaper2(text) if not url then - return "Kein Bild gefunden." + return "Kein Wallpaper gefunden." end print("Bilder-URL: ", url) @@ -42,9 +41,10 @@ function run(msg, matches) end return { - description = "Sucht Bild mit Google-API und versendet es", - usage = "/wallpaper2 [Suchbegriff]", + description = "Sucht Wallpaper mit Google und versendet es [NSFW]", + usage = {"/wallpaper2 [Suchbegriff]","/wp2 [Suchbegriff]"}, patterns = {"^/wallpaper2 (.*)$","^/wp2 (.*)$"}, run = run } end +-- Original by yagop ; Modified by Akamaru \ No newline at end of file diff --git a/plugins/wd.lua b/plugins/wd.lua index 28b8913..4b5d6c6 100644 --- a/plugins/wd.lua +++ b/plugins/wd.lua @@ -5,7 +5,7 @@ end return { description = "Sagt dass ihr wieder da seid", - usage = "/wd", + usage = {"/wd"}, patterns = {"^/wd(.*)$"}, run = run } diff --git a/plugins/wiki.lua b/plugins/wiki.lua index 19518a3..52f74bc 100644 --- a/plugins/wiki.lua +++ b/plugins/wiki.lua @@ -60,11 +60,7 @@ end return { description = "Sendet einen Wikipedia-Artikel", - usage = "/wiki Suchwort", - patterns = { - "^/wiki (.*)$", - "^%.[w|W]iki (.*)$", - "de.wikipedia.org/wiki/([A-Za-z0-9-_-]+)" - }, + usage = {"/wiki [Suchwort]","de.wikipedia.org Link"}, + patterns = {"^/wiki (.*)$","^%.[w|W]iki (.*)$","de.wikipedia.org/wiki/([A-Za-z0-9-_-]+)"}, run = run } \ No newline at end of file diff --git a/plugins/wuerfel.lua b/plugins/wuerfel.lua index e673614..b8ab5be 100644 --- a/plugins/wuerfel.lua +++ b/plugins/wuerfel.lua @@ -7,7 +7,7 @@ end return { description = "Würfel eine Zahl zwischen 1 bis 6", - usage = "/würfel", + usage = {"/würfel"}, patterns = {"^/würfel"}, run = run } diff --git a/plugins/xkcd.lua b/plugins/xkcd.lua index 1bfe157..08ffbd3 100644 --- a/plugins/xkcd.lua +++ b/plugins/xkcd.lua @@ -47,11 +47,7 @@ end return { description = "Sendet Comics von xkcd", usage = {"/xkcd"}, - patterns = { - "^/xkcd$", - "^/xkcd (%d+)", - "xkcd.com/(%d+)" - }, + patterns = {"^/xkcd$","^/xkcd (%d+)","xkcd.com/(%d+)"}, run = run } diff --git a/plugins/yolo.lua b/plugins/yolo.lua index 9187746..476e12c 100644 --- a/plugins/yolo.lua +++ b/plugins/yolo.lua @@ -5,7 +5,7 @@ end return { description = "Sendet euch ein Hä YOLO?", - usage = "/yolo", + usage = {"/yolo"}, patterns = {"^/yolo"}, run = run } diff --git a/plugins/youporn.lua b/plugins/youporn.lua index c6004e1..de9d50c 100644 --- a/plugins/youporn.lua +++ b/plugins/youporn.lua @@ -42,8 +42,7 @@ end return { description = "Sendet ein YouPorn Video", - usage = "/youporn", - patterns = {"^/youporn (.*)$", - "^/yp (.*)$"}, + usage = {"/youporn","/yp"}, + patterns = {"^/youporn (.*)$","^/yp (.*)$"}, run = run } \ No newline at end of file