Merge branch 'develop' into swn

2021-09-04 20:41:41 +09:00
parent 33c43ad498 bf7bacceab
commit 42d82ab379
69 changed files with 638 additions and 375 deletions
--- a/src/client/pages/federation.vue
+++ b/src/client/pages/federation.vue
@@ -28,14 +28,14 @@
 				<option value="-following">{{ $ts.following }} ({{ $ts.ascendingOrder }})</option>
 				<option value="+followers">{{ $ts.followers }} ({{ $ts.descendingOrder }})</option>
 				<option value="-followers">{{ $ts.followers }} ({{ $ts.ascendingOrder }})</option>
-				<option value="+caughtAt">{{ $ts.caughtAt }} ({{ $ts.descendingOrder }})</option>
-				<option value="-caughtAt">{{ $ts.caughtAt }} ({{ $ts.ascendingOrder }})</option>
-				<option value="+lastCommunicatedAt">{{ $ts.lastCommunicatedAt }} ({{ $ts.descendingOrder }})</option>
-				<option value="-lastCommunicatedAt">{{ $ts.lastCommunicatedAt }} ({{ $ts.ascendingOrder }})</option>
+				<option value="+caughtAt">{{ $ts.registeredAt }} ({{ $ts.descendingOrder }})</option>
+				<option value="-caughtAt">{{ $ts.registeredAt }} ({{ $ts.ascendingOrder }})</option>
+				<option value="+lastCommunicatedAt">{{ $ts.lastCommunication }} ({{ $ts.descendingOrder }})</option>
+				<option value="-lastCommunicatedAt">{{ $ts.lastCommunication }} ({{ $ts.ascendingOrder }})</option>
 				<option value="+driveUsage">{{ $ts.driveUsage }} ({{ $ts.descendingOrder }})</option>
 				<option value="-driveUsage">{{ $ts.driveUsage }} ({{ $ts.ascendingOrder }})</option>
-				<option value="+driveFiles">{{ $ts.driveFiles }} ({{ $ts.descendingOrder }})</option>
-				<option value="-driveFiles">{{ $ts.driveFiles }} ({{ $ts.ascendingOrder }})</option>
+				<option value="+driveFiles">{{ $ts.driveFilesCount }} ({{ $ts.descendingOrder }})</option>
+				<option value="-driveFiles">{{ $ts.driveFilesCount }} ({{ $ts.ascendingOrder }})</option>
 			</MkSelect>
 		</div>
 	</div>
--- a/src/client/pages/settings/general.vue
+++ b/src/client/pages/settings/general.vue
@@ -45,6 +45,10 @@
 		</FormSwitch>
 	</FormGroup>

+	<FormGroup>
+		<FormSwitch v-model:value="aiChanMode">{{ $ts.aiChanMode }}</FormSwitch>
+	</FormGroup>
+
 	<FormRadios v-model="fontSize">
 		<template #desc>{{ $ts.fontSize }}</template>
 		<option value="small"><span style="font-size: 14px;">Aa</span></option>
@@ -149,6 +153,7 @@ export default defineComponent({
 		enableInfiniteScroll: defaultStore.makeGetterSetter('enableInfiniteScroll'),
 		useReactionPickerForContextMenu: defaultStore.makeGetterSetter('useReactionPickerForContextMenu'),
 		squareAvatars: defaultStore.makeGetterSetter('squareAvatars'),
+		aiChanMode: defaultStore.makeGetterSetter('aiChanMode'),
 	},

 	watch: {
@@ -184,6 +189,10 @@ export default defineComponent({
 			this.reloadAsk();
 		},

+		aiChanMode() {
+			this.reloadAsk();
+		},
+
 		showGapBetweenNotesInTimeline() {
 			this.reloadAsk();
 		},
--- a/src/client/store.ts
+++ b/src/client/store.ts
@@ -210,6 +210,10 @@ export const defaultStore = markRaw(new Storage('base', {
 		where: 'device',
 		default: ''
 	},
+	aiChanMode: {
+		where: 'device',
+		default: false
+	},
 }));

 // TODO: 他のタブと永続化されたstateを同期
--- a/src/client/tsconfig.json
+++ b/src/client/tsconfig.json
@@ -21,7 +21,8 @@
 		"baseUrl": ".",
 		"paths": {
 			"@/*": ["../*"],
-			"@client/*": ["./*"]
+			"@client/*": ["./*"],
+			"@lib/*": ["../../lib/*"],
 		},
 		"typeRoots": [
 			"node_modules/@types",
--- a/src/client/ui/default.vue
+++ b/src/client/ui/default.vue
@@ -54,12 +54,14 @@
 		<XWidgets v-if="widgetsShowing" class="tray"/>
 	</transition>

+	<iframe v-if="$store.state.aiChanMode" class="ivnzpscs" ref="live2d" src="https://misskey-dev.github.io/mascot-web/?scale=2&y=1.4"></iframe>
+
 	<XCommon/>
 </div>
 </template>

 <script lang="ts">
-import { defineComponent, defineAsyncComponent } from 'vue';
+import { defineComponent, defineAsyncComponent, markRaw } from 'vue';
 import { instanceName } from '@client/config';
 import { StickySidebar } from '@client/scripts/sticky-sidebar';
 import XSidebar from './default.sidebar.vue';
@@ -131,6 +133,19 @@ export default defineComponent({
 			this.isMobile = (window.innerWidth <= MOBILE_THRESHOLD);
 			this.isDesktop = (window.innerWidth >= DESKTOP_THRESHOLD);
 		}, { passive: true });
+
+		if (this.$store.state.aiChanMode) {
+			const iframeRect = this.$refs.live2d.getBoundingClientRect();
+			window.addEventListener('mousemove', ev => {
+				this.$refs.live2d.contentWindow.postMessage({
+					type: 'moveCursor',
+					body: {
+						x: ev.clientX - iframeRect.left,
+						y: ev.clientY - iframeRect.top,
+					}
+				}, '*');
+			}, { passive: true });
+		}
 	},

 	methods: {
@@ -201,6 +216,10 @@ export default defineComponent({
 				}
 			}], e);
 		},
+
+		onAiClick(ev) {
+			//if (this.live2d) this.live2d.click(ev);
+		}
 	}
 });
 </script>
@@ -458,5 +477,15 @@ export default defineComponent({
 		overflow: auto;
 		background: var(--bg);
 	}
+
+	> .ivnzpscs {
+		position: fixed;
+		bottom: 0;
+		right: 0;
+		width: 300px;
+		height: 600px;
+		border: none;
+		pointer-events: none;
+	}
 }
 </style>
--- a/src/client/widgets/aichan.vue
+++ b/src/client/widgets/aichan.vue
@@ -0,0 +1,59 @@
+<template>
+<MkContainer :naked="props.transparent" :show-header="false">
+	<iframe class="dedjhjmo" ref="live2d" @click="touched" src="https://misskey-dev.github.io/mascot-web/?scale=1.5&y=1.1&eyeY=100"></iframe>
+</MkContainer>
+</template>
+
+<script lang="ts">
+import { defineComponent, markRaw } from 'vue';
+import define from './define';
+import MkContainer from '@client/components/ui/container.vue';
+import * as os from '@client/os';
+
+const widget = define({
+	name: 'ai',
+	props: () => ({
+		transparent: {
+			type: 'boolean',
+			default: false,
+		},
+	})
+});
+
+export default defineComponent({
+	extends: widget,
+	components: {
+		MkContainer,
+	},
+	data() {
+		return {
+		};
+	},
+	mounted() {
+		window.addEventListener('mousemove', ev => {
+			const iframeRect = this.$refs.live2d.getBoundingClientRect();
+			this.$refs.live2d.contentWindow.postMessage({
+				type: 'moveCursor',
+				body: {
+					x: ev.clientX - iframeRect.left,
+					y: ev.clientY - iframeRect.top,
+				}
+			}, '*');
+		}, { passive: true });
+	},
+	methods: {
+		touched() {
+			//if (this.live2d) this.live2d.changeExpression('gurugurume');
+		}
+	}
+});
+</script>
+
+<style lang="scss" scoped>
+.dedjhjmo {
+	width: 100%;
+	height: 350px;
+	border: none;
+	pointer-events: none;
+}
+</style>
--- a/src/client/widgets/index.ts
+++ b/src/client/widgets/index.ts
@@ -19,6 +19,7 @@ export default function(app: App) {
 	app.component('MkwJobQueue', defineAsyncComponent(() => import('./job-queue.vue')));
 	app.component('MkwButton', defineAsyncComponent(() => import('./button.vue')));
 	app.component('MkwAiscript', defineAsyncComponent(() => import('./aiscript.vue')));
+	app.component('MkwAichan', defineAsyncComponent(() => import('./aichan.vue')));
 }

 export const widgets = [
@@ -40,4 +41,5 @@ export const widgets = [
 	'jobQueue',
 	'button',
 	'aiscript',
+	'aichan',
 ];