laoxong/misskey
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into cache-user-info

Browse Source
This commit is contained in:
syuilo 2022-03-21 05:26:53 +09:00
commit a1f11126bb
22 changed files with 674 additions and 775 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
packages/backend/src/server/activitypub.ts
View File

@ -18,6 +18,7 @@ import { ILocalUser, User } from '@/models/entities/user.js';
import { In } from 'typeorm';
import { renderLike } from '@/remote/activitypub/renderer/like.js';
import { getUserKeypair } from '@/misc/keypair-store.js';
import { noteCache, userCache } from './activitypub/cache.js';
// Init router
const router = new Router();
@ -65,11 +66,12 @@ router.post('/users/:user/inbox', json(), inbox);
router.get('/notes/:note', async (ctx, next) => {
if (!isActivityPubReq(ctx)) return await next();
const note = await Notes.findOne({
// TODO: typeorm 3.0にしたら .then(x => x || null) は消せる
const note = await noteCache.fetch(ctx.params.note, () => Notes.findOne({
id: ctx.params.note,
visibility: In(['public' as const, 'home' as const]),
localOnly: false,
});
}).then(x => x || null));
if (note == null) {
ctx.status = 404;
@ -148,7 +150,7 @@ router.get('/users/:user/publickey', async ctx => {
});
// user
async function userInfo(ctx: Router.RouterContext, user: User | undefined) {
async function userInfo(ctx: Router.RouterContext, user: User | undefined | null) {
if (user == null) {
ctx.status = 404;
return;
@ -164,11 +166,12 @@ router.get('/users/:user', async (ctx, next) => {
const userId = ctx.params.user;
const user = await Users.findOne({
// TODO: typeorm 3.0にしたら .then(x => x || null) は消せる
const user = await userCache.fetch(userId, () => Users.findOne({
id: userId,
host: null,
isSuspended: false,
});
}).then(x => x || null));
await userInfo(ctx, user);
});

6
packages/backend/src/server/activitypub/cache.ts Normal file
View File

@ -0,0 +1,6 @@
import { Cache } from "@/misc/cache";
import { Note } from "@/models/entities/note";
import { User } from "@/models/entities/user";
export const userCache = new Cache<User | null>(1000 * 60 * 30);
export const noteCache = new Cache<Note | null>(1000 * 60 * 30);

7
packages/backend/src/server/activitypub/featured.ts
View File

@ -5,15 +5,16 @@ import renderOrderedCollection from '@/remote/activitypub/renderer/ordered-colle
import { setResponseType } from '../activitypub.js';
import renderNote from '@/remote/activitypub/renderer/note.js';
import { Users, Notes, UserNotePinings } from '@/models/index.js';
import { userCache } from './cache.js';
export default async (ctx: Router.RouterContext) => {
const userId = ctx.params.user;
// Verify user
const user = await Users.findOne({
// TODO: typeorm 3.0にしたら .then(x => x || null) は消せる
const user = await userCache.fetch(userId, () => Users.findOne({
id: userId,
host: null,
});
}).then(x => x || null));
if (user == null) {
ctx.status = 404;

7
packages/backend/src/server/activitypub/followers.ts
View File

@ -10,6 +10,7 @@ import renderFollowUser from '@/remote/activitypub/renderer/follow-user.js';
import { setResponseType } from '../activitypub.js';
import { Users, Followings, UserProfiles } from '@/models/index.js';
import { LessThan } from 'typeorm';
import { userCache } from './cache.js';
export default async (ctx: Router.RouterContext) => {
const userId = ctx.params.user;
@ -27,11 +28,11 @@ export default async (ctx: Router.RouterContext) => {
return;
}
// Verify user
const user = await Users.findOne({
// TODO: typeorm 3.0にしたら .then(x => x || null) は消せる
const user = await userCache.fetch(userId, () => Users.findOne({
id: userId,
host: null,
});
}).then(x => x || null));
if (user == null) {
ctx.status = 404;

7
packages/backend/src/server/activitypub/following.ts
View File

@ -11,6 +11,7 @@ import { setResponseType } from '../activitypub.js';
import { Users, Followings, UserProfiles } from '@/models/index.js';
import { LessThan, FindConditions } from 'typeorm';
import { Following } from '@/models/entities/following.js';
import { userCache } from './cache.js';
export default async (ctx: Router.RouterContext) => {
const userId = ctx.params.user;
@ -28,11 +29,11 @@ export default async (ctx: Router.RouterContext) => {
return;
}
// Verify user
const user = await Users.findOne({
// TODO: typeorm 3.0にしたら .then(x => x || null) は消せる
const user = await userCache.fetch(userId, () => Users.findOne({
id: userId,
host: null,
});
}).then(x => x || null));
if (user == null) {
ctx.status = 404;

7
packages/backend/src/server/activitypub/outbox.ts
View File

@ -15,6 +15,7 @@ import { Users, Notes } from '@/models/index.js';
import { makePaginationQuery } from '../api/common/make-pagination-query.js';
import { Brackets } from 'typeorm';
import { Note } from '@/models/entities/note.js';
import { userCache } from './cache.js';
export default async (ctx: Router.RouterContext) => {
const userId = ctx.params.user;
@ -35,11 +36,11 @@ export default async (ctx: Router.RouterContext) => {
return;
}
// Verify user
const user = await Users.findOne({
// TODO: typeorm 3.0にしたら .then(x => x || null) は消せる
const user = await userCache.fetch(userId, () => Users.findOne({
id: userId,
host: null,
});
}).then(x => x || null));
if (user == null) {
ctx.status = 404;

7
packages/backend/src/server/nodeinfo.ts
View File

@ -4,6 +4,7 @@ import { fetchMeta } from '@/misc/fetch-meta.js';
import { Users, Notes } from '@/models/index.js';
import { MoreThan } from 'typeorm';
import { MAX_NOTE_TEXT_LENGTH } from '@/const.js';
import { Cache } from '@/misc/cache';
const router = new Router();
@ -81,15 +82,17 @@ const nodeinfo2 = async () => {
};
};
const cache = new Cache<Awaited<ReturnType<typeof nodeinfo2>>>(1000 * 60 * 10);
router.get(nodeinfo2_1path, async ctx => {
const base = await nodeinfo2();
const base = await cache.fetch(null, () => nodeinfo2());
ctx.body = { version: '2.1', ...base };
ctx.set('Cache-Control', 'public, max-age=600');
});
router.get(nodeinfo2_0path, async ctx => {
const base = await nodeinfo2();
const base = await cache.fetch(null, () => nodeinfo2());
delete base.software.repository;

4
packages/client/src/components/notifications.vue
View File

@ -17,7 +17,7 @@
</template>
<script lang="ts" setup>
import { defineComponent, PropType, markRaw, onUnmounted, onMounted, computed, ref } from 'vue';
import { defineComponent, markRaw, onUnmounted, onMounted, computed, ref } from 'vue';
import { notificationTypes } from 'misskey-js';
import MkPagination from '@/components/ui/pagination.vue';
import { Paging } from '@/components/ui/pagination.vue';
@ -29,7 +29,7 @@ import { stream } from '@/stream';
import { $i } from '@/account';
const props = defineProps<{
includeTypes?: PropType<typeof notificationTypes[number][]>;
includeTypes?: typeof notificationTypes[number][];
unreadOnly?: boolean;
}>();

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

@ -293,23 +293,25 @@ export function inputDate(props: {
});
}
export function select(props: {
export function select<C extends any = any>(props: {
title?: string | null;
text?: string | null;
default?: string | null;
items?: {
value: string;
} & ({
items: {
value: C;
text: string;
}[];
groupedItems?: {
} | {
groupedItems: {
label: string;
items: {
value: string;
value: C;
text: string;
}[];
}[];
}): Promise<{ canceled: true; result: undefined; } | {
canceled: false; result: string;
})): Promise<{ canceled: true; result: undefined; } | {
canceled: false; result: C;
}> {
return new Promise((resolve, reject) => {
popup(import('@/components/dialog.vue'), {

41
packages/client/src/ui/deck.vue
View File

@ -17,7 +17,8 @@
:key="ids[0]"
class="column"
:column="columns.find(c => c.id === ids[0])"
:style="columns.find(c => c.id === ids[0]).flexible ? { flex: 1, minWidth: '350px' } : { width: columns.find(c => c.id === ids[0]).width + 'px' }"
:is-stacked="false"
:style="columns.find(c => c.id === ids[0])!.flexible ? { flex: 1, minWidth: '350px' } : { width: columns.find(c => c.id === ids[0])!.width + 'px' }"
@parent-focus="moveFocus(ids[0], $event)"
/>
</template>
@ -25,8 +26,8 @@
<div v-if="isMobile" class="buttons">
<button class="button nav _button" @click="drawerMenuShowing = true"><i class="fas fa-bars"></i><span v-if="menuIndicated" class="indicator"><i class="fas fa-circle"></i></span></button>
<button class="button home _button" @click="$router.push('/')"><i class="fas fa-home"></i></button>
<button class="button notifications _button" @click="$router.push('/my/notifications')"><i class="fas fa-bell"></i><span v-if="$i.hasUnreadNotification" class="indicator"><i class="fas fa-circle"></i></span></button>
<button class="button post _button" @click="post()"><i class="fas fa-pencil-alt"></i></button>
<button class="button notifications _button" @click="$router.push('/my/notifications')"><i class="fas fa-bell"></i><span v-if="$i?.hasUnreadNotification" class="indicator"><i class="fas fa-circle"></i></span></button>
<button class="button post _button" @click="os.post()"><i class="fas fa-pencil-alt"></i></button>
</div>
<transition :name="$store.state.animation ? 'menu-back' : ''">
@ -45,8 +46,8 @@
</div>
</template>
<script lang="ts">
import { computed, defineComponent, provide, ref, watch } from 'vue';
<script lang="ts" setup>
import { computed, provide, ref, watch } from 'vue';
import { v4 as uuid } from 'uuid';
import DeckColumnCore from '@/ui/deck/column-core.vue';
import XSidebar from '@/ui/_common_/sidebar.vue';
@ -60,15 +61,6 @@ import { useRoute } from 'vue-router';
import { $i } from '@/account';
import { i18n } from '@/i18n';
export default defineComponent({
components: {
XCommon,
XSidebar,
XDrawerMenu,
DeckColumnCore,
},
setup() {
const isMobile = ref(window.innerWidth <= 500);
window.addEventListener('resize', () => {
isMobile.value = window.innerWidth <= 500;
@ -122,8 +114,7 @@ export default defineComponent({
const onContextmenu = (ev) => {
os.contextMenu([{
text: i18n.ts._deck.addColumn,
icon: null,
action: addColumn
action: addColumn,
}], ev);
};
@ -137,25 +128,15 @@ export default defineComponent({
document.documentElement.style.overflowY = 'hidden';
document.documentElement.style.scrollBehavior = 'auto';
window.addEventListener('wheel', (ev) => {
if (getScrollContainer(ev.target) == null) {
if (getScrollContainer(ev.target as HTMLElement) == null) {
document.documentElement.scrollLeft += ev.deltaY > 0 ? 96 : -96;
}
});
loadDeck();
return {
isMobile,
deckStore,
drawerMenuShowing,
columns,
layout,
menuIndicated,
onContextmenu,
wallpaper: localStorage.getItem('wallpaper') != null,
post: os.post,
};
},
});
function moveFocus(id: string, direction: 'up' | 'down' | 'left' | 'right') {
// TODO??
}
</script>
<style lang="scss" scoped>

79
packages/client/src/ui/deck/antenna-column.vue
View File

@ -1,75 +1,62 @@
<template>
<XColumn :func="{ handler: setAntenna, title: $ts.selectAntenna }" :column="column" :is-stacked="isStacked">
<XColumn :func="{ handler: setAntenna, title: $ts.selectAntenna }" :column="column" :is-stacked="isStacked" @parent-focus="$event => emit('parent-focus', $event)">
<template #header>
<i class="fas fa-satellite"></i><span style="margin-left: 8px;">{{ column.name }}</span>
</template>
<XTimeline v-if="column.antennaId" ref="timeline" src="antenna" :antenna="column.antennaId" @after="() => $emit('loaded')"/>
<XTimeline v-if="column.antennaId" ref="timeline" src="antenna" :antenna="column.antennaId" @after="() => emit('loaded')"/>
</XColumn>
</template>
<script lang="ts">
import { defineComponent } from 'vue';
<script lang="ts" setup>
import { onMounted } from 'vue';
import XColumn from './column.vue';
import XTimeline from '@/components/timeline.vue';
import * as os from '@/os';
import { updateColumn } from './deck-store';
import { updateColumn, Column } from './deck-store';
import { i18n } from '@/i18n';
export default defineComponent({
components: {
XColumn,
XTimeline,
},
const props = defineProps<{
column: Column;
isStacked: boolean;
}>();
props: {
column: {
type: Object,
required: true
},
isStacked: {
type: Boolean,
required: true
const emit = defineEmits<{
(e: 'loaded'): void;
(e: 'parent-focus', direction: 'up' | 'down' | 'left' | 'right'): void;
}>();
let timeline = $ref<InstanceType<typeof XTimeline>>();
onMounted(() => {
if (props.column.antennaId == null) {
setAntenna();
}
},
});
data() {
return {
};
},
watch: {
mediaOnly() {
(this.$refs.timeline as any).reload();
}
},
mounted() {
if (this.column.antennaId == null) {
this.setAntenna();
}
},
methods: {
async setAntenna() {
async function setAntenna() {
const antennas = await os.api('antennas/list');
const { canceled, result: antenna } = await os.select({
title: this.$ts.selectAntenna,
title: i18n.ts.selectAntenna,
items: antennas.map(x => ({
value: x, text: x.name
})),
default: this.column.antennaId
default: props.column.antennaId
});
if (canceled) return;
updateColumn(this.column.id, {
updateColumn(props.column.id, {
antennaId: antenna.id
});
},
}
/*
function focus() {
timeline.focus();
}
focus() {
(this.$refs.timeline as any).focus();
}
}
defineExpose({
focus,
});
*/
</script>
<style lang="scss" scoped>

54
packages/client/src/ui/deck/column-core.vue
View File

@ -1,17 +1,18 @@
<template>
<!-- TODO: リファクタの余地がありそう -->
<XMainColumn v-if="column.type === 'main'" :column="column" :is-stacked="isStacked" @parent-focus="$emit('parent-focus', $event)"/>
<XWidgetsColumn v-else-if="column.type === 'widgets'" :column="column" :is-stacked="isStacked" @parent-focus="$emit('parent-focus', $event)"/>
<XNotificationsColumn v-else-if="column.type === 'notifications'" :column="column" :is-stacked="isStacked" @parent-focus="$emit('parent-focus', $event)"/>
<XTlColumn v-else-if="column.type === 'tl'" :column="column" :is-stacked="isStacked" @parent-focus="$emit('parent-focus', $event)"/>
<XListColumn v-else-if="column.type === 'list'" :column="column" :is-stacked="isStacked" @parent-focus="$emit('parent-focus', $event)"/>
<XAntennaColumn v-else-if="column.type === 'antenna'" :column="column" :is-stacked="isStacked" @parent-focus="$emit('parent-focus', $event)"/>
<XMentionsColumn v-else-if="column.type === 'mentions'" :column="column" :is-stacked="isStacked" @parent-focus="$emit('parent-focus', $event)"/>
<XDirectColumn v-else-if="column.type === 'direct'" :column="column" :is-stacked="isStacked" @parent-focus="$emit('parent-focus', $event)"/>
<div v-if="!column">たぶん見えちゃいけないやつ</div>
<XMainColumn v-else-if="column.type === 'main'" :column="column" :is-stacked="isStacked" @parent-focus="emit('parent-focus', $event)"/>
<XWidgetsColumn v-else-if="column.type === 'widgets'" :column="column" :is-stacked="isStacked" @parent-focus="emit('parent-focus', $event)"/>
<XNotificationsColumn v-else-if="column.type === 'notifications'" :column="column" :is-stacked="isStacked" @parent-focus="emit('parent-focus', $event)"/>
<XTlColumn v-else-if="column.type === 'tl'" :column="column" :is-stacked="isStacked" @parent-focus="emit('parent-focus', $event)"/>
<XListColumn v-else-if="column.type === 'list'" :column="column" :is-stacked="isStacked" @parent-focus="emit('parent-focus', $event)"/>
<XAntennaColumn v-else-if="column.type === 'antenna'" :column="column" :is-stacked="isStacked" @parent-focus="emit('parent-focus', $event)"/>
<XMentionsColumn v-else-if="column.type === 'mentions'" :column="column" :is-stacked="isStacked" @parent-focus="emit('parent-focus', $event)"/>
<XDirectColumn v-else-if="column.type === 'direct'" :column="column" :is-stacked="isStacked" @parent-focus="emit('parent-focus', $event)"/>
</template>
<script lang="ts">
import { defineComponent } from 'vue';
<script lang="ts" setup>
import { } from 'vue';
import XMainColumn from './main-column.vue';
import XTlColumn from './tl-column.vue';
import XAntennaColumn from './antenna-column.vue';
@ -20,33 +21,24 @@ import XNotificationsColumn from './notifications-column.vue';
import XWidgetsColumn from './widgets-column.vue';
import XMentionsColumn from './mentions-column.vue';
import XDirectColumn from './direct-column.vue';
import { Column } from './deck-store';
defineProps<{
column?: Column;
isStacked: boolean;
}>();
const emit = defineEmits<{
(e: 'parent-focus', direction: 'up' | 'down' | 'left' | 'right'): void;
}>();
/*
export default defineComponent({
components: {
XMainColumn,
XTlColumn,
XAntennaColumn,
XListColumn,
XNotificationsColumn,
XWidgetsColumn,
XMentionsColumn,
XDirectColumn
},
props: {
column: {
type: Object,
required: true
},
isStacked: {
type: Boolean,
required: false,
default: false
}
},
methods: {
focus() {
this.$children[0].focus();
}
}
});
*/
</script>

275
packages/client/src/ui/deck/column.vue
View File

@ -31,211 +31,186 @@
</template>
<script lang="ts">
import { defineComponent } from 'vue';
export type DeckFunc = {
title: string;
handler: (payload: MouseEvent) => void;
icon?: string;
};
</script>
<script lang="ts" setup>
import { onBeforeUnmount, onMounted, provide, watch } from 'vue';
import * as os from '@/os';
import { updateColumn, swapLeftColumn, swapRightColumn, swapUpColumn, swapDownColumn, stackLeftColumn, popRightColumn, removeColumn, swapColumn } from './deck-store';
import { updateColumn, swapLeftColumn, swapRightColumn, swapUpColumn, swapDownColumn, stackLeftColumn, popRightColumn, removeColumn, swapColumn, Column } from './deck-store';
import { deckStore } from './deck-store';
import { i18n } from '@/i18n';
export default defineComponent({
provide: {
shouldHeaderThin: true,
shouldOmitHeaderTitle: true,
},
provide('shouldHeaderThin', true);
provide('shouldOmitHeaderTitle', true);
props: {
column: {
type: Object,
required: false,
default: null
},
isStacked: {
type: Boolean,
required: false,
default: false
},
func: {
type: Object,
required: false,
default: null
},
naked: {
type: Boolean,
required: false,
default: false
},
indicated: {
type: Boolean,
required: false,
default: false
},
},
data() {
return {
deckStore,
dragging: false,
draghover: false,
dropready: false,
};
},
computed: {
isMainColumn(): boolean {
return this.column.type === 'main';
},
active(): boolean {
return this.column.active !== false;
},
keymap(): any {
return {
'shift+up': () => this.$parent.$emit('parent-focus', 'up'),
'shift+down': () => this.$parent.$emit('parent-focus', 'down'),
'shift+left': () => this.$parent.$emit('parent-focus', 'left'),
'shift+right': () => this.$parent.$emit('parent-focus', 'right'),
};
}
},
watch: {
active(v) {
this.$emit('change-active-state', v);
},
dragging(v) {
os.deckGlobalEvents.emit(v ? 'column.dragStart' : 'column.dragEnd');
}
},
mounted() {
os.deckGlobalEvents.on('column.dragStart', this.onOtherDragStart);
os.deckGlobalEvents.on('column.dragEnd', this.onOtherDragEnd);
},
beforeUnmount() {
os.deckGlobalEvents.off('column.dragStart', this.onOtherDragStart);
os.deckGlobalEvents.off('column.dragEnd', this.onOtherDragEnd);
},
methods: {
onOtherDragStart() {
this.dropready = true;
},
onOtherDragEnd() {
this.dropready = false;
},
toggleActive() {
if (!this.isStacked) return;
updateColumn(this.column.id, {
active: !this.column.active
const props = withDefaults(defineProps<{
column: Column;
isStacked?: boolean;
func?: DeckFunc | null;
naked?: boolean;
indicated?: boolean;
}>(), {
isStacked: false,
func: null,
naked: false,
indicated: false,
});
},
getMenu() {
const emit = defineEmits<{
(e: 'parent-focus', direction: 'up' | 'down' | 'left' | 'right'): void;
(e: 'change-active-state', v: boolean): void;
}>();
let body = $ref<HTMLDivElement>();
let dragging = $ref(false);
watch($$(dragging), v => os.deckGlobalEvents.emit(v ? 'column.dragStart' : 'column.dragEnd'));
let draghover = $ref(false);
let dropready = $ref(false);
const isMainColumn = $computed(() => props.column.type === 'main');
const active = $computed(() => props.column.active !== false);
watch($$(active), v => emit('change-active-state', v));
const keymap = $computed(() => ({
'shift+up': () => emit('parent-focus', 'up'),
'shift+down': () => emit('parent-focus', 'down'),
'shift+left': () => emit('parent-focus', 'left'),
'shift+right': () => emit('parent-focus', 'right'),
}));
onMounted(() => {
os.deckGlobalEvents.on('column.dragStart', onOtherDragStart);
os.deckGlobalEvents.on('column.dragEnd', onOtherDragEnd);
});
onBeforeUnmount(() => {
os.deckGlobalEvents.off('column.dragStart', onOtherDragStart);
os.deckGlobalEvents.off('column.dragEnd', onOtherDragEnd);
});
function onOtherDragStart() {
dropready = true;
}
function onOtherDragEnd() {
dropready = false;
}
function toggleActive() {
if (!props.isStacked) return;
updateColumn(props.column.id, {
active: !props.column.active
});
}
function getMenu() {
const items = [{
icon: 'fas fa-pencil-alt',
text: this.$ts.edit,
text: i18n.ts.edit,
action: async () => {
const { canceled, result } = await os.form(this.column.name, {
const { canceled, result } = await os.form(props.column.name, {
name: {
type: 'string',
label: this.$ts.name,
default: this.column.name
label: i18n.ts.name,
default: props.column.name
},
width: {
type: 'number',
label: this.$ts.width,
default: this.column.width
label: i18n.ts.width,
default: props.column.width
},
flexible: {
type: 'boolean',
label: this.$ts.flexible,
default: this.column.flexible
label: i18n.ts.flexible,
default: props.column.flexible
}
});
if (canceled) return;
updateColumn(this.column.id, result);
updateColumn(props.column.id, result);
}
}, null, {
icon: 'fas fa-arrow-left',
text: this.$ts._deck.swapLeft,
text: i18n.ts._deck.swapLeft,
action: () => {
swapLeftColumn(this.column.id);
swapLeftColumn(props.column.id);
}
}, {
icon: 'fas fa-arrow-right',
text: this.$ts._deck.swapRight,
text: i18n.ts._deck.swapRight,
action: () => {
swapRightColumn(this.column.id);
swapRightColumn(props.column.id);
}
}, this.isStacked ? {
}, props.isStacked ? {
icon: 'fas fa-arrow-up',
text: this.$ts._deck.swapUp,
text: i18n.ts._deck.swapUp,
action: () => {
swapUpColumn(this.column.id);
swapUpColumn(props.column.id);
}
} : undefined, this.isStacked ? {
} : undefined, props.isStacked ? {
icon: 'fas fa-arrow-down',
text: this.$ts._deck.swapDown,
text: i18n.ts._deck.swapDown,
action: () => {
swapDownColumn(this.column.id);
swapDownColumn(props.column.id);
}
} : undefined, null, {
icon: 'fas fa-window-restore',
text: this.$ts._deck.stackLeft,
text: i18n.ts._deck.stackLeft,
action: () => {
stackLeftColumn(this.column.id);
stackLeftColumn(props.column.id);
}
}, this.isStacked ? {
}, props.isStacked ? {
icon: 'fas fa-window-maximize',
text: this.$ts._deck.popRight,
text: i18n.ts._deck.popRight,
action: () => {
popRightColumn(this.column.id);
popRightColumn(props.column.id);
}
} : undefined, null, {
icon: 'fas fa-trash-alt',
text: this.$ts.remove,
text: i18n.ts.remove,
danger: true,
action: () => {
removeColumn(this.column.id);
removeColumn(props.column.id);
}
}];
return items;
},
}
onContextmenu(ev: MouseEvent) {
os.contextMenu(this.getMenu(), ev);
},
function onContextmenu(ev: MouseEvent) {
os.contextMenu(getMenu(), ev);
}
goTop() {
this.$refs.body.scrollTo({
function goTop() {
body.scrollTo({
top: 0,
behavior: 'smooth'
});
},
}
onDragstart(e) {
function onDragstart(e) {
e.dataTransfer.effectAllowed = 'move';
e.dataTransfer.setData(_DATA_TRANSFER_DECK_COLUMN_, this.column.id);
e.dataTransfer.setData(_DATA_TRANSFER_DECK_COLUMN_, props.column.id);
// Chromeのバグで、Dragstartハンドラ内ですぐにDOMを変更する(=リアクティブなプロパティを変更する)とDragが終了してしまう
// SEE: https://stackoverflow.com/questions/19639969/html5-dragend-event-firing-immediately
window.setTimeout(() => {
this.dragging = true;
dragging = true;
}, 10);
},
}
onDragend(e) {
this.dragging = false;
},
function onDragend(e) {
dragging = false;
}
onDragover(e) {
function onDragover(e) {
// 自分自身がドラッグされている場合
if (this.dragging) {
if (dragging) {
// 自分自身にはドロップさせない
e.dataTransfer.dropEffect = 'none';
return;
@ -245,24 +220,22 @@ export default defineComponent({
e.dataTransfer.dropEffect = isDeckColumn ? 'move' : 'none';
if (!this.dragging && isDeckColumn) this.draghover = true;
},
if (!dragging && isDeckColumn) draghover = true;
}
onDragleave() {
this.draghover = false;
},
function onDragleave() {
draghover = false;
}
onDrop(e) {
this.draghover = false;
function onDrop(e) {
draghover = false;
os.deckGlobalEvents.emit('column.dragEnd');
const id = e.dataTransfer.getData(_DATA_TRANSFER_DECK_COLUMN_);
if (id != null && id != '') {
swapColumn(this.column.id, id);
swapColumn(props.column.id, id);
}
}
}
});
</script>
<style lang="scss" scoped>

10
packages/client/src/ui/deck/deck-store.ts
View File

@ -1,8 +1,9 @@
import { throttle } from 'throttle-debounce';
import { i18n } from '@/i18n';
import { api } from '@/os';
import { markRaw, watch } from 'vue';
import { markRaw } from 'vue';
import { Storage } from '../../pizzax';
import { notificationTypes } from 'misskey-js';
type ColumnWidget = {
name: string;
@ -10,13 +11,18 @@ type ColumnWidget = {
data: Record<string, any>;
};
type Column = {
export type Column = {
id: string;
type: string;
name: string | null;
width: number;
widgets?: ColumnWidget[];
active?: boolean;
flexible?: boolean;
antennaId?: string;
listId?: string;
includingTypes?: typeof notificationTypes[number][];
tl?: 'home' | 'local' | 'social' | 'global';
};
function copy<T>(x: T): T {

22
packages/client/src/ui/deck/direct-column.vue
View File

@ -1,5 +1,5 @@
<template>
<XColumn :column="column" :is-stacked="isStacked">
<XColumn :column="column" :is-stacked="isStacked" @parent-focus="$event => emit('parent-focus', $event)">
<template #header><i class="fas fa-envelope" style="margin-right: 8px;"></i>{{ column.name }}</template>
<XNotes :pagination="pagination"/>
@ -7,21 +7,25 @@
</template>
<script lang="ts" setup>
import { computed } from 'vue';
import { } from 'vue';
import XColumn from './column.vue';
import XNotes from '@/components/notes.vue';
import * as os from '@/os';
import { Column } from './deck-store';
const props = defineProps<{
column: Record<string, unknown>; // TODO
defineProps<{
column: Column;
isStacked: boolean;
}>();
const emit = defineEmits<{
(e: 'parent-focus', direction: 'up' | 'down' | 'left' | 'right'): void;
}>();
const pagination = {
point: 'notes/mentions' as const,
endpoint: 'notes/mentions' as const,
limit: 10,
params: computed(() => ({
visibility: 'specified' as const,
})),
params: {
visibility: 'specified'
},
};
</script>

96
packages/client/src/ui/deck/list-column.vue
View File

@ -1,75 +1,65 @@
<template>
<XColumn :func="{ handler: setList, title: $ts.selectList }" :column="column" :is-stacked="isStacked">
<XColumn :func="{ handler: setList, title: $ts.selectList }" :column="column" :is-stacked="isStacked" @parent-focus="$event => emit('parent-focus', $event)">
<template #header>
<i class="fas fa-list-ul"></i><span style="margin-left: 8px;">{{ column.name }}</span>
</template>
<XTimeline v-if="column.listId" ref="timeline" src="list" :list="column.listId" @after="() => $emit('loaded')"/>
<XTimeline v-if="column.listId" ref="timeline" src="list" :list="column.listId" @after="() => emit('loaded')"/>
</XColumn>
</template>
<script lang="ts">
import { defineComponent } from 'vue';
<script lang="ts" setup>
import { } from 'vue';
import XColumn from './column.vue';
import XTimeline from '@/components/timeline.vue';
import * as os from '@/os';
import { updateColumn } from './deck-store';
import { updateColumn, Column } from './deck-store';
import { i18n } from '@/i18n';
const props = defineProps<{
column: Column;
isStacked: boolean;
}>();
const emit = defineEmits<{
(e: 'loaded'): void;
(e: 'parent-focus', direction: 'up' | 'down' | 'left' | 'right'): void;
}>();
let timeline = $ref<InstanceType<typeof XTimeline>>();
if (props.column.listId == null) {
setList();
}
async function setList() {
const lists = await os.api('users/lists/list');
const { canceled, result: list } = await os.select({
title: i18n.ts.selectList,
items: lists.map(x => ({
value: x, text: x.name
})),
default: props.column.listId
});
if (canceled) return;
updateColumn(props.column.id, {
listId: list.id
});
}
/*
function focus() {
timeline.focus();
}
export default defineComponent({
components: {
XColumn,
XTimeline,
},
props: {
column: {
type: Object,
required: true
},
isStacked: {
type: Boolean,
required: true
}
},
data() {
return {
};
},
watch: {
mediaOnly() {
(this.$refs.timeline as any).reload();
}
},
mounted() {
if (this.column.listId == null) {
this.setList();
}
},
methods: {
async setList() {
const lists = await os.api('users/lists/list');
const { canceled, result: list } = await os.select({
title: this.$ts.selectList,
items: lists.map(x => ({
value: x, text: x.name
})),
default: this.column.listId
});
if (canceled) return;
updateColumn(this.column.id, {
listId: list.id
});
},
focus() {
(this.$refs.timeline as any).focus();
}
}
});
*/
</script>
<style lang="scss" scoped>

69
packages/client/src/ui/deck/main-column.vue
View File

@ -1,5 +1,5 @@
<template>
<XColumn v-if="deckStore.state.alwaysShowMainColumn || $route.name !== 'index'" :column="column" :is-stacked="isStacked">
<XColumn v-if="deckStore.state.alwaysShowMainColumn || $route.name !== 'index'" :column="column" :is-stacked="isStacked" @parent-focus="$event => emit('parent-focus', $event)">
<template #header>
<template v-if="pageInfo">
<i :class="pageInfo.icon"></i>
@ -20,72 +20,59 @@
</XColumn>
</template>
<script lang="ts">
import { defineComponent } from 'vue';
<script lang="ts" setup>
import { } from 'vue';
import XColumn from './column.vue';
import XNotes from '@/components/notes.vue';
import { deckStore } from '@/ui/deck/deck-store';
import { deckStore, Column } from '@/ui/deck/deck-store';
import * as os from '@/os';
import * as symbols from '@/symbols';
import { i18n } from '@/i18n';
import { router } from '@/router';
export default defineComponent({
components: {
XColumn,
XNotes
},
defineProps<{
column: Column;
isStacked: boolean;
}>();
props: {
column: {
type: Object,
required: true
},
isStacked: {
type: Boolean,
required: true
}
},
const emit = defineEmits<{
(e: 'parent-focus', direction: 'up' | 'down' | 'left' | 'right'): void;
}>();
data() {
return {
deckStore,
pageInfo: null,
}
},
let pageInfo = $ref<Record<string, any> | null>(null);
methods: {
changePage(page) {
function changePage(page) {
if (page == null) return;
if (page[symbols.PAGE_INFO]) {
this.pageInfo = page[symbols.PAGE_INFO];
pageInfo = page[symbols.PAGE_INFO];
}
},
back() {
}
/*
function back() {
history.back();
},
}
*/
function onContextmenu(ev: MouseEvent) {
if (!ev.target) return;
onContextmenu(ev: MouseEvent) {
const isLink = (el: HTMLElement) => {
if (el.tagName === 'A') return true;
if (el.parentElement) {
return isLink(el.parentElement);
}
};
if (isLink(ev.target)) return;
if (['INPUT', 'TEXTAREA', 'IMG', 'VIDEO', 'CANVAS'].includes(ev.target.tagName) || ev.target.attributes['contenteditable']) return;
if (window.getSelection().toString() !== '') return;
const path = this.$route.path;
if (isLink(ev.target as HTMLElement)) return;
if (['INPUT', 'TEXTAREA', 'IMG', 'VIDEO', 'CANVAS'].includes((ev.target as HTMLElement).tagName) || (ev.target as HTMLElement).attributes['contenteditable']) return;
if (window.getSelection()?.toString() !== '') return;
const path = router.currentRoute.value.path;
os.contextMenu([{
type: 'label',
text: path,
}, {
icon: 'fas fa-window-maximize',
text: this.$ts.openInWindow,
text: i18n.ts.openInWindow,
action: () => {
os.pageWindow(path);
}
}], ev);
},
}
});
</script>

12
packages/client/src/ui/deck/mentions-column.vue
View File

@ -1,5 +1,5 @@
<template>
<XColumn :column="column" :is-stacked="isStacked">
<XColumn :column="column" :is-stacked="isStacked" @parent-focus="$event => emit('parent-focus', $event)">
<template #header><i class="fas fa-at" style="margin-right: 8px;"></i>{{ column.name }}</template>
<XNotes :pagination="pagination"/>
@ -10,13 +10,17 @@
import { } from 'vue';
import XColumn from './column.vue';
import XNotes from '@/components/notes.vue';
import * as os from '@/os';
import { Column } from './deck-store';
const props = defineProps<{
column: Record<string, unknown>; // TODO
defineProps<{
column: Column;
isStacked: boolean;
}>();
const emit = defineEmits<{
(e: 'parent-focus', direction: 'up' | 'down' | 'left' | 'right'): void;
}>();
const pagination = {
endpoint: 'notes/mentions' as const,
limit: 10,

43
packages/client/src/ui/deck/notifications-column.vue
View File

@ -1,53 +1,38 @@
<template>
<XColumn :column="column" :is-stacked="isStacked" :func="{ handler: func, title: $ts.notificationSetting }">
<XColumn :column="column" :is-stacked="isStacked" :func="{ handler: func, title: $ts.notificationSetting }" @parent-focus="$event => emit('parent-focus', $event)">
<template #header><i class="fas fa-bell" style="margin-right: 8px;"></i>{{ column.name }}</template>
<XNotifications :include-types="column.includingTypes"/>
</XColumn>
</template>
<script lang="ts">
import { defineComponent } from 'vue';
<script lang="ts" setup>
import { } from 'vue';
import XColumn from './column.vue';
import XNotifications from '@/components/notifications.vue';
import * as os from '@/os';
import { updateColumn } from './deck-store';
import { Column } from './deck-store';
export default defineComponent({
components: {
XColumn,
XNotifications
},
const props = defineProps<{
column: Column;
isStacked: boolean;
}>();
props: {
column: {
type: Object,
required: true
},
isStacked: {
type: Boolean,
required: true
}
},
const emit = defineEmits<{
(e: 'parent-focus', direction: 'up' | 'down' | 'left' | 'right'): void;
}>();
data() {
return {
}
},
methods: {
func() {
function func() {
os.popup(import('@/components/notification-setting-window.vue'), {
includingTypes: this.column.includingTypes,
includingTypes: props.column.includingTypes,
}, {
done: async (res) => {
const { includingTypes } = res;
updateColumn(this.column.id, {
updateColumn(props.column.id, {
includingTypes: includingTypes
});
},
}, 'closed');
}
}
});
</script>

155
packages/client/src/ui/deck/tl-column.vue
View File

@ -1,5 +1,5 @@
<template>
<XColumn :func="{ handler: setType, title: $ts.timeline }" :column="column" :is-stacked="isStacked" :indicated="indicated" @change-active-state="onChangeActiveState">
<XColumn :func="{ handler: setType, title: $ts.timeline }" :column="column" :is-stacked="isStacked" :indicated="indicated" @change-active-state="onChangeActiveState" @parent-focus="$event => emit('parent-focus', $event)">
<template #header>
<i v-if="column.tl === 'home'" class="fas fa-home"></i>
<i v-else-if="column.tl === 'local'" class="fas fa-comments"></i>
@ -15,108 +15,103 @@
</p>
<p class="desc">{{ $t('disabled-timeline.description') }}</p>
</div>
<XTimeline v-else-if="column.tl" ref="timeline" :key="column.tl" :src="column.tl" @after="() => $emit('loaded')" @queue="queueUpdated" @note="onNote"/>
<XTimeline v-else-if="column.tl" ref="timeline" :key="column.tl" :src="column.tl" @after="() => emit('loaded')" @queue="queueUpdated" @note="onNote"/>
</XColumn>
</template>
<script lang="ts">
import { defineComponent } from 'vue';
<script lang="ts" setup>
import { onMounted } from 'vue';
import XColumn from './column.vue';
import XTimeline from '@/components/timeline.vue';
import * as os from '@/os';
import { removeColumn, updateColumn } from './deck-store';
import { removeColumn, updateColumn, Column } from './deck-store';
import { $i } from '@/account';
import { instance } from '@/instance';
import { i18n } from '@/i18n';
export default defineComponent({
components: {
XColumn,
XTimeline,
},
const props = defineProps<{
column: Column;
isStacked: boolean;
}>();
props: {
column: {
type: Object,
required: true
},
isStacked: {
type: Boolean,
required: true
const emit = defineEmits<{
(e: 'loaded'): void;
(e: 'parent-focus', direction: 'up' | 'down' | 'left' | 'right'): void;
}>();
let disabled = $ref(false);
let indicated = $ref(false);
let columnActive = $ref(true);
onMounted(() => {
if (props.column.tl == null) {
setType();
} else if ($i) {
disabled = !$i.isModerator && !$i.isAdmin && (
instance.disableLocalTimeline && ['local', 'social'].includes(props.column.tl) ||
instance.disableGlobalTimeline && ['global'].includes(props.column.tl));
}
},
});
data() {
return {
disabled: false,
indicated: false,
columnActive: true,
};
},
async function setType() {
const { canceled, result: src } = await os.select({
title: i18n.ts.timeline,
items: [{
value: 'home' as const, text: i18n.ts._timelines.home
}, {
value: 'local' as const, text: i18n.ts._timelines.local
}, {
value: 'social' as const, text: i18n.ts._timelines.social
}, {
value: 'global' as const, text: i18n.ts._timelines.global
}],
});
if (canceled) {
if (props.column.tl == null) {
removeColumn(props.column.id);
}
return;
}
updateColumn(props.column.id, {
tl: src
});
}
function queueUpdated(q) {
if (columnActive) {
indicated = q !== 0;
}
}
function onNote() {
if (!columnActive) {
indicated = true;
}
}
function onChangeActiveState(state) {
columnActive = state;
if (columnActive) {
indicated = false;
}
}
/*
export default defineComponent({
watch: {
mediaOnly() {
(this.$refs.timeline as any).reload();
}
},
mounted() {
if (this.column.tl == null) {
this.setType();
} else {
this.disabled = !this.$i.isModerator && !this.$i.isAdmin && (
this.$instance.disableLocalTimeline && ['local', 'social'].includes(this.column.tl) ||
this.$instance.disableGlobalTimeline && ['global'].includes(this.column.tl));
}
},
methods: {
async setType() {
const { canceled, result: src } = await os.select({
title: this.$ts.timeline,
items: [{
value: 'home', text: this.$ts._timelines.home
}, {
value: 'local', text: this.$ts._timelines.local
}, {
value: 'social', text: this.$ts._timelines.social
}, {
value: 'global', text: this.$ts._timelines.global
}]
});
if (canceled) {
if (this.column.tl == null) {
removeColumn(this.column.id);
}
return;
}
updateColumn(this.column.id, {
tl: src
});
},
queueUpdated(q) {
if (this.columnActive) {
this.indicated = q !== 0;
}
},
onNote() {
if (!this.columnActive) {
this.indicated = true;
}
},
onChangeActiveState(state) {
this.columnActive = state;
if (this.columnActive) {
this.indicated = false;
}
},
focus() {
(this.$refs.timeline as any).focus();
}
}
});
*/
</script>
<style lang="scss" scoped>

75
packages/client/src/ui/deck/widgets-column.vue
View File

@ -1,64 +1,49 @@
<template>
<XColumn :func="{ handler: func, title: $ts.editWidgets }" :naked="true" :column="column" :is-stacked="isStacked">
<XColumn :func="{ handler: func, title: $ts.editWidgets }" :naked="true" :column="column" :is-stacked="isStacked" @parent-focus="$event => emit('parent-focus', $event)">
<template #header><i class="fas fa-window-maximize" style="margin-right: 8px;"></i>{{ column.name }}</template>
<div class="wtdtxvec">
<XWidgets :edit="edit" :widgets="column.widgets" @add-widget="addWidget" @remove-widget="removeWidget" @update-widget="updateWidget" @update-widgets="updateWidgets" @exit="edit = false"/>
<XWidgets v-if="column.widgets" :edit="edit" :widgets="column.widgets" @add-widget="addWidget" @remove-widget="removeWidget" @update-widget="updateWidget" @update-widgets="updateWidgets" @exit="edit = false"/>
</div>
</XColumn>
</template>
<script lang="ts">
import { defineComponent, defineAsyncComponent } from 'vue';
<script lang="ts" setup>
import { } from 'vue';
import XWidgets from '@/components/widgets.vue';
import XColumn from './column.vue';
import { addColumnWidget, removeColumnWidget, setColumnWidgets, updateColumnWidget } from './deck-store';
import { addColumnWidget, Column, removeColumnWidget, setColumnWidgets, updateColumnWidget } from './deck-store';
export default defineComponent({
components: {
XColumn,
XWidgets,
},
const props = defineProps<{
column: Column;
isStacked: boolean;
}>();
props: {
column: {
type: Object,
required: true,
},
isStacked: {
type: Boolean,
required: true,
},
},
const emit = defineEmits<{
(e: 'parent-focus', direction: 'up' | 'down' | 'left' | 'right'): void;
}>();
data() {
return {
edit: false,
};
},
let edit = $ref(false);
methods: {
addWidget(widget) {
addColumnWidget(this.column.id, widget);
},
removeWidget(widget) {
removeColumnWidget(this.column.id, widget);
},
updateWidget({ id, data }) {
updateColumnWidget(this.column.id, id, data);
},
updateWidgets(widgets) {
setColumnWidgets(this.column.id, widgets);
},
func() {
this.edit = !this.edit;
function addWidget(widget) {
addColumnWidget(props.column.id, widget);
}
function removeWidget(widget) {
removeColumnWidget(props.column.id, widget);
}
function updateWidget({ id, data }) {
updateColumnWidget(props.column.id, id, data);
}
function updateWidgets(widgets) {
setColumnWidgets(props.column.id, widgets);
}
function func() {
edit = !edit;
}
});
</script>
<style lang="scss" scoped>

62
packages/client/src/ui/universal.widgets.vue
View File

@ -1,58 +1,50 @@
<template>
<div class="efzpzdvf">
<XWidgets :edit="editMode" :widgets="$store.reactiveState.widgets.value" @add-widget="addWidget" @remove-widget="removeWidget" @update-widget="updateWidget" @update-widgets="updateWidgets" @exit="editMode = false"/>
<XWidgets :edit="editMode" :widgets="defaultStore.reactiveState.widgets.value" @add-widget="addWidget" @remove-widget="removeWidget" @update-widget="updateWidget" @update-widgets="updateWidgets" @exit="editMode = false"/>
<button v-if="editMode" class="_textButton" style="font-size: 0.9em;" @click="editMode = false"><i class="fas fa-check"></i> {{ $ts.editWidgetsExit }}</button>
<button v-else class="_textButton" style="font-size: 0.9em;" @click="editMode = true"><i class="fas fa-pencil-alt"></i> {{ $ts.editWidgets }}</button>
<button v-if="editMode" class="_textButton" style="font-size: 0.9em;" @click="editMode = false"><i class="fas fa-check"></i> {{ i18n.ts.editWidgetsExit }}</button>
<button v-else class="_textButton" style="font-size: 0.9em;" @click="editMode = true"><i class="fas fa-pencil-alt"></i> {{ i18n.ts.editWidgets }}</button>
</div>
</template>
<script lang="ts">
import { defineComponent, defineAsyncComponent } from 'vue';
<script lang="ts" setup>
import { onMounted } from 'vue';
import XWidgets from '@/components/widgets.vue';
import * as os from '@/os';
import { i18n } from '@/i18n';
import { defaultStore } from '@/store';
export default defineComponent({
components: {
XWidgets
},
const emit = defineEmits<{
(e: 'mounted', el: Element): void;
}>();
emits: ['mounted'],
let editMode = $ref(false);
let rootEl = $ref<HTMLDivElement>();
data() {
return {
editMode: false,
};
},
onMounted(() => {
emit('mounted', rootEl);
});
mounted() {
this.$emit('mounted', this.$el);
},
methods: {
addWidget(widget) {
this.$store.set('widgets', [{
function addWidget(widget) {
defaultStore.set('widgets', [{
...widget,
place: null,
}, ...this.$store.state.widgets]);
},
}, ...defaultStore.state.widgets]);
}
removeWidget(widget) {
this.$store.set('widgets', this.$store.state.widgets.filter(w => w.id != widget.id));
},
function removeWidget(widget) {
defaultStore.set('widgets', defaultStore.state.widgets.filter(w => w.id != widget.id));
}
updateWidget({ id, data }) {
this.$store.set('widgets', this.$store.state.widgets.map(w => w.id === id ? {
function updateWidget({ id, data }) {
defaultStore.set('widgets', defaultStore.state.widgets.map(w => w.id === id ? {
...w,
data: data
} : w));
},
}
updateWidgets(widgets) {
this.$store.set('widgets', widgets);
function updateWidgets(widgets) {
defaultStore.set('widgets', widgets);
}
}
});
</script>
<style lang="scss" scoped>