mirror of
https://iceshrimp.dev/limepotato/jormungandr-bite.git
synced 2024-11-28 21:08:52 -07:00
[backend] Rework note edits
This commit is contained in:
Laura Hausmann
parent
e0fefc986f
commit
500a85acb9
2 changed files with 246 additions and 518 deletions
|
|
@ -1,40 +1,13 @@
|
||||||
import { In } from "typeorm";
|
import { Users, DriveFiles, Notes } from "@/models/index.js";
|
||||||
import create, { index } from "@/services/note/create.js";
|
|
||||||
import type { IRemoteUser, User } from "@/models/entities/user.js";
|
|
||||||
import {
|
|
||||||
Users,
|
|
||||||
DriveFiles,
|
|
||||||
Notes,
|
|
||||||
Channels,
|
|
||||||
Blockings,
|
|
||||||
UserProfiles,
|
|
||||||
Polls,
|
|
||||||
NoteEdits,
|
|
||||||
} from "@/models/index.js";
|
|
||||||
import type { DriveFile } from "@/models/entities/drive-file.js";
|
import type { DriveFile } from "@/models/entities/drive-file.js";
|
||||||
import type { IMentionedRemoteUsers, Note } from "@/models/entities/note.js";
|
import type { Note } from "@/models/entities/note.js";
|
||||||
import type { Channel } from "@/models/entities/channel.js";
|
|
||||||
import { MAX_NOTE_TEXT_LENGTH } from "@/const.js";
|
import { MAX_NOTE_TEXT_LENGTH } from "@/const.js";
|
||||||
import { noteVisibilities } from "../../../../types.js";
|
|
||||||
import { ApiError } from "../../error.js";
|
import { ApiError } from "../../error.js";
|
||||||
import define from "../../define.js";
|
import define from "../../define.js";
|
||||||
import { HOUR } from "@/const.js";
|
import { HOUR } from "@/const.js";
|
||||||
import { getNote } from "../../common/getters.js";
|
|
||||||
import { Poll } from "@/models/entities/poll.js";
|
|
||||||
import * as mfm from "mfm-js";
|
|
||||||
import { concat } from "@/prelude/array.js";
|
|
||||||
import { extractHashtags } from "@/misc/extract-hashtags.js";
|
|
||||||
import { extractCustomEmojisFromMfm } from "@/misc/extract-custom-emojis-from-mfm.js";
|
|
||||||
import { extractMentionedUsers } from "@/services/note/create.js";
|
|
||||||
import { genId } from "@/misc/gen-id.js";
|
|
||||||
import { publishNoteStream } from "@/services/stream.js";
|
|
||||||
import DeliverManager from "@/remote/activitypub/deliver-manager.js";
|
|
||||||
import { renderActivity } from "@/remote/activitypub/renderer/index.js";
|
|
||||||
import renderNote from "@/remote/activitypub/renderer/note.js";
|
|
||||||
import renderUpdate from "@/remote/activitypub/renderer/update.js";
|
|
||||||
import { deliverToRelays } from "@/services/relay.js";
|
|
||||||
// import { deliverQuestionUpdate } from "@/services/note/polls/update.js";
|
// import { deliverQuestionUpdate } from "@/services/note/polls/update.js";
|
||||||
import { fetchMeta } from "@/misc/fetch-meta.js";
|
import editNote from "@/services/note/edit.js"
|
||||||
|
import { Packed } from "@/misc/schema.js";
|
||||||
|
|
||||||
export const meta = {
|
export const meta = {
|
||||||
tags: ["notes"],
|
tags: ["notes"],
|
||||||
|
|
@ -52,59 +25,16 @@ export const meta = {
|
||||||
type: "object",
|
type: "object",
|
||||||
optional: false,
|
optional: false,
|
||||||
nullable: false,
|
nullable: false,
|
||||||
properties: {
|
ref: "Note"
|
||||||
createdNote: {
|
|
||||||
type: "object",
|
|
||||||
optional: false,
|
|
||||||
nullable: false,
|
|
||||||
ref: "Note",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
},
|
||||||
|
|
||||||
errors: {
|
errors: {
|
||||||
noSuchRenoteTarget: {
|
|
||||||
message: "No such renote target.",
|
|
||||||
code: "NO_SUCH_RENOTE_TARGET",
|
|
||||||
id: "b5c90186-4ab0-49c8-9bba-a1f76c282ba4",
|
|
||||||
},
|
|
||||||
|
|
||||||
cannotReRenote: {
|
|
||||||
message: "You can not Renote a pure Renote.",
|
|
||||||
code: "CANNOT_RENOTE_TO_A_PURE_RENOTE",
|
|
||||||
id: "fd4cc33e-2a37-48dd-99cc-9b806eb2031a",
|
|
||||||
},
|
|
||||||
|
|
||||||
noSuchReplyTarget: {
|
|
||||||
message: "No such reply target.",
|
|
||||||
code: "NO_SUCH_REPLY_TARGET",
|
|
||||||
id: "749ee0f6-d3da-459a-bf02-282e2da4292c",
|
|
||||||
},
|
|
||||||
|
|
||||||
cannotReplyToPureRenote: {
|
|
||||||
message: "You can not reply to a pure Renote.",
|
|
||||||
code: "CANNOT_REPLY_TO_A_PURE_RENOTE",
|
|
||||||
id: "3ac74a84-8fd5-4bb0-870f-01804f82ce15",
|
|
||||||
},
|
|
||||||
|
|
||||||
cannotCreateAlreadyExpiredPoll: {
|
cannotCreateAlreadyExpiredPoll: {
|
||||||
message: "Poll is already expired.",
|
message: "Poll is already expired.",
|
||||||
code: "CANNOT_CREATE_ALREADY_EXPIRED_POLL",
|
code: "CANNOT_CREATE_ALREADY_EXPIRED_POLL",
|
||||||
id: "04da457d-b083-4055-9082-955525eda5a5",
|
id: "04da457d-b083-4055-9082-955525eda5a5",
|
||||||
},
|
},
|
||||||
|
|
||||||
noSuchChannel: {
|
|
||||||
message: "No such channel.",
|
|
||||||
code: "NO_SUCH_CHANNEL",
|
|
||||||
id: "b1653923-5453-4edc-b786-7c4f39bb0bbb",
|
|
||||||
},
|
|
||||||
|
|
||||||
youHaveBeenBlocked: {
|
|
||||||
message: "You have been blocked by this user.",
|
|
||||||
code: "YOU_HAVE_BEEN_BLOCKED",
|
|
||||||
id: "b390d7e1-8a5e-46ed-b625-06271cafd3d3",
|
|
||||||
},
|
|
||||||
|
|
||||||
accountLocked: {
|
accountLocked: {
|
||||||
message: "You migrated. Your account is now locked.",
|
message: "You migrated. Your account is now locked.",
|
||||||
code: "ACCOUNT_LOCKED",
|
code: "ACCOUNT_LOCKED",
|
||||||
|
|
@ -129,29 +59,11 @@ export const meta = {
|
||||||
id: "c6e61685-411d-43d0-b90a-a448d2539001",
|
id: "c6e61685-411d-43d0-b90a-a448d2539001",
|
||||||
},
|
},
|
||||||
|
|
||||||
cannotPrivateRenote: {
|
|
||||||
message: "You can not perform a private renote.",
|
|
||||||
code: "CANNOT_PRIVATE_RENOTE",
|
|
||||||
id: "19a50f1c-84fa-4e33-81d3-17834ccc0ad8",
|
|
||||||
},
|
|
||||||
|
|
||||||
notLocalUser: {
|
notLocalUser: {
|
||||||
message: "You are not a local user.",
|
message: "You are not a local user.",
|
||||||
code: "NOT_LOCAL_USER",
|
code: "NOT_LOCAL_USER",
|
||||||
id: "b907f407-2aa0-4283-800b-a2c56290b822",
|
id: "b907f407-2aa0-4283-800b-a2c56290b822",
|
||||||
},
|
},
|
||||||
|
|
||||||
cannotChangeVisibility: {
|
|
||||||
message: "You cannot change the visibility of a note.",
|
|
||||||
code: "CANNOT_CHANGE_VISIBILITY",
|
|
||||||
id: "2917fd0b-da04-41de-949f-146835a006c6",
|
|
||||||
},
|
|
||||||
|
|
||||||
cannotQuoteOwnNote: {
|
|
||||||
message: "You cannot quote your own note.",
|
|
||||||
code: "CANNOT_QUOTE_OWN_NOTE",
|
|
||||||
id: "070eee98-5f8a-4eca-9dc0-830b4d4e52ac",
|
|
||||||
},
|
|
||||||
}
|
}
|
||||||
} as const;
|
} as const;
|
||||||
|
|
||||||
|
|
@ -159,21 +71,8 @@ export const paramDef = {
|
||||||
type: "object",
|
type: "object",
|
||||||
properties: {
|
properties: {
|
||||||
editId: { type: "string", format: "misskey:id" },
|
editId: { type: "string", format: "misskey:id" },
|
||||||
visibility: { type: "string", enum: noteVisibilities, nullable: true },
|
|
||||||
visibleUserIds: {
|
|
||||||
type: "array",
|
|
||||||
uniqueItems: true,
|
|
||||||
items: {
|
|
||||||
type: "string",
|
|
||||||
format: "misskey:id",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
text: { type: "string", maxLength: MAX_NOTE_TEXT_LENGTH, nullable: true },
|
text: { type: "string", maxLength: MAX_NOTE_TEXT_LENGTH, nullable: true },
|
||||||
cw: { type: "string", nullable: true, maxLength: 250 },
|
cw: { type: "string", nullable: true, maxLength: 250 },
|
||||||
localOnly: { type: "boolean", default: false },
|
|
||||||
noExtractMentions: { type: "boolean", default: false },
|
|
||||||
noExtractHashtags: { type: "boolean", default: false },
|
|
||||||
noExtractEmojis: { type: "boolean", default: false },
|
|
||||||
fileIds: {
|
fileIds: {
|
||||||
type: "array",
|
type: "array",
|
||||||
uniqueItems: true,
|
uniqueItems: true,
|
||||||
|
|
@ -181,19 +80,6 @@ export const paramDef = {
|
||||||
maxItems: 16,
|
maxItems: 16,
|
||||||
items: { type: "string", format: "misskey:id" },
|
items: { type: "string", format: "misskey:id" },
|
||||||
},
|
},
|
||||||
mediaIds: {
|
|
||||||
deprecated: true,
|
|
||||||
description:
|
|
||||||
"Use `fileIds` instead. If both are specified, this property is discarded.",
|
|
||||||
type: "array",
|
|
||||||
uniqueItems: true,
|
|
||||||
minItems: 1,
|
|
||||||
maxItems: 16,
|
|
||||||
items: { type: "string", format: "misskey:id" },
|
|
||||||
},
|
|
||||||
replyId: { type: "string", format: "misskey:id", nullable: true },
|
|
||||||
renoteId: { type: "string", format: "misskey:id", nullable: true },
|
|
||||||
channelId: { type: "string", format: "misskey:id", nullable: true },
|
|
||||||
poll: {
|
poll: {
|
||||||
type: "object",
|
type: "object",
|
||||||
nullable: true,
|
nullable: true,
|
||||||
|
|
@ -214,7 +100,7 @@ export const paramDef = {
|
||||||
},
|
},
|
||||||
anyOf: [
|
anyOf: [
|
||||||
{
|
{
|
||||||
// (re)note with text, files and poll are optional
|
// note with text, files and poll are optional
|
||||||
properties: {
|
properties: {
|
||||||
text: {
|
text: {
|
||||||
type: "string",
|
type: "string",
|
||||||
|
|
@ -226,28 +112,20 @@ export const paramDef = {
|
||||||
required: ["text"],
|
required: ["text"],
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
// (re)note with files, text and poll are optional
|
// note with files, text and poll are optional
|
||||||
required: ["fileIds"],
|
required: ["fileIds"],
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
// (re)note with files, text and poll are optional
|
// note with poll, text and files are optional
|
||||||
required: ["mediaIds"],
|
|
||||||
},
|
|
||||||
{
|
|
||||||
// (re)note with poll, text and files are optional
|
|
||||||
properties: {
|
properties: {
|
||||||
poll: { type: "object", nullable: false },
|
poll: { type: "object", nullable: false },
|
||||||
},
|
},
|
||||||
required: ["poll"],
|
required: ["poll"],
|
||||||
},
|
},
|
||||||
{
|
|
||||||
// pure renote
|
|
||||||
required: ["renoteId"],
|
|
||||||
},
|
|
||||||
],
|
],
|
||||||
} as const;
|
} as const;
|
||||||
|
|
||||||
export default define(meta, paramDef, async (ps, user) => {
|
export default define(meta, paramDef, async (ps, user): Promise<Packed<"Note">> => {
|
||||||
if (user.movedToUri != null) throw new ApiError(meta.errors.accountLocked);
|
if (user.movedToUri != null) throw new ApiError(meta.errors.accountLocked);
|
||||||
|
|
||||||
if (!Users.isLocalUser(user)) {
|
if (!Users.isLocalUser(user)) {
|
||||||
|
|
@ -258,12 +136,11 @@ export default define(meta, paramDef, async (ps, user) => {
|
||||||
throw new ApiError(meta.errors.needsEditId);
|
throw new ApiError(meta.errors.needsEditId);
|
||||||
}
|
}
|
||||||
|
|
||||||
let publishing = false;
|
|
||||||
let note = await Notes.findOneBy({
|
let note = await Notes.findOneBy({
|
||||||
id: ps.editId,
|
id: ps.editId,
|
||||||
});
|
});
|
||||||
|
|
||||||
if (note == null) {
|
if (!note) {
|
||||||
throw new ApiError(meta.errors.noSuchNote);
|
throw new ApiError(meta.errors.noSuchNote);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -271,172 +148,12 @@ export default define(meta, paramDef, async (ps, user) => {
|
||||||
throw new ApiError(meta.errors.youAreNotTheAuthor);
|
throw new ApiError(meta.errors.youAreNotTheAuthor);
|
||||||
}
|
}
|
||||||
|
|
||||||
let renote: Note | null = null;
|
if (ps.poll?.expiresAt && new Date(ps.poll.expiresAt).getTime() < new Date().getTime()) {
|
||||||
if (ps.renoteId != null) {
|
throw new ApiError(meta.errors.cannotCreateAlreadyExpiredPoll);
|
||||||
// Fetch renote to note
|
|
||||||
renote = await getNote(ps.renoteId, user).catch((e) => {
|
|
||||||
if (e.id === "9725d0ce-ba28-4dde-95a7-2cbb2c15de24")
|
|
||||||
throw new ApiError(meta.errors.noSuchRenoteTarget);
|
|
||||||
throw e;
|
|
||||||
});
|
|
||||||
|
|
||||||
if (ps.renoteId === note.id) {
|
|
||||||
throw new ApiError(meta.errors.cannotQuoteOwnNote);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (renote.renoteId && !renote.text && !renote.fileIds && !renote.hasPoll) {
|
|
||||||
throw new ApiError(meta.errors.cannotReRenote);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Check blocking
|
|
||||||
if (renote.userId !== user.id) {
|
|
||||||
const block = await Blockings.findOneBy({
|
|
||||||
blockerId: renote.userId,
|
|
||||||
blockeeId: user.id,
|
|
||||||
});
|
|
||||||
if (block) {
|
|
||||||
throw new ApiError(meta.errors.youHaveBeenBlocked);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
let reply: Note | null = null;
|
|
||||||
if (ps.replyId != null) {
|
|
||||||
// Fetch reply
|
|
||||||
reply = await getNote(ps.replyId, user).catch((e) => {
|
|
||||||
if (e.id === "9725d0ce-ba28-4dde-95a7-2cbb2c15de24")
|
|
||||||
throw new ApiError(meta.errors.noSuchReplyTarget);
|
|
||||||
throw e;
|
|
||||||
});
|
|
||||||
|
|
||||||
if (reply.renoteId && !reply.text && !reply.fileIds && !reply.hasPoll) {
|
|
||||||
throw new ApiError(meta.errors.cannotReplyToPureRenote);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Check blocking
|
|
||||||
if (reply.userId !== user.id) {
|
|
||||||
const block = await Blockings.findOneBy({
|
|
||||||
blockerId: reply.userId,
|
|
||||||
blockeeId: user.id,
|
|
||||||
});
|
|
||||||
if (block) {
|
|
||||||
throw new ApiError(meta.errors.youHaveBeenBlocked);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
let channel: Channel | null = null;
|
|
||||||
if (ps.channelId != null) {
|
|
||||||
channel = await Channels.findOneBy({ id: ps.channelId });
|
|
||||||
|
|
||||||
if (channel == null) {
|
|
||||||
throw new ApiError(meta.errors.noSuchChannel);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// keep visibility on edit if not specified
|
|
||||||
if (ps.visibility == null) {
|
|
||||||
ps.visibility = note.visibility;
|
|
||||||
}
|
|
||||||
|
|
||||||
// enforce silent clients on server
|
|
||||||
if (user.isSilenced && ps.visibility === "public" && ps.channelId == null) {
|
|
||||||
ps.visibility = "home";
|
|
||||||
}
|
|
||||||
|
|
||||||
// Reject if the target of the renote is a public range other than "Home or Entire".
|
|
||||||
if (
|
|
||||||
renote &&
|
|
||||||
renote.visibility !== "public" &&
|
|
||||||
renote.visibility !== "home" &&
|
|
||||||
renote.userId !== user.id
|
|
||||||
) {
|
|
||||||
throw new ApiError(meta.errors.cannotPrivateRenote);
|
|
||||||
}
|
|
||||||
|
|
||||||
// If the target of the renote is not public, make it home.
|
|
||||||
if (renote && renote.visibility !== "public" && ps.visibility === "public") {
|
|
||||||
ps.visibility = "home";
|
|
||||||
}
|
|
||||||
|
|
||||||
// If the reply target is not public, make it home.
|
|
||||||
if (reply && reply.visibility !== "public" && ps.visibility === "public") {
|
|
||||||
ps.visibility = "home";
|
|
||||||
}
|
|
||||||
|
|
||||||
// Renote local only if you Renote local only.
|
|
||||||
if (renote?.localOnly && ps.channelId == null) {
|
|
||||||
ps.localOnly = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
// If you reply to local only, make it local only.
|
|
||||||
if (reply?.localOnly && ps.channelId == null) {
|
|
||||||
ps.localOnly = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (ps.text) {
|
|
||||||
ps.text = ps.text.trim();
|
|
||||||
} else {
|
|
||||||
ps.text = null;
|
|
||||||
}
|
|
||||||
|
|
||||||
let tags = [];
|
|
||||||
let emojis = [];
|
|
||||||
let mentionedUsers = [];
|
|
||||||
|
|
||||||
const tokens = ps.text ? mfm.parse(ps.text) : [];
|
|
||||||
const cwTokens = ps.cw ? mfm.parse(ps.cw) : [];
|
|
||||||
const choiceTokens = ps.poll?.choices
|
|
||||||
? concat(ps.poll.choices.map((choice) => mfm.parse(choice)))
|
|
||||||
: [];
|
|
||||||
|
|
||||||
const combinedTokens = tokens.concat(cwTokens).concat(choiceTokens);
|
|
||||||
|
|
||||||
tags = extractHashtags(combinedTokens);
|
|
||||||
|
|
||||||
emojis = extractCustomEmojisFromMfm(combinedTokens);
|
|
||||||
|
|
||||||
mentionedUsers = await extractMentionedUsers(user, combinedTokens);
|
|
||||||
|
|
||||||
tags = [...new Set(tags)]
|
|
||||||
.sort()
|
|
||||||
.filter((tag) => Array.from(tag || "").length <= 128)
|
|
||||||
.splice(0, 32);
|
|
||||||
|
|
||||||
emojis = [...new Set(emojis)].sort();
|
|
||||||
|
|
||||||
if (
|
|
||||||
reply &&
|
|
||||||
user.id !== reply.userId &&
|
|
||||||
!mentionedUsers.some((u) => u.id === reply?.userId)
|
|
||||||
) {
|
|
||||||
mentionedUsers.push(await Users.findOneByOrFail({ id: reply.userId }));
|
|
||||||
}
|
|
||||||
|
|
||||||
let visibleUsers: User[] = [];
|
|
||||||
if (ps.visibleUserIds) {
|
|
||||||
visibleUsers = await Users.findBy({
|
|
||||||
id: In(ps.visibleUserIds),
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
if (ps.visibility === "specified") {
|
|
||||||
if (visibleUsers == null) throw new Error("invalid param");
|
|
||||||
|
|
||||||
for (const u of visibleUsers) {
|
|
||||||
if (!mentionedUsers.some((x) => x.id === u.id)) {
|
|
||||||
mentionedUsers.push(u);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (reply && !visibleUsers.some((x) => x.id === reply?.userId)) {
|
|
||||||
visibleUsers.push(await Users.findOneByOrFail({ id: reply.userId }));
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
let files: DriveFile[] = [];
|
let files: DriveFile[] = [];
|
||||||
const fileIds =
|
const fileIds = ps.fileIds ?? null;
|
||||||
ps.fileIds != null ? ps.fileIds : ps.mediaIds != null ? ps.mediaIds : null;
|
|
||||||
if (fileIds != null) {
|
if (fileIds != null) {
|
||||||
files = await DriveFiles.createQueryBuilder("file")
|
files = await DriveFiles.createQueryBuilder("file")
|
||||||
.where("file.userId = :userId AND file.id IN (:...fileIds)", {
|
.where("file.userId = :userId AND file.id IN (:...fileIds)", {
|
||||||
|
|
@ -448,229 +165,18 @@ export default define(meta, paramDef, async (ps, user) => {
|
||||||
.getMany();
|
.getMany();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (ps.poll) {
|
note = await editNote(user, note, {
|
||||||
let expires = ps.poll.expiresAt;
|
text: ps.text,
|
||||||
if (typeof expires === "number") {
|
|
||||||
if (expires < Date.now()) {
|
|
||||||
throw new ApiError(meta.errors.cannotCreateAlreadyExpiredPoll);
|
|
||||||
}
|
|
||||||
} else if (typeof ps.poll.expiredAfter === "number") {
|
|
||||||
expires = Date.now() + ps.poll.expiredAfter;
|
|
||||||
}
|
|
||||||
|
|
||||||
let poll = await Polls.findOneBy({ noteId: note.id });
|
|
||||||
const pp = ps.poll;
|
|
||||||
if (!poll && pp) {
|
|
||||||
poll = new Poll({
|
|
||||||
noteId: note.id,
|
|
||||||
choices: pp.choices,
|
|
||||||
expiresAt: expires ? new Date(expires) : null,
|
|
||||||
multiple: pp.multiple,
|
|
||||||
votes: new Array(pp.choices.length).fill(0),
|
|
||||||
noteVisibility: ps.visibility,
|
|
||||||
userId: user.id,
|
|
||||||
userHost: user.host,
|
|
||||||
});
|
|
||||||
await Polls.insert(poll);
|
|
||||||
publishing = true;
|
|
||||||
} else if (poll && !pp) {
|
|
||||||
await Polls.remove(poll);
|
|
||||||
publishing = true;
|
|
||||||
} else if (poll && pp) {
|
|
||||||
const pollUpdate: Partial<Poll> = {};
|
|
||||||
if (poll.expiresAt !== expires) {
|
|
||||||
pollUpdate.expiresAt = expires ? new Date(expires) : null;
|
|
||||||
}
|
|
||||||
if (poll.multiple !== pp.multiple) {
|
|
||||||
pollUpdate.multiple = pp.multiple;
|
|
||||||
}
|
|
||||||
if (poll.noteVisibility !== ps.visibility) {
|
|
||||||
pollUpdate.noteVisibility = ps.visibility;
|
|
||||||
}
|
|
||||||
// Keep votes for unmodified choices, reset votes if choice is modified or new
|
|
||||||
const oldVoteCounts = new Map<string, number>();
|
|
||||||
for (let i = 0; i < poll.choices.length; i++) {
|
|
||||||
oldVoteCounts.set(poll.choices[i], poll.votes[i]);
|
|
||||||
}
|
|
||||||
const newVotes = pp.choices.map(
|
|
||||||
(choice) => oldVoteCounts.get(choice) || 0,
|
|
||||||
);
|
|
||||||
pollUpdate.choices = pp.choices;
|
|
||||||
pollUpdate.votes = newVotes;
|
|
||||||
if (notEmpty(pollUpdate)) {
|
|
||||||
await Polls.update(note.id, pollUpdate);
|
|
||||||
// Seemingly already handled by by the rendered update activity
|
|
||||||
// await deliverQuestionUpdate(note.id);
|
|
||||||
}
|
|
||||||
publishing = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
const mentionedUserLookup: Record<string, User> = {};
|
|
||||||
mentionedUsers.forEach((u) => {
|
|
||||||
mentionedUserLookup[u.id] = u;
|
|
||||||
});
|
|
||||||
|
|
||||||
const mentionedUserIds = [...new Set(mentionedUsers.map((u) => u.id))].sort();
|
|
||||||
|
|
||||||
const remoteUsers = mentionedUserIds
|
|
||||||
.map((id) => mentionedUserLookup[id])
|
|
||||||
.filter((u) => u.host != null);
|
|
||||||
|
|
||||||
const remoteUserIds = remoteUsers.map((user) => user.id);
|
|
||||||
const remoteProfiles = await UserProfiles.findBy({
|
|
||||||
userId: In(remoteUserIds),
|
|
||||||
});
|
|
||||||
const mentionedRemoteUsers = remoteUsers.map((user) => {
|
|
||||||
const profile = remoteProfiles.find(
|
|
||||||
(profile) => profile.userId === user.id,
|
|
||||||
);
|
|
||||||
return {
|
|
||||||
username: user.username,
|
|
||||||
host: user.host ?? null,
|
|
||||||
uri: user.uri,
|
|
||||||
url: profile ? profile.url : undefined,
|
|
||||||
} as IMentionedRemoteUsers[0];
|
|
||||||
});
|
|
||||||
|
|
||||||
const update: Partial<Note> = {};
|
|
||||||
if (ps.text !== note.text) {
|
|
||||||
update.text = ps.text;
|
|
||||||
}
|
|
||||||
if (ps.cw !== note.cw || (ps.cw && !note.cw)) {
|
|
||||||
update.cw = ps.cw;
|
|
||||||
}
|
|
||||||
if (!ps.cw && note.cw) {
|
|
||||||
update.cw = null;
|
|
||||||
}
|
|
||||||
if (ps.visibility !== note.visibility) {
|
|
||||||
// update.visibility = ps.visibility;
|
|
||||||
throw new ApiError(meta.errors.cannotChangeVisibility);
|
|
||||||
}
|
|
||||||
if (ps.localOnly !== note.localOnly) {
|
|
||||||
update.localOnly = ps.localOnly;
|
|
||||||
}
|
|
||||||
if (ps.visibleUserIds !== note.visibleUserIds) {
|
|
||||||
update.visibleUserIds = ps.visibleUserIds;
|
|
||||||
}
|
|
||||||
if (!unorderedEqual(mentionedUserIds, note.mentions)) {
|
|
||||||
update.mentions = mentionedUserIds;
|
|
||||||
update.mentionedRemoteUsers = JSON.stringify(mentionedRemoteUsers);
|
|
||||||
}
|
|
||||||
if (ps.channelId !== note.channelId) {
|
|
||||||
update.channelId = ps.channelId;
|
|
||||||
}
|
|
||||||
if (ps.replyId !== note.replyId) {
|
|
||||||
update.replyId = ps.replyId;
|
|
||||||
}
|
|
||||||
if (ps.renoteId !== note.renoteId) {
|
|
||||||
update.renoteId = ps.renoteId;
|
|
||||||
}
|
|
||||||
if (note.hasPoll !== !!ps.poll) {
|
|
||||||
update.hasPoll = !!ps.poll;
|
|
||||||
}
|
|
||||||
if (!unorderedEqual(emojis, note.emojis)) {
|
|
||||||
update.emojis = emojis;
|
|
||||||
}
|
|
||||||
if (!unorderedEqual(tags, note.tags)) {
|
|
||||||
update.tags = tags;
|
|
||||||
}
|
|
||||||
if (!unorderedEqual(ps.fileIds || [], note.fileIds)) {
|
|
||||||
update.fileIds = fileIds || undefined;
|
|
||||||
|
|
||||||
if (fileIds) {
|
|
||||||
// Get attachedFileTypes for each file with fileId from fileIds
|
|
||||||
const attachedFiles = fileIds.map((fileId) =>
|
|
||||||
files.find((file) => file.id === fileId),
|
|
||||||
);
|
|
||||||
update.attachedFileTypes = attachedFiles.map(
|
|
||||||
(file) => file?.type || "application/octet-stream",
|
|
||||||
);
|
|
||||||
} else {
|
|
||||||
update.attachedFileTypes = undefined;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (notEmpty(update)) {
|
|
||||||
update.updatedAt = new Date();
|
|
||||||
await Notes.update(note.id, update);
|
|
||||||
|
|
||||||
// Add NoteEdit history
|
|
||||||
await NoteEdits.insert({
|
|
||||||
id: genId(),
|
|
||||||
noteId: note.id,
|
|
||||||
text: ps.text || undefined,
|
|
||||||
cw: ps.cw,
|
cw: ps.cw,
|
||||||
fileIds: ps.fileIds,
|
poll: ps.poll
|
||||||
updatedAt: new Date(),
|
? {
|
||||||
|
choices: ps.poll.choices,
|
||||||
|
multiple: ps.poll.multiple,
|
||||||
|
expiresAt: ps.poll.expiresAt ? new Date(ps.poll.expiresAt) : null,
|
||||||
|
}
|
||||||
|
: undefined,
|
||||||
|
files: files
|
||||||
});
|
});
|
||||||
|
|
||||||
publishing = true;
|
return Notes.pack(note, user);
|
||||||
}
|
|
||||||
|
|
||||||
note = await Notes.findOneBy({ id: note.id });
|
|
||||||
if (!note) {
|
|
||||||
throw new ApiError(meta.errors.noSuchNote);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (publishing) {
|
|
||||||
index(note, true);
|
|
||||||
|
|
||||||
// Publish update event for the updated note details
|
|
||||||
publishNoteStream(note.id, "updated", {
|
|
||||||
updatedAt: update.updatedAt,
|
|
||||||
});
|
|
||||||
|
|
||||||
(async () => {
|
|
||||||
const noteActivity = await renderNote(note, false);
|
|
||||||
noteActivity.updated = note.updatedAt.toISOString();
|
|
||||||
const updateActivity = renderUpdate(noteActivity, user);
|
|
||||||
updateActivity.to = noteActivity.to;
|
|
||||||
updateActivity.cc = noteActivity.cc;
|
|
||||||
const activity = renderActivity(updateActivity);
|
|
||||||
const dm = new DeliverManager(user, activity);
|
|
||||||
|
|
||||||
// Delivery to remote mentioned users
|
|
||||||
for (const u of mentionedUsers.filter((u) => Users.isRemoteUser(u))) {
|
|
||||||
dm.addDirectRecipe(u as IRemoteUser);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Post is a reply and remote user is the contributor of the original post
|
|
||||||
if (note.reply && note.reply.userHost !== null) {
|
|
||||||
const u = await Users.findOneBy({ id: note.reply.userId });
|
|
||||||
if (u && Users.isRemoteUser(u)) dm.addDirectRecipe(u);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Post is a renote and remote user is the contributor of the original post
|
|
||||||
if (note.renote && note.renote.userHost !== null) {
|
|
||||||
const u = await Users.findOneBy({ id: note.renote.userId });
|
|
||||||
if (u && Users.isRemoteUser(u)) dm.addDirectRecipe(u);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Deliver to followers for non-direct posts.
|
|
||||||
if (["public", "home", "followers"].includes(note.visibility)) {
|
|
||||||
dm.addFollowersRecipe();
|
|
||||||
}
|
|
||||||
|
|
||||||
// Deliver to relays for public posts.
|
|
||||||
if (["public"].includes(note.visibility)) {
|
|
||||||
deliverToRelays(user, activity);
|
|
||||||
}
|
|
||||||
|
|
||||||
// GO!
|
|
||||||
dm.execute();
|
|
||||||
})();
|
|
||||||
}
|
|
||||||
|
|
||||||
return {
|
|
||||||
createdNote: await Notes.pack(note, user),
|
|
||||||
};
|
|
||||||
});
|
});
|
||||||
|
|
||||||
function unorderedEqual<T>(a: T[], b: T[]) {
|
|
||||||
return a.length === b.length && a.every((v) => b.includes(v));
|
|
||||||
}
|
|
||||||
|
|
||||||
function notEmpty(partial: Partial<any>) {
|
|
||||||
return Object.keys(partial).length > 0;
|
|
||||||
}
|
|
||||||
|
|
|
||||||
222
packages/backend/src/services/note/edit.ts
Normal file
222
packages/backend/src/services/note/edit.ts
Normal file
|
|
@ -0,0 +1,222 @@
|
||||||
|
import * as mfm from "mfm-js";
|
||||||
|
import {
|
||||||
|
publishNoteStream,
|
||||||
|
} from "@/services/stream.js";
|
||||||
|
import DeliverManager from "@/remote/activitypub/deliver-manager.js";
|
||||||
|
import renderNote from "@/remote/activitypub/renderer/note.js";
|
||||||
|
import { renderActivity } from "@/remote/activitypub/renderer/index.js";
|
||||||
|
import { extractCustomEmojisFromMfm } from "@/misc/extract-custom-emojis-from-mfm.js";
|
||||||
|
import { extractHashtags } from "@/misc/extract-hashtags.js";
|
||||||
|
import type { IMentionedRemoteUsers } from "@/models/entities/note.js";
|
||||||
|
import { Note } from "@/models/entities/note.js";
|
||||||
|
import {
|
||||||
|
Users,
|
||||||
|
Notes,
|
||||||
|
UserProfiles,
|
||||||
|
Polls, NoteEdits,
|
||||||
|
} from "@/models/index.js";
|
||||||
|
import type { DriveFile } from "@/models/entities/drive-file.js";
|
||||||
|
import { In } from "typeorm";
|
||||||
|
import type { ILocalUser, IRemoteUser } from "@/models/entities/user.js";
|
||||||
|
import { genId } from "@/misc/gen-id.js";
|
||||||
|
import type { IPoll } from "@/models/entities/poll.js";
|
||||||
|
import { deliverToRelays } from "../relay.js";
|
||||||
|
import renderUpdate from "@/remote/activitypub/renderer/update.js";
|
||||||
|
import { extractMentionedUsers, index } from "@/services/note/create.js";
|
||||||
|
|
||||||
|
type Option = {
|
||||||
|
text?: string | null;
|
||||||
|
files?: DriveFile[] | null;
|
||||||
|
poll?: IPoll | null;
|
||||||
|
cw?: string | null;
|
||||||
|
};
|
||||||
|
|
||||||
|
export default async function (
|
||||||
|
user: ILocalUser,
|
||||||
|
note: Note,
|
||||||
|
data: Option,
|
||||||
|
): Promise<Note> {
|
||||||
|
if (data.text !== undefined && data.text !== null) {
|
||||||
|
data.text = data.text.trim();
|
||||||
|
} else {
|
||||||
|
data.text = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
const fileIds = data.files?.map((file) => file.id) ?? [];
|
||||||
|
const fileTypes = data.files?.map((file) => file.type) ?? [];
|
||||||
|
|
||||||
|
const tokens = mfm
|
||||||
|
.parse(data.text || "")
|
||||||
|
.concat(mfm.parse(data.cw || ""));
|
||||||
|
|
||||||
|
const tags: string[] = extractHashtags(tokens);
|
||||||
|
const emojis = extractCustomEmojisFromMfm(tokens);
|
||||||
|
|
||||||
|
const mentionUsers = (await extractMentionedUsers(user, tokens));
|
||||||
|
|
||||||
|
const mentionUserIds = mentionUsers.map((user) => user.id);
|
||||||
|
const remoteUsers = mentionUsers.filter((user) => user.host != null);
|
||||||
|
const remoteUserIds = remoteUsers.map((user) => user.id);
|
||||||
|
const remoteProfiles = await UserProfiles.findBy({
|
||||||
|
userId: In(remoteUserIds),
|
||||||
|
});
|
||||||
|
const mentionedRemoteUsers = remoteUsers.map((user) => {
|
||||||
|
const profile = remoteProfiles.find(
|
||||||
|
(profile) => profile.userId === user.id,
|
||||||
|
);
|
||||||
|
return {
|
||||||
|
username: user.username,
|
||||||
|
host: user.host ?? null,
|
||||||
|
uri: user.uri,
|
||||||
|
url: profile ? profile.url : undefined,
|
||||||
|
} as IMentionedRemoteUsers[0];
|
||||||
|
});
|
||||||
|
|
||||||
|
let publishing = false;
|
||||||
|
const update = {} as Partial<Note>;
|
||||||
|
if (data.text !== null && data.text !== note.text) {
|
||||||
|
update.text = data.text;
|
||||||
|
}
|
||||||
|
if (data.cw !== note.cw) {
|
||||||
|
update.cw = data.cw ?? null;
|
||||||
|
}
|
||||||
|
if (fileIds.sort().join(",") !== note.fileIds.sort().join(",")) {
|
||||||
|
update.fileIds = fileIds;
|
||||||
|
update.attachedFileTypes = fileTypes;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (tags.sort().join(",") !== note.tags.sort().join(",")) {
|
||||||
|
update.tags = tags;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (mentionUserIds.sort().join(",") !== note.mentions.sort().join(",")) {
|
||||||
|
update.mentions = mentionUserIds;
|
||||||
|
update.mentionedRemoteUsers = JSON.stringify(mentionedRemoteUsers);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (emojis.sort().join(",") !== note.emojis.sort().join(",")) {
|
||||||
|
update.emojis = emojis;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (note.hasPoll !== !!data.poll) {
|
||||||
|
update.hasPoll = !!data.poll;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (data.poll) {
|
||||||
|
const dbPoll = await Polls.findOneBy({ noteId: note.id });
|
||||||
|
if (dbPoll == null) {
|
||||||
|
await Polls.insert({
|
||||||
|
noteId: note.id,
|
||||||
|
choices: data.poll?.choices,
|
||||||
|
multiple: data.poll?.multiple,
|
||||||
|
votes: data.poll?.votes,
|
||||||
|
expiresAt: data.poll?.expiresAt,
|
||||||
|
noteVisibility: note.visibility === "hidden" ? "home" : note.visibility,
|
||||||
|
userId: user.id,
|
||||||
|
userHost: user.host,
|
||||||
|
});
|
||||||
|
publishing = true;
|
||||||
|
} else if (
|
||||||
|
dbPoll.multiple !== data.poll.multiple ||
|
||||||
|
dbPoll.expiresAt !== data.poll.expiresAt ||
|
||||||
|
dbPoll.noteVisibility !== note.visibility ||
|
||||||
|
JSON.stringify(dbPoll.choices) !== JSON.stringify(data.poll.choices)
|
||||||
|
) {
|
||||||
|
await Polls.update(
|
||||||
|
{ noteId: note.id },
|
||||||
|
{
|
||||||
|
choices: data.poll?.choices,
|
||||||
|
multiple: data.poll?.multiple,
|
||||||
|
votes: data.poll?.votes,
|
||||||
|
expiresAt: data.poll?.expiresAt,
|
||||||
|
noteVisibility:
|
||||||
|
note.visibility === "hidden" ? "home" : note.visibility,
|
||||||
|
},
|
||||||
|
);
|
||||||
|
publishing = true;
|
||||||
|
} else {
|
||||||
|
for (let i = 0; i < data.poll.choices.length; i++) {
|
||||||
|
if (dbPoll.votes[i] !== data.poll.votes?.[i]) {
|
||||||
|
await Polls.update({ noteId: note.id }, { votes: data.poll?.votes });
|
||||||
|
publishing = true;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (notEmpty(update)) {
|
||||||
|
update.updatedAt = new Date();
|
||||||
|
await Notes.update(note.id, update);
|
||||||
|
|
||||||
|
// Add previous note contents to NoteEdit history
|
||||||
|
await NoteEdits.insert({
|
||||||
|
id: genId(),
|
||||||
|
noteId: note.id,
|
||||||
|
text: note.text || undefined,
|
||||||
|
cw: note.cw,
|
||||||
|
fileIds: note.fileIds,
|
||||||
|
updatedAt: update.updatedAt,
|
||||||
|
});
|
||||||
|
|
||||||
|
publishing = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
note = await Notes.findOneByOrFail({ id: note.id });
|
||||||
|
|
||||||
|
if (publishing) {
|
||||||
|
index(note, true);
|
||||||
|
|
||||||
|
// Publish update event for the updated note details
|
||||||
|
publishNoteStream(note.id, "updated", {
|
||||||
|
updatedAt: update.updatedAt,
|
||||||
|
});
|
||||||
|
|
||||||
|
(async () => {
|
||||||
|
const noteActivity = await renderNote(note, false);
|
||||||
|
noteActivity.updated = note.updatedAt.toISOString();
|
||||||
|
const updateActivity = renderUpdate(noteActivity, user);
|
||||||
|
updateActivity.to = noteActivity.to;
|
||||||
|
updateActivity.cc = noteActivity.cc;
|
||||||
|
const activity = renderActivity(updateActivity);
|
||||||
|
const dm = new DeliverManager(user, activity);
|
||||||
|
|
||||||
|
// Delivery to remote mentioned users
|
||||||
|
for (const u of mentionUsers.filter((u) => Users.isRemoteUser(u))) {
|
||||||
|
dm.addDirectRecipe(u as IRemoteUser);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Post is a reply and remote user is the contributor of the original post
|
||||||
|
if (note.reply && note.reply.userHost !== null) {
|
||||||
|
const u = await Users.findOneBy({ id: note.reply.userId });
|
||||||
|
if (u && Users.isRemoteUser(u)) dm.addDirectRecipe(u);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Post is a renote and remote user is the contributor of the original post
|
||||||
|
if (note.renote && note.renote.userHost !== null) {
|
||||||
|
const u = await Users.findOneBy({ id: note.renote.userId });
|
||||||
|
if (u && Users.isRemoteUser(u)) dm.addDirectRecipe(u);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Deliver to followers for non-direct posts.
|
||||||
|
if (["public", "home", "followers"].includes(note.visibility)) {
|
||||||
|
dm.addFollowersRecipe();
|
||||||
|
}
|
||||||
|
|
||||||
|
// Deliver to relays for public posts.
|
||||||
|
if (["public"].includes(note.visibility)) {
|
||||||
|
deliverToRelays(user, activity);
|
||||||
|
}
|
||||||
|
|
||||||
|
// GO!
|
||||||
|
dm.execute();
|
||||||
|
})();
|
||||||
|
}
|
||||||
|
|
||||||
|
return note;
|
||||||
|
}
|
||||||
|
|
||||||
|
function notEmpty(partial: Partial<any>) {
|
||||||
|
return Object.keys(partial).length > 0;
|
||||||
|
}
|
||||||
|
|
||||||
Loading…
Reference in a new issue