Merge branch 'develop' into 'develop'

fix import notes federated initially

Co-authored-by: CGsama <CGsama@outlook.com>

See merge request firefish/firefish!10639
This commit is contained in:
Kainoa Kanter 2023-11-10 15:32:23 +00:00
commit 6f951855f3

View File

@ -175,7 +175,7 @@ export default async (
) => ) =>
// rome-ignore lint/suspicious/noAsyncPromiseExecutor: FIXME // rome-ignore lint/suspicious/noAsyncPromiseExecutor: FIXME
new Promise<Note>(async (res, rej) => { new Promise<Note>(async (res, rej) => {
const dontFederateInitially = data.visibility === "hidden"; const dontFederateInitially = data.visibility?.startsWith("hidden") === true;
// If you reply outside the channel, match the scope of the target. // If you reply outside the channel, match the scope of the target.
// TODO (I think it's a process that could be done on the client side, but it's server side for now.) // TODO (I think it's a process that could be done on the client side, but it's server side for now.)
@ -209,7 +209,7 @@ export default async (
if (data.channel != null) data.visibility = "public"; if (data.channel != null) data.visibility = "public";
if (data.channel != null) data.visibleUsers = []; if (data.channel != null) data.visibleUsers = [];
if (data.channel != null) data.localOnly = true; if (data.channel != null) data.localOnly = true;
if (data.visibility.startsWith("hidden")) if (data.visibility.startsWith("hidden") && data.visibility !== "hidden")
data.visibility = data.visibility.slice(6); data.visibility = data.visibility.slice(6);
// enforce silent clients on server // enforce silent clients on server