delete stats file - don't know how to await so put stats callback in main - add config

Author: noahpodgurski

source/main.lua

@@ -17,7 +17,6 @@ require("console")
 require("errorhandler")
 require("extensions.love")
 require('ranks')
-require('stats')
 
 local log = require("log")
 local melee = require("melee")
@@ -28,6 +27,8 @@ local notification = require("notification")
 local overlay = require("overlay")
 local music = require("music")
 
+local json = require("serializer.json")
+local web = require("web")
 local color = require("util.color")
 local gui = require("gui")
 local web = require("web")
@@ -94,6 +95,41 @@ local opponentName = ""
 local opponentRank = ""
 local opponentElo = 0
 
+function grabUserStats(userCode, isOpponent)
+	-- userCode: 'xxx#123'
+	local body = json.encode({
+		operationName = "AccountManagementPageQuery", 
+		variables = {
+			cc = string.format("%s", userCode),
+			uid = string.format("%s", userCode)
+		}, 
+		query = "fragment userProfilePage on User {\n  fbUid\n  displayName\n  connectCode {\n    code\n    __typename\n  }\n  status\n  activeSubscription {\n    level\n    hasGiftSub\n    __typename\n  }\n  rankedNetplayProfile {\n    id\n    ratingOrdinal\n    ratingUpdateCount\n    wins\n    losses\n    dailyGlobalPlacement\n    dailyRegionalPlacement\n    continent\n    characters {\n      id\n      character\n      gameCount\n      __typename\n    }\n    __typename\n  }\n  __typename\n}\n\nquery AccountManagementPageQuery($cc: String!, $uid: String!) {\n  getUser(fbUid: $uid) {\n    ...userProfilePage\n    __typename\n  }\n  getConnectCode(code: $cc) {\n    user {\n      ...userProfilePage\n      __typename\n    }\n    __typename\n  }\n}\n"
+	})
+	print(body)
+
+	local res = web.post(
+		'https://gql-gateway-dot-slippi.uc.r.appspot.com/graphql',
+		body,
+		{
+			["Content-Type"] = "application/json",
+			["Content-Length"] = string.len(body)
+		},
+		function(event)
+			data = json.decode(event.response)
+			if data.data and data.data.getConnectCode.user.displayName then
+				if isOpponent then
+					opponentElo = data.data.getConnectCode.user.rankedNetplayProfile.ratingOrdinal
+					opponentRank = getRank(opponentElo, false)
+					opponentName = data.data.getConnectCode.user.displayName
+				else
+					playerElo = data.data.getConnectCode.user.rankedNetplayProfile.ratingOrdinal
+					playerRank = getRank(playerElo, false)
+					playerName = data.data.getConnectCode.user.displayName
+				end
+			end
+		end)
+end
+
 local portless_title = ""
 function love.updateTitle(str)
 	local title = str
@@ -186,16 +222,10 @@ memory.hook("scene.minor", "Slippi Auto Port Switcher", function(minor)
 			opponentCode = memory.slippi.players[1].code
 		end
 
-		playerStats = grabUserStats(playerCode)
-		opponentStats = grabUserStats(opponentCode)
-
-		playerName = playerStats[1]
-		playerElo = playerStats[2]
-		playerRank = getRank(playerElo, false)
-
-		opponentName = opponentStats[1]
-		opponentElo = opponentStats[2]
-		opponentRank = getRank(opponentElo, false)
+		if PANEL_SETTINGS:IsShowRanksEnabled() then
+			grabUserStats(playerCode, false)
+			grabUserStats(opponentCode, true)
+		end
 
 		if minor == SCENE_VS_ONLINE_CSS or menu == SCENE_VS_ONLINE_SSS then
 			-- Switch back to whatever controller is controlling port 1, when not in a match
@@ -405,13 +435,15 @@ function love.drawControllerOverlay()
 		overlay.draw(controller)
 		-- graphics.textOutline(string.format("%s %s", opponentName, opponentRank), .5, 400, 200) -- maybe add outline
 		graphics.setColor(255, 0, 0, 255)
-		local playerLabel = string.format("%s\n%s (%d)", playerName, playerRank, playerElo)
-		local opponentLabel = string.format("%s\n(%d) %s", opponentName, opponentElo, opponentRank)
-		if playerElo > 0 then
-			graphics.print(playerLabel, 10, 200)
-		end
-		if opponentElo > 0 then
-			graphics.printf(opponentLabel, 300, 200, 200, "right")
+		if PANEL_SETTINGS:IsShowRanksEnabled() then
+			local playerLabel = string.format("%s\n%s (%d)", playerName, playerRank, playerElo)
+			local opponentLabel = string.format("%s\n(%d) %s", opponentName, opponentElo, opponentRank)
+			if playerElo > 0 then
+				graphics.print(playerLabel, 10, 200)
+			end
+			if opponentElo > 0 then
+				graphics.printf(opponentLabel, 300, 200, 200, "right")
+			end
 		end
 
 		if PANEL_SETTINGS:GetDebuggingInputFlags() > 0 then

source/modules/gui/panels/settings.lua

@@ -12,6 +12,8 @@ SLIPPI_OFF = 1
 SLIPPI_NETPLAY = 2
 SLIPPI_REPLAY = 3
 
+SHOW_RANKED_DETAILS = 1
+
 LOOPING_NONE = 0
 LOOPING_MENU = 1
 LOOPING_STAGE_TIMED = 2
@@ -115,7 +117,7 @@ function PANEL:Settings()
 	self.SLIPPI.MODE = self.SLIPPI.RIGHT:Add("RadioPanel")
 	self.SLIPPI.MODE:SetText("Slippi mode")
 	self.SLIPPI.MODE:DockMargin(0,0,0,0)
-	self.SLIPPI.MODE:Dock(DOCK_FILL)
+	self.SLIPPI.MODE:Dock(DOCK_TOP)
 	self.SLIPPI.MODE:SetWidth(100)
 
 	local off = self.SLIPPI.MODE:AddOption(SLIPPI_OFF, "Off: Other games", true)
@@ -136,6 +138,15 @@ WARNING: This tricks M'Overlay into thinking Melee is being played when an inval
 	self.SLIPPI.MODE.OnSelectOption = function(this, num)
 		self.SLIPPI.ICON:SetImage(num == SLIPPI_OFF and "textures/slippi.png" or "textures/slippi_filled.png")
 	end
+	
+	self.SLIPPI.RANKED = self.SLIPPI.RIGHT:Add("CheckBox")
+	self.SLIPPI.RANKED:SetText("Ranked Details")
+	self.SLIPPI.RANKED:DockMargin(0,0,0,0)
+	self.SLIPPI.RANKED:Dock(DOCK_BOTTOM)
+	self.SLIPPI.RANKED:SetWidth(100)
+	self.SLIPPI.RANKED:SetTooltipParent(self.SLIPPI.RANKED)
+	self.SLIPPI.RANKED:SetTooltipTitle("Show Ranked Details")
+	self.SLIPPI.RANKED:SetTooltipBody("[[Shows player and opponent slippi.gg leaderboard elo and league ranks]]")
 
 	self.MELEE.MUSIC = self.MELEE.LEFT:Add("CheckBox")
 	self.MELEE.MUSIC:SetText("Enable music")
@@ -531,6 +542,10 @@ function PANEL:GetSlippiMode()
 	return self.SLIPPI.MODE:GetOption()
 end
 
+function PANEL:IsShowRanksEnabled()
+	return self.SLIPPI.RANKED:IsToggled()
+end
+
 function PANEL:IsSlippiNetplay()
 	return self.SLIPPI.MODE:GetOption() == SLIPPI_NETPLAY
 end