+
}
+ testId="chat-submit-button"
/>
diff --git a/app/features/friends/FriendRepository.server.test.ts b/app/features/friends/FriendRepository.server.test.ts
new file mode 100644
index 000000000..592e0e499
--- /dev/null
+++ b/app/features/friends/FriendRepository.server.test.ts
@@ -0,0 +1,465 @@
+import { afterEach, beforeEach, describe, expect, test } from "vitest";
+import { dbInsertUsers, dbReset } from "~/utils/Test";
+import * as FriendRepository from "./FriendRepository.server";
+
+const createFriendRequest = async ({
+ senderId,
+ receiverId,
+}: {
+ senderId: number;
+ receiverId: number;
+}) => {
+ await FriendRepository.insertFriendRequest({ senderId, receiverId });
+ const request = await FriendRepository.findFriendRequestBetween({
+ senderId,
+ receiverId,
+ });
+ return request!.id;
+};
+
+const createFriendship = async ({
+ senderId,
+ receiverId,
+}: {
+ senderId: number;
+ receiverId: number;
+}) => {
+ const requestId = await createFriendRequest({ senderId, receiverId });
+ await FriendRepository.insertFriendship({
+ userOneId: senderId,
+ userTwoId: receiverId,
+ friendRequestId: requestId,
+ });
+};
+
+describe("insertFriendRequest / findFriendRequestBetween", () => {
+ beforeEach(async () => {
+ await dbInsertUsers(3);
+ });
+
+ afterEach(() => {
+ dbReset();
+ });
+
+ test("finds request from sender to receiver", async () => {
+ await FriendRepository.insertFriendRequest({
+ senderId: 1,
+ receiverId: 2,
+ });
+
+ const result = await FriendRepository.findFriendRequestBetween({
+ senderId: 1,
+ receiverId: 2,
+ });
+
+ expect(result).toBeDefined();
+ expect(result!.id).toBeTypeOf("number");
+ });
+
+ test("finds request in reverse direction", async () => {
+ await FriendRepository.insertFriendRequest({
+ senderId: 1,
+ receiverId: 2,
+ });
+
+ const result = await FriendRepository.findFriendRequestBetween({
+ senderId: 2,
+ receiverId: 1,
+ });
+
+ expect(result).toBeDefined();
+ });
+
+ test("returns undefined for unrelated users", async () => {
+ await FriendRepository.insertFriendRequest({
+ senderId: 1,
+ receiverId: 2,
+ });
+
+ const result = await FriendRepository.findFriendRequestBetween({
+ senderId: 1,
+ receiverId: 3,
+ });
+
+ expect(result).toBeUndefined();
+ });
+});
+
+describe("findPendingSentRequests / findPendingReceivedRequests", () => {
+ beforeEach(async () => {
+ await dbInsertUsers(3);
+ });
+
+ afterEach(() => {
+ dbReset();
+ });
+
+ test("sent request appears in sender's sent requests", async () => {
+ await FriendRepository.insertFriendRequest({
+ senderId: 1,
+ receiverId: 2,
+ });
+
+ const result = await FriendRepository.findPendingSentRequests(1);
+
+ expect(result).toHaveLength(1);
+ expect(result[0].receiverId).toBe(2);
+ });
+
+ test("sent request appears in receiver's received requests", async () => {
+ await FriendRepository.insertFriendRequest({
+ senderId: 1,
+ receiverId: 2,
+ });
+
+ const result = await FriendRepository.findPendingReceivedRequests(2);
+
+ expect(result).toHaveLength(1);
+ expect(result[0].senderId).toBe(1);
+ });
+
+ test("does not appear in wrong user's requests", async () => {
+ await FriendRepository.insertFriendRequest({
+ senderId: 1,
+ receiverId: 2,
+ });
+
+ const sent = await FriendRepository.findPendingSentRequests(3);
+ const received = await FriendRepository.findPendingReceivedRequests(3);
+
+ expect(sent).toHaveLength(0);
+ expect(received).toHaveLength(0);
+ });
+});
+
+describe("countPendingSentRequests", () => {
+ beforeEach(async () => {
+ await dbInsertUsers(4);
+ });
+
+ afterEach(() => {
+ dbReset();
+ });
+
+ test("returns 0 with no requests", async () => {
+ const count = await FriendRepository.countPendingSentRequests(1);
+
+ expect(count).toBe(0);
+ });
+
+ test("returns correct count after inserting multiple requests", async () => {
+ await FriendRepository.insertFriendRequest({
+ senderId: 1,
+ receiverId: 2,
+ });
+ await FriendRepository.insertFriendRequest({
+ senderId: 1,
+ receiverId: 3,
+ });
+ await FriendRepository.insertFriendRequest({
+ senderId: 1,
+ receiverId: 4,
+ });
+
+ const count = await FriendRepository.countPendingSentRequests(1);
+
+ expect(count).toBe(3);
+ });
+});
+
+describe("deleteFriendRequest", () => {
+ beforeEach(async () => {
+ await dbInsertUsers(3);
+ });
+
+ afterEach(() => {
+ dbReset();
+ });
+
+ test("deletes request by sender", async () => {
+ const requestId = await createFriendRequest({
+ senderId: 1,
+ receiverId: 2,
+ });
+
+ await FriendRepository.deleteFriendRequest({ id: requestId, senderId: 1 });
+
+ const result = await FriendRepository.findFriendRequestBetween({
+ senderId: 1,
+ receiverId: 2,
+ });
+ expect(result).toBeUndefined();
+ });
+
+ test("does not delete when wrong senderId is used", async () => {
+ const requestId = await createFriendRequest({
+ senderId: 1,
+ receiverId: 2,
+ });
+
+ await FriendRepository.deleteFriendRequest({ id: requestId, senderId: 3 });
+
+ const result = await FriendRepository.findFriendRequestBetween({
+ senderId: 1,
+ receiverId: 2,
+ });
+ expect(result).toBeDefined();
+ });
+});
+
+describe("deleteFriendRequestByReceiver", () => {
+ beforeEach(async () => {
+ await dbInsertUsers(3);
+ });
+
+ afterEach(() => {
+ dbReset();
+ });
+
+ test("deletes request by receiver", async () => {
+ const requestId = await createFriendRequest({
+ senderId: 1,
+ receiverId: 2,
+ });
+
+ await FriendRepository.deleteFriendRequestByReceiver({
+ id: requestId,
+ receiverId: 2,
+ });
+
+ const result = await FriendRepository.findFriendRequestBetween({
+ senderId: 1,
+ receiverId: 2,
+ });
+ expect(result).toBeUndefined();
+ });
+});
+
+describe("insertFriendship / findFriendship / findFriendIds", () => {
+ beforeEach(async () => {
+ await dbInsertUsers(3);
+ });
+
+ afterEach(() => {
+ dbReset();
+ });
+
+ test("creates friendship and removes friend request", async () => {
+ const requestId = await createFriendRequest({
+ senderId: 2,
+ receiverId: 1,
+ });
+
+ await FriendRepository.insertFriendship({
+ userOneId: 2,
+ userTwoId: 1,
+ friendRequestId: requestId,
+ });
+
+ const friendship = await FriendRepository.findFriendship({
+ userOneId: 1,
+ userTwoId: 2,
+ });
+ expect(friendship).toBeDefined();
+
+ const pendingRequest = await FriendRepository.findFriendRequestBetween({
+ senderId: 2,
+ receiverId: 1,
+ });
+ expect(pendingRequest).toBeUndefined();
+ });
+
+ test("normalizes IDs so userOneId < userTwoId", async () => {
+ const requestId = await createFriendRequest({
+ senderId: 3,
+ receiverId: 1,
+ });
+
+ await FriendRepository.insertFriendship({
+ userOneId: 3,
+ userTwoId: 1,
+ friendRequestId: requestId,
+ });
+
+ const friendship = await FriendRepository.findFriendship({
+ userOneId: 1,
+ userTwoId: 3,
+ });
+ expect(friendship).toBeDefined();
+ });
+
+ test("findFriendIds returns friend's ID", async () => {
+ await createFriendship({ senderId: 1, receiverId: 2 });
+
+ const friendIds = await FriendRepository.findFriendIds(1);
+
+ expect(friendIds).toHaveLength(1);
+ expect(friendIds).toContain(2);
+ });
+
+ test("findFriendIds returns friend ID from both sides", async () => {
+ await createFriendship({ senderId: 1, receiverId: 2 });
+
+ const friendIdsOfUser2 = await FriendRepository.findFriendIds(2);
+
+ expect(friendIdsOfUser2).toHaveLength(1);
+ expect(friendIdsOfUser2).toContain(1);
+ });
+
+ test("findFriendIds returns empty array with no friends", async () => {
+ const friendIds = await FriendRepository.findFriendIds(1);
+
+ expect(friendIds).toHaveLength(0);
+ });
+});
+
+describe("deleteFriendship", () => {
+ beforeEach(async () => {
+ await dbInsertUsers(3);
+ });
+
+ afterEach(() => {
+ dbReset();
+ });
+
+ test("removes friendship", async () => {
+ await createFriendship({ senderId: 1, receiverId: 2 });
+
+ const friendship = await FriendRepository.findFriendship({
+ userOneId: 1,
+ userTwoId: 2,
+ });
+
+ await FriendRepository.deleteFriendship({
+ id: friendship!.id,
+ userId: 1,
+ });
+
+ const result = await FriendRepository.findFriendship({
+ userOneId: 1,
+ userTwoId: 2,
+ });
+ expect(result).toBeUndefined();
+ });
+
+ test("does not delete friendship user is not part of", async () => {
+ await createFriendship({ senderId: 1, receiverId: 2 });
+
+ const friendship = await FriendRepository.findFriendship({
+ userOneId: 1,
+ userTwoId: 2,
+ });
+
+ await FriendRepository.deleteFriendship({
+ id: friendship!.id,
+ userId: 3,
+ });
+
+ const result = await FriendRepository.findFriendship({
+ userOneId: 1,
+ userTwoId: 2,
+ });
+ expect(result).toBeDefined();
+ });
+});
+
+describe("findFriendRequestByIdAndReceiver", () => {
+ beforeEach(async () => {
+ await dbInsertUsers(3);
+ });
+
+ afterEach(() => {
+ dbReset();
+ });
+
+ test("returns sender ID when request exists for receiver", async () => {
+ const requestId = await createFriendRequest({
+ senderId: 1,
+ receiverId: 2,
+ });
+
+ const result = await FriendRepository.findFriendRequestByIdAndReceiver({
+ id: requestId,
+ receiverId: 2,
+ });
+
+ expect(result).toBeDefined();
+ expect(result!.senderId).toBe(1);
+ });
+
+ test("returns undefined for wrong receiver", async () => {
+ const requestId = await createFriendRequest({
+ senderId: 1,
+ receiverId: 2,
+ });
+
+ const result = await FriendRepository.findFriendRequestByIdAndReceiver({
+ id: requestId,
+ receiverId: 3,
+ });
+
+ expect(result).toBeUndefined();
+ });
+});
+
+describe("findMutualFriends", () => {
+ beforeEach(async () => {
+ await dbInsertUsers(4);
+ });
+
+ afterEach(() => {
+ dbReset();
+ });
+
+ test("returns mutual friend when two users share a common friend", async () => {
+ await createFriendship({ senderId: 1, receiverId: 3 });
+ await createFriendship({ senderId: 2, receiverId: 3 });
+
+ const mutuals = await FriendRepository.findMutualFriends({
+ loggedInUserId: 1,
+ targetUserId: 2,
+ });
+
+ expect(mutuals).toHaveLength(1);
+ expect(mutuals[0].id).toBe(3);
+ });
+
+ test("returns empty array when no common friends", async () => {
+ await createFriendship({ senderId: 1, receiverId: 3 });
+ await createFriendship({ senderId: 2, receiverId: 4 });
+
+ const mutuals = await FriendRepository.findMutualFriends({
+ loggedInUserId: 1,
+ targetUserId: 2,
+ });
+
+ expect(mutuals).toHaveLength(0);
+ });
+});
+
+describe("findByUserIdWithActivity", () => {
+ beforeEach(async () => {
+ await dbInsertUsers(3);
+ });
+
+ afterEach(() => {
+ dbReset();
+ });
+
+ test("returns friends with friendshipId and createdAt", async () => {
+ await createFriendship({ senderId: 1, receiverId: 2 });
+
+ const result = await FriendRepository.findByUserIdWithActivity(1);
+
+ const friendRow = result.find((r) => r.discordId === "1");
+ expect(friendRow).toBeDefined();
+ expect(friendRow!.friendshipId).toBeTypeOf("number");
+ expect(friendRow!.friendshipCreatedAt).toBeTypeOf("number");
+ });
+
+ test("returns empty array when user has no friends or team members", async () => {
+ const result = await FriendRepository.findByUserIdWithActivity(1);
+
+ expect(result).toHaveLength(0);
+ });
+});
diff --git a/app/features/sendouq/actions/q.server.ts b/app/features/sendouq/actions/q.server.ts
index c8932255a..af9a6b52b 100644
--- a/app/features/sendouq/actions/q.server.ts
+++ b/app/features/sendouq/actions/q.server.ts
@@ -37,14 +37,6 @@ export const action: ActionFunction = async ({ request }) => {
await refreshSendouQInstance();
- const createdGroup = SendouQ.findOwnGroup(user.id);
- if (createdGroup?.chatCode) {
- setGroupChatMetadata({
- chatCode: createdGroup.chatCode,
- members: createdGroup.members,
- });
- }
-
return redirect(
data.direct === "true" ? SENDOUQ_LOOKING_PAGE : SENDOUQ_PREPARING_PAGE,
);
diff --git a/app/features/sendouq/loaders/q.looking.server.ts b/app/features/sendouq/loaders/q.looking.server.ts
index 4094a2e8a..a943fb45c 100644
--- a/app/features/sendouq/loaders/q.looking.server.ts
+++ b/app/features/sendouq/loaders/q.looking.server.ts
@@ -46,6 +46,7 @@ export const loader = async ({ request }: LoaderFunctionArgs) => {
},
lastUpdated: Date.now(),
streamsCount: (await cachedStreams()).length,
- chatCode: ownGroup ? ownGroup.chatCode : null,
+ chatCode:
+ ownGroup && ownGroup.members.length > 1 ? ownGroup.chatCode : null,
};
};
diff --git a/app/features/settings/routes/settings.tsx b/app/features/settings/routes/settings.tsx
index d5558a03a..e47678c5a 100644
--- a/app/features/settings/routes/settings.tsx
+++ b/app/features/settings/routes/settings.tsx
@@ -131,6 +131,7 @@ export default function SettingsPage() {
+
{t("common:settings.themeInfo")}