なんかもうめっちゃ変えた

Resolve #5846

locales/ja-JP.yml

@@ -376,6 +376,7 @@ next: "次"
 retype: "再入力"
 noteOf: "{user}のノート"
 inviteToGroup: "グループに招待"
+maxNoteTextLength: "ノートの文字数制限"
 
 _tutorial:
   title: "Misskeyの使い方"

src/client/components/autocomplete.vue

@@ -143,7 +143,7 @@ export default Vue.extend({
 		this.setPosition();
 
 		//#region Construct Emoji DB
-		const customEmojis = (this.$root.getMetaSync() || { emojis: [] }).emojis || [];
+		const customEmojis = this.$store.state.instance.meta.emojis;
 		const emojiDefinitions: EmojiDef[] = [];
 
 		for (const x of customEmojis) {

src/client/components/emoji-picker.vue

@@ -140,7 +140,7 @@ export default Vue.extend({
 	},
 
 	created() {
-		let local = (this.$root.getMetaSync() || { emojis: [] }).emojis || [];
+		let local = this.$store.state.instance.meta.emojis;
 		local = groupByX(local, (x: any) => x.category || '');
 		this.customEmojis = local;
 	},

src/client/components/emoji.vue

@@ -55,13 +55,21 @@ export default Vue.extend({
 
 		useOsDefaultEmojis(): boolean {
 			return this.$store.state.device.useOsDefaultEmojis && !this.isReaction;
+		},
+
+		ce() {
+			let ce = [];
+			if (this.customEmojis) ce = ce.concat(this.customEmojis);
+			if (this.$store.state.instance.meta && this.$store.state.instance.meta.emojis) ce = ce.concat(this.$store.state.instance.meta.emojis);
+			return ce;
 		}
 	},
 
 	watch: {
-		customEmojis() {
+		ce: {
+			handler() {
 				if (this.name) {
-				const customEmoji = this.customEmojis.find(x => x.name == this.name);
+					const customEmoji = this.ce.find(x => x.name == this.name);
 					if (customEmoji) {
 						this.customEmoji = customEmoji;
 						this.url = this.$store.state.device.disableShowingAnimatedImages
@@ -70,23 +78,12 @@ export default Vue.extend({
 					}
 				}
 			},
+			immediate: true
+		},
 	},
 
 	created() {
-		if (this.name) {
+		if (!this.name) {
-			const customEmoji = this.customEmojis.find(x => x.name == this.name);
-			if (customEmoji) {
-				this.customEmoji = customEmoji;
-				this.url = this.$store.state.device.disableShowingAnimatedImages
-					? getStaticImageUrl(customEmoji.url)
-					: customEmoji.url;
-			} else {
-				//const emoji = lib[this.name];
-				//if (emoji) {
-				//	this.char = emoji.char;
-				//}
-			}
-		} else {
 			this.char = this.emoji;
 		}
 

src/client/components/mfm.ts

@@ -234,7 +234,6 @@ export default Vue.component('misskey-flavored-markdown', {
 				}
 
 				case 'emoji': {
-					const customEmojis = (this.$root.getMetaSync() || { emojis: [] }).emojis || [];
 					return [createElement('mk-emoji', {
 						key: Math.random(),
 						attrs: {
@@ -242,7 +241,7 @@ export default Vue.component('misskey-flavored-markdown', {
 							name: token.node.props.name
 						},
 						props: {
-							customEmojis: this.customEmojis || customEmojis,
+							customEmojis: this.customEmojis,
 							normal: this.plain
 						}
 					})];

src/client/components/post-form.vue

@@ -8,7 +8,7 @@
 	<header>
 		<button class="cancel _button" @click="cancel"><fa :icon="faTimes"/></button>
 		<div>
-			<span class="text-count" :class="{ over: trimmedLength(text) > 500 }">{{ 500 - trimmedLength(text) }}</span>
+			<span class="text-count" :class="{ over: trimmedLength(text) > max }">{{ max - trimmedLength(text) }}</span>
 			<button class="_button visibility" @click="setVisibility" ref="visibilityButton">
 				<span v-if="visibility === 'public'"><fa :icon="faGlobe"/></span>
 				<span v-if="visibility === 'home'"><fa :icon="faHome"/></span>
@@ -172,8 +172,12 @@ export default Vue.extend({
 		canPost(): boolean {
 			return !this.posting &&
 				(1 <= this.text.length || 1 <= this.files.length || this.poll || this.renote) &&
-				(length(this.text.trim()) <= 500) &&
+				(length(this.text.trim()) <= this.max) &&
 				(!this.poll || this.pollChoices.length >= 2);
+		},
+
+		max(): number {
+			return this.$store.state.instance.meta ? this.$store.state.instance.meta.maxNoteTextLength : 1000;
 		}
 	},
 

src/client/components/reaction-icon.vue

@@ -1,5 +1,5 @@
 <template>
-<mk-emoji :emoji="reaction.startsWith(':') ? null : reaction" :name="reaction.startsWith(':') ? reaction.substr(1, reaction.length - 2) : null" :is-reaction="true" :custom-emojis="customEmojis" :normal="true" :no-style="noStyle"/>
+<mk-emoji :emoji="reaction.startsWith(':') ? null : reaction" :name="reaction.startsWith(':') ? reaction.substr(1, reaction.length - 2) : null" :is-reaction="true" :normal="true" :no-style="noStyle"/>
 </template>
 
 <script lang="ts">
@@ -18,15 +18,5 @@ export default Vue.extend({
 			default: false
 		},
 	},
-	data() {
-		return {
-			customEmojis: []
-		};
-	},
-	created() {
-		this.$root.getMeta().then(meta => {
-			if (meta && meta.emojis) this.customEmojis = meta.emojis;
-		});
-	},
 });
 </script>

src/client/components/signin.vue

@@ -82,7 +82,6 @@ export default Vue.extend({
 			token: '',
 			apiUrl,
 			host: toUnicode(host),
-			meta: null,
 			totpLogin: false,
 			credential: null,
 			challengeData: null,
@@ -91,11 +90,13 @@ export default Vue.extend({
 		};
 	},
 
-	created() {
+	computed: {
-		this.$root.getMeta().then(meta => {
+		meta() {
-			this.meta = meta;
+			return this.$store.state.instance.meta;
-		});
+		},
+	},
 
+	created() {
 		if (this.autoSet) {
 			this.$once('login', res => {
 				localStorage.setItem('i', res.i);

src/client/components/signup.vue

@@ -79,7 +79,6 @@ export default Vue.extend({
 			usernameState: null,
 			passwordStrength: '',
 			passwordRetypeState: null,
-			meta: {},
 			submitting: false,
 			ToSAgreement: false,
 			faLock, faExclamationTriangle, faSpinner, faCheck
@@ -87,6 +86,10 @@ export default Vue.extend({
 	},
 
 	computed: {
+		meta() {
+			return this.$store.state.instance.meta;
+		},
+		
 		shouldShowProfileUrl(): boolean {
 			return (this.username != '' &&
 				this.usernameState != 'invalid-format' &&
@@ -95,12 +98,6 @@ export default Vue.extend({
 		}
 	},
 
-	created() {
-		this.$root.getMeta().then(meta => {
-			this.meta = meta;
-		});
-	},
-
 	mounted() {
 		const head = document.getElementsByTagName('head')[0];
 		const script = document.createElement('script');

src/client/init.ts

@@ -157,8 +157,6 @@ os.init(async () => {
 		},
 		methods: {
 			api: os.api,
-			getMeta: os.getMeta,
-			getMetaSync: os.getMetaSync,
 			signout: os.signout,
 			new(vm, props) {
 				const x = new vm({

src/client/mios.ts

@@ -17,16 +17,6 @@ let pending = 0;
  * Misskey Operating System
  */
 export default class MiOS extends EventEmitter {
-	/**
-	 * Misskeyの /meta で取得できるメタ情報
-	 */
-	private meta: {
-		data: { [x: string]: any };
-		chachedAt: Date;
-	};
-
-	private isMetaFetching = false;
-
 	public app: Vue;
 
 	public store: ReturnType<typeof initStore>;
@@ -88,7 +78,7 @@ export default class MiOS extends EventEmitter {
 			// When failure
 			.catch(() => {
 				// Render the error screen
-				document.body.innerHTML = '<div id="err">Error</div>';
+				document.body.innerHTML = '<div id="err">Oops!</div>';
 
 				Progress.done();
 			});
@@ -107,9 +97,9 @@ export default class MiOS extends EventEmitter {
 			// Finish init
 			callback();
 
+			this.store.dispatch('instance/fetch').then(() => {
 				// Init service worker
-			this.getMeta().then(data => {
+				if (this.store.state.instance.meta.swPublickey) this.registerSw(this.store.state.instance.meta.swPublickey);
-				if (data.swPublickey) this.registerSw(data.swPublickey);
 			});
 		};
 
@@ -350,49 +340,6 @@ export default class MiOS extends EventEmitter {
 
 		return promise;
 	}
-
-	/**
-	 * Misskeyのメタ情報を取得します
-	 */
-	@autobind
-	public getMetaSync() {
-		return this.meta ? this.meta.data : null;
-	}
-
-	/**
-	 * Misskeyのメタ情報を取得します
-	 * @param force キャッシュを無視するか否か
-	 */
-	@autobind
-	public getMeta(force = false) {
-		return new Promise<{ [x: string]: any }>(async (res, rej) => {
-			if (this.isMetaFetching) {
-				this.once('_meta_fetched_', () => {
-					res(this.meta.data);
-				});
-				return;
-			}
-
-			const expire = 1000 * 60; // 1min
-
-			// forceが有効, meta情報を保持していない or 期限切れ
-			if (force || this.meta == null || Date.now() - this.meta.chachedAt.getTime() > expire) {
-				this.isMetaFetching = true;
-				const meta = await this.api('meta', {
-					detail: false
-				});
-				this.meta = {
-					data: meta,
-					chachedAt: new Date()
-				};
-				this.isMetaFetching = false;
-				this.emit('_meta_fetched_');
-				res(meta);
-			} else {
-				res(this.meta.data);
-			}
-		});
-	}
 }
 
 /**

src/client/pages/about.vue

@@ -84,18 +84,19 @@ export default Vue.extend({
 	data() {
 		return {
 			version,
-			meta: null,
 			stats: null,
 			serverInfo: null,
 			faInfoCircle
 		}
 	},
 
-	created() {
+	computed: {
-		this.$root.getMeta().then(meta => {
+		meta() {
-			this.meta = meta;
+			return this.$store.state.instance.meta;
-		});
+		},
+	},
 
+	created() {
 		this.$root.api('stats').then(res => {
 			this.stats = res;
 		});

src/client/pages/explore.vue

@@ -115,13 +115,15 @@ export default Vue.extend({
 			tagsLocal: [],
 			tagsRemote: [],
 			stats: null,
-			meta: null,
 			num: Vue.filter('number'),
 			faBookmark, faChartLine, faCommentAlt, faPlus, faHashtag, faRocket
 		};
 	},
 
 	computed: {
+		meta() {
+			return this.$store.state.instance.meta;
+		},
 		tagUsers(): any {
 			return {
 				endpoint: 'hashtags/users',
@@ -159,9 +161,6 @@ export default Vue.extend({
 		this.$root.api('stats').then(stats => {
 			this.stats = stats;
 		});
-		this.$root.getMeta().then(meta => {
-			this.meta = meta;
-		});
 	},
 });
 </script>

src/client/pages/index.home.vue

@@ -83,15 +83,6 @@ export default Vue.extend({
 	},
 
 	created() {
-		this.$root.getMeta().then((meta: Record<string, any>) => {
-			if (!(
-				this.enableGlobalTimeline = !meta.disableGlobalTimeline || this.$store.state.i.isModerator || this.$store.state.i.isAdmin
-			) && this.src === 'global') this.src = 'local';
-			if (!(
-				this.enableLocalTimeline = !meta.disableLocalTimeline || this.$store.state.i.isModerator || this.$store.state.i.isAdmin
-			) && ['local', 'social'].includes(this.src)) this.src = 'home';
-		});
-
 		this.src = this.$store.state.deviceUser.tl.src;
 		if (this.src === 'list') {
 			this.list = this.$store.state.deviceUser.tl.arg;

src/client/pages/index.welcome.entrance.vue

@@ -1,10 +1,10 @@
 <template>
 <div class="rsqzvsbo">
-	<div class="_panel about">
+	<div class="_panel about" v-if="meta">
-		<div class="banner" :style="{ backgroundImage: `url(${ banner })` }"></div>
+		<div class="banner" :style="{ backgroundImage: `url(${ meta.bannerUrl })` }"></div>
 		<div class="body">
-			<h1 class="name" v-html="name || host"></h1>
+			<h1 class="name" v-html="meta.name || host"></h1>
-			<div class="desc" v-html="description || $t('introMisskey')"></div>
+			<div class="desc" v-html="meta.description || $t('introMisskey')"></div>
 			<mk-button @click="signup()" style="display: inline-block; margin-right: 16px;" primary>{{ $t('signup') }}</mk-button>
 			<mk-button @click="signin()" style="display: inline-block;">{{ $t('login') }}</mk-button>
 		</div>
@@ -39,23 +39,16 @@ export default Vue.extend({
 				noPaging: true,
 			},
 			host: toUnicode(host),
-			meta: null,
-			name: null,
-			description: null,
-			banner: null,
-			announcements: [],
 		};
 	},
 
-	created() {
+	computed: {
-		this.$root.getMeta().then(meta => {
+		meta() {
-			this.meta = meta;
+			return this.$store.state.instance.meta;
-			this.name = meta.name;
+		},
-			this.description = meta.description;
+	},
-			this.announcements = meta.announcements;
-			this.banner = meta.bannerUrl;
-		});
 
+	created() {
 		this.$root.api('stats').then(stats => {
 			this.stats = stats;
 		});

src/client/pages/index.welcome.vue

@@ -20,15 +20,14 @@ export default Vue.extend({
 
 	data() {
 		return {
-			meta: null,
 			instanceName: getInstanceName(),
 		}
 	},
 
-	created() {
+	computed: {
-		this.$root.getMeta().then(meta => {
+		meta() {
-			this.meta = meta;
+			return this.$store.state.instance.meta;
-		});
+		},
-	}
+	},
 });
 </script>

src/client/pages/instance/federation.instance.vue

@@ -98,7 +98,7 @@
 		<div class="operations">
 			<span class="label">{{ $t('operations') }}</span>
 			<mk-switch v-model="isSuspended" class="switch">{{ $t('stopActivityDelivery') }}</mk-switch>
-			<mk-switch v-model="isBlocked" class="switch">{{ $t('blockThisInstance') }}</mk-switch>
+			<mk-switch :value="isBlocked" class="switch" @change="changeBlock">{{ $t('blockThisInstance') }}</mk-switch>
 		</div>
 		<details class="metadata">
 			<summary class="label">{{ $t('metadata') }}</summary>
@@ -147,9 +147,7 @@ export default Vue.extend({
 
 	data() {
 		return {
-			meta: null,
+			isSuspended: this.instance.isSuspended,
-			isSuspended: false,
-			isBlocked: false,
 			now: null,
 			chart: null,
 			chartInstance: null,
@@ -184,6 +182,14 @@ export default Vue.extend({
 				null;
 
 			return stats;
+		},
+
+		meta() {
+			return this.$store.state.instance.meta;
+		},
+
+		isBlocked() {
+			return this.meta && this.meta.blockedHosts.includes(this.instance.host);
 		}
 	},
 
@@ -195,12 +201,6 @@ export default Vue.extend({
 			});
 		},
 
-		isBlocked() {
-			this.$root.api('admin/update-meta', {
-				blockedHosts: this.isBlocked ? this.meta.blockedHosts.concat([this.instance.host]) : this.meta.blockedHosts.filter(x => x !== this.instance.host)
-			});
-		},
-
 		chartSrc() {
 			this.renderChart();
 		},
@@ -211,12 +211,6 @@ export default Vue.extend({
 	},
 
 	async created() {	
-		this.$root.getMeta().then(meta => {
-			this.meta = meta;
-			this.isSuspended = this.instance.isSuspended;
-			this.isBlocked = this.meta.blockedHosts.includes(this.instance.host);
-		});
-	
 		this.now = new Date();
 
 		const [perHour, perDay] = await Promise.all([
@@ -235,6 +229,12 @@ export default Vue.extend({
 	},
 
 	methods: {
+		changeBlock(e) {
+			this.$root.api('admin/update-meta', {
+				blockedHosts: this.isBlocked ? this.meta.blockedHosts.concat([this.instance.host]) : this.meta.blockedHosts.filter(x => x !== this.instance.host)
+			});
+		},
+
 		setSrc(src) {
 			this.chartSrc = src;
 		},

src/client/pages/instance/index.vue

@@ -20,6 +20,9 @@
 	</section>
 
 	<section class="_card info">
+		<div class="_content">
+			<mk-input v-model="maxNoteTextLength" type="number" :save="() => save()" style="margin:0;"><template #icon><fa :icon="faPencilAlt"/></template>{{ $t('maxNoteTextLength') }}</mk-input>
+		</div>
 		<div class="_content">
 			<mk-switch v-model="enableLocalTimeline" @change="save()">{{ $t('enableLocalTimeline') }}</mk-switch>
 			<mk-switch v-model="enableGlobalTimeline" @change="save()">{{ $t('enableGlobalTimeline') }}</mk-switch>
@@ -171,7 +174,7 @@
 
 <script lang="ts">
 import Vue from 'vue';
-import { faShareAlt, faGhost, faCog, faPlus, faCloud, faInfoCircle, faBan, faSave, faServer, faLink, faThumbtack, faUser, faShieldAlt, faKey, faBolt } from '@fortawesome/free-solid-svg-icons';
+import { faPencilAlt, faShareAlt, faGhost, faCog, faPlus, faCloud, faInfoCircle, faBan, faSave, faServer, faLink, faThumbtack, faUser, faShieldAlt, faKey, faBolt } from '@fortawesome/free-solid-svg-icons';
 import { faTrashAlt, faEnvelope } from '@fortawesome/free-regular-svg-icons';
 import { faTwitter, faDiscord, faGithub } from '@fortawesome/free-brands-svg-icons';
 import MkButton from '../../components/ui/button.vue';
@@ -205,7 +208,6 @@ export default Vue.extend({
 		return {
 			version,
 			url,
-			meta: null,
 			stats: null,
 			serverInfo: null,
 			proxyAccount: null,
@@ -223,6 +225,7 @@ export default Vue.extend({
 			tosUrl: null,
 			bannerUrl: null,
 			iconUrl: null,
+			maxNoteTextLength: 0,
 			enableRegistration: false,
 			enableLocalTimeline: false,
 			enableGlobalTimeline: false,
@@ -241,13 +244,17 @@ export default Vue.extend({
 			enableDiscordIntegration: false,
 			discordClientId: null,
 			discordClientSecret: null,
-			faTwitter, faDiscord, faGithub, faShareAlt, faTrashAlt, faGhost, faCog, faPlus, faCloud, faInfoCircle, faBan, faSave, faServer, faLink, faEnvelope, faThumbtack, faUser, faShieldAlt, faKey, faBolt
+			faPencilAlt, faTwitter, faDiscord, faGithub, faShareAlt, faTrashAlt, faGhost, faCog, faPlus, faCloud, faInfoCircle, faBan, faSave, faServer, faLink, faEnvelope, faThumbtack, faUser, faShieldAlt, faKey, faBolt
 		}
 	},
 
+	computed: {
+		meta() {
+			return this.$store.state.instance.meta;
+		},
+	},
+
 	created() {
-		this.$root.getMeta().then(meta => {
-			this.meta = meta;
 		this.name = this.meta.name;
 		this.description = this.meta.description;
 		this.tosUrl = this.meta.tosUrl;
@@ -255,6 +262,7 @@ export default Vue.extend({
 		this.iconUrl = this.meta.iconUrl;
 		this.maintainerName = this.meta.maintainerName;
 		this.maintainerEmail = this.meta.maintainerEmail;
+		this.maxNoteTextLength = this.meta.maxNoteTextLength;
 		this.enableRegistration = !this.meta.disableRegistration;
 		this.enableLocalTimeline = !this.meta.disableLocalTimeline;
 		this.enableGlobalTimeline = !this.meta.disableGlobalTimeline;
@@ -286,7 +294,6 @@ export default Vue.extend({
 				this.proxyAccount = proxyAccount;
 			});
 		}
-		});
 
 		this.$root.api('admin/server-info').then(res => {
 			this.serverInfo = res;
@@ -347,6 +354,7 @@ export default Vue.extend({
 				iconUrl: this.iconUrl,
 				maintainerName: this.maintainerName,
 				maintainerEmail: this.maintainerEmail,
+				maxNoteTextLength: this.maxNoteTextLength,
 				disableRegistration: !this.enableRegistration,
 				disableLocalTimeline: !this.enableLocalTimeline,
 				disableGlobalTimeline: !this.enableGlobalTimeline,
@@ -373,6 +381,7 @@ export default Vue.extend({
 				discordClientId: this.discordClientId,
 				discordClientSecret: this.discordClientSecret,
 			}).then(() => {
+				this.$store.dispatch('instance/fetch');
 				if (withDialog) {
 					this.$root.dialog({
 						type: 'success',

src/client/pages/settings/integration.vue

@@ -56,15 +56,17 @@ export default Vue.extend({
 	computed: {
 		integrations() {
 			return this.$store.state.i.integrations;
-		}
+		},
+		
+		meta() {
+			return this.$store.state.instance.meta;
+		},
 	},
 
 	created() {
-		this.$root.getMeta().then(meta => {
+		this.enableTwitterIntegration = this.meta.enableTwitterIntegration;
-			this.enableTwitterIntegration = meta.enableTwitterIntegration;
+		this.enableDiscordIntegration = this.meta.enableDiscordIntegration;
-			this.enableDiscordIntegration = meta.enableDiscordIntegration;
+		this.enableGithubIntegration = this.meta.enableGithubIntegration;
-			this.enableGithubIntegration = meta.enableGithubIntegration;
-		});
 	},
 
 	mounted() {

src/client/store.ts

@@ -41,13 +41,13 @@ const defaultDeviceSettings = {
 	userData: {},
 };
 
-function copy(data) {
+function copy<T>(data: T): T {
 	return JSON.parse(JSON.stringify(data));
 }
 
 export default (os: MiOS) => new Vuex.Store({
 	plugins: [createPersistedState({
-		paths: ['i', 'device', 'deviceUser', 'settings']
+		paths: ['i', 'device', 'deviceUser', 'settings', 'instance']
 	})],
 
 	state: {
@@ -111,6 +111,30 @@ export default (os: MiOS) => new Vuex.Store({
 	},
 
 	modules: {
+		instance: {
+			namespaced: true,
+
+			state: {
+				meta: null
+			},
+
+			mutations: {
+				set(state, meta) {
+					state.meta = meta;
+				},
+			},
+
+			actions: {
+				async fetch(ctx) {
+					const meta = await os.api('meta', {
+						detail: false
+					});
+
+					ctx.commit('set', meta);
+				}
+			}
+		},
+
 		device: {
 			namespaced: true,