mirror/iceshrimp
1
0
Fork 0
mirror of https://iceshrimp.dev/iceshrimp/iceshrimp synced 2024-11-27 14:28:08 +09:00
Code Issues Actions Packages Projects Releases Wiki Activity

[backend] Use authenticated resolver for poll updates

Browse Source
This commit is contained in:
mia 2024-11-04 19:52:25 -08:00
parent 25ac7812ef
commit 3adb155ed4
No known key found for this signature in database
GPG Key ID: 3FB3CE1B30FCDCD2
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
packages/backend/src/remote/activitypub/models/question.ts
View File

@ -8,10 +8,8 @@ import type { IPoll } from "@/models/entities/poll.js";
export async function extractPollFromQuestion( export async function extractPollFromQuestion(
source: string | IObject, source: string | IObject,
resolver?: Resolver, resolver: Resolver,
): Promise<IPoll> { ): Promise<IPoll> {
if (resolver == null) resolver = new Resolver();
const question = await resolver.resolve(source); const question = await resolver.resolve(source);
if (!isQuestion(question)) { if (!isQuestion(question)) {
@ -52,7 +50,7 @@ export async function extractPollFromQuestion(
*/ */
export async function updateQuestion( export async function updateQuestion(
value: string | IQuestion, value: string | IQuestion,
resolver?: Resolver, resolver: Resolver,
): Promise<boolean> { ): Promise<boolean> {
const uri = typeof value === "string" ? value : getApId(value); const uri = typeof value === "string" ? value : getApId(value);
@ -68,8 +66,7 @@ export async function updateQuestion(
//#endregion //#endregion
// resolve new Question object // resolve new Question object
const _resolver = resolver ?? new Resolver(); const question = (await resolver.resolve(value)) as IQuestion;
const question = (await _resolver.resolve(value)) as IQuestion;
apLogger.debug(`fetched question: ${JSON.stringify(question, null, 2)}`); apLogger.debug(`fetched question: ${JSON.stringify(question, null, 2)}`);
if (question.type !== "Question") throw new Error("object is not a Question"); if (question.type !== "Question") throw new Error("object is not a Question");

6
packages/backend/src/server/api/endpoints/ap/show.ts
View File

@ -104,6 +104,8 @@ async function fetchAny(
if (await shouldBlockInstance(extractDbHost(uri))) return null; if (await shouldBlockInstance(extractDbHost(uri))) return null;
const dbResolver = new DbResolver(); const dbResolver = new DbResolver();
const resolver = new Resolver();
resolver.setUser(me);
const [user, note] = await Promise.all([ const [user, note] = await Promise.all([
dbResolver.getUserFromApId(uri), dbResolver.getUserFromApId(uri),
@ -115,7 +117,7 @@ async function fetchAny(
// Update questions if the stored (remote) note contains the poll // Update questions if the stored (remote) note contains the poll
const key = `pollFetched:${note.uri}`; const key = `pollFetched:${note.uri}`;
if ((await redisClient.exists(key)) === 0) { if ((await redisClient.exists(key)) === 0) {
if (await updateQuestion(note.uri)) { if (await updateQuestion(note.uri, resolver)) {
local.object.poll = await populatePoll(note, me?.id ?? null); local.object.poll = await populatePoll(note, me?.id ?? null);
} }
// Allow fetching the poll again after 1 minute // Allow fetching the poll again after 1 minute
@ -126,8 +128,6 @@ async function fetchAny(
} }
// fetching Object once from remote // fetching Object once from remote
const resolver = new Resolver();
resolver.setUser(me);
const object = await resolver.resolve(uri); const object = await resolver.resolve(uri);
// /@user If a URI other than the id is specified, // /@user If a URI other than the id is specified,