X-Git-Url: https://jfr.im/git/erebus.git/blobdiff_plain/67e04ca5bbdfb8d128767750058d665af3a39c44..b53a701ea7bafcce6367ca8c35ba5acfd43d26a2:/erebus.py

diff --git a/erebus.py b/erebus.py
index e8a1ca9..c91e24c 100644
--- a/erebus.py
+++ b/erebus.py
@@ -17,14 +17,13 @@ class Erebus(object):
 	chans = {}
 
 	class User(object):
-		chans = []
-
 		def __init__(self, nick, auth=None):
-			print "parent.User(self, %r, %r)" % (nick, auth)
 			self.nick = nick
 			self.auth = auth
 			self.checklevel()
 
+			self.chans = []
+
 		def isauthed(self):
 			return self.auth is not None
 
@@ -46,16 +45,23 @@ class Erebus(object):
 					self.glevel = 0
 			return self.glevel
 
+		def join(self, chan):
+			self.chans.append(chan)
+		def part(self, chan):
+			self.chans.remove(chan)
+
 		def __str__(self): return self.nick
 		def __repr__(self): return "<User %r (%d)>" % (self.nick,self.glevel)
 
 	class Channel(object):
-		users = []
-		voices = []
-		ops = []
-
-		def __init__(self, name):
+		def __init__(self, name, bot, levels={}):
 			self.name = name
+			self.bot = bot
+			self.levels = levels
+
+			self.users = []
+			self.voices = []
+			self.ops = []
 
 		def userjoin(self, user, level=None):
 			if user not in self.users: self.users.append(user)
@@ -87,9 +93,9 @@ class Erebus(object):
 			self.potype = "select"
 			self.fdlist = []
 
-	def newbot(self, nick, user, bind, server, port, realname, chans):
+	def newbot(self, nick, user, bind, server, port, realname):
 		if bind is None: bind = ''
-		obj = bot.Bot(self, nick, user, bind, server, port, realname, chans)
+		obj = bot.Bot(self, nick, user, bind, server, port, realname)
 		self.bots[nick.lower()] = obj
 
 	def newfd(self, obj, fileno):
@@ -103,17 +109,31 @@ 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): #TODO #get Channel() by name
-		return self.Channel(name.lower())
+	def channel(self, name): #get Channel() by name
+		if name.lower() in self.chans:
+			return self.chans[name.lower()]
+		else:
+			return None
+
+	def newchannel(self, bot, name, levels={}):
+		chan = self.Channel(name.lower(), bot, levels)
+		self.chans[name.lower()] = chan
+		return chan
 
 	def poll(self):
 		if self.potype == "poll":
@@ -143,8 +163,8 @@ def setup():
 	main = Erebus(cfg.trigger)
 
 	autoloads = [mod for mod, yes in cfg.items('autoloads') if int(yes) == 1]
-	print autoloads
 	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)
@@ -153,17 +173,14 @@ def setup():
 	rows = c.fetchall()
 	c.close()
 	for row in rows:
-		c2 = main.db.cursor()
-		c2.execute("SELECT chname FROM chans WHERE bot = %s AND active = 1", (row['nick'],))
-		chans = [chdic['chname'] for chdic in c2.fetchall()]
-		c2.close()
-		main.newbot(row['nick'], row['user'], row['bind'], cfg.host, cfg.port, cfg.realname, chans)
+		main.newbot(row['nick'], row['user'], row['bind'], cfg.host, cfg.port, cfg.realname)
 	main.connectall()
 
 def loop():
 	poready = main.poll()
 	for fileno in poready:
-		main.fd(fileno).getdata()
+		for line in main.fd(fileno).getdata():
+			main.fd(fileno).parse(line)
 
 if __name__ == '__main__':
 	setup()