OpenSource/Sharkey
OpenSource/Sharkey
1
0
Fork 0
mirror of https://activitypub.software/TransFem-org/Sharkey.git synced 2024-12-29 13:59:26 +01:00
Code Issues Projects Releases Packages Wiki Activity

merge: enforce restrictions for user's rss feed (!822)

Browse source 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/822

Approved-by: Charlotte <timo.herngreen@gmail.com>
Approved-by: Marie <github@yuugi.dev>
This commit is contained in:
Marie 2024-12-17 21:46:10 +00:00
commit 16822639e6
1 changed files with 23 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
packages/backend/src/server/web/FeedService.ts
View file

@ -48,7 +48,7 @@ export class FeedService {
const profile = await this.userProfilesRepository.findOneByOrFail({ userId: user.id }); const profile = await this.userProfilesRepository.findOneByOrFail({ userId: user.id });
const notes = await this.notesRepository.find({ const notes = user.requireSigninToViewContents ? [] : await this.notesRepository.find({
where: { where: {
userId: user.id, userId: user.id,
renoteId: IsNull(), renoteId: IsNull(),
@ -74,7 +74,16 @@ export class FeedService {
copyright: user.name ?? user.username, copyright: user.name ?? user.username,
}); });
const followersOnlyBefore = user.makeNotesFollowersOnlyBefore;
const hiddenBefore = user.makeNotesHiddenBefore;
for (const note of notes) { for (const note of notes) {
const createdAt = new Date(this.idService.parse(note.id).date);
if (this.shouldHideNote(followersOnlyBefore, createdAt) || this.shouldHideNote(hiddenBefore, createdAt)) {
continue;
}
const files = note.fileIds.length > 0 ? await this.driveFilesRepository.findBy({ const files = note.fileIds.length > 0 ? await this.driveFilesRepository.findBy({
id: In(note.fileIds), id: In(note.fileIds),
}) : []; }) : [];
@ -93,4 +102,17 @@ export class FeedService {
return feed; return feed;
} }
// this logic is copied from NoteEntityService.hideNote
private shouldHideNote(reference: number | null, createdAt: Date): boolean {
if ((reference !== null)
&& (
(reference <= 0 && (Date.now() - createdAt.getTime() > 0 - (reference * 1000)))
|| (reference > 0 && (createdAt.getTime() < reference * 1000))
)
) {
return true;
}
return false;
}
} }