refactor: move addFriend to db.ts

Author: Miodec

frontend/src/ts/components/pages/profile/UserDetails.tsx

@@ -15,10 +15,9 @@ import { formatDistanceToNowStrict } from "date-fns/formatDistanceToNowStrict";
 import { createEffect, createSignal, For, JSXElement, Show } from "solid-js";
 
 import { Snapshot } from "../../../constants/default-snapshot";
-import { isFriend } from "../../../db";
+import { addFriend, isFriend } from "../../../db";
 import * as EditProfileModal from "../../../modals/edit-profile";
 import * as UserReportModal from "../../../modals/user-report";
-import { addFriend } from "../../../pages/friends";
 import { bp } from "../../../states/breakpoints";
 import { getUserId, isLoggedIn } from "../../../states/core";
 import {

frontend/src/ts/db.ts

@@ -1145,6 +1145,34 @@ function convertConnections(
   );
 }
 
+export function getReceiverUid(
+  connection: Pick<Connection, "initiatorUid" | "receiverUid">,
+): string {
+  const me = getAuthenticatedUser();
+  if (me === null) {
+    throw new Error("expected to be authenticated in getReceiverUid");
+  }
+
+  if (me.uid === connection.initiatorUid) return connection.receiverUid;
+  return connection.initiatorUid;
+}
+
+export async function addFriend(receiverName: string): Promise<true | string> {
+  const result = await Ape.connections.create({ body: { receiverName } });
+
+  if (result.status !== 200) {
+    return `Friend request failed: ${result.body.message}`;
+  } else {
+    const snapshot = getSnapshot();
+    if (snapshot !== undefined) {
+      const receiverUid = getReceiverUid(result.body.data);
+      // oxlint-disable-next-line no-unsafe-member-access
+      snapshot.connections[receiverUid] = result.body.data.status;
+    }
+    return true;
+  }
+}
+
 export function isFriend(uid: string | undefined): boolean {
   if (uid === undefined || uid === getAuthenticatedUser()?.uid) return false;
 

frontend/src/ts/elements/account-settings/blocked-user-table.ts

@@ -3,8 +3,8 @@ import { Connection } from "@monkeytype/schemas/connections";
 import Ape from "../../ape";
 import { format } from "date-fns/format";
 import { isAuthenticated } from "../../firebase";
-import { getReceiverUid } from "../../pages/friends";
 import * as DB from "../../db";
+import { getReceiverUid } from "../../db";
 import { qsr } from "../../utils/dom";
 
 let blockedUsers: Connection[] = [];

frontend/src/ts/pages/friends.ts

@@ -26,6 +26,7 @@ import { getAvatarElement } from "../utils/discord-avatar";
 import { formatTypingStatsRatio } from "../utils/misc";
 import { getLanguageDisplayString } from "../utils/strings";
 import * as DB from "../db";
+import { addFriend, getReceiverUid } from "../db";
 import { getAuthenticatedUser } from "../firebase";
 import * as ServerConfiguration from "../ape/server-configuration";
 import { authEvent } from "../events/auth";
@@ -42,35 +43,6 @@ let friendsTable: SortedTable<Friend> | undefined = undefined;
 let pendingRequests: Connection[] | undefined;
 let friendsList: Friend[] | undefined;
 
-export function getReceiverUid(
-  connection: Pick<Connection, "initiatorUid" | "receiverUid">,
-): string {
-  const me = getAuthenticatedUser();
-  if (me === null) {
-    throw new Error("expected to be authenticated in getReceiverUid");
-  }
-
-  if (me.uid === connection.initiatorUid) return connection.receiverUid;
-  return connection.initiatorUid;
-}
-
-export async function addFriend(receiverName: string): Promise<true | string> {
-  const result = await Ape.connections.create({ body: { receiverName } });
-
-  if (result.status !== 200) {
-    return `Friend request failed: ${result.body.message}`;
-  } else {
-    const snapshot = DB.getSnapshot();
-    if (snapshot !== undefined) {
-      const receiverUid = getReceiverUid(result.body.data);
-      // oxlint-disable-next-line no-unsafe-member-access
-      snapshot.connections[receiverUid] = result.body.data.status;
-      updatePendingConnections();
-    }
-    return true;
-  }
-}
-
 const addFriendModal = new SimpleModal({
   id: "addFriend",
   title: "Add a friend",
@@ -94,6 +66,7 @@ const addFriendModal = new SimpleModal({
     const result = await addFriend(receiverName);
 
     if (result === true) {
+      updatePendingConnections();
       return { status: "success", message: `Request sent to ${receiverName}` };
     }