mirror of
https://iceshrimp.dev/iceshrimp/iceshrimp
synced 2024-12-11 13:18:09 +09:00
parent
e5c40adb79
commit
2b5a5122ac
@ -1,13 +1,19 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="bcekxzvu _card _gap">
|
<div class="bcekxzvu _gap _panel">
|
||||||
<div class="_content target">
|
<div class="target">
|
||||||
<MkAvatar class="avatar" :user="report.targetUser" :show-indicator="true"/>
|
<MkA v-user-preview="report.targetUserId" class="info" :to="`/user-info/${report.targetUserId}`" :behavior="'window'">
|
||||||
<MkA v-user-preview="report.targetUserId" class="info" :to="userPage(report.targetUser)">
|
<MkAvatar class="avatar" :user="report.targetUser" :show-indicator="true" :disable-link="true"/>
|
||||||
|
<div class="names">
|
||||||
<MkUserName class="name" :user="report.targetUser"/>
|
<MkUserName class="name" :user="report.targetUser"/>
|
||||||
<MkAcct class="acct" :user="report.targetUser" style="display: block;"/>
|
<MkAcct class="acct" :user="report.targetUser" style="display: block;"/>
|
||||||
</MkA>
|
|
||||||
</div>
|
</div>
|
||||||
<div class="_content">
|
</MkA>
|
||||||
|
<MkKeyValue class="_formBlock">
|
||||||
|
<template #key>{{ $ts.registeredDate }}</template>
|
||||||
|
<template #value>{{ new Date(report.targetUser.createdAt).toLocaleString() }} (<MkTime :time="report.targetUser.createdAt"/>)</template>
|
||||||
|
</MkKeyValue>
|
||||||
|
</div>
|
||||||
|
<div class="detail">
|
||||||
<div>
|
<div>
|
||||||
<Mfm :text="report.comment"/>
|
<Mfm :text="report.comment"/>
|
||||||
</div>
|
</div>
|
||||||
@ -18,8 +24,7 @@
|
|||||||
<MkAcct :user="report.assignee"/>
|
<MkAcct :user="report.assignee"/>
|
||||||
</div>
|
</div>
|
||||||
<div><MkTime :time="report.createdAt"/></div>
|
<div><MkTime :time="report.createdAt"/></div>
|
||||||
</div>
|
<div class="action">
|
||||||
<div class="_footer">
|
|
||||||
<MkSwitch v-model="forward" :disabled="report.targetUser.host == null || report.resolved">
|
<MkSwitch v-model="forward" :disabled="report.targetUser.host == null || report.resolved">
|
||||||
{{ $ts.forwardReport }}
|
{{ $ts.forwardReport }}
|
||||||
<template #caption>{{ $ts.forwardReportIsAnonymous }}</template>
|
<template #caption>{{ $ts.forwardReportIsAnonymous }}</template>
|
||||||
@ -27,68 +32,62 @@
|
|||||||
<MkButton v-if="!report.resolved" primary @click="resolve">{{ $ts.abuseMarkAsResolved }}</MkButton>
|
<MkButton v-if="!report.resolved" primary @click="resolve">{{ $ts.abuseMarkAsResolved }}</MkButton>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script lang="ts">
|
<script lang="ts" setup>
|
||||||
import { defineComponent } from 'vue';
|
|
||||||
|
|
||||||
import MkButton from '@/components/ui/button.vue';
|
import MkButton from '@/components/ui/button.vue';
|
||||||
import MkSwitch from '@/components/form/switch.vue';
|
import MkSwitch from '@/components/form/switch.vue';
|
||||||
|
import MkKeyValue from '@/components/key-value.vue';
|
||||||
import { acct, userPage } from '@/filters/user';
|
import { acct, userPage } from '@/filters/user';
|
||||||
import * as os from '@/os';
|
import * as os from '@/os';
|
||||||
|
|
||||||
export default defineComponent({
|
const props = defineProps<{
|
||||||
components: {
|
report: any;
|
||||||
MkButton,
|
}>();
|
||||||
MkSwitch,
|
|
||||||
},
|
|
||||||
|
|
||||||
props: {
|
const emit = defineEmits<{
|
||||||
report: {
|
(ev: 'resolved', reportId: string): void;
|
||||||
type: Object,
|
}>();
|
||||||
required: true,
|
|
||||||
}
|
|
||||||
},
|
|
||||||
|
|
||||||
emits: ['resolved'],
|
let forward = $ref(props.report.forwarded);
|
||||||
|
|
||||||
data() {
|
function resolve() {
|
||||||
return {
|
|
||||||
forward: this.report.forwarded,
|
|
||||||
};
|
|
||||||
},
|
|
||||||
|
|
||||||
methods: {
|
|
||||||
acct,
|
|
||||||
userPage,
|
|
||||||
|
|
||||||
resolve() {
|
|
||||||
os.apiWithDialog('admin/resolve-abuse-user-report', {
|
os.apiWithDialog('admin/resolve-abuse-user-report', {
|
||||||
forward: this.forward,
|
forward: forward,
|
||||||
reportId: this.report.id,
|
reportId: props.report.id,
|
||||||
}).then(() => {
|
}).then(() => {
|
||||||
this.$emit('resolved', this.report.id);
|
emit('resolved', props.report.id);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
|
||||||
});
|
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style lang="scss" scoped>
|
<style lang="scss" scoped>
|
||||||
.bcekxzvu {
|
.bcekxzvu {
|
||||||
> .target {
|
|
||||||
display: flex;
|
display: flex;
|
||||||
width: 100%;
|
|
||||||
|
> .target {
|
||||||
|
width: 35%;
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
text-align: left;
|
text-align: left;
|
||||||
|
padding: 24px;
|
||||||
|
border-right: solid 1px var(--divider);
|
||||||
|
|
||||||
|
> .info {
|
||||||
|
display: flex;
|
||||||
|
box-sizing: border-box;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
|
padding: 14px;
|
||||||
|
border-radius: 8px;
|
||||||
|
background-image: linear-gradient(45deg, rgb(255 196 0 / 15%) 16.67%, transparent 16.67%, transparent 50%, rgb(255 196 0 / 15%) 50%, rgb(255 196 0 / 15%) 66.67%, transparent 66.67%, transparent 100%);
|
||||||
|
background-size: 16px 16px;
|
||||||
|
|
||||||
> .avatar {
|
> .avatar {
|
||||||
width: 42px;
|
width: 42px;
|
||||||
height: 42px;
|
height: 42px;
|
||||||
}
|
}
|
||||||
|
|
||||||
> .info {
|
> .names {
|
||||||
margin-left: 0.3em;
|
margin-left: 0.3em;
|
||||||
padding: 0 8px;
|
padding: 0 8px;
|
||||||
flex: 1;
|
flex: 1;
|
||||||
@ -99,4 +98,10 @@ export default defineComponent({
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
> .detail {
|
||||||
|
flex: 1;
|
||||||
|
padding: 24px;
|
||||||
|
}
|
||||||
|
}
|
||||||
</style>
|
</style>
|
||||||
|
@ -107,13 +107,18 @@ export class Router extends EventEmitter<{
|
|||||||
}
|
}
|
||||||
break pathMatchLoop;
|
break pathMatchLoop;
|
||||||
} else {
|
} else {
|
||||||
if (p.startsWith && (parts[0] == null || !parts[0].startsWith(p.startsWith))) continue forEachRouteLoop;
|
if (p.startsWith) {
|
||||||
|
if (parts[0] == null || !parts[0].startsWith(p.startsWith)) continue forEachRouteLoop;
|
||||||
|
|
||||||
|
props.set(p.name, parts[0].substring(p.startsWith.length));
|
||||||
|
parts.shift();
|
||||||
|
} else {
|
||||||
props.set(p.name, parts[0]);
|
props.set(p.name, parts[0]);
|
||||||
parts.shift();
|
parts.shift();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (parts.length !== 0) continue forEachRouteLoop;
|
if (parts.length !== 0) continue forEachRouteLoop;
|
||||||
|
|
||||||
|
@ -151,21 +151,21 @@ watch($$(eyeCatchingImageId), async () => {
|
|||||||
|
|
||||||
function getSaveOptions() {
|
function getSaveOptions() {
|
||||||
return {
|
return {
|
||||||
title: tatitle.trim(),
|
title: title.trim(),
|
||||||
name: taname.trim(),
|
name: name.trim(),
|
||||||
summary: tasummary,
|
summary: summary,
|
||||||
font: tafont,
|
font: font,
|
||||||
script: tascript,
|
script: script,
|
||||||
hideTitleWhenPinned: tahideTitleWhenPinned,
|
hideTitleWhenPinned: hideTitleWhenPinned,
|
||||||
alignCenter: taalignCenter,
|
alignCenter: alignCenter,
|
||||||
content: tacontent,
|
content: content,
|
||||||
variables: tavariables,
|
variables: variables,
|
||||||
eyeCatchingImageId: taeyeCatchingImageId,
|
eyeCatchingImageId: eyeCatchingImageId,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
function save() {
|
function save() {
|
||||||
const options = tagetSaveOptions();
|
const options = getSaveOptions();
|
||||||
|
|
||||||
const onError = err => {
|
const onError = err => {
|
||||||
if (err.id == '3d81ceae-475f-4600-b2a8-2bc116157532') {
|
if (err.id == '3d81ceae-475f-4600-b2a8-2bc116157532') {
|
||||||
@ -184,11 +184,11 @@ function save() {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
if (tapageId) {
|
if (pageId) {
|
||||||
options.pageId = tapageId;
|
options.pageId = pageId;
|
||||||
os.api('pages/update', options)
|
os.api('pages/update', options)
|
||||||
.then(page => {
|
.then(page => {
|
||||||
tacurrentName = taname.trim();
|
currentName = name.trim();
|
||||||
os.alert({
|
os.alert({
|
||||||
type: 'success',
|
type: 'success',
|
||||||
text: i18n.ts._pages.updated,
|
text: i18n.ts._pages.updated,
|
||||||
@ -197,8 +197,8 @@ function save() {
|
|||||||
} else {
|
} else {
|
||||||
os.api('pages/create', options)
|
os.api('pages/create', options)
|
||||||
.then(created => {
|
.then(created => {
|
||||||
tapageId = created.id;
|
pageId = created.id;
|
||||||
tacurrentName = name.trim();
|
currentName = name.trim();
|
||||||
os.alert({
|
os.alert({
|
||||||
type: 'success',
|
type: 'success',
|
||||||
text: i18n.ts._pages.created,
|
text: i18n.ts._pages.created,
|
||||||
@ -227,11 +227,11 @@ function del() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function duplicate() {
|
function duplicate() {
|
||||||
tatitle = tatitle + ' - copy';
|
title = title + ' - copy';
|
||||||
taname = taname + '-copy';
|
name = name + '-copy';
|
||||||
os.api('pages/create', tagetSaveOptions()).then(created => {
|
os.api('pages/create', getSaveOptions()).then(created => {
|
||||||
tapageId = created.id;
|
pageId = created.id;
|
||||||
tacurrentName = taname.trim();
|
currentName = name.trim();
|
||||||
os.alert({
|
os.alert({
|
||||||
type: 'success',
|
type: 'success',
|
||||||
text: i18n.ts._pages.created,
|
text: i18n.ts._pages.created,
|
||||||
@ -244,12 +244,12 @@ async function add() {
|
|||||||
const { canceled, result: type } = await os.select({
|
const { canceled, result: type } = await os.select({
|
||||||
type: null,
|
type: null,
|
||||||
title: i18n.ts._pages.chooseBlock,
|
title: i18n.ts._pages.chooseBlock,
|
||||||
groupedItems: tagetPageBlockList(),
|
groupedItems: getPageBlockList(),
|
||||||
});
|
});
|
||||||
if (canceled) return;
|
if (canceled) return;
|
||||||
|
|
||||||
const id = uuid();
|
const id = uuid();
|
||||||
tacontent.push({ id, type });
|
content.push({ id, type });
|
||||||
}
|
}
|
||||||
|
|
||||||
async function addVariable() {
|
async function addVariable() {
|
||||||
@ -260,7 +260,7 @@ async function addVariable() {
|
|||||||
|
|
||||||
name = name.trim();
|
name = name.trim();
|
||||||
|
|
||||||
if (tahpml.isUsedName(name)) {
|
if (hpml.isUsedName(name)) {
|
||||||
os.alert({
|
os.alert({
|
||||||
type: 'error',
|
type: 'error',
|
||||||
text: i18n.ts._pages.variableNameIsAlreadyUsed,
|
text: i18n.ts._pages.variableNameIsAlreadyUsed,
|
||||||
@ -269,11 +269,11 @@ async function addVariable() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const id = uuid();
|
const id = uuid();
|
||||||
tavariables.push({ id, name, type: null });
|
variables.push({ id, name, type: null });
|
||||||
}
|
}
|
||||||
|
|
||||||
function removeVariable(v) {
|
function removeVariable(v) {
|
||||||
tavariables = tavariables.filter(x => x.name !== v.name);
|
variables = variables.filter(x => x.name !== v.name);
|
||||||
}
|
}
|
||||||
|
|
||||||
function getPageBlockList() {
|
function getPageBlockList() {
|
||||||
@ -352,7 +352,7 @@ function setEyeCatchingImage(e) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function removeEyeCatchingImage() {
|
function removeEyeCatchingImage() {
|
||||||
taeyeCatchingImageId = null;
|
eyeCatchingImageId = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
function highlighter(code) {
|
function highlighter(code) {
|
||||||
|
@ -1,4 +1,5 @@
|
|||||||
<template><MkStickyContainer>
|
<template>
|
||||||
|
<MkStickyContainer>
|
||||||
<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs"/></template>
|
<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs"/></template>
|
||||||
<MkSpacer :content-max="700">
|
<MkSpacer :content-max="700">
|
||||||
<transition :name="$store.state.animation ? 'fade' : ''" mode="out-in">
|
<transition :name="$store.state.animation ? 'fade' : ''" mode="out-in">
|
||||||
@ -54,10 +55,11 @@
|
|||||||
</MkPagination>
|
</MkPagination>
|
||||||
</MkContainer>
|
</MkContainer>
|
||||||
</div>
|
</div>
|
||||||
<MkError v-else-if="error" @retry="fetch()"/>
|
<MkError v-else-if="error" @retry="fetchPage()"/>
|
||||||
<MkLoading v-else/>
|
<MkLoading v-else/>
|
||||||
</transition>
|
</transition>
|
||||||
</MkSpacer></MkStickyContainer>
|
</MkSpacer>
|
||||||
|
</MkStickyContainer>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script lang="ts" setup>
|
<script lang="ts" setup>
|
||||||
|
@ -109,23 +109,7 @@ function focus(): void {
|
|||||||
tlComponent.focus();
|
tlComponent.focus();
|
||||||
}
|
}
|
||||||
|
|
||||||
const headerActions = $computed(() => [{
|
const headerActions = $computed(() => []);
|
||||||
icon: 'fas fa-list-ul',
|
|
||||||
text: i18n.ts.lists,
|
|
||||||
handler: chooseList,
|
|
||||||
}, {
|
|
||||||
icon: 'fas fa-satellite',
|
|
||||||
text: i18n.ts.antennas,
|
|
||||||
handler: chooseAntenna,
|
|
||||||
}, {
|
|
||||||
icon: 'fas fa-satellite-dish',
|
|
||||||
text: i18n.ts.channel,
|
|
||||||
handler: chooseChannel,
|
|
||||||
}, {
|
|
||||||
icon: 'fas fa-calendar-alt',
|
|
||||||
text: i18n.ts.jumpToSpecifiedDate,
|
|
||||||
handler: timetravel,
|
|
||||||
}]);
|
|
||||||
|
|
||||||
const headerTabs = $computed(() => [{
|
const headerTabs = $computed(() => [{
|
||||||
active: src === 'home',
|
active: src === 'home',
|
||||||
@ -151,7 +135,22 @@ const headerTabs = $computed(() => [{
|
|||||||
icon: 'fas fa-globe',
|
icon: 'fas fa-globe',
|
||||||
iconOnly: true,
|
iconOnly: true,
|
||||||
onClick: () => { saveSrc('global'); },
|
onClick: () => { saveSrc('global'); },
|
||||||
}] : [])]);
|
}] : []), {
|
||||||
|
icon: 'fas fa-list-ul',
|
||||||
|
title: i18n.ts.lists,
|
||||||
|
iconOnly: true,
|
||||||
|
onClick: chooseList,
|
||||||
|
}, {
|
||||||
|
icon: 'fas fa-satellite',
|
||||||
|
title: i18n.ts.antennas,
|
||||||
|
iconOnly: true,
|
||||||
|
onClick: chooseAntenna,
|
||||||
|
}, {
|
||||||
|
icon: 'fas fa-satellite-dish',
|
||||||
|
title: i18n.ts.channel,
|
||||||
|
iconOnly: true,
|
||||||
|
onClick: chooseChannel,
|
||||||
|
}]);
|
||||||
|
|
||||||
definePageMetadata(computed(() => ({
|
definePageMetadata(computed(() => ({
|
||||||
title: i18n.ts.timeline,
|
title: i18n.ts.timeline,
|
||||||
|
@ -1,5 +1,7 @@
|
|||||||
<template>
|
<template>
|
||||||
<div ref="rootEl" v-hotkey.global="keymap" v-size="{ min: [800] }" class="eqqrhokj">
|
<MkStickyContainer>
|
||||||
|
<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs"/></template>
|
||||||
|
<div ref="rootEl" v-size="{ min: [800] }" class="eqqrhokj">
|
||||||
<div v-if="queue > 0" class="new"><button class="_buttonPrimary" @click="top()">{{ $ts.newNoteRecived }}</button></div>
|
<div v-if="queue > 0" class="new"><button class="_buttonPrimary" @click="top()">{{ $ts.newNoteRecived }}</button></div>
|
||||||
<div class="tl _block">
|
<div class="tl _block">
|
||||||
<XTimeline
|
<XTimeline
|
||||||
@ -12,6 +14,7 @@
|
|||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
</MkStickyContainer>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script lang="ts" setup>
|
<script lang="ts" setup>
|
||||||
@ -61,15 +64,7 @@ async function timetravel() {
|
|||||||
tlEl.timetravel(date);
|
tlEl.timetravel(date);
|
||||||
}
|
}
|
||||||
|
|
||||||
const headerActions = $computed(() => []);
|
const headerActions = $computed(() => list ? [{
|
||||||
|
|
||||||
const headerTabs = $computed(() => []);
|
|
||||||
|
|
||||||
definePageMetadata(computed(() => list ? {
|
|
||||||
title: list.name,
|
|
||||||
icon: 'fas fa-list-ul',
|
|
||||||
bg: 'var(--bg)',
|
|
||||||
actions: [{
|
|
||||||
icon: 'fas fa-calendar-alt',
|
icon: 'fas fa-calendar-alt',
|
||||||
text: i18n.ts.jumpToSpecifiedDate,
|
text: i18n.ts.jumpToSpecifiedDate,
|
||||||
handler: timetravel,
|
handler: timetravel,
|
||||||
@ -77,7 +72,14 @@ definePageMetadata(computed(() => list ? {
|
|||||||
icon: 'fas fa-cog',
|
icon: 'fas fa-cog',
|
||||||
text: i18n.ts.settings,
|
text: i18n.ts.settings,
|
||||||
handler: settings,
|
handler: settings,
|
||||||
}],
|
}] : []);
|
||||||
|
|
||||||
|
const headerTabs = $computed(() => []);
|
||||||
|
|
||||||
|
definePageMetadata(computed(() => list ? {
|
||||||
|
title: list.name,
|
||||||
|
icon: 'fas fa-list-ul',
|
||||||
|
bg: 'var(--bg)',
|
||||||
} : null));
|
} : null));
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user