12.2.0

* pwa

* ✌️

CHANGELOG.md

@@ -1,6 +1,18 @@
 ChangeLog
 =========
 
+12.2.0 (2020/02/06)
+--------------------
+### ✨Improvements
+* UIのアニメーションを無効にできるように
+* トークで絵文字ピッカーを表示できるように
+* 戻るボタンだけでなく、ホームボタンを押してホームに戻ったときもスクロール位置を復元するように
+* タブを見ていないときのタイムライン通知を削除
+
+### 🐛Fixes
+* PWAとしてインストールできなかったのを修正
+* トークでドライブからファイルを添付出来ない問題を修正
+
 12.1.0 (2020/02/06)
 --------------------
 ### ✨Improvements

locales/ja-JP.yml

@@ -350,6 +350,7 @@ post: "投稿"
 posted: "投稿しました"
 autoReloadWhenDisconnected: "サーバー切断時に自動リロード"
 autoNoteWatch: "ノートの自動ウォッチ"
+reduceUiAnimation: "UIのアニメーションを減らす"
 
 _2fa:
   registerDevice: "デバイスを登録"
@@ -413,6 +414,7 @@ _widgets:
   calendar: "カレンダー"
   trends: "トレンド"
   clock: "時計"
+  rss: "RSSリーダー"
 
 _cw:
   hide: "隠す"

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "misskey",
 	"author": "syuilo <syuilotan@yahoo.co.jp>",
-	"version": "12.0.0",
+	"version": "12.2.0",
 	"codename": "indigo",
 	"repository": {
 		"type": "git",

src/client/app.vue

@@ -2,10 +2,10 @@
 <div class="mk-app" v-hotkey.global="keymap">
 	<header class="header">
 		<div class="title" ref="title">
-			<transition name="header" mode="out-in" appear>
+			<transition :name="$store.state.device.animation ? 'header' : ''" mode="out-in" appear>
 				<button class="_button back" v-if="canBack" @click="back()"><fa :icon="faChevronLeft"/></button>
 			</transition>
-			<transition name="header" mode="out-in" appear>
+			<transition :name="$store.state.device.animation ? 'header' : ''" mode="out-in" appear>
 				<div class="body" :key="pageKey">
 					<div class="default">
 						<portal-target name="avatar" slim/>
@@ -76,7 +76,7 @@
 	<div class="contents">
 		<main ref="main">
 			<div class="content">
-				<transition name="page" mode="out-in">
+				<transition :name="$store.state.device.animation ? 'page' : ''" mode="out-in" @enter="onTransition">
 					<keep-alive :include="['index']">
 						<router-view></router-view>
 					</keep-alive>
@@ -100,9 +100,9 @@
 							class="sortable"
 							@sort="onWidgetSort"
 						>
-							<div v-for="widget in widgets" class="customize-container" :key="widget.id">
+							<div v-for="widget in widgets" class="customize-container _panel" :key="widget.id">
 								<header>
-									<span class="handle"><fa :icon="faBars"/></span>{{ widget.name }}<button class="remove" @click="removeWidget(widget)"><fa :icon="faTimes"/></button>
+									<span class="handle"><fa :icon="faBars"/></span>{{ $t('_widgets.' + widget.name) }}<button class="remove _button" @click="removeWidget(widget)"><fa :icon="faTimes"/></button>
 								</header>
 								<div @click="widgetFunc(widget.id)">
 									<component :is="`mkw-${widget.name}`" :widget="widget" :ref="widget.id" :is-customize-mode="true"/>
@@ -258,6 +258,10 @@ export default Vue.extend({
 			if (this.canBack) window.history.back();
 		},
 
+		onTransition() {
+			if (window._scroll) window._scroll();
+		},
+
 		post() {
 			this.$root.post();
 		},
@@ -965,10 +969,10 @@ export default Vue.extend({
 					> header {
 						position: relative;
 						line-height: 32px;
-						background: #eee;
 
 						> .handle {
 							padding: 0 8px;
+							cursor: move;
 						}
 
 						> .remove {

src/client/components/modal.vue

@@ -1,9 +1,9 @@
 <template>
 <div class="mk-modal">
-	<transition name="bg-fade" appear>
+	<transition :name="$store.state.device.animation ? 'bg-fade' : ''" appear>
 		<div class="bg" ref="bg" v-if="show" @click="close()"></div>
 	</transition>
-	<transition name="modal" appear @after-leave="() => { $emit('closed'); destroyDom(); }">
+	<transition :name="$store.state.device.animation ? 'modal' : ''" appear @after-leave="() => { $emit('closed'); destroyDom(); }">
 		<div class="content" ref="content" v-if="show" @click.self="close()"><slot></slot></div>
 	</transition>
 </div>

src/client/components/note.vue

@@ -275,8 +275,14 @@ export default Vue.extend({
 	methods: {
 		capture(withHandler = false) {
 			if (this.$store.getters.isSignedIn) {
-				this.connection.send('sn', { id: this.appearNote.id });
-				if (withHandler) this.connection.on('noteUpdated', this.onStreamNoteUpdated);
+				if (document.body.contains(this.$el)) {
+					this.connection.send('sn', { id: this.appearNote.id });
+					if (withHandler) this.connection.on('noteUpdated', this.onStreamNoteUpdated);
+				} else {
+					this.$once('hook:activated', () => {
+						this.capture(withHandler);
+					});
+				}
 			}
 		},
 

src/client/components/notes.vue

@@ -36,19 +36,6 @@ export default Vue.extend({
 
 	mixins: [
 		paging({
-			onPrepend: (self, note) => {
-				// タブが非表示なら通知
-				if (document.hidden) {
-					if ('Notification' in window && Notification.permission === 'granted') {
-						new Notification(getUserName(note.user), {
-							body: getNoteSummary(note),
-							icon: note.user.avatarUrl,
-							tag: 'newNote'
-						});
-					}
-				}
-			},
-
 			before: (self) => {
 				self.$emit('before');
 			},

src/client/components/popup.vue

@@ -1,9 +1,9 @@
 <template>
 <div class="mk-popup">
-	<transition name="bg-fade" appear>
+	<transition :name="$store.state.device.animation ? 'bg-fade' : ''" appear>
 		<div class="bg" ref="bg" @click="close()" v-if="show"></div>
 	</transition>
-	<transition name="popup" appear @after-leave="() => { $emit('closed'); destroyDom(); }">
+	<transition :name="$store.state.device.animation ? 'popup' : ''" appear @after-leave="() => { $emit('closed'); destroyDom(); }">
 		<div class="content" :class="{ fixed }" ref="content" v-if="show" :style="{ width: width ? width + 'px' : 'auto' }"><slot></slot></div>
 	</transition>
 </div>

src/client/components/post-form-dialog.vue

@@ -1,10 +1,10 @@
 <template>
 <div class="ulveipglmagnxfgvitaxyszerjwiqmwl">
-	<transition name="form-fade" appear>
+	<transition :name="$store.state.device.animation ? 'form-fade' : ''" appear>
 		<div class="bg" ref="bg" v-if="show" @click="close()"></div>
 	</transition>
 	<div class="main" ref="main" @click.self="close()" @keydown="onKeydown">
-		<transition name="form" appear
+		<transition :name="$store.state.device.animation ? 'form' : ''" appear
 			@after-leave="destroyDom"
 		>
 			<x-post-form ref="form"

src/client/components/sequential-entrance.vue

@@ -1,5 +1,5 @@
 <template>
-<transition-group
+<transition-group v-if="$store.state.device.animation"
 	name="staggered-fade"
 	tag="div"
 	:css="false"
@@ -11,6 +11,9 @@
 >
 	<slot></slot>
 </transition-group>
+<div v-else>
+	<slot></slot>
+</div>
 </template>
 
 <script lang="ts">

src/client/pages/messaging-room.form.vue

@@ -5,7 +5,7 @@
 >
 	<textarea
 		v-model="text"
-		ref="textarea"
+		ref="text"
 		@keypress="onKeypress"
 		@paste="onPaste"
 		:placeholder="$t('input-message-here')"
@@ -16,22 +16,20 @@
 	<button class="send _button" @click="send" :disabled="!canSend || sending" :title="$t('send')">
 		<template v-if="!sending"><fa :icon="faPaperPlane"/></template><template v-if="sending"><fa icon="spinner .spin"/></template>
 	</button>
-	<button class="attach-from-local _button" @click="chooseFile" :title="$t('attach-from-local')">
-		<fa :icon="faUpload"/>
-	</button>
-	<button class="attach-from-drive _button" @click="chooseFileFromDrive" :title="$t('attach-from-drive')">
-		<fa :icon="faCloud"/>
-	</button>
+	<button class="_button" @click="chooseFile"><fa :icon="faPhotoVideo"/></button>
+	<button class="_button" @click="insertEmoji"><fa :icon="faLaughSquint"/></button>
 	<input ref="file" type="file" @change="onChangeFile"/>
 </div>
 </template>
 
 <script lang="ts">
 import Vue from 'vue';
-import { faPaperPlane, faUpload, faCloud } from '@fortawesome/free-solid-svg-icons';
-import i18n from '../i18n';
+import { faPaperPlane, faPhotoVideo, faLaughSquint } from '@fortawesome/free-solid-svg-icons';
+import insertTextAtCursor from 'insert-text-at-cursor';
 import * as autosize from 'autosize';
+import i18n from '../i18n';
 import { formatTimeString } from '../../misc/format-time-string';
+import { selectFile } from '../scripts/select-file';
 
 export default Vue.extend({
 	i18n,
@@ -53,7 +51,7 @@ export default Vue.extend({
 			text: null,
 			file: null,
 			sending: false,
-			faPaperPlane, faUpload, faCloud
+			faPaperPlane, faPhotoVideo, faLaughSquint
 		};
 	},
 	computed: {
@@ -80,7 +78,7 @@ export default Vue.extend({
 		}
 	},
 	mounted() {
-		autosize(this.$refs.textarea);
+		autosize(this.$refs.text);
 
 		// 書きかけの投稿を復元
 		const draft = JSON.parse(localStorage.getItem('message_drafts') || '{}')[this.draftId];
@@ -160,14 +158,8 @@ export default Vue.extend({
 			}
 		},
 
-		chooseFile() {
-			(this.$refs.file as any).click();
-		},
-
-		chooseFileFromDrive() {
-			this.$chooseDriveFile({
-				multiple: false
-			}).then(file => {
+		chooseFile(e) {
+			selectFile(this, e.currentTarget || e.target, this.$t('selectFile'), false).then(file => {
 				this.file = file;
 			});
 		},
@@ -227,6 +219,15 @@ export default Vue.extend({
 
 			localStorage.setItem('message_drafts', JSON.stringify(data));
 		},
+
+		async insertEmoji(ev) {
+			const vm = this.$root.new(await import('../components/emoji-picker.vue').then(m => m.default), {
+				source: ev.currentTarget || ev.target
+			}).$once('chosen', emoji => {
+				insertTextAtCursor(this.$refs.text, emoji);
+				vm.close();
+			});
+		}
 	}
 });
 </script>
@@ -330,8 +331,7 @@ export default Vue.extend({
 		}
 	}
 
-	.attach-from-local,
-	.attach-from-drive {
+	._button {
 		margin: 0;
 		padding: 16px;
 		font-size: 1em;

src/client/pages/messaging.vue

@@ -32,7 +32,7 @@
 		</router-link>
 	</sequential-entrance>
 	<p class="no-history" v-if="!fetching && messages.length == 0">{{ $t('no-history') }}</p>
-	<p class="fetching" v-if="fetching"><fa icon="spinner" pulse fixed-width/>{{ $t('@.loading') }}<mk-ellipsis/></p>
+	<mk-loading v-if="fetching"/>
 </div>
 </template>
 
@@ -282,17 +282,6 @@ export default Vue.extend({
 		font-weight: 500;
 	}
 
-	> .fetching {
-		margin: 0;
-		padding: 16px;
-		text-align: center;
-		color: var(--text);
-
-		> [data-icon] {
-			margin-right: 4px;
-		}
-	}
-
 	@media (max-width: 400px) {
 		> .search {
 			> .result {

src/client/pages/settings/general.vue

@@ -22,6 +22,11 @@
 		<mk-button @click="readAllUnreadNotes">{{ $t('mark-as-read-all-unread-notes') }}</mk-button>
 		<mk-button @click="readAllMessagingMessages">{{ $t('mark-as-read-all-talk-messages') }}</mk-button>
 	</div>
+	<div class="_content">
+		<mk-switch v-model="reduceAnimation">
+			{{ $t('reduceUiAnimation') }}
+		</mk-switch>
+	</div>
 </section>
 </template>
 
@@ -60,6 +65,11 @@ export default Vue.extend({
 			get() { return this.$store.state.device.autoReload; },
 			set(value) { this.$store.commit('device/set', { key: 'autoReload', value }); }
 		},
+
+		reduceAnimation: {
+			get() { return !this.$store.state.device.animation; },
+			set(value) { this.$store.commit('device/set', { key: 'animation', value: !value }); }
+		},
 	},
 
 	methods: {

src/client/pages/user/index.vue

@@ -4,7 +4,7 @@
 	<portal to="avatar" v-if="user"><mk-avatar class="avatar" :user="user" :disable-preview="true"/></portal>
 	
 	<div class="remote-caution _panel" v-if="user.host != null"><fa :icon="faExclamationTriangle" style="margin-right: 8px;"/>{{ $t('remoteUserCaution') }}<a :href="user.url" rel="nofollow noopener" target="_blank">{{ $t('showOnRemote') }}</a></div>
-	<transition name="zoom" mode="out-in" appear>
+	<transition :name="$store.state.device.animation ? 'zoom' : ''" mode="out-in" appear>
 		<div class="profile _panel" :key="user.id">
 			<div class="banner-container" :style="style">
 				<div class="banner" ref="banner" :style="style"></div>

src/client/router.ts

@@ -6,6 +6,8 @@ Vue.use(VueRouter);
 
 const page = (path: string) => () => import(`./pages/${path}.vue`).then(m => m.default);
 
+let indexScrollPos = 0;
+
 export const router = new VueRouter({
 	mode: 'history',
 	routes: [
@@ -55,14 +57,19 @@ export const router = new VueRouter({
 	// なんかHacky
 	// 通常の使い方をすると scroll メソッドの behavior を設定できないため、自前で window.scroll するようにする
 	// setTimeout しないと、アニメーション(トランジション)の関係でうまく動かない
-	scrollBehavior(to, from, savedPosition) {
-		setTimeout(() => {
-			if (savedPosition) {
-				window.scroll({ top: savedPosition.y, behavior: 'instant' });
+	scrollBehavior(to) {
+		window._scroll = () => { // さらにHacky
+			if (to.name === 'index') {
+				window.scroll({ top: indexScrollPos, behavior: 'instant' });
 			} else {
 				window.scroll({ top: 0, behavior: 'instant' });
 			}
-		}, 600);
-		return;
+		};
+	}
+});
+
+router.afterEach((to, from) => {
+	if (from.name === 'index') {
+		indexScrollPos = window.scrollY;
 	}
 });

src/client/store.ts

@@ -29,6 +29,7 @@ const defaultDeviceSettings = {
 	localOnly: false,
 	themes: [],
 	theme: 'light',
+	animation: true,
 };
 
 export default (os: MiOS) => new Vuex.Store({

src/client/sw.js

@@ -18,7 +18,7 @@ self.addEventListener('install', ev => {
 		caches.open(cacheName)
 			.then(cache => {
 				return cache.addAll([
-					'/assets/error.jpg'
+					'/'
 				]);
 			})
 			.then(() => self.skipWaiting())