From cfa96e6505ec0205ea15149374110e737b31e7d0 Mon Sep 17 00:00:00 2001 From: Akamaru Date: Thu, 25 Jan 2018 14:34:42 +0100 Subject: [PATCH] Ersetzte "anditest.perseus.uberspace.de" durch "brawlbot.tk" --- miku/plugins/adfly.lua | 2 +- miku/plugins/bitly.lua | 2 +- miku/plugins/currency.lua | 2 +- miku/plugins/echo.lua | 4 ++-- miku/plugins/expand.lua | 2 +- miku/plugins/figuya.lua | 8 ++------ miku/plugins/forecast.lua | 2 +- miku/plugins/googl.lua | 2 +- miku/plugins/hdf.lua | 2 +- miku/plugins/help.lua | 2 +- miku/plugins/imdb.lua | 2 +- miku/plugins/justkitten.lua | 2 +- miku/plugins/nintendo_search.lua | 4 ++-- miku/plugins/plex.lua | 2 +- miku/plugins/preview.lua | 2 +- miku/plugins/respond.lua | 2 +- miku/plugins/special.lua | 5 ++++- miku/plugins/tagesschau.lua | 2 +- miku/plugins/time.lua | 4 ++-- miku/plugins/weather.lua | 2 +- miku/plugins/wikipedia.lua | 2 +- 21 files changed, 28 insertions(+), 29 deletions(-) diff --git a/miku/plugins/adfly.lua b/miku/plugins/adfly.lua index 0901898..a390917 100644 --- a/miku/plugins/adfly.lua +++ b/miku/plugins/adfly.lua @@ -30,7 +30,7 @@ function adfly:inline_callback(inline_query, config, matches) if not url then abort_inline_query(inline_query) return end if url == 'NOTFOUND' then abort_inline_query(inline_query) return end - local results = '[{"type":"article","id":"1","title":"Verlängerte URL","description":"'..url..'","url":"'..url..'","thumb_url":"https://anditest.perseus.uberspace.de/inlineQuerys/generic/internet.jpg","thumb_width":165,"thumb_height":150,"hide_url":true,"input_message_content":{"message_text":"'..url..'"}}]' + local results = '[{"type":"article","id":"1","title":"Verlängerte URL","description":"'..url..'","url":"'..url..'","thumb_url":"https://brawlbot.tk/inlineQuerys/generic/internet.jpg","thumb_width":165,"thumb_height":150,"hide_url":true,"input_message_content":{"message_text":"'..url..'"}}]' utilities.answer_inline_query(inline_query, results, 3600, true) end diff --git a/miku/plugins/bitly.lua b/miku/plugins/bitly.lua index f9afe4c..0521a34 100644 --- a/miku/plugins/bitly.lua +++ b/miku/plugins/bitly.lua @@ -40,7 +40,7 @@ function bitly:inline_callback(inline_query, config, matches) if not url then abort_inline_query(inline_query) return end - local results = '[{"type":"article","id":"2","title":"Verlängerte URL","description":"'..url..'","url":"'..url..'","thumb_url":"https://anditest.perseus.uberspace.de/inlineQuerys/generic/internet.jpg","thumb_width":165,"thumb_height":150,"hide_url":true,"input_message_content":{"message_text":"'..url..'"}}]' + local results = '[{"type":"article","id":"2","title":"Verlängerte URL","description":"'..url..'","url":"'..url..'","thumb_url":"https://brawlbot.tk/inlineQuerys/generic/internet.jpg","thumb_width":165,"thumb_height":150,"hide_url":true,"input_message_content":{"message_text":"'..url..'"}}]' utilities.answer_inline_query(inline_query, results, 3600) end diff --git a/miku/plugins/currency.lua b/miku/plugins/currency.lua index 27665b8..054f597 100644 --- a/miku/plugins/currency.lua +++ b/miku/plugins/currency.lua @@ -47,7 +47,7 @@ function currency:inline_callback(inline_query, config, matches) else title = amount..' '..base..' entsprechen' end - local results = '[{"type":"article","id":"20","title":"'..title..'","description":"'..value..' '..to..'","thumb_url":"https://anditest.perseus.uberspace.de/inlineQuerys/currency/cash.jpg","thumb_width":157,"thumb_height":140,"input_message_content":{"message_text":"'..output..'","parse_mode":"Markdown"}}]' + local results = '[{"type":"article","id":"20","title":"'..title..'","description":"'..value..' '..to..'","thumb_url":"https://brawlbot.tk/inlineQuerys/currency/cash.jpg","thumb_width":157,"thumb_height":140,"input_message_content":{"message_text":"'..output..'","parse_mode":"Markdown"}}]' utilities.answer_inline_query(inline_query, results, 3600) end diff --git a/miku/plugins/echo.lua b/miku/plugins/echo.lua index eb1ea5a..4b993f2 100644 --- a/miku/plugins/echo.lua +++ b/miku/plugins/echo.lua @@ -18,10 +18,10 @@ function echo:inline_callback(inline_query, config, matches) -- enable custom markdown button if text:match('%[.*%]%(.*%)') or text:match('%*.*%*') or text:match('_.*_') or text:match('`.*`') then - results = results..'{"type":"article","id":"3","thumb_url":"https://anditest.perseus.uberspace.de/inlineQuerys/echo/custom.jpg","title":"Eigenes Markdown","description":"'..text..'","input_message_content":{"message_text":"'..text..'","parse_mode":"Markdown"}},' + results = results..'{"type":"article","id":"3","thumb_url":"https://brawlbot.tk/inlineQuerys/echo/custom.jpg","title":"Eigenes Markdown","description":"'..text..'","input_message_content":{"message_text":"'..text..'","parse_mode":"Markdown"}},' end - local results = results..'{"type":"article","id":"4","thumb_url":"https://anditest.perseus.uberspace.de/inlineQuerys/echo/fett.jpg","title":"Fett","description":"*'..text..'*","input_message_content":{"message_text":"'..text..'","parse_mode":"HTML"}},{"type":"article","id":"5","thumb_url":"https://anditest.perseus.uberspace.de/inlineQuerys/echo/kursiv.jpg","title":"Kursiv","description":"_'..text..'_","input_message_content":{"message_text":"'..text..'","parse_mode":"HTML"}},{"type":"article","id":"6","thumb_url":"https://anditest.perseus.uberspace.de/inlineQuerys/echo/fixedsys.jpg","title":"Feste Breite","description":"`'..text..'`","input_message_content":{"message_text":"'..text..'","parse_mode":"HTML"}}]' + local results = results..'{"type":"article","id":"4","thumb_url":"https://brawlbot.tk/inlineQuerys/echo/fett.jpg","title":"Fett","description":"*'..text..'*","input_message_content":{"message_text":"'..text..'","parse_mode":"HTML"}},{"type":"article","id":"5","thumb_url":"https://brawlbot.tk/inlineQuerys/echo/kursiv.jpg","title":"Kursiv","description":"_'..text..'_","input_message_content":{"message_text":"'..text..'","parse_mode":"HTML"}},{"type":"article","id":"6","thumb_url":"https://brawlbot.tk/inlineQuerys/echo/fixedsys.jpg","title":"Feste Breite","description":"`'..text..'`","input_message_content":{"message_text":"'..text..'","parse_mode":"HTML"}}]' utilities.answer_inline_query(inline_query, results, 0) end diff --git a/miku/plugins/expand.lua b/miku/plugins/expand.lua index c928d6b..12d48eb 100644 --- a/miku/plugins/expand.lua +++ b/miku/plugins/expand.lua @@ -27,7 +27,7 @@ function expand:inline_callback(inline_query, config, matches) description = url end - local results = '[{"type":"article","id":"7","title":"'..title..'","description":"'..description..'","url":"'..url..'","thumb_url":"https://anditest.perseus.uberspace.de/inlineQuerys/generic/internet.jpg","thumb_width":165,"thumb_height":150,"hide_url":true,"input_message_content":{"message_text":"'..url..'"}}]' + local results = '[{"type":"article","id":"7","title":"'..title..'","description":"'..description..'","url":"'..url..'","thumb_url":"https://brawlbot.tk/inlineQuerys/generic/internet.jpg","thumb_width":165,"thumb_height":150,"hide_url":true,"input_message_content":{"message_text":"'..url..'"}}]' utilities.answer_inline_query(inline_query, results, 3600) end diff --git a/miku/plugins/figuya.lua b/miku/plugins/figuya.lua index 28d000e..ba4b3b1 100644 --- a/miku/plugins/figuya.lua +++ b/miku/plugins/figuya.lua @@ -12,12 +12,8 @@ function figuya:get_figuya(figu) local data = json.decode(b) local title = data.title - if string.len(data.description) > 500 then - desc = string.sub(unescape(data.description:gsub("%b<>", "")), 1, 500)..'...' - else - desc = unescape(data.description)..'.' - end - local pic = 'https://anditest.perseus.uberspace.de/img.php?url='..data.thumbnail_url + local desc = string.sub(unescape(data.description:gsub("%b<>", "")), 1, 500)..'...' + local pic = 'https://brawlbot.tk/img.php?url='..data.thumbnail_url local text = ''..title..'\n'..desc..''..' ' return text diff --git a/miku/plugins/forecast.lua b/miku/plugins/forecast.lua index 0ff2e42..6527afc 100644 --- a/miku/plugins/forecast.lua +++ b/miku/plugins/forecast.lua @@ -226,7 +226,7 @@ function forecast:inline_callback(inline_query, config, matches) if not title and not description and not text and not ttl then abort_inline_query(inline_query) return end local text = text:gsub('\n', '\\n') - local results = '[{"type":"article","id":"28062013","title":"'..title..'","description":"'..description..'","thumb_url":"https://anditest.perseus.uberspace.de/inlineQuerys/weather/cloudy.jpg","thumb_width":80,"thumb_height":80,"input_message_content":{"message_text":"'..text..'", "parse_mode":"Markdown"}}]' + local results = '[{"type":"article","id":"28062013","title":"'..title..'","description":"'..description..'","thumb_url":"https://brawlbot.tk/inlineQuerys/weather/cloudy.jpg","thumb_width":80,"thumb_height":80,"input_message_content":{"message_text":"'..text..'", "parse_mode":"Markdown"}}]' utilities.answer_inline_query(inline_query, results, ttl, is_personal) end diff --git a/miku/plugins/googl.lua b/miku/plugins/googl.lua index 0721282..c047933 100644 --- a/miku/plugins/googl.lua +++ b/miku/plugins/googl.lua @@ -27,7 +27,7 @@ function googl:inline_callback(inline_query, config, matches) local text, longUrl = googl:send_googl_info(shorturl) if not longUrl then abort_inline_query(inline_query) return end - local results = '[{"type":"article","id":"9","title":"Verlängerte URL","description":"'..longUrl..'","url":"'..longUrl..'","thumb_url":"https://anditest.perseus.uberspace.de/inlineQuerys/generic/internet.jpg","thumb_width":165,"thumb_height":150,"hide_url":true,"input_message_content":{"message_text":"'..text..'"}}]' + local results = '[{"type":"article","id":"9","title":"Verlängerte URL","description":"'..longUrl..'","url":"'..longUrl..'","thumb_url":"https://brawlbot.tk/inlineQuerys/generic/internet.jpg","thumb_width":165,"thumb_height":150,"hide_url":true,"input_message_content":{"message_text":"'..text..'"}}]' utilities.answer_inline_query(inline_query, results, 1) end diff --git a/miku/plugins/hdf.lua b/miku/plugins/hdf.lua index b173f03..99c51f7 100644 --- a/miku/plugins/hdf.lua +++ b/miku/plugins/hdf.lua @@ -8,7 +8,7 @@ end hdf.command = 'hdf' function hdf:action(msg, config) - local HDF_URL = 'https://anditest.perseus.uberspace.de/plugins/hdf' + local HDF_URL = 'https://brawlbot.tk/plugins/hdf' local hdf_pics = { "/hdf1.jpg", "/hdf2.jpg", diff --git a/miku/plugins/help.lua b/miku/plugins/help.lua index 49796b7..e3fb74c 100644 --- a/miku/plugins/help.lua +++ b/miku/plugins/help.lua @@ -28,7 +28,7 @@ function help:inline_callback(inline_query, config, matches) local doc = doc:gsub('"', '\\"') local doc = doc:gsub('\\n', '\\\n') local chosen_plugin = utilities.get_word(plugin.command, 1) - local results = '[{"type":"article","id":"9","title":"Hilfe für '..chosen_plugin..'","description":"Hilfe für das Plugin \\"'..chosen_plugin..'\\" wird gepostet.","thumb_url":"https://anditest.perseus.uberspace.de/inlineQuerys/help/hilfe.jpg","input_message_content":{"message_text":"'..doc..'","parse_mode":"Markdown"}}]' + local results = '[{"type":"article","id":"9","title":"Hilfe für '..chosen_plugin..'","description":"Hilfe für das Plugin \\"'..chosen_plugin..'\\" wird gepostet.","thumb_url":"https://brawlbot.tk/inlineQuerys/help/hilfe.jpg","input_message_content":{"message_text":"'..doc..'","parse_mode":"Markdown"}}]' utilities.answer_inline_query(inline_query, results, 600, nil, nil, 'Hilfe anzeigen', 'hilfe_'..chosen_plugin) end end diff --git a/miku/plugins/imdb.lua b/miku/plugins/imdb.lua index 07e1585..b19c017 100644 --- a/miku/plugins/imdb.lua +++ b/miku/plugins/imdb.lua @@ -53,7 +53,7 @@ function imdb:inline_callback(inline_query, config, matches) local description = description:gsub("'", "\'") if movie_info.Poster == "N/A" then - img_url = 'https://anditest.perseus.uberspace.de/inlineQuerys/imdb/logo.jpg' + img_url = 'https://brawlbot.tk/inlineQuerys/imdb/logo.jpg' else img_url = movie_info.Poster end diff --git a/miku/plugins/justkitten.lua b/miku/plugins/justkitten.lua index 6d04995..4800863 100644 --- a/miku/plugins/justkitten.lua +++ b/miku/plugins/justkitten.lua @@ -8,7 +8,7 @@ end jk.command = 'jk' function jk:action(msg, config) - local JK_URL = 'https://anditest.perseus.uberspace.de/plugins/jk' + local JK_URL = 'https://brawlbot.tk/plugins/jk' local jk_pics = { "/justkitten1.jpg", "/justkitten2.jpg", diff --git a/miku/plugins/nintendo_search.lua b/miku/plugins/nintendo_search.lua index d150d83..cb7f442 100644 --- a/miku/plugins/nintendo_search.lua +++ b/miku/plugins/nintendo_search.lua @@ -43,9 +43,9 @@ function nintendo_search:get_info(gametitle) local release = '\nRelease: '..data.pretty_date_s if data.image_url_h2x1_s then - image_url = ' ' + image_url = ' ' else - image_url = ' ' + image_url = ' ' end local text = title..publish..system..image_url..fsk..player..release..link..description diff --git a/miku/plugins/plex.lua b/miku/plugins/plex.lua index 27c03b6..5e4d124 100644 --- a/miku/plugins/plex.lua +++ b/miku/plugins/plex.lua @@ -188,7 +188,7 @@ function plex:inline_callback(inline_query, config, matches) local text, _, title = plex:get_plex(input) if not text or not title then abort_inline_query(inline_query) return end local text = text:gsub('"', '\\"') - local results = '[{"type":"article","id":"PLEX","title":"'..title..'","thumb_url":"https://anditest.perseus.uberspace.de/inlineQuerys/plex/plex.jpg","thumb_width":150,"thumb_height":150,"input_message_content":{"message_text":"'..text..'","parse_mode":"HTML"}}]' + local results = '[{"type":"article","id":"PLEX","title":"'..title..'","thumb_url":"https://brawlbot.tk/inlineQuerys/plex/plex.jpg","thumb_width":150,"thumb_height":150,"input_message_content":{"message_text":"'..text..'","parse_mode":"HTML"}}]' utilities.answer_inline_query(inline_query, results, 3600) end diff --git a/miku/plugins/preview.lua b/miku/plugins/preview.lua index ea86611..3a1e5d0 100644 --- a/miku/plugins/preview.lua +++ b/miku/plugins/preview.lua @@ -50,7 +50,7 @@ function preview:inline_callback(inline_query, config, matches) width = data.thumbnail_width height = data.thumbnail_height else - thumb = 'https://anditest.perseus.uberspace.de/inlineQuerys/generic/internet.jpg' + thumb = 'https://brawlbot.tk/inlineQuerys/generic/internet.jpg' width = 150 height = 150 end diff --git a/miku/plugins/respond.lua b/miku/plugins/respond.lua index 7888f8d..57c11a1 100644 --- a/miku/plugins/respond.lua +++ b/miku/plugins/respond.lua @@ -43,7 +43,7 @@ end function respond:action(msg, config, matches) local user_name = get_name(msg) local receiver = msg.chat.id - local BASE_URL = 'https://anditest.perseus.uberspace.de/plugins/respond' + local BASE_URL = 'https://brawlbot.tk/plugins/respond' if user_name == "DefenderX" then user_name = "Deffu" end if string.match(msg.text, "[Ll][Oo][Dd]") then diff --git a/miku/plugins/special.lua b/miku/plugins/special.lua index 4a42c0c..18585ef 100644 --- a/miku/plugins/special.lua +++ b/miku/plugins/special.lua @@ -40,7 +40,8 @@ special.triggers = { "^[Pp][Ii][Nn][Gg]$", "^[Dd][Aa][Ss] [Ii][Ss][Tt]? [Nn][Ii][Cc][Hh][Tt]? [Ll][Uu][Ss][Tt][Ii][Gg]!?$", "/[Bb][Ll][Uu][Ee][Tt][Ee][Xx][Tt]", - "/[Ll][Mm][Gg][Tt][Ff][Yy] (.*)" + "/[Ll][Mm][Gg][Tt][Ff][Yy] (.*)", + "/[Ff][Oo][Rr][Tt][Uu][Nn][Ee]" } @@ -154,6 +155,8 @@ MUST CLICK I AM A STUPID ANIMAL THAT IS ATTRACTED TO COLORS]] elseif msg_text:match("/[Ll][Mm][Gg][Tt][Ff][Yy]") then utilities.send_reply(msg, 'Deine Antwort findest du hier. ;)', 'HTML') + elseif msg_text:match("[Ff][Oo][Rr][Tt][Uu][Nn][Ee]") then + output = run_command("fortune") end utilities.send_reply(msg, output) diff --git a/miku/plugins/tagesschau.lua b/miku/plugins/tagesschau.lua index 76f258f..54f989d 100644 --- a/miku/plugins/tagesschau.lua +++ b/miku/plugins/tagesschau.lua @@ -55,7 +55,7 @@ function tagesschau:inline_callback(inline_query, config, matches) end local text = text:gsub('\n', '\\n') - local results = '[{"type":"article","id":"11","title":"'..headline..'","description":"'..shorttext..'","url":"'..full_url..'","thumb_url":"https://anditest.perseus.uberspace.de/inlineQuerys/tagesschau/tagesschau.jpg","thumb_width":150,"thumb_height":150,"hide_url":true,"reply_markup":{"inline_keyboard":[[{"text":"Artikel aufrufen","url":"'..full_url..'"}]]},"input_message_content":{"message_text":"'..text..'","parse_mode":"HTML"}}]' + local results = '[{"type":"article","id":"11","title":"'..headline..'","description":"'..shorttext..'","url":"'..full_url..'","thumb_url":"https://brawlbot.tk/inlineQuerys/tagesschau/tagesschau.jpg","thumb_width":150,"thumb_height":150,"hide_url":true,"reply_markup":{"inline_keyboard":[[{"text":"Artikel aufrufen","url":"'..full_url..'"}]]},"input_message_content":{"message_text":"'..text..'","parse_mode":"HTML"}}]' utilities.answer_inline_query(inline_query, results, 7200) end diff --git a/miku/plugins/time.lua b/miku/plugins/time.lua index a0a5da0..8b69fdd 100644 --- a/miku/plugins/time.lua +++ b/miku/plugins/time.lua @@ -79,13 +79,13 @@ function time:inline_callback(inline_query, config, matches) if matches[1] == 'time' then local desc_time = os.date("%A, %d. %B %Y, %H:%M:%S Uhr") local cur_time = time:localize(os.date("%A, %d. %B %Y, *%H:%M:%S Uhr*")) - results = '[{"type":"article","id":"12","title":"Europa/Berlin","description":"'..desc_time..'","thumb_url":"https://anditest.perseus.uberspace.de/inlineQuerys/time/clock.jpg","input_message_content":{"message_text":"'..cur_time..'","parse_mode":"Markdown"}}]' + results = '[{"type":"article","id":"12","title":"Europa/Berlin","description":"'..desc_time..'","thumb_url":"https://brawlbot.tk/inlineQuerys/time/clock.jpg","input_message_content":{"message_text":"'..cur_time..'","parse_mode":"Markdown"}}]' else local coords = utilities.get_coords(matches[1], config) if type(coords) == 'string' then abort_inline_query(inline_query) return end local output, place, desc_time = time:get_time(coords) if not output then abort_inline_query(inline_query) return end - results = '[{"type":"article","id":"13","title":"'..place..'","description":"'..desc_time..'","thumb_url":"https://anditest.perseus.uberspace.de/inlineQuerys/time/clock.jpg","input_message_content":{"message_text":"'..output..'","parse_mode":"Markdown"}}]' + results = '[{"type":"article","id":"13","title":"'..place..'","description":"'..desc_time..'","thumb_url":"https://brawlbot.tk/inlineQuerys/time/clock.jpg","input_message_content":{"message_text":"'..output..'","parse_mode":"Markdown"}}]' end utilities.answer_inline_query(inline_query, results, 1) end diff --git a/miku/plugins/weather.lua b/miku/plugins/weather.lua index dfd9d40..031b35b 100644 --- a/miku/plugins/weather.lua +++ b/miku/plugins/weather.lua @@ -173,7 +173,7 @@ function weather:inline_callback(inline_query, config, matches) if not title and not description and not icon and not text and not ttl then abort_inline_query(inline_query) return end local text = text:gsub('\n', '\\n') - local thumb_url = 'https://anditest.perseus.uberspace.de/inlineQuerys/weather/' + local thumb_url = 'https://brawlbot.tk/inlineQuerys/weather/' if icon == 'clear-day' or icon == 'partly-cloudy-day' then thumb_url = thumb_url..'day.jpg' elseif icon == 'clear-night' then diff --git a/miku/plugins/wikipedia.lua b/miku/plugins/wikipedia.lua index a3b22ea..00be205 100644 --- a/miku/plugins/wikipedia.lua +++ b/miku/plugins/wikipedia.lua @@ -194,7 +194,7 @@ function wikipedia:inline_callback(inline_query, config, matches) for num in pairs(data.search) do local title, result, keyboard = wikipedia:wikintro(data.search[num].title, lang, true) if not title or not result or not keyboard then abort_inline_query(inline_query) return end - results = results..'{"type":"article","id":"'..id..'","title":"'..title..'","description":"'..wikipedia:snip_snippet(data.search[num].snippet)..'","url":"https://'..lang..'.wikipedia.org/wiki/'..URL.escape(title)..'","hide_url":true,"thumb_url":"https://anditest.perseus.uberspace.de/inlineQuerys/wiki/logo.jpg","thumb_width":95,"thumb_height":86,"reply_markup":'..keyboard..',"input_message_content":{"message_text":"'..result..'","parse_mode":"HTML"}}' + results = results..'{"type":"article","id":"'..id..'","title":"'..title..'","description":"'..wikipedia:snip_snippet(data.search[num].snippet)..'","url":"https://'..lang..'.wikipedia.org/wiki/'..URL.escape(title)..'","hide_url":true,"thumb_url":"https://brawlbot.tk/inlineQuerys/wiki/logo.jpg","thumb_width":95,"thumb_height":86,"reply_markup":'..keyboard..',"input_message_content":{"message_text":"'..result..'","parse_mode":"HTML"}}' id = id+1 if num < #data.search then results = results..','