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

Revert "Merge pull request 'Add support for CW boosting' (#10047) from supakaity/hajkey:hk/cw-boost into develop" 

This reverts commit 5e86bafb24, reversing
changes made to d1977fc320.
This commit is contained in:
ThatOneCalculator 2023-05-07 11:38:39 -07:00
parent d0d49696e2
commit 988b530745
No known key found for this signature in database
GPG Key ID: 8703CACD01000000
14 changed files with 158 additions and 365 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
locales/en-US.yml
View File

@ -886,7 +886,6 @@ global: "Global"
recommended: "Recommended"
squareAvatars: "Display squared avatars"
seperateRenoteQuote: "Separate boost and quote buttons"
highlightCw: "Highlight content warned posts"
sent: "Sent"
received: "Received"
searchResult: "Search results"

3
packages/backend/src/services/note/create.ts
View File

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

5
packages/backend/src/services/note/reaction/create.ts
View File

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

67
packages/client/src/components/MkMenu.vue
View File

@ -13,12 +13,6 @@
>
<template v-for="(item, i) in items2">
<div v-if="item === null" class="divider"></div>
<template
v-else-if="
item.hidden ||
(item.visible !== undefined && !item.visible)
"
/>
<span v-else-if="item.type === 'label'" class="label item">
<span :style="item.textStyle || ''">{{
item.text
@ -27,7 +21,6 @@
<span
v-else-if="item.type === 'pending'"
class="pending item"
:class="classMap(item.classes)"
>
<span><MkEllipsis /></span>
</span>
@ -35,7 +28,6 @@
v-else-if="item.type === 'link'"
:to="item.to"
class="_button item"
:class="classMap(item.classes)"
@click.passive="close(true)"
@mouseenter.passive="onItemMouseEnter(item)"
@mouseleave.passive="onItemMouseLeave(item)"
@ -64,7 +56,6 @@
:target="item.target"
:download="item.download"
class="_button item"
:class="classMap(item.classes)"
@click="close(true)"
@mouseenter.passive="onItemMouseEnter(item)"
@mouseleave.passive="onItemMouseLeave(item)"
@ -82,12 +73,9 @@
></span>
</a>
<button
v-else-if="item.type === 'user'"
v-else-if="item.type === 'user' && !items.hidden"
class="_button item"
:class="{
active: item.active,
...classMap(item.classes),
}"
:class="{ active: item.active }"
:disabled="item.active"
@click="clicked(item.action, $event)"
@mouseenter.passive="onItemMouseEnter(item)"
@ -105,7 +93,6 @@
<span
v-else-if="item.type === 'switch'"
class="item"
:class="classMap(item.classes)"
@mouseenter.passive="onItemMouseEnter(item)"
@mouseleave.passive="onItemMouseLeave(item)"
>
@ -117,29 +104,10 @@
>{{ item.text }}</FormSwitch
>
</span>
<span
v-else-if="item.type === 'input'"
:tabindex="i"
class="item"
:class="classMap(item.classes)"
@mouseenter.passive="onItemMouseEnter(item)"
@mouseleave.passive="onItemMouseLeave(item)"
>
<FormInput
v-model="item.ref"
:disabled="item.disabled"
class="form-input"
:required="item.required"
:placeholder="item.placeholder"
/>
</span>
<button
v-else-if="item.type === 'parent'"
class="_button item parent"
:class="{
childShowing: childShowingItem === item,
...classMap(item.classes),
}"
:class="{ childShowing: childShowingItem === item }"
@mouseenter="showChildren(item, $event)"
@click="showChildren(item, $event)"
>
@ -158,13 +126,9 @@
></span>
</button>
<button
v-else
v-else-if="!item.hidden"
class="_button item"
:class="{
danger: item.danger,
active: item.active,
...classMap(item.classes),
}"
:class="{ danger: item.danger, active: item.active }"
:disabled="item.active"
@click="clicked(item.action, $event)"
@mouseenter.passive="onItemMouseEnter(item)"
@ -222,14 +186,7 @@ import {
} from "vue";
import { focusPrev, focusNext } from "@/scripts/focus";
import FormSwitch from "@/components/form/switch.vue";
import FormInput from "@/components/form/input.vue";
import {
MenuItem,
InnerMenuItem,
MenuPending,
MenuAction,
MenuClasses,
} from "@/types/menu";
import { MenuItem, InnerMenuItem, MenuPending, MenuAction } from "@/types/menu";
import * as os from "@/os";
import { i18n } from "@/i18n";
import { FocusTrap } from "focus-trap-vue";
@ -287,18 +244,6 @@ watch(
let childMenu = $ref<MenuItem[] | null>();
let childTarget = $ref<HTMLElement | null>();
function classMap(classes?: MenuClasses) {
if (!classes) return {};
return (Array.isArray(classes) ? classes : classes.value).reduce(
(acc, cls) => {
acc[cls] = true;
return acc;
},
{}
);
}
function closeChild() {
childMenu = null;
childShowingItem = null;

3
packages/client/src/components/MkNote.vue
View File

@ -79,7 +79,7 @@
<div class="body">
<MkSubNoteContent
class="text"
:note="note"
:note="appearNote"
:detailed="true"
:detailedView="detailedView"
:parentId="appearNote.parentId"
@ -139,7 +139,6 @@
class="button"
:note="appearNote"
:count="appearNote.renoteCount"
:renoteCw="note.cw"
/>
<XStarButtonNoEmoji
v-if="!enableEmojiReactions"

1
packages/client/src/components/MkNoteSub.vue
View File

@ -69,7 +69,6 @@
class="button"
:note="appearNote"
:count="appearNote.renoteCount"
:renoteCw="note.cw"
/>
<XStarButtonNoEmoji
v-if="!enableEmojiReactions"

21
packages/client/src/components/MkPopupMenu.vue
View File

@ -17,19 +17,17 @@
:max-height="maxHeight"
:as-drawer="type === 'drawer'"
class="sfhdhdhq"
:class="{
drawer: type === 'drawer',
...classMap(classes),
}"
:class="{ drawer: type === 'drawer' }"
@close="modal.close()"
/>
</MkModal>
</template>
<script lang="ts" setup>
import {} from "vue";
import MkModal from "./MkModal.vue";
import MkMenu from "./MkMenu.vue";
import { MenuClasses, MenuItem } from "@/types/menu";
import { MenuItem } from "@/types/menu";
defineProps<{
items: MenuItem[];
@ -37,7 +35,6 @@ defineProps<{
width?: number;
viaKeyboard?: boolean;
src?: any;
classes?: MenuClasses;
}>();
const emit = defineEmits<{
@ -45,18 +42,6 @@ const emit = defineEmits<{
}>();
let modal = $ref<InstanceType<typeof MkModal>>();
function classMap(classes?: MenuClasses) {
if (!classes) return {};
return (Array.isArray(classes) ? classes : classes.value).reduce(
(acc, cls) => {
acc[cls] = true;
return acc;
},
{}
);
}
</script>
<style lang="scss" scoped>

49
packages/client/src/components/MkRenoteButton.vue
View File

@ -4,7 +4,6 @@
ref="buttonRef"
v-tooltip.noDelay.bottom="i18n.ts.renote"
class="eddddedb _button canRenote"
:class="{ addCw }"
@click="renote(false, $event)"
>
<i class="ph-repeat ph-bold ph-lg"></i>
@ -26,18 +25,13 @@ import { $i } from "@/account";
import { useTooltip } from "@/scripts/use-tooltip";
import { i18n } from "@/i18n";
import { defaultStore } from "@/store";
import { MenuItem } from "@/types/menu";
import { add } from "date-fns";
const props = defineProps<{
note: misskey.entities.Note;
count: number;
renoteCw?: string | null;
}>();
const buttonRef = ref<HTMLElement>();
const addCw = ref<boolean>(!!props.renoteCw);
const cwInput = ref<string>(props.renoteCw ?? "");
const canRenote = computed(
() =>
@ -45,8 +39,6 @@ const canRenote = computed(
props.note.userId === $i.id
);
const getCw = () => (addCw.value ? cwInput.value : props.note.cw ?? undefined);
useTooltip(buttonRef, async (showing) => {
const renotes = await os.api("notes/renotes", {
noteId: props.note.id,
@ -81,12 +73,9 @@ const renote = async (viaKeyboard = false, ev?: MouseEvent) => {
const users = renotes.map((x) => x.user.id);
const hasRenotedBefore = users.includes($i.id);
let buttonActions: Array<MenuItem> = [];
let buttonActions = [];
if (
props.note.visibility === "public" ||
props.note.visibility === "hidden"
) {
if (props.note.visibility === "public" || props.note.visibility === "hidden") {
buttonActions.push({
text: i18n.ts.renote,
textStyle: "font-weight: bold",
@ -96,7 +85,6 @@ const renote = async (viaKeyboard = false, ev?: MouseEvent) => {
os.api("notes/create", {
renoteId: props.note.id,
visibility: "public",
cw: getCw(),
});
const el =
ev &&
@ -123,7 +111,6 @@ const renote = async (viaKeyboard = false, ev?: MouseEvent) => {
os.api("notes/create", {
renoteId: props.note.id,
visibility: "home",
cw: getCw(),
});
const el =
ev &&
@ -151,7 +138,6 @@ const renote = async (viaKeyboard = false, ev?: MouseEvent) => {
renoteId: props.note.id,
visibility: "specified",
visibleUserIds: props.note.visibleUserIds,
cw: getCw(),
});
const el =
ev &&
@ -176,7 +162,6 @@ const renote = async (viaKeyboard = false, ev?: MouseEvent) => {
os.api("notes/create", {
renoteId: props.note.id,
visibility: "followers",
cw: getCw(),
});
const el =
ev &&
@ -194,30 +179,7 @@ const renote = async (viaKeyboard = false, ev?: MouseEvent) => {
});
}
const showQuote = !defaultStore.state.seperateRenoteQuote;
if (!props.note.cw || props.note.cw === "") {
buttonActions.push({
type: "switch",
ref: addCw,
text: "Add content warning",
hidden: addCw,
});
buttonActions.push({
type: "input",
ref: cwInput,
placeholder: "Content warning",
required: true,
visible: addCw,
});
if (showQuote || hasRenotedBefore) {
buttonActions.push(null);
}
}
if (showQuote) {
if (!defaultStore.state.seperateRenoteQuote) {
buttonActions.push({
text: i18n.ts.quote,
icon: "ph-quotes ph-bold ph-lg",
@ -242,10 +204,7 @@ const renote = async (viaKeyboard = false, ev?: MouseEvent) => {
},
});
}
os.popupMenu(buttonActions, buttonRef.value, {
viaKeyboard,
});
os.popupMenu(buttonActions, buttonRef.value, { viaKeyboard });
};
</script>

130
packages/client/src/components/MkSubNoteContent.vue
View File

@ -1,14 +1,8 @@
<template>
<div
:class="{
hasCw: !!cw,
cwHighlight,
}"
>
<p v-if="cw != null" class="cw">
<p v-if="note.cw != null" class="cw">
<MkA
v-if="!detailed && appearNote.replyId"
:to="`/notes/${appearNote.replyId}`"
v-if="!detailed && note.replyId"
:to="`/notes/${note.replyId}`"
class="reply-icon"
@click.stop
>
@ -17,35 +11,35 @@
<MkA
v-if="
conversation &&
appearNote.renoteId &&
appearNote.renoteId != parentId &&
!appearNote.replyId
note.renoteId &&
note.renoteId != parentId &&
!note.replyId
"
:to="`/notes/${appearNote.renoteId}`"
:to="`/notes/${note.renoteId}`"
class="reply-icon"
@click.stop
>
<i class="ph-quotes ph-bold ph-lg"></i>
</MkA>
<Mfm
v-if="cw != ''"
v-if="note.cw != ''"
class="text"
:text="cw"
:author="appearNote.user"
:text="note.cw"
:author="note.user"
:i="$i"
:custom-emojis="appearNote.emojis"
:custom-emojis="note.emojis"
/>
</p>
<div class="wrmlmaau">
<div
class="content"
:class="{ collapsed, isLong, showContent: cw && !showContent }"
:class="{ collapsed, isLong, showContent: note.cw && !showContent }"
>
<XCwButton
ref="cwButton"
v-if="cw && !showContent"
v-if="note.cw && !showContent"
v-model="showContent"
:note="appearNote"
:note="note"
v-on:keydown="focusFooter"
/>
<div
@ -55,13 +49,13 @@
tabindex: !showContent ? '-1' : null,
}"
>
<span v-if="appearNote.deletedAt" style="opacity: 0.5"
<span v-if="note.deletedAt" style="opacity: 0.5"
>({{ i18n.ts.deleted }})</span
>
<template v-if="!cw">
<template v-if="!note.cw">
<MkA
v-if="!detailed && appearNote.replyId"
:to="`/notes/${appearNote.replyId}`"
v-if="!detailed && note.replyId"
:to="`/notes/${note.replyId}`"
class="reply-icon"
@click.stop
>
@ -70,11 +64,11 @@
<MkA
v-if="
conversation &&
appearNote.renoteId &&
appearNote.renoteId != parentId &&
!appearNote.replyId
note.renoteId &&
note.renoteId != parentId &&
!note.replyId
"
:to="`/notes/${appearNote.renoteId}`"
:to="`/notes/${note.renoteId}`"
class="reply-icon"
@click.stop
>
@ -82,26 +76,22 @@
</MkA>
</template>
<Mfm
v-if="appearNote.text"
:text="appearNote.text"
:author="appearNote.user"
v-if="note.text"
:text="note.text"
:author="note.user"
:i="$i"
:custom-emojis="appearNote.emojis"
:custom-emojis="note.emojis"
/>
<MkA
v-if="!detailed && appearNote.renoteId"
v-if="!detailed && note.renoteId"
class="rp"
:to="`/notes/${appearNote.renoteId}`"
:to="`/notes/${note.renoteId}`"
>{{ i18n.ts.quoteAttached }}: ...</MkA
>
<div v-if="appearNote.files.length > 0" class="files">
<XMediaList :media-list="appearNote.files" />
<div v-if="note.files.length > 0" class="files">
<XMediaList :media-list="note.files" />
</div>
<XPoll
v-if="appearNote.poll"
:note="appearNote"
class="poll"
/>
<XPoll v-if="note.poll" :note="note" class="poll" />
<template v-if="detailed">
<MkUrlPreview
v-for="url in urls"
@ -112,15 +102,15 @@
class="url-preview"
/>
<div
v-if="appearNote.renote"
v-if="note.renote"
class="renote"
@click.stop="emit('push', appearNote.renote)"
@click.stop="emit('push', note.renote)"
>
<XNoteSimple :note="appearNote.renote" />
<XNoteSimple :note="note.renote" />
</div>
</template>
<div
v-if="cw && !showContent"
v-if="note.cw && !showContent"
tabindex="0"
v-on:focus="cwButton?.focus()"
></div>
@ -129,8 +119,7 @@
v-if="isLong"
v-model="collapsed"
></XShowMoreButton>
<XCwButton v-if="cw" v-model="showContent" :note="appearNote" />
</div>
<XCwButton v-if="note.cw" v-model="showContent" :note="note" />
</div>
</div>
</template>
@ -147,7 +136,6 @@ import XShowMoreButton from "@/components/MkShowMoreButton.vue";
import XCwButton from "@/components/MkCwButton.vue";
import { extractUrlFromMfm } from "@/scripts/extract-url-from-mfm";
import { i18n } from "@/i18n";
import { defaultStore } from "@/store";
const props = defineProps<{
note: misskey.entities.Note;
@ -162,30 +150,16 @@ const emit = defineEmits<{
(ev: "focusfooter"): void;
}>();
const note = props.note;
const isRenote =
note.renote != null &&
note.text == null &&
note.fileIds.length === 0 &&
note.poll == null;
let appearNote = $computed(() =>
isRenote ? (note.renote as misskey.entities.Note) : note
);
let cw = $computed(() => appearNote.cw || note.cw);
const cwHighlight = defaultStore.state.highlightCw;
const cwButton = ref<HTMLElement>();
const isLong =
!props.detailedView &&
!cw &&
appearNote.text != null &&
(appearNote.text.split("\n").length > 9 || appearNote.text.length > 500);
const collapsed = $ref(!cw && isLong);
props.note.cw == null &&
props.note.text != null &&
(props.note.text.split("\n").length > 9 || props.note.text.length > 500);
const collapsed = $ref(props.note.cw == null && isLong);
const urls = appearNote.text
? extractUrlFromMfm(mfm.parse(appearNote.text)).slice(0, 5)
const urls = props.note.text
? extractUrlFromMfm(mfm.parse(props.note.text)).slice(0, 5)
: null;
let showContent = $ref(false);
@ -219,23 +193,6 @@ function focusFooter(ev) {
overflow-wrap: break-word;
> .text {
margin-right: 8px;
padding-inline-start: 0.25em;
}
}
.cwHighlight.hasCw {
outline: 1px dotted var(--cwFg);
border-radius: 5px;
> .wrmlmaau {
padding-inline-start: 0.25em;
}
> .cw {
background-color: var(--cwFg);
color: var(--cwBg);
border-top-left-radius: 5px;
border-top-right-radius: 5px;
> .reply-icon {
color: var(--cwBg);
}
}
}
.wrmlmaau {
@ -267,9 +224,11 @@ function focusFooter(ev) {
> .url-preview {
margin-top: 8px;
}
> .poll {
font-size: 80%;
}
> .renote {
padding-top: 8px;
> * {
@ -284,6 +243,7 @@ function focusFooter(ev) {
}
}
}
&.collapsed,
&.showContent {
position: relative;

11
packages/client/src/os.ts
View File

@ -1,13 +1,6 @@
// TODO: なんでもかんでもos.tsに突っ込むのやめたいのでよしなに分割する
import {
Component,
markRaw,
Ref,
ref,
defineAsyncComponent,
ComputedRef,
} from "vue";
import { Component, markRaw, Ref, ref, defineAsyncComponent } from "vue";
import { EventEmitter } from "eventemitter3";
import insertTextAtCursor from "insert-text-at-cursor";
import * as Misskey from "calckey-js";
@ -771,7 +764,6 @@ export function popupMenu(
align?: string;
width?: number;
viaKeyboard?: boolean;
classes?: string[] | Ref<Array<string>> | ComputedRef<Array<string>>;
},
) {
return new Promise((resolve, reject) => {
@ -784,7 +776,6 @@ export function popupMenu(
width: options?.width,
align: options?.align,
viaKeyboard: options?.viaKeyboard,
classes: options?.classes,
},
{
closed: () => {

4
packages/client/src/pages/settings/general.vue
View File

@ -123,9 +123,6 @@
<FormSwitch v-model="seperateRenoteQuote" class="_formBlock">{{
i18n.ts.seperateRenoteQuote
}}</FormSwitch>
<FormSwitch v-model="highlightCw" class="_formBlock">{{
i18n.ts.highlightCw
}}</FormSwitch>
<FormSwitch v-model="useSystemFont" class="_formBlock">{{
i18n.ts.useSystemFont
}}</FormSwitch>
@ -305,7 +302,6 @@ const useReactionPickerForContextMenu = computed(
const seperateRenoteQuote = computed(
defaultStore.makeGetterSetter("seperateRenoteQuote")
);
const highlightCw = computed(defaultStore.makeGetterSetter("highlightCw"));
const squareAvatars = computed(defaultStore.makeGetterSetter("squareAvatars"));
const showUpdates = computed(defaultStore.makeGetterSetter("showUpdates"));
const swipeOnDesktop = computed(

4
packages/client/src/store.ts
View File

@ -146,10 +146,6 @@ export const defaultStore = markRaw(
where: "device",
default: true,
},
highlightCw: {
where: "device",
default: false,
},
nsfw: {
where: "device",
default: "respect" as "respect" | "force" | "ignore",

64
packages/client/src/types/menu.ts
View File

@ -1,26 +1,16 @@
import * as Misskey from "calckey-js";
import { ComputedRef, Ref } from "vue";
export type MenuClasses =
| Array<string>
| Ref<Array<string>>
| ComputedRef<Array<string>>;
export type MenuBase = {
classes?: MenuClasses;
hidden?: boolean | Ref<boolean>;
visible?: boolean | Ref<boolean>;
};
import { Ref } from "vue";
export type MenuAction = (ev: MouseEvent) => void;
export type MenuDivider = null;
export type MenuNull = undefined;
export type MenuLabel = MenuBase & {
export type MenuLabel = {
type: "label";
text: string;
textStyle?: string;
};
export type MenuLink = MenuBase & {
export type MenuLink = {
type: "link";
to: string;
text: string;
@ -29,7 +19,7 @@ export type MenuLink = MenuBase & {
indicate?: boolean;
avatar?: Misskey.entities.User;
};
export type MenuA = MenuBase & {
export type MenuA = {
type: "a";
href: string;
target?: string;
@ -39,21 +29,22 @@ export type MenuA = MenuBase & {
icon?: string;
indicate?: boolean;
};
export type MenuUser = MenuBase & {
export type MenuUser = {
type: "user";
user: Misskey.entities.User;
active?: boolean;
indicate?: boolean;
hidden?: boolean;
action: MenuAction;
};
export type MenuSwitch = MenuBase & {
export type MenuSwitch = {
type: "switch";
ref: Ref<boolean>;
text: string;
textStyle?: string;
disabled?: boolean;
};
export type MenuButton = MenuBase & {
export type MenuButton = {
type?: "button";
text: string;
textStyle?: string;
@ -61,28 +52,11 @@ export type MenuButton = MenuBase & {
indicate?: boolean;
danger?: boolean;
active?: boolean;
hidden?: boolean;
avatar?: Misskey.entities.User;
action: MenuAction;
};
export type MenuButtonMultipleIcons = MenuBase & {
type?: "button";
text: string;
textStyle?: string;
icons: string[];
indicate?: boolean;
danger?: boolean;
active?: boolean;
avatar?: Misskey.entities.User;
action: MenuAction;
};
export type MenuInput = MenuBase & {
type: "input";
ref: Ref<string>;
placeholder: string;
disabled?: boolean;
required?: boolean | Ref<boolean>;
};
export type MenuParent = MenuBase & {
export type MenuParent = {
type: "parent";
text: string;
textStyle?: string;
@ -90,9 +64,7 @@ export type MenuParent = MenuBase & {
children: OuterMenuItem[];
};
export type MenuPending = MenuBase & {
type: "pending";
};
export type MenuPending = { type: "pending" };
type OuterMenuItem =
| MenuDivider
@ -103,19 +75,9 @@ type OuterMenuItem =
| MenuUser
| MenuSwitch
| MenuButton
| MenuButtonMultipleIcons
| MenuInput
| MenuParent;
type OuterPromiseMenuItem = Promise<
| MenuLabel
| MenuLink
| MenuA
| MenuUser
| MenuSwitch
| MenuButton
| MenuButtonMultipleIcons
| MenuInput
| MenuParent
MenuLabel | MenuLink | MenuA | MenuUser | MenuSwitch | MenuButton | MenuParent
>;
export type MenuItem = OuterMenuItem | OuterPromiseMenuItem;
export type InnerMenuItem =
@ -127,6 +89,4 @@ export type InnerMenuItem =
| MenuUser
| MenuSwitch
| MenuButton
| MenuButtonMultipleIcons
| MenuInput
| MenuParent;