From 7a84d2555ffabbe29b23cf6e5035b6a4be8b9eb6 Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Tue, 9 Jan 2024 23:10:35 -0800
Subject: remove users from archive once migrated

---
 lib/sockets.js | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'lib/sockets.js')

diff --git a/lib/sockets.js b/lib/sockets.js
index 44b3bf2a..2339c06e 100644
--- a/lib/sockets.js
+++ b/lib/sockets.js
@@ -1,12 +1,11 @@
 import config from "$config";
-import migrate from "$lib/migrate";
 import store from "$lib/store";
 import jwt from "jsonwebtoken";
 import { v4 } from "uuid";
 import whitelist from "$lib/whitelist";
 import { l, err, warn } from "$lib/logging";
 import { g } from "$lib/db";
-import { pick } from "$lib/utils";
+import { fail, getUser, pick } from "$lib/utils";
 
 const code = 1000;
 const all = {};
@@ -51,10 +50,9 @@ let track = async (ws, token) => {
   let { id } = ws;
   let { id: uid } = jwt.decode(token);
 
-  if (!uid) throw new Error("Invalid JWT token");
-  let user = await g(`user:${uid}`);
-  if (!user) user = migrate(id);
-  if (!user) throw new Error(`User not found ${uid}`);
+  if (!uid) fail("Invalid JWT token");
+  let user = await getUser(uid);
+  if (!user) fail(`User not found ${uid}`);
 
   if (!store.sockets[uid]) store.sockets[uid] = {};
 
@@ -113,7 +111,7 @@ export async function socketServer(app) {
               ws.send(JSON.stringify({ type: "logout" }));
             setTimeout(
               () => ws && ws.close(code, `closing due to error ${e.message}`),
-              1000
+              1000,
             );
           }
           break;
-- 
cgit v1.2.3