From d7c9e1c535a1cd9f089aba352378f9c77a71faee Mon Sep 17 00:00:00 2001
From: tommy aka doge <59783653+dowoge@users.noreply.github.com>
Date: Fri, 14 Oct 2022 23:25:02 -0400
Subject: [PATCH 1/2] fiveman api implementation, fuck rover

m
---
 src/modules/strafes_net.lua | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/modules/strafes_net.lua b/src/modules/strafes_net.lua
index 2eff6da..55784d9 100644
--- a/src/modules/strafes_net.lua
+++ b/src/modules/strafes_net.lua
@@ -3,7 +3,7 @@ local API = {}
 local API_KEY = require('./apikey.lua')
 local API_HEADER = { {'Content-Type','application/json'}, { 'api-key', API_KEY } }
 local STRAFESNET_API_URL = 'https://api.strafes.net/v1/'
-local ROVER_API_URL = 'https://verify.eryn.io/api/'
+local FIVEMAN_API_URL = 'https://api.fiveman1.net/v1/'
 local ROBLOX_API_URL = 'https://users.roblox.com/v1/'
 local ROBLOX_API_URL2 = 'https://api.roblox.com/'
 local ROBLOX_THUMBNAIL_URL = 'https://thumbnails.roblox.com/v1/'
@@ -220,13 +220,13 @@ function API:GetUserFromAny(user,message)
     elseif user=='me' then
         local me=message.author
         local roblox_user=self:GetRobloxInfoFromDiscordId(me.id)
-        if not roblox_user.id then return 'You are not registered with the RoverAPI' end
+        if not roblox_user.id then return 'You are not registered with the rbhop api' end
         return roblox_user
     elseif user:match('<@%d+>') then
         local user_id=user:match('<@(%d+)>')
         local member=message.guild:getMember(user_id)
         local roblox_user=self:GetRobloxInfoFromDiscordId(member.id)
-        if not roblox_user.id then return 'User is not registered with the RoverAPI' end
+        if not roblox_user.id then return 'User is not registered with the rbhop api' end
         return roblox_user
     else
         local roblox_user=self:GetRobloxInfoFromUsername(user)
@@ -237,7 +237,7 @@ function API:GetUserFromAny(user,message)
 end
 
 
--- [[ ROBLOX / ROVER AND OTHER APIs ]] --
+-- [[ ROBLOX / FIVEMAN AND OTHER APIs ]] --
 
 function API:GetRobloxInfoFromUserId(USER_ID)
     if not USER_ID then return 'empty id' end
@@ -257,9 +257,9 @@ end
 
 function API:GetRobloxInfoFromDiscordId(DISCORD_ID)
     if not DISCORD_ID then return 'empty id' end
-    local response,headers = http_request('GET', ROVER_API_URL..'user/'..DISCORD_ID, API_HEADER)
+    local response,headers = http_request('GET', FIVEMAN_API_URL..'users/'..DISCORD_ID, API_HEADER)
     if not response.robloxId and response.error then return response,headers.error end
-    local response2 = http_request('GET', ROBLOX_API_URL..'users/'..response.robloxId, API_HEADER)
+    local response2 = http_request('GET', ROBLOX_API_URL..'users/'..response.result.robloxId, API_HEADER)
     return response2
 end
 

From 5908799c4408ce5c7895e094b8f313e6679ee834 Mon Sep 17 00:00:00 2001
From: tommy aka doge <59783653+dowoge@users.noreply.github.com>
Date: Sat, 15 Oct 2022 02:32:03 -0400
Subject: [PATCH 2/2] no more literal check, allows for "points" and "point"

---
 src/modules/commands/skillCalc.lua | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/modules/commands/skillCalc.lua b/src/modules/commands/skillCalc.lua
index b812058..2791240 100644
--- a/src/modules/commands/skillCalc.lua
+++ b/src/modules/commands/skillCalc.lua
@@ -15,7 +15,7 @@ commands:Add('skill',{},'skill <username|mention|"me"> <game> <style> <sort?=ski
         if not game then return message:reply('invalid game') end
         if not style then return message:reply('invalid style') end
         local sort = args[4]
-        if type(sort)=='string' and sort:lower()~='skill' and sort:lower()~='point' then
+        if type(sort)=='string' and not sort:lower():find('skill') and not sort:lower():find('point') then
             return message:reply('invalid sort option, valid options are "skill" or "point"')
         elseif sort==nil then
             sort = 'skill'
@@ -65,9 +65,9 @@ commands:Add('skill',{},'skill <username|mention|"me"> <game> <style> <sort?=ski
                 test_a=test_a+(count-rank)
                 test_b=test_b+(count-1)
             end
-            table.sort(times,sort=='skill' and function(t1,t2)
+            table.sort(times,sort:find('skill') and function(t1,t2)
                 return t1.SkillRaw<t2.SkillRaw
-            end or sort=='point' and function(t1,t2)
+            end or sort:find('point') and function(t1,t2)
                 return t1.Points<t2.Points
             end)
             local points = 0