Revert "fix: hidden post federation"

This reverts commit 8a51c73fe7.
This commit is contained in:
ThatOneCalculator 2023-05-07 18:01:36 -07:00
parent 3dcd6c0e4a
commit ba7418aa6d
No known key found for this signature in database
GPG Key ID: 8703CACD01000000
4 changed files with 9 additions and 12 deletions

View File

@ -16,7 +16,6 @@ export default async function renderNote(
dive = true,
isTalk = false,
): Promise<Record<string, unknown>> {
note.visibility = note.visibility === "hidden" ? "home" : note.visibility;
const getPromisedFiles = async (ids: string[]) => {
if (!ids || ids.length === 0) return [];
const items = await DriveFiles.findBy({ id: In(ids) });

View File

@ -606,7 +606,7 @@ export default async (
});
async function renderNoteOrRenoteActivity(data: Option, note: Note) {
if (data.localOnly || note.visibility !== "hidden") return null;
if (data.localOnly) return null;
const content =
data.renote &&

View File

@ -144,7 +144,11 @@ export default async (
});
//#region deliver
if (Users.isLocalUser(user) && !note.localOnly) {
if (
Users.isLocalUser(user) &&
!note.localOnly &&
note.visibility !== "hidden"
) {
const content = renderActivity(await renderLike(record, note));
const dm = new DeliverManager(user, content);
if (note.userHost !== null) {

View File

@ -35,7 +35,7 @@ const buttonRef = ref<HTMLElement>();
const canRenote = computed(
() =>
["public", "home", "hidden"].includes(props.note.visibility) ||
["public", "home"].includes(props.note.visibility) ||
props.note.userId === $i.id
);
@ -75,10 +75,7 @@ const renote = async (viaKeyboard = false, ev?: MouseEvent) => {
let buttonActions = [];
if (
props.note.visibility === "public" ||
props.note.visibility === "hidden"
) {
if (props.note.visibility === "public") {
buttonActions.push({
text: i18n.ts.renote,
textStyle: "font-weight: bold",
@ -105,11 +102,8 @@ const renote = async (viaKeyboard = false, ev?: MouseEvent) => {
});
}
if (["public", "home", "hidden"].includes(props.note.visibility)) {
buttonActions.push({
text: `${i18n.ts.renote} (${i18n.ts._visibility.home})`,
if (["public", "home"].includes(props.note.visibility)) {
icon: "ph-house ph-bold ph-lg",
danger: false,
action: () => {
os.api("notes/create", {
renoteId: props.note.id,