Merge remote-tracking branch 'origin/master' into db-changes

# Conflicts:
#	protocol/Protocol.py

Author: abma

Client.py

@@ -123,6 +123,7 @@ def Handle(self, data):
 			flood_limits = self._root.flood_limits[self.access]
 		else:
 			flood_limits = self._root.flood_limits['fresh']
+		
 		#logging.info("  < [" + self.username + " " + str(self.session_id) + "] " + data.strip()) # uncomment for debugging
 
 		now = int(time.time())
@@ -213,15 +214,18 @@ def ReportFloodBreach(self, type, bytes):
 	## send data to client
 	##
 	def RealSend(self, data):
-		## don't append new data to buffer when client gets removed
 		if not data:
 			return
+
+		raw_msg  = data[data.find(" ")+1:] if data.startswith('#') else data
+		command = raw_msg[:raw_msg.find(" ")] if " " in raw_msg else raw_msg
+		self._root.outbound_command_stats[command] = self._root.outbound_command_stats.get(command, 0) + 1
+
 		#logging.info("> [" + self.username + " " + str(self.session_id) + "] " + data.strip()) # uncomment for debugging
+		
 		self.transport.write(data.encode("utf-8") + b"\n")
 
 	def Send(self, data):
-		command = data[:data.find(" ")] if " " in data else data
-		self._root.outbound_command_stats[command] = self._root.outbound_command_stats.get(command, 0) + 1 # ignore when RealSend is used directly
 		if self.msg_id:
 			data = self.msg_id + data
 		if self.buffersend:

DataHandler.py

@@ -710,10 +710,10 @@ def createSocket(self):
 	def stats(self):
 		logging.info(" -- STATS -- ")
 		logging.info("Command counts (inbound):")
-		for k in self.inbound_command_stats:
+		for k in sorted(self.inbound_command_stats):
 			logging.info(" %s %d" % (k, self.inbound_command_stats[k]))
 		logging.info("Command counts (outbound):")
-		for k in self.outbound_command_stats:
+		for k in sorted(self.outbound_command_stats):
 			logging.info(" %s %d" % (k, self.outbound_command_stats[k]))
 		logging.info("Number of logins: %d" % self.n_login_stats)
 		logging.info("TLS logins: %d" % self.tls_stats)

protocol/Protocol.py

@@ -1427,7 +1427,12 @@ def in_SAYFROM(self, client, chan, location, external_id, msg):
 
 		# backwards compat
 		msg = '<' + bridgedClient.username + '> ' + msg
-		self._root.broadcast('SAID %s %s %s' % (chan, client.username, msg), chan, set([]), client, None, 'u') 
+		if channel.identity=="battle":
+			self._root.broadcast('SAIDBATTLE %s %s' % (client.username, msg), chan, set([]), client, None, 'u')
+		else:
+			self._root.broadcast('SAID %s %s %s' % (chan, client.username, msg), chan, set([]), client, None, 'u')
+		if channel.store_history: #fixme for bridged clients
+			self.userdb.add_channel_message(channel.id, client.user_id, msg)
 
 
 	def in_IGNORE(self, client, tags):
@@ -1872,7 +1877,7 @@ def in_JOINBATTLEACCEPT(self, client, username):
 			return
 		if not user.session_id in battle.pending_users:
 			return
-		self.removePendingBattle(client)
+		self.removePendingBattle(user)
 		battle.joinBattle(user)
 
 	def in_JOINBATTLEDENY(self, client, username, reason=None):
@@ -1890,7 +1895,7 @@ def in_JOINBATTLEDENY(self, client, username, reason=None):
 			return
 		if not user.session_id in battle.pending_users:
 			return
-		self.removePendingBattle(client)
+		self.removePendingBattle(user)
 		user.Send('JOINBATTLEFAILED %s%s' % ('Access denied by host', (' ('+reason+')' if reason else '')))
 
 	def in_KICKFROMBATTLE(self, client, username):
@@ -2396,7 +2401,7 @@ def in_ADDBOT(self, client, name, battlestatus, teamcolor, AIDLL):
 			return
 
 		if name in battle.bots:
-			self.out_FAILED(client, "ADDBOT", "Bot already exists!", True)
+			self.out_FAILED(client, "ADDBOT", "Bot already exists!", False)
 			return
 		client.battle_bots[name] = battle.battle_id
 		battle.bots[name] = {'owner':client.username, 'battlestatus':battlestatus, 'teamcolor':teamcolor, 'AIDLL':AIDLL}