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

Conflicts:
	bot/bot.lua

bot/bot.lua

@@ -42,6 +42,12 @@ function msg_valid(msg)
     print("Not valid, readed")
     return false
   end
+
+  if is_disabled(msg) then
+    print("Disabled channel")
+    return false
+  end
+  
   return true
 end
 
@@ -158,6 +164,7 @@ function create_config( )
       "location",
       "media",
       "plugins",
+      "channels",
       "set",
       "stats",
       "time",
@@ -165,7 +172,8 @@ function create_config( )
       "weather",
       "xkcd",
       "youtube" },
-    sudo_users = {our_id}  
+    sudo_users = {our_id},
+    disabled_channels = {}
   }
   serialize_to_file(config, './data/config.lua')
   print ('saved config into ./data/config.lua')

bot/utils.lua

@@ -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