Fixed 267U.pre2
This commit is contained in:
@@ -0,0 +1,45 @@
|
||||
import { IsNull } from "typeorm";
|
||||
import config from "../../config/index.js";
|
||||
import { renderActivity } from "../../remote/activitypub/renderer/index.js";
|
||||
import renderOrderedCollection from "../../remote/activitypub/renderer/ordered-collection.js";
|
||||
import { Users, Notes, UserNotePinings } from "../../models/index.js";
|
||||
import { checkFetch } from "../../remote/activitypub/check-fetch.js";
|
||||
import { fetchMeta } from "../../misc/fetch-meta.js";
|
||||
import { setResponseType } from "../activitypub.js";
|
||||
export default (async (ctx)=>{
|
||||
const verify = await checkFetch(ctx.req);
|
||||
if (verify !== 200) {
|
||||
ctx.status = verify;
|
||||
return;
|
||||
}
|
||||
const userId = ctx.params.user;
|
||||
const user = await Users.findOneBy({
|
||||
id: userId,
|
||||
host: IsNull()
|
||||
});
|
||||
if (user == null) {
|
||||
ctx.status = 404;
|
||||
return;
|
||||
}
|
||||
const pinings = await UserNotePinings.find({
|
||||
where: {
|
||||
userId: user.id
|
||||
},
|
||||
order: {
|
||||
id: "DESC"
|
||||
}
|
||||
});
|
||||
const pinnedNotes = await Promise.all(pinings.map((pining)=>Notes.findOneByOrFail({
|
||||
id: pining.noteId
|
||||
})));
|
||||
const renderedNotes = pinnedNotes.map((note)=>`${config.url}/notes/${note.id}`);
|
||||
const rendered = renderOrderedCollection(`${config.url}/users/${userId}/collections/featured`, renderedNotes.length, undefined, undefined, renderedNotes);
|
||||
ctx.body = renderActivity(rendered);
|
||||
const meta = await fetchMeta();
|
||||
if (meta.secureMode || meta.privateMode) {
|
||||
ctx.set("Cache-Control", "private, max-age=0, must-revalidate");
|
||||
} else {
|
||||
ctx.set("Cache-Control", "public, max-age=180");
|
||||
}
|
||||
setResponseType(ctx);
|
||||
});
|
||||
@@ -0,0 +1,90 @@
|
||||
import { IsNull, LessThan } from "typeorm";
|
||||
import config from "../../config/index.js";
|
||||
import * as url from "../../prelude/url.js";
|
||||
import { renderActivity } from "../../remote/activitypub/renderer/index.js";
|
||||
import renderOrderedCollection from "../../remote/activitypub/renderer/ordered-collection.js";
|
||||
import renderOrderedCollectionPage from "../../remote/activitypub/renderer/ordered-collection-page.js";
|
||||
import renderFollowUser from "../../remote/activitypub/renderer/follow-user.js";
|
||||
import { Users, Followings, UserProfiles } from "../../models/index.js";
|
||||
import { checkFetch } from "../../remote/activitypub/check-fetch.js";
|
||||
import { fetchMeta } from "../../misc/fetch-meta.js";
|
||||
import { setResponseType } from "../activitypub.js";
|
||||
export default (async (ctx)=>{
|
||||
const verify = await checkFetch(ctx.req);
|
||||
if (verify !== 200) {
|
||||
ctx.status = verify;
|
||||
return;
|
||||
}
|
||||
const userId = ctx.params.user;
|
||||
const cursor = ctx.request.query.cursor;
|
||||
if (cursor != null && typeof cursor !== "string") {
|
||||
ctx.status = 400;
|
||||
return;
|
||||
}
|
||||
const page = ctx.request.query.page === "true";
|
||||
const user = await Users.findOneBy({
|
||||
id: userId,
|
||||
host: IsNull()
|
||||
});
|
||||
if (user == null) {
|
||||
ctx.status = 404;
|
||||
return;
|
||||
}
|
||||
//#region Check ff visibility
|
||||
const profile = await UserProfiles.findOneByOrFail({
|
||||
userId: user.id
|
||||
});
|
||||
if (profile.ffVisibility === "private") {
|
||||
ctx.status = 403;
|
||||
ctx.set("Cache-Control", "public, max-age=30");
|
||||
return;
|
||||
} else if (profile.ffVisibility === "followers") {
|
||||
ctx.status = 403;
|
||||
ctx.set("Cache-Control", "public, max-age=30");
|
||||
return;
|
||||
}
|
||||
//#endregion
|
||||
const limit = 10;
|
||||
const partOf = `${config.url}/users/${userId}/followers`;
|
||||
if (page) {
|
||||
const query = {
|
||||
followeeId: user.id
|
||||
};
|
||||
// カーソルが指定されている場合
|
||||
if (cursor) {
|
||||
query.id = LessThan(cursor);
|
||||
}
|
||||
// Get followers
|
||||
const followings = await Followings.find({
|
||||
where: query,
|
||||
take: limit + 1,
|
||||
order: {
|
||||
id: -1
|
||||
}
|
||||
});
|
||||
// 「次のページ」があるかどうか
|
||||
const inStock = followings.length === limit + 1;
|
||||
if (inStock) followings.pop();
|
||||
const renderedFollowers = await Promise.all(followings.map((following)=>renderFollowUser(following.followerId)));
|
||||
const rendered = renderOrderedCollectionPage(`${partOf}?${url.query({
|
||||
page: "true",
|
||||
cursor
|
||||
})}`, user.followersCount, renderedFollowers, partOf, undefined, inStock ? `${partOf}?${url.query({
|
||||
page: "true",
|
||||
cursor: followings[followings.length - 1].id
|
||||
})}` : undefined);
|
||||
ctx.body = renderActivity(rendered);
|
||||
setResponseType(ctx);
|
||||
} else {
|
||||
// index page
|
||||
const rendered = renderOrderedCollection(partOf, user.followersCount, `${partOf}?page=true`);
|
||||
ctx.body = renderActivity(rendered);
|
||||
setResponseType(ctx);
|
||||
}
|
||||
const meta = await fetchMeta();
|
||||
if (meta.secureMode || meta.privateMode) {
|
||||
ctx.set("Cache-Control", "private, max-age=0, must-revalidate");
|
||||
} else {
|
||||
ctx.set("Cache-Control", "public, max-age=180");
|
||||
}
|
||||
});
|
||||
@@ -0,0 +1,90 @@
|
||||
import { LessThan, IsNull } from "typeorm";
|
||||
import config from "../../config/index.js";
|
||||
import * as url from "../../prelude/url.js";
|
||||
import { renderActivity } from "../../remote/activitypub/renderer/index.js";
|
||||
import renderOrderedCollection from "../../remote/activitypub/renderer/ordered-collection.js";
|
||||
import renderOrderedCollectionPage from "../../remote/activitypub/renderer/ordered-collection-page.js";
|
||||
import renderFollowUser from "../../remote/activitypub/renderer/follow-user.js";
|
||||
import { Users, Followings, UserProfiles } from "../../models/index.js";
|
||||
import { checkFetch } from "../../remote/activitypub/check-fetch.js";
|
||||
import { fetchMeta } from "../../misc/fetch-meta.js";
|
||||
import { setResponseType } from "../activitypub.js";
|
||||
export default (async (ctx)=>{
|
||||
const verify = await checkFetch(ctx.req);
|
||||
if (verify !== 200) {
|
||||
ctx.status = verify;
|
||||
return;
|
||||
}
|
||||
const userId = ctx.params.user;
|
||||
const cursor = ctx.request.query.cursor;
|
||||
if (cursor != null && typeof cursor !== "string") {
|
||||
ctx.status = 400;
|
||||
return;
|
||||
}
|
||||
const page = ctx.request.query.page === "true";
|
||||
const user = await Users.findOneBy({
|
||||
id: userId,
|
||||
host: IsNull()
|
||||
});
|
||||
if (user == null) {
|
||||
ctx.status = 404;
|
||||
return;
|
||||
}
|
||||
//#region Check ff visibility
|
||||
const profile = await UserProfiles.findOneByOrFail({
|
||||
userId: user.id
|
||||
});
|
||||
if (profile.ffVisibility === "private") {
|
||||
ctx.status = 403;
|
||||
ctx.set("Cache-Control", "public, max-age=30");
|
||||
return;
|
||||
} else if (profile.ffVisibility === "followers") {
|
||||
ctx.status = 403;
|
||||
ctx.set("Cache-Control", "public, max-age=30");
|
||||
return;
|
||||
}
|
||||
//#endregion
|
||||
const limit = 10;
|
||||
const partOf = `${config.url}/users/${userId}/following`;
|
||||
if (page) {
|
||||
const query = {
|
||||
followerId: user.id
|
||||
};
|
||||
// If a cursor is specified
|
||||
if (cursor) {
|
||||
query.id = LessThan(cursor);
|
||||
}
|
||||
// Get followings
|
||||
const followings = await Followings.find({
|
||||
where: query,
|
||||
take: limit + 1,
|
||||
order: {
|
||||
id: -1
|
||||
}
|
||||
});
|
||||
// Whether there is a "next page" or not
|
||||
const inStock = followings.length === limit + 1;
|
||||
if (inStock) followings.pop();
|
||||
const renderedFollowees = await Promise.all(followings.map((following)=>renderFollowUser(following.followeeId)));
|
||||
const rendered = renderOrderedCollectionPage(`${partOf}?${url.query({
|
||||
page: "true",
|
||||
cursor
|
||||
})}`, user.followingCount, renderedFollowees, partOf, undefined, inStock ? `${partOf}?${url.query({
|
||||
page: "true",
|
||||
cursor: followings[followings.length - 1].id
|
||||
})}` : undefined);
|
||||
ctx.body = renderActivity(rendered);
|
||||
setResponseType(ctx);
|
||||
} else {
|
||||
// index page
|
||||
const rendered = renderOrderedCollection(partOf, user.followingCount, `${partOf}?page=true`);
|
||||
ctx.body = renderActivity(rendered);
|
||||
setResponseType(ctx);
|
||||
}
|
||||
const meta = await fetchMeta();
|
||||
if (meta.secureMode || meta.privateMode) {
|
||||
ctx.set("Cache-Control", "private, max-age=0, must-revalidate");
|
||||
} else {
|
||||
ctx.set("Cache-Control", "public, max-age=180");
|
||||
}
|
||||
});
|
||||
@@ -0,0 +1,97 @@
|
||||
import { Brackets, IsNull } from "typeorm";
|
||||
import config from "../../config/index.js";
|
||||
import { renderActivity } from "../../remote/activitypub/renderer/index.js";
|
||||
import renderOrderedCollection from "../../remote/activitypub/renderer/ordered-collection.js";
|
||||
import renderOrderedCollectionPage from "../../remote/activitypub/renderer/ordered-collection-page.js";
|
||||
import renderNote from "../../remote/activitypub/renderer/note.js";
|
||||
import renderCreate from "../../remote/activitypub/renderer/create.js";
|
||||
import renderAnnounce from "../../remote/activitypub/renderer/announce.js";
|
||||
import { countIf } from "../../prelude/array.js";
|
||||
import * as url from "../../prelude/url.js";
|
||||
import { Users, Notes } from "../../models/index.js";
|
||||
import { checkFetch } from "../../remote/activitypub/check-fetch.js";
|
||||
import { fetchMeta } from "../../misc/fetch-meta.js";
|
||||
import { makePaginationQuery } from "../api/common/make-pagination-query.js";
|
||||
import { setResponseType } from "../activitypub.js";
|
||||
export default (async (ctx)=>{
|
||||
const verify = await checkFetch(ctx.req);
|
||||
if (verify !== 200) {
|
||||
ctx.status = verify;
|
||||
return;
|
||||
}
|
||||
const userId = ctx.params.user;
|
||||
const sinceId = ctx.request.query.since_id;
|
||||
if (sinceId != null && typeof sinceId !== "string") {
|
||||
ctx.status = 400;
|
||||
return;
|
||||
}
|
||||
const untilId = ctx.request.query.until_id;
|
||||
if (untilId != null && typeof untilId !== "string") {
|
||||
ctx.status = 400;
|
||||
return;
|
||||
}
|
||||
const page = ctx.request.query.page === "true";
|
||||
if (countIf((x)=>x != null, [
|
||||
sinceId,
|
||||
untilId
|
||||
]) > 1) {
|
||||
ctx.status = 400;
|
||||
return;
|
||||
}
|
||||
const user = await Users.findOneBy({
|
||||
id: userId,
|
||||
host: IsNull()
|
||||
});
|
||||
if (user == null) {
|
||||
ctx.status = 404;
|
||||
return;
|
||||
}
|
||||
const limit = 20;
|
||||
const partOf = `${config.url}/users/${userId}/outbox`;
|
||||
if (page) {
|
||||
const query = makePaginationQuery(Notes.createQueryBuilder("note"), sinceId, untilId).andWhere("note.userId = :userId", {
|
||||
userId: user.id
|
||||
}).andWhere(new Brackets((qb)=>{
|
||||
qb.where("note.visibility = 'public'").orWhere("note.visibility = 'home'");
|
||||
})).andWhere("note.localOnly = FALSE");
|
||||
const notes = await query.take(limit).getMany();
|
||||
if (sinceId) notes.reverse();
|
||||
const activities = await Promise.all(notes.map((note)=>packActivity(note)));
|
||||
const rendered = renderOrderedCollectionPage(`${partOf}?${url.query({
|
||||
page: "true",
|
||||
since_id: sinceId,
|
||||
until_id: untilId
|
||||
})}`, user.notesCount, activities, partOf, notes.length ? `${partOf}?${url.query({
|
||||
page: "true",
|
||||
since_id: notes[0].id
|
||||
})}` : undefined, notes.length ? `${partOf}?${url.query({
|
||||
page: "true",
|
||||
until_id: notes[notes.length - 1].id
|
||||
})}` : undefined);
|
||||
ctx.body = renderActivity(rendered);
|
||||
setResponseType(ctx);
|
||||
} else {
|
||||
// index page
|
||||
const rendered = renderOrderedCollection(partOf, user.notesCount, `${partOf}?page=true`, `${partOf}?page=true&since_id=000000000000000000000000`);
|
||||
ctx.body = renderActivity(rendered);
|
||||
setResponseType(ctx);
|
||||
}
|
||||
const meta = await fetchMeta();
|
||||
if (meta.secureMode || meta.privateMode) {
|
||||
ctx.set("Cache-Control", "private, max-age=0, must-revalidate");
|
||||
} else {
|
||||
ctx.set("Cache-Control", "public, max-age=180");
|
||||
}
|
||||
});
|
||||
/**
|
||||
* Pack Create<Note> or Announce Activity
|
||||
* @param note Note
|
||||
*/ export async function packActivity(note) {
|
||||
if (note.renoteId && note.text == null && note.cw == null && !note.hasPoll && (note.fileIds == null || note.fileIds.length === 0)) {
|
||||
const renote = await Notes.findOneByOrFail({
|
||||
id: note.renoteId
|
||||
});
|
||||
return renderAnnounce(renote.uri ?? `${config.url}/notes/${renote.id}`, note);
|
||||
}
|
||||
return renderCreate(await renderNote(note, false), note);
|
||||
}
|
||||
Reference in New Issue
Block a user