Make SendRide code slightly less ugly

AudiosurfResearch · Sep 2, 2023 · ee5dccc · ee5dccc
1 parent 80d298f
commit ee5dccc
Show file tree

Hide file tree

Showing 4 changed files with 92 additions and 155 deletions.
diff --git a/package.json b/package.json
@@ -26,7 +26,7 @@
   },
   "homepage": "https://github.com/AudiosurfResearch/Wavebreaker#readme",
   "devDependencies": {
-    "@types/node": "^18.6.1",
+    "@types/node": "^20.5.9",
     "@types/node-steam-openid": "^1.0.0",
     "@types/steamapi": "^2.2.2",
     "@types/steamid": "^2.0.1",
@@ -50,10 +50,9 @@
     "discord.js": "^14.13.0",
     "fastify": "^4.22.0",
     "fastify-https-redirect": "^1.0.4",
+    "ioredis": "^5.3.2",
     "musicbrainz-api": "^0.10.3",
     "node-steam-openid": "^1.2.0",
-    "redis": "^4.6.8",
-    "redis-om": "^0.4.2",
     "steamapi": "^2.4.2",
     "steamid": "^2.0.0",
     "xml2js": "^0.6.2"

diff --git a/routes/as1/gameplay.ts b/routes/as1/gameplay.ts
@@ -309,6 +309,23 @@ export default async function routes(fastify: FastifyInstance) {
         },
       });
 
+      const scoreComponent = {
+        trackShape: request.body.trackshape,
+        xstats: request.body.xstats,
+        density: request.body.density,
+        vehicleId: request.body.vehicle,
+        score: request.body.score,
+        feats: request.body.feats,
+        songLength: request.body.songlength,
+        goldThreshold: request.body.goldthreshold,
+        skillPoints: calcSkillPoints(
+          request.body.score,
+          request.body.goldthreshold,
+          request.body.league
+        ),
+        iss: request.body.iss,
+        isj: request.body.isj,
+      };
       const score = await prisma.score.upsert({
         where: {
           userId_leagueId_songId: {
@@ -320,45 +337,17 @@ export default async function routes(fastify: FastifyInstance) {
         create: {
           userId: user.id,
           leagueId: request.body.league,
-          trackShape: request.body.trackshape,
-          xstats: request.body.xstats,
-          density: request.body.density,
-          vehicleId: request.body.vehicle,
-          score: request.body.score,
-          feats: request.body.feats,
-          songLength: request.body.songlength,
-          goldThreshold: request.body.goldthreshold,
-          skillPoints: calcSkillPoints(
-            request.body.score,
-            request.body.goldthreshold,
-            request.body.league
-          ),
-          iss: request.body.iss,
-          isj: request.body.isj,
           songId: request.body.songid,
+          ...scoreComponent,
         },
         update: {
           playCount: {
             increment: 1,
           },
           ...(prevScore &&
             prevScore.score < request.body.score && {
-              trackShape: request.body.trackshape,
-              xstats: request.body.xstats,
-              density: request.body.density,
-              vehicleId: request.body.vehicle,
-              score: request.body.score,
-              feats: request.body.feats,
-              songLength: request.body.songlength,
-              goldThreshold: request.body.goldthreshold,
-              skillPoints: calcSkillPoints(
-                request.body.score,
-                request.body.goldthreshold,
-                request.body.league
-              ),
-              iss: request.body.iss,
-              isj: request.body.isj,
               rideTime: new Date(),
+              ...scoreComponent,
             }),
         },
       });

diff --git a/util/db.ts b/util/db.ts
@@ -1,5 +1,5 @@
 import { PrismaClient, Song, User } from "@prisma/client";
-import { createClient } from "redis";
+import Redis from "ioredis";
 
 export const prisma = new PrismaClient({
   log: [
@@ -10,13 +10,7 @@ export const prisma = new PrismaClient({
   ],
 });
 
-export const redis = createClient({
-  url: process.env.REDIS_URL,
-});
-redis.on("error", (err) => console.error("Redis Client Error", err));
-redis.connect().then(() => {
-  console.log("Connected to Redis");
-});
+export const redis = new Redis(process.env.REDIS_URL);
 
 export interface ExtendedUser extends User {
   totalScore: number;