HoovesSocial/hippofish
2
0
Fork 0
Code Issues 3 Pull requests 1 Projects Releases Packages Wiki Activity Actions

fix (backend): replace deprecated exist method

Browse source
This commit is contained in:
naskya 2024-06-02 07:23:07 +09:00
parent c64119108e
commit 071ba83704
No known key found for this signature in database
GPG key ID: 712D413B3A9FED5C
25 changed files with 99 additions and 146 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
packages/backend/src/server/api/common/read-messaging-message.ts
View file

@ -68,12 +68,10 @@ export async function readUserMessagingMessage(
await sendPushNotification(userId, PushNotificationKind.ReadAllChats, {}); await sendPushNotification(userId, PushNotificationKind.ReadAllChats, {});
} else { } else {
// そのユーザーとのメッセージで未読がなければイベント発行 // そのユーザーとのメッセージで未読がなければイベント発行
const hasUnread = await MessagingMessages.exists({ const hasUnread = await MessagingMessages.existsBy({
where: { userId: otherpartyId,
userId: otherpartyId, recipientId: userId,
recipientId: userId, isRead: false,
isRead: false,
},
}); });
if (!hasUnread) { if (!hasUnread) {

4
packages/backend/src/server/api/endpoints/admin/promo/create.ts
View file

@ -40,9 +40,9 @@ export default define(meta, paramDef, async (ps, user) => {
throw err; throw err;
}); });
const exist = await PromoNotes.exist({ where: { noteId: note.id } }); const exists = await PromoNotes.existsBy({ noteId: note.id });
if (exist) { if (exists) {
throw new ApiError(meta.errors.alreadyPromoted); throw new ApiError(meta.errors.alreadyPromoted);
} }

14
packages/backend/src/server/api/endpoints/auth/accept.ts
View file

@ -2,7 +2,7 @@ import * as crypto from "node:crypto";
import define from "@/server/api/define.js"; import define from "@/server/api/define.js";
import { ApiError } from "@/server/api/error.js"; import { ApiError } from "@/server/api/error.js";
import { AuthSessions, AccessTokens, Apps } from "@/models/index.js"; import { AuthSessions, AccessTokens, Apps } from "@/models/index.js";
import { genId, generateSecureRandomString } from "backend-rs"; import { genIdAt, generateSecureRandomString } from "backend-rs";
export const meta = { export const meta = {
tags: ["auth"], tags: ["auth"],
@ -40,14 +40,12 @@ export default define(meta, paramDef, async (ps, user) => {
const accessToken = generateSecureRandomString(32); const accessToken = generateSecureRandomString(32);
// Fetch exist access token // Fetch exist access token
const exist = await AccessTokens.exists({ const exists = await AccessTokens.existsBy({
where: { appId: session.appId,
appId: session.appId, userId: user.id,
userId: user.id,
},
}); });
if (!exist) { if (!exists) {
// Lookup app // Lookup app
const app = await Apps.findOneByOrFail({ id: session.appId }); const app = await Apps.findOneByOrFail({ id: session.appId });
@ -60,7 +58,7 @@ export default define(meta, paramDef, async (ps, user) => {
// Insert access token doc // Insert access token doc
await AccessTokens.insert({ await AccessTokens.insert({
id: genId(), id: genIdAt(now),
createdAt: now, createdAt: now,
lastUsedAt: now, lastUsedAt: now,
appId: session.appId, appId: session.appId,

10
packages/backend/src/server/api/endpoints/blocking/create.ts
View file

@ -69,14 +69,12 @@ export default define(meta, paramDef, async (ps, user) => {
}); });
// Check if already blocking // Check if already blocking
const exist = await Blockings.exist({ const exists = await Blockings.existsBy({
where: { blockerId: blocker.id,
blockerId: blocker.id, blockeeId: blockee.id,
blockeeId: blockee.id,
},
}); });
if (exist) { if (exists) {
throw new ApiError(meta.errors.alreadyBlocking); throw new ApiError(meta.errors.alreadyBlocking);
} }

10
packages/backend/src/server/api/endpoints/blocking/delete.ts
View file

@ -69,14 +69,12 @@ export default define(meta, paramDef, async (ps, user) => {
}); });
// Check not blocking // Check not blocking
const exist = await Blockings.exist({ const exists = await Blockings.existsBy({
where: { blockerId: blocker.id,
blockerId: blocker.id, blockeeId: blockee.id,
blockeeId: blockee.id,
},
}); });
if (!exist) { if (!exists) {
throw new ApiError(meta.errors.notBlocking); throw new ApiError(meta.errors.notBlocking);
} }

10
packages/backend/src/server/api/endpoints/clips/add-note.ts
View file

@ -57,14 +57,12 @@ export default define(meta, paramDef, async (ps, user) => {
throw err; throw err;
}); });
const exist = await ClipNotes.exist({ const exists = await ClipNotes.existsBy({
where: { noteId: note.id,
noteId: note.id, clipId: clip.id,
clipId: clip.id,
},
}); });
if (exist) { if (exists) {
throw new ApiError(meta.errors.alreadyClipped); throw new ApiError(meta.errors.alreadyClipped);
} }

10
packages/backend/src/server/api/endpoints/drive/files/check-existence.ts
View file

@ -26,12 +26,8 @@ export const paramDef = {
} as const; } as const;
export default define(meta, paramDef, async (ps, user) => { export default define(meta, paramDef, async (ps, user) => {
const exist = await DriveFiles.exist({ return await DriveFiles.existsBy({
where: { md5: ps.md5,
md5: ps.md5, userId: user.id,
userId: user.id,
},
}); });
return exist;
}); });

10
packages/backend/src/server/api/endpoints/following/create.ts
View file

@ -82,14 +82,12 @@ export default define(meta, paramDef, async (ps, user) => {
}); });
// Check if already following // Check if already following
const exist = await Followings.exist({ const exists = await Followings.existsBy({
where: { followerId: follower.id,
followerId: follower.id, followeeId: followee.id,
followeeId: followee.id,
},
}); });
if (exist) { if (exists) {
throw new ApiError(meta.errors.alreadyFollowing); throw new ApiError(meta.errors.alreadyFollowing);
} }

10
packages/backend/src/server/api/endpoints/following/delete.ts
View file

@ -69,14 +69,12 @@ export default define(meta, paramDef, async (ps, user) => {
}); });
// Check not following // Check not following
const exist = await Followings.exist({ const exists = await Followings.existsBy({
where: { followerId: follower.id,
followerId: follower.id, followeeId: followee.id,
followeeId: followee.id,
},
}); });
if (!exist) { if (!exists) {
throw new ApiError(meta.errors.notFollowing); throw new ApiError(meta.errors.notFollowing);
} }

10
packages/backend/src/server/api/endpoints/following/invalidate.ts
View file

@ -69,14 +69,12 @@ export default define(meta, paramDef, async (ps, user) => {
}); });
// Check not following // Check not following
const exist = await Followings.exist({ const exists = await Followings.existsBy({
where: { followerId: follower.id,
followerId: follower.id, followeeId: followee.id,
followeeId: followee.id,
},
}); });
if (!exist) { if (!exists) {
throw new ApiError(meta.errors.notFollowing); throw new ApiError(meta.errors.notFollowing);
} }

10
packages/backend/src/server/api/endpoints/gallery/posts/like.ts
View file

@ -40,14 +40,12 @@ export default define(meta, paramDef, async (ps, user) => {
} }
// if already liked // if already liked
const exist = await GalleryLikes.exist({ const exists = await GalleryLikes.existsBy({
where: { postId: post.id,
postId: post.id, userId: user.id,
userId: user.id,
},
}); });
if (exist) { if (exists) {
throw new ApiError(meta.errors.alreadyLiked); throw new ApiError(meta.errors.alreadyLiked);
} }

14
packages/backend/src/server/api/endpoints/i/read-announcement.ts
View file

@ -30,20 +30,18 @@ export const paramDef = {
export default define(meta, paramDef, async (ps, user) => { export default define(meta, paramDef, async (ps, user) => {
// Check if announcement exists // Check if announcement exists
const exist = await Announcements.exist({ const exists = await Announcements.existsBy({
where: { id: ps.announcementId }, id: ps.announcementId,
}); });
if (!exist) { if (!exists) {
throw new ApiError(meta.errors.noSuchAnnouncement); throw new ApiError(meta.errors.noSuchAnnouncement);
} }
// Check if already read // Check if already read
const read = await AnnouncementReads.exist({ const read = await AnnouncementReads.existsBy({
where: { announcementId: ps.announcementId,
announcementId: ps.announcementId, userId: user.id,
userId: user.id,
},
}); });
if (read) { if (read) {

4
packages/backend/src/server/api/endpoints/i/revoke-token.ts
View file

@ -17,9 +17,9 @@ export const paramDef = {
} as const; } as const;
export default define(meta, paramDef, async (ps, user) => { export default define(meta, paramDef, async (ps, user) => {
const exist = await AccessTokens.exist({ where: { id: ps.tokenId } }); const exists = await AccessTokens.existsBy({ id: ps.tokenId });
if (exist) { if (exists) {
await AccessTokens.delete({ await AccessTokens.delete({
id: ps.tokenId, id: ps.tokenId,
userId: user.id, userId: user.id,

10
packages/backend/src/server/api/endpoints/mute/create.ts
View file

@ -64,14 +64,12 @@ export default define(meta, paramDef, async (ps, user) => {
}); });
// Check if already muting // Check if already muting
const exist = await Mutings.exist({ const exists = await Mutings.existsBy({
where: { muterId: muter.id,
muterId: muter.id, muteeId: mutee.id,
muteeId: mutee.id,
},
}); });
if (exist) { if (exists) {
throw new ApiError(meta.errors.alreadyMuting); throw new ApiError(meta.errors.alreadyMuting);
} }

16
packages/backend/src/server/api/endpoints/notes/create.ts
View file

@ -233,11 +233,9 @@ export default define(meta, paramDef, async (ps, user) => {
// Check blocking // Check blocking
if (renote.userId !== user.id) { if (renote.userId !== user.id) {
const isBlocked = await Blockings.exists({ const isBlocked = await Blockings.existsBy({
where: { blockerId: renote.userId,
blockerId: renote.userId, blockeeId: user.id,
blockeeId: user.id,
},
}); });
if (isBlocked) { if (isBlocked) {
throw new ApiError(meta.errors.youHaveBeenBlocked); throw new ApiError(meta.errors.youHaveBeenBlocked);
@ -260,11 +258,9 @@ export default define(meta, paramDef, async (ps, user) => {
// Check blocking // Check blocking
if (reply.userId !== user.id) { if (reply.userId !== user.id) {
const isBlocked = await Blockings.exists({ const isBlocked = await Blockings.existsBy({
where: { blockerId: reply.userId,
blockerId: reply.userId, blockeeId: user.id,
blockeeId: user.id,
},
}); });
if (isBlocked) { if (isBlocked) {
throw new ApiError(meta.errors.youHaveBeenBlocked); throw new ApiError(meta.errors.youHaveBeenBlocked);

10
packages/backend/src/server/api/endpoints/notes/favorites/create.ts
View file

@ -43,14 +43,12 @@ export default define(meta, paramDef, async (ps, user) => {
}); });
// if already favorited // if already favorited
const exist = await NoteFavorites.exist({ const exists = await NoteFavorites.existsBy({
where: { noteId: note.id,
noteId: note.id, userId: user.id,
userId: user.id,
},
}); });
if (exist) { if (exists) {
throw new ApiError(meta.errors.alreadyFavorited); throw new ApiError(meta.errors.alreadyFavorited);
} }

10
packages/backend/src/server/api/endpoints/pages/like.ts
View file

@ -40,14 +40,12 @@ export default define(meta, paramDef, async (ps, user) => {
} }
// if already liked // if already liked
const exist = await PageLikes.exist({ const exists = await PageLikes.existsBy({
where: { pageId: page.id,
pageId: page.id, userId: user.id,
userId: user.id,
},
}); });
if (exist) { if (exists) {
throw new ApiError(meta.errors.alreadyLiked); throw new ApiError(meta.errors.alreadyLiked);
} }

10
packages/backend/src/server/api/endpoints/promo/read.ts
View file

@ -33,14 +33,12 @@ export default define(meta, paramDef, async (ps, user) => {
throw err; throw err;
}); });
const exist = await PromoReads.exist({ const exists = await PromoReads.existsBy({
where: { noteId: note.id,
noteId: note.id, userId: user.id,
userId: user.id,
},
}); });
if (exist) { if (exists) {
return; return;
} }

10
packages/backend/src/server/api/endpoints/renote-mute/create.ts
View file

@ -47,14 +47,12 @@ export default define(meta, paramDef, async (ps, user) => {
}); });
// Check if already muting // Check if already muting
const exist = await RenoteMutings.exist({ const exists = await RenoteMutings.existsBy({
where: { muterId: muter.id,
muterId: muter.id, muteeId: mutee.id,
muteeId: mutee.id,
},
}); });
if (exist) { if (exists) {
throw new ApiError(meta.errors.alreadyMuting); throw new ApiError(meta.errors.alreadyMuting);
} }

8
packages/backend/src/server/api/endpoints/users/followers.ts
View file

@ -103,11 +103,9 @@ export default define(meta, paramDef, async (ps, me) => {
if (me == null) { if (me == null) {
throw new ApiError(meta.errors.forbidden); throw new ApiError(meta.errors.forbidden);
} else if (me.id !== user.id) { } else if (me.id !== user.id) {
const isFollowed = await Followings.exist({ const isFollowed = await Followings.existsBy({
where: { followeeId: user.id,
followeeId: user.id, followerId: me.id,
followerId: me.id,
},
}); });
if (!isFollowed) { if (!isFollowed) {
throw new ApiError(meta.errors.nullFollowers); throw new ApiError(meta.errors.nullFollowers);

8
packages/backend/src/server/api/endpoints/users/following.ts
View file

@ -102,11 +102,9 @@ export default define(meta, paramDef, async (ps, me) => {
if (me == null) { if (me == null) {
throw new ApiError(meta.errors.forbidden); throw new ApiError(meta.errors.forbidden);
} else if (me.id !== user.id) { } else if (me.id !== user.id) {
const isFollowing = await Followings.exist({ const isFollowing = await Followings.existsBy({
where: { followeeId: user.id,
followeeId: user.id, followerId: me.id,
followerId: me.id,
},
}); });
if (!isFollowing) { if (!isFollowing) {
throw new ApiError(meta.errors.cannot_find); throw new ApiError(meta.errors.cannot_find);

18
packages/backend/src/server/api/endpoints/users/lists/push.ts
View file

@ -70,25 +70,21 @@ export default define(meta, paramDef, async (ps, me) => {
// Check blocking // Check blocking
if (user.id !== me.id) { if (user.id !== me.id) {
const isBlocked = await Blockings.exist({ const isBlocked = await Blockings.existsBy({
where: { blockerId: user.id,
blockerId: user.id, blockeeId: me.id,
blockeeId: me.id,
},
}); });
if (isBlocked) { if (isBlocked) {
throw new ApiError(meta.errors.youHaveBeenBlocked); throw new ApiError(meta.errors.youHaveBeenBlocked);
} }
} }
const exist = await UserListJoinings.exist({ const exists = await UserListJoinings.existsBy({
where: { userListId: ps.listId,
userListId: ps.listId, userId: user.id,
userId: user.id,
},
}); });
if (exist) { if (exists) {
throw new ApiError(meta.errors.alreadyAdded); throw new ApiError(meta.errors.alreadyAdded);
} }

10
packages/backend/src/server/api/stream/channels/user-list.ts
View file

@ -22,13 +22,11 @@ export default class extends Channel {
this.listId = params.listId as string; this.listId = params.listId as string;
// Check existence and owner // Check existence and owner
const exist = await UserLists.exists({ const exists = await UserLists.existsBy({
where: { id: this.listId,
id: this.listId, userId: this.user!.id,
userId: this.user!.id,
},
}); });
if (!exist) return; if (!exists) return;
// Subscribe stream // Subscribe stream
this.subscriber.on(`userListStream:${this.listId}`, this.send); this.subscriber.on(`userListStream:${this.listId}`, this.send);

5
packages/backend/src/services/create-notification.ts
View file

@ -39,8 +39,9 @@ export async function createNotification(
(notifier.isSilenced || (notifier.isSilenced ||
(Users.isRemoteUser(notifier) && (Users.isRemoteUser(notifier) &&
(await isSilencedServer(notifier.host)))) && (await isSilencedServer(notifier.host)))) &&
!(await Followings.exists({ !(await Followings.existsBy({
where: { followerId: notifieeId, followeeId: data.notifierId }, followerId: notifieeId,
followeeId: data.notifierId,
})) }))
) )
return null; return null;

4
packages/backend/src/services/note/unread.ts
View file

@ -42,9 +42,9 @@ export async function insertNoteUnread(
// 2秒経っても既読にならなかったら「未読の投稿がありますよ」イベントを発行する // 2秒経っても既読にならなかったら「未読の投稿がありますよ」イベントを発行する
setTimeout(async () => { setTimeout(async () => {
const exist = await NoteUnreads.exist({ where: { id: unread.id } }); const exists = await NoteUnreads.existsBy({ id: unread.id });
if (!exist) return; if (!exists) return;
if (params.isMentioned) { if (params.isMentioned) {
publishMainStream(userId, "unreadMention", note.id); publishMainStream(userId, "unreadMention", note.id);