merge upstream

Disabled pattern lowercase matches
Update isup.lua
This commit is contained in:
Akamaru 2015-05-15 15:37:59 +02:00
parent 281d01859b
commit 643d2554bf
2 changed files with 5 additions and 4 deletions

View File

@ -112,7 +112,7 @@ function match_plugin(plugin, plugin_name, msg)
-- Go over patterns. If one matches is enough. -- Go over patterns. If one matches is enough.
for k, pattern in pairs(plugin.patterns) do for k, pattern in pairs(plugin.patterns) do
local matches = match_pattern(pattern, msg.text, true) local matches = match_pattern(pattern, msg.text)
if matches then if matches then
print("Nachricht stimmt überein mit ", pattern) print("Nachricht stimmt überein mit ", pattern)

View File

@ -103,9 +103,9 @@ local function run(msg, matches)
return save_cron(msg, matches[2]) return save_cron(msg, matches[2])
elseif isup(matches[1]) then elseif isup(matches[1]) then
return matches[1]..' ist UP' return matches[1]..' ist UP'
else else
return matches[1]..' scheint DOWN zu sein' return matches[1]..' scheint DOWN zu sein'
end end
end end
@ -124,7 +124,8 @@ return {
"^/ping (remove) (.*)$", "^/ping (remove) (.*)$",
"^/ping (save) (.*)$" "^/ping (save) (.*)$"
}, },
run = run run = run,
cron = cron
} }
end end