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

merge: use the current resolver for quotes - #524 (!536)

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

Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
Approved-by: Marie <marie@kaifa.ch>
This commit is contained in:
Marie 2024-06-03 16:54:51 +00:00
commit b2088e60b7
3 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
packages/backend/src/core/NoteCreateService.ts
View file

@ -627,6 +627,14 @@ export class NoteCreateService implements OnApplicationShutdown {
userHost: user.host,
});
// should really not happen, but better safe than sorry
if (data.reply?.id === insert.id) {
throw new Error("A note can't reply to itself");
}
if (data.renote?.id === insert.id) {
throw new Error("A note can't renote itself");
}
if (data.uri != null) insert.uri = data.uri;
if (data.url != null) insert.url = data.url;

4
packages/backend/src/core/NoteEditService.ts
View file

@ -299,6 +299,10 @@ export class NoteEditService implements OnApplicationShutdown {
}
if (data.renote) {
if (data.renote.id === oldnote.id) {
throw new Error("A note can't renote itself");
}
switch (data.renote.visibility) {
case 'public':
// public noteは無条件にrenote可能

4
packages/backend/src/core/activitypub/models/ApNoteService.ts
View file

@ -251,7 +251,7 @@ export class ApNoteService {
> => {
if (typeof uri !== 'string' || !/^https?:/.test(uri)) return { status: 'permerror' };
try {
const res = await this.resolveNote(uri);
const res = await this.resolveNote(uri, { resolver });
if (res == null) return { status: 'permerror' };
return { status: 'ok', res };
} catch (e) {
@ -478,7 +478,7 @@ export class ApNoteService {
> => {
if (!/^https?:/.test(uri)) return { status: 'permerror' };
try {
const res = await this.resolveNote(uri);
const res = await this.resolveNote(uri, { resolver });
if (res == null) return { status: 'permerror' };
return { status: 'ok', res };
} catch (e) {