added subwatch module

dissimulate · Dec 8, 2015 · e0a2f3d · e0a2f3d
1 parent b7932ec
commit e0a2f3d
Show file tree

Hide file tree

Showing 4 changed files with 697 additions and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,3 +4,5 @@
 src/config.test.json
 
 src/config.json
+
+src/praw.ini
diff --git a/src/config.example.json b/src/config.example.json
@@ -23,5 +23,11 @@
     "prefix": "$",
     "server": "irc.snoonet.org",
     "ssl": false,
+<<<<<<< HEAD
+    "stopped": [],
+    "timeout": 60,
+    "watch": {}
+=======
     "timeout": 60
+>>>>>>> upstream/master
   }
diff --git a/src/main.py b/src/main.py
@@ -9,6 +9,10 @@
 
     # bot.debug = True
 
+<<<<<<< HEAD
+
+=======
+>>>>>>> upstream/master
     def signal_handler(signal, frame):
 
         print('\nShutting down...')
@@ -40,3 +44,14 @@ def signal_handler(signal, frame):
         elif line == 'dc':
 
             bot.disconnect()
+<<<<<<< HEAD
+
+        elif line == 'grow':
+
+            bot.grow_threads()
+
+        elif line == 'shrink':
+
+            bot.shrink_threads()
+=======
+>>>>>>> upstream/master