X-Git-Url: https://jfr.im/git/erebus.git/blobdiff_plain/5477b368b6f982ae96db41d62bbd3ce7abbc9d5d..500ba0c6c13d3a2eb66fc3b036f2ff3fb8dfc6e0:/erebus.py

diff --git a/erebus.py b/erebus.py
index 4e1934b..fb4239a 100644
--- a/erebus.py
+++ b/erebus.py
@@ -12,6 +12,7 @@ class Erebus(object):
 	bots = {}
 	fds = {}
 	mods = {}
+	numhandlers = {}
 	msghandlers = {}
 	users = {}
 	chans = {}
@@ -29,7 +30,7 @@ class Erebus(object):
 
 		def authed(self, auth):
 			if auth == '0': auth = None
-			self.auth = auth
+			self.auth = auth.lower()
 			self.checklevel()
 
 		def checklevel(self):
@@ -54,15 +55,37 @@ class Erebus(object):
 		def __repr__(self): return "<User %r (%d)>" % (self.nick,self.glevel)
 
 	class Channel(object):
-		def __init__(self, name, bot, levels={}):
+		def __init__(self, name, bot):
 			self.name = name
 			self.bot = bot
-			self.levels = levels
+			self.levels = {}
 
 			self.users = []
 			self.voices = []
 			self.ops = []
 
+			c = main.db.cursor()
+			c.execute("SELECT user, level FROM chusers WHERE chan = %s", (self.name,))
+			row = c.fetchone()
+			while row is not None:
+				self.levels[row['user']] = row['level']
+				row = c.fetchone()
+
+
+		def levelof(self, auth):
+			auth = auth.lower()
+			if auth in self.levels:
+				return self.levels[auth]
+			else:
+				return 0
+
+		def setlevel(self, auth, level, savetodb=True):
+			auth = auth.lower()
+			if savetodb:
+				c = main.db.cursor()
+				c.execute("REPLACE INTO chusers (chan, user, level) VALUES (%s, %s, %s)", (self.name, auth, level))
+			self.levels[auth] = level
+
 		def userjoin(self, user, level=None):
 			if user not in self.users: self.users.append(user)
 			if level == 'op' and user not in self.ops: self.ops.append(user)
@@ -109,14 +132,20 @@ class Erebus(object):
 		return self.bots[name.lower()]
 	def fd(self, fileno): #get Bot() by fd/fileno
 		return self.fds[fileno]
+	def randbot(self): #get Bot() randomly
+		for b in self.bots.itervalues(): return b #TODO
 
-	def user(self, nick):
+	def user(self, nick, justjoined=False):
 		nick = nick.lower()
 		if nick in self.users:
 			return self.users[nick]
 		else:
 			user = self.User(nick)
 			self.users[nick] = user
+
+			if justjoined:
+				self.randbot().conn.send("WHO %s %%ant,2" % (nick))
+
 			return user
 	def channel(self, name): #get Channel() by name
 		if name.lower() in self.chans:
@@ -124,8 +153,8 @@ class Erebus(object):
 		else:
 			return None
 
-	def newchannel(self, bot, name, levels={}):
-		chan = self.Channel(name.lower(), bot, levels)
+	def newchannel(self, bot, name):
+		chan = self.Channel(name.lower(), bot)
 		self.chans[name.lower()] = chan
 		return chan
 
@@ -142,14 +171,34 @@ class Erebus(object):
 
 	#bind functions
 	def hook(self, word, handler):
-		self.msghandlers[word] = handler
-	def unhook(self, word):
-		del self.msghandlers[word]
+		try:
+			self.msghandlers[word].append(handler)
+		except:
+			self.msghandlers[word] = [handler]
+	def unhook(self, word, handler):
+		if word in self.msghandlers and handler in self.msghandlers[word]:
+			self.msghandlers[word].remove(handler)
 	def hashook(self, word):
-		return word in self.msghandlers
+		return word in self.msghandlers and len(self.msghandlers[word]) != 0
 	def gethook(self, word):
 		return self.msghandlers[word]
 
+	def hooknum(self, word, handler):
+		try:
+			self.numhandlers[word].append(handler)
+		except:
+			self.numhandlers[word] = [handler]
+	def unhooknum(self, word, handler):
+		if word in self.numhandlers and handler in self.numhandlers[word]:
+			self.numhandlers[word].remove(handler)
+	def hasnumhook(self, word):
+		return word in self.numhandlers and len(self.numhandlers[word]) != 0
+	def getnumhook(self, word):
+		return self.numhandlers[word]
+
+
+
+
 def setup():
 	global cfg, main
 
@@ -158,6 +207,7 @@ def setup():
 
 	autoloads = [mod for mod, yes in cfg.items('autoloads') if int(yes) == 1]
 	for mod in autoloads:
+		print "Loading %s" % (mod)
 		ctlmod.load(main, mod)
 
 	main.db = MySQLdb.connect(host=cfg.dbhost, user=cfg.dbuser, passwd=cfg.dbpass, db=cfg.dbname, cursorclass=MySQLdb.cursors.DictCursor)