db changes

ChanServ.py

@@ -19,7 +19,7 @@ def __init__(self, root, address, session_id):
 
 		self.username = 'ChanServ'
 		self.password = 'ChanServ'
-		self.lobby_id = 'ChanServ'
+		self.agent = 'ChanServ'
 		self._root.usernames[self.username] = self
 		self._root.clients[session_id] = self
 		self._root = root
@@ -216,10 +216,10 @@ def HandleCommand(self, user, cmd, chan=None, args=None):
 				return '#%s: You do not have permission to change history settings in the channel' % chan
 			if args=='on':
 				channel.setHistory(client, True)
-				return '#%s: History enabled' % (chan, str(enable))
+				return '#%s: History enabled' % chan
 			if args=='off':
 				channel.setHistory(client, False)
-				return '#%s: History disabled' % (chan, str(enable))
+				return '#%s: History disabled' % chan
 			return '#%s: Unknown value for history setting (expected: on, off).' % chan
 
 		if cmd == 'antispam':
@@ -467,6 +467,9 @@ def HandleCommand(self, user, cmd, chan=None, args=None):
 			antispam = "Anti-spam protection is off"
 			if channel.antispam:
 				antispam = "Anti-spam protection is on"
+			history = "Channel history is off"
+			if channel.store_history:
+				history = "Channel history is on"
 			founder = 'No founder is registered'
 			if channel.owner_user_id:
 				founder = self._root.clientFromID(channel.owner_user_id, True)
@@ -486,7 +489,8 @@ def HandleCommand(self, user, cmd, chan=None, args=None):
 			users_str = 'Currently contains 0 users and 0 bridged users'
 			if len(users)>=1 or len(bridged_users)>=1:
 				users_str = 'Currently contains %i users and %i bridged users' % (len(users), len(bridged_users))
-			return '#%s info: %s. %s. %s. %s. ' % (chan, antispam, founder, op_list, users_str)
+			used_str = "Last used on %s" % channel.last_used.strftime('%b %d, %Y')
+			return '#%s info: %s. %s. %s. %s. %s. %s.' % (chan, founder, op_list, users_str, antispam, history, used_str)
 
 		if not (len(cmd)>=3 and all(c.isalpha() for c in cmd)):
 			return #probably just a smiley or suchlike - not meant to invoke ChanServ

Client.py

@@ -46,7 +46,7 @@ def __init__(self, root, address, session_id):
 		self.compat = set() # holds compatibility flags
 
 		self.country_code = '??'
-		self.lobby_id = ""
+		self.agent = ""
 		self.setFlagByIP(self.ip_address)
 		self.status = 12
 		self.accesslevels = ['fresh','everyone']

DataHandler.py

@@ -176,6 +176,10 @@ def _fk_pragma_on_connect(dbapi_con, con_record):
 			channel.key = dbchannel['key']
 			if channel.key in ('', None, '*'):
 				channel.key = None
+			channel.last_used = dbchannel['last_used']
+			if not channel.last_used: # can remove after first run!
+				channel.last_used = now
+				self.channeldb.recordUse(channel)
 
 			channel.topic_user_id = dbchannel['topic_user_id']
 			channel.topic = dbchannel['topic']
@@ -733,10 +737,10 @@ def client_LoginStats(self, client):
 				self.flag_stats[flag] += 1
 			else:
 				self.flag_stats[flag] = 1
-		if client.lobby_id in self.agent_stats:
-			self.agent_stats[client.lobby_id] += 1
+		if client.agent in self.agent_stats:
+			self.agent_stats[client.agent] += 1
 		else:
-			self.agent_stats[client.lobby_id] = 1
+			self.agent_stats[client.agent] = 1
 
 	def reload(self, client):
 		# reload non-core parts of the server