From 4021a1c84d11a05d6ebd93fa7cd9c43330f62c05 Mon Sep 17 00:00:00 2001 From: Akamaru Date: Mon, 20 Apr 2015 18:52:25 +0200 Subject: [PATCH] many code cleanup in plugins --- plugins/afk.lua | 8 ++++---- plugins/aha.png.lua | 8 +++----- plugins/baka_bot.lua | 7 ++++--- plugins/barusamikosu.lua | 12 +++++------- plugins/boersedown.lua | 2 +- plugins/chucknorris.lua | 2 +- plugins/emoticons.lua | 9 ++++----- plugins/facepalm.lua | 3 ++- plugins/hallo.lua | 5 +++-- plugins/images.lua | 4 ++-- plugins/img_google_nsfw.lua | 4 ++-- plugins/justkitten.lua | 18 +++++++++--------- plugins/kitty.lua | 14 +++++++------- plugins/lucky_star.lua | 3 ++- plugins/lyrics.lua | 2 +- plugins/magische_miesmuschel.lua | 3 ++- plugins/media.lua | 4 ++-- plugins/moepse.lua | 4 ++-- plugins/naira_derp.lua | 3 ++- plugins/nau.lua | 8 +++----- plugins/neorame.lua | 8 +++----- plugins/niissan.lua | 8 ++------ plugins/nope.avi.lua | 7 ++----- plugins/nyu.lua | 10 +++------- plugins/pornhub.lua | 8 ++++---- plugins/rechner.lua | 4 +--- plugins/reload.lua | 6 +++--- plugins/rich_bitch.lua | 7 ++----- plugins/sakurasou.lua | 15 ++++++++------- plugins/senran_kagura.lua | 20 ++++++++++---------- plugins/stille.lua | 12 ++++++------ plugins/twitter_send.lua | 4 ++-- plugins/urban_dictionary.lua | 4 ++-- plugins/url_title.lua | 18 +++++++++++------- plugins/version.lua | 1 - plugins/wd.lua | 5 ++--- plugins/wuerfel.lua | 4 +++- plugins/yolo.lua | 9 +++------ plugins/youporn.lua | 10 +++++----- 39 files changed, 133 insertions(+), 150 deletions(-) diff --git a/plugins/afk.lua b/plugins/afk.lua index 4be1896..fb08fe6 100644 --- a/plugins/afk.lua +++ b/plugins/afk.lua @@ -1,13 +1,13 @@ function run(msg, matches) +--get username local user_name = get_name(msg) - return "" .. user_name .. " ist nun AFK" + return '' .. user_name .. ' ist nun AFK' end return { description = "Sagt dass ihr afk seid", usage = "/afk", - patterns = { - "^/afk(.*)$" - }, + patterns = {"^/afk(.*)$"}, run = run } +--by Akamaru \ No newline at end of file diff --git a/plugins/aha.png.lua b/plugins/aha.png.lua index 29511f6..03da8b2 100644 --- a/plugins/aha.png.lua +++ b/plugins/aha.png.lua @@ -1,8 +1,5 @@ function run(msg, matches) - - if string.starts(msg.text, "aha.png") then - send_photo(get_receiver(msg), "pictures/aha.png", ok_cb, false) - end +send_photo(get_receiver(msg), "pictures/aha.png", ok_cb, false) end return { @@ -10,4 +7,5 @@ return { usage = "aha.png", patterns = {"^aha.png"}, run = run -} \ No newline at end of file +} +--by Akamaru \ No newline at end of file diff --git a/plugins/baka_bot.lua b/plugins/baka_bot.lua index f3cc728..e8d6612 100644 --- a/plugins/baka_bot.lua +++ b/plugins/baka_bot.lua @@ -1,11 +1,11 @@ function run(msg, matches) return "Gomen'nasai ๐Ÿ˜ฃ" - end +end return { - description = "", - usage = "", + description = "So ein dummer Bot", + usage = "Baka Bot", patterns = {"^baka bot", "Baka bot", "baka Bot", @@ -13,3 +13,4 @@ return { "BAKA BOT"}, run = run } +--by Akamaru \ No newline at end of file diff --git a/plugins/barusamikosu.lua b/plugins/barusamikosu.lua index d0d2b74..6820892 100644 --- a/plugins/barusamikosu.lua +++ b/plugins/barusamikosu.lua @@ -1,15 +1,13 @@ function run(msg, matches) - - if string.starts(msg.text, '/barusamiko') or string.starts(msg.text, "/barusamikosu") or string.starts(msg.text, "/Balsamiko Essig") then - send_photo(get_receiver(msg), "pictures/luckystar/barusamikosu.jpg", ok_cb, false) - end + send_photo(get_receiver(msg), "pictures/luckystar/barusamikosu.jpg", ok_cb, false) end return { description = "Balsamiko Essig!", usage = "/barusamiko", patterns = {"^/barusamiko", - "^/barusamikosu", - "^/Balsamiko Essig"}, + "^/barusamikosu", + "^/Balsamiko Essig"}, run = run -} \ No newline at end of file +} +--by Akamaru \ No newline at end of file diff --git a/plugins/boersedown.lua b/plugins/boersedown.lua index f87ed6d..7ae9f49 100644 --- a/plugins/boersedown.lua +++ b/plugins/boersedown.lua @@ -16,7 +16,7 @@ function cron() end return { - description = "", + description = "Checkt ob Boerse.to online ist", usage = "", patterns = {}, run = nil, diff --git a/plugins/chucknorris.lua b/plugins/chucknorris.lua index 4b25c38..0a4a6a8 100644 --- a/plugins/chucknorris.lua +++ b/plugins/chucknorris.lua @@ -14,7 +14,7 @@ function run(msg, matches) end return { - description = "get chuck norris joke", + description = "Sendet Chuck Norris Witze (Englisch)", usage = "/cn", patterns = {"^/cn$"}, run = run diff --git a/plugins/emoticons.lua b/plugins/emoticons.lua index 2b4a183..a60d192 100644 --- a/plugins/emoticons.lua +++ b/plugins/emoticons.lua @@ -1,14 +1,13 @@ function run(msg, matches) - if matches[1] == "/emoticons" then - return '๐Ÿ˜„๐Ÿ˜ƒ๐Ÿ˜€๐Ÿ˜Šโ˜บ๏ธ๐Ÿ˜‰๐Ÿ˜๐Ÿ˜˜๐Ÿ˜š๐Ÿ˜—๐Ÿ˜™๐Ÿ˜œ๐Ÿ˜๐Ÿ˜›๐Ÿ˜ณ๐Ÿ˜๐Ÿ˜”๐Ÿ˜Œ๐Ÿ˜’๐Ÿ˜ž๐Ÿ˜ฃ๐Ÿ˜ข๐Ÿ˜‚๐Ÿ˜ญ๐Ÿ˜ช๐Ÿ˜ฅ๐Ÿ˜ฐ๐Ÿ˜…๐Ÿ˜“๐Ÿ˜ฉ๐Ÿ˜ซ๐Ÿ˜จ๐Ÿ˜ฑ๐Ÿ˜ ๐Ÿ˜ก๐Ÿ˜ค๐Ÿ˜–๐Ÿ˜†๐Ÿ˜‹๐Ÿ˜ท๐Ÿ˜Ž๐Ÿ˜ด๐Ÿ˜ต๐Ÿ˜ฒ๐Ÿ˜Ÿ๐Ÿ˜ฆ๐Ÿ˜ง๐Ÿ˜ˆ๐Ÿ‘ฟ๐Ÿ˜ฎ๐Ÿ˜ฌ๐Ÿ˜๐Ÿ˜•๐Ÿ˜ฏ๐Ÿ˜ถ๐Ÿ˜‡๐Ÿ˜๐Ÿ˜‘๐Ÿ‘ฒ๐Ÿ‘ณ๐Ÿ‘ฎ๐Ÿ‘ท๐Ÿ’‚๐Ÿ‘ถ๐Ÿ‘ฆ๐Ÿ‘ง๐Ÿ‘จ๐Ÿ‘ฉ๐Ÿ‘ด๐Ÿ‘ต๐Ÿ‘ฑ๐Ÿ‘ผ๐Ÿ‘ธ๐Ÿ˜บ๐Ÿ˜ธ๐Ÿ˜ป๐Ÿ˜ฝ๐Ÿ˜ผ๐Ÿ™€๐Ÿ˜ฟ๐Ÿ˜น๐Ÿ˜พ๐Ÿ‘น๐Ÿ‘บ๐Ÿ™ˆ๐Ÿ™‰๐Ÿ™Š๐Ÿ’€๐Ÿ‘ฝ๐Ÿ’ฉ๐Ÿ”ฅโœจ๐ŸŒŸ๐Ÿ’ซ๐Ÿ’ฅ๐Ÿ’ข๐Ÿ’ฆ๐Ÿ’ง๐Ÿ’ค๐Ÿ’จ๐Ÿ‘‚๐Ÿ‘€๐Ÿ‘ƒ๐Ÿ‘…๐Ÿ‘„๐Ÿ‘๐Ÿ‘Ž๐Ÿ‘Œ๐Ÿ‘ŠโœŠโœŒ๏ธ๐Ÿ‘‹โœ‹๐Ÿ‘๐Ÿ‘†๐Ÿ‘‡๐Ÿ‘‰๐Ÿ‘ˆ๐Ÿ™Œ๐Ÿ™โ˜๏ธ๐Ÿ‘๐Ÿ’ช๐Ÿšถ๐Ÿƒ๐Ÿ’ƒ๐Ÿ‘ซ๐Ÿ‘ช๐Ÿ‘ฌ๐Ÿ‘ญ๐Ÿ’๐Ÿ’‘๐Ÿ‘ฏ๐Ÿ™†๐Ÿ™…๐Ÿ’๐Ÿ™‹๐Ÿ’†๐Ÿ’‡๐Ÿ’…๐Ÿ‘ฐ๐Ÿ™Ž๐Ÿ™๐Ÿ™‡๐ŸŽฉ๐Ÿ‘‘๐Ÿ‘’๐Ÿ‘Ÿ๐Ÿ‘ž๐Ÿ‘ก๐Ÿ‘ ๐Ÿ‘ข๐Ÿ‘•๐Ÿ‘”๐Ÿ‘š๐Ÿ‘—๐ŸŽฝ๐Ÿ‘–๐Ÿ‘˜๐Ÿ‘™๐Ÿ’ผ๐Ÿ‘œ๐Ÿ‘๐Ÿ‘›๐Ÿ‘“๐ŸŽ€๐ŸŒ‚๐Ÿ’„๐Ÿ’›๐Ÿ’™๐Ÿ’œ๐Ÿ’šโค๏ธ๐Ÿ’”๐Ÿ’—๐Ÿ’“๐Ÿ’•๐Ÿ’–๐Ÿ’ž๐Ÿ’˜๐Ÿ’Œ๐Ÿ’‹๐Ÿ’๐Ÿ’Ž๐Ÿ‘ค๐Ÿ‘ฅ๐Ÿ’ฌ๐Ÿ‘ฃ๐Ÿ’ญ๐Ÿถ๐Ÿบ๐Ÿฑ๐Ÿญ๐Ÿน๐Ÿฐ๐Ÿธ๐Ÿฏ๐Ÿจ๐Ÿป๐Ÿท๐Ÿฝ๐Ÿฎ๐Ÿ—๐Ÿต๐Ÿ’๐Ÿด๐Ÿ‘๐Ÿ˜๐Ÿผ๐Ÿง๐Ÿฆ๐Ÿค๐Ÿฅ๐Ÿฃ๐Ÿ”๐Ÿ๐Ÿข๐Ÿ›๐Ÿ๐Ÿœ๐Ÿž๐ŸŒ๐Ÿ™๐Ÿš๐Ÿ ๐ŸŸ๐Ÿฌ๐Ÿณ๐Ÿ‹๐Ÿ„๐Ÿ๐Ÿ€๐Ÿƒ๐Ÿ…๐Ÿ‡๐Ÿ‰๐ŸŽ๐Ÿ๐Ÿ“๐Ÿ•๐Ÿ–๐Ÿ๐Ÿ‚๐Ÿฒ๐Ÿก๐ŸŠ๐Ÿซ๐Ÿช๐Ÿ†๐Ÿˆ๐Ÿฉ๐Ÿพ๐Ÿ’๐ŸŒธ๐ŸŒท๐Ÿ€๐ŸŒน๐ŸŒป๐ŸŒบ๐Ÿ๐Ÿƒ๐Ÿ‚๐ŸŒฟ๐ŸŒพ๐Ÿ„๐ŸŒต๐ŸŒด๐ŸŒฒ๐ŸŒณ๐ŸŒฐ๐ŸŒฑ๐ŸŒผ๐ŸŒ๐ŸŒž๐ŸŒ๐ŸŒš๐ŸŒ‘๐ŸŒ’๐ŸŒ“๐ŸŒ”๐ŸŒ•๐ŸŒ–๐ŸŒ—๐ŸŒ˜๐ŸŒœ๐ŸŒ›๐ŸŒ™๐ŸŒ๐ŸŒŽ๐ŸŒ๐ŸŒ‹๐ŸŒŒ๐ŸŒ โญ๏ธโ˜€๏ธโ›…๏ธโ˜๏ธโšก๏ธโ˜”๏ธโ„๏ธโ›„๏ธ๐ŸŒ€๐ŸŒ๐ŸŒˆ๐ŸŒŠ๐ŸŽ๐Ÿ’๐ŸŽŽ๐ŸŽ’๐ŸŽ“๐ŸŽ๐ŸŽ†๐ŸŽ‡๐ŸŽ๐ŸŽ‘๐ŸŽƒ๐Ÿ‘ป๐ŸŽ…๐ŸŽ„๐ŸŽ๐ŸŽ‹๐ŸŽ‰๐ŸŽŠ๐ŸŽˆ๐ŸŽŒ๐Ÿ”ฎ๐ŸŽฅ๐Ÿ“ท๐Ÿ“น๐Ÿ“ผ๐Ÿ’ฟ๐Ÿ“€๐Ÿ’ฝ๐Ÿ’พ๐Ÿ’ป๐Ÿ“ฑโ˜Ž๏ธ๐Ÿ“ž๐Ÿ“Ÿ๐Ÿ“ ๐Ÿ“ก๐Ÿ“บ๐Ÿ“ป๐Ÿ”Š๐Ÿ”‰๐Ÿ”ˆ๐Ÿ”‡๐Ÿ””๐Ÿ”•๐Ÿ“ข๐Ÿ“ฃโณโŒ›๏ธโฐโŒš๏ธ๐Ÿ”“๐Ÿ”’๐Ÿ”๐Ÿ”๐Ÿ”‘๐Ÿ”Ž๐Ÿ’ก๐Ÿ”ฆ๐Ÿ”†๐Ÿ”…๐Ÿ”Œ๐Ÿ”‹๐Ÿ”๐Ÿ›๐Ÿ›€๐Ÿšฟ๐Ÿšฝ๐Ÿ”ง๐Ÿ”ฉ๐Ÿ”จ๐Ÿšช๐Ÿšฌ๐Ÿ’ฃ๐Ÿ”ซ๐Ÿ”ช๐Ÿ’Š๐Ÿ’‰๐Ÿ’ฐ๐Ÿ’ด๐Ÿ’ต๐Ÿ’ท๐Ÿ’ถ๐Ÿ’ณ๐Ÿ’ธ๐Ÿ“ฒ๐Ÿ“ง๐Ÿ“ฅ๐Ÿ“คโœ‰๏ธ๐Ÿ“ฉ๐Ÿ“จ๐Ÿ“ฏ๐Ÿ“ซ๐Ÿ“ช๐Ÿ“ฌ๐Ÿ“ญ๐Ÿ“ฎ๐Ÿ“ฆ๐Ÿ“๐Ÿ“„๐Ÿ“ƒ๐Ÿ“‘๐Ÿ“Š๐Ÿ“ˆ๐Ÿ“‰๐Ÿ“œ๐Ÿ“‹๐Ÿ“…๐Ÿ“†๐Ÿ“‡๐Ÿ“๐Ÿ“‚โœ‚๏ธ๐Ÿ“Œ๐Ÿ“Žโœ’๏ธโœ๏ธ๐Ÿ“๐Ÿ“๐Ÿ“•๐Ÿ“—๐Ÿ“˜๐Ÿ“™๐Ÿ““๐Ÿ“”๐Ÿ“’๐Ÿ“š๐Ÿ“–๐Ÿ”–๐Ÿ“›๐Ÿ”ฌ๐Ÿ”ญ๐Ÿ“ฐ๐ŸŽจ๐ŸŽฌ๐ŸŽค๐ŸŽง๐ŸŽผ๐ŸŽต๐ŸŽถ๐ŸŽน๐ŸŽป๐ŸŽบ๐ŸŽท๐ŸŽธ๐Ÿ‘พ๐ŸŽฎ๐Ÿƒ๐ŸŽด๐Ÿ€„๏ธ๐ŸŽฒ๐ŸŽฏ๐Ÿˆ๐Ÿ€โšฝ๏ธโšพ๏ธ๐ŸŽพ๐ŸŽฑ๐Ÿ‰๐ŸŽณโ›ณ๏ธ๐Ÿšต๐Ÿšด๐Ÿ๐Ÿ‡๐Ÿ†๐ŸŽฟ๐Ÿ‚๐ŸŠ๐Ÿ„๐ŸŽฃโ˜•๏ธ๐Ÿต๐Ÿถ๐Ÿผ๐Ÿบ๐Ÿป๐Ÿธ๐Ÿน๐Ÿท๐Ÿด๐Ÿ•๐Ÿ”๐ŸŸ๐Ÿ—๐Ÿ–๐Ÿ๐Ÿ›๐Ÿค๐Ÿฑ๐Ÿฃ๐Ÿฅ๐Ÿ™๐Ÿ˜๐Ÿš๐Ÿœ๐Ÿฒ๐Ÿข๐Ÿก๐Ÿณ๐Ÿž๐Ÿฉ๐Ÿฎ๐Ÿฆ๐Ÿจ๐Ÿง๐ŸŽ‚๐Ÿฐ๐Ÿช๐Ÿซ๐Ÿฌ๐Ÿญ๐Ÿฏ๐ŸŽ๐Ÿ๐ŸŠ๐Ÿ‹๐Ÿ’๐Ÿ‡๐Ÿ‰๐Ÿ“๐Ÿ‘๐Ÿˆ๐ŸŒ๐Ÿ๐Ÿ๐Ÿ ๐Ÿ†๐Ÿ…๐ŸŒฝ๐Ÿ ๐Ÿก๐Ÿซ๐Ÿข๐Ÿฃ๐Ÿฅ๐Ÿฆ๐Ÿช๐Ÿฉ๐Ÿจ๐Ÿ’’โ›ช๏ธ๐Ÿฌ๐Ÿค๐ŸŒ‡๐ŸŒ†๐Ÿฏ๐Ÿฐโ›บ๏ธ๐Ÿญ๐Ÿ—ผ๐Ÿ—พ๐Ÿ—ป๐ŸŒ„๐ŸŒ…๐ŸŒƒ๐Ÿ—ฝ๐ŸŒ‰๐ŸŽ ๐ŸŽกโ›ฒ๏ธ๐ŸŽข๐Ÿšขโ›ต๏ธ๐Ÿšค๐Ÿšฃโš“๏ธ๐Ÿš€โœˆ๏ธ๐Ÿ’บ๐Ÿš๐Ÿš‚๐ŸšŠ๐Ÿš‰๐Ÿšž๐Ÿš†๐Ÿš„๐Ÿš…๐Ÿšˆ๐Ÿš‡๐Ÿš๐Ÿš‹๐Ÿšƒ๐ŸšŽ๐ŸšŒ๐Ÿš๐Ÿš™๐Ÿš˜๐Ÿš—๐Ÿš•๐Ÿš–๐Ÿš›๐Ÿšš๐Ÿšจ๐Ÿš“๐Ÿš”๐Ÿš’๐Ÿš‘๐Ÿš๐Ÿšฒ๐Ÿšก๐ŸšŸ๐Ÿš ๐Ÿšœ๐Ÿ’ˆ๐Ÿš๐ŸŽซ๐Ÿšฆ๐Ÿšฅโš ๏ธ๐Ÿšง๐Ÿ”ฐโ›ฝ๏ธ๐Ÿฎ๐ŸŽฐโ™จ๏ธ๐Ÿ—ฟ๐ŸŽช๐ŸŽญ๐Ÿ“๐Ÿšฉ๐Ÿ‡ฏ๐Ÿ‡ต๐Ÿ‡ฐ๐Ÿ‡ท๐Ÿ‡ฉ๐Ÿ‡ช๐Ÿ‡จ๐Ÿ‡ณ๐Ÿ‡บ๐Ÿ‡ธ๐Ÿ‡ซ๐Ÿ‡ท๐Ÿ‡ช๐Ÿ‡ธ๐Ÿ‡ฎ๐Ÿ‡น๐Ÿ‡ท๐Ÿ‡บ๐Ÿ‡ฌ๐Ÿ‡ง1โƒฃ2โƒฃ3โƒฃ4โƒฃ5โƒฃ6โƒฃ7โƒฃ8โƒฃ9โƒฃ0โƒฃ๐Ÿ”Ÿ๐Ÿ”ข#โƒฃ๐Ÿ”ฃโฌ†๏ธโฌ‡๏ธโฌ…๏ธโžก๏ธ๐Ÿ” ๐Ÿ”ก๐Ÿ”คโ†—๏ธโ†–๏ธโ†˜๏ธโ†™๏ธโ†”๏ธโ†•๏ธ๐Ÿ”„โ—€๏ธโ–ถ๏ธ๐Ÿ”ผ๐Ÿ”ฝโ†ฉ๏ธโ†ช๏ธโ„น๏ธโชโฉโซโฌโคต๏ธโคด๏ธ๐Ÿ†—๐Ÿ”€๐Ÿ”๐Ÿ”‚๐Ÿ†•๐Ÿ†™๐Ÿ†’๐Ÿ†“๐Ÿ†–๐Ÿ“ถ๐ŸŽฆ๐Ÿˆ๐Ÿˆฏ๏ธ๐Ÿˆณ๐Ÿˆต๐Ÿˆด๐Ÿˆฒ๐Ÿ‰๐Ÿˆน๐Ÿˆบ๐Ÿˆถ๐Ÿˆš๏ธ๐Ÿšป๐Ÿšน๐Ÿšบ๐Ÿšผ๐Ÿšพ๐Ÿšฐ๐Ÿšฎ๐Ÿ…ฟ๏ธโ™ฟ๏ธ๐Ÿšญ๐Ÿˆท๐Ÿˆธ๐Ÿˆ‚โ“‚๏ธ๐Ÿ›‚๐Ÿ›„๐Ÿ›…๐Ÿ›ƒ๐Ÿ‰‘ใŠ™๏ธใŠ—๏ธ๐Ÿ†‘๐Ÿ†˜๐Ÿ†”๐Ÿšซ๐Ÿ”ž๐Ÿ“ต๐Ÿšฏ๐Ÿšฑ๐Ÿšณ๐Ÿšท๐Ÿšธโ›”๏ธโœณ๏ธโ‡๏ธโŽโœ…โœด๏ธ๐Ÿ’Ÿ๐Ÿ†š๐Ÿ“ณ๐Ÿ“ด๐Ÿ…ฐ๐Ÿ…ฑ๐Ÿ†Ž๐Ÿ…พ๐Ÿ’ โžฟโ™ป๏ธโ™ˆ๏ธโ™‰๏ธโ™Š๏ธโ™‹๏ธโ™Œ๏ธโ™๏ธโ™Ž๏ธโ™๏ธโ™๏ธโ™‘๏ธโ™’๏ธโ™“๏ธโ›Ž๐Ÿ”ฏ๐Ÿง๐Ÿ’น๐Ÿ’ฒ๐Ÿ’ฑยฉยฎโ„ขโŒโ€ผ๏ธโ‰๏ธโ—๏ธโ“โ•โ”โญ•๏ธ๐Ÿ”๐Ÿ”š๐Ÿ”™๐Ÿ”›๐Ÿ”œ๐Ÿ”ƒ๐Ÿ•›๐Ÿ•ง๐Ÿ•๐Ÿ•œ๐Ÿ•‘๐Ÿ•๐Ÿ•’๐Ÿ•ž๐Ÿ•“๐Ÿ•Ÿ๐Ÿ•”๐Ÿ• ๐Ÿ••๐Ÿ•–๐Ÿ•—๐Ÿ•˜๐Ÿ•™๐Ÿ•š๐Ÿ•ก๐Ÿ•ข๐Ÿ•ฃ๐Ÿ•ค๐Ÿ•ฅ๐Ÿ•ฆโœ–๏ธโž•โž–โž—โ™ ๏ธโ™ฅ๏ธโ™ฃ๏ธโ™ฆ๏ธ๐Ÿ’ฎ๐Ÿ’ฏโœ”๏ธโ˜‘๏ธ๐Ÿ”˜๐Ÿ”—โžฐใ€ฐใ€ฝ๏ธ๐Ÿ”ฑโ—ผ๏ธโ—ป๏ธโ—พ๏ธโ—ฝ๏ธโ–ช๏ธโ–ซ๏ธ๐Ÿ”บ๐Ÿ”ฒ๐Ÿ”ณโšซ๏ธโšช๏ธ๐Ÿ”ด๐Ÿ”ต๐Ÿ”ปโฌœ๏ธโฌ›๏ธ๐Ÿ”ถ๐Ÿ”ท๐Ÿ”ธ๐Ÿ”น' - end - + return '๐Ÿ˜„๐Ÿ˜ƒ๐Ÿ˜€๐Ÿ˜Šโ˜บ๏ธ๐Ÿ˜‰๐Ÿ˜๐Ÿ˜˜๐Ÿ˜š๐Ÿ˜—๐Ÿ˜™๐Ÿ˜œ๐Ÿ˜๐Ÿ˜›๐Ÿ˜ณ๐Ÿ˜๐Ÿ˜”๐Ÿ˜Œ๐Ÿ˜’๐Ÿ˜ž๐Ÿ˜ฃ๐Ÿ˜ข๐Ÿ˜‚๐Ÿ˜ญ๐Ÿ˜ช๐Ÿ˜ฅ๐Ÿ˜ฐ๐Ÿ˜…๐Ÿ˜“๐Ÿ˜ฉ๐Ÿ˜ซ๐Ÿ˜จ๐Ÿ˜ฑ๐Ÿ˜ ๐Ÿ˜ก๐Ÿ˜ค๐Ÿ˜–๐Ÿ˜†๐Ÿ˜‹๐Ÿ˜ท๐Ÿ˜Ž๐Ÿ˜ด๐Ÿ˜ต๐Ÿ˜ฒ๐Ÿ˜Ÿ๐Ÿ˜ฆ๐Ÿ˜ง๐Ÿ˜ˆ๐Ÿ‘ฟ๐Ÿ˜ฎ๐Ÿ˜ฌ๐Ÿ˜๐Ÿ˜•๐Ÿ˜ฏ๐Ÿ˜ถ๐Ÿ˜‡๐Ÿ˜๐Ÿ˜‘๐Ÿ‘ฒ๐Ÿ‘ณ๐Ÿ‘ฎ๐Ÿ‘ท๐Ÿ’‚๐Ÿ‘ถ๐Ÿ‘ฆ๐Ÿ‘ง๐Ÿ‘จ๐Ÿ‘ฉ๐Ÿ‘ด๐Ÿ‘ต๐Ÿ‘ฑ๐Ÿ‘ผ๐Ÿ‘ธ๐Ÿ˜บ๐Ÿ˜ธ๐Ÿ˜ป๐Ÿ˜ฝ๐Ÿ˜ผ๐Ÿ™€๐Ÿ˜ฟ๐Ÿ˜น๐Ÿ˜พ๐Ÿ‘น๐Ÿ‘บ๐Ÿ™ˆ๐Ÿ™‰๐Ÿ™Š๐Ÿ’€๐Ÿ‘ฝ๐Ÿ’ฉ๐Ÿ”ฅโœจ๐ŸŒŸ๐Ÿ’ซ๐Ÿ’ฅ๐Ÿ’ข๐Ÿ’ฆ๐Ÿ’ง๐Ÿ’ค๐Ÿ’จ๐Ÿ‘‚๐Ÿ‘€๐Ÿ‘ƒ๐Ÿ‘…๐Ÿ‘„๐Ÿ‘๐Ÿ‘Ž๐Ÿ‘Œ๐Ÿ‘ŠโœŠโœŒ๏ธ๐Ÿ‘‹โœ‹๐Ÿ‘๐Ÿ‘†๐Ÿ‘‡๐Ÿ‘‰๐Ÿ‘ˆ๐Ÿ™Œ๐Ÿ™โ˜๏ธ๐Ÿ‘๐Ÿ’ช๐Ÿšถ๐Ÿƒ๐Ÿ’ƒ๐Ÿ‘ซ๐Ÿ‘ช๐Ÿ‘ฌ๐Ÿ‘ญ๐Ÿ’๐Ÿ’‘๐Ÿ‘ฏ๐Ÿ™†๐Ÿ™…๐Ÿ’๐Ÿ™‹๐Ÿ’†๐Ÿ’‡๐Ÿ’…๐Ÿ‘ฐ๐Ÿ™Ž๐Ÿ™๐Ÿ™‡๐ŸŽฉ๐Ÿ‘‘๐Ÿ‘’๐Ÿ‘Ÿ๐Ÿ‘ž๐Ÿ‘ก๐Ÿ‘ ๐Ÿ‘ข๐Ÿ‘•๐Ÿ‘”๐Ÿ‘š๐Ÿ‘—๐ŸŽฝ๐Ÿ‘–๐Ÿ‘˜๐Ÿ‘™๐Ÿ’ผ๐Ÿ‘œ๐Ÿ‘๐Ÿ‘›๐Ÿ‘“๐ŸŽ€๐ŸŒ‚๐Ÿ’„๐Ÿ’›๐Ÿ’™๐Ÿ’œ๐Ÿ’šโค๏ธ๐Ÿ’”๐Ÿ’—๐Ÿ’“๐Ÿ’•๐Ÿ’–๐Ÿ’ž๐Ÿ’˜๐Ÿ’Œ๐Ÿ’‹๐Ÿ’๐Ÿ’Ž๐Ÿ‘ค๐Ÿ‘ฅ๐Ÿ’ฌ๐Ÿ‘ฃ๐Ÿ’ญ๐Ÿถ๐Ÿบ๐Ÿฑ๐Ÿญ๐Ÿน๐Ÿฐ๐Ÿธ๐Ÿฏ๐Ÿจ๐Ÿป๐Ÿท๐Ÿฝ๐Ÿฎ๐Ÿ—๐Ÿต๐Ÿ’๐Ÿด๐Ÿ‘๐Ÿ˜๐Ÿผ๐Ÿง๐Ÿฆ๐Ÿค๐Ÿฅ๐Ÿฃ๐Ÿ”๐Ÿ๐Ÿข๐Ÿ›๐Ÿ๐Ÿœ๐Ÿž๐ŸŒ๐Ÿ™๐Ÿš๐Ÿ ๐ŸŸ๐Ÿฌ๐Ÿณ๐Ÿ‹๐Ÿ„๐Ÿ๐Ÿ€๐Ÿƒ๐Ÿ…๐Ÿ‡๐Ÿ‰๐ŸŽ๐Ÿ๐Ÿ“๐Ÿ•๐Ÿ–๐Ÿ๐Ÿ‚๐Ÿฒ๐Ÿก๐ŸŠ๐Ÿซ๐Ÿช๐Ÿ†๐Ÿˆ๐Ÿฉ๐Ÿพ๐Ÿ’๐ŸŒธ๐ŸŒท๐Ÿ€๐ŸŒน๐ŸŒป๐ŸŒบ๐Ÿ๐Ÿƒ๐Ÿ‚๐ŸŒฟ๐ŸŒพ๐Ÿ„๐ŸŒต๐ŸŒด๐ŸŒฒ๐ŸŒณ๐ŸŒฐ๐ŸŒฑ๐ŸŒผ๐ŸŒ๐ŸŒž๐ŸŒ๐ŸŒš๐ŸŒ‘๐ŸŒ’๐ŸŒ“๐ŸŒ”๐ŸŒ•๐ŸŒ–๐ŸŒ—๐ŸŒ˜๐ŸŒœ๐ŸŒ›๐ŸŒ™๐ŸŒ๐ŸŒŽ๐ŸŒ๐ŸŒ‹๐ŸŒŒ๐ŸŒ โญ๏ธโ˜€๏ธโ›…๏ธโ˜๏ธโšก๏ธโ˜”๏ธโ„๏ธโ›„๏ธ๐ŸŒ€๐ŸŒ๐ŸŒˆ๐ŸŒŠ๐ŸŽ๐Ÿ’๐ŸŽŽ๐ŸŽ’๐ŸŽ“๐ŸŽ๐ŸŽ†๐ŸŽ‡๐ŸŽ๐ŸŽ‘๐ŸŽƒ๐Ÿ‘ป๐ŸŽ…๐ŸŽ„๐ŸŽ๐ŸŽ‹๐ŸŽ‰๐ŸŽŠ๐ŸŽˆ๐ŸŽŒ๐Ÿ”ฎ๐ŸŽฅ๐Ÿ“ท๐Ÿ“น๐Ÿ“ผ๐Ÿ’ฟ๐Ÿ“€๐Ÿ’ฝ๐Ÿ’พ๐Ÿ’ป๐Ÿ“ฑโ˜Ž๏ธ๐Ÿ“ž๐Ÿ“Ÿ๐Ÿ“ ๐Ÿ“ก๐Ÿ“บ๐Ÿ“ป๐Ÿ”Š๐Ÿ”‰๐Ÿ”ˆ๐Ÿ”‡๐Ÿ””๐Ÿ”•๐Ÿ“ข๐Ÿ“ฃโณโŒ›๏ธโฐโŒš๏ธ๐Ÿ”“๐Ÿ”’๐Ÿ”๐Ÿ”๐Ÿ”‘๐Ÿ”Ž๐Ÿ’ก๐Ÿ”ฆ๐Ÿ”†๐Ÿ”…๐Ÿ”Œ๐Ÿ”‹๐Ÿ”๐Ÿ›๐Ÿ›€๐Ÿšฟ๐Ÿšฝ๐Ÿ”ง๐Ÿ”ฉ๐Ÿ”จ๐Ÿšช๐Ÿšฌ๐Ÿ’ฃ๐Ÿ”ซ๐Ÿ”ช๐Ÿ’Š๐Ÿ’‰๐Ÿ’ฐ๐Ÿ’ด๐Ÿ’ต๐Ÿ’ท๐Ÿ’ถ๐Ÿ’ณ๐Ÿ’ธ๐Ÿ“ฒ๐Ÿ“ง๐Ÿ“ฅ๐Ÿ“คโœ‰๏ธ๐Ÿ“ฉ๐Ÿ“จ๐Ÿ“ฏ๐Ÿ“ซ๐Ÿ“ช๐Ÿ“ฌ๐Ÿ“ญ๐Ÿ“ฎ๐Ÿ“ฆ๐Ÿ“๐Ÿ“„๐Ÿ“ƒ๐Ÿ“‘๐Ÿ“Š๐Ÿ“ˆ๐Ÿ“‰๐Ÿ“œ๐Ÿ“‹๐Ÿ“…๐Ÿ“†๐Ÿ“‡๐Ÿ“๐Ÿ“‚โœ‚๏ธ๐Ÿ“Œ๐Ÿ“Žโœ’๏ธโœ๏ธ๐Ÿ“๐Ÿ“๐Ÿ“•๐Ÿ“—๐Ÿ“˜๐Ÿ“™๐Ÿ““๐Ÿ“”๐Ÿ“’๐Ÿ“š๐Ÿ“–๐Ÿ”–๐Ÿ“›๐Ÿ”ฌ๐Ÿ”ญ๐Ÿ“ฐ๐ŸŽจ๐ŸŽฌ๐ŸŽค๐ŸŽง๐ŸŽผ๐ŸŽต๐ŸŽถ๐ŸŽน๐ŸŽป๐ŸŽบ๐ŸŽท๐ŸŽธ๐Ÿ‘พ๐ŸŽฎ๐Ÿƒ๐ŸŽด๐Ÿ€„๏ธ๐ŸŽฒ๐ŸŽฏ๐Ÿˆ๐Ÿ€โšฝ๏ธโšพ๏ธ๐ŸŽพ๐ŸŽฑ๐Ÿ‰๐ŸŽณโ›ณ๏ธ๐Ÿšต๐Ÿšด๐Ÿ๐Ÿ‡๐Ÿ†๐ŸŽฟ๐Ÿ‚๐ŸŠ๐Ÿ„๐ŸŽฃโ˜•๏ธ๐Ÿต๐Ÿถ๐Ÿผ๐Ÿบ๐Ÿป๐Ÿธ๐Ÿน๐Ÿท๐Ÿด๐Ÿ•๐Ÿ”๐ŸŸ๐Ÿ—๐Ÿ–๐Ÿ๐Ÿ›๐Ÿค๐Ÿฑ๐Ÿฃ๐Ÿฅ๐Ÿ™๐Ÿ˜๐Ÿš๐Ÿœ๐Ÿฒ๐Ÿข๐Ÿก๐Ÿณ๐Ÿž๐Ÿฉ๐Ÿฎ๐Ÿฆ๐Ÿจ๐Ÿง๐ŸŽ‚๐Ÿฐ๐Ÿช๐Ÿซ๐Ÿฌ๐Ÿญ๐Ÿฏ๐ŸŽ๐Ÿ๐ŸŠ๐Ÿ‹๐Ÿ’๐Ÿ‡๐Ÿ‰๐Ÿ“๐Ÿ‘๐Ÿˆ๐ŸŒ๐Ÿ๐Ÿ๐Ÿ ๐Ÿ†๐Ÿ…๐ŸŒฝ๐Ÿ ๐Ÿก๐Ÿซ๐Ÿข๐Ÿฃ๐Ÿฅ๐Ÿฆ๐Ÿช๐Ÿฉ๐Ÿจ๐Ÿ’’โ›ช๏ธ๐Ÿฌ๐Ÿค๐ŸŒ‡๐ŸŒ†๐Ÿฏ๐Ÿฐโ›บ๏ธ๐Ÿญ๐Ÿ—ผ๐Ÿ—พ๐Ÿ—ป๐ŸŒ„๐ŸŒ…๐ŸŒƒ๐Ÿ—ฝ๐ŸŒ‰๐ŸŽ ๐ŸŽกโ›ฒ๏ธ๐ŸŽข๐Ÿšขโ›ต๏ธ๐Ÿšค๐Ÿšฃโš“๏ธ๐Ÿš€โœˆ๏ธ๐Ÿ’บ๐Ÿš๐Ÿš‚๐ŸšŠ๐Ÿš‰๐Ÿšž๐Ÿš†๐Ÿš„๐Ÿš…๐Ÿšˆ๐Ÿš‡๐Ÿš๐Ÿš‹๐Ÿšƒ๐ŸšŽ๐ŸšŒ๐Ÿš๐Ÿš™๐Ÿš˜๐Ÿš—๐Ÿš•๐Ÿš–๐Ÿš›๐Ÿšš๐Ÿšจ๐Ÿš“๐Ÿš”๐Ÿš’๐Ÿš‘๐Ÿš๐Ÿšฒ๐Ÿšก๐ŸšŸ๐Ÿš ๐Ÿšœ๐Ÿ’ˆ๐Ÿš๐ŸŽซ๐Ÿšฆ๐Ÿšฅโš ๏ธ๐Ÿšง๐Ÿ”ฐโ›ฝ๏ธ๐Ÿฎ๐ŸŽฐโ™จ๏ธ๐Ÿ—ฟ๐ŸŽช๐ŸŽญ๐Ÿ“๐Ÿšฉ๐Ÿ‡ฏ๐Ÿ‡ต๐Ÿ‡ฐ๐Ÿ‡ท๐Ÿ‡ฉ๐Ÿ‡ช๐Ÿ‡จ๐Ÿ‡ณ๐Ÿ‡บ๐Ÿ‡ธ๐Ÿ‡ซ๐Ÿ‡ท๐Ÿ‡ช๐Ÿ‡ธ๐Ÿ‡ฎ๐Ÿ‡น๐Ÿ‡ท๐Ÿ‡บ๐Ÿ‡ฌ๐Ÿ‡ง1โƒฃ2โƒฃ3โƒฃ4โƒฃ5โƒฃ6โƒฃ7โƒฃ8โƒฃ9โƒฃ0โƒฃ๐Ÿ”Ÿ๐Ÿ”ข#โƒฃ๐Ÿ”ฃโฌ†๏ธโฌ‡๏ธโฌ…๏ธโžก๏ธ๐Ÿ” ๐Ÿ”ก๐Ÿ”คโ†—๏ธโ†–๏ธโ†˜๏ธโ†™๏ธโ†”๏ธโ†•๏ธ๐Ÿ”„โ—€๏ธโ–ถ๏ธ๐Ÿ”ผ๐Ÿ”ฝโ†ฉ๏ธโ†ช๏ธโ„น๏ธโชโฉโซโฌโคต๏ธโคด๏ธ๐Ÿ†—๐Ÿ”€๐Ÿ”๐Ÿ”‚๐Ÿ†•๐Ÿ†™๐Ÿ†’๐Ÿ†“๐Ÿ†–๐Ÿ“ถ๐ŸŽฆ๐Ÿˆ๐Ÿˆฏ๏ธ๐Ÿˆณ๐Ÿˆต๐Ÿˆด๐Ÿˆฒ๐Ÿ‰๐Ÿˆน๐Ÿˆบ๐Ÿˆถ๐Ÿˆš๏ธ๐Ÿšป๐Ÿšน๐Ÿšบ๐Ÿšผ๐Ÿšพ๐Ÿšฐ๐Ÿšฎ๐Ÿ…ฟ๏ธโ™ฟ๏ธ๐Ÿšญ๐Ÿˆท๐Ÿˆธ๐Ÿˆ‚โ“‚๏ธ๐Ÿ›‚๐Ÿ›„๐Ÿ›…๐Ÿ›ƒ๐Ÿ‰‘ใŠ™๏ธใŠ—๏ธ๐Ÿ†‘๐Ÿ†˜๐Ÿ†”๐Ÿšซ๐Ÿ”ž๐Ÿ“ต๐Ÿšฏ๐Ÿšฑ๐Ÿšณ๐Ÿšท๐Ÿšธโ›”๏ธโœณ๏ธโ‡๏ธโŽโœ…โœด๏ธ๐Ÿ’Ÿ๐Ÿ†š๐Ÿ“ณ๐Ÿ“ด๐Ÿ…ฐ๐Ÿ…ฑ๐Ÿ†Ž๐Ÿ…พ๐Ÿ’ โžฟโ™ป๏ธโ™ˆ๏ธโ™‰๏ธโ™Š๏ธโ™‹๏ธโ™Œ๏ธโ™๏ธโ™Ž๏ธโ™๏ธโ™๏ธโ™‘๏ธโ™’๏ธโ™“๏ธโ›Ž๐Ÿ”ฏ๐Ÿง๐Ÿ’น๐Ÿ’ฒ๐Ÿ’ฑยฉยฎโ„ขโŒโ€ผ๏ธโ‰๏ธโ—๏ธโ“โ•โ”โญ•๏ธ๐Ÿ”๐Ÿ”š๐Ÿ”™๐Ÿ”›๐Ÿ”œ๐Ÿ”ƒ๐Ÿ•›๐Ÿ•ง๐Ÿ•๐Ÿ•œ๐Ÿ•‘๐Ÿ•๐Ÿ•’๐Ÿ•ž๐Ÿ•“๐Ÿ•Ÿ๐Ÿ•”๐Ÿ• ๐Ÿ••๐Ÿ•–๐Ÿ•—๐Ÿ•˜๐Ÿ•™๐Ÿ•š๐Ÿ•ก๐Ÿ•ข๐Ÿ•ฃ๐Ÿ•ค๐Ÿ•ฅ๐Ÿ•ฆโœ–๏ธโž•โž–โž—โ™ ๏ธโ™ฅ๏ธโ™ฃ๏ธโ™ฆ๏ธ๐Ÿ’ฎ๐Ÿ’ฏโœ”๏ธโ˜‘๏ธ๐Ÿ”˜๐Ÿ”—โžฐใ€ฐใ€ฝ๏ธ๐Ÿ”ฑโ—ผ๏ธโ—ป๏ธโ—พ๏ธโ—ฝ๏ธโ–ช๏ธโ–ซ๏ธ๐Ÿ”บ๐Ÿ”ฒ๐Ÿ”ณโšซ๏ธโšช๏ธ๐Ÿ”ด๐Ÿ”ต๐Ÿ”ปโฌœ๏ธโฌ›๏ธ๐Ÿ”ถ๐Ÿ”ท๐Ÿ”ธ๐Ÿ”น' end return { description = "Sendet alle Emoticons", usage = "/emoticons", - patterns = {"^/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 a3b6c81..055e417 100644 --- a/plugins/facepalm.lua +++ b/plugins/facepalm.lua @@ -8,4 +8,5 @@ return { patterns = {"^/facepalm", "^/Facepalm"}, run = run -} \ No newline at end of file +} +--by Akamaru \ No newline at end of file diff --git a/plugins/hallo.lua b/plugins/hallo.lua index 24478c7..ca84f8e 100644 --- a/plugins/hallo.lua +++ b/plugins/hallo.lua @@ -1,7 +1,7 @@ function run(msg, matches) local user_name = get_name(msg) - local receiver = get_receiver(msg) - return "Hallo " .. user_name .. "!" + local receiver = get_receiver(msg) + return "Hallo " .. user_name .. "!" end return { @@ -13,3 +13,4 @@ return { }, run = run } +--by Akamaru \ No newline at end of file diff --git a/plugins/images.lua b/plugins/images.lua index 1b89ee2..0941ac0 100644 --- a/plugins/images.lua +++ b/plugins/images.lua @@ -7,8 +7,8 @@ function run(msg, matches) end return { - description = "When user sends image URL (ends with png, jpg, jpeg) download and send it to origin.", - usage = "", + 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)$", diff --git a/plugins/img_google_nsfw.lua b/plugins/img_google_nsfw.lua index 54ce17c..24e2e3b 100644 --- a/plugins/img_google_nsfw.lua +++ b/plugins/img_google_nsfw.lua @@ -1,6 +1,6 @@ do -function getGoogleImage(text) +function getGoogleImage2(text) local text = URL.escape(text) local api = "https://ajax.googleapis.com/ajax/services/search/images?v=1.0&rsz=8&q=" local res, code = http.request(api..text) @@ -29,7 +29,7 @@ end function run(msg, matches) local receiver = get_receiver(msg) local text = matches[1] - local url = getGoogleImage(text) + local url = getGoogleImage2(text) if not url then return "Kein Bild gefunden." diff --git a/plugins/justkitten.lua b/plugins/justkitten.lua index 3efc6a1..163474c 100644 --- a/plugins/justkitten.lua +++ b/plugins/justkitten.lua @@ -1,19 +1,18 @@ function run(msg, matches) - randomValue = math.random(6) - if randomValue == 1 then +if randomValue == 1 then send_photo(get_receiver(msg), "pictures/justkitten/justkitten1.jpg", ok_cb, false) - elseif randomValue == 2 then +elseif randomValue == 2 then send_photo(get_receiver(msg), "pictures/justkitten/justkitten2.jpg", ok_cb, false) - elseif randomValue == 3 then +elseif randomValue == 3 then send_photo(get_receiver(msg), "pictures/justkitten/justkitten3.jpg", ok_cb, false) - elseif randomValue == 4 then +elseif randomValue == 4 then send_photo(get_receiver(msg), "pictures/justkitten/justkitten4.jpg", ok_cb, false) - elseif randomValue == 5 then +elseif randomValue == 5 then send_photo(get_receiver(msg), "pictures/justkitten/justkitten5.jpg", ok_cb, false) - elseif randomValue == 6 then +elseif randomValue == 6 then send_photo(get_receiver(msg), "pictures/justkitten/justkitten6.jpg", ok_cb, false) - end +end end return { @@ -21,4 +20,5 @@ return { usage = "/jk", patterns = {"^/jk"}, run = run -} \ No newline at end of file +} +--by Akamaru \ No newline at end of file diff --git a/plugins/kitty.lua b/plugins/kitty.lua index c9f36af..8e299b6 100644 --- a/plugins/kitty.lua +++ b/plugins/kitty.lua @@ -1,15 +1,14 @@ function run(msg, matches) - randomValue = math.random(4) - if randomValue == 1 then +if randomValue == 1 then send_photo(get_receiver(msg), "pictures/cats/cat1.jpg", ok_cb, false) - elseif randomValue == 2 then +elseif randomValue == 2 then send_photo(get_receiver(msg), "pictures/cats/cat2.jpg", ok_cb, false) - elseif randomValue == 3 then +elseif randomValue == 3 then send_photo(get_receiver(msg), "pictures/cats/cat3.jpg", ok_cb, false) - elseif randomValue == 4 then +elseif randomValue == 4 then send_photo(get_receiver(msg), "pictures/cats/cat4.jpg", ok_cb, false) - end +end end return { @@ -17,4 +16,5 @@ return { usage = "/kitty", patterns = {"^/kitty"}, run = run -} \ No newline at end of file +} +--by Akamaru \ No newline at end of file diff --git a/plugins/lucky_star.lua b/plugins/lucky_star.lua index 1ceb930..7afa39a 100644 --- a/plugins/lucky_star.lua +++ b/plugins/lucky_star.lua @@ -29,4 +29,5 @@ return { "^/tsukasa", "^/Tsukasa"}, run = run -} \ No newline at end of file +} +--by Akamaru \ No newline at end of file diff --git a/plugins/lyrics.lua b/plugins/lyrics.lua index 2d93ecf..4b1894a 100644 --- a/plugins/lyrics.lua +++ b/plugins/lyrics.lua @@ -31,7 +31,7 @@ end function run(msg, matches) local lyrics = getLyrics(msg.text) if (lyrics == nil) then - return "Zzzzz..." + return "Nichts gefunden!" else return lyrics end diff --git a/plugins/magische_miesmuschel.lua b/plugins/magische_miesmuschel.lua index 3cdec6e..8d6716b 100644 --- a/plugins/magische_miesmuschel.lua +++ b/plugins/magische_miesmuschel.lua @@ -17,4 +17,5 @@ return { }, run = run } -end \ No newline at end of file +end +--by Akamaru \ No newline at end of file diff --git a/plugins/media.lua b/plugins/media.lua index 9c8b767..70dde90 100644 --- a/plugins/media.lua +++ b/plugins/media.lua @@ -7,8 +7,8 @@ function run(msg, matches) end return { - description = "When user sends media URL (ends with gif, mp4, pdf, etc.) download and send it to origin.", - usage = "", + description = "Wenn ein Link zu einer Datei gesendet wird, lรคd und sendet der Bot die Datei.", + usage = "Link zur Datei", patterns = { "(https?://[%w-_%.%?%.:/%+=&]+%.gif)$", "(https?://[%w-_%.%?%.:/%+=&]+%.mp4)$", diff --git a/plugins/moepse.lua b/plugins/moepse.lua index 463a178..f6010fb 100644 --- a/plugins/moepse.lua +++ b/plugins/moepse.lua @@ -1,7 +1,7 @@ function run(msg, matches) return 'se' - end +end return { description = "Mรถpse? Meepse?", @@ -12,4 +12,4 @@ return { "Meep"}, run = run } - +--by Akamaru \ No newline at end of file diff --git a/plugins/naira_derp.lua b/plugins/naira_derp.lua index 2a4eabb..7b7a3bc 100644 --- a/plugins/naira_derp.lua +++ b/plugins/naira_derp.lua @@ -8,4 +8,5 @@ return { patterns = {"^/nairad", "^/Nairad"}, run = run -} \ No newline at end of file +} +--by Akamaru \ No newline at end of file diff --git a/plugins/nau.lua b/plugins/nau.lua index e6e5309..82fb345 100644 --- a/plugins/nau.lua +++ b/plugins/nau.lua @@ -1,8 +1,5 @@ function run(msg, matches) - - if string.starts(msg.text, "/nau") then - send_photo(get_receiver(msg), "pictures/nau.jpg", ok_cb, false) - end + send_photo(get_receiver(msg), "pictures/nau.jpg", ok_cb, false) end return { @@ -10,4 +7,5 @@ return { usage = "/nau", patterns = {"^/nau"}, run = run -} \ No newline at end of file +} +--by Akamaru \ No newline at end of file diff --git a/plugins/neorame.lua b/plugins/neorame.lua index e97dc2d..eec2cc3 100644 --- a/plugins/neorame.lua +++ b/plugins/neorame.lua @@ -1,8 +1,5 @@ function run(msg, matches) - - if string.starts(msg.text, "/neorame") then - send_photo(get_receiver(msg), "pictures/neorame.jpg", ok_cb, false) - end + send_photo(get_receiver(msg), "pictures/neorame.jpg", ok_cb, false) end return { @@ -10,4 +7,5 @@ return { usage = "/neorame", patterns = {"^/neorame"}, run = run -} \ No newline at end of file +} +--by Akamaru \ No newline at end of file diff --git a/plugins/niissan.lua b/plugins/niissan.lua index 1d622ef..926f950 100644 --- a/plugins/niissan.lua +++ b/plugins/niissan.lua @@ -1,9 +1,5 @@ function run(msg, matches) - - if string.starts(msg.text, 'nii-san') or string.starts(msg.text, 'Nii-san') or string.starts(msg.text, 'Nissan') or string.starts(msg.text, 'nissan') then - send_photo(get_receiver(msg), "pictures/Nii-san.jpg", ok_cb, false) - end - + send_photo(get_receiver(msg), "pictures/Nii-san.jpg", ok_cb, false) end return { @@ -15,4 +11,4 @@ return { "^Nissan"}, run = run } - +--by Akamaru \ No newline at end of file diff --git a/plugins/nope.avi.lua b/plugins/nope.avi.lua index f11fc71..615cfad 100644 --- a/plugins/nope.avi.lua +++ b/plugins/nope.avi.lua @@ -1,9 +1,6 @@ function run(msg, matches) - if matches[1] == "nope.avi" then - return 'https://www.youtube.com/watch?v=gvdf5n-zI14' - end - + return 'https://www.youtube.com/watch?v=gvdf5n-zI14' end return { @@ -12,4 +9,4 @@ return { patterns = {"^nope.avi"}, run = run } - +--by Akamaru \ No newline at end of file diff --git a/plugins/nyu.lua b/plugins/nyu.lua index 7e53612..23e6660 100644 --- a/plugins/nyu.lua +++ b/plugins/nyu.lua @@ -1,16 +1,12 @@ function run(msg, matches) - - if string.starts(msg.text, 'nyu') or string.starts(msg.text, 'Nyu') then - send_photo(get_receiver(msg), "pictures/nyu.jpg", ok_cb, false) - end - + send_photo(get_receiver(msg), "pictures/nyu.jpg", ok_cb, false) end return { description = "Nyu?", usage = "nyu", patterns = {"^nyu", - "^Nyu"}, + "^Nyu"}, run = run } - +--by Akamaru \ No newline at end of file diff --git a/plugins/pornhub.lua b/plugins/pornhub.lua index e657597..362ad6e 100644 --- a/plugins/pornhub.lua +++ b/plugins/pornhub.lua @@ -6,12 +6,12 @@ function run(msg, matches) -- local new_matches = {query} -- return g.run(msg, new_matches) - local results = findPorn(matches[1]) + local results = findPornhub(matches[1]) return results-- build_result(results) end -function findPorn(query) - local api = "http://ajax.googleapis.com/ajax/services/search/web?v=1.0&q=site:pornhub.com+viewkey+" .. query:gsub(" ", "+") +function findPornhub(query) + local api = "http://ajax.googleapis.com/ajax/services/search/web?v=1.0&q=site:pornhub.com+viewkey+" .. query:gsub(" ", "+") -- Do the request local res, code = https.request(api) @@ -41,7 +41,7 @@ function build_result(query) end return { - description = "", + description = "Sendet ein PornHub Video", usage = "/pornhub", patterns = {"^/pornhub (.*)$", "^/ph (.*)$"}, diff --git a/plugins/rechner.lua b/plugins/rechner.lua index 67f9812..1a13d39 100644 --- a/plugins/rechner.lua +++ b/plugins/rechner.lua @@ -7,8 +7,6 @@ end return { description = "Ein simpler Taschenrechner", usage = "/calc [Rechnung]", - patterns = { - "^/calc (.*)$" - }, + patterns = {"^/calc (.*)$"}, run = run } \ No newline at end of file diff --git a/plugins/reload.lua b/plugins/reload.lua index bc539d9..909bd01 100644 --- a/plugins/reload.lua +++ b/plugins/reload.lua @@ -1,12 +1,12 @@ function run(msg, matches) plugins = {} load_plugins() - return 'Plugins reloaded' + return 'Plugins erfolgreich geladen!' end return { - description = "Reloads Bot Plugins", - usage = "/reload", + description = "", + usage = "", patterns = {"^/reload$"}, run = run, privileged = true diff --git a/plugins/rich_bitch.lua b/plugins/rich_bitch.lua index 0abc371..1631c14 100644 --- a/plugins/rich_bitch.lua +++ b/plugins/rich_bitch.lua @@ -1,9 +1,6 @@ function run(msg, matches) - if matches[1] == "rich bitch" then - return 'Akamaru ist nicht reich!' - end - + return 'Akamaru ist nicht reich!' end return { @@ -16,4 +13,4 @@ return { "^RICH BITCH"}, run = run } - +--by Akamaru \ No newline at end of file diff --git a/plugins/sakurasou.lua b/plugins/sakurasou.lua index 8d05a4b..a3a6d1a 100644 --- a/plugins/sakurasou.lua +++ b/plugins/sakurasou.lua @@ -4,27 +4,27 @@ function run(msg, matches) send_photo(get_receiver(msg), "pictures/sakurasou/shiina.jpg", ok_cb, false) end - if string.starts(msg.text, '/chihiro') or string.starts(msg.text, "/Chihiro") then + if string.starts(msg.text, '/chihiro') or string.starts(msg.text, "/Chihiro") then send_photo(get_receiver(msg), "pictures/sakurasou/chihiro.jpg", ok_cb, false) end - if string.starts(msg.text, '/jin') or string.starts(msg.text, "/Jin") then + if string.starts(msg.text, '/jin') or string.starts(msg.text, "/Jin") then send_photo(get_receiver(msg), "pictures/sakurasou/jin.jpg", ok_cb, false) end - if string.starts(msg.text, '/misaki') or string.starts(msg.text, "/Misaki") then + if string.starts(msg.text, '/misaki') or string.starts(msg.text, "/Misaki") then send_photo(get_receiver(msg), "pictures/sakurasou/misaki.jpg", ok_cb, false) end - if string.starts(msg.text, '/nanami') or string.starts(msg.text, "/Nanami") then + if string.starts(msg.text, '/nanami') or string.starts(msg.text, "/Nanami") then send_photo(get_receiver(msg), "pictures/sakurasou/nanami.jpg", ok_cb, false) end - if string.starts(msg.text, '/ryuunosuke') or string.starts(msg.text, "/Ryuunosuke") then + if string.starts(msg.text, '/ryuunosuke') or string.starts(msg.text, "/Ryuunosuke") then send_photo(get_receiver(msg), "pictures/sakurasou/ryuunosuke.jpg", ok_cb, false) end - if string.starts(msg.text, '/sorata') or string.starts(msg.text, "/Sorata") then + if string.starts(msg.text, '/sorata') or string.starts(msg.text, "/Sorata") then send_photo(get_receiver(msg), "pictures/sakurasou/sorata.jpg", ok_cb, false) end end @@ -47,4 +47,5 @@ return { "^/sorata", "^/Sorata"}, run = run -} \ No newline at end of file +} +--by Akamaru \ No newline at end of file diff --git a/plugins/senran_kagura.lua b/plugins/senran_kagura.lua index 551a806..983a6a6 100644 --- a/plugins/senran_kagura.lua +++ b/plugins/senran_kagura.lua @@ -4,39 +4,39 @@ function run(msg, matches) send_photo(get_receiver(msg), "pictures/senrankagura/hanzouacademy/asuka.jpg", ok_cb, false) end - if string.starts(msg.text, '/hibari') or string.starts(msg.text, "/Hibari") then + if string.starts(msg.text, '/hibari') or string.starts(msg.text, "/Hibari") then send_photo(get_receiver(msg), "pictures/senrankagura/hanzouacademy/hibari.jpg", ok_cb, false) end - if string.starts(msg.text, '/ikaruga') or string.starts(msg.text, "/Ikaruga") then + if string.starts(msg.text, '/ikaruga') or string.starts(msg.text, "/Ikaruga") then send_photo(get_receiver(msg), "pictures/senrankagura/hanzouacademy/ikaruga.jpg", ok_cb, false) end - if string.starts(msg.text, '/katsuragi') or string.starts(msg.text, "/Katsuragi") then + if string.starts(msg.text, '/katsuragi') or string.starts(msg.text, "/Katsuragi") then send_photo(get_receiver(msg), "pictures/senrankagura/hanzouacademy/katsuragi.jpg", ok_cb, false) end - if string.starts(msg.text, '/yagyuu') or string.starts(msg.text, "/Yagyuu") then + if string.starts(msg.text, '/yagyuu') or string.starts(msg.text, "/Yagyuu") then send_photo(get_receiver(msg), "pictures/senrankagura/hanzouacademy/yagyuu.jpg", ok_cb, false) end - if string.starts(msg.text, '/haruka') or string.starts(msg.text, "/Haruka") then + if string.starts(msg.text, '/haruka') or string.starts(msg.text, "/Haruka") then send_photo(get_receiver(msg), "pictures/senrankagura/hebijoacademy/haruka.jpg", ok_cb, false) end - if string.starts(msg.text, '/hikage') or string.starts(msg.text, "/Hikage") then + if string.starts(msg.text, '/hikage') or string.starts(msg.text, "/Hikage") then send_photo(get_receiver(msg), "pictures/senrankagura/hebijoacademy/hikage.jpg", ok_cb, false) end - if string.starts(msg.text, '/homura') or string.starts(msg.text, "/Homura") then + if string.starts(msg.text, '/homura') or string.starts(msg.text, "/Homura") then send_photo(get_receiver(msg), "pictures/senrankagura/hebijoacademy/homura.jpg", ok_cb, false) end - if string.starts(msg.text, '/mirai') or string.starts(msg.text, "/Mirai") then + if string.starts(msg.text, '/mirai') or string.starts(msg.text, "/Mirai") then send_photo(get_receiver(msg), "pictures/senrankagura/hebijoacademy/mirai.jpg", ok_cb, false) end - if string.starts(msg.text, '/yomi') or string.starts(msg.text, "/Yomi") then + if string.starts(msg.text, '/yomi') or string.starts(msg.text, "/Yomi") then send_photo(get_receiver(msg), "pictures/senrankagura/hebijoacademy/yomi.jpg", ok_cb, false) end end @@ -66,4 +66,4 @@ return { "^/Yomi"}, run = run } - +--by Akamaru \ No newline at end of file diff --git a/plugins/stille.lua b/plugins/stille.lua index 34df9bf..b900523 100644 --- a/plugins/stille.lua +++ b/plugins/stille.lua @@ -1,12 +1,12 @@ do function run(msg, matches) - local answers = {'Ja, es ist sehr ruhig hier','Wenn es dir zu still ist, kannst du gerne mit mir reden','*SCHREI*', - 'Dann mach doch etwas dagegen!','Mรถpse?','Vermutlich schlafen alle', - 'Stรถrt dich die Stille?','Nein, es ist nicht still','Nyu?', - 'Besser als Spam','Stille ist schรถn', + local answers = {'Ja, es ist sehr ruhig hier','Wenn es dir zu still ist, kannst du gerne mit mir reden', + '*SCHREI*','Dann mach doch etwas dagegen!','Mรถpse?','Vermutlich schlafen alle', + 'Stรถrt dich die Stille?','Nein, es ist nicht still','Nyu?','Besser als Spam','Stille ist schรถn', 'Mein Name ist Mikubot','Spiel doch etwas http://curvefever.com/', - 'Stille sagt manchmal mehr als tausend Worte','Stille und Nacht sind untrennbar verwoben. Die Nacht ist die Stille unter den Sternen.'} + 'Stille sagt manchmal mehr als tausend Worte', + 'Stille und Nacht sind untrennbar verwoben. Die Nacht ist die Stille unter den Sternen.'} return answers[math.random(#answers)] end @@ -19,5 +19,5 @@ return { "^*Stille*"}, run = run } - end +--by Akamaru \ No newline at end of file diff --git a/plugins/twitter_send.lua b/plugins/twitter_send.lua index 3db44f6..401908e 100644 --- a/plugins/twitter_send.lua +++ b/plugins/twitter_send.lua @@ -38,11 +38,11 @@ function run(msg, matches) return "Fehler: "..response_code end local data = json:decode(response_body) - return "Tweet gesendet! Sieh ihn dir an: https://twitter.com/TalesOfTelegram/status/"..data.id_str + return "Tweet gesendet!"..data.id_str end return { - description = "Sends a tweet", + description = "", usage = "", patterns = {"^/tw (.+)"}, run = run, diff --git a/plugins/urban_dictionary.lua b/plugins/urban_dictionary.lua index 4dc641a..0e7b982 100644 --- a/plugins/urban_dictionary.lua +++ b/plugins/urban_dictionary.lua @@ -25,14 +25,14 @@ end function run(msg, matches) local text = getUrbanDictionary(msg.text) if (text == nil) then - return "Zzzzz..." + return "Nichts gefunden!" else return text end end return { - description = "get urban dictionary definition", + description = "Zeigt eine Urban Dictionary Definition", usage = "/ud [topic]", patterns = {"^/ud (.*)$"}, run = run diff --git a/plugins/url_title.lua b/plugins/url_title.lua index f3ae580..ee72ff5 100644 --- a/plugins/url_title.lua +++ b/plugins/url_title.lua @@ -27,8 +27,15 @@ function run(msg, matches) local result = http.request(url) local title = getTitle(result) - -- We don't want 301 (and one Extrawurst for Google), 302, 404 and empty titles - if title == "301 Moved Permanently" or title == "" or title == "404 Not Found" or title == "302 Found" or title == "Moved Permanently" or string.match(title, "DeviantArt") then + --Ignoring 301, 302, 404 and more + if title == "301 Moved Permanently" or + title == "" or + title == "404 Not Found" or + title == "302 Found" or + title == "Moved Permanently" or + string.match(title, "deviantArt") or + string.match(title, "twitch") or + string.match(title, "eBay") then print('Invalide, da "'..title..'"') else return title @@ -37,11 +44,8 @@ function run(msg, matches) return { description = "Postet URL-Titel", - usage = "", - patterns = { - "(https?://[%w-_%.%?%.:/%+=&]+)$", - }, + usage = "Irgendein Link", + patterns = {"(https?://[%w-_%.%?%.:/%+=&]+)$",}, run = run } - end \ No newline at end of file diff --git a/plugins/version.lua b/plugins/version.lua index 97de8dd..fa4fc32 100644 --- a/plugins/version.lua +++ b/plugins/version.lua @@ -12,5 +12,4 @@ return { }, run = run } - end diff --git a/plugins/wd.lua b/plugins/wd.lua index fa2f6fe..28b8913 100644 --- a/plugins/wd.lua +++ b/plugins/wd.lua @@ -6,8 +6,7 @@ end return { description = "Sagt dass ihr wieder da seid", usage = "/wd", - patterns = { - "^/wd(.*)$" - }, + patterns = {"^/wd(.*)$"}, run = run } +--by Akamaru \ No newline at end of file diff --git a/plugins/wuerfel.lua b/plugins/wuerfel.lua index 81ef5be..e673614 100644 --- a/plugins/wuerfel.lua +++ b/plugins/wuerfel.lua @@ -4,10 +4,12 @@ function run(msg, matches) local answers = {'1','2','3','4','5','6'} return answers[math.random(#answers)] end + return { description = "Wรผrfel eine Zahl zwischen 1 bis 6", usage = "/wรผrfel", patterns = {"^/wรผrfel"}, run = run } -end \ No newline at end of file +end +--by Akamaru \ No newline at end of file diff --git a/plugins/yolo.lua b/plugins/yolo.lua index 0a1bc5f..9187746 100644 --- a/plugins/yolo.lua +++ b/plugins/yolo.lua @@ -1,15 +1,12 @@ function run(msg, matches) - if matches[1] == "yolo" then - return 'Hรค YOLO?' - end - + return 'Hรค YOLO?' end return { description = "Sendet euch ein Hรค YOLO?", usage = "/yolo", - patterns = {"^/(yolo)"}, + patterns = {"^/yolo"}, run = run } - +--by Akamaru \ No newline at end of file diff --git a/plugins/youporn.lua b/plugins/youporn.lua index dadc8ba..c6004e1 100644 --- a/plugins/youporn.lua +++ b/plugins/youporn.lua @@ -2,16 +2,16 @@ function run(msg, matches) -- local g = require "./plugins/google" - -- local query = "site:pornhub.com+viewkey+" .. matches[1] + -- local query = "site:youporn.com+viewkey+" .. matches[1] -- local new_matches = {query} -- return g.run(msg, new_matches) - local results = findAss(matches[1]) + local results = findYouporn(matches[1]) return results-- build_result(results) end -function findAss(query) - local api = "http://ajax.googleapis.com/ajax/services/search/web?v=1.0&q=site:youporn.com+viewkey+" .. query:gsub(" ", "+") +function findYouporn(query) + local api = "http://ajax.googleapis.com/ajax/services/search/web?v=1.0&q=site:youporn.com+viewkey+" .. query:gsub(" ", "+") -- Do the request local res, code = https.request(api) @@ -41,7 +41,7 @@ function build_result(query) end return { - description = "", + description = "Sendet ein YouPorn Video", usage = "/youporn", patterns = {"^/youporn (.*)$", "^/yp (.*)$"},