Merge remote-tracking branch 'upstream/master'

miku/plugins/about.lua

@@ -1,6 +1,6 @@
 local about = {}
 
-local bot = require('miku.bot')
+local bot = require('otouto.bot')
 
 about.command = 'about'
 about.doc = '`Sendet Informationen über den Bot.`'
@@ -8,13 +8,13 @@ about.doc = '`Sendet Informationen über den Bot.`'
 function about:init(config)
   about.text = config.about_text .. '\n[Mikudayobot](https://github.com/Akamaru/Mikubot-V2) v'..bot.version..' von @Akamaru, basierend auf [otouto](https://github.com/topkecleon/otouto) von topkecleon.'
   about.triggers = {
-	'/[Aa][Bb][Oo][Uu][Tt]',
-	'/[Ss][Tt][Aa][Rr][Tt]'
-}
+	'^/about$',
+	'^/start$'
+  }
 end
 
 function about:action(msg, config)
   utilities.send_message(msg.chat.id, about.text, true, nil, true)
 end
 
-return about
+return about

miku/plugins/help.lua

@@ -9,7 +9,8 @@ function help:init(config)
     "^/[Hh][Ii][Ll][Ff][Ee] (.+)",
 	"^/[Hh][Ee][Ll][Pp] (.+)",
 	"^/(hilfe)_(.+)",
-	"^/[Hh][Ii][Ll][Ff][Ee]$"
+	"^/hilfe$",
+	"^/help$"
   }
   help.inline_triggers = {
     "^[Hh][Ii][Ll][Ff][Ee] (.+)",
@@ -37,7 +38,7 @@ end
 function help:action(msg, config, matches)
   if matches[2] then
     input = matches[2]
-  elseif matches[1] ~= '/hilfe' then
+  elseif matches[1] ~= '/hilfe' and matches[1] ~= '/help' then
     input = matches[1]
   else
     input = nil