Leahnaya/sendou.ink
1
0
Fork 0
mirror of https://github.com/Sendouc/sendou.ink.git synced 2026-09-30 15:17:43 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix can't add friend to pick-up scrim with no friend code
Some checks are pending
E2E Tests / e2e (push) Waiting to run
Details
Tests and checks on push / run-checks-and-tests (push) Waiting to run
Details
Updates translation progress / update-translation-progress-issue (push) Waiting to run
Details

Browse Source
This commit is contained in:
Kalle
2026-05-14 07:20:58 +03:00
parent 460d74b655
commit 9278214d77
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/features/scrims/actions/scrims.new.server.ts
View File

@@ -161,7 +161,9 @@ async function validatePickup(userIds: number[], authorId: number) {
async function validatePickupFriends(userIds: number[], authorId: number) {
const unconsentingUsers: string[] = [];
const friendsData = await SQGroupRepository.friendsAndTeammates(authorId);
const friendsData = await SQGroupRepository.friendsAndTeammates(authorId, {
requireFriendCode: false,
});
for (const userId of userIds) {
const user = await UserRepository.findLeanById(userId);

13
app/features/sendouq/SQGroupRepository.server.ts
View File

@@ -417,7 +417,10 @@ export function rechallenge({
.execute();
}
export async function friendsAndTeammates(userId: number) {
export async function friendsAndTeammates(
userId: number,
{ requireFriendCode = true }: { requireFriendCode?: boolean } = {},
) {
const teams = await db
.selectFrom("TeamMemberWithSecondary")
.innerJoin("Team", "Team.id", "TeamMemberWithSecondary.teamId")
@@ -428,7 +431,9 @@ export async function friendsAndTeammates(userId: number) {
const rows = await db
.selectFrom("TeamMemberWithSecondary")
.innerJoin("User", "User.id", "TeamMemberWithSecondary.userId")
.innerJoin("UserFriendCode", "UserFriendCode.userId", "User.id")
.$if(requireFriendCode, (qb) =>
qb.innerJoin("UserFriendCode", "UserFriendCode.userId", "User.id"),
)
.select([
...COMMON_USER_FIELDS,
"User.inGameName",
@@ -456,7 +461,9 @@ export async function friendsAndTeammates(userId: number) {
]),
),
)
.innerJoin("UserFriendCode", "UserFriendCode.userId", "User.id")
.$if(requireFriendCode, (qb) =>
qb.innerJoin("UserFriendCode", "UserFriendCode.userId", "User.id"),
)
.select([
...COMMON_USER_FIELDS,
"User.inGameName",