added ability to add commands in chat, various little modifications

Author: Beaux44

Commands.py

@@ -1,5 +1,5 @@
 # PyBot is a Twitch IRC chatbot used particularly for spamming your chat, but as well as a general chatbot for doing whatever.
-# Copyright (C) 2016 Sheep44
+# Copyright (C) 2016-2018 Sheep44
 #
 # This file is part of PyBot.
 #
@@ -13,62 +13,50 @@
 # GNU General Public License for more details.
 
 
+# NOTE: Move from username to user ID
 
-# This is an unfinished file and is not for use until it is patched up.
 import threading
-from Settings import CHANNEL
+from requests import request as req
+from Settings import CHANNEL, PASS
 from time import sleep as t
-import urllib.request
 from os.path import isfile
-printLock = threading.Lock()
+
+
 _pointsList = {}
+chatInfo = {}
+_pointsFileName = "points/" + CHANNEL + ".json"
 def points():
-    justStarted = True
-    global _pointsList
-    _pointsFileName = "points_" + CHANNEL + ".json"
-    if isfile(_pointsFileName):
-        _pointsFileRead = open(_pointsFileName, 'r')
-        _pointsList = eval(_pointsFileRead.read())
-    while True:
-        chatInfo = eval(urllib.request.urlopen("https://tmi.twitch.tv/group/user/" + CHANNEL + "/chatters").read())
-        chatters = chatInfo["chatters"]
-        mods = chatters["moderators"]
-        staff = chatters["staff"]
-        admins = chatters["admins"]
-        gMods = chatters["global_mods"]
-        viewers = chatters["viewers"]
-        if justStarted:
-            justStarted = False
-        else:
-            for i in viewers:
-                if i in _pointsList.keys():
-                    _pointsList[i] += 5
-                else:
-                    _pointsList[i] = 0
-            for i in mods:
-                if i in _pointsList.keys():
-                    _pointsList[i] += 5
-                else:
-                    _pointsList[i] = 0
-            for i in staff:
-                if i in _pointsList.keys():
-                    _pointsList[i] += 5
-                else:
-                    _pointsList[i] = 0
-            for i in admins:
-                if i in _pointsList.keys():
-                    _pointsList[i] += 5
-                else:
-                    _pointsList[i] = 0
-            for i in gMods:
-                if i in _pointsList.keys():
-                    _pointsList[i] += 5
-                else:
-                    _pointsList[i] = 0
-
-            _pointsFileWrite = open(_pointsFileName, 'w')
-            _pointsFileWrite.write(str(_pointsList))
-        t(60)
+	global _pointsList
+	global chatInfo
+	justStarted = True
+	if isfile(_pointsFileName):
+		try:
+			_pointsList = eval(open(_pointsFileName, 'r'))
+		except:
+			__ = open(_pointsFileName, 'w')
+			__.close()
+			del __
+	while True:
+		chatInfo = eval(
+						req(
+							method="GET",
+							url="https://tmi.twitch.tv/group/user/%s/chatters" % CHANNEL
+						).text
+					)
+		chatters = chatInfo["chatters"]
+		if justStarted:
+			justStarted = False
+		else:
+			for x in chatters:
+				for i in chatInfo["chatters"][x]:
+					if i in _pointsList.keys() and "bot" not in i:
+						_pointsList[i] += 5
+					elif "bot" not in i:
+						_pointsList[i] = 5
+			with open(_pointsFileName, 'w') as f:
+				f.write(str(_pointsList))
+				f.close()
+		t(60)
 
 
 thread = threading.Thread(target=points)