.BANCHO. Add basic api code

constants/fokabotCommands.py

@@ -684,7 +684,7 @@ def updateBeatmap(fro, chan, to):
 		if beatmapData is None:
 			return "Couldn't find beatmap data in database. Please load the beatmap's leaderboard and try again."
 
-		response = requests.post("{}/api/v1/update_beatmap".format(glob.conf.config["mirror"]["apiurl"]), {
+		response = requests.post("{}/api/v1/update_beatmap".format(glob.conf.config["mirror"]["url"]), {
 			"beatmap_set_id": beatmapData["beatmapset_id"],
 			"beatmap_name": beatmapData["song_name"],
 			"username": token.username,
@@ -837,8 +837,7 @@ commands = [
 		"callback": pp
 	}, {
 		"trigger": "!update",
-		"callback": updateBeatmap,
+		"callback": updateBeatmap
-		"privileges": privileges.ADMIN_MANAGE_SERVERS,	# TODO: Remove privileges for !update
 	}
 	#
 	#	"trigger": "!acc",

handlers/api/ping.py

@@ -0,0 +1,7 @@
+from common.web.api import api
+
+class handler(api.asyncAPIHandler):
+	@api.api
+	@api.args("ses")
+	def asyncGet(self):
+		self.data["message"] = "狂乱 Hey Kids!!"

helpers/configHelper.py

@@ -42,9 +42,8 @@ class config:
 			self.config.get("server","gzip")
 			self.config.get("server","gziplevel")
 			self.config.get("server","cikey")
-			self.config.get("server","cloudflare")
 
-			self.config.get("mirror","apiurl")
+			self.config.get("mirror","url")
 			self.config.get("mirror","apikey")
 
 			self.config.get("debug","enable")
@@ -94,10 +93,9 @@ class config:
 		self.config.set("server", "gzip", "1")
 		self.config.set("server", "gziplevel", "6")
 		self.config.set("server", "cikey", "changeme")
-		self.config.set("server", "cloudflare", "0")
 
 		self.config.add_section("mirror")
-		self.config.set("mirror", "apiurl", "http://storage.ripple.moe")
+		self.config.set("mirror", "url", "http://storage.ripple.moe")
 		self.config.set("mirror", "apikey", "anotherkey")
 
 		self.config.add_section("debug")

objects/glob.py

@@ -4,6 +4,7 @@ import time
 
 from common.ddog import datadogClient
 from common.files import fileBuffer, fileLocks
+from common.web.api import rateLimit
 from objects import channelList
 from objects import matchList
 from objects import streamList
@@ -32,7 +33,6 @@ fileBuffers = fileBuffer.buffersList()
 schiavo = schiavo.schiavo()
 dog = datadogClient.datadogClient()
 verifiedCache = {}
-cloudflare = False
 chatFilters = None
 userIDCache = {}
 pool = None
@@ -51,3 +51,4 @@ startTime = int(time.time())
 
 
 streams = streamList.streamList()
+rateLimits = rateLimit.rateLimiters(60, 60)

pep.py

@@ -25,6 +25,7 @@ from handlers import apiVerifiedStatusHandler
 from handlers import ciTriggerHandler
 from handlers import mainHandler
 from handlers import heavyHandler
+from handlers.api import ping
 from helpers import configHelper
 from helpers import consoleHelper
 from helpers import systemHelper as system
@@ -35,6 +36,7 @@ from objects import fokabot
 from objects import glob
 
 
+
 def make_app():
 	return tornado.web.Application([
 		(r"/", mainHandler.handler),
@@ -44,7 +46,9 @@ def make_app():
 		(r"/api/v1/ciTrigger", ciTriggerHandler.handler),
 		(r"/api/v1/verifiedStatus", apiVerifiedStatusHandler.handler),
 		(r"/api/v1/fokabotMessage", apiFokabotMessageHandler.handler),
-		(r"/stress", heavyHandler.handler)
+		(r"/stress", heavyHandler.handler),
+
+		(r"/api/v2/ping", ping.handler),
 	])
 
 if __name__ == "__main__":
@@ -208,9 +212,6 @@ if __name__ == "__main__":
 		except:
 			consoleHelper.printColored("[!] Error while starting Datadog client! Please check your config.ini and run the server again", bcolors.RED)
 
-		# Cloudflare memes
-		glob.cloudflare = generalUtils.stringToBool(glob.conf.config["server"]["cloudflare"])
-
 		# IRC start message and console output
 		glob.irc = generalUtils.stringToBool(glob.conf.config["irc"]["enable"])
 		if glob.irc: