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

refactor: null check at initialization

Browse source
This commit is contained in:
Namekuji 2023-08-07 06:53:52 -04:00
parent 5475383d94
commit 52e9ba73df
No known key found for this signature in database
GPG key ID: 1D62332C07FBA532
1 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -23,7 +23,14 @@ import {
filterBlockedUser, filterBlockedUser,
filterMutedRenotes, filterMutedRenotes,
} from "@/db/scylla.js"; } from "@/db/scylla.js";
import { ChannelFollowingsCache, LocalFollowingsCache, RenoteMutingsCache, UserBlockedCache, UserMutingsCache, userWordMuteCache } from "@/misc/cache.js"; import {
ChannelFollowingsCache,
LocalFollowingsCache,
RenoteMutingsCache,
UserBlockedCache,
UserMutingsCache,
userWordMuteCache,
} from "@/misc/cache.js";
export const meta = { export const meta = {
tags: ["notes"], tags: ["notes"],
@ -90,12 +97,13 @@ export default define(meta, paramDef, async (ps, user) => {
const validUserIds = [user.id].concat(followingUserIds); const validUserIds = [user.id].concat(followingUserIds);
const userMutingsCache = await UserMutingsCache.init(user.id); const userMutingsCache = await UserMutingsCache.init(user.id);
const mutedUserIds = await userMutingsCache.getAll(); const mutedUserIds = await userMutingsCache.getAll();
const mutedWords = await userWordMuteCache.fetchMaybe(user.id, () => const mutedWords =
(await userWordMuteCache.fetchMaybe(user.id, () =>
UserProfiles.findOne({ UserProfiles.findOne({
select: ["mutedWords"], select: ["mutedWords"],
where: { userId: user.id }, where: { userId: user.id },
}).then((profile) => profile?.mutedWords), }).then((profile) => profile?.mutedWords),
); )) ?? [];
const blockedCache = await UserBlockedCache.init(user.id); const blockedCache = await UserBlockedCache.init(user.id);
const blockerIds = await blockedCache.getAll(); const blockerIds = await blockedCache.getAll();
const renoteMutingsCache = await RenoteMutingsCache.init(user.id); const renoteMutingsCache = await RenoteMutingsCache.init(user.id);
@ -109,7 +117,7 @@ export default define(meta, paramDef, async (ps, user) => {
filtered = await filterReply(filtered, ps.withReplies, user); filtered = await filterReply(filtered, ps.withReplies, user);
filtered = await filterVisibility(filtered, user, followingUserIds); filtered = await filterVisibility(filtered, user, followingUserIds);
filtered = await filterMutedUser(filtered, user, mutedUserIds); filtered = await filterMutedUser(filtered, user, mutedUserIds);
filtered = await filterMutedNote(filtered, user, mutedWords ?? []); filtered = await filterMutedNote(filtered, user, mutedWords);
filtered = await filterBlockedUser(filtered, user, blockerIds); filtered = await filterBlockedUser(filtered, user, blockerIds);
filtered = await filterMutedRenotes(filtered, user, renoteMutedIds); filtered = await filterMutedRenotes(filtered, user, renoteMutedIds);
if (!ps.includeMyRenotes) { if (!ps.includeMyRenotes) {