Fixed 267U.pre2

This commit is contained in:
2026-07-26 18:25:37 +09:00
parent 50bfaeafdf
commit 317d00a284
1286 changed files with 80222 additions and 1 deletions
@@ -0,0 +1,36 @@
import define from "../../define.js";
import Resolver from "../../../../remote/activitypub/resolver.js";
import { HOUR } from "../../../../const.js";
export const meta = {
tags: [
"federation"
],
requireCredential: true,
requireAdmin: true,
limit: {
duration: HOUR,
max: 30
},
errors: {},
res: {
type: "object",
optional: false,
nullable: false
}
};
export const paramDef = {
type: "object",
properties: {
uri: {
type: "string"
}
},
required: [
"uri"
]
};
export default define(meta, paramDef, async (ps)=>{
const resolver = new Resolver();
const object = await resolver.resolve(ps.uri);
return object;
});
@@ -0,0 +1,157 @@
import define from "../../define.js";
import { createPerson } from "../../../../remote/activitypub/models/person.js";
import { createNote } from "../../../../remote/activitypub/models/note.js";
import DbResolver from "../../../../remote/activitypub/db-resolver.js";
import Resolver from "../../../../remote/activitypub/resolver.js";
import { ApiError } from "../../error.js";
import { extractDbHost } from "../../../../misc/convert-host.js";
import { Users, Notes } from "../../../../models/index.js";
import { isActor, isPost, getApId } from "../../../../remote/activitypub/type.js";
import { MINUTE } from "../../../../const.js";
import { shouldBlockInstance } from "../../../../misc/should-block-instance.js";
import { updateQuestion } from "../../../../remote/activitypub/models/question.js";
import { populatePoll } from "../../../../models/repositories/note.js";
import { redisClient } from "../../../../db/redis.js";
export const meta = {
tags: [
"federation"
],
requireCredential: true,
limit: {
duration: MINUTE,
max: 10
},
errors: {
noSuchObject: {
message: "No such object.",
code: "NO_SUCH_OBJECT",
id: "dc94d745-1262-4e63-a17d-fecaa57efc82"
}
},
res: {
optional: false,
nullable: false,
oneOf: [
{
type: "object",
properties: {
type: {
type: "string",
optional: false,
nullable: false,
enum: [
"User"
]
},
object: {
type: "object",
optional: false,
nullable: false,
ref: "UserDetailedNotMe"
}
}
},
{
type: "object",
properties: {
type: {
type: "string",
optional: false,
nullable: false,
enum: [
"Note"
]
},
object: {
type: "object",
optional: false,
nullable: false,
ref: "Note"
}
}
}
]
}
};
export const paramDef = {
type: "object",
properties: {
uri: {
type: "string"
}
},
required: [
"uri"
]
};
export default define(meta, paramDef, async (ps, me)=>{
const object = await fetchAny(ps.uri, me);
if (object) {
return object;
} else {
throw new ApiError(meta.errors.noSuchObject);
}
});
/***
* Resolve User or Note from URI
*/ async function fetchAny(uri, me) {
// Wait if blocked.
if (await shouldBlockInstance(extractDbHost(uri))) return null;
const dbResolver = new DbResolver();
const resolver = new Resolver();
resolver.setUser(me);
const [user, note] = await Promise.all([
dbResolver.getUserFromApId(uri),
dbResolver.getNoteFromApId(uri)
]);
let local = await mergePack(me, user, note);
if (local) {
if (local.type === "Note" && note?.uri && note.hasPoll) {
// Update questions if the stored (remote) note contains the poll
const key = `pollFetched:${note.uri}`;
if (await redisClient.exists(key) === 0) {
if (await updateQuestion(note.uri, resolver)) {
local.object.poll = await populatePoll(note, me?.id ?? null);
}
// Allow fetching the poll again after 1 minute
await redisClient.set(key, 1, "EX", 60);
}
}
return local;
}
// fetching Object once from remote
const object = await resolver.resolve(uri);
// /@user If a URI other than the id is specified,
// the URI is determined here
if (uri !== object.id) {
local = await mergePack(me, ...await Promise.all([
dbResolver.getUserFromApId(getApId(object)),
dbResolver.getNoteFromApId(getApId(object))
]));
if (local != null) return local;
}
return await mergePack(me, isActor(object) ? await createPerson(getApId(object), resolver.reset()) : null, isPost(object) ? await createNote(getApId(object), resolver.reset(), true) : null);
}
async function mergePack(me, user, note) {
if (user != null) {
return {
type: "User",
object: await Users.pack(user, me, {
detail: true
})
};
} else if (note != null) {
try {
const object = await Notes.pack(note, me, {
detail: true
});
return {
type: "Note",
object
};
} catch (e) {
return null;
}
}
return null;
}