IRC Support for username with spaces
BATs with Donor have bright yellow username in chat General performance improvements Code cleaning Multiplayer improvements and fixes Fixed some spectator bugs
This commit is contained in:
@@ -33,7 +33,5 @@ class handler(requestHelper.asyncRequestHandler):
|
||||
data["status"] = statusCode
|
||||
|
||||
# Send response
|
||||
#self.clear()
|
||||
self.write(json.dumps(data))
|
||||
self.set_status(statusCode)
|
||||
#self.finish(json.dumps(data))
|
||||
|
@@ -226,8 +226,8 @@ class handler(SentryMixin, requestHelper.asyncRequestHandler):
|
||||
self.set_status(200)
|
||||
self.add_header("cho-token", responseTokenString)
|
||||
self.add_header("cho-protocol", "19")
|
||||
#self.add_header("Keep-Alive", "timeout=5, max=100")
|
||||
#self.add_header("Connection", "keep-alive")
|
||||
self.add_header("Connection", "keep-alive")
|
||||
self.add_header("Keep-Alive", "timeout=5, max=100")
|
||||
self.add_header("Content-Type", "text/html; charset=UTF-8")
|
||||
except:
|
||||
log.error("Unknown error!\n```\n{}\n{}```".format(sys.exc_info(), traceback.format_exc()))
|
||||
@@ -259,6 +259,4 @@ class handler(SentryMixin, requestHelper.asyncRequestHandler):
|
||||
html += " \\ . .. .. . /<br>"
|
||||
html += "^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^<br>"
|
||||
html += "</marquee><br><strike>reverse engineering a protocol impossible to reverse engineer since always</strike><br>we are actually reverse engineering bancho successfully. for the third time.<br><br><i>© Ripple team, 2016</i></pre></body></html>"
|
||||
self.write(html)
|
||||
#yield tornado.gen.Task(self.captureMessage, "test")
|
||||
#self.finish()
|
||||
self.write(html)
|
@@ -1,52 +0,0 @@
|
||||
"""
|
||||
WIP feature that will come in the future.
|
||||
Don't import
|
||||
"""
|
||||
import flask
|
||||
from objects import glob
|
||||
from constants import exceptions
|
||||
|
||||
@app.route("/api/online-users-count")
|
||||
def APIonlineUsersCount():
|
||||
return flask.jsonify({"count" : len(glob.tokens.tokens)-1})
|
||||
|
||||
@app.route("/api/user-info")
|
||||
def APIonlineUsers():
|
||||
resp = {}
|
||||
|
||||
try:
|
||||
u = flask.request.args.get('u')
|
||||
|
||||
# Username/userID
|
||||
if u.isdigit():
|
||||
u = int(u)
|
||||
else:
|
||||
u = userHelper.getID(u)
|
||||
if u == None:
|
||||
raise exceptions.userNotFoundException
|
||||
|
||||
# Make sure this user is online
|
||||
userToken = glob.tokens.getTokenFromUserID(u)
|
||||
if userToken == None:
|
||||
raise exceptions.tokenNotFoundException
|
||||
|
||||
# Build response dictionary
|
||||
resp["response"] = "1"
|
||||
resp[userToken.username] = {
|
||||
"userID" : userToken.userID,
|
||||
"actionID" : userToken.actionID,
|
||||
"actionText" : userToken.actionText,
|
||||
"actionMd5" : userToken.actionMd5,
|
||||
"actionMods": userToken.actionMods,
|
||||
"gameMode": userToken.gameMode,
|
||||
"country": countryHelper.getCountryLetters(userToken.country),
|
||||
"position": userToken.location,
|
||||
"spectating": userToken.spectating,
|
||||
"spectators": userToken.spectators
|
||||
}
|
||||
except exceptions.userNotFoundException:
|
||||
resp["response"] = "-1"
|
||||
except exceptions.tokenNotFoundException:
|
||||
resp["response"] = "-2"
|
||||
finally:
|
||||
return flask.jsonify(resp)
|
Reference in New Issue
Block a user