feat: add user ranking on profile and use their custom accent colour …

…if set in discord
zeepkist · Jan 20, 2023 · 5c04e3b · 5c04e3b
1 parent f04aaf2
commit 5c04e3b
Show file tree

Hide file tree

Showing 4 changed files with 52 additions and 16 deletions.
diff --git a/src/commands/user.ts b/src/commands/user.ts
@@ -13,8 +13,8 @@ import { Command } from '../command.js'
 import { listRecords } from '../components/lists/listRecords.js'
 import { database } from '../services/database.js'
 import { getRecords } from '../services/records.js'
-import { getUser } from '../services/users.js'
-import { userSimilarity } from '../utils/index.js'
+import { getUser, getUserRanking } from '../services/users.js'
+import { formatOrdinal, userSimilarity } from '../utils/index.js'
 
 const addDiscordAuthor = (
   embed: EmbedBuilder,
@@ -27,6 +27,9 @@ const addDiscordAuthor = (
     url: `https://zeepkist.wopian.me/user/${steamId}`
   })
   embed.setThumbnail(linkedAccount.avatarURL() ?? '')
+  if (linkedAccount.hexAccentColor) {
+    embed.setColor(linkedAccount.hexAccentColor)
+  }
 }
 
 export const user: Command = {
@@ -77,20 +80,20 @@ export const user: Command = {
     }
 
     try {
-      const user = await getUser({ steamId, id })
+      const user = await getUser({ SteamId: steamId, Id: id })
+      const userRanking = await getUserRanking({ SteamId: user.steamId })
 
-      /*
       const allValidRecords = await getRecords({
         UserSteamId: steamId,
         UserId: id,
+        InvalidOnly: true,
         Sort: '-id',
         Limit: 5
       })
-      */
       const allInvalidRecords = await getRecords({
         UserSteamId: steamId,
         UserId: id,
-        ValidOnly: false,
+        InvalidOnly: true,
         Sort: '-id',
         Limit: 5
       })
@@ -109,8 +112,8 @@ export const user: Command = {
         Limit: 5
       })
 
-      const totalRuns = allInvalidRecords.totalAmount
-      // allValidRecords.totalAmount + allInvalidRecords.totalAmount
+      const totalRuns =
+        allValidRecords.totalAmount + allInvalidRecords.totalAmount
 
       const embed = new EmbedBuilder()
         .setColor(0xff_92_00)
@@ -119,14 +122,21 @@ export const user: Command = {
         .addFields(
           {
             name: 'World Records',
-            value: String(worldRecords.totalAmount),
+            value: `${worldRecords.totalAmount} (${formatOrdinal(
+              userRanking.position
+            )})`,
             inline: true
           },
           {
             name: 'Best Times',
             value: String(bestRecords.totalAmount),
             inline: true
           },
+          {
+            name: 'any% Times',
+            value: String(allValidRecords.totalAmount),
+            inline: true
+          },
           {
             name: 'Total Runs',
             value: String(totalRuns),

diff --git a/src/models/user.ts b/src/models/user.ts
@@ -12,6 +12,11 @@ export interface UserRankings {
 
 export type UserResponse = User
 
+export interface UserRankingResponse {
+  amountOfWorldRecords: number
+  position: number
+}
+
 export interface UserRankingsResponse {
   totalAmount: number
   rankings: UserRankings[]

diff --git a/src/services/users.ts b/src/services/users.ts
@@ -1,22 +1,35 @@
-import type { UserRankingsResponse, UserResponse } from '../models/user.js'
+import type {
+  UserRankingResponse,
+  UserRankingsResponse,
+  UserResponse
+} from '../models/user.js'
 import { api } from './api.js'
 
 interface GetUserParameters {
-  id?: number
-  steamId?: string
+  Id?: number
+  SteamId?: string
 }
 
-export const getUser = async ({ id, steamId }: GetUserParameters) => {
-  const response = await (id
-    ? api.get('users/id', { params: { id } })
-    : api.get('users/steamid', { params: { SteamId: steamId } }))
+export const getUser = async ({ Id, SteamId }: GetUserParameters) => {
+  const response = await (Id
+    ? api.get('users/id', { params: { Id } })
+    : api.get('users/steamid', { params: { SteamId } }))
 
   if (response.status === 200) return response.data as UserResponse
   else {
     throw response.data.error
   }
 }
 
+export const getUserRanking = async (query: GetUserParameters = {}) => {
+  const response = await api.get('users/ranking', { params: query })
+
+  if (response.status === 200) return response.data as UserRankingResponse
+  else {
+    throw response.data.error
+  }
+}
+
 interface GetUserRankingsParameters {
   Limit?: number
   Offset?: number

diff --git a/src/utils/format.ts b/src/utils/format.ts
@@ -42,3 +42,11 @@ export const formatResultTime = (input: number, precision = 4) => {
     precision
   )}`)
 }
+
+export const formatOrdinal = (number: number) => {
+  const ordinals = ['th', 'st', 'nd', 'rd']
+  const modulo = number % 100
+  return (
+    number + (ordinals[(modulo - 20) % 10] || ordinals[modulo] || ordinals[0])
+  )
+}