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

Note fetching from Magnetar!

This commit is contained in:
Natty 2023-11-05 20:31:50 +01:00
parent 0ad015cd68
commit e7812a816b
Signed by: natty
GPG Key ID: BF6CB659ADEE60EC
74 changed files with 2217 additions and 640 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Cargo.lock generated
View File

@ -535,7 +535,7 @@ dependencies = [
[[package]]
name = "ck"
version = "0.2.1-alpha"
version = "0.3.0-alpha"
dependencies = [
"sea-orm",
"serde",
@ -835,7 +835,7 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0"
[[package]]
name = "ext_calckey_model_migration"
version = "0.2.1-alpha"
version = "0.3.0-alpha"
dependencies = [
"sea-orm-migration",
"tokio",
@ -1446,7 +1446,7 @@ dependencies = [
[[package]]
name = "magnetar"
version = "0.2.1-alpha"
version = "0.3.0-alpha"
dependencies = [
"axum",
"cached",
@ -1487,7 +1487,7 @@ dependencies = [
[[package]]
name = "magnetar_calckey_fe"
version = "0.2.1-alpha"
version = "0.3.0-alpha"
dependencies = [
"axum",
"chrono",
@ -1511,7 +1511,7 @@ dependencies = [
[[package]]
name = "magnetar_calckey_model"
version = "0.2.1-alpha"
version = "0.3.0-alpha"
dependencies = [
"chrono",
"ck",
@ -1536,7 +1536,7 @@ dependencies = [
[[package]]
name = "magnetar_common"
version = "0.2.1-alpha"
version = "0.3.0-alpha"
dependencies = [
"idna",
"magnetar_core",
@ -1550,7 +1550,7 @@ dependencies = [
[[package]]
name = "magnetar_core"
version = "0.2.1-alpha"
version = "0.3.0-alpha"
dependencies = [
"serde",
"serde_json",
@ -1558,7 +1558,7 @@ dependencies = [
[[package]]
name = "magnetar_mmm_parser"
version = "0.2.1-alpha"
version = "0.3.0-alpha"
dependencies = [
"compact_str",
"either",
@ -1574,7 +1574,7 @@ dependencies = [
[[package]]
name = "magnetar_nodeinfo"
version = "0.2.1-alpha"
version = "0.3.0-alpha"
dependencies = [
"serde",
"serde_json",
@ -1582,7 +1582,7 @@ dependencies = [
[[package]]
name = "magnetar_sdk"
version = "0.2.1-alpha"
version = "0.3.0-alpha"
dependencies = [
"chrono",
"http",
@ -1596,7 +1596,7 @@ dependencies = [
[[package]]
name = "magnetar_sdk_macros"
version = "0.2.1-alpha"
version = "0.3.0-alpha"
dependencies = [
"quote",
"syn 2.0.28",
@ -1604,7 +1604,7 @@ dependencies = [
[[package]]
name = "magnetar_webfinger"
version = "0.2.1-alpha"
version = "0.3.0-alpha"
dependencies = [
"magnetar_core",
"serde",

2
Cargo.toml
View File

@ -19,7 +19,7 @@ members = [
]
[workspace.package]
version = "0.2.1-alpha"
version = "0.3.0-alpha"
edition = "2021"
[workspace.dependencies]

937
fe_calckey/frontend/client/src/components/MagNote.vue Normal file
View File

@ -0,0 +1,937 @@
<template>
<div
:aria-label="accessibleLabel"
v-if="!muted.muted"
v-show="!isDeleted"
ref="el"
v-hotkey="keymap"
v-size="{ max: [500, 350] }"
class="tkcbzcuz note-container"
:tabindex="!isDeleted ? '-1' : null"
:class="{ renote: isRenote }"
:id="appearNote.id"
>
<MkNoteSub
v-if="appearNote.parent_note && !detailedView && !collapsedReply"
:note="appearNote.parent_note"
class="reply-to"
/>
<div
v-if="!detailedView"
class="note-context"
@click="noteClick"
:class="{
collapsedReply: collapsedReply && appearNote.parent_note,
}"
>
<div class="line"></div>
<div v-if="appearNote._prId_" class="info">
<i class="ph-megaphone-simple-bold ph-lg"></i>
{{ i18n.ts.promotion
}}<button class="_textButton hide" @click.stop="readPromo()">
{{ i18n.ts.hideThisNote }}
<i class="ph-x ph-bold ph-lg"></i>
</button>
</div>
<div v-if="appearNote._featuredId_" class="info">
<i class="ph-lightning ph-bold ph-lg"></i>
{{ i18n.ts.featured }}
</div>
<div v-if="pinned" class="info">
<i class="ph-push-pin ph-bold ph-lg"></i
>{{ i18n.ts.pinnedNote }}
</div>
<div v-if="isRenote" class="renote">
<i class="ph-repeat ph-bold ph-lg"></i>
<I18n :src="i18n.ts.renotedBy" tag="span">
<template #user>
<MkA
v-user-preview="note.user.id"
class="name"
:to="userPage(note.user)"
@click.stop
>
<MkUserName :user="note.user" />
</MkA>
</template>
</I18n>
<div class="info">
<button
ref="renoteTime"
class="_button time"
@click.stop="showRenoteMenu()"
>
<i
v-if="isMyRenote"
class="ph-dots-three-outline ph-bold ph-lg dropdownIcon"
></i>
<MkTime :time="note.created_at" />
</button>
<MkVisibility :note="note" />
</div>
</div>
<div v-if="collapsedReply && appearNote.parent_note" class="info">
<MkAvatar class="avatar" :user="appearNote.parent_note.user" />
<MkUserName
class="username"
:user="appearNote.parent_note.user"
></MkUserName>
<Mfm
class="summary"
:text="getNoteSummary(appearNote.parent_note)"
:plain="true"
:nowrap="true"
:custom-emojis="note.emojis"
/>
</div>
</div>
<article
class="article"
@contextmenu.stop="onContextmenu"
@click="noteClick"
:style="{
cursor: expandOnNoteClick && !detailedView ? 'pointer' : '',
}"
>
<div class="main">
<div class="header-container">
<MkAvatar class="avatar" :user="appearNote.user" />
<XNoteHeader class="header" :note="appearNote" />
</div>
<div class="body">
<MkSubNoteContent
class="text"
:note="appearNote"
:detailed="true"
:detailedView="detailedView"
:parentId="appearNote.id"
@push="(e) => router.push(notePage(e))"
@focusfooter="footerEl.focus()"
@expanded="(e) => setPostExpanded(e)"
></MkSubNoteContent>
<div v-if="translating || translation" class="translation">
<MkLoading v-if="translating" mini />
<div v-else class="translated">
<b
>{{
i18n.t("translatedFrom", {
x: translation.sourceLang,
})
}}:
</b>
<Mfm
:text="translation.text"
:author="appearNote.user"
:i="$i"
:custom-emojis="appearNote.emojis"
/>
</div>
</div>
</div>
<div v-if="detailedView" class="info">
<MkA class="created-at" :to="notePage(appearNote)">
<MkTime :time="appearNote.created_at" mode="absolute" />
</MkA>
</div>
<footer ref="footerEl" class="footer" @click.stop tabindex="-1">
<XReactionsViewer
v-if="enableEmojiReactions"
ref="reactionsViewer"
:note="appearNote"
/>
<button
v-tooltip.noDelay.bottom="i18n.ts.reply"
class="button _button"
@click="reply()"
>
<i class="ph-arrow-u-up-left ph-bold ph-lg"></i>
<template
v-if="appearNote.reply_count > 0 && !detailedView"
>
<p class="count">{{ appearNote.reply_count }}</p>
</template>
</button>
<XRenoteButton
ref="renoteButton"
class="button"
:note="appearNote"
:count="appearNote.renote_count"
:detailedView="detailedView"
/>
<XStarButtonNoEmoji
v-if="!enableEmojiReactions"
class="button"
:note="appearNote"
:count="magReactionCount(appearNote)"
:reacted="magHasReacted(appearNote)"
/>
<XStarButton
v-if="
enableEmojiReactions && !magHasReacted(appearNote)
"
ref="starButton"
class="button"
:note="appearNote"
/>
<button
v-if="
enableEmojiReactions && !magHasReacted(appearNote)
"
ref="reactButton"
v-tooltip.noDelay.bottom="i18n.ts.reaction"
class="button _button"
@click="react()"
>
<i class="ph-smiley ph-bold ph-lg"></i>
</button>
<button
v-if="enableEmojiReactions && magHasReacted(appearNote)"
ref="reactButton"
class="button _button reacted"
@click="undoReact(appearNote)"
v-tooltip.noDelay.bottom="i18n.ts.removeReaction"
>
<i class="ph-minus ph-bold ph-lg"></i>
</button>
<XQuoteButton class="button" :note="appearNote" />
<button
ref="menuButton"
v-tooltip.noDelay.bottom="i18n.ts.more"
class="button _button"
@click="menu()"
>
<i class="ph-dots-three-outline ph-bold ph-lg"></i>
</button>
</footer>
</div>
</article>
</div>
<button v-else class="muted _button" @click="muted.muted = false">
<I18n :src="softMuteReasonI18nSrc(muted.what)" tag="small">
<template #name>
<MkA
v-user-preview="note.user.id"
class="name"
:to="userPage(note.user)"
>
<MkUserName :user="note.user" />
</MkA>
</template>
<template #reason>
<b class="_blur_text">{{ muted.matched.join(", ") }}</b>
</template>
</I18n>
</button>
</template>
<script lang="ts" setup>
import type { Ref } from "vue";
import { computed, inject, onMounted, ref, toRaw } from "vue";
import * as mfm from "mfm-js";
import type * as misskey from "calckey-js";
import MkNoteSub from "@/components/MkNoteSub.vue";
import MkSubNoteContent from "./MkSubNoteContent.vue";
import XNoteHeader from "@/components/MkNoteHeader.vue";
import XRenoteButton from "@/components/MkRenoteButton.vue";
import XReactionsViewer from "@/components/MkReactionsViewer.vue";
import XStarButton from "@/components/MkStarButton.vue";
import XStarButtonNoEmoji from "@/components/MkStarButtonNoEmoji.vue";
import XQuoteButton from "@/components/MkQuoteButton.vue";
import MkVisibility from "@/components/MkVisibility.vue";
import copyToClipboard from "@/scripts/copy-to-clipboard";
import { url } from "@/config";
import { pleaseLogin } from "@/scripts/please-login";
import { focusNext, focusPrev } from "@/scripts/focus";
import { getWordSoftMute } from "@/scripts/check-word-mute";
import { useRouter } from "@/router";
import { userPage } from "@/filters/user";
import * as os from "@/os";
import { defaultStore, noteViewInterruptors } from "@/store";
import { reactionPicker } from "@/scripts/reaction-picker";
import { $i } from "@/account";
import { i18n } from "@/i18n";
import { getNoteMenu } from "@/scripts/get-note-menu";
import { useNoteCapture } from "@/scripts/use-note-capture";
import { notePage } from "@/filters/note";
import { getNoteSummary } from "@/scripts/get-note-summary";
import { packed } from "magnetar-common";
import {
magEffectiveNote,
magHasReacted,
magIsRenote,
magReactionCount,
} from "@/scripts-mag/mag-util";
const router = useRouter();
const props = defineProps<{
note: packed.PackNoteMaybeFull;
pinned?: boolean;
detailedView?: boolean;
collapsedReply?: boolean;
}>();
let note = $ref<packed.PackNoteMaybeFull>(structuredClone(toRaw(props.note)));
const softMuteReasonI18nSrc = (what?: string) => {
if (what === "note") return i18n.ts.userSaysSomethingReason;
if (what === "reply") return i18n.ts.userSaysSomethingReasonReply;
if (what === "renote") return i18n.ts.userSaysSomethingReasonRenote;
if (what === "quote") return i18n.ts.userSaysSomethingReasonQuote;
// I don't think here is reachable, but just in case
return i18n.ts.userSaysSomething;
};
// plugin
if (noteViewInterruptors.length > 0) {
onMounted(async () => {
let result = structuredClone(toRaw(note));
for (const interruptor of noteViewInterruptors) {
result = await interruptor.handler(result);
}
note = result;
});
}
const isRenote = magIsRenote(note);
const el = ref<HTMLElement>();
const footerEl = ref<HTMLElement>();
const menuButton = ref<HTMLElement>();
const starButton = ref<InstanceType<typeof XStarButton>>();
const renoteButton = ref<InstanceType<typeof XRenoteButton>>();
const renoteTime = ref<HTMLElement>();
const reactButton = ref<HTMLElement>();
let appearNote = $computed(
() => magEffectiveNote(note) as packed.PackNoteMaybeFull
);
const isMyRenote = $i && $i.id === note.user.id;
const showContent = ref(false);
const isDeleted = ref(false);
const muted = ref(getWordSoftMute(note, $i, defaultStore.state.mutedWords));
const translation = ref(null);
const translating = ref(false);
const enableEmojiReactions = defaultStore.state.enableEmojiReactions;
const expandOnNoteClick = defaultStore.state.expandOnNoteClick;
const keymap = {
r: () => reply(true),
"e|a|plus": () => react(true),
q: () => renoteButton.value.renote(true),
"up|k": focusBefore,
"down|j": focusAfter,
esc: blur,
"m|o": () => menu(true),
s: () => showContent.value !== showContent.value,
};
useNoteCapture({
rootEl: el,
note: $$(appearNote),
isDeletedRef: isDeleted,
});
function reply(viaKeyboard = false): void {
pleaseLogin();
os.post(
{
reply: appearNote,
animation: !viaKeyboard,
},
() => {
focus();
}
);
}
function react(viaKeyboard = false): void {
pleaseLogin();
blur();
reactionPicker.show(
reactButton.value,
(reaction) => {
os.api("notes/reactions/create", {
noteId: appearNote.id,
reaction: reaction,
});
},
() => {
focus();
}
);
}
function undoReact(note): void {
const oldReaction = note.myReaction;
if (!oldReaction) return;
os.api("notes/reactions/delete", {
noteId: note.id,
});
}
const currentClipPage = inject<Ref<misskey.entities.Clip> | null>(
"currentClipPage",
null
);
function onContextmenu(ev: MouseEvent): void {
const isLink = (el: HTMLElement) => {
if (el.tagName === "A") return true;
// The Audio element's context menu is the browser default, such as for selecting playback speed.
if (el.tagName === "AUDIO") return true;
if (el.parentElement) {
return isLink(el.parentElement);
}
};
if (isLink(ev.target)) return;
if (window.getSelection()?.toString() !== "") return;
if (defaultStore.state.useReactionPickerForContextMenu) {
ev.preventDefault();
react();
} else {
os.contextMenu(
[
{
type: "label",
text: notePage(appearNote),
},
{
icon: "ph-browser ph-bold ph-lg",
text: i18n.ts.openInWindow,
action: () => {
os.pageWindow(notePage(appearNote));
},
},
notePage(appearNote) != location.pathname
? {
icon: "ph-arrows-out-simple ph-bold ph-lg",
text: i18n.ts.showInPage,
action: () => {
router.push(notePage(appearNote), "forcePage");
},
}
: undefined,
null,
{
type: "a",
icon: "ph-arrow-square-out ph-bold ph-lg",
text: i18n.ts.openInNewTab,
href: notePage(appearNote),
target: "_blank",
},
{
icon: "ph-link-simple ph-bold ph-lg",
text: i18n.ts.copyLink,
action: () => {
copyToClipboard(`${url}${notePage(appearNote)}`);
},
},
appearNote.user.host != null
? {
type: "a",
icon: "ph-arrow-square-up-right ph-bold ph-lg",
text: i18n.ts.showOnRemote,
href: appearNote.url ?? appearNote.uri ?? "",
target: "_blank",
}
: undefined,
],
ev
);
}
}
function menu(viaKeyboard = false): void {
os.popupMenu(
getNoteMenu({
note: note,
translating,
translation,
menuButton,
isDeleted,
currentClipPage,
}),
menuButton.value,
{
viaKeyboard,
}
).then(focus);
}
function showRenoteMenu(viaKeyboard = false): void {
if (!isMyRenote) return;
os.popupMenu(
[
{
text: i18n.ts.unrenote,
icon: "ph-trash ph-bold ph-lg",
danger: true,
action: () => {
os.api("notes/delete", {
noteId: note.id,
});
isDeleted.value = true;
},
},
],
renoteTime.value,
{
viaKeyboard: viaKeyboard,
}
);
}
function focus() {
el.value?.focus();
}
function blur() {
el.value?.blur();
}
function focusBefore() {
focusPrev(el.value);
}
function focusAfter() {
focusNext(el.value);
}
function scrollIntoView() {
el.value?.scrollIntoView();
}
function noteClick(e) {
if (
document.getSelection()?.type === "Range" ||
props.detailedView ||
!expandOnNoteClick
) {
e.stopPropagation();
} else {
router.push(notePage(appearNote));
}
}
function readPromo() {
os.api("promo/read", {
noteId: appearNote.id,
});
isDeleted.value = true;
}
let postIsExpanded = ref(false);
function setPostExpanded(val: boolean) {
postIsExpanded.value = val;
}
const accessibleLabel = computed(() => {
let label = `${appearNote.user.username}; `;
if (appearNote.renoted_note) {
label += `${i18n.t("renoted")} ${
appearNote.renoted_note.user.username
}; `;
if (appearNote.renoted_note.cw) {
label += `${i18n.t("cw")}: ${appearNote.renoted_note.cw}; `;
if (postIsExpanded.value) {
label += `${appearNote.renoted_note.text}; `;
}
} else {
label += `${appearNote.renoted_note.text}; `;
}
} else {
if (appearNote.cw) {
label += `${i18n.t("cw")}: ${appearNote.cw}; `;
if (postIsExpanded.value) {
label += `${appearNote.text}; `;
}
} else {
label += `${appearNote.text}; `;
}
}
const date = new Date(appearNote.created_at);
label += `${date.toLocaleTimeString()}`;
return label;
});
defineExpose({
focus,
blur,
scrollIntoView,
});
</script>
<style lang="scss" scoped>
.tkcbzcuz {
position: relative;
transition: box-shadow 0.1s ease;
font-size: 1.05em;
overflow: clip;
contain: content;
-webkit-tap-highlight-color: transparent;
// これらの指定はパフォーマンス向上には有効だが、ノートの高さは一定でないため、
// 下の方までスクロールすると上のノートの高さがここで決め打ちされたものに変化し、表示しているノートの位置が変わってしまう
// ノートがマウントされたときに自身の高さを取得し contain-intrinsic-size を設定しなおせばほぼ解決できそうだが、
// 今度はその処理自体がパフォーマンス低下の原因にならないか懸念される。また、被リアクションでも高さは変化するため、やはり多少のズレは生じる
// 一度レンダリングされた要素はブラウザがよしなにサイズを覚えておいてくれるような実装になるまで待った方が良さそう(なるのか？)
//content-visibility: auto;
//contain-intrinsic-size: 0 128px;
&:focus-visible {
outline: none;
&:after {
content: "";
pointer-events: none;
display: block;
position: absolute;
z-index: 10;
top: 0;
left: 0;
right: 0;
bottom: 0;
margin: auto;
width: calc(100% - 8px);
height: calc(100% - 8px);
border: solid 1px var(--focus);
border-radius: var(--radius);
box-sizing: border-box;
}
}
& > .article > .main {
&:hover,
&:focus-within {
:deep(.footer .button) {
opacity: 1;
}
}
}
> .reply-to {
& + .note-context {
.line::before {
content: "";
display: block;
margin-bottom: -4px;
margin-top: 16px;
border-left: 2px solid currentColor;
margin-left: calc((var(--avatarSize) / 2) - 1px);
opacity: 0.25;
}
}
}
.note-context {
position: relative;
padding: 0 32px 0 32px;
display: flex;
z-index: 1;
&:first-child {
margin-top: 20px;
}
> :not(.line) {
width: 0;
flex-grow: 1;
position: relative;
line-height: 28px;
}
> .line {
position: relative;
z-index: 2;
width: var(--avatarSize);
display: flex;
margin-right: 14px;
margin-top: 0;
flex-grow: 0;
pointer-events: none;
}
> div > i {
margin-left: -0.5px;
}
> .info {
display: flex;
align-items: center;
font-size: 90%;
white-space: pre;
color: #f6c177;
> i {
margin-right: 4px;
}
> .hide {
margin-left: auto;
color: inherit;
}
}
> .renote {
display: flex;
align-items: center;
white-space: pre;
color: var(--renote);
cursor: pointer;
> i {
margin-right: 4px;
}
> span {
overflow: hidden;
flex-shrink: 1;
text-overflow: ellipsis;
white-space: nowrap;
> .name {
font-weight: bold;
}
}
> .info {
margin-left: auto;
font-size: 0.9em;
display: flex;
> .time {
flex-shrink: 0;
color: inherit;
display: inline-flex;
align-items: center;
> .dropdownIcon {
margin-right: 4px;
}
}
}
}
&.collapsedReply {
.line {
opacity: 0.25;
&::after {
content: "";
position: absolute;
border-left: 2px solid currentColor;
border-top: 2px solid currentColor;
margin-left: calc(var(--avatarSize) / 2 - 1px);
width: calc(var(--avatarSize) / 2 + 14px);
border-top-left-radius: calc(var(--avatarSize) / 4);
top: calc(50% - 1px);
height: calc(50% + 5px);
}
}
.info {
color: var(--fgTransparentWeak);
transition: color 0.2s;
}
.avatar {
width: 1.2em;
height: 1.2em;
border-radius: 2em;
overflow: hidden;
margin-right: 0.4em;
background: var(--panelHighlight);
}
.username {
font-weight: 700;
flex-shrink: 0;
max-width: 30%;
&::after {
content: ": ";
}
}
&:hover,
&:focus-within {
.info {
color: var(--fg);
}
}
}
}
> .article {
position: relative;
overflow: clip;
padding: 20px 32px 10px;
margin-top: -16px;
&:first-child,
&:nth-child(2) {
margin-top: -100px;
padding-top: 104px;
}
@media (pointer: coarse) {
cursor: default;
}
.header-container {
display: flex;
position: relative;
z-index: 2;
> .avatar {
flex-shrink: 0;
display: block;
margin: 0 14px 0 0;
width: var(--avatarSize);
height: var(--avatarSize);
position: relative;
top: 0;
left: 0;
}
> .header {
width: 0;
flex-grow: 1;
}
}
> .main {
flex: 1;
min-width: 0;
> .body {
margin-top: 0.7em;
> .translation {
border: solid 0.5px var(--divider);
border-radius: var(--radius);
padding: 12px;
margin-top: 8px;
}
> .renote {
padding-top: 8px;
> * {
padding: 16px;
border: solid 1px var(--renote);
border-radius: 8px;
transition: background 0.2s;
&:hover,
&:focus-within {
background-color: var(--panelHighlight);
}
}
}
}
> .info {
display: flex;
justify-content: space-between;
flex-wrap: wrap;
gap: 0.7em;
margin-top: 16px;
opacity: 0.7;
font-size: 0.9em;
}
> .footer {
position: relative;
z-index: 2;
display: flex;
flex-wrap: wrap;
pointer-events: none; // Allow clicking anything w/out pointer-events: all; to open post
margin-top: 0.4em;
> :deep(.button) {
position: relative;
margin: 0;
padding: 8px;
opacity: 0.7;
flex-grow: 1;
max-width: 3.5em;
width: max-content;
min-width: max-content;
pointer-events: all;
height: auto;
transition: opacity 0.2s;
&::before {
content: "";
position: absolute;
inset: 0;
bottom: 2px;
background: var(--panel);
z-index: -1;
transition: background 0.2s;
}
&:first-of-type {
margin-left: -0.5em;
&::before {
border-radius: 100px 0 0 100px;
}
}
&:last-of-type {
&::before {
border-radius: 0 100px 100px 0;
}
}
&:hover {
color: var(--fgHighlighted);
}
> i {
display: inline !important;
}
> .count {
display: inline;
margin: 0 0 0 8px;
opacity: 0.7;
}
&.reacted {
color: var(--accent);
}
}
}
}
}
> .reply {
border-top: solid 0.5px var(--divider);
}
&.max-width_500px {
font-size: 0.975em;
--avatarSize: 46px;
padding-top: 6px;
> .note-context {
padding-inline: 16px;
margin-top: 8px;
> :not(.line) {
margin-top: 0px;
}
> .line {
margin-right: 10px;
&::before {
margin-top: 8px;
}
}
}
> .article {
padding: 18px 16px 8px;
&:first-child,
&:nth-child(2) {
padding-top: 104px;
}
> .main > .header-container > .avatar {
margin-right: 10px;
// top: calc(14px + var(--stickyTop, 0px));
}
}
}
&.max-width_300px {
--avatarSize: 40px;
}
}
.muted {
padding: 8px;
text-align: center;
opacity: 0.7;
width: 100%;
._blur_text {
pointer-events: auto;
}
}
</style>

69
fe_calckey/frontend/client/src/components/MkNoteDetailed.vue → fe_calckey/frontend/client/src/components/MagNoteDetailed.vue
View File

@ -7,7 +7,7 @@
v-size="{ max: [500, 350, 300] }"
class="lxwezrsl _block"
:tabindex="!isDeleted ? '-1' : null"
:class="{ renote: isRenote }"
:class="{ renote: magIsRenote(note) }"
>
<MkNoteSub
v-if="conversation"
@ -17,38 +17,38 @@
:note="note"
:detailedView="true"
/>
<MkLoading v-else-if="note.reply" mini />
<MkLoading v-else-if="note.parent_note" mini />
<MkNoteSub
v-if="note.reply"
:note="note.reply"
v-if="note.parent_note"
:note="note.parent_note"
class="reply-to"
:detailedView="true"
/>
<MkNote
<MagNote
ref="noteEl"
@contextmenu.stop="onContextmenu"
tabindex="-1"
:note="note"
detailedView
></MkNote>
></MagNote>
<MkTab v-model="tab" :style="'underline'" @update:modelValue="loadTab">
<option value="replies">
<!-- <i class="ph-arrow-u-up-left ph-bold ph-lg"></i> -->
<span v-if="note.repliesCount > 0" class="count">{{
note.repliesCount
<span v-if="note.reply_count > 0" class="count">{{
note.reply_count
}}</span>
{{ i18n.ts._notification._types.reply }}
</option>
<option value="renotes" v-if="note.renoteCount > 0">
<option value="renotes" v-if="note.renote_count > 0">
<!-- <i class="ph-repeat ph-bold ph-lg"></i> -->
<span class="count">{{ note.renoteCount }}</span>
<span class="count">{{ note.renote_count }}</span>
{{ i18n.ts._notification._types.renote }}
</option>
<option value="reactions" v-if="reactionsCount > 0">
<option value="reactions" v-if="magReactionCount(note) > 0">
<!-- <i class="ph-smiley ph-bold ph-lg"></i> -->
<span class="count">{{ reactionsCount }}</span>
<span class="count">{{ magReactionCount(note) }}</span>
{{ i18n.ts.reaction }}
</option>
<option value="quotes" v-if="directQuotes?.length > 0">
@ -73,7 +73,7 @@
:detailedView="true"
:parentId="note.id"
/>
<MkLoading v-else-if="tab === 'replies' && note.repliesCount > 0" />
<MkLoading v-else-if="tab === 'replies' && note.reply_count > 0" />
<MkNoteSub
v-if="directQuotes && tab === 'quotes'"
@ -101,7 +101,7 @@
:with-chart="false"
/>
<!-- </MkPagination> -->
<MkLoading v-else-if="tab === 'renotes' && note.renoteCount > 0" />
<MkLoading v-else-if="tab === 'renotes' && note.renote_count > 0" />
<div v-if="tab === 'clips' && clips.length > 0" class="_content clips">
<MkA
@ -127,7 +127,7 @@
<MkLoading v-else-if="tab === 'clips' && clips.length > 0" />
<MkReactedUsers
v-if="tab === 'reactions' && reactionsCount > 0"
v-if="tab === 'reactions' && magReactionCount(note) > 0"
:note-id="note.id"
></MkReactedUsers>
</div>
@ -135,7 +135,7 @@
<I18n :src="softMuteReasonI18nSrc(muted.what)" tag="small">
<template #name>
<MkA
v-user-preview="note.userId"
v-user-preview="note.user.id"
class="name"
:to="userPage(note.user)"
>
@ -150,22 +150,11 @@
</template>
<script lang="ts" setup>
import {
computed,
inject,
onMounted,
onUnmounted,
onUpdated,
reactive,
ref,
} from "vue";
import { onMounted, onUnmounted, onUpdated, ref, toRaw } from "vue";
import * as misskey from "calckey-js";
import MkTab from "@/components/MkTab.vue";
import MkNote from "@/components/MkNote.vue";
import MkNoteSub from "@/components/MkNoteSub.vue";
import XStarButton from "@/components/MkStarButton.vue";
import XRenoteButton from "@/components/MkRenoteButton.vue";
import MkPagination from "@/components/MkPagination.vue";
import MkUserCardMini from "@/components/MkUserCardMini.vue";
import MkReactedUsers from "@/components/MkReactedUsers.vue";
import { pleaseLogin } from "@/scripts/please-login";
@ -178,19 +167,20 @@ import { $i } from "@/account";
import { i18n } from "@/i18n";
import { getNoteMenu } from "@/scripts/get-note-menu";
import { useNoteCapture } from "@/scripts/use-note-capture";
import { deepClone } from "@/scripts/clone";
import { stream } from "@/stream";
import { NoteUpdatedEvent } from "calckey-js/built/streaming.types";
import appear from "@/directives/appear";
import { packed } from "magnetar-common";
import { magIsRenote, magReactionCount } from "@/scripts-mag/mag-util";
import MagNote from "@/components/MagNote.vue";
const props = defineProps<{
note: misskey.entities.Note;
note: packed.PackNoteMaybeFull;
pinned?: boolean;
}>();
let tab = $ref("replies");
let note = $ref(deepClone(props.note));
let note = $ref<packed.PackNoteMaybeFull>(structuredClone(toRaw(props.note)));
const softMuteReasonI18nSrc = (what?: string) => {
if (what === "note") return i18n.ts.userSaysSomethingReason;
@ -205,7 +195,7 @@ const softMuteReasonI18nSrc = (what?: string) => {
// plugin
if (noteViewInterruptors.length > 0) {
onMounted(async () => {
let result = deepClone(note);
let result = structuredClone(toRaw(note));
for (const interruptor of noteViewInterruptors) {
result = await interruptor.handler(result);
}
@ -231,11 +221,6 @@ let clips = $ref();
let renotes = $ref();
let isScrolling;
const reactionsCount = Object.values(props.note.reactions).reduce(
(x, y) => x + y,
0
);
const keymap = {
r: () => reply(true),
"e|a|plus": () => react(true),
@ -294,7 +279,7 @@ function onContextmenu(ev: MouseEvent): void {
}
};
if (isLink(ev.target)) return;
if (window.getSelection().toString() !== "") return;
if (window.getSelection()?.toString() !== "") return;
if (defaultStore.state.useReactionPickerForContextMenu) {
ev.preventDefault();
@ -344,7 +329,7 @@ os.api("notes/children", {
depth: 12,
}).then((res) => {
res = res.reduce((acc, resNote) => {
if (resNote.userId == note.userId) {
if (resNote.userId == note.user.id) {
return [...acc, resNote];
}
return [resNote, ...acc];
@ -357,9 +342,9 @@ os.api("notes/children", {
});
conversation = null;
if (note.replyId) {
if (note.parent_note_id) {
os.api("notes/conversation", {
noteId: note.replyId,
noteId: note.parent_note_id,
limit: 30,
}).then((res) => {
conversation = res.reverse();

2
fe_calckey/frontend/client/src/components/MkAvatars.vue
View File

@ -1,7 +1,7 @@
<template>
<div class="defgtij">
<div v-for="user in users" :key="user.id" class="avatar-holder">
<MkAvatar :user="user" :show-indicator="true" class="avatar" />
<MkAvatar :user="user" class="avatar" />
</div>
</div>
</template>

13
fe_calckey/frontend/client/src/components/MkCwButton.vue
View File

@ -18,10 +18,12 @@ import { length } from "stringz";
import * as misskey from "calckey-js";
import { concat } from "@/scripts/array";
import { i18n } from "@/i18n";
import { packed } from "magnetar-common";
import { magTransProperty } from "@/scripts-mag/mag-util";
const props = defineProps<{
modelValue: boolean;
note: misskey.entities.Note;
note: packed.PackNoteMaybeFull | misskey.entities.Note;
}>();
const emit = defineEmits<{
@ -31,15 +33,18 @@ const emit = defineEmits<{
const el = ref<HTMLElement>();
const label = computed(() => {
const attachments = magTransProperty(props.note, "attachments", "files");
const renote = magTransProperty(props.note, "renoted_note", "renote");
return concat([
props.note.text
? [i18n.t("_cw.chars", { count: length(props.note.text) })]
: [],
props.note.files && props.note.files.length !== 0
? [i18n.t("_cw.files", { count: props.note.files.length })]
attachments && attachments.length !== 0
? [i18n.t("_cw.files", { count: attachments.length })]
: [],
props.note.poll != null ? [i18n.ts.poll] : [],
props.note.renote != null ? [i18n.ts.quoteAttached] : [],
renote != null ? [i18n.ts.quoteAttached] : [],
] as string[][]).join(", ");
});

60
fe_calckey/frontend/client/src/components/MkFollowButton.vue
View File

@ -19,8 +19,8 @@
}"
:disabled="wait"
@click.stop="onClick"
:aria-label="`${state} ${user.name || user.username}`"
v-tooltip="full ? null : `${state} ${user.name || user.username}`"
:aria-label="`${state} ${magTransUsername(user)}`"
v-tooltip="full ? null : `${state} ${magTransUsername(user)}`"
>
<template v-if="!wait">
<template v-if="isBlocking">
@ -28,13 +28,19 @@
><i class="ph-prohibit ph-bold ph-lg"></i>
</template>
<template
v-else-if="hasPendingFollowRequestFromYou && user.isLocked"
v-else-if="
hasPendingFollowRequestFromYou &&
magTransProperty(user, 'is_locked', 'isLocked')
"
>
<span>{{ (state = i18n.ts.followRequestPending) }}</span
><i class="ph-hourglass-medium ph-bold ph-lg"></i>
</template>
<template
v-else-if="hasPendingFollowRequestFromYou && !user.isLocked"
v-else-if="
hasPendingFollowRequestFromYou &&
!magTransProperty(user, 'is_locked', 'isLocked')
"
>
<!-- つまりリモートフォローの場合。 -->
<span>{{ (state = i18n.ts.processing) }}</span
@ -44,11 +50,21 @@
<span>{{ (state = i18n.ts.unfollow) }}</span
><i class="ph-minus ph-bold ph-lg"></i>
</template>
<template v-else-if="!isFollowing && user.isLocked">
<template
v-else-if="
!isFollowing &&
magTransProperty(user, 'is_locked', 'isLocked')
"
>
<span>{{ (state = i18n.ts.followRequest) }}</span
><i class="ph-plus ph-bold ph-lg"></i>
</template>
<template v-else-if="!isFollowing && !user.isLocked">
<template
v-else-if="
!isFollowing &&
!magTransProperty(user, 'is_locked', 'isLocked')
"
>
<span>{{ (state = i18n.ts.follow) }}</span
><i class="ph-plus ph-bold ph-lg"></i>
</template>
@ -69,13 +85,15 @@ import { i18n } from "@/i18n";
import { $i } from "@/account";
import { getUserMenu } from "@/scripts/get-user-menu";
import { useRouter } from "@/router";
import { packed } from "magnetar-common";
import { magTransProperty, magTransUsername } from "@/scripts-mag/mag-util";
const router = useRouter();
const emit = defineEmits(["refresh"]);
const props = withDefaults(
defineProps<{
user: Misskey.entities.UserDetailed;
user: packed.PackUserMaybeAll | Misskey.entities.User;
full?: boolean;
large?: boolean;
hideMenu?: boolean;
@ -86,24 +104,38 @@ const props = withDefaults(
}
);
const isBlocking = computed(() => props.user.isBlocking);
const isBlocking = computed(() =>
magTransProperty(props.user, "you_block", "isBlocking")
);
let state = $ref(i18n.ts.processing);
let isFollowing = $ref(props.user.isFollowing);
let isFollowing = $ref(
magTransProperty(props.user, "you_follow", "isFollowing")
);
let hasPendingFollowRequestFromYou = $ref(
props.user.hasPendingFollowRequestFromYou
magTransProperty(
props.user,
"you_request_follow",
"hasPendingFollowRequestFromYou"
)
);
let wait = $ref(false);
const connection = stream.useChannel("main");
if (props.user.isFollowing == null) {
if (
typeof magTransProperty(props.user, "you_follow", "isFollowing") !==
"boolean"
) {
os.api("users/show", {
userId: props.user.id,
}).then(onFollowChange);
}
function onFollowChange(user: Misskey.entities.UserDetailed) {
function onFollowChange(user: Misskey.entities.User) {
if (!("isFollowing" in user && "hasPendingFollowRequestFromYou" in user))
return;
if (user.id === props.user.id) {
isFollowing = user.isFollowing;
hasPendingFollowRequestFromYou = user.hasPendingFollowRequestFromYou;
@ -124,7 +156,7 @@ async function onClick() {
await os.api("blocking/delete", {
userId: props.user.id,
});
if (props.user.isMuted) {
if (magTransProperty(props.user, "mute", "isMuted")) {
await os.api("mute/delete", {
userId: props.user.id,
});
@ -134,7 +166,7 @@ async function onClick() {
const { canceled } = await os.confirm({
type: "warning",
text: i18n.t("unfollowConfirm", {
name: props.user.name || props.user.username,
name: magTransUsername(props.user),
}),
});

46
fe_calckey/frontend/client/src/components/MkInstanceTicker.vue
View File

@ -1,7 +1,12 @@
<template>
<div
class="hpaizdrt"
v-tooltip="capitalize(instance.softwareName)"
v-tooltip="
capitalize(
magTransProperty(instance, 'software_name', 'softwareName') ??
'?'
)
"
ref="ticker"
:style="bg"
>
@ -14,44 +19,59 @@
import { instanceName } from "@/config";
import { instance as Instance } from "@/instance";
import { getProxiedImageUrlNullable } from "@/scripts/media-proxy";
import * as Misskey from "calckey-js";
import { types } from "magnetar-common";
import { magTransProperty } from "@/scripts-mag/mag-util";
const props = defineProps<{
instance?: {
faviconUrl?: string;
name: string;
themeColor?: string;
softwareName?: string;
};
instance?: Misskey.entities.User["instance"] | types.InstanceTicker | null;
}>();
let ticker = $ref<HTMLElement | null>(null);
// if no instance data is given, this is for the local instance
const instance = props.instance ?? {
faviconUrl: Instance.iconUrl || Instance.faviconUrl || "/favicon.ico",
iconUrl: null,
faviconUrl: (Instance.iconUrl || Instance.faviconUrl || "/favicon.ico") as
| string
| null,
name: instanceName,
themeColor: (
document.querySelector(
'meta[name="theme-color-orig"]'
) as HTMLMetaElement
)?.content,
softwareName: Instance.softwareName || "Calckey",
softwareName: (Instance.softwareName || "Magnetar") as string | null,
softwareVersion: (Instance.softwareVersion || Instance.version || "") as
| string
| null,
};
const capitalize = (s: string) => s && s[0].toUpperCase() + s.slice(1);
const computedStyle = getComputedStyle(document.documentElement);
const themeColor =
instance.themeColor ?? computedStyle.getPropertyValue("--bg");
magTransProperty(instance, "theme_color", "themeColor") ??
computedStyle.getPropertyValue("--bg");
const bg = {
background: `linear-gradient(90deg, ${themeColor}, ${themeColor}55)`,
};
function getInstanceIcon(instance): string {
function getInstanceIcon(
instance?: Misskey.entities.User["instance"] | types.InstanceTicker | null
): string {
if (!instance) return "/client-assets/dummy.png";
return (
getProxiedImageUrlNullable(instance.iconUrl, "preview") ??
getProxiedImageUrlNullable(instance.faviconUrl, "preview") ??
getProxiedImageUrlNullable(
magTransProperty(instance, "icon_url", "iconUrl"),
"preview"
) ??
getProxiedImageUrlNullable(
magTransProperty(instance, "favicon_url", "faviconUrl"),
"preview"
) ??
"/client-assets/dummy.png"
);
}

10
fe_calckey/frontend/client/src/components/MkMediaBanner.vue
View File

@ -1,7 +1,7 @@
<template>
<div class="mk-media-banner" @click.stop>
<div
v-if="media.isSensitive && hide"
v-if="magTransProperty(media, 'sensitive', 'isSensitive') && hide"
class="sensitive"
@click="hide = false"
>
@ -11,7 +11,9 @@
</div>
<div
v-else-if="
media.type.startsWith('audio') && media.type !== 'audio/midi'
((type) => type.startsWith('audio') && type !== 'audio/midi')(
magTransProperty(media, 'mime_type', 'type')
)
"
class="audio"
>
@ -62,10 +64,12 @@ import type * as misskey from "calckey-js";
import { ColdDeviceStorage } from "@/store";
import "vue-plyr/dist/vue-plyr.css";
import { i18n } from "@/i18n";
import { packed } from "magnetar-common";
import { magTransProperty } from "@/scripts-mag/mag-util";
const props = withDefaults(
defineProps<{
media: misskey.entities.DriveFile;
media: packed.PackDriveFileBase | misskey.entities.DriveFile;
}>(),
{}
);

9
fe_calckey/frontend/client/src/components/MkMediaCaption.vue
View File

@ -53,12 +53,19 @@
@click="$refs.modal.close()"
/>
<footer>
<span>{{ image.type }}</span>
<span>{{ image.mime_type || image.type }}</span>
<span>{{ bytes(image.size) }}</span>
<span v-if="image.properties && image.properties.width"
>{{ number(image.properties.width) }}px ×
{{ number(image.properties.height) }}px</span
>
<span
v-if="
image.media_metadata && image.media_metadata.width
"
>{{ number(image.media_metadata.width) }}px ×
{{ number(image.media_metadata.height) }}px</span
>
</footer>
</div>
</div>

31
fe_calckey/frontend/client/src/components/MkMediaImage.vue
View File

@ -1,9 +1,9 @@
<template>
<button v-if="hide" class="qjewsnkg" @click="hide = false">
<ImgWithBlurhash
:hash="image.blurhash"
:hash="image.blurhash ?? undefined"
:title="image.comment"
:alt="image.comment"
:alt="image.comment ?? ''"
/>
<div class="text">
<div class="wrapper">
@ -18,14 +18,21 @@
<div v-else class="gqnyydlz">
<a :href="image.url" :title="image.name">
<ImgWithBlurhash
:hash="image.blurhash"
:hash="image.blurhash ?? undefined"
:src="url"
:alt="image.comment"
:type="image.type"
:alt="image.comment ?? ''"
:type="magTransProperty(image, 'mime_type', 'type')"
:title="image.comment"
:cover="false"
/>
<div v-if="image.type === 'image/gif'" class="gif">GIF</div>
<div
v-if="
magTransProperty(image, 'mime_type', 'type') === 'image/gif'
"
class="gif"
>
GIF
</div>
</a>
<div class="_image_controls">
<button
@ -63,9 +70,11 @@ import { getStaticImageUrl } from "@/scripts/get-static-image-url";
import ImgWithBlurhash from "@/components/MkImgWithBlurhash.vue";
import { defaultStore } from "@/store";
import { i18n } from "@/i18n";
import { packed } from "magnetar-common";
import { magTransProperty } from "@/scripts-mag/mag-util";
const props = defineProps<{
image: misskey.entities.DriveFile;
image: packed.PackDriveFileBase | misskey.entities.DriveFile;
raw?: boolean;
}>();
@ -95,8 +104,10 @@ const url =
props.raw || defaultStore.state.loadRawImages
? props.image.url
: defaultStore.state.disableShowingAnimatedImages
? getStaticImageUrl(props.image.thumbnailUrl)
: props.image.thumbnailUrl;
? getStaticImageUrl(
magTransProperty(props.image, "thumbnail_url", "thumbnailUrl")!
)
: magTransProperty(props.image, "thumbnail_url", "thumbnailUrl")!;
// Plugin:register_note_view_interruptor を使って書き換えられる可能性があるためwatchする
watch(
@ -105,7 +116,7 @@ watch(
hide =
defaultStore.state.nsfw === "force"
? true
: props.image.isSensitive &&
: magTransProperty(props.image, "sensitive", "isSensitive") &&
defaultStore.state.nsfw !== "ignore";
},
{

74
fe_calckey/frontend/client/src/components/MkMediaList.vue
View File

@ -18,12 +18,24 @@
)"
>
<XVideo
v-if="media.type.startsWith('video')"
v-if="
magTransProperty(
media,
'mime_type',
'type'
).startsWith('video')
"
:key="media.id"
:video="media"
/>
<XImage
v-else-if="media.type.startsWith('image')"
v-else-if="
magTransProperty(
media,
'mime_type',
'type'
).startsWith('image')
"
:key="media.id"
class="image"
:data-id="media.id"
@ -47,10 +59,11 @@ import XImage from "@/components/MkMediaImage.vue";
import XVideo from "@/components/MkMediaVideo.vue";
import * as os from "@/os";
import { FILE_TYPE_BROWSERSAFE } from "@/const";
import { defaultStore } from "@/store";
import { packed } from "magnetar-common";
import { magTransProperty } from "@/scripts-mag/mag-util";
const props = defineProps<{
mediaList: misskey.entities.DriveFile[];
mediaList: (packed.PackDriveFileBase | misskey.entities.DriveFile)[];
raw?: boolean;
inDm?: boolean;
}>();
@ -62,22 +75,30 @@ onMounted(() => {
const lightbox = new PhotoSwipeLightbox({
dataSource: props.mediaList
.filter((media) => {
if (media.type === "image/svg+xml") return true; // svgのwebpublicはpngなのでtrue
const type = magTransProperty(media, "mime_type", "type");
if (type === "image/svg+xml") return true; // svgのwebpublicはpngなのでtrue
return (
media.type.startsWith("image") &&
FILE_TYPE_BROWSERSAFE.includes(media.type)
type.startsWith("image") &&
FILE_TYPE_BROWSERSAFE.includes(type)
);
})
.map((media) => {
const properties = magTransProperty(
media,
"media_metadata",
"properties"
);
const item = {
src: media.url,
w: media.properties.width,
h: media.properties.height,
w: properties.width,
h: properties.height,
alt: media.comment,
};
if (
media.properties.orientation != null &&
media.properties.orientation >= 5
properties.orientation != null &&
properties.orientation >= 5
) {
[item.w, item.h] = [item.h, item.w];
}
@ -116,16 +137,21 @@ onMounted(() => {
const id = element.dataset.id;
const file = props.mediaList.find((media) => media.id === id);
if (!file) return;
const properties = magTransProperty(
file,
"media_metadata",
"properties"
);
itemData.src = file.url;
itemData.w = Number(file.properties.width);
itemData.h = Number(file.properties.height);
if (
file.properties.orientation != null &&
file.properties.orientation >= 5
) {
itemData.w = Number(properties.width);
itemData.h = Number(properties.height);
if (properties.orientation != null && properties.orientation >= 5) {
[itemData.w, itemData.h] = [itemData.h, itemData.w];
}
itemData.msrc = file.thumbnailUrl;
itemData.msrc = magTransProperty(file, "thumbnail_url", "thumbnailUrl");
itemData.alt = file.comment;
itemData.thumbCropped = true;
});
@ -178,12 +204,16 @@ onMounted(() => {
}
});
const previewable = (file: misskey.entities.DriveFile): boolean => {
if (file.type === "image/svg+xml") return true; // svgのwebpublic/thumbnailはpngなのでtrue
const previewable = (
file: packed.PackDriveFileBase | misskey.entities.DriveFile
): boolean => {
const type = magTransProperty(file, "mime_type", "type");
if (type === "image/svg+xml") return true; // svgのwebpublic/thumbnailはpngなのでtrue
// FILE_TYPE_BROWSERSAFEに適合しないものはブラウザで表示するのに不適切
return (
(file.type.startsWith("video") || file.type.startsWith("image")) &&
FILE_TYPE_BROWSERSAFE.includes(file.type)
(type.startsWith("video") || type.startsWith("image")) &&
FILE_TYPE_BROWSERSAFE.includes(type)
);
};
const previewableCount = props.mediaList.filter((media) =>

16
fe_calckey/frontend/client/src/components/MkMediaVideo.vue
View File

@ -31,14 +31,19 @@
}"
>
<video
:poster="video.thumbnailUrl"
:poster="
magTransProperty(video, 'thumbnail_url', 'thumbnailUrl')
"
:title="video.comment"
:aria-label="video.comment"
preload="none"
controls
@contextmenu.stop
>
<source :src="video.url" :type="video.type" />
<source
:src="video.url"
:type="magTransProperty(video, 'mime_type', 'type')"
/>
</video>
</VuePlyr>
<button
@ -58,9 +63,11 @@ import type * as misskey from "calckey-js";
import { defaultStore } from "@/store";
import "vue-plyr/dist/vue-plyr.css";
import { i18n } from "@/i18n";
import { packed } from "magnetar-common";
import { magTransProperty } from "@/scripts-mag/mag-util";
const props = defineProps<{
video: misskey.entities.DriveFile;
video: packed.PackDriveFileBase | misskey.entities.DriveFile;
}>();
const plyr = ref();
@ -69,7 +76,8 @@ const mini = ref(false);
const hide = ref(
defaultStore.state.nsfw === "force"
? true
: props.video.isSensitive && defaultStore.state.nsfw !== "ignore"
: magTransProperty(props.video, "sensitive", "isSensitive") &&
defaultStore.state.nsfw !== "ignore"
);
onMounted(() => {

16
fe_calckey/frontend/client/src/components/MkNote.vue
View File

@ -235,28 +235,23 @@
</template>
<script lang="ts" setup>
import { computed, inject, onMounted, onUnmounted, reactive, ref } from "vue";
import * as mfm from "mfm-js";
import type { Ref } from "vue";
import { computed, inject, onMounted, ref, toRaw } from "vue";
import * as mfm from "mfm-js";
import type * as misskey from "calckey-js";
import MkNoteSub from "@/components/MkNoteSub.vue";
import MkSubNoteContent from "./MkSubNoteContent.vue";
import XNoteHeader from "@/components/MkNoteHeader.vue";
import XNoteSimple from "@/components/MkNoteSimple.vue";
import XMediaList from "@/components/MkMediaList.vue";
import XCwButton from "@/components/MkCwButton.vue";
import XPoll from "@/components/MkPoll.vue";
import XRenoteButton from "@/components/MkRenoteButton.vue";
import XReactionsViewer from "@/components/MkReactionsViewer.vue";
import XStarButton from "@/components/MkStarButton.vue";
import XStarButtonNoEmoji from "@/components/MkStarButtonNoEmoji.vue";
import XQuoteButton from "@/components/MkQuoteButton.vue";
import MkUrlPreview from "@/components/MkUrlPreview.vue";
import MkVisibility from "@/components/MkVisibility.vue";
import copyToClipboard from "@/scripts/copy-to-clipboard";
import { url } from "@/config";
import { pleaseLogin } from "@/scripts/please-login";
import { focusPrev, focusNext } from "@/scripts/focus";
import { focusNext, focusPrev } from "@/scripts/focus";
import { getWordSoftMute } from "@/scripts/check-word-mute";
import { useRouter } from "@/router";
import { userPage } from "@/filters/user";
@ -268,7 +263,6 @@ import { i18n } from "@/i18n";
import { getNoteMenu } from "@/scripts/get-note-menu";
import { useNoteCapture } from "@/scripts/use-note-capture";
import { notePage } from "@/filters/note";
import { deepClone } from "@/scripts/clone";
import { getNoteSummary } from "@/scripts/get-note-summary";
const router = useRouter();
@ -280,7 +274,7 @@ const props = defineProps<{
collapsedReply?: boolean;
}>();
let note = $ref(deepClone(props.note));
let note = $ref<misskey.entities.Note>(structuredClone(toRaw(props.note)));
const softMuteReasonI18nSrc = (what?: string) => {
if (what === "note") return i18n.ts.userSaysSomethingReason;
@ -295,7 +289,7 @@ const softMuteReasonI18nSrc = (what?: string) => {
// plugin
if (noteViewInterruptors.length > 0) {
onMounted(async () => {
let result = deepClone(note);
let result = structuredClone(toRaw(note));
for (const interruptor of noteViewInterruptors) {
result = await interruptor.handler(result);
}

49
fe_calckey/frontend/client/src/components/MkNoteHeader.vue
View File

@ -9,7 +9,13 @@
@click.stop
>
<MkUserName :user="note.user" class="mkusername">
<span v-if="note.user.isBot" class="is-bot">bot</span>
<span
v-if="
magTransProperty(note.user, 'is_bot', 'isBot')
"
class="is-bot"
>bot</span
>
</MkUserName>
</MkA>
<div class="username"><MkAcct :user="note.user" /></div>
@ -17,16 +23,38 @@
<div>
<div class="info">
<MkA class="created-at" :to="notePage(note)">
<MkTime :time="note.createdAt" />
<MkTime
:time="
magTransProperty(
note,
'created_at',
'createdAt'
)
"
/>
<i
v-if="note.updatedAt"
v-if="
magTransProperty(
note,
'updated_at',
'updatedAt'
)
"
v-tooltip.noDelay="
i18n.t('edited', {
date: new Date(
note.updatedAt
magTransProperty(
note,
'updated_at',
'updatedAt'
)!
).toLocaleDateString(),
time: new Date(
note.updatedAt
magTransProperty(
note,
'updated_at',
'updatedAt'
)!
).toLocaleTimeString(),
})
"
@ -37,7 +65,7 @@
<MkVisibility :note="note" />
</div>
<MkInstanceTicker
v-if="showTicker"
v-if="showTicker && note.user.instance"
class="ticker"
:instance="note.user.instance"
/>
@ -47,17 +75,18 @@
</template>
<script lang="ts" setup>
import {} from "vue";
import type * as misskey from "calckey-js";
import { defaultStore, noteViewInterruptors } from "@/store";
import { defaultStore } from "@/store";
import MkVisibility from "@/components/MkVisibility.vue";
import MkInstanceTicker from "@/components/MkInstanceTicker.vue";
import { notePage } from "@/filters/note";
import { userPage } from "@/filters/user";
import { i18n } from "@/i18n";
import { packed } from "magnetar-common";
import { magTransProperty } from "@/scripts-mag/mag-util";
const props = defineProps<{
note: misskey.entities.Note;
note: packed.PackNoteBase | misskey.entities.Note;
pinned?: boolean;
}>();
@ -65,7 +94,7 @@ let note = $ref(props.note);
const showTicker =
defaultStore.state.instanceTicker === "always" ||
(defaultStore.state.instanceTicker === "remote" && note.user.instance);
(defaultStore.state.instanceTicker === "remote" && note.user.host);
</script>
<style lang="scss" scoped>

4
fe_calckey/frontend/client/src/components/MkNoteSimple.vue
View File

@ -11,13 +11,13 @@
</template>
<script lang="ts" setup>
import {} from "vue";
import * as misskey from "calckey-js";
import XNoteHeader from "@/components/MkNoteHeader.vue";
import MkSubNoteContent from "@/components/MkSubNoteContent.vue";
import { packed } from "magnetar-common";
const props = defineProps<{
note: misskey.entities.Note;
note: packed.PackNoteMaybeFull | misskey.entities.Note;
pinned?: boolean;
}>();
</script>

95
fe_calckey/frontend/client/src/components/MkNoteSub.vue
View File

@ -68,32 +68,52 @@
@click="reply()"
>
<i class="ph-arrow-u-up-left ph-bold ph-lg"></i>
<template v-if="appearNote.repliesCount > 0">
<p class="count">{{ appearNote.repliesCount }}</p>
<template
v-if="
Number(
magTransProperty(
appearNote,
'reply_count',
'repliesCount'
)
) > 0
"
>
<p class="count">
{{
magTransProperty(
appearNote,
"reply_count",
"repliesCount"
)
}}
</p>
</template>
</button>
<XRenoteButton
ref="renoteButton"
class="button"
:note="appearNote"
:count="appearNote.renoteCount"
:count="
Number(
magTransProperty(
appearNote,
'renote_count',
'renoteCount'
)
)
"
/>
<XStarButtonNoEmoji
v-if="!enableEmojiReactions"
class="button"
:note="appearNote"
:count="
Object.values(appearNote.reactions).reduce(
(partialSum, val) => partialSum + val,
0
)
"
:reacted="appearNote.myReaction != null"
:count="magReactionCount(appearNote)"
:reacted="magHasReacted(appearNote)"
/>
<XStarButton
v-if="
enableEmojiReactions &&
appearNote.myReaction == null
enableEmojiReactions && !magHasReacted(appearNote)
"
ref="starButton"
class="button"
@ -101,8 +121,7 @@
/>
<button
v-if="
enableEmojiReactions &&
appearNote.myReaction == null
enableEmojiReactions && !magHasReacted(appearNote)
"
ref="reactButton"
v-tooltip.noDelay.bottom="i18n.ts.reaction"
@ -112,10 +131,7 @@
<i class="ph-smiley ph-bold ph-lg"></i>
</button>
<button
v-if="
enableEmojiReactions &&
appearNote.myReaction != null
"
v-if="enableEmojiReactions && magHasReacted(appearNote)"
ref="reactButton"
class="button _button reacted"
@click="undoReact(appearNote)"
@ -162,7 +178,9 @@
<I18n :src="softMuteReasonI18nSrc(muted.what)" tag="small">
<template #name>
<MkA
v-user-preview="note.userId"
v-user-preview="
magTransMap(note, 'user', 'userId', (u) => u.id)
"
class="name"
:to="userPage(note.user)"
>
@ -177,8 +195,8 @@
</template>
<script lang="ts" setup>
import { inject, ref } from "vue";
import type { Ref } from "vue";
import { inject, ref, toRaw } from "vue";
import * as misskey from "calckey-js";
import XNoteHeader from "@/components/MkNoteHeader.vue";
import MkSubNoteContent from "@/components/MkSubNoteContent.vue";
@ -201,13 +219,20 @@ import { $i } from "@/account";
import { i18n } from "@/i18n";
import { useNoteCapture } from "@/scripts/use-note-capture";
import { defaultStore } from "@/store";
import { deepClone } from "@/scripts/clone";
import { packed } from "magnetar-common";
import {
magHasReacted,
magIsRenote,
magReactionCount,
magTransMap,
magTransProperty,
} from "@/scripts-mag/mag-util";
const router = useRouter();
const props = withDefaults(
defineProps<{
note: misskey.entities.Note;
note: packed.PackNoteMaybeFull | misskey.entities.Note;
conversation?: misskey.entities.Note[];
parentId?;
detailedView?;
@ -223,7 +248,9 @@ const props = withDefaults(
}
);
let note = $ref(deepClone(props.note));
let note = $ref<packed.PackNoteMaybeFull | misskey.entities.Note>(
structuredClone(toRaw(props.note))
);
const softMuteReasonI18nSrc = (what?: string) => {
if (what === "note") return i18n.ts.userSaysSomethingReason;
@ -235,12 +262,6 @@ const softMuteReasonI18nSrc = (what?: string) => {
return i18n.ts.userSaysSomething;
};
const isRenote =
note.renote != null &&
note.text == null &&
note.fileIds.length === 0 &&
note.poll == null;
const el = ref<HTMLElement>();
const footerEl = ref<HTMLElement>();
const menuButton = ref<HTMLElement>();
@ -248,7 +269,11 @@ const starButton = ref<InstanceType<typeof XStarButton>>();
const renoteButton = ref<InstanceType<typeof XRenoteButton>>();
const reactButton = ref<HTMLElement>();
let appearNote = $computed(() =>
isRenote ? (note.renote as misskey.entities.Note) : note
magIsRenote(note)
? (magTransProperty(note, "renoted_note", "renote") as
| packed.PackNoteMaybeFull
| misskey.entities.Note)
: note
);
const isDeleted = ref(false);
const muted = ref(getWordSoftMute(note, $i, defaultStore.state.mutedWords));
@ -329,6 +354,8 @@ function menu(viaKeyboard = false): void {
}
function onContextmenu(ev: MouseEvent): void {
if (!ev.target || !(ev.target instanceof HTMLElement)) return;
const isLink = (el: HTMLElement) => {
if (el.tagName === "A") return true;
if (el.parentElement) {
@ -336,7 +363,7 @@ function onContextmenu(ev: MouseEvent): void {
}
};
if (isLink(ev.target)) return;
if (window.getSelection().toString() !== "") return;
if (window.getSelection()?.toString() !== "") return;
if (defaultStore.state.useReactionPickerForContextMenu) {
ev.preventDefault();
@ -395,15 +422,15 @@ function onContextmenu(ev: MouseEvent): void {
}
function focus() {
el.value.focus();
el.value?.focus();
}
function blur() {
el.value.blur();
el.value?.blur();
}
function noteClick(e) {
if (document.getSelection().type === "Range" || !expandOnNoteClick) {
if (document.getSelection()?.type === "Range" || !expandOnNoteClick) {
e.stopPropagation();
} else {
router.push(notePage(props.note));

75
fe_calckey/frontend/client/src/components/MkPoll.vue
View File

@ -2,31 +2,50 @@
<div class="tivcixzd" :class="{ done: closed || isVoted }">
<ul>
<li
v-for="(choice, i) in note.poll.choices"
v-for="(choice, i) in magTransProperty(
note.poll,
'options',
'choices'
)"
:key="i"
:class="{ voted: choice.voted }"
:class="{ voted: magTransProperty(choice, 'voted', 'isVoted') }"
@click.stop="vote(i)"
>
<div
class="backdrop"
:style="{
width: `${
showResult ? (choice.votes / total) * 100 : 0
showResult
? (magTransProperty(
choice,
'votes_count',
'votes'
) /
total) *
100
: 0
}%`,
}"
></div>
<span>
<template v-if="choice.isVoted"
<template
v-if="magTransProperty(choice, 'voted', 'isVoted')"
><i class="ph-check ph-bold ph-lg"></i
></template>
<Mfm
:text="choice.text"
:text="magTransProperty(choice, 'title', 'text')"
:plain="true"
:custom-emojis="note.emojis"
/>
<span v-if="showResult" class="votes"
>({{
i18n.t("_poll.votesCount", { n: choice.votes })
i18n.t("_poll.votesCount", {
n: magTransProperty(
choice,
"votes_count",
"votes"
),
})
}})</span
>
</span>
@ -65,22 +84,35 @@ import { pleaseLogin } from "@/scripts/please-login";
import * as os from "@/os";
import { i18n } from "@/i18n";
import { useInterval } from "@/scripts/use-interval";
import { packed } from "magnetar-common";
import { magTransProperty } from "@/scripts-mag/mag-util";
const props = defineProps<{
note: misskey.entities.Note & Required<Pick<misskey.entities.Note, "poll">>;
note:
| (packed.PackNoteMaybeFull & { poll: {} })
| (misskey.entities.Note &
Required<Pick<misskey.entities.Note, "poll">>);
readOnly?: boolean;
}>();
const pollRefreshing = ref(false);
const remaining = ref(-1);
const total = computed(() => sum(props.note.poll.choices.map((x) => x.votes)));
const total = computed(() =>
sum(
magTransProperty(props.note.poll, "options", "choices").map(
(x) => magTransProperty(x, "votes_count", "votes") as number
)
)
);
const closed = computed(() => remaining.value === 0);
const isLocal = computed(() => !props.note.uri);
const isVoted = computed(
() =>
!props.note.poll.multiple &&
props.note.poll.choices.some((c) => c.isVoted)
!magTransProperty(props.note.poll, "multiple_choice", "multiple") &&
magTransProperty(props.note.poll, "options", "choices").some(
(c) => magTransProperty(c, "voted", "isVoted") ?? false
)
);
const timer = computed(() =>
i18n.t(
@ -103,11 +135,17 @@ const timer = computed(() =>
const showResult = ref(props.readOnly || isVoted.value);
// 期限付きアンケート
if (props.note.poll.expiresAt) {
if (magTransProperty(props.note.poll, "expires_at", "expiresAt")) {
const tick = () => {
remaining.value = Math.floor(
Math.max(
new Date(props.note.poll.expiresAt!).getTime() - Date.now(),
new Date(
magTransProperty(
props.note.poll,
"expires_at",
"expiresAt"
)!
).getTime() - Date.now(),
0
) / 1000
);
@ -152,7 +190,11 @@ const vote = async (id: number) => {
const { canceled } = await os.confirm({
type: "question",
text: i18n.t("voteConfirm", {
choice: props.note.poll.choices[id].text,
choice: magTransProperty(
magTransProperty(props.note.poll, "options", "choices")[id],
"title",
"text"
),
}),
});
if (canceled) return;
@ -161,7 +203,12 @@ const vote = async (id: number) => {
noteId: props.note.id,
choice: id,
});
if (!showResult.value) showResult.value = !props.note.poll.multiple;
if (!showResult.value)
showResult.value = !magTransProperty(
props.note.poll,
"multiple_choice",
"multiple"
);
};
</script>

77
fe_calckey/frontend/client/src/components/MkPostForm.vue
View File

@ -252,24 +252,32 @@ import {
openAccountMenu as openAccountMenu_,
} from "@/account";
import { uploadFile } from "@/scripts/upload";
import { deepClone } from "@/scripts/clone";
import XCheatSheet from "@/components/MkCheatSheetDialog.vue";
import { preprocess } from "@/scripts/preprocess";
import { packed } from "magnetar-common";
import {
magLegacyVisibility,
magTransMap,
magTransProperty,
} from "@/scripts-mag/mag-util";
const modal = inject("modal");
const props = withDefaults(
defineProps<{
reply?: misskey.entities.Note;
renote?: misskey.entities.Note;
reply?: packed.PackNoteMaybeFull | misskey.entities.Note;
renote?: packed.PackNoteMaybeFull | misskey.entities.Note;
mention?: misskey.entities.User;
specified?: misskey.entities.User;
initialText?: string;
initialVisibility?: typeof misskey.noteVisibilities;
initialFiles?: misskey.entities.DriveFile[];
initialFiles?: (
| packed.PackDriveFileBase
| misskey.entities.DriveFile
)[];
initialLocalOnly?: boolean;
initialVisibleUsers?: misskey.entities.User[];
initialNote?: misskey.entities.Note;
initialNote?: packed.PackNoteMaybeFull | misskey.entities.Note;
instant?: boolean;
fixed?: boolean;
autofocus?: boolean;
@ -465,21 +473,26 @@ if (
) {
visibility = "specified";
} else {
visibility = props.reply.visibility;
visibility = magLegacyVisibility(props.reply.visibility);
}
if (visibility === "specified") {
if (props.reply.visibleUserIds) {
const ids = magTransProperty(
props.reply,
"visible_user_ids",
"visibleUserIds"
);
if (ids) {
os.api("users/show", {
userIds: props.reply.visibleUserIds.filter(
(uid) => uid !== $i.id && uid !== props.reply.userId
userIds: ids.filter(
(uid) => uid !== $i.id && uid !== props.reply!.user.id
),
}).then((users) => {
users.forEach(pushVisibleUser);
});
}
if (props.reply.userId !== $i.id) {
os.api("users/show", { userId: props.reply.userId }).then(
if (props.reply.user.id !== $i.id) {
os.api("users/show", { userId: props.reply.user.id }).then(
(user) => {
pushVisibleUser(user);
}
@ -591,7 +604,10 @@ function updateFiles(_files) {
}
function updateFileSensitive(file, sensitive) {
files[files.findIndex((x) => x.id === file.id)].isSensitive = sensitive;
const idx = files.findIndex((x) => x.id === file.id);
const f = files[idx];
if ("isSensitive" in f) f.isSensitive = sensitive;
else f.sensitive = sensitive;
}
function updateFileName(file, name) {
@ -830,7 +846,7 @@ async function post() {
// plugin
if (notePostInterruptors.length > 0) {
for (const interruptor of notePostInterruptors) {
postData = await interruptor.handler(deepClone(postData));
postData = await interruptor.handler(structuredClone(postData));
}
}
@ -972,20 +988,39 @@ onMounted(() => {
if (props.initialNote) {
const init = props.initialNote;
text = init.text ? init.text : "";
files = init.files;
files = magTransProperty(init, "attachments", "files") ?? [];
cw = init.cw;
useCw = init.cw != null;
if (init.poll) {
poll = {
choices: init.poll.choices.map((x) => x.text),
multiple: init.poll.multiple,
expiresAt: init.poll.expiresAt,
expiredAfter: init.poll.expiredAfter,
choices: magTransMap(
init.poll,
"options",
"choices",
(a) => a.map((x) => x.title),
(b) => b.map((x) => x.text)
),
multiple: magTransProperty(
init.poll,
"multiple_choice",
"multiple"
),
expiresAt: magTransProperty(
init.poll,
"expires_at",
"expiresAt"
),
// TODO(Natty)
expiredAfter: null,
};
}
visibility = init.visibility;
localOnly = init.localOnly;
quoteId = init.renote ? init.renote.id : null;
visibility = magLegacyVisibility(init.visibility);
localOnly =
magTransProperty(init, "local_only", "localOnly") ?? false;
quoteId = magTransProperty(init, "renote", "renoted_note")
? magTransProperty(init, "renote", "renoted_note")!.id
: null;
}
nextTick(() => watchForDraft());

22
fe_calckey/frontend/client/src/components/MkPostFormAttaches.vue
View File

@ -20,7 +20,10 @@
:file="element"
fit="cover"
/>
<div v-if="element.isSensitive" class="sensitive">
<div
v-if="element.sensitive ?? element.isSensitive"
class="sensitive"
>
<i class="ph-warning ph-bold ph-lg icon"></i>
</div>
</div>
@ -31,7 +34,7 @@
</template>
<script lang="ts">
import { defineComponent, defineAsyncComponent } from "vue";
import { defineAsyncComponent, defineComponent } from "vue";
import MkDriveFileThumbnail from "@/components/MkDriveFileThumbnail.vue";
import * as os from "@/os";
import { i18n } from "@/i18n";
@ -86,9 +89,13 @@ export default defineComponent({
toggleSensitive(file) {
os.api("drive/files/update", {
fileId: file.id,
isSensitive: !file.isSensitive,
isSensitive: !(file.sensitive ?? file.isSensitive),
}).then(() => {
this.$emit("changeSensitive", file, !file.isSensitive);
this.$emit(
"changeSensitive",
file,
!(file.sensitive ?? file.isSensitive)
);
});
},
async rename(file) {
@ -150,9 +157,10 @@ export default defineComponent({
},
},
{
text: file.isSensitive
? i18n.ts.unmarkAsSensitive
: i18n.ts.markAsSensitive,
text:
file.sensitive ?? file.isSensitive
? i18n.ts.unmarkAsSensitive
: i18n.ts.markAsSensitive,
icon: file.isSensitive
? "ph-eye ph-bold ph-lg"
: "ph-eye-slash ph-bold ph-lg",

8
fe_calckey/frontend/client/src/components/MkPostFormDialog.vue
View File

@ -19,14 +19,14 @@
</template>
<script lang="ts" setup>
import {} from "vue";
import * as misskey from "calckey-js";
import MkModal from "@/components/MkModal.vue";
import MkPostForm from "@/components/MkPostForm.vue";
import { packed } from "magnetar-common";
const props = defineProps<{
reply?: misskey.entities.Note;
renote?: misskey.entities.Note;
reply?: packed.PackNoteMaybeFull | misskey.entities.Note;
renote?: packed.PackNoteMaybeFull | misskey.entities.Note;
mention?: misskey.entities.User;
specified?: misskey.entities.User;
initialText?: string;
@ -34,7 +34,7 @@ const props = defineProps<{
initialFiles?: misskey.entities.DriveFile[];
initialLocalOnly?: boolean;
initialVisibleUsers?: misskey.entities.User[];
initialNote?: misskey.entities.Note;
initialNote?: packed.PackNoteMaybeFull | misskey.entities.Note;
instant?: boolean;
fixed?: boolean;
autofocus?: boolean;

8
fe_calckey/frontend/client/src/components/MkReactionsViewer.reaction.vue
View File

@ -5,7 +5,7 @@
v-ripple="canToggle"
class="hkzvhatu _button"
:class="{
reacted: note.myReaction == reaction,
reacted: magReactionSelf(note) === reaction,
canToggle,
newlyAdded: !isInitial,
}"
@ -28,12 +28,14 @@ import XReactionIcon from "@/components/MkReactionIcon.vue";
import * as os from "@/os";
import { useTooltip } from "@/scripts/use-tooltip";
import { $i } from "@/account";
import { packed } from "magnetar-common";
import { magReactionSelf } from "@/scripts-mag/mag-util";
const props = defineProps<{
reaction: string;
count: number;
isInitial: boolean;
note: misskey.entities.Note;
note: packed.PackNoteMaybeFull | misskey.entities.Note;
}>();
const buttonRef = ref<HTMLElement>();
@ -43,7 +45,7 @@ const canToggle = computed(() => !props.reaction.match(/@\w/) && $i);
const toggleReaction = () => {
if (!canToggle.value) return;
const oldReaction = props.note.myReaction;
const oldReaction = magReactionSelf(props.note);
if (oldReaction) {
os.api("notes/reactions/delete", {
noteId: props.note.id,

18
fe_calckey/frontend/client/src/components/MkReactionsViewer.vue
View File

@ -1,11 +1,13 @@
<template>
<div class="tdflqwzn" :class="{ isMe }">
<XReaction
v-for="(count, reaction) in note.reactions"
:key="reaction"
:reaction="reaction"
:count="count"
:is-initial="initialReactions.has(reaction)"
v-for="r in Array.isArray(note.reactions)
? note.reactions
: Object.entries(note.reactions)"
:key="magReactionPairToLegacy(r)[0]"
:reaction="magReactionPairToLegacy(r)[0]"
:count="magReactionPairToLegacy(r)[1]"
:is-initial="initialReactions.has(magReactionPairToLegacy(r)[0])"
:note="note"
/>
</div>
@ -16,14 +18,16 @@ import { computed } from "vue";
import * as misskey from "calckey-js";
import { $i } from "@/account";
import XReaction from "@/components/MkReactionsViewer.reaction.vue";
import { packed } from "magnetar-common";
import { magReactionPairToLegacy } from "@/scripts-mag/mag-util";
const props = defineProps<{
note: misskey.entities.Note;
note: packed.PackNoteMaybeFull | misskey.entities.Note;
}>();
const initialReactions = new Set(Object.keys(props.note.reactions));
const isMe = computed(() => $i && $i.id === props.note.userId);
const isMe = computed(() => $i && $i.id === props.note.user.id);
</script>
<style lang="scss" scoped>

47
fe_calckey/frontend/client/src/components/MkRenoteButton.vue
View File

@ -23,7 +23,6 @@
<script lang="ts" setup>
import { computed, ref } from "vue";
import type * as misskey from "calckey-js";
import Ripple from "@/components/MkRipple.vue";
import XDetails from "@/components/MkUsersTooltip.vue";
import { pleaseLogin } from "@/scripts/please-login";
@ -33,21 +32,37 @@ import { useTooltip } from "@/scripts/use-tooltip";
import { i18n } from "@/i18n";
import { defaultStore } from "@/store";
import { MenuItem } from "@/types/menu";
import { packed } from "magnetar-common";
import {
magLegacyVisibility,
magTransMap,
magTransProperty,
} from "@/scripts-mag/mag-util";
import * as Misskey from "calckey-js";
const props = defineProps<{
note: misskey.entities.Note;
note: packed.PackNoteMaybeFull | Misskey.entities.Note;
count: number;
detailedView?;
}>();
const buttonRef = ref<HTMLElement>();
const hasRenotedBefore = ref(props.note.hasRenotedBefore ?? false);
const hasRenotedBefore = ref<boolean>(
magTransMap(
props.note,
"self_renote_count",
"hasRenotedBefore",
(n) => (n ?? 0) > 0
) ?? false
);
const canRenote = computed(
() =>
["public", "home"].includes(props.note.visibility) ||
props.note.userId === $i.id
($i &&
magTransMap(props.note, "user", "userId", (user) => user.id) ===
$i.id)
);
useTooltip(buttonRef, async (showing) => {
@ -141,7 +156,12 @@ const renote = async (viaKeyboard = false, ev?: MouseEvent) => {
os.api("notes/create", {
renoteId: props.note.id,
visibility: "specified",
visibleUserIds: props.note.visibleUserIds,
visibleUserIds:
magTransProperty(
props.note,
"visible_user_ids",
"visibleUserIds"
) ?? [],
});
hasRenotedBefore.value = true;
const el =
@ -193,16 +213,25 @@ const renote = async (viaKeyboard = false, ev?: MouseEvent) => {
action: () => {
os.api(
"notes/create",
props.note.visibility === "specified"
magLegacyVisibility(props.note.visibility) === "specified"
? {
renoteId: props.note.id,
visibility: props.note.visibility,
visibleUserIds: props.note.visibleUserIds,
visibility: magLegacyVisibility(
props.note.visibility
),
visibleUserIds:
magTransProperty(
props.note,
"visible_user_ids",
"visibleUserIds"
) ?? [],
localOnly: true,
}
: {
renoteId: props.note.id,
visibility: props.note.visibility,
visibility: magLegacyVisibility(
props.note.visibility
),
localOnly: true,
}
);

3
fe_calckey/frontend/client/src/components/MkStarButton.vue
View File

@ -45,9 +45,10 @@ import * as os from "@/os";
import { defaultStore } from "@/store";
import { i18n } from "@/i18n";
import { instance } from "@/instance";
import { packed } from "magnetar-common";
const props = defineProps<{
note: Note;
note: packed.PackNoteBase | Note;
}>();
function star(ev?: MouseEvent): void {

4
fe_calckey/frontend/client/src/components/MkStarButtonNoEmoji.vue
View File

@ -47,13 +47,13 @@ import Ripple from "@/components/MkRipple.vue";
import XDetails from "@/components/MkUsersTooltip.vue";
import { pleaseLogin } from "@/scripts/please-login";
import * as os from "@/os";
import { defaultStore } from "@/store";
import { i18n } from "@/i18n";
import { instance } from "@/instance";
import { useTooltip } from "@/scripts/use-tooltip";
import { packed } from "magnetar-common";
const props = defineProps<{
note: Note;
note: packed.PackNoteBase | Note;
count: number;
reacted: boolean;
}>();

89
fe_calckey/frontend/client/src/components/MkSubNoteContent.vue
View File

@ -1,7 +1,11 @@
<template>
<p v-if="note.cw != null" class="cw">
<MkA
v-if="conversation && note.renoteId == parentId"
v-if="
conversation &&
magTransProperty(note, 'renoted_note_id', 'renoteId') ==
parentId
"
:to="
detailedView ? `#${parentId}` : `${notePage(note)}#${parentId}`
"
@ -12,11 +16,17 @@
<i class="ph-quotes ph-bold ph-lg"></i>
</MkA>
<MkA
v-else-if="!detailed && note.replyId"
v-else-if="
!detailed && magTransProperty(note, 'parent_note_id', 'replyId')
"
:to="
detailedView
? `#${note.replyId}`
: `${notePage(note)}#${note.replyId}`
? `#${magTransProperty(note, 'parent_note_id', 'replyId')}`
: `${notePage(note)}#${magTransProperty(
note,
'parent_note_id',
'replyId'
)}`
"
behavior="browser"
v-tooltip="i18n.ts.jumpToPrevious"
@ -40,7 +50,8 @@
:class="{
collapsed,
isLong,
manyImages: note.files.length > 4,
manyImages:
magTransProperty(note, 'attachments', 'files')?.length > 4,
showContent: note.cw && !showContent,
animatedMfm: !disableMfm,
}"
@ -66,12 +77,16 @@
tabindex: !showContent ? '-1' : null,
}"
>
<span v-if="note.deletedAt" style="opacity: 0.5"
>({{ i18n.ts.deleted }})</span
>
<template v-if="!note.cw">
<MkA
v-if="conversation && note.renoteId == parentId"
v-if="
conversation &&
magTransProperty(
note,
'renoted_note_id',
'renoteId'
) == parentId
"
:to="
detailedView
? `#${parentId}`
@ -84,11 +99,22 @@
<i class="ph-quotes ph-bold ph-lg"></i>
</MkA>
<MkA
v-else-if="!detailed && note.replyId"
v-else-if="
!detailed &&
magTransProperty(note, 'parent_note_id', 'replyId')
"
:to="
detailedView
? `#${note.replyId}`
: `${notePage(note)}#${note.replyId}`
? `#${magTransProperty(
note,
'parent_note_id',
'replyId'
)}`
: `${notePage(note)}#${magTransProperty(
note,
'parent_note_id',
'replyId'
)}`
"
behavior="browser"
v-tooltip="i18n.ts.jumpToPrevious"
@ -106,14 +132,24 @@
:custom-emojis="note.emojis"
/>
<MkA
v-if="!detailed && note.renoteId"
v-if="
!detailed &&
magTransProperty(note, 'renoted_note_id', 'renoteId')
"
class="rp"
:to="`/notes/${note.renoteId}`"
:to="`/notes/${magTransProperty(
note,
'renoted_note_id',
'renoteId'
)}`"
>{{ i18n.ts.quoteAttached }}: ...</MkA
>
<XMediaList
v-if="note.files.length > 0"
:media-list="note.files"
v-if="
magTransProperty(note, 'attachments', 'files')?.length >
0
"
:media-list="magTransProperty(note, 'attachments', 'files')!"
/>
<XPoll v-if="note.poll" :note="note" class="poll" />
<template v-if="detailed">
@ -126,11 +162,18 @@
class="url-preview"
/>
<div
v-if="note.renote"
v-if="magTransProperty(note, 'renoted_note', 'renote')"
class="renote"
@click.stop="emit('push', note.renote)"
@click.stop="
emit(
'push',
magTransProperty(note, 'renoted_note', 'renote')
)
"
>
<XNoteSimple :note="note.renote" />
<XNoteSimple
:note="magTransProperty(note, 'renoted_note', 'renote')!"
/>
</div>
</template>
<div
@ -192,9 +235,12 @@ import { extractUrlFromMfm } from "@/scripts/extract-url-from-mfm";
import { extractMfmWithAnimation } from "@/scripts/extract-mfm";
import { i18n } from "@/i18n";
import { defaultStore } from "@/store";
import { $i } from "@/account";
import { magTransProperty } from "@/scripts-mag/mag-util";
import { packed } from "magnetar-common";
const props = defineProps<{
note: misskey.entities.Note;
note: packed.PackNoteMaybeFull | misskey.entities.Note;
parentId?;
conversation?;
detailed?: boolean;
@ -216,7 +262,8 @@ const isLong =
((props.note.text != null &&
(props.note.text.split("\n").length > 10 ||
props.note.text.length > 800)) ||
props.note.files.length > 4);
(magTransProperty(props.note, "attachments", "files") ?? []).length >
4);
const collapsed = $ref(props.note.cw == null && isLong);
const urls = props.note.text
? extractUrlFromMfm(mfm.parse(props.note.text)).slice(0, 5)

49
fe_calckey/frontend/client/src/components/MkUserOnlineIndicator.vue
View File

@ -1,49 +0,0 @@
<template>
<div v-tooltip="text" class="fzgwjkgc" :class="user.onlineStatus"></div>
</template>
<script lang="ts" setup>
import {} from "vue";
import * as misskey from "calckey-js";
import { i18n } from "@/i18n";
const props = defineProps<{
user: misskey.entities.User;
}>();
const text = $computed(() => {
switch (props.user.onlineStatus) {
case "online":
return i18n.ts.online;
case "active":
return i18n.ts.active;
case "offline":
return i18n.ts.offline;
case "unknown":
return i18n.ts.unknown;
}
});
</script>
<style lang="scss" scoped>
.fzgwjkgc {
box-shadow: 0 0 0 3px var(--panel);
border-radius: 120%; // Blinkのバグか知らんけど、100%ぴったりにすると何故か若干楕円でレンダリングされる
&.online {
background: #9ccfd8;
}
&.active {
background: #f6c177;
}
&.offline {
background: #eb6f92;
}
&.unknown {
background: #6e6a86;
}
}
</style>

3
fe_calckey/frontend/client/src/components/global/MkAcct.vue
View File

@ -13,9 +13,10 @@
import * as misskey from "calckey-js";
import { toUnicode } from "punycode/";
import { host as hostRaw } from "@/config";
import { packed } from "magnetar-common";
defineProps<{
user: misskey.entities.UserDetailed;
user: packed.PackUserBase | misskey.entities.User;
detail?: boolean;
}>();

53
fe_calckey/frontend/client/src/components/global/MkAvatar.vue
View File

@ -3,23 +3,36 @@
v-if="disableLink"
v-user-preview="disablePreview ? undefined : user.id"
class="eiwwqkts _noSelect"
:class="{ cat: user.isCat, square: $store.state.squareAvatars }"
:class="{
cat:
magTransMap(
props.user,
'avatar_decoration',
'isCat',
(a) => a === 'CatEars'
) || false,
square: $store.state.squareAvatars,
}"
:style="{ color }"
:title="acct(user)"
@click="onClick"
>
<img class="inner" :src="url" decoding="async" />
<MkUserOnlineIndicator
v-if="showIndicator && user.instance == null"
class="indicator"
:user="user"
/>
</span>
<MkA
v-else
v-user-preview="disablePreview ? undefined : user.id"
class="eiwwqkts _noSelect"
:class="{ cat: user.isCat, square: $store.state.squareAvatars }"
:class="{
cat:
magTransMap(
props.user,
'avatar_decoration',
'isCat',
(d) => d === 'CatEars'
) || false,
square: $store.state.squareAvatars,
}"
:style="{ color }"
:to="userPage(user)"
:title="acct(user)"
@ -27,36 +40,30 @@
@click.stop
>
<img class="inner" :src="url" decoding="async" />
<MkUserOnlineIndicator
v-if="showIndicator && user.instance == null"
class="indicator"
:user="user"
/>
</MkA>
</template>
<script lang="ts" setup>
import { onMounted, watch } from "vue";
import { watch } from "vue";
import * as misskey from "calckey-js";
import { getStaticImageUrl } from "@/scripts/get-static-image-url";
import { extractAvgColorFromBlurhash } from "@/scripts/extract-avg-color-from-blurhash";
import { acct, userPage } from "@/filters/user";
import MkUserOnlineIndicator from "@/components/MkUserOnlineIndicator.vue";
import { defaultStore } from "@/store";
import { packed } from "magnetar-common";
import { magTransMap, magTransProperty } from "@/scripts-mag/mag-util";
const props = withDefaults(
defineProps<{
user: misskey.entities.User;
user: packed.PackUserBase | misskey.entities.User;
target?: string | null;
disableLink?: boolean;
disablePreview?: boolean;
showIndicator?: boolean;
}>(),
{
target: null,
disableLink: false,
disablePreview: false,
showIndicator: false,
}
);
@ -66,8 +73,10 @@ const emit = defineEmits<{
const url = $computed(() =>
defaultStore.state.disableShowingAnimatedImages
? getStaticImageUrl(props.user.avatarUrl)
: props.user.avatarUrl
? getStaticImageUrl(
magTransProperty(props.user, "avatar_url", "avatarUrl")
)
: magTransProperty(props.user, "avatar_url", "avatarUrl")
);
function onClick(ev: MouseEvent) {
@ -77,9 +86,11 @@ function onClick(ev: MouseEvent) {
let color = $ref();
watch(
() => props.user.avatarBlurhash,
() => magTransProperty(props.user, "avatar_blurhash", "avatarBlurhash"),
() => {
color = extractAvgColorFromBlurhash(props.user.avatarBlurhash);
color = extractAvgColorFromBlurhash(
magTransProperty(props.user, "avatar_blurhash", "avatarBlurhash")
);
},
{
immediate: true,

7
fe_calckey/frontend/client/src/components/global/MkUserName.vue
View File

@ -1,7 +1,7 @@
<template>
<Mfm
:class="$style.root"
:text="user.name || user.username"
:text="magTransUsername(user)"
:plain="true"
:nowrap="nowrap"
:custom-emojis="user.emojis"
@ -9,12 +9,13 @@
</template>
<script lang="ts" setup>
import {} from "vue";
import * as misskey from "calckey-js";
import { packed } from "magnetar-common";
import { magTransUsername } from "@/scripts-mag/mag-util";
const props = withDefaults(
defineProps<{
user: misskey.entities.User;
user: packed.PackUserBase | misskey.entities.User;
nowrap?: boolean;
}>(),
{

21
fe_calckey/frontend/client/src/components/page/page.note.vue
View File

@ -15,10 +15,11 @@
<script lang="ts">
import { defineComponent, onMounted, PropType, Ref, ref } from "vue";
import XNote from "@/components/MkNote.vue";
import XNoteDetailed from "@/components/MkNoteDetailed.vue";
import XNote from "@/components/MagNote.vue";
import XNoteDetailed from "@/components/MagNoteDetailed.vue";
import * as os from "@/os";
import { NoteBlock } from "@/scripts/hpml/block";
import { endpoints, packed } from "magnetar-common";
export default defineComponent({
components: {
@ -32,14 +33,18 @@ export default defineComponent({
},
},
setup(props, ctx) {
const note: Ref<Record<string, any> | null> = ref(null);
const note: Ref<packed.PackNoteMaybeFull | null> = ref(null);
onMounted(() => {
os.api("notes/show", { noteId: props.block.note }).then(
(result) => {
note.value = result;
}
);
if (!props.block.note) return;
os.magApi(
endpoints.GetNoteById,
{ context: props.block.detailed, attachments: true },
{ id: props.block.note }
).then((result) => {
note.value = result;
});
});
return {

2
fe_calckey/frontend/client/src/config.ts
View File

@ -15,6 +15,6 @@ export const lang = localStorage.getItem("lang");
export const langs = _LANGS_;
export const locale = JSON.parse(localStorage.getItem("locale"));
export const version = _VERSION_;
export const instanceName = siteName === "Magnetar" ? host : siteName;
export const instanceName = siteName === "Magnetar" ? "" + host : siteName;
export const ui = localStorage.getItem("ui");
export const debug = localStorage.getItem("debug") === "true";

7
fe_calckey/frontend/client/src/filters/note.ts
View File

@ -1,3 +1,8 @@
export const notePage = (note) => {
import * as Misskey from "calckey-js";
import { packed } from "magnetar-common";
export const notePage = (note: {
id: packed.PackNoteBase["id"] | Misskey.entities.Note["id"];
}) => {
return `/notes/${note.id}`;
};

29
fe_calckey/frontend/client/src/init.ts
View File

@ -11,36 +11,28 @@ import "@phosphor-icons/web/fill";
//#region account indexedDB migration
import { set } from "@/scripts/idb-proxy";
const accounts = localStorage.getItem("accounts");
if (accounts) {
set("accounts", JSON.parse(accounts));
localStorage.removeItem("accounts");
}
//#endregion
import {
computed,
createApp,
watch,
defineAsyncComponent,
markRaw,
version as vueVersion,
defineAsyncComponent,
watch,
} from "vue";
import { compareVersions } from "compare-versions";
import widgets from "@/widgets";
import directives from "@/directives";
import components from "@/components";
import { version, ui, lang, host } from "@/config";
import { lang, ui, version } from "@/config";
import { applyTheme } from "@/scripts/theme";
import { isDeviceDarkmode } from "@/scripts/is-device-darkmode";
import { i18n } from "@/i18n";
import { confirm, alert, post, popup, toast } from "@/os";
import { alert, confirm, popup, post, toast } from "@/os";
import { stream } from "@/stream";
import * as sound from "@/scripts/sound";
import { $i, refreshAccount, login, updateAccount, signout } from "@/account";
import { defaultStore, ColdDeviceStorage } from "@/store";
import { $i, login, refreshAccount, signout, updateAccount } from "@/account";
import { ColdDeviceStorage, defaultStore } from "@/store";
import { fetchInstance, instance } from "@/instance";
import { makeHotkey } from "@/scripts/hotkey";
import { search } from "@/scripts/search";
@ -51,6 +43,13 @@ import { reactionPicker } from "@/scripts/reaction-picker";
import { getUrlWithoutLoginId } from "@/scripts/login-id";
import { getAccountFromId } from "@/scripts/get-account-from-id";
const accounts = localStorage.getItem("accounts");
if (accounts) {
set("accounts", JSON.parse(accounts));
localStorage.removeItem("accounts");
}
//#endregion
function checkForSplash() {
const splash = document.getElementById("splash");
// 念のためnullチェック(HTMLが古い場合があるため(そのうち消す))
@ -64,7 +63,7 @@ function checkForSplash() {
}
(async () => {
console.info(`Calckey v${version}`);
console.info(`Magnetar v${version}`);
if (_DEV_) {
console.warn("Development mode!!!");

2
fe_calckey/frontend/client/src/os.ts
View File

@ -26,7 +26,7 @@ const apiClient = new Misskey.api.APIClient({
origin: url,
});
const magnetarApiClient = new MagApiClient(url);
const magnetarApiClient = new MagApiClient(`${url}/mag/v1`);
export async function magApi<
T extends BackendApiEndpoint<

40
fe_calckey/frontend/client/src/pages/note.vue
View File

@ -34,7 +34,7 @@
<div class="note _gap">
<MkRemoteCaution
v-if="appearNote.user.host != null"
:href="appearNote.url ?? appearNote.uri"
:href="(appearNote.url ?? appearNote.uri) !"
/>
<XNoteDetailed
:key="appearNote.id"
@ -70,27 +70,28 @@
<script lang="ts" setup>
import { computed, watch } from "vue";
import * as misskey from "calckey-js";
import XNoteDetailed from "@/components/MkNoteDetailed.vue";
import XNoteDetailed from "@/components/MagNoteDetailed.vue";
import XNotes from "@/components/MkNotes.vue";
import MkRemoteCaution from "@/components/MkRemoteCaution.vue";
import MkButton from "@/components/MkButton.vue";
import * as os from "@/os";
import { definePageMetadata } from "@/scripts/page-metadata";
import { i18n } from "@/i18n";
import { endpoints, packed } from "magnetar-common";
import { magTransUsername } from "@/scripts-mag/mag-util";
const props = defineProps<{
noteId: string;
}>();
let note = $ref<null | misskey.entities.Note>();
let note = $ref<null | packed.PackNoteMaybeFull>();
let hasPrev = $ref(false);
let hasNext = $ref(false);
let showPrev = $ref(false);
let showNext = $ref(false);
let error = $ref();
let isRenote = $ref(false);
let appearNote = $ref<null | misskey.entities.Note>();
let appearNote = $ref<null | packed.PackNoteMaybeFull>();
const prevPagination = {
endpoint: "users/notes" as const,
@ -98,7 +99,7 @@ const prevPagination = {
params: computed(() =>
appearNote
? {
userId: appearNote.userId,
userId: appearNote.user.id,
untilId: appearNote.id,
}
: null
@ -112,7 +113,7 @@ const nextPagination = {
params: computed(() =>
appearNote
? {
userId: appearNote.userId,
userId: appearNote.user.id,
sinceId: appearNote.id,
}
: null
@ -125,28 +126,30 @@ function fetchNote() {
showPrev = false;
showNext = false;
note = null;
os.api("notes/show", {
noteId: props.noteId,
})
os.magApi(
endpoints.GetNoteById,
{ context: true, attachments: true },
{ id: props.noteId }
)
.then((res) => {
note = res;
isRenote =
note.renote != null &&
note.renoted_note_id != null &&
note.text == null &&
note.fileIds.length === 0 &&
note.file_ids.length === 0 &&
note.poll == null;
appearNote = isRenote
? (note.renote as misskey.entities.Note)
? (note.renoted_note as packed.PackNoteMaybeFull)
: note;
Promise.all([
os.api("users/notes", {
userId: note.userId,
userId: note.user.id,
untilId: note.id,
limit: 1,
}),
os.api("users/notes", {
userId: note.userId,
userId: note.user.id,
sinceId: note.id,
limit: 1,
}),
@ -173,15 +176,14 @@ definePageMetadata(
appearNote
? {
title: i18n.t("noteOf", {
user: appearNote.user.name || appearNote.user.username,
user: magTransUsername(appearNote.user),
}),
subtitle: new Date(appearNote.createdAt).toLocaleString(),
subtitle: new Date(appearNote.created_at).toLocaleString(),
avatar: appearNote.user,
path: `/notes/${appearNote.id}`,
share: {
title: i18n.t("noteOf", {
user:
appearNote.user.name || appearNote.user.username,
user: magTransUsername(appearNote.user),
}),
text: appearNote.text,
},

28
fe_calckey/frontend/client/src/pages/page-editor/els/page-editor.el.note.vue
View File

@ -35,14 +35,15 @@
</template>
<script lang="ts" setup>
import { watch } from "vue";
import { ref, watch } from "vue";
import XContainer from "../page-editor.container.vue";
import MkInput from "@/components/form/input.vue";
import MkSwitch from "@/components/form/switch.vue";
import XNote from "@/components/MkNote.vue";
import XNoteDetailed from "@/components/MkNoteDetailed.vue";
import XNoteDetailed from "@/components/MagNoteDetailed.vue";
import * as os from "@/os";
import { i18n } from "@/i18n";
import { endpoints, packed } from "magnetar-common";
const props = withDefaults(
defineProps<{
@ -56,21 +57,32 @@ const props = withDefaults(
}
);
let id: any = $ref(props.value.note);
let note: any = $ref(null);
let id = ref<string | null>(props.value.note);
let note = ref<packed.PackNoteMaybeFull | null>(null);
watch(
id,
async () => {
if (id && (id.startsWith("http://") || id.startsWith("https://"))) {
props.value.note = (id.endsWith("/") ? id.slice(0, -1) : id)
if (
id.value &&
(id.value.startsWith("http://") || id.value.startsWith("https://"))
) {
props.value.note = (
id.value.endsWith("/") ? id.value.slice(0, -1) : id.value
)
.split("/")
.pop();
} else {
props.value.note = id;
props.value.note = id.value;
}
note = await os.api("notes/show", { noteId: props.value.note });
if (props.value.note) return;
note.value = await os.magApi(
endpoints.GetNoteById,
{ context: true, attachments: true },
{ id: props.value.note }
);
},
{
immediate: true,

6
fe_calckey/frontend/client/src/pages/settings/reaction.vue
View File

@ -125,7 +125,6 @@
<script lang="ts" setup>
import { defineAsyncComponent, watch } from "vue";
import XDraggable from "vuedraggable";
import FormInput from "@/components/form/input.vue";
import FormRadios from "@/components/form/radios.vue";
import FromSlot from "@/components/form/slot.vue";
import FormButton from "@/components/MkButton.vue";
@ -135,7 +134,6 @@ import * as os from "@/os";
import { defaultStore } from "@/store";
import { i18n } from "@/i18n";
import { definePageMetadata } from "@/scripts/page-metadata";
import { deepClone } from "@/scripts/clone";
import { unisonReload } from "@/scripts/unison-reload";
async function reloadAsk() {
@ -148,7 +146,7 @@ async function reloadAsk() {
unisonReload();
}
let reactions = $ref(deepClone(defaultStore.state.reactions));
let reactions = $ref(structuredClone(defaultStore.state.reactions));
const reactionPickerSkinTone = $computed(
defaultStore.makeGetterSetter("reactionPickerSkinTone")
@ -211,7 +209,7 @@ async function setDefault() {
});
if (canceled) return;
reactions = deepClone(defaultStore.def.reactions.default);
reactions = structuredClone(defaultStore.def.reactions.default);
}
function chooseEmoji(ev: MouseEvent) {

12
fe_calckey/frontend/client/src/pages/settings/statusbar.statusbar.vue
View File

@ -142,17 +142,15 @@
</template>
<script lang="ts" setup>
import { computed, reactive, ref, watch } from "vue";
import { reactive, watch } from "vue";
import FormSelect from "@/components/form/select.vue";
import MkInput from "@/components/form/input.vue";
import MkSwitch from "@/components/form/switch.vue";
import FormRadios from "@/components/form/radios.vue";
import FormButton from "@/components/MkButton.vue";
import FormRange from "@/components/form/range.vue";
import * as os from "@/os";
import { defaultStore } from "@/store";
import { i18n } from "@/i18n";
import { deepClone } from "@/scripts/clone";
const props = defineProps<{
_id: string;
@ -160,7 +158,9 @@ const props = defineProps<{
}>();
const statusbar = reactive(
deepClone(defaultStore.state.statusbars.find((x) => x.id === props._id))
structuredClone(
defaultStore.state.statusbars.find((x) => x.id === props._id)
)
);
watch(
@ -197,8 +197,8 @@ async function save() {
const i = defaultStore.state.statusbars.findIndex(
(x) => x.id === props._id
);
const statusbars = deepClone(defaultStore.state.statusbars);
statusbars[i] = deepClone(statusbar);
const statusbars = structuredClone(defaultStore.state.statusbars);
statusbars[i] = structuredClone(statusbar);
defaultStore.set("statusbars", statusbars);
}

10
fe_calckey/frontend/client/src/plugin.ts
View File

@ -135,7 +135,7 @@ function registerPostFormAction({ pluginId, title, handler }) {
postFormActions.push({
title,
handler: (form, update) => {
pluginContexts.get(pluginId).execFn(handler, [
pluginContexts.get(pluginId)?.execFn(handler, [
utils.jsToVal(form),
values.FN_NATIVE(([key, value]) => {
update(key.value, value.value);
@ -149,7 +149,9 @@ function registerUserAction({ pluginId, title, handler }) {
userActions.push({
title,
handler: (user) => {
pluginContexts.get(pluginId).execFn(handler, [utils.jsToVal(user)]);
pluginContexts
.get(pluginId)
?.execFn(handler, [utils.jsToVal(user)]);
},
});
}
@ -158,7 +160,9 @@ function registerNoteAction({ pluginId, title, handler }) {
noteActions.push({
title,
handler: (note) => {
pluginContexts.get(pluginId).execFn(handler, [utils.jsToVal(note)]);
pluginContexts
.get(pluginId)
?.execFn(handler, [utils.jsToVal(note)]);
},
});
}

240
fe_calckey/frontend/client/src/scripts-mag/mag-util.ts Normal file
View File

@ -0,0 +1,240 @@
import * as Misskey from "calckey-js";
import { packed, types } from "magnetar-common";
// https://stackoverflow.com/a/50375286 Evil magic
type Dist<U> = U extends any ? (k: U) => void : never;
type UnionToIntersection<U> = Dist<U> extends (k: infer I) => void ? I : never;
// End of evil magic
type UnionMerged<A> = { [AK in keyof A]: AK extends keyof A ? A[AK] : never };
type UnionIntersectionMerge<A> = Omit<
UnionToIntersection<A>,
keyof UnionMerged<A>
> &
UnionMerged<A>;
export function magTransProperty<
A extends Record<string, any>,
AA extends keyof UnionToIntersection<A> & string,
BB extends keyof UnionToIntersection<A> & string
>(
x: A,
keyA: AA,
keyB: BB
): UnionIntersectionMerge<A>[AA] | UnionIntersectionMerge<A>[BB] {
const a = x[keyA];
if (typeof a !== "undefined") {
return a;
}
return x[keyB];
}
export function magTransMap<
A extends Record<string, any>,
AA extends keyof UnionIntersectionMerge<A> & string,
BB extends keyof UnionIntersectionMerge<A> & string,
X extends any
>(
x: A,
keyA: AA,
keyB: BB,
mapLeft: (a: UnionIntersectionMerge<A>[AA]) => X = (a) => a as X,
mapRight: (b: UnionIntersectionMerge<A>[BB]) => X = (a) => a as X
): X {
const a = x[keyA];
if (typeof a !== "undefined") {
return mapLeft(a as UnionIntersectionMerge<A>[AA]);
}
const b = x[keyB];
return typeof b === "undefined"
? b
: mapRight(b as UnionIntersectionMerge<A>[BB]);
}
type UserUnion = packed.PackUserBase | Misskey.entities.User;
export function magTransUsername(x: UserUnion): string {
return (
(x as UnionToIntersection<UserUnion>)["display_name"] ||
(x as UnionToIntersection<UserUnion>)["name"] ||
(x as UnionToIntersection<UserUnion>)["username"]
);
}
export function magReactionCount(
note: packed.PackNoteMaybeFull | Misskey.entities.Note
): number {
if (Array.isArray(note.reactions)) {
return Number(
note.reactions
.map(([, cnt]) => cnt)
.reduce((partialSum, val) => partialSum + val, 0)
);
} else {
return Object.values(note).reduce((accum, val) => accum + val, 0);
}
}
export function magHasReacted(
note: packed.PackNoteMaybeFull | Misskey.entities.Note
): boolean {
if (Array.isArray(note.reactions)) {
return note.reactions.some(([, , reacted]) => reacted === true);
} else {
return (
typeof (note as Misskey.entities.Note).myReaction !== "undefined" &&
(note as Misskey.entities.Note).myReaction !== null
);
}
}
export function magReactionSelf(
note: packed.PackNoteMaybeFull | Misskey.entities.Note
): string | null {
if (Array.isArray(note.reactions)) {
const found = note.reactions.find(
([, , reacted]) => reacted === true
)?.[0];
return typeof found !== "undefined" ? magReactionToLegacy(found) : null;
} else if ((note as Misskey.entities.Note).myReaction !== "undefined") {
return (note as Misskey.entities.Note).myReaction ?? null;
}
return null;
}
export function noteIsMag(
note: packed.PackNoteMaybeFull | Misskey.entities.Note
): note is packed.PackNoteMaybeFull {
return "created_at" in note;
}
export function magIsRenote(
note: packed.PackNoteMaybeFull | Misskey.entities.Note
): boolean {
return (
magTransProperty(note, "renoted_note", "renote") != null &&
note.text == null &&
magTransProperty(note, "file_ids", "fileIds").length === 0 &&
note.poll == null
);
}
export function magEffectiveNote(
note: packed.PackNoteMaybeFull | Misskey.entities.Note
): packed.PackNoteMaybeFull | Misskey.entities.Note {
return magIsRenote(note)
? (magTransProperty(note, "renoted_note", "renote") as
| packed.PackNoteMaybeFull
| Misskey.entities.Note)
: note;
}
export function magLegacyVisibility(
vis: types.NoteVisibility | Misskey.entities.Note["visibility"]
): Misskey.entities.Note["visibility"];
export function magLegacyVisibility(vis: undefined): undefined;
export function magLegacyVisibility(
vis: types.NoteVisibility | Misskey.entities.Note["visibility"] | undefined
): Misskey.entities.Note["visibility"] | undefined {
if (typeof vis === "undefined") return vis;
switch (vis) {
case "Public":
return "public";
case "Home":
return "home";
case "Followers":
return "followers";
case "Direct":
return "specified";
case "public":
case "home":
case "followers":
case "specified":
return vis;
}
}
export function magConvertReaction(
reaction: string,
urlHint?: string | null
): types.Reaction {
if (reaction.endsWith("@.:")) {
reaction = reaction.replaceAll(/@\.:$/, ":");
}
if (reaction.match(/^:.+:$/)) {
const [name, host] = reaction.split("@");
return {
name,
host: host || null,
url: urlHint!,
};
} else {
return reaction;
}
}
export function magReactionToLegacy(reaction: types.Reaction | string): string {
if (typeof reaction === "string") {
return reaction;
}
if ("name" in reaction) {
if (reaction.host) {
return `:${reaction.name}@${reaction.host}:`;
} else {
return `:${reaction.name}@.:`;
}
}
if ("raw" in reaction) {
return reaction.raw;
}
return reaction;
}
export function magReactionPairToLegacy(
reaction: types.ReactionPair | [string, number]
): [string, number] {
const legacy = magReactionToLegacy(reaction[0]);
return [legacy, reaction[1]];
}
export function magReactionIndex(
reactions: types.ReactionPair[],
reactionType: types.Reaction
) {
return reactions.findIndex(([r, ,]) => {
if (typeof r !== typeof reactionType) return false;
if (typeof r === "string") {
return r === reactionType;
} else if (
"name" in r &&
"name" in (reactionType as { name: string; host: string | null })
) {
const { name, host } = reactionType as {
name: string;
host: string | null;
};
const { name: rName, host: rHost } = r;
return name === rName && (host ?? null) === (rHost ?? null);
} else if ("raw" in r && "raw" in (reactionType as { raw: string })) {
return r.raw === (reactionType as { raw: string }).raw;
}
return false;
});
}

37
fe_calckey/frontend/client/src/scripts/check-word-mute.ts
View File

@ -1,23 +1,28 @@
import { packed } from "magnetar-common";
import * as Misskey from "calckey-js";
import { magTransMap, magTransProperty } from "@/scripts-mag/mag-util";
export type Muted = {
muted: boolean;
matched: string[];
what?: string; // "note" || "reply" || "renote" || "quote"
what?: "note" | "reply" | "renote" | "quote";
};
const NotMuted = { muted: false, matched: [] };
export type NotMuted = { muted: false; matched: string[] };
function checkWordMute(
note: NoteLike,
note: packed.PackNoteMaybeFull | Misskey.entities.Note,
mutedWords: Array<string | string[]>
): Muted {
let text = `${note.cw ?? ""} ${note.text ?? ""}`;
if (note.files != null)
text += ` ${note.files.map((f) => f.comment ?? "").join(" ")}`;
const attachments = magTransProperty(note, "attachments", "files");
if (attachments)
text += ` ${attachments.map((f) => f.comment ?? "").join(" ")}`;
text = text.trim();
if (text === "") return NotMuted;
let result: Muted | NotMuted = { muted: false, matched: [] };
let result = { muted: false, matched: [] };
if (text === "") return result;
for (const mutePattern of mutedWords) {
if (Array.isArray(mutePattern)) {
@ -59,13 +64,13 @@ function checkWordMute(
}
export function getWordSoftMute(
note: Record<string, any>,
note: packed.PackNoteMaybeFull | Misskey.entities.Note,
me: Record<string, any> | null | undefined,
mutedWords: Array<string | string[]>
): Muted {
// 自分自身
if (me && note.userId === me.id) {
return NotMuted;
if (me && magTransMap(note, "user", "userId", (u) => u.id) === me.id) {
return { muted: false, matched: [] };
}
if (mutedWords.length > 0) {
@ -75,16 +80,18 @@ export function getWordSoftMute(
return noteMuted;
}
if (note.renote) {
let renoteMuted = checkWordMute(note.renote, mutedWords);
const renote = magTransProperty(note, "renoted_note", "renote");
if (renote) {
let renoteMuted = checkWordMute(renote, mutedWords);
if (renoteMuted.muted) {
renoteMuted.what = note.text == null ? "renote" : "quote";
return renoteMuted;
}
}
if (note.reply) {
let replyMuted = checkWordMute(note.reply, mutedWords);
const reply = magTransProperty(note, "parent_note", "reply");
if (reply) {
let replyMuted = checkWordMute(reply, mutedWords);
if (replyMuted.muted) {
replyMuted.what = "reply";
return replyMuted;
@ -92,5 +99,5 @@ export function getWordSoftMute(
}
}
return NotMuted;
return { muted: false, matched: [] };
}

24
fe_calckey/frontend/client/src/scripts/clone.ts
View File

@ -1,24 +0,0 @@
// structredCloneが遅いため
// SEE: http://var.blog.jp/archives/86038606.html
type Cloneable =
| string
| number
| boolean
| null
| { [key: string]: Cloneable }
| Cloneable[];
export function deepClone<T extends Cloneable>(x: T): T {
if (typeof x === "object") {
if (x === null) return x;
if (Array.isArray(x)) return x.map(deepClone) as T;
const obj = {} as Record<string, Cloneable>;
for (const [k, v] of Object.entries(x)) {
obj[k] = deepClone(v);
}
return obj as T;
} else {
return x;
}
}

4
fe_calckey/frontend/client/src/scripts/extract-avg-color-from-blurhash.ts
View File

@ -1,5 +1,5 @@
export function extractAvgColorFromBlurhash(hash: string) {
return typeof hash === "string"
export function extractAvgColorFromBlurhash(hash: string | null) {
return hash
? `#${[...hash.slice(2, 6)]
.map((x) =>
"0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz#$%*+,-.:;=?@[]^_{|}~".indexOf(

53
fe_calckey/frontend/client/src/scripts/get-note-menu.ts
View File

@ -9,24 +9,23 @@ import { url } from "@/config";
import { noteActions } from "@/store";
import { shareAvailable } from "@/scripts/share-available";
import { getUserMenu } from "@/scripts/get-user-menu";
import {
magEffectiveNote,
magTransMap,
magTransProperty,
magTransUsername,
} from "@/scripts-mag/mag-util";
import { packed } from "magnetar-common";
export function getNoteMenu(props: {
note: misskey.entities.Note;
note: packed.PackNoteMaybeFull | misskey.entities.Note;
menuButton: Ref<HTMLElement | undefined>;
translation: Ref<any>;
translating: Ref<boolean>;
isDeleted: Ref<boolean>;
currentClipPage?: Ref<misskey.entities.Clip>;
}) {
const isRenote =
props.note.renote != null &&
props.note.text == null &&
props.note.fileIds.length === 0 &&
props.note.poll == null;
const appearNote = isRenote
? (props.note.renote as misskey.entities.Note)
: props.note;
const appearNote = magEffectiveNote(props.note);
function del(): void {
os.confirm({
@ -54,8 +53,8 @@ export function getNoteMenu(props: {
os.post({
initialNote: appearNote,
renote: appearNote.renote,
reply: appearNote.reply,
renote: magTransProperty(appearNote, "renoted_note", "renote"),
reply: magTransProperty(appearNote, "parent_note", "reply"),
});
});
}
@ -63,8 +62,8 @@ export function getNoteMenu(props: {
function edit(): void {
os.post({
initialNote: appearNote,
renote: appearNote.renote,
reply: appearNote.reply,
renote: magTransProperty(appearNote, "renoted_note", "renote"),
reply: magTransProperty(appearNote, "parent_note", "reply"),
editId: appearNote.id,
});
}
@ -228,23 +227,12 @@ export function getNoteMenu(props: {
props.isDeleted.value = true;
}
async function promote(): Promise<void> {
const { canceled, result: days } = await os.inputNumber({
title: i18n.ts.numberOfDays,
});
if (canceled) return;
os.apiWithDialog("admin/promo/create", {
noteId: appearNote.id,
expiresAt: Date.now() + 86400000 * days,
});
}
function share(): void {
navigator.share({
title: i18n.t("noteOf", { user: appearNote.user.name }),
text: appearNote.text,
title: i18n.t("noteOf", {
user: magTransUsername(appearNote.user),
}),
text: appearNote.text ?? undefined,
url: `${url}/notes/${appearNote.id}`,
});
}
@ -266,7 +254,8 @@ export function getNoteMenu(props: {
noteId: appearNote.id,
});
const isAppearAuthor = appearNote.userId === $i.id;
const isAppearAuthor =
magTransMap(appearNote, "user", "userId", (u) => u.id) === $i.id;
const isModerator = $i.isAdmin || $i.isModerator;
menu = [
@ -353,7 +342,7 @@ export function getNoteMenu(props: {
text: i18n.ts.showOnRemote,
action: () => {
window.open(
appearNote.url || appearNote.uri,
(appearNote.url || appearNote.uri)!,
"_blank"
);
},
@ -468,7 +457,7 @@ export function getNoteMenu(props: {
text: i18n.ts.showOnRemote,
action: () => {
window.open(
appearNote.url || appearNote.uri,
(appearNote.url || appearNote.uri)!,
"_blank"
);
},

12
fe_calckey/frontend/client/src/scripts/get-note-summary.ts
View File

@ -1,11 +1,14 @@
import * as misskey from "calckey-js";
import { i18n } from "@/i18n";
import { packed } from "magnetar-common";
import { magTransProperty } from "@/scripts-mag/mag-util";
/**
* 投稿を表す文字列を取得します。
* @param {*} note (packされた)投稿
*/
export const getNoteSummary = (note: misskey.entities.Note): string => {
export const getNoteSummary = (
note: packed.PackNoteMaybeFull | misskey.entities.Note
): string => {
/*
if (note.deletedAt) {
return `(${i18n.ts.deletedNote})`;
@ -22,8 +25,9 @@ export const getNoteSummary = (note: misskey.entities.Note): string => {
}
// ファイルが添付されているとき
if ((note.files || []).length !== 0) {
const len = note.files?.length;
const files = magTransProperty(note, "attachments", "files");
if ((files || []).length !== 0) {
const len = files?.length;
summary += ` 📎${len !== 1 ? ` (${len})` : ""}`;
}

3
fe_calckey/frontend/client/src/scripts/page-metadata.ts
View File

@ -9,6 +9,7 @@ import {
ref,
Ref,
} from "vue";
import { packed } from "magnetar-common";
export const setPageMetadata = Symbol("setPageMetadata");
export const pageMetadataProvider = Symbol("pageMetadataProvider");
@ -17,7 +18,7 @@ export type PageMetadata = {
title: string;
subtitle?: string;
icon?: string | null;
avatar?: misskey.entities.User | null;
avatar?: packed.PackUserBase | misskey.entities.User | null;
userName?: misskey.entities.User | null;
bg?: string;
};

8
fe_calckey/frontend/client/src/scripts/theme.ts
View File

@ -1,6 +1,8 @@
import { ref } from "vue";
import tinycolor from "tinycolor2";
import { globalEvents } from "@/events";
import lightTheme from "@/themes/_light.json5";
import darkTheme from "@/themes/_dark.json5";
export type Theme = {
id: string;
@ -11,10 +13,6 @@ export type Theme = {
props: Record<string, string>;
};
import lightTheme from "@/themes/_light.json5";
import darkTheme from "@/themes/_dark.json5";
import { deepClone } from "./clone";
export const themeProps = Object.keys(lightTheme.props).filter(
(key) => !key.startsWith("X")
);
@ -77,7 +75,7 @@ export function applyTheme(theme: Theme, persist = true) {
const colorSchema = theme.base === "dark" ? "dark" : "light";
// Deep copy
const _theme = deepClone(theme);
const _theme = structuredClone(theme);
if (_theme.base) {
const base = [lightTheme, darkTheme].find((x) => x.id === _theme.base);

238
fe_calckey/frontend/client/src/scripts/use-note-capture.ts
View File

@ -3,10 +3,16 @@ import * as misskey from "calckey-js";
import { stream } from "@/stream";
import { $i } from "@/account";
import * as os from "@/os";
import { endpoints, packed } from "magnetar-common";
import {
magConvertReaction,
magReactionIndex,
noteIsMag,
} from "@/scripts-mag/mag-util";
export function useNoteCapture(props: {
rootEl: Ref<HTMLElement>;
note: Ref<misskey.entities.Note>;
note: Ref<packed.PackNoteMaybeFull | misskey.entities.Note>;
isDeletedRef: Ref<boolean>;
}) {
const note = props.note;
@ -17,80 +23,188 @@ export function useNoteCapture(props: {
if (id !== note.value.id) return;
switch (type) {
case "reacted": {
const reaction = body.reaction;
if (noteIsMag(note.value)) {
switch (type) {
case "reacted": {
const reaction = body.reaction as string;
if (body.emoji) {
const emojis = note.value.emojis || [];
if (!emojis.includes(body.emoji)) {
note.value.emojis = [...emojis, body.emoji];
if (body.emoji) {
const emojis = note.value.emojis || [];
if (!emojis.includes(body.emoji)) {
note.value.emojis = [
...emojis,
{
id: body.emoji.id,
shortcode: body.emoji.name,
url: body.emoji.url,
width: body.emoji.width ?? null,
height: body.emoji.height ?? null,
category: null,
},
];
}
}
const reactionType = magConvertReaction(reaction);
const foundReaction = magReactionIndex(
note.value.reactions,
reactionType
);
const selfReact = ($i && body.userId === $i.id) || false;
if (foundReaction >= 0) {
note.value.reactions[foundReaction] = [
note.value.reactions[foundReaction][0],
note.value.reactions[foundReaction][1] + 1,
selfReact,
];
} else {
note.value.reactions.push([reactionType, 1, selfReact]);
}
break;
}
// TODO: reactionsプロパティがない場合ってあったっけ？ なければ || {} は消せる
const currentCount = note.value.reactions?.[reaction] || 0;
case "unreacted": {
const reaction = body.reaction;
note.value.reactions[reaction] = currentCount + 1;
const reactionType = magConvertReaction(reaction);
const foundReaction = magReactionIndex(
note.value.reactions,
reactionType
);
if ($i && body.userId === $i.id) {
note.value.myReaction = reaction;
}
break;
}
if (foundReaction >= 0) {
const cnt = note.value.reactions[foundReaction][1];
note.value.reactions[foundReaction] = [
note.value.reactions[foundReaction][0],
cnt === 0 ? 0 : cnt - 1,
false,
];
}
case "unreacted": {
const reaction = body.reaction;
// TODO: reactionsプロパティがない場合ってあったっけ？ なければ || {} は消せる
const currentCount = note.value.reactions?.[reaction] || 0;
note.value.reactions[reaction] = Math.max(0, currentCount - 1);
if ($i && body.userId === $i.id) {
note.value.myReaction = undefined;
}
break;
}
case "pollVoted": {
const choice = body.choice;
if (note.value.poll) {
const choices = [...note.value.poll.choices];
choices[choice] = {
...choices[choice],
votes: choices[choice].votes + 1,
...($i && body.userId === $i.id
? {
isVoted: true,
}
: {}),
};
note.value.poll.choices = choices;
break;
}
break;
case "pollVoted": {
const choice = body.choice;
if (note.value.poll) {
const options = [...note.value.poll.options];
options[choice] = {
...options[choice],
votes_count: options[choice].votes_count + 1,
voted: ($i && body.userId === $i.id) || null,
};
note.value.poll.options = options;
}
break;
}
case "deleted": {
props.isDeletedRef.value = true;
break;
}
case "updated": {
const editedNote = await os.magApi(
endpoints.GetNoteById,
{
attachments: true,
context: true,
},
{ id }
);
const keys = new Set<string>();
Object.keys(editedNote)
.concat(Object.keys(note.value))
.forEach((key) => keys.add(key));
keys.forEach((key) => {
note.value[key] = editedNote[key];
});
break;
}
}
} else {
switch (type) {
case "reacted": {
const reaction = body.reaction;
case "deleted": {
props.isDeletedRef.value = true;
break;
}
if (body.emoji) {
const emojis = note.value.emojis || [];
if (!emojis.includes(body.emoji)) {
note.value.emojis = [...emojis, body.emoji];
}
}
case "updated": {
const editedNote = await os.api("notes/show", {
noteId: id,
});
// TODO: reactionsプロパティがない場合ってあったっけ？ なければ || {} は消せる
const currentCount = note.value.reactions?.[reaction] || 0;
const keys = new Set<string>();
Object.keys(editedNote)
.concat(Object.keys(note.value))
.forEach((key) => keys.add(key));
keys.forEach((key) => {
note.value[key] = editedNote[key];
});
break;
note.value.reactions[reaction] = currentCount + 1;
if ($i && body.userId === $i.id) {
note.value.myReaction = reaction;
}
break;
}
case "unreacted": {
const reaction = body.reaction;
// TODO: reactionsプロパティがない場合ってあったっけ？ なければ || {} は消せる
const currentCount = note.value.reactions?.[reaction] || 0;
note.value.reactions[reaction] = Math.max(
0,
currentCount - 1
);
if ($i && body.userId === $i.id) {
note.value.myReaction = undefined;
}
break;
}
case "pollVoted": {
const choice = body.choice;
if (note.value.poll) {
const choices = [...note.value.poll.choices];
choices[choice] = {
...choices[choice],
votes: choices[choice].votes + 1,
...($i && body.userId === $i.id
? {
isVoted: true,
}
: {}),
};
note.value.poll.choices = choices;
}
break;
}
case "deleted": {
props.isDeletedRef.value = true;
break;
}
case "updated": {
const editedNote = await os.api("notes/show", {
noteId: id,
});
const keys = new Set<string>();
Object.keys(editedNote)
.concat(Object.keys(note.value))
.forEach((key) => keys.add(key));
keys.forEach((key) => {
note.value[key] = editedNote[key];
});
break;
}
}
}
}

15
fe_calckey/frontend/client/src/store.ts
View File

@ -6,11 +6,16 @@ import { Storage } from "./pizzax";
import lightTheme from "@/themes/l-rosepinedawn.json5";
import darkTheme from "@/themes/d-rosepine.json5";
export const postFormActions = [];
export const userActions = [];
export const noteActions = [];
export const noteViewInterruptors = [];
export const notePostInterruptors = [];
export const postFormActions: {
title: any;
handler: (form: any, update: any) => void;
}[] = [];
export const userActions: { title: any; handler: (user: any) => void }[] = [];
export const noteActions: { title: any; handler: (note: any) => void }[] = [];
export const noteViewInterruptors: { handler: (note: any) => Promise<any> }[] =
[];
export const notePostInterruptors: { handler: (note: any) => Promise<any> }[] =
[];
const menuOptions = [
"notifications",

41
fe_calckey/frontend/client/src/ui/deck/deck-store.ts
View File

@ -3,7 +3,6 @@ import { markRaw } from "vue";
import { notificationTypes } from "calckey-js";
import { Storage } from "../../pizzax";
import { api } from "@/os";
import { deepClone } from "@/scripts/clone";
type ColumnWidget = {
name: string;
@ -158,7 +157,7 @@ export function swapColumn(a: Column["id"], b: Column["id"]) {
const aY = deckStore.state.layout[aX].findIndex((id) => id === a);
const bX = deckStore.state.layout.findIndex((ids) => ids.indexOf(b) !== -1);
const bY = deckStore.state.layout[bX].findIndex((id) => id === b);
const layout = deepClone(deckStore.state.layout);
const layout = structuredClone(deckStore.state.layout);
layout[aX][aY] = b;
layout[bX][bY] = a;
deckStore.set("layout", layout);
@ -166,7 +165,7 @@ export function swapColumn(a: Column["id"], b: Column["id"]) {
}
export function swapLeftColumn(id: Column["id"]) {
const layout = deepClone(deckStore.state.layout);
const layout = structuredClone(deckStore.state.layout);
deckStore.state.layout.some((ids, i) => {
if (ids.includes(id)) {
const left = deckStore.state.layout[i - 1];
@ -182,7 +181,7 @@ export function swapLeftColumn(id: Column["id"]) {
}
export function swapRightColumn(id: Column["id"]) {
const layout = deepClone(deckStore.state.layout);
const layout = structuredClone(deckStore.state.layout);
deckStore.state.layout.some((ids, i) => {
if (ids.includes(id)) {
const right = deckStore.state.layout[i + 1];
@ -198,11 +197,11 @@ export function swapRightColumn(id: Column["id"]) {
}
export function swapUpColumn(id: Column["id"]) {
const layout = deepClone(deckStore.state.layout);
const layout = structuredClone(deckStore.state.layout);
const idsIndex = deckStore.state.layout.findIndex((ids) =>
ids.includes(id)
);
const ids = deepClone(deckStore.state.layout[idsIndex]);
const ids = structuredClone(deckStore.state.layout[idsIndex]);
ids.some((x, i) => {
if (x === id) {
const up = ids[i - 1];
@ -220,11 +219,11 @@ export function swapUpColumn(id: Column["id"]) {
}
export function swapDownColumn(id: Column["id"]) {
const layout = deepClone(deckStore.state.layout);
const layout = structuredClone(deckStore.state.layout);
const idsIndex = deckStore.state.layout.findIndex((ids) =>
ids.includes(id)
);
const ids = deepClone(deckStore.state.layout[idsIndex]);
const ids = structuredClone(deckStore.state.layout[idsIndex]);
ids.some((x, i) => {
if (x === id) {
const down = ids[i + 1];
@ -242,7 +241,7 @@ export function swapDownColumn(id: Column["id"]) {
}
export function stackLeftColumn(id: Column["id"]) {
let layout = deepClone(deckStore.state.layout);
let layout = structuredClone(deckStore.state.layout);
const i = deckStore.state.layout.findIndex((ids) => ids.includes(id));
layout = layout.map((ids) => ids.filter((_id) => _id !== id));
layout[i - 1].push(id);
@ -252,7 +251,7 @@ export function stackLeftColumn(id: Column["id"]) {
}
export function popRightColumn(id: Column["id"]) {
let layout = deepClone(deckStore.state.layout);
let layout = structuredClone(deckStore.state.layout);
const i = deckStore.state.layout.findIndex((ids) => ids.includes(id));
const affected = layout[i];
layout = layout.map((ids) => ids.filter((_id) => _id !== id));
@ -260,7 +259,7 @@ export function popRightColumn(id: Column["id"]) {
layout = layout.filter((ids) => ids.length > 0);
deckStore.set("layout", layout);
const columns = deepClone(deckStore.state.columns);
const columns = structuredClone(deckStore.state.columns);
for (const column of columns) {
if (affected.includes(column.id)) {
column.active = true;
@ -272,9 +271,9 @@ export function popRightColumn(id: Column["id"]) {
}
export function addColumnWidget(id: Column["id"], widget: ColumnWidget) {
const columns = deepClone(deckStore.state.columns);
const columns = structuredClone(deckStore.state.columns);
const columnIndex = deckStore.state.columns.findIndex((c) => c.id === id);
const column = deepClone(deckStore.state.columns[columnIndex]);
const column = structuredClone(deckStore.state.columns[columnIndex]);
if (column == null) return;
if (column.widgets == null) column.widgets = [];
column.widgets.unshift(widget);
@ -284,9 +283,9 @@ export function addColumnWidget(id: Column["id"], widget: ColumnWidget) {
}
export function removeColumnWidget(id: Column["id"], widget: ColumnWidget) {
const columns = deepClone(deckStore.state.columns);
const columns = structuredClone(deckStore.state.columns);
const columnIndex = deckStore.state.columns.findIndex((c) => c.id === id);
const column = deepClone(deckStore.state.columns[columnIndex]);
const column = structuredClone(deckStore.state.columns[columnIndex]);
if (column == null) return;
column.widgets = column.widgets.filter((w) => w.id !== widget.id);
columns[columnIndex] = column;
@ -295,9 +294,9 @@ export function removeColumnWidget(id: Column["id"], widget: ColumnWidget) {
}
export function setColumnWidgets(id: Column["id"], widgets: ColumnWidget[]) {
const columns = deepClone(deckStore.state.columns);
const columns = structuredClone(deckStore.state.columns);
const columnIndex = deckStore.state.columns.findIndex((c) => c.id === id);
const column = deepClone(deckStore.state.columns[columnIndex]);
const column = structuredClone(deckStore.state.columns[columnIndex]);
if (column == null) return;
column.widgets = widgets;
columns[columnIndex] = column;
@ -310,9 +309,9 @@ export function updateColumnWidget(
widgetId: string,
widgetData: any
) {
const columns = deepClone(deckStore.state.columns);
const columns = structuredClone(deckStore.state.columns);
const columnIndex = deckStore.state.columns.findIndex((c) => c.id === id);
const column = deepClone(deckStore.state.columns[columnIndex]);
const column = structuredClone(deckStore.state.columns[columnIndex]);
if (column == null) return;
column.widgets = column.widgets.map((w) =>
w.id === widgetId
@ -328,9 +327,9 @@ export function updateColumnWidget(
}
export function updateColumn(id: Column["id"], column: Partial<Column>) {
const columns = deepClone(deckStore.state.columns);
const columns = structuredClone(deckStore.state.columns);
const columnIndex = deckStore.state.columns.findIndex((c) => c.id === id);
const currentColumn = deepClone(deckStore.state.columns[columnIndex]);
const currentColumn = structuredClone(deckStore.state.columns[columnIndex]);
if (currentColumn == null) return;
for (const [k, v] of Object.entries(column)) {
currentColumn[k] = v;

16
fe_calckey/frontend/client/src/widgets/job-queue.vue
View File

@ -123,20 +123,12 @@
</template>
<script lang="ts" setup>
import { onMounted, onUnmounted, reactive, ref } from "vue";
import {
useWidgetPropsManager,
Widget,
WidgetComponentEmits,
WidgetComponentExpose,
WidgetComponentProps,
} from "./widget";
import { onUnmounted, reactive } from "vue";
import { useWidgetPropsManager, Widget, WidgetComponentExpose } from "./widget";
import { GetFormResultType } from "@/scripts/form";
import { stream } from "@/stream";
import number from "@/filters/number";
import * as sound from "@/scripts/sound";
import * as os from "@/os";
import { deepClone } from "@/scripts/clone";
const name = "jobQueue";
@ -185,12 +177,12 @@ const prev = reactive({} as typeof current);
const jammedSound = sound.setVolume(sound.getAudio("syuilo/queue-jammed"), 1);
for (const domain of ["inbox", "deliver"]) {
prev[domain] = deepClone(current[domain]);
prev[domain] = structuredClone(current[domain]);
}
const onStats = (stats) => {
for (const domain of ["inbox", "deliver"]) {
prev[domain] = deepClone(current[domain]);
prev[domain] = structuredClone(current[domain]);
current[domain].activeSincePrevTick = stats[domain].activeSincePrevTick;
current[domain].active = stats[domain].active;
current[domain].waiting = stats[domain].waiting;

7
fe_calckey/frontend/client/src/widgets/widget.ts
View File

@ -1,8 +1,7 @@
import { reactive, watch } from "vue";
import { reactive, toRaw, watch } from "vue";
import { throttle } from "throttle-debounce";
import { Form, GetFormResultType } from "@/scripts/form";
import * as os from "@/os";
import { deepClone } from "@/scripts/clone";
export type Widget<P extends Record<string, unknown>> = {
id: string;
@ -36,7 +35,7 @@ export const useWidgetPropsManager = <
configure: () => void;
} => {
const widgetProps = reactive(
props.widget ? deepClone(props.widget.data) : {}
props.widget ? structuredClone(toRaw(props.widget.data)) : {}
);
const mergeProps = () => {
@ -59,7 +58,7 @@ export const useWidgetPropsManager = <
});
const configure = async () => {
const form = deepClone(propsDef);
const form = structuredClone(toRaw(propsDef));
for (const item of Object.keys(form)) {
form[item].default = widgetProps[item];
}

3
fe_calckey/frontend/client/tsconfig.json
View File

@ -36,7 +36,8 @@
"esnext",
"dom"
],
"jsx": "preserve"
"jsx": "preserve",
"jsxImportSource": "vue"
},
"compileOnSave": false,
"include": [

3
fe_calckey/frontend/magnetar-common/src/be-api.ts
View File

@ -87,7 +87,8 @@ export class MagApiClient {
endpoint = endpoint.replace(`:${name}`, `${pathParams[name]}`);
}
let url = `${this.baseUrl}/${endpoint}`;
const baseUrl = this.baseUrl.replace(/\/+$/, "");
let url = `${baseUrl}${endpoint}`;
if (method === "GET") {
const query = nestedUrlSearchParams(data as any);

2
fe_calckey/frontend/magnetar-common/src/types/DriveFileBase.ts
View File

@ -1,4 +1,4 @@
// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
import type { ImageMeta } from "./ImageMeta";
export interface DriveFileBase { name: string, created_at: string, size: bigint, hash: string | null, mime_type: string, media_metadata: ImageMeta, url: string | null, source_url: string, thumbnail_url: string | null, blurhash: string | null, sensitive: boolean, comment: string | null, folder_id: string | null, user_id: string | null, }
export interface DriveFileBase { name: string, created_at: string, size: number, hash: string | null, mime_type: string, media_metadata: ImageMeta, url: string | null, source_url: string, thumbnail_url: string | null, blurhash: string | null, sensitive: boolean, comment: string | null, folder_id: string | null, user_id: string | null, }

2
fe_calckey/frontend/magnetar-common/src/types/DriveFolderBase.ts
View File

@ -1,3 +1,3 @@
// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
export interface DriveFolderBase { name: string, created_at: string, comment: string | null, file_count: bigint, folder_count: bigint, parent_id: string | null, user_id: string, }
export interface DriveFolderBase { name: string, created_at: string, comment: string | null, file_count: number, folder_count: number, parent_id: string | null, user_id: string, }

2
fe_calckey/frontend/magnetar-common/src/types/ImageMeta.ts
View File

@ -1,3 +1,3 @@
// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
export interface ImageMeta { width: bigint | null, height: bigint | null, orientation: bigint | null, color: string | null, }
export interface ImageMeta { width: number | null, height: number | null, orientation: number | null, color: string | null, }

2
fe_calckey/frontend/magnetar-common/src/types/NoteBase.ts
View File

@ -5,4 +5,4 @@ import type { NoteVisibility } from "./NoteVisibility";
import type { PackUserBase } from "./packed/PackUserBase";
import type { ReactionPair } from "./ReactionPair";
export interface NoteBase { created_at: string, updated_at: string | null, cw: string | null, cw_mm: MmXml | null, uri: string | null, url: string | null, text: string, text_mm: MmXml | null, visibility: NoteVisibility, user: PackUserBase, parent_note_id: string | null, renoted_note_id: string | null, reply_count: bigint, renote_count: bigint, mentions: Array<string>, visible_user_ids: Array<string> | null, hashtags: Array<string>, reactions: Array<ReactionPair>, local_only: boolean, has_poll: boolean, file_ids: Array<string>, emojis: EmojiContext, }
export interface NoteBase { created_at: string, updated_at: string | null, cw: string | null, cw_mm: MmXml | null, uri: string | null, url: string | null, text: string, text_mm: MmXml | null, visibility: NoteVisibility, user: PackUserBase, parent_note_id: string | null, renoted_note_id: string | null, reply_count: number, renote_count: number, mentions: Array<string>, visible_user_ids: Array<string> | null, hashtags: Array<string>, reactions: Array<ReactionPair>, local_only: boolean, has_poll: boolean, file_ids: Array<string>, emojis: EmojiContext, }

2
fe_calckey/frontend/magnetar-common/src/types/NoteSelfContextExt.ts
View File

@ -1,3 +1,3 @@
// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
export interface NoteSelfContextExt { self_renote_count: bigint | null, }
export interface NoteSelfContextExt { self_renote_count: number | null, }

2
fe_calckey/frontend/magnetar-common/src/types/PollChoice.ts
View File

@ -1,3 +1,3 @@
// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
export interface PollChoice { title: string, votes_count: bigint, voted: boolean | null, }
export interface PollChoice { title: string, votes_count: number, voted: boolean | null, }

2
fe_calckey/frontend/magnetar-common/src/types/ReactionPair.ts
View File

@ -1,4 +1,4 @@
// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
import type { Reaction } from "./Reaction";
export type ReactionPair = [Reaction, bigint] | [Reaction, bigint, boolean];
export type ReactionPair = [Reaction, number] | [Reaction, number, boolean];

2
fe_calckey/frontend/magnetar-common/src/types/UserProfileExt.ts
View File

@ -2,4 +2,4 @@
import type { MmXml } from "./MmXml";
import type { ProfileField } from "./ProfileField";
export interface UserProfileExt { is_locked: boolean, is_silenced: boolean, is_suspended: boolean, description: string | null, description_mm: MmXml | null, location: string | null, birthday: string | null, fields: Array<ProfileField>, follower_count: bigint | null, following_count: bigint | null, note_count: bigint | null, url: string | null, moved_to_uri: string | null, also_known_as: string | null, banner_url: string | null, banner_blurhash: string | null, has_public_reactions: boolean, }
export interface UserProfileExt { is_locked: boolean, is_silenced: boolean, is_suspended: boolean, description: string | null, description_mm: MmXml | null, location: string | null, birthday: string | null, fields: Array<ProfileField>, follower_count: number | null, following_count: number | null, note_count: number | null, url: string | null, moved_to_uri: string | null, also_known_as: string | null, banner_url: string | null, banner_blurhash: string | null, has_public_reactions: boolean, }

2
fe_calckey/frontend/package.json
View File

@ -1,6 +1,6 @@
{
"name": "calckey-magnetar",
"version": "0.2.1-alpha",
"version": "0.3.0-alpha",
"codename": "aqua",
"repository": {
"type": "git",

10
fe_calckey/frontend/pnpm-lock.yaml
View File

@ -2010,7 +2010,7 @@ packages:
resolution: {integrity: sha512-WKExI/eSGgGAkWAO+wMVdFObZV7hQen54UpD1kCCTN3tvlL3W1jL4+lPP/M7MwoP7Q4RHzKtO3JQ4HxYEcd+xQ==}
dependencies:
browserslist: 1.7.7
caniuse-db: 1.0.30001559
caniuse-db: 1.0.30001561
normalize-range: 0.1.2
num2fraction: 1.2.2
postcss: 5.2.18
@ -2177,7 +2177,7 @@ packages:
deprecated: Browserslist 2 could fail on reading Browserslist >3.0 config used in other tools.
hasBin: true
dependencies:
caniuse-db: 1.0.30001559
caniuse-db: 1.0.30001561
electron-to-chromium: 1.4.576
dev: true
@ -2288,13 +2288,13 @@ packages:
resolution: {integrity: sha512-SBTl70K0PkDUIebbkXrxWqZlHNs0wRgRD6QZ8guctShjbh63gEPfF+Wj0Yw+75f5Y8tSzqAI/NcisYv/cCah2Q==}
dependencies:
browserslist: 1.7.7
caniuse-db: 1.0.30001559
caniuse-db: 1.0.30001561
lodash.memoize: 4.1.2
lodash.uniq: 4.5.0
dev: true
/caniuse-db@1.0.30001559:
resolution: {integrity: sha512-v0gHDJ0eR+mhzYeQK9e488H2FPOYJvMo7uSDzZMj67wKGI9oGMu4ARAVtqqqYTHqvWUMa7NtJfzkiBD8tTs4Jg==}
/caniuse-db@1.0.30001561:
resolution: {integrity: sha512-lrMBU9QyHu5Rg24Eu5bILWA6fvm/IxFy4z2lYc8Nnidkmr0io4Pi/UMqDEBU/3LPBao/UaKk4URwJP9Nww9lpQ==}
dev: true
/caniuse-lite@1.0.30001513:

12
magnetar_sdk/src/types/drive.rs
View File

@ -12,9 +12,9 @@ use crate::types::Id;
#[derive(Clone, Debug, Default, Deserialize, Serialize, TS)]
#[ts(export)]
pub struct ImageMeta {
pub width: Option<u64>,
pub height: Option<u64>,
pub orientation: Option<u64>,
pub width: Option<usize>,
pub height: Option<usize>,
pub orientation: Option<usize>,
pub color: Option<String>,
}
@ -24,8 +24,8 @@ pub struct DriveFolderBase {
pub name: String,
pub created_at: DateTime<Utc>,
pub comment: Option<String>,
pub file_count: u64,
pub folder_count: u64,
pub file_count: usize,
pub folder_count: usize,
pub parent_id: Option<String>,
pub user_id: String,
}
@ -48,7 +48,7 @@ pack!(
pub struct DriveFileBase {
pub name: String,
pub created_at: DateTime<Utc>,
pub size: u64,
pub size: usize,
pub hash: Option<String>,
pub mime_type: String,
pub media_metadata: ImageMeta,

12
magnetar_sdk/src/types/note.rs
View File

@ -32,7 +32,7 @@ pub enum NoteVisibility {
#[ts(export)]
pub struct PollChoice {
pub title: String,
pub votes_count: u64,
pub votes_count: usize,
pub voted: Option<bool>,
}
@ -62,8 +62,8 @@ pub struct NoteBase {
pub user: Box<PackUserBase>,
pub parent_note_id: Option<String>,
pub renoted_note_id: Option<String>,
pub reply_count: u64,
pub renote_count: u64,
pub reply_count: usize,
pub renote_count: usize,
pub mentions: Vec<String>,
pub visible_user_ids: Option<Vec<String>>,
pub hashtags: Vec<String>,
@ -79,7 +79,7 @@ pack!(PackNoteBase, Required<Id> as id & Required<NoteBase> as note);
#[derive(Clone, Debug, Deserialize, Serialize, TS)]
#[ts(export)]
pub struct NoteSelfContextExt {
pub self_renote_count: Option<u64>,
pub self_renote_count: Option<usize>,
}
#[derive(Clone, Debug, Deserialize, Serialize, TS)]
@ -125,6 +125,6 @@ pub enum Reaction {
#[ts(export)]
#[serde(untagged)]
pub enum ReactionPair {
WithoutContext(Reaction, u64),
WithContext(Reaction, u64, bool),
WithoutContext(Reaction, usize),
WithContext(Reaction, usize, bool),
}

6
magnetar_sdk/src/types/user.rs
View File

@ -69,9 +69,9 @@ pub struct UserProfileExt {
pub birthday: Option<DateTime<Utc>>,
pub fields: Vec<ProfileField>,
pub follower_count: Option<u64>,
pub following_count: Option<u64>,
pub note_count: Option<u64>,
pub follower_count: Option<usize>,
pub following_count: Option<usize>,
pub note_count: Option<usize>,
pub url: Option<String>,

2
src/model/data/drive.rs
View File

@ -26,7 +26,7 @@ impl PackType<PackFileBaseInput<'_>> for DriveFileBase {
DriveFileBase {
name: file.name.clone(),
created_at: file.created_at.into(),
size: file.size as u64,
size: file.size as usize,
hash: None, // TODO: blake3
mime_type: file.r#type.clone(),
media_metadata,

6
src/model/data/note.rs
View File

@ -59,8 +59,8 @@ impl PackType<NoteBaseSource<'_>> for NoteBase {
))),
parent_note_id: note.reply_id.clone(),
renoted_note_id: note.renote_id.clone(),
reply_count: note.replies_count as u64,
renote_count: note.renote_count as u64,
reply_count: note.replies_count as usize,
renote_count: note.renote_count as usize,
mentions: note.mentions.clone(),
hashtags: note.tags.clone(),
visible_user_ids: matches!(note.visibility, NVE::Specified)
@ -77,7 +77,7 @@ impl PackType<NoteBaseSource<'_>> for NoteBase {
impl PackType<&sub_interaction_renote::Model> for NoteSelfContextExt {
fn extract(_context: &PackingContext, data: &sub_interaction_renote::Model) -> Self {
NoteSelfContextExt {
self_renote_count: data.renotes.map(|v| v as u64),
self_renote_count: data.renotes.map(|v| v as usize),
}
}
}

2
src/model/data/poll.rs
View File

@ -18,7 +18,7 @@ impl PackType<PollPackInput<'_>> for PollBase {
.enumerate()
.map(|(i, (name, count))| PollChoice {
title: name.to_string(),
votes_count: *count as u64,
votes_count: *count as usize,
voted: votes.map(|v| v.iter().any(|v| v.choice as usize == i)),
})
.collect(),

6
src/model/data/user.rs
View File

@ -113,9 +113,9 @@ impl PackType<UserProfileExtSource<'_>> for UserProfileExt {
.clone()
.and_then(|b| b.parse().map_or_else(|_| None, Some)),
fields: profile_fields.clone(),
follower_count: follow_visibility.then_some(user.followers_count as u64),
following_count: follow_visibility.then_some(user.following_count as u64),
note_count: Some(user.notes_count as u64),
follower_count: follow_visibility.then_some(user.followers_count as usize),
following_count: follow_visibility.then_some(user.following_count as usize),
note_count: Some(user.notes_count as usize),
url: profile.url.clone(),
moved_to_uri: user.moved_to_uri.clone(),
also_known_as: user.also_known_as.clone(),

2
src/model/processing/note.rs
View File

@ -241,7 +241,7 @@ impl NoteModel {
)
})
.map(|(code, count, self_reacted)| {
Ok((code, u64::deserialize(count)?, self_reacted))
Ok((code, usize::deserialize(count)?, self_reacted))
})
.collect::<Result<Vec<_>, serde_json::Error>>()?;
// Pick out all successfully-parsed shortcode emojis