Leahnaya/sendou.ink
1
0
Fork 0
mirror of https://github.com/Sendouc/sendou.ink.git synced 2026-08-23 11:36:19 -05:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Get current user id via ALS in ChatSystemMessage

Browse Source
This commit is contained in:
Kalle
2026-06-21 13:54:24 +03:00
parent 9df09bf4d5
commit 9d6030d17d
10 changed files with 21 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/features/auth/core/user.server.ts
View File

@@ -1,6 +1,10 @@
import { IMPERSONATED_SESSION_KEY, SESSION_KEY } from "./authenticator.server";
import { authSessionStorage } from "./session.server";
import { type AuthenticatedUser, getUserContext } from "./user-context.server";
import {
type AuthenticatedUser,
getUserContext,
userAsyncLocalStorage,
} from "./user-context.server";
export type { AuthenticatedUser };
@@ -32,6 +36,13 @@ export function actorIdOrNull(): number | null {
return getUser()?.id ?? null;
}
/** Id of the acting user, or null when there is no actor *or* no request
* context at all (e.g. cron routines). Never throws, unlike actorIdOrNull —
* use for ambient side effects that may also run outside of a request. */
export function actorIdOrNullSafe(): number | null {
return userAsyncLocalStorage.getStore()?.user?.id ?? null;
}
export async function isImpersonating(request: Request) {
const session = await authSessionStorage.getSession(
request.headers.get("Cookie"),

3
app/features/chat/ChatSystemMessage.server.ts
View File

@@ -1,6 +1,7 @@
import { add } from "date-fns";
import { nanoid } from "nanoid";
import { ServerConfig } from "~/config.server";
import { actorIdOrNullSafe } from "~/features/auth/core/user.server";
import * as UserRepository from "~/features/user-page/UserRepository.server";
import { IS_E2E_TEST_RUN } from "~/utils/e2e";
import invariant from "~/utils/invariant";
@@ -60,7 +61,7 @@ export const send: ChatSystemMessageService["send"] = (partialMsg) => {
context: partialMsg.context,
type: partialMsg.type,
revalidateOnly: partialMsg.revalidateOnly,
authorUserId: partialMsg.authorUserId,
authorUserId: partialMsg.authorUserId ?? actorIdOrNullSafe() ?? undefined,
};
});

19
app/features/scrims/actions/scrims.$id.server.ts
View File

@@ -103,7 +103,7 @@ export const action = async ({ request, params }: ActionFunctionArgs) => {
serializedPool,
});
broadcastRevalidate({ post, user });
broadcastRevalidate(post);
break;
}
case "REMOVE_MAP_LIST": {
@@ -111,7 +111,7 @@ export const action = async ({ request, params }: ActionFunctionArgs) => {
await ScrimMapListRepository.deleteMapList(post.id, viewerSide);
broadcastRevalidate({ post, user });
broadcastRevalidate(post);
break;
}
case "REPORT_MAP": {
@@ -127,7 +127,7 @@ export const action = async ({ request, params }: ActionFunctionArgs) => {
winnerSide: data.winnerSide,
});
broadcastRevalidate({ post, user });
broadcastRevalidate(post);
break;
}
case "UNDO_MAP": {
@@ -138,7 +138,7 @@ export const action = async ({ request, params }: ActionFunctionArgs) => {
await ScrimMapRepository.undoMostRecentMap(post.id);
broadcastRevalidate({ post, user });
broadcastRevalidate(post);
break;
}
case "REPLAY_MAP": {
@@ -203,18 +203,13 @@ async function loadMapByMapContext({
return { viewerSide: viewerSide!, maps, mapLists };
}
function broadcastRevalidate({
post,
user,
}: {
post: NonNullable<Awaited<ReturnType<typeof ScrimPostRepository.findById>>>;
user: ReturnType<typeof requireUser>;
}) {
function broadcastRevalidate(
post: NonNullable<Awaited<ReturnType<typeof ScrimPostRepository.findById>>>,
) {
if (!post.chatCode) return;
ChatSystemMessage.send({
room: post.chatCode,
revalidateOnly: true,
authorUserId: user.id,
});
}

8
app/features/sendouq-match/actions/q.match.$id.server.ts
View File

@@ -103,7 +103,6 @@ export const action = async ({ request, params }: ActionFunctionArgs) => {
ChatSystemMessage.send({
room: match.chatCode,
revalidateOnly: true,
authorUserId: user.id,
});
}
}
@@ -156,7 +155,6 @@ export const action = async ({ request, params }: ActionFunctionArgs) => {
ChatSystemMessage.send({
room: match.chatCode,
revalidateOnly: true,
authorUserId: user.id,
});
}
@@ -164,7 +162,6 @@ export const action = async ({ request, params }: ActionFunctionArgs) => {
ChatSystemMessage.send({
room: SENDOUQ_LOOKING_ROOM,
revalidateOnly: true,
authorUserId: user.id,
});
break;
@@ -237,7 +234,6 @@ export const action = async ({ request, params }: ActionFunctionArgs) => {
ChatSystemMessage.send({
room: SENDOUQ_LOOKING_ROOM,
revalidateOnly: true,
authorUserId: user.id,
});
}
@@ -245,7 +241,6 @@ export const action = async ({ request, params }: ActionFunctionArgs) => {
ChatSystemMessage.send({
room: match.chatCode,
revalidateOnly: true,
authorUserId: user.id,
});
}
@@ -297,7 +292,6 @@ export const action = async ({ request, params }: ActionFunctionArgs) => {
ChatSystemMessage.send({
room: match.chatCode,
revalidateOnly: true,
authorUserId: user.id,
});
}
@@ -322,7 +316,6 @@ export const action = async ({ request, params }: ActionFunctionArgs) => {
ChatSystemMessage.send({
room: match.chatCode,
revalidateOnly: true,
authorUserId: user.id,
});
}
@@ -402,7 +395,6 @@ export const action = async ({ request, params }: ActionFunctionArgs) => {
ChatSystemMessage.send({
room: match.chatCode,
revalidateOnly: true,
authorUserId: user.id,
});
}

5
app/features/sendouq/actions/q.looking.server.ts
View File

@@ -37,14 +37,12 @@ export const action: ActionFunction = async ({ request }) => {
ChatSystemMessage.send({
room: SENDOUQ_LOOKING_ROOM,
revalidateOnly: true,
authorUserId: user.id,
});
const revalidateGroupTopic = (groupId: number) =>
ChatSystemMessage.send({
room: sqGroupWebsocketRoom(groupId),
revalidateOnly: true,
authorUserId: user.id,
});
const notifyLikeReceived = (groupId: number) =>
@@ -52,7 +50,6 @@ export const action: ActionFunction = async ({ request }) => {
room: sqGroupWebsocketRoom(groupId),
type: "LIKE_RECEIVED",
revalidateOnly: true,
authorUserId: user.id,
});
try {
@@ -215,13 +212,11 @@ export const action: ActionFunction = async ({ request }) => {
room: sqGroupWebsocketRoom(ownGroup.id),
type: "MATCH_STARTED",
revalidateOnly: true,
authorUserId: user.id,
},
{
room: sqGroupWebsocketRoom(theirGroup.id),
type: "MATCH_STARTED",
revalidateOnly: true,
authorUserId: user.id,
},
]);

3
app/features/sendouq/actions/q.preparing.server.ts
View File

@@ -44,7 +44,6 @@ export const action = async ({ request }: ActionFunctionArgs) => {
ChatSystemMessage.send({
room: SENDOUQ_LOOKING_ROOM,
revalidateOnly: true,
authorUserId: user.id,
});
return redirect(SENDOUQ_LOOKING_PAGE);
@@ -78,7 +77,6 @@ export const action = async ({ request }: ActionFunctionArgs) => {
ChatSystemMessage.send({
room: chatCodeToRevalidate,
revalidateOnly: true,
authorUserId: user.id,
});
}
@@ -95,7 +93,6 @@ export const action = async ({ request }: ActionFunctionArgs) => {
ChatSystemMessage.send({
room: sqGroupWebsocketRoom(ownGroup.id),
revalidateOnly: true,
authorUserId: user.id,
});
notify({

5
app/features/sendouq/actions/q.server.ts
View File

@@ -54,7 +54,6 @@ export const action: ActionFunction = async ({ request, url }) => {
ChatSystemMessage.send({
room: chatCodeToRevalidate,
revalidateOnly: true,
authorUserId: user.id,
});
}
@@ -66,7 +65,6 @@ export const action: ActionFunction = async ({ request, url }) => {
ChatSystemMessage.send({
room: SENDOUQ_LOOKING_ROOM,
revalidateOnly: true,
authorUserId: user.id,
});
}
@@ -100,7 +98,6 @@ export const action: ActionFunction = async ({ request, url }) => {
ChatSystemMessage.send({
room: chatCodeToRevalidate,
revalidateOnly: true,
authorUserId: user.id,
});
}
@@ -120,7 +117,6 @@ export const action: ActionFunction = async ({ request, url }) => {
ChatSystemMessage.send({
room: sqGroupWebsocketRoom(groupInvitedTo.id),
revalidateOnly: true,
authorUserId: user.id,
});
} else {
// Joining an active group changes its size/suitability for the whole
@@ -129,7 +125,6 @@ export const action: ActionFunction = async ({ request, url }) => {
ChatSystemMessage.send({
room: SENDOUQ_LOOKING_ROOM,
revalidateOnly: true,
authorUserId: user.id,
});
}

5
app/features/tournament-admin/actions/to.$id.admin.index.server.ts
View File

@@ -123,7 +123,6 @@ export const action: ActionFunction = async ({ request, params }) => {
sendDroppedMatchChatMessages({
tournamentId: tournament.ctx.id,
endedMatchIds,
authorUserId: user.id,
});
break;
@@ -196,11 +195,9 @@ async function dropTeamOut({
function sendDroppedMatchChatMessages({
tournamentId,
endedMatchIds,
authorUserId,
}: {
tournamentId: number;
endedMatchIds: number[];
authorUserId: number;
}) {
if (endedMatchIds.length === 0) return;
@@ -209,13 +206,11 @@ function sendDroppedMatchChatMessages({
room: tournamentMatchWebsocketRoom(matchId),
type: "TOURNAMENT_MATCH_UPDATED" as const,
revalidateOnly: true as const,
authorUserId,
})),
{
room: tournamentWebsocketRoom(tournamentId),
type: "TOURNAMENT_UPDATED" as const,
revalidateOnly: true as const,
authorUserId,
},
]);
}

1
app/features/tournament-bracket/actions/to.$id.brackets.server.ts
View File

@@ -348,7 +348,6 @@ export const action: ActionFunction = async ({ params, request }) => {
room: tournamentWebsocketRoom(tournament.ctx.id),
type: "TOURNAMENT_UPDATED",
revalidateOnly: true,
authorUserId: user.id,
},
]);
}

3
app/features/tournament-match/actions/to.$id.matches.$mid.server.ts
View File

@@ -882,13 +882,11 @@ export const action: ActionFunction = async ({ params, request }) => {
room: tournamentMatchWebsocketRoom(matchId),
type: "TOURNAMENT_MATCH_UPDATED",
revalidateOnly: true,
authorUserId: user.id,
},
...otherMatchIdsToRevalidate.map((id) => ({
room: tournamentMatchWebsocketRoom(id),
type: "TOURNAMENT_MATCH_UPDATED" as const,
revalidateOnly: true as const,
authorUserId: user.id,
})),
]);
}
@@ -898,7 +896,6 @@ export const action: ActionFunction = async ({ params, request }) => {
room: tournamentWebsocketRoom(tournament.ctx.id),
type: "TOURNAMENT_UPDATED",
revalidateOnly: true,
authorUserId: user.id,
},
]);
}