Merge branch 'master' of https://github.com/soend/telegram-bot into soend-master

Conflicts:
	bot/bot.lua
This commit is contained in:
yago
2015-04-12 22:08:56 +02:00
3 changed files with 72 additions and 2 deletions

View File

@ -177,6 +177,20 @@ function is_sudo(msg)
return var
end
function is_disabled(msg)
local var = false
if msg.text == "!channel enable" then
return var
end
-- Check users id in config
for v,channel in pairs(_config.disabled_channels) do
if channel == msg.to.id then
var = true
end
end
return var
end
-- Returns the name of the sender
function get_name(msg)
local name = msg.from.first_name
@ -446,4 +460,4 @@ function match_pattern(pattern, text)
return matches
end
-- nil
end
end