natty
/
calckey
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' into beta

This commit is contained in:
ThatOneCalculator 2023-06-06 12:11:37 -07:00
parent 2d79418851 f621e58efa
commit 7ecb20bf79
No known key found for this signature in database
GPG Key ID: 8703CACD01000000
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
packages/backend/src/remote/activitypub/models/note.ts
View File

@ -52,7 +52,8 @@ import { UserProfiles } from "@/models/index.js";
import { In } from "typeorm"; import { In } from "typeorm";
import { DB_MAX_IMAGE_COMMENT_LENGTH } from "@/misc/hard-limits.js"; import { DB_MAX_IMAGE_COMMENT_LENGTH } from "@/misc/hard-limits.js";
import { truncate } from "@/misc/truncate.js"; import { truncate } from "@/misc/truncate.js";
import { type Size, getEmojiSize } from "@/misc/emoji-meta.js"; import { type Size, getEmojiSize } from "@/misc/emoji-meta.js";\
import { fetchMeta } from "@/misc/fetch-meta.js";
const logger = apLogger; const logger = apLogger;
@ -544,6 +545,10 @@ function notEmpty(partial: Partial<any>) {
export async function updateNote(value: string | IObject, resolver?: Resolver) { export async function updateNote(value: string | IObject, resolver?: Resolver) {
const uri = typeof value === "string" ? value : value.id; const uri = typeof value === "string" ? value : value.id;
if (!uri) throw new Error("Missing note uri"); if (!uri) throw new Error("Missing note uri");
const instanceMeta = await fetchMeta();
if (instanceMeta.experimentalFeatures?.postEdits === false) {
throw new Error("Post edits disabled.");
}
// Skip if URI points to this server // Skip if URI points to this server
if (uri.startsWith(`${config.url}/`)) throw new Error("uri points local"); if (uri.startsWith(`${config.url}/`)) throw new Error("uri points local");

2
packages/backend/src/server/api/endpoints/meta.ts
View File

@ -1,4 +1,4 @@
import * as JSON5 from "json5"; import JSON5 from "json5";
import { IsNull, MoreThan } from "typeorm"; import { IsNull, MoreThan } from "typeorm";
import config from "@/config/index.js"; import config from "@/config/index.js";
import { fetchMeta } from "@/misc/fetch-meta.js"; import { fetchMeta } from "@/misc/fetch-meta.js";

3
packages/backend/src/server/api/endpoints/notes/edit.ts
View File

@ -244,8 +244,9 @@ export default define(meta, paramDef, async (ps, user) => {
if (user.movedToUri != null) throw new ApiError(meta.errors.accountLocked); if (user.movedToUri != null) throw new ApiError(meta.errors.accountLocked);
const instanceMeta = await fetchMeta(); const instanceMeta = await fetchMeta();
if (instanceMeta.experimentalFeatures?.postImports === false) if (instanceMeta.experimentalFeatures?.postEdits === false) {
throw new ApiError(meta.errors.editsDisabled); throw new ApiError(meta.errors.editsDisabled);
}
if (!Users.isLocalUser(user)) { if (!Users.isLocalUser(user)) {
throw new ApiError(meta.errors.notLocalUser); throw new ApiError(meta.errors.notLocalUser);