10.49.7

package.json

@@ -1,8 +1,8 @@
 {
 	"name": "misskey",
 	"author": "syuilo <i@syuilo.com>",
-	"version": "10.49.6",
+	"version": "10.49.7",
-	"clientVersion": "2.0.11783",
+	"clientVersion": "2.0.11789",
 	"codename": "nighthike",
 	"main": "./built/index.js",
 	"private": true,

src/client/app/common/scripts/note-mixin.ts

@@ -141,11 +141,10 @@ export default (opts: Opts = {}) => ({
 			this.$root.api('notes/favorites/create', {
 				noteId: this.appearNote.id
 			}).then(() => {
-				// TODO
+				this.$root.alert({
-				/*this.$root.alert({
+					type: 'success',
-					pointer: false,
+					splash: true
-					autoClose: true
+				});
-				});*/
 			});
 		},
 

src/client/app/common/views/components/alert.vue

@@ -1,11 +1,11 @@
 <template>
-<div class="felqjxyj" :class="{ pointer }">
+<div class="felqjxyj" :class="{ splash }">
 	<div class="bg" ref="bg" @click="onBgClick"></div>
 	<div class="main" ref="main">
 		<div class="icon" :class="type"><fa :icon="icon"/></div>
 		<header v-if="title" v-html="title"></header>
 		<div class="body" v-if="text" v-html="text"></div>
-		<ui-horizon-group no-grow class="buttons">
+		<ui-horizon-group no-grow class="buttons" v-if="!splash">
 			<ui-button @click="ok" primary autofocus>OK</ui-button>
 			<ui-button @click="cancel" v-if="showCancelButton">Cancel</ui-button>
 		</ui-horizon-group>
@@ -31,15 +31,15 @@ export default Vue.extend({
 		},
 		text: {
 			type: String,
-			required: true
+			required: false
 		},
 		showCancelButton: {
 			type: Boolean,
 			default: false
 		},
-		pointer: {
+		splash: {
 			type: Boolean,
-			default: true
+			default: false
 		}
 	},
 
@@ -72,6 +72,12 @@ export default Vue.extend({
 				duration: 300,
 				easing: [0, 0.5, 0.5, 1]
 			});
+
+			if (this.splash) {
+				setTimeout(() => {
+					this.close();
+				}, 1000);
+			}
 		});
 	},
 
@@ -125,8 +131,13 @@ export default Vue.extend({
 	width 100%
 	height 100%
 
-	&:not(.pointer)
+	&.splash
-		pointer-events none
+		&, *
+			pointer-events none !important
+
+		> .main
+			min-width 0
+			width initial
 
 	> .bg
 		display block

src/client/app/common/views/components/messaging-room.vue

@@ -20,7 +20,7 @@
 	<footer>
 		<transition name="fade">
 			<div class="new-message" v-show="showIndicator">
-				<button @click="onIndicatorClick"><i><fa icon="arrow-circle-down"/></i>{{ $t('new-message') }}</button>
+				<button @click="onIndicatorClick"><i><fa :icon="faArrowCircleDown"/></i>{{ $t('new-message') }}</button>
 			</div>
 		</transition>
 		<x-form :user="user" ref="form"/>
@@ -34,6 +34,7 @@ import i18n from '../../../i18n';
 import XMessage from './messaging-room.message.vue';
 import XForm from './messaging-room.form.vue';
 import { url } from '../../../config';
+import { faArrowCircleDown } from '@fortawesome/free-solid-svg-icons';
 
 export default Vue.extend({
 	i18n: i18n('common/views/components/messaging-room.vue'),
@@ -52,7 +53,8 @@ export default Vue.extend({
 			existMoreMessages: false,
 			connection: null,
 			showIndicator: false,
-			timer: null
+			timer: null,
+			faArrowCircleDown
 		};
 	},
 

src/client/app/common/views/components/note-menu.vue

@@ -78,8 +78,10 @@ export default Vue.extend({
 			this.$root.api('i/pin', {
 				noteId: this.note.id
 			}).then(() => {
-				// TODO
+				this.$root.alert({
-				//this.$root.new(Ok);
+					type: 'success',
+					splash: true
+				});
 				this.destroyDom();
 			});
 		},
@@ -112,8 +114,10 @@ export default Vue.extend({
 			this.$root.api('notes/favorites/create', {
 				noteId: this.note.id
 			}).then(() => {
-				// TODO
+				this.$root.alert({
-				//this.$root.new(Ok);
+					type: 'success',
+					splash: true
+				});
 				this.destroyDom();
 			});
 		},
@@ -122,8 +126,10 @@ export default Vue.extend({
 			this.$root.api('notes/favorites/delete', {
 				noteId: this.note.id
 			}).then(() => {
-				// TODO
+				this.$root.alert({
-				//this.$root.new(Ok);
+					type: 'success',
+					splash: true
+				});
 				this.destroyDom();
 			});
 		},

src/client/app/common/views/components/profile-editor.vue

@@ -223,6 +223,5 @@ export default Vue.extend({
 			width 72px
 			height 72px
 			margin auto
-			box-shadow 0 0 16px rgba(0, 0, 0, 0.5)
 
 </style>

src/client/app/common/views/components/theme.vue

@@ -1,7 +1,7 @@
 <template>
 <div class="nicnklzforebnpfgasiypmpdaaglujqm">
 	<label>
-		<span>{{ $t('light-theme') }}</span>
+		<span><fa :icon="faSun"/> {{ $t('light-theme') }}</span>
 		<ui-select v-model="light" :placeholder="$t('light-theme')">
 			<optgroup :label="$t('light-themes')">
 				<option v-for="x in lightThemes" :value="x.id" :key="x.id">{{ x.name }}</option>
@@ -13,7 +13,7 @@
 	</label>
 
 	<label>
-		<span>{{ $t('dark-theme') }}</span>
+		<span><fa :icon="faMoon"/> {{ $t('dark-theme') }}</span>
 		<ui-select v-model="dark" :placeholder="$t('dark-theme')">
 			<optgroup :label="$t('dark-themes')">
 				<option v-for="x in darkThemes" :value="x.id" :key="x.id">{{ x.name }}</option>
@@ -104,6 +104,7 @@ import { Chrome } from 'vue-color';
 import * as uuid from 'uuid';
 import * as tinycolor from 'tinycolor2';
 import * as JSON5 from 'json5';
+import { faMoon, faSun } from '@fortawesome/free-regular-svg-icons';
 
 // 後方互換性のため
 function convertOldThemedefinition(t) {
@@ -135,7 +136,8 @@ export default Vue.extend({
 			myThemeDesc: '',
 			myThemePrimary: lightTheme.vars.primary,
 			myThemeSecondary: lightTheme.vars.secondary,
-			myThemeText: lightTheme.vars.text
+			myThemeText: lightTheme.vars.text,
+			faMoon, faSun
 		};
 	},
 

src/client/app/desktop/views/pages/deck/deck.user-column.vue

@@ -307,8 +307,10 @@ export default Vue.extend({
 							listId: list.id,
 							userId: this.user.id
 						});
-						// TODO
+						this.$root.alert({
-						//this.$root.new(Ok);
+							type: 'success',
+							splash: true
+						});
 					});
 				}
 			}];

src/client/app/init.ts

@@ -115,6 +115,7 @@ import {
 	faChartLine,
 	faEllipsisV,
 	faStickyNote,
+	faUserPlus,
 } from '@fortawesome/free-solid-svg-icons';
 
 import {
@@ -233,6 +234,7 @@ library.add(
 	faChartLine,
 	faEllipsisV,
 	faStickyNote,
+	faUserPlus,
 
 	farBell,
 	farEnvelope,