DatseMultimediaSites
/
Sharkey
mirror of https://activitypub.software/TransFem-org/Sharkey.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

normalize naming of `isPackedPureRenote` and `PackedPureRenote`

This commit is contained in:
Hazelnoot 2024-11-17 09:08:04 -05:00
parent faf1b3559a
commit 4b503f88e1
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/backend/src/core/entities/NoteEntityService.ts
View File

@ -16,7 +16,7 @@ import { bindThis } from '@/decorators.js';
import { DebounceLoader } from '@/misc/loader.js'; import { DebounceLoader } from '@/misc/loader.js';
import { IdService } from '@/core/IdService.js'; import { IdService } from '@/core/IdService.js';
import { ReactionsBufferingService } from '@/core/ReactionsBufferingService.js'; import { ReactionsBufferingService } from '@/core/ReactionsBufferingService.js';
import { isPureRenotePacked } from '@/misc/is-renote.js'; import { isPackedPureRenote } from '@/misc/is-renote.js';
import type { OnModuleInit } from '@nestjs/common'; import type { OnModuleInit } from '@nestjs/common';
import type { CacheService } from '../CacheService.js'; import type { CacheService } from '../CacheService.js';
import type { CustomEmojiService } from '../CustomEmojiService.js'; import type { CustomEmojiService } from '../CustomEmojiService.js';
@ -139,7 +139,7 @@ export class NoteEntityService implements OnModuleInit {
// Otherwise we can have empty notes on the timeline, which is not good. // Otherwise we can have empty notes on the timeline, which is not good.
// Notes are packed in depth-first order, so we can safely grab the "isHidden" property to avoid duplicated checks. // Notes are packed in depth-first order, so we can safely grab the "isHidden" property to avoid duplicated checks.
// This is pulled out to ensure that we check both the renote *and* the boosted note. // This is pulled out to ensure that we check both the renote *and* the boosted note.
if (packedNote.renote?.isHidden && isPureRenotePacked(packedNote)) { if (packedNote.renote?.isHidden && isPackedPureRenote(packedNote)) {
hide = true; hide = true;
} }

4
packages/backend/src/misc/is-renote.ts
View File

@ -69,7 +69,7 @@ type PackedQuote =
fileIds: NonNullable<Packed<'Note'>['fileIds']> fileIds: NonNullable<Packed<'Note'>['fileIds']>
}); });
type PurePackedRenote = PackedRenote & { type PackedPureRenote = PackedRenote & {
text: NonNullable<Packed<'Note'>['text']>; text: NonNullable<Packed<'Note'>['text']>;
cw: NonNullable<Packed<'Note'>['cw']>; cw: NonNullable<Packed<'Note'>['cw']>;
replyId: NonNullable<Packed<'Note'>['replyId']>; replyId: NonNullable<Packed<'Note'>['replyId']>;
@ -89,6 +89,6 @@ export function isQuotePacked(note: PackedRenote): note is PackedQuote {
(note.fileIds != null && note.fileIds.length > 0); (note.fileIds != null && note.fileIds.length > 0);
} }
export function isPureRenotePacked(note: Packed<'Note'>): note is PurePackedRenote { export function isPackedPureRenote(note: Packed<'Note'>): note is PackedPureRenote {
return isRenotePacked(note) && !isQuotePacked(note); return isRenotePacked(note) && !isQuotePacked(note);
} }