10.95.0

* New translations ja-JP.yml (Chinese Simplified)

* New translations ja-JP.yml (English)

* New translations ja-JP.yml (French)

* New translations ja-JP.yml (Korean)

* New translations ja-JP.yml (Japanese, Kansai)

* New translations ja-JP.yml (Czech)

* New translations ja-JP.yml (Korean)

* New translations ja-JP.yml (English)

* New translations ja-JP.yml (Czech)

* New translations ja-JP.yml (Chinese Simplified)

* New translations ja-JP.yml (Polish)

* New translations ja-JP.yml (English)

CHANGELOG.md

@@ -5,6 +5,29 @@ If you encounter any problems with updating, please try the following:
 1. `npm run clean` or `npm run cleanall`
 2. Retry update (Don't forget `npm i`)
 
+10.95.0
+----------
+* ジョブを一覧できるように
+* MFMでURLを明示する構文の追加
+* Articleタイプのアクティビティを受け入れるように
+* 凍結されたユーザーをサジェストしないように
+* ファビコンが保存されないのを修正
+* キューのジョブクリアの動作を修正
+* デザインの調整
+
+10.94.0
+----------
+* Faviconを設定できるように
+* アカウントを凍結したときすべてのフォローを解除するように
+* シェアページが機能していない問題を修正
+* インスタンスブロックをしていてもRenote等すると取得されてしまう問題を修正
+* デザインの調整
+
+10.93.1
+----------
+* データのエクスポートとインポートの動作を修正
+* デザインの調整
+
 10.93.0
 ----------
 * フォローリストをインポートできるように

locales/cs-CZ.yml

@@ -304,6 +304,7 @@ common/views/pages/explore.vue:
   explore: "Prozkoumat {host}"
 common/views/components/url-preview.vue:
   enable-player: "Otevřít v přehrávači"
+  disable-player: "Zavřít přehrávač"
 common/views/components/user-list.vue:
   no-users: "Žádní uživatelé"
 common/views/components/games/reversi/reversi.vue:
@@ -848,8 +849,6 @@ admin/views/dashboard.vue:
   instances: "Instance"
   this-instance: "Tato instance"
   federated: "Z fediversu"
-admin/views/queue.vue:
-  operation: "Akce"
 admin/views/abuse.vue:
   details: "Popis"
   remove-report: "Odstranit"

locales/en-US.yml

@@ -169,9 +169,9 @@ common:
     deck-column-align-flexible: "Flexible"
     deck-column-width: "Deck column width"
     deck-column-width-narrow: "Narrow"
-    deck-column-width-narrower: "Somewhat narrow"
+    deck-column-width-narrower: "Narrower"
     deck-column-width-normal: "Regular"
-    deck-column-width-wider: "Somewhat wide"
+    deck-column-width-wider: "Slightly wide"
     deck-column-width-wide: "Wide"
     use-shadow: "Use shadows in the UI"
     rounded-corners: "Round the corners of the UI"
@@ -1057,7 +1057,7 @@ admin/views/dashboard.vue:
   this-instance: "This instance"
   federated: "Federated"
 admin/views/queue.vue:
-  operation: "Action(s)"
+  title: "Queue"
   remove-all-jobs: "Clear all queued jobs"
 admin/views/abuse.vue:
   title: "Abuse"

locales/fr-FR.yml

@@ -927,7 +927,6 @@ admin/views/dashboard.vue:
   this-instance: "Cette instance"
   federated: "Fédérées"
 admin/views/queue.vue:
-  operation: "Action(s)"
   remove-all-jobs: "Enlever toutes les tâches en attente"
 admin/views/abuse.vue:
   title: "Abus"

locales/index.js

@@ -14,6 +14,7 @@ const merge = (...args) => args.reduce((a, c) => ({
 }), {});
 
 const languages = [
+	'cs-CZ',
 	'de-DE',
 	'en-US',
 	'es-ES',
@@ -24,9 +25,11 @@ const languages = [
 	'nl-NL',
 	'pl-PL',
 	'zh-CN',
+	'zh-TW',
 ];
 
 const primaries = {
+	'en': 'US',
 	'ja': 'JP',
 	'zh': 'CN',
 };

locales/ja-KS.yml

@@ -860,8 +860,6 @@ admin/views/dashboard.vue:
   instances: "インスタンス"
   this-instance: "ワイのインスタンス"
   federated: "連合"
-admin/views/queue.vue:
-  operation: "操作"
 admin/views/abuse.vue:
   details: "もっと"
   remove-report: "削除"

locales/ko-KR.yml

@@ -314,6 +314,7 @@ common/views/pages/explore.vue:
   users-info: "현재 {users} 사용자가 등록되어 있습니다"
 common/views/components/url-preview.vue:
   enable-player: "플레이어 열기"
+  disable-player: "플레이어 닫기"
 common/views/components/user-list.vue:
   no-users: "사용자가 없습니다"
 common/views/components/games/reversi/reversi.vue:
@@ -1056,7 +1057,7 @@ admin/views/dashboard.vue:
   this-instance: "이 인스턴스"
   federated: "연합"
 admin/views/queue.vue:
-  operation: "동작"
+  title: "큐"
   remove-all-jobs: "모든 작업 제거"
 admin/views/abuse.vue:
   title: "스팸 신고"

locales/pl-PL.yml

@@ -121,12 +121,15 @@ common:
     other: "Inne"
     appearance: "Wygląd"
     behavior: "Zachowanie"
+    fetch-on-scroll: "Automatycznie ładuj po przeciągnięciu w dół"
     note-visibility: "Widoczność wpisów"
+    web-search-engine: "Wyszukiwarka internetowa"
     line-width-thin: "Cienka"
     line-width-normal: "Normalna"
     line-width-thick: "Gruba"
     font-size: "Rozmiar tekstu"
     font-size-medium: "Normalna"
+    font-size-large: "Trochę duży"
     font-size-x-large: "Duży"
     deck-column-align-center: "Po środku"
     deck-column-align-left: "Z lewej"
@@ -137,6 +140,8 @@ common:
     deck-column-width-normal: "Normalna"
     deck-column-width-wider: "Trochę szerokie"
     deck-column-width-wide: "Szeroka"
+    wallpaper: "Tapeta"
+    choose-wallpaper: "Wybierz tapetę"
     timeline: "Oś czasu"
     navbar-position-left: "Z lewej"
   search: "Szukaj"

locales/zh-CN.yml

@@ -314,6 +314,7 @@ common/views/pages/explore.vue:
   users-info: "当前有{users}个注册用户"
 common/views/components/url-preview.vue:
   enable-player: "打开播放器"
+  disable-player: "关闭播放器"
 common/views/components/user-list.vue:
   no-users: "无用户"
 common/views/components/games/reversi/reversi.vue:
@@ -1056,7 +1057,7 @@ admin/views/dashboard.vue:
   this-instance: "此实例"
   federated: "联合"
 admin/views/queue.vue:
-  operation: "操作"
+  title: "队列"
   remove-all-jobs: "清除所有作业"
 admin/views/abuse.vue:
   title: "举报垃圾信息"

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "misskey",
 	"author": "syuilo <i@syuilo.com>",
-	"version": "10.93.0",
+	"version": "10.95.0",
 	"codename": "nighthike",
 	"repository": {
 		"type": "git",
@@ -46,7 +46,6 @@
 		"@types/gulp-uglify": "3.0.6",
 		"@types/gulp-util": "3.0.34",
 		"@types/is-root": "1.0.0",
-		"@types/is-svg": "3.0.0",
 		"@types/is-url": "1.2.28",
 		"@types/js-yaml": "3.12.0",
 		"@types/jsdom": "12.2.3",
@@ -96,7 +95,7 @@
 		"@types/websocket": "0.0.40",
 		"@types/ws": "6.0.1",
 		"animejs": "3.0.1",
-		"apexcharts": "3.5.0",
+		"apexcharts": "3.6.2",
 		"autobind-decorator": "2.4.0",
 		"autosize": "4.0.2",
 		"autwh": "0.1.0",
@@ -109,20 +108,20 @@
 		"chalk": "2.4.2",
 		"commander": "2.19.0",
 		"crc-32": "1.2.0",
-		"css-loader": "2.1.0",
+		"css-loader": "2.1.1",
 		"cssnano": "4.1.10",
 		"dateformat": "3.0.3",
 		"deep-equal": "1.0.1",
 		"deepcopy": "0.6.3",
 		"diskusage": "1.0.0",
 		"double-ended-queue": "2.1.0-0",
-		"elasticsearch": "15.3.1",
+		"elasticsearch": "15.4.1",
 		"emojilib": "2.4.0",
 		"escape-regexp": "0.0.1",
-		"eslint": "5.15.0",
+		"eslint": "5.15.1",
 		"eslint-plugin-vue": "5.2.2",
 		"eventemitter3": "3.1.0",
-		"feed": "2.0.2",
+		"feed": "2.0.4",
 		"file-type": "10.9.0",
 		"fuckadblock": "3.2.1",
 		"gulp": "4.0.0",
@@ -131,20 +130,20 @@
 		"gulp-mocha": "6.0.0",
 		"gulp-rename": "1.4.0",
 		"gulp-replace": "1.0.0",
-		"gulp-sourcemaps": "2.6.4",
+		"gulp-sourcemaps": "2.6.5",
 		"gulp-stylus": "2.7.0",
-		"gulp-tslint": "8.1.3",
+		"gulp-tslint": "8.1.4",
 		"gulp-typescript": "5.0.0",
-		"gulp-uglify": "3.0.1",
+		"gulp-uglify": "3.0.2",
 		"gulp-util": "3.0.8",
 		"hard-source-webpack-plugin": "0.13.1",
 		"html-minifier": "3.5.21",
 		"http-signature": "1.2.0",
 		"insert-text-at-cursor": "0.1.2",
 		"is-root": "2.0.0",
-		"is-svg": "3.0.0",
-		"js-yaml": "3.12.1",
-		"jsdom": "13.2.0",
+		"is-svg": "4.0.0",
+		"js-yaml": "3.12.2",
+		"jsdom": "14.0.0",
 		"json5": "2.1.0",
 		"json5-loader": "1.0.1",
 		"katex": "0.10.1",
@@ -189,13 +188,13 @@
 		"pug": "2.0.3",
 		"punycode": "2.1.1",
 		"qrcode": "1.3.3",
-		"randomcolor": "0.5.3",
-		"ratelimiter": "3.2.0",
+		"randomcolor": "0.5.4",
+		"ratelimiter": "3.3.0",
 		"recaptcha-promise": "0.1.3",
 		"reconnecting-websocket": "4.1.10",
 		"redis": "2.8.0",
 		"request": "2.88.0",
-		"request-promise-native": "1.0.5",
+		"request-promise-native": "1.0.7",
 		"request-stats": "3.0.0",
 		"rimraf": "2.6.3",
 		"rndstr": "1.0.0",
@@ -210,14 +209,14 @@
 		"stylus": "0.54.5",
 		"stylus-loader": "3.0.2",
 		"summaly": "2.2.0",
-		"systeminformation": "4.0.14",
+		"systeminformation": "4.0.16",
 		"syuilo-password-strength": "0.0.1",
 		"terser-webpack-plugin": "1.2.3",
 		"textarea-caret": "3.1.0",
 		"tinycolor2": "1.4.1",
 		"tmp": "0.0.33",
 		"ts-loader": "5.3.3",
-		"ts-node": "8.0.2",
+		"ts-node": "8.0.3",
 		"tslint": "5.13.1",
 		"tslint-sonarts": "1.9.0",
 		"typescript": "3.3.3333",
@@ -232,7 +231,7 @@
 		"vue-color": "2.7.0",
 		"vue-content-loading": "1.5.3",
 		"vue-cropperjs": "3.0.0",
-		"vue-i18n": "8.8.2",
+		"vue-i18n": "8.9.0",
 		"vue-js-modal": "1.3.28",
 		"vue-json-pretty": "1.4.1",
 		"vue-loader": "15.7.0",
@@ -241,9 +240,9 @@
 		"vue-router": "3.0.2",
 		"vue-sequential-entrance": "1.1.3",
 		"vue-style-loader": "4.1.2",
-		"vue-svg-inline-loader": "1.2.12",
+		"vue-svg-inline-loader": "1.2.13",
 		"vue-template-compiler": "2.6.8",
-		"vuedraggable": "2.18.1",
+		"vuedraggable": "2.19.2",
 		"vuewordcloud": "18.7.11",
 		"vuex": "3.1.0",
 		"vuex-persistedstate": "2.5.4",
@@ -252,7 +251,7 @@
 		"webpack": "4.28.4",
 		"webpack-cli": "3.2.3",
 		"websocket": "1.0.28",
-		"ws": "6.1.4",
+		"ws": "6.2.0",
 		"xev": "2.0.1"
 	}
 }

src/client/app/admin/views/dashboard.charts.vue

@@ -181,7 +181,12 @@ export default Vue.extend({
 				},
 				grid: {
 					clipMarkers: false,
-					borderColor: 'rgba(0, 0, 0, 0.1)'
+					borderColor: 'rgba(0, 0, 0, 0.1)',
+					xaxis: {
+						lines: {
+							show: true,
+						}
+					},
 				},
 				stroke: {
 					curve: 'straight',

src/client/app/admin/views/dashboard.queue-charts.vue

@@ -0,0 +1,196 @@
+<template>
+<div class="mzxlfysy">
+	<div>
+		<header>
+			<span><fa :icon="faInbox"/> In</span>
+			<span v-if="latestStats">{{ latestStats.inbox.activeSincePrevTick | number }} / {{ latestStats.inbox.delayed | number }}</span>
+		</header>
+		<div ref="in"></div>
+	</div>
+	<div>
+		<header>
+			<span><fa :icon="faPaperPlane"/> Out</span>
+			<span v-if="latestStats">{{ latestStats.deliver.activeSincePrevTick | number }} / {{ latestStats.deliver.delayed | number }}</span>
+		</header>
+		<div ref="out"></div>
+	</div>
+</div>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+import { faInbox } from '@fortawesome/free-solid-svg-icons';
+import { faPaperPlane } from '@fortawesome/free-regular-svg-icons';
+import ApexCharts from 'apexcharts';
+
+const limit = 150;
+
+export default Vue.extend({
+	data() {
+		return {
+			stats: [],
+			inChart: null,
+			outChart: null,
+			faInbox, faPaperPlane
+		};
+	},
+
+	computed: {
+		latestStats(): any {
+			return this.stats[this.stats.length - 1];
+		}
+	},
+
+	watch: {
+		stats(stats) {
+			this.inChart.updateSeries([{
+				data: stats.map((x, i) => ({ x: i, y: x.inbox.activeSincePrevTick }))
+			}, {
+				data: stats.map((x, i) => ({ x: i, y: x.inbox.active }))
+			}, {
+				data: stats.map((x, i) => ({ x: i, y: x.inbox.waiting }))
+			}, {
+				data: stats.map((x, i) => ({ x: i, y: x.inbox.delayed }))
+			}]);
+			this.outChart.updateSeries([{
+				data: stats.map((x, i) => ({ x: i, y: x.deliver.activeSincePrevTick }))
+			}, {
+				data: stats.map((x, i) => ({ x: i, y: x.deliver.active }))
+			}, {
+				data: stats.map((x, i) => ({ x: i, y: x.deliver.waiting }))
+			}, {
+				data: stats.map((x, i) => ({ x: i, y: x.deliver.delayed }))
+			}]);
+		}
+	},
+
+	mounted() {
+		const chartOpts = {
+			chart: {
+				type: 'area',
+				height: 200,
+				animations: {
+					dynamicAnimation: {
+						enabled: false
+					}
+				},
+				toolbar: {
+					show: false
+				},
+				zoom: {
+					enabled: false
+				}
+			},
+			dataLabels: {
+				enabled: false
+			},
+			grid: {
+				clipMarkers: false,
+				borderColor: 'rgba(0, 0, 0, 0.1)'
+			},
+			stroke: {
+				curve: 'straight',
+				width: 2
+			},
+			tooltip: {
+				enabled: false
+			},
+			legend: {
+				show: false
+			},
+			colors: ['#00E396', '#00BCD4', '#FFB300', '#e53935'],
+			series: [{ data: [] }, { data: [] }, { data: [] }, { data: [] }] as any,
+			xaxis: {
+				type: 'numeric',
+				labels: {
+					show: false
+				},
+				tooltip: {
+					enabled: false
+				}
+			},
+			yaxis: {
+				show: false,
+				min: 0,
+			}
+		};
+
+		this.inChart = new ApexCharts(this.$refs.in, chartOpts);
+		this.outChart = new ApexCharts(this.$refs.out, chartOpts);
+
+		this.inChart.render();
+		this.outChart.render();
+
+		const connection = this.$root.stream.useSharedConnection('queueStats');
+		connection.on('stats', this.onStats);
+		connection.on('statsLog', this.onStatsLog);
+		connection.send('requestLog', {
+			id: Math.random().toString().substr(2, 8),
+			length: limit
+		});
+
+		this.$once('hook:beforeDestroy', () => {
+			connection.dispose();
+			this.inChart.destroy();
+			this.outChart.destroy();
+		});
+	},
+
+	methods: {
+		onStats(stats) {
+			this.stats.push(stats);
+			if (this.stats.length > limit) this.stats.shift();
+		},
+
+		onStatsLog(statsLog) {
+			for (const stats of statsLog.reverse()) {
+				this.onStats(stats);
+			}
+		}
+	}
+});
+</script>
+
+<style lang="stylus" scoped>
+.mzxlfysy
+	display flex
+
+	> div
+		display block
+		flex 1
+		padding 20px 12px 0 12px
+		box-shadow 0 2px 4px rgba(0, 0, 0, 0.1)
+		background var(--face)
+		border-radius 8px
+
+		&:first-child
+			margin-right 16px
+
+		> header
+			display flex
+			padding 0 8px
+			margin-bottom -16px
+			color var(--adminDashboardCardFg)
+			font-size 14px
+
+			> span
+				&:last-child
+					margin-left auto
+					opacity 0.7
+
+				> span
+					opacity 0.7
+
+		> div
+			margin-bottom -10px
+
+	@media (max-width 1000px)
+		display block
+		margin-bottom 26px
+
+		> div
+			&:first-child
+				margin-right 0
+				margin-bottom 26px
+
+</style>

src/client/app/admin/views/dashboard.vue

@@ -73,6 +73,10 @@
 		<x-charts ref="charts"/>
 	</div>
 
+	<div class="queue">
+		<x-queue/>
+	</div>
+
 	<div class="cpu-memory">
 		<x-cpu-memory :connection="connection"/>
 	</div>
@@ -86,9 +90,10 @@
 <script lang="ts">
 import Vue from 'vue';
 import i18n from '../../i18n';
-import XCpuMemory from "./cpu-memory.vue";
-import XCharts from "./charts.vue";
-import XApLog from "./ap-log.vue";
+import XCpuMemory from "./dashboard.cpu-memory.vue";
+import XQueue from "./dashboard.queue-charts.vue";
+import XCharts from "./dashboard.charts.vue";
+import XApLog from "./dashboard.ap-log.vue";
 import { faDatabase } from '@fortawesome/free-solid-svg-icons';
 import MarqueeText from 'vue-marquee-text-component';
 import randomColor from 'randomcolor';
@@ -98,6 +103,7 @@ export default Vue.extend({
 
 	components: {
 		XCpuMemory,
+		XQueue,
 		XCharts,
 		XApLog,
 		MarqueeText
@@ -274,6 +280,9 @@ export default Vue.extend({
 	> .charts
 		margin-bottom 16px
 
+	> .queue
+		margin-bottom 16px
+
 	> .cpu-memory
 		margin-bottom 16px
 

src/client/app/admin/views/instance.vue

@@ -6,6 +6,7 @@
 			<ui-input :value="host" readonly>{{ $t('host') }}</ui-input>
 			<ui-input v-model="name">{{ $t('instance-name') }}</ui-input>
 			<ui-textarea v-model="description">{{ $t('instance-description') }}</ui-textarea>
+			<ui-input v-model="iconUrl"><template #icon><fa icon="link"/></template>{{ $t('icon-url') }}</ui-input>
 			<ui-input v-model="mascotImageUrl"><template #icon><fa icon="link"/></template>{{ $t('logo-url') }}</ui-input>
 			<ui-input v-model="bannerUrl"><template #icon><fa icon="link"/></template>{{ $t('banner-url') }}</ui-input>
 			<ui-input v-model="errorImageUrl"><template #icon><fa icon="link"/></template>{{ $t('error-image-url') }}</ui-input>
@@ -157,6 +158,7 @@ export default Vue.extend({
 			mascotImageUrl: null,
 			bannerUrl: null,
 			errorImageUrl: null,
+			iconUrl: null,
 			name: null,
 			description: null,
 			languages: null,
@@ -207,6 +209,7 @@ export default Vue.extend({
 			this.mascotImageUrl = meta.mascotImageUrl;
 			this.bannerUrl = meta.bannerUrl;
 			this.errorImageUrl = meta.errorImageUrl;
+			this.iconUrl = meta.iconUrl;
 			this.name = meta.name;
 			this.description = meta.description;
 			this.languages = meta.langs.join(' ');
@@ -267,6 +270,7 @@ export default Vue.extend({
 				mascotImageUrl: this.mascotImageUrl,
 				bannerUrl: this.bannerUrl,
 				errorImageUrl: this.errorImageUrl,
+				iconUrl: this.iconUrl,
 				name: this.name,
 				description: this.description,
 				langs: this.languages.split(' '),

src/client/app/admin/views/queue.vue

@@ -1,33 +1,57 @@
 <template>
 <div>
 	<ui-card>
-		<template #title><fa :icon="faTasks"/> {{ $t('title') }}</template>
+		<template #title><fa :icon="faChartBar"/> {{ $t('title') }}</template>
 		<section class="wptihjuy">
 			<header><fa :icon="faPaperPlane"/> Deliver</header>
+			<ui-info warn v-if="latestStats && latestStats.deliver.waiting > 0">The queue is jammed.</ui-info>
 			<ui-horizon-group inputs v-if="latestStats" class="fit-bottom">
-				<ui-input :value="latestStats.deliver.waiting | number" type="text" readonly>
-					<span>Waiting</span>
-				</ui-input>
-				<ui-input :value="latestStats.deliver.delayed | number" type="text" readonly>
-					<span>Delayed</span>
+				<ui-input :value="latestStats.deliver.activeSincePrevTick | number" type="text" readonly>
+					<span>Process</span>
+					<template #prefix><fa :icon="fasPlayCircle"/></template>
+					<template #suffix>jobs/tick</template>
 				</ui-input>
 				<ui-input :value="latestStats.deliver.active | number" type="text" readonly>
 					<span>Active</span>
+					<template #prefix><fa :icon="farPlayCircle"/></template>
+					<template #suffix>jobs</template>
+				</ui-input>
+				<ui-input :value="latestStats.deliver.waiting | number" type="text" readonly>
+					<span>Waiting</span>
+					<template #prefix><fa :icon="faStopCircle"/></template>
+					<template #suffix>jobs</template>
+				</ui-input>
+				<ui-input :value="latestStats.deliver.delayed | number" type="text" readonly>
+					<span>Delayed</span>
+					<template #prefix><fa :icon="faStopwatch"/></template>
+					<template #suffix>jobs</template>
 				</ui-input>
 			</ui-horizon-group>
 			<div ref="deliverChart" class="chart"></div>
 		</section>
 		<section class="wptihjuy">
 			<header><fa :icon="faInbox"/> Inbox</header>
+			<ui-info warn v-if="latestStats && latestStats.inbox.waiting > 0">The queue is jammed.</ui-info>
 			<ui-horizon-group inputs v-if="latestStats" class="fit-bottom">
-				<ui-input :value="latestStats.inbox.waiting | number" type="text" readonly>
-					<span>Waiting</span>
-				</ui-input>
-				<ui-input :value="latestStats.inbox.delayed | number" type="text" readonly>
-					<span>Delayed</span>
+				<ui-input :value="latestStats.inbox.activeSincePrevTick | number" type="text" readonly>
+					<span>Process</span>
+					<template #prefix><fa :icon="fasPlayCircle"/></template>
+					<template #suffix>jobs/tick</template>
 				</ui-input>
 				<ui-input :value="latestStats.inbox.active | number" type="text" readonly>
 					<span>Active</span>
+					<template #prefix><fa :icon="farPlayCircle"/></template>
+					<template #suffix>jobs</template>
+				</ui-input>
+				<ui-input :value="latestStats.inbox.waiting | number" type="text" readonly>
+					<span>Waiting</span>
+					<template #prefix><fa :icon="faStopCircle"/></template>
+					<template #suffix>jobs</template>
+				</ui-input>
+				<ui-input :value="latestStats.inbox.delayed | number" type="text" readonly>
+					<span>Delayed</span>
+					<template #prefix><fa :icon="faStopwatch"/></template>
+					<template #suffix>jobs</template>
 				</ui-input>
 			</ui-horizon-group>
 			<div ref="inboxChart" class="chart"></div>
@@ -36,6 +60,35 @@
 			<ui-button @click="removeAllJobs">{{ $t('remove-all-jobs') }}</ui-button>
 		</section>
 	</ui-card>
+
+	<ui-card>
+		<template #title><fa :icon="faTasks"/> {{ $t('jobs') }}</template>
+		<section class="fit-top">
+			<ui-horizon-group inputs>
+				<ui-select v-model="domain">
+					<template #label>{{ $t('queue') }}</template>
+					<option value="deliver">{{ $t('domains.deliver') }}</option>
+					<option value="inbox">{{ $t('domains.inbox') }}</option>
+				</ui-select>
+				<ui-select v-model="state">
+					<template #label>{{ $t('state') }}</template>
+					<option value="delayed">{{ $t('states.delayed') }}</option>
+				</ui-select>
+			</ui-horizon-group>
+			<sequential-entrance animation="entranceFromTop" delay="25">
+				<div class="xvvuvgsv" v-for="job in jobs">
+					<b>{{ job.id }}</b>
+					<template v-if="domain === 'deliver'">
+						<span>{{ job.data.to }}</span>
+					</template>
+					<template v-if="domain === 'inbox'">
+						<span>{{ job.activity.id }}</span>
+					</template>
+				</div>
+			</sequential-entrance>
+			<ui-info v-if="jobs.length == jobsLimit">{{ $t('result-is-truncated', { n: jobsLimit }) }}</ui-info>
+		</section>
+	</ui-card>
 </div>
 </template>
 
@@ -44,8 +97,10 @@ import Vue from 'vue';
 import i18n from '../../i18n';
 import ApexCharts from 'apexcharts';
 import * as tinycolor from 'tinycolor2';
-import { faTasks, faInbox } from '@fortawesome/free-solid-svg-icons';
-import { faPaperPlane } from '@fortawesome/free-regular-svg-icons';
+import { faTasks, faInbox, faStopwatch, faPlayCircle as fasPlayCircle } from '@fortawesome/free-solid-svg-icons';
+import { faPaperPlane, faStopCircle, faPlayCircle as farPlayCircle, faChartBar } from '@fortawesome/free-regular-svg-icons';
+
+const limit = 150;
 
 export default Vue.extend({
 	i18n: i18n('admin/views/queue.vue'),
@@ -55,7 +110,11 @@ export default Vue.extend({
 			stats: [],
 			deliverChart: null,
 			inboxChart: null,
-			faTasks, faPaperPlane, faInbox
+			jobs: [],
+			jobsLimit: 50,
+			domain: 'deliver',
+			state: 'delayed',
+			faTasks, faPaperPlane, faInbox, faStopwatch, faStopCircle, farPlayCircle, fasPlayCircle, faChartBar
 		};
 	},
 
@@ -68,31 +127,59 @@ export default Vue.extend({
 	watch: {
 		stats(stats) {
 			this.inboxChart.updateSeries([{
-				name: 'Active',
+				name: 'Process',
+				type: 'area',
 				data: stats.map((x, i) => ({ x: i, y: x.inbox.activeSincePrevTick }))
+			}, {
+				name: 'Active',
+				type: 'area',
+				data: stats.map((x, i) => ({ x: i, y: x.inbox.active }))
 			}, {
 				name: 'Waiting',
+				type: 'line',
 				data: stats.map((x, i) => ({ x: i, y: x.inbox.waiting }))
 			}, {
 				name: 'Delayed',
+				type: 'line',
 				data: stats.map((x, i) => ({ x: i, y: x.inbox.delayed }))
 			}]);
 			this.deliverChart.updateSeries([{
-				name: 'Active',
+				name: 'Process',
+				type: 'area',
 				data: stats.map((x, i) => ({ x: i, y: x.deliver.activeSincePrevTick }))
+			}, {
+				name: 'Active',
+				type: 'area',
+				data: stats.map((x, i) => ({ x: i, y: x.deliver.active }))
 			}, {
 				name: 'Waiting',
+				type: 'line',
 				data: stats.map((x, i) => ({ x: i, y: x.deliver.waiting }))
 			}, {
 				name: 'Delayed',
+				type: 'line',
 				data: stats.map((x, i) => ({ x: i, y: x.deliver.delayed }))
 			}]);
-		}
+		},
+
+		domain() {
+			this.jobs = [];
+			this.fetchJobs();
+		},
+
+		state() {
+			this.jobs = [];
+			this.fetchJobs();
+		},
 	},
 
 	mounted() {
-		const chartOpts = {
+		this.fetchJobs();
+
+		const chartOpts = id => ({
 			chart: {
+				id,
+				group: 'queue',
 				type: 'area',
 				height: 200,
 				animations: {
@@ -112,7 +199,12 @@ export default Vue.extend({
 			},
 			grid: {
 				clipMarkers: false,
-				borderColor: 'rgba(0, 0, 0, 0.1)'
+				borderColor: 'rgba(0, 0, 0, 0.1)',
+				xaxis: {
+					lines: {
+						show: true,
+					}
+				},
 			},
 			stroke: {
 				curve: 'straight',
@@ -127,7 +219,7 @@ export default Vue.extend({
 				},
 			},
 			series: [] as any,
-			colors: ['#00BCD4', '#FFEB3B', '#e53935'],
+			colors: ['#00E396', '#00BCD4', '#FFB300', '#e53935'],
 			xaxis: {
 				type: 'numeric',
 				labels: {
@@ -141,10 +233,10 @@ export default Vue.extend({
 				show: false,
 				min: 0,
 			}
-		};
+		});
 
-		this.inboxChart = new ApexCharts(this.$refs.inboxChart, chartOpts);
-		this.deliverChart = new ApexCharts(this.$refs.deliverChart, chartOpts);
+		this.inboxChart = new ApexCharts(this.$refs.inboxChart, chartOpts('a'));
+		this.deliverChart = new ApexCharts(this.$refs.deliverChart, chartOpts('b'));
 
 		this.inboxChart.render();
 		this.deliverChart.render();
@@ -154,7 +246,7 @@ export default Vue.extend({
 		connection.on('statsLog', this.onStatsLog);
 		connection.send('requestLog', {
 			id: Math.random().toString().substr(2, 8),
-			length: 100
+			length: limit
 		});
 
 		this.$once('hook:beforeDestroy', () => {
@@ -184,14 +276,24 @@ export default Vue.extend({
 
 		onStats(stats) {
 			this.stats.push(stats);
-			if (this.stats.length > 100) this.stats.shift();
+			if (this.stats.length > limit) this.stats.shift();
 		},
 
 		onStatsLog(statsLog) {
 			for (const stats of statsLog.reverse()) {
 				this.onStats(stats);
 			}
-		}
+		},
+
+		fetchJobs() {
+			this.$root.api('admin/queue/jobs', {
+				domain: this.domain,
+				state: this.state,
+				limit: this.jobsLimit
+			}).then(jobs => {
+				this.jobs = jobs;
+			});
+		},
 	}
 });
 </script>
@@ -200,5 +302,10 @@ export default Vue.extend({
 .wptihjuy
 	> .chart
 		min-height 200px !important
+		margin 0 -8px
+
+.xvvuvgsv
+	> b
+		margin-right 16px
 
 </style>

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

@@ -69,7 +69,7 @@ export default Vue.extend({
 				},
 				plotOptions: {
 					bar: {
-						columnWidth: '90%'
+						columnWidth: '80%'
 					}
 				},
 				grid: {

src/client/app/common/views/components/settings/drive.vue

@@ -93,12 +93,17 @@ export default Vue.extend({
 					},
 					plotOptions: {
 						bar: {
-							columnWidth: '90%'
+							columnWidth: '80%'
 						}
 					},
 					grid: {
 						clipMarkers: false,
-						borderColor: 'rgba(0, 0, 0, 0.1)'
+						borderColor: 'rgba(0, 0, 0, 0.1)',
+						xaxis: {
+							lines: {
+								show: true,
+							}
+						},
 					},
 					tooltip: {
 						shared: true,

src/client/app/common/views/components/ui/input.vue

@@ -366,9 +366,6 @@ root(fill)
 			&[type='file']
 				display none
 
-			&[type='number']
-				text-align right
-
 		> .prefix
 		> .suffix
 			display block

src/client/app/common/views/deck/deck.user-column.home.vue

@@ -172,7 +172,7 @@ export default Vue.extend({
 					},
 					plotOptions: {
 						bar: {
-							columnWidth: '90%'
+							columnWidth: '80%'
 						}
 					},
 					grid: {

src/client/app/common/views/pages/share.vue

@@ -28,10 +28,10 @@ export default Vue.extend({
 	computed: {
 		template(): string {
 			let t = '';
-			if (this.title && this.url) t += `【[${title}](${url})】\n`;
-			if (this.title && !this.url) t += `【${title}】\n`;
-			if (this.text) t += `${text}\n`;
-			if (!this.title && this.url) t += `${url}`;
+			if (this.title && this.url) t += `【[${this.title}](${this.url})】\n`;
+			if (this.title && !this.url) t += `【${this.title}】\n`;
+			if (this.text) t += `${this.text}\n`;
+			if (!this.title && this.url) t += `${this.url}`;
 			return t.trim();
 		}
 	},

src/client/app/common/views/widgets/queue.vue

@@ -42,13 +42,29 @@ export default define({
 	watch: {
 		stats(stats) {
 			this.inChart.updateSeries([{
+				type: 'area',
 				data: stats.map((x, i) => ({ x: i, y: x.inbox.activeSincePrevTick }))
 			}, {
+				type: 'area',
+				data: stats.map((x, i) => ({ x: i, y: x.inbox.active }))
+			}, {
+				type: 'line',
+				data: stats.map((x, i) => ({ x: i, y: x.inbox.waiting }))
+			}, {
+				type: 'line',
 				data: stats.map((x, i) => ({ x: i, y: x.inbox.delayed }))
 			}]);
 			this.outChart.updateSeries([{
+				type: 'area',
 				data: stats.map((x, i) => ({ x: i, y: x.deliver.activeSincePrevTick }))
 			}, {
+				type: 'area',
+				data: stats.map((x, i) => ({ x: i, y: x.deliver.active }))
+			}, {
+				type: 'line',
+				data: stats.map((x, i) => ({ x: i, y: x.deliver.waiting }))
+			}, {
+				type: 'line',
 				data: stats.map((x, i) => ({ x: i, y: x.deliver.delayed }))
 			}]);
 		}
@@ -81,11 +97,8 @@ export default define({
 				curve: 'straight',
 				width: 1
 			},
-			series: [{
-				data: [] as any
-			}, {
-				data: [] as any
-			}],
+			colors: ['#00E396', '#00BCD4', '#FFB300', '#e53935'],
+			series: [{ data: [] }, { data: [] }, { data: [] }, { data: [] }] as any,
 			yaxis: {
 				min: 0,
 			}

src/daemons/queue-stats.ts

@@ -4,7 +4,7 @@ import { deliverQueue, inboxQueue } from '../queue';
 
 const ev = new Xev();
 
-const interval = 1000;
+const interval = 2000;
 
 /**
  * Report queue stats regularly

src/mfm/fromHtml.ts

@@ -1,5 +1,6 @@
 import { parseFragment, DefaultTreeDocumentFragment } from 'parse5';
 import { URL } from 'url';
+import { urlRegex } from './prelude';
 
 export function fromHtml(html: string): string {
 	if (html == null) return null;
@@ -14,7 +15,7 @@ export function fromHtml(html: string): string {
 
 	return text.trim();
 
-	function getText(node: any) {
+	function getText(node: any): string {
 		if (node.nodeName == '#text') return node.value;
 
 		if (node.childNodes) {
@@ -38,10 +39,11 @@ export function fromHtml(html: string): string {
 				const txt = getText(node);
 				const rel = node.attrs.find((x: any) => x.name == 'rel');
 				const href = node.attrs.find((x: any) => x.name == 'href');
+				const isHashtag = rel && rel.value.match('tag') !== null;
 
 				// ハッシュタグ / hrefがない / txtがURL
-				if ((rel && rel.value.match('tag') !== null) || !href || href.value == txt) {
-					text += txt;
+				if (isHashtag || !href || href.value == txt) {
+					text += isHashtag || txt.match(urlRegex) ? txt : `<${txt}>`;
 				// メンション
 				} else if (txt.startsWith('@') && !(rel && rel.value.match(/^me /))) {
 					const part = txt.split('@');

src/mfm/language.ts

@@ -1,5 +1,5 @@
 import * as P from 'parsimmon';
-import { createLeaf, createTree } from './types';
+import { createLeaf, createTree, urlRegex } from './prelude';
 import { takeWhile, cumulativeSum } from '../prelude/array';
 import parseAcct from '../misc/acct/parse';
 import { toUnicode } from 'punycode';
@@ -154,9 +154,16 @@ export const mfmLanguage = P.createLanguage({
 	url: () => {
 		return P((input, i) => {
 			const text = input.substr(i);
-			const match = text.match(/^https?:\/\/[\w\/:%#@\$&\?!\(\)\[\]~\.,=\+\-]+/);
-			if (!match) return P.makeFailure(i, 'not a url');
-			let url = match[0];
+			const match = text.match(urlRegex);
+			let url: string;
+			if (!match) {
+				const match = text.match(/^<(https?:\/\/.*?)>/);
+				if (!match)
+					return P.makeFailure(i, 'not a url');
+				url = match[1];
+				i += 2;
+			} else
+				url = match[0];
 			url = removeOrphanedBrackets(url);
 			if (url.endsWith('.')) url = url.substr(0, url.lastIndexOf('.'));
 			if (url.endsWith(',')) url = url.substr(0, url.lastIndexOf(','));

src/mfm/normalize.ts

@@ -1,6 +1,6 @@
 import * as A from '../prelude/array';
 import * as S from '../prelude/string';
-import { MfmForest, MfmTree } from './types';
+import { MfmForest, MfmTree } from './prelude';
 import { createTree, createLeaf } from '../prelude/tree';
 
 function isEmptyTextTree(t: MfmTree): boolean {

src/mfm/parse.ts

@@ -1,5 +1,5 @@
 import { mfmLanguage } from './language';
-import { MfmForest } from './types';
+import { MfmForest } from './prelude';
 import { normalize } from './normalize';
 
 export function parse(source: string): MfmForest {

src/mfm/prelude.ts

@@ -35,3 +35,5 @@ export function createLeaf(type: string, props: any): MfmTree {
 export function createTree(type: string, children: MfmForest, props: any): MfmTree {
 	return T.createTree({ type, props }, children);
 }
+
+export const urlRegex = /^https?:\/\/[\w\/:%#@\$&\?!\(\)\[\]~\.,=\+\-]+/;

src/mfm/toHtml.ts

@@ -2,7 +2,7 @@ import { JSDOM } from 'jsdom';
 import config from '../config';
 import { INote } from '../models/note';
 import { intersperse } from '../prelude/array';
-import { MfmForest, MfmTree } from './types';
+import { MfmForest, MfmTree } from './prelude';
 
 export function toHtml(tokens: MfmForest, mentionedRemoteUsers: INote['mentionedRemoteUsers'] = []) {
 	if (tokens == null) {

src/misc/check-svg.ts

@@ -1,5 +1,5 @@
 import * as fs from 'fs';
-import * as isSvg from 'is-svg';
+import isSvg from 'is-svg';
 
 export default function(path: string) {
 	try {

src/misc/convert-host.ts

@@ -0,0 +1,27 @@
+import config from '../config';
+import { toUnicode, toASCII } from 'punycode';
+import { URL } from 'url';
+
+export function getFullApAccount(username: string, host: string) {
+	return host ? `${username}@${toApHost(host)}` : `${username}@${toApHost(config.host)}`;
+}
+
+export function isSelfHost(host: string) {
+	if (host == null) return true;
+	return toApHost(config.host) === toApHost(host);
+}
+
+export function extractDbHost(uri: string) {
+	const url = new URL(uri);
+	return toDbHost(url.hostname);
+}
+
+export function toDbHost(host: string) {
+	if (host == null) return null;
+	return toUnicode(host.toLowerCase());
+}
+
+export function toApHost(host: string) {
+	if (host == null) return null;
+	return toASCII(host.toLowerCase());
+}

src/misc/extract-emojis.ts

@@ -1,4 +1,4 @@
-import { EmojiNode, MfmForest } from '../mfm/types';
+import { EmojiNode, MfmForest } from '../mfm/prelude';
 import { preorderF } from '../prelude/tree';
 import { unique } from '../prelude/array';
 

src/misc/extract-hashtags.ts

@@ -1,4 +1,4 @@
-import { HashtagNode, MfmForest } from '../mfm/types';
+import { HashtagNode, MfmForest } from '../mfm/prelude';
 import { preorderF } from '../prelude/tree';
 import { unique } from '../prelude/array';
 

src/misc/extract-mentions.ts

@@ -1,6 +1,6 @@
 // test is located in test/extract-mentions
 
-import { MentionNode, MfmForest } from '../mfm/types';
+import { MentionNode, MfmForest } from '../mfm/prelude';
 import { preorderF } from '../prelude/tree';
 
 export default function(mfmForest: MfmForest): MentionNode['props'][] {

src/models/meta.ts

@@ -198,6 +198,7 @@ export type IMeta = {
 	mascotImageUrl?: string;
 	bannerUrl?: string;
 	errorImageUrl?: string;
+	iconUrl?: string;
 
 	cacheRemoteFiles?: boolean;
 

src/models/note.ts

@@ -41,6 +41,7 @@ export type INote = {
 	replyId: mongo.ObjectID;
 	renoteId: mongo.ObjectID;
 	poll: IPoll;
+	name?: string;
 	text: string;
 	tags: string[];
 	tagsLower: string[];
@@ -391,6 +392,10 @@ export const pack = async (
 	}
 	//#endregion
 
+	if (_note.name) {
+		_note.text = `【${_note.name}】\n${_note.text}`;
+	}
+
 	if (_note.user.isCat && _note.text) {
 		_note.text = (_note.text
 			// ja-JP

src/models/user.ts

@@ -20,6 +20,7 @@ User.createIndex('createdAt');
 User.createIndex('updatedAt');
 User.createIndex('followersCount');
 User.createIndex('tags');
+User.createIndex('isSuspended');
 User.createIndex('username');
 User.createIndex('usernameLower');
 User.createIndex('host');

src/queue/index.ts

@@ -178,10 +178,10 @@ export function destroy() {
 	deliverQueue.once('cleaned', (jobs, status) => {
 		deliverLogger.succ(`Cleaned ${jobs.length} ${status} jobs`);
 	});
-	deliverQueue.clean(0, 'wait');
+	deliverQueue.clean(0, 'delayed');
 
 	inboxQueue.once('cleaned', (jobs, status) => {
 		inboxLogger.succ(`Cleaned ${jobs.length} ${status} jobs`);
 	});
-	inboxQueue.clean(0, 'wait');
+	inboxQueue.clean(0, 'delayed');
 }

src/queue/processors/db/export-blocking.ts

@@ -8,7 +8,7 @@ import addFile from '../../../services/drive/add-file';
 import User from '../../../models/user';
 import dateFormat = require('dateformat');
 import Blocking from '../../../models/blocking';
-import config from '../../../config';
+import { getFullApAccount } from '../../../misc/convert-host';
 
 const logger = queueLogger.createSubLogger('export-blocking');
 
@@ -56,7 +56,7 @@ export async function exportBlocking(job: Bull.Job, done: any): Promise<void> {
 
 		for (const block of blockings) {
 			const u = await User.findOne({ _id: block.blockeeId }, { fields: { username: true, host: true } });
-			const content = u.host ? `${u.username}@${u.host}` : `${u.username}@${config.host}`;
+			const content = getFullApAccount(u.username, u.host);
 			await new Promise((res, rej) => {
 				stream.write(content + '\n', err => {
 					if (err) {

src/queue/processors/db/export-following.ts

@@ -8,7 +8,7 @@ import addFile from '../../../services/drive/add-file';
 import User from '../../../models/user';
 import dateFormat = require('dateformat');
 import Following from '../../../models/following';
-import config from '../../../config';
+import { getFullApAccount } from '../../../misc/convert-host';
 
 const logger = queueLogger.createSubLogger('export-following');
 
@@ -56,7 +56,7 @@ export async function exportFollowing(job: Bull.Job, done: any): Promise<void> {
 
 		for (const following of followings) {
 			const u = await User.findOne({ _id: following.followeeId }, { fields: { username: true, host: true } });
-			const content = u.host ? `${u.username}@${u.host}` : `${u.username}@${config.host}`;
+			const content = getFullApAccount(u.username, u.host);
 			await new Promise((res, rej) => {
 				stream.write(content + '\n', err => {
 					if (err) {

src/queue/processors/db/export-mute.ts

@@ -8,7 +8,7 @@ import addFile from '../../../services/drive/add-file';
 import User from '../../../models/user';
 import dateFormat = require('dateformat');
 import Mute from '../../../models/mute';
-import config from '../../../config';
+import { getFullApAccount } from '../../../misc/convert-host';
 
 const logger = queueLogger.createSubLogger('export-mute');
 
@@ -56,7 +56,7 @@ export async function exportMute(job: Bull.Job, done: any): Promise<void> {
 
 		for (const mute of mutes) {
 			const u = await User.findOne({ _id: mute.muteeId }, { fields: { username: true, host: true } });
-			const content = u.host ? `${u.username}@${u.host}` : `${u.username}@${config.host}`;
+			const content = getFullApAccount(u.username, u.host);
 			await new Promise((res, rej) => {
 				stream.write(content + '\n', err => {
 					if (err) {

src/queue/processors/db/export-user-lists.ts

@@ -7,8 +7,8 @@ import { queueLogger } from '../../logger';
 import addFile from '../../../services/drive/add-file';
 import User from '../../../models/user';
 import dateFormat = require('dateformat');
-import config from '../../../config';
 import UserList from '../../../models/user-list';
+import { getFullApAccount } from '../../../misc/convert-host';
 
 const logger = queueLogger.createSubLogger('export-user-lists');
 
@@ -46,7 +46,7 @@ export async function exportUserLists(job: Bull.Job, done: any): Promise<void> {
 		});
 
 		for (const u of users) {
-			const acct = u.host ? `${u.username}@${u.host}` : `${u.username}@${config.host}`;
+			const acct = getFullApAccount(u.username, u.host);
 			const content = `${list.title},${acct}`;
 			await new Promise((res, rej) => {
 				stream.write(content + '\n', err => {

src/queue/processors/db/import-following.ts

@@ -3,13 +3,13 @@ import * as mongo from 'mongodb';
 
 import { queueLogger } from '../../logger';
 import User from '../../../models/user';
-import config from '../../../config';
 import follow from '../../../services/following/create';
 import DriveFile from '../../../models/drive-file';
 import { getOriginalUrl } from '../../../misc/get-drive-file-url';
 import parseAcct from '../../../misc/acct/parse';
 import resolveUser from '../../../remote/resolve-user';
 import { downloadTextFile } from '../../../misc/download-text-file';
+import { isSelfHost, toDbHost } from '../../../misc/convert-host';
 
 const logger = queueLogger.createSubLogger('import-following');
 
@@ -31,11 +31,11 @@ export async function importFollowing(job: Bull.Job, done: any): Promise<void> {
 	for (const line of csv.trim().split('\n')) {
 		const { username, host } = parseAcct(line.trim());
 
-		let target = host === config.host ? await User.findOne({
+		let target = isSelfHost(host) ? await User.findOne({
 			host: null,
 			usernameLower: username.toLowerCase()
 		}) : await User.findOne({
-			host: host,
+			host: toDbHost(host),
 			usernameLower: username.toLowerCase()
 		});
 

src/queue/processors/db/import-user-lists.ts

@@ -3,7 +3,6 @@ import * as mongo from 'mongodb';
 
 import { queueLogger } from '../../logger';
 import User from '../../../models/user';
-import config from '../../../config';
 import UserList from '../../../models/user-list';
 import DriveFile from '../../../models/drive-file';
 import { getOriginalUrl } from '../../../misc/get-drive-file-url';
@@ -11,6 +10,7 @@ import parseAcct from '../../../misc/acct/parse';
 import resolveUser from '../../../remote/resolve-user';
 import { pushUserToUserList } from '../../../services/user-list/push';
 import { downloadTextFile } from '../../../misc/download-text-file';
+import { isSelfHost, toDbHost } from '../../../misc/convert-host';
 
 const logger = queueLogger.createSubLogger('import-user-lists');
 
@@ -47,11 +47,11 @@ export async function importUserLists(job: Bull.Job, done: any): Promise<void> {
 			});
 		}
 
-		let target = host === config.host ? await User.findOne({
+		let target = isSelfHost(host) ? await User.findOne({
 			host: null,
 			usernameLower: username.toLowerCase()
 		}) : await User.findOne({
-			host: host,
+			host: toDbHost(host),
 			usernameLower: username.toLowerCase()
 		});
 

src/remote/activitypub/kernel/announce/index.ts

@@ -24,10 +24,8 @@ export default async (actor: IRemoteUser, activity: IAnnounce): Promise<void> =>
 
 	switch (object.type) {
 	case 'Note':
-		announceNote(resolver, actor, activity, object as INote);
-		break;
-
 	case 'Question':
+	case 'Article':
 		announceNote(resolver, actor, activity, object as INote);
 		break;
 

src/remote/activitypub/kernel/announce/note.ts

@@ -5,6 +5,8 @@ import { IAnnounce, INote } from '../../type';
 import { fetchNote, resolveNote } from '../../models/note';
 import { resolvePerson } from '../../models/person';
 import { apLogger } from '../../logger';
+import { extractDbHost } from '../../../../misc/convert-host';
+import Instance from '../../../../models/instance';
 
 const logger = apLogger;
 
@@ -23,6 +25,11 @@ export default async function(resolver: Resolver, actor: IRemoteUser, activity:
 		throw new Error('invalid announce');
 	}
 
+	// アナウンス先をブロックしてたら中断
+	// TODO: いちいちデータベースにアクセスするのはコスト高そうなのでどっかにキャッシュしておく
+	const instance = await Instance.findOne({ host: extractDbHost(uri) });
+	if (instance && instance.isBlocked) return;
+
 	// 既に同じURIを持つものが登録されていないかチェック
 	const exist = await fetchNote(uri);
 	if (exist) {

src/remote/activitypub/kernel/create/index.ts

@@ -29,10 +29,8 @@ export default async (actor: IRemoteUser, activity: ICreate): Promise<void> => {
 		break;
 
 	case 'Note':
-		createNote(resolver, actor, object);
-		break;
-
 	case 'Question':
+	case 'Article':
 		createNote(resolver, actor, object);
 		break;
 

src/remote/activitypub/kernel/delete/index.ts

@@ -21,10 +21,8 @@ export default async (actor: IRemoteUser, activity: IDelete): Promise<void> => {
 
 	switch (object.type) {
 	case 'Note':
-		deleteNote(actor, uri);
-		break;
-
 	case 'Question':
+	case 'Article':
 		deleteNote(actor, uri);
 		break;
 

src/remote/activitypub/logger.ts

@@ -1,3 +1,3 @@
-import { remoteLogger } from "../logger";
+import { remoteLogger } from '../logger';
 
 export const apLogger = remoteLogger.createSubLogger('ap', 'magenta');

src/remote/activitypub/models/note.ts

@@ -19,6 +19,8 @@ import vote from '../../../services/note/polls/vote';
 import { apLogger } from '../logger';
 import { IDriveFile } from '../../../models/drive-file';
 import { deliverQuestionUpdate } from '../../../services/note/polls/update';
+import Instance from '../../../models/instance';
+import { extractDbHost } from '../../../misc/convert-host';
 
 const logger = apLogger;
 
@@ -55,7 +57,7 @@ export async function createNote(value: any, resolver?: Resolver, silent = false
 
 	const object: any = await resolver.resolve(value);
 
-	if (!object || !['Note', 'Question'].includes(object.type)) {
+	if (!object || !['Note', 'Question', 'Article'].includes(object.type)) {
 		logger.error(`invalid note: ${value}`, {
 			resolver: {
 				history: resolver.getHistory()
@@ -116,7 +118,7 @@ export async function createNote(value: any, resolver?: Resolver, silent = false
 		: [];
 
 	// リプライ
-	const reply = note.inReplyTo
+	const reply: INote = note.inReplyTo
 		? await resolveNote(note.inReplyTo, resolver).catch(e => {
 			// 4xxの場合はリプライしてないことにする
 			if (e.statusCode >= 400 && e.statusCode < 500) {
@@ -132,7 +134,15 @@ export async function createNote(value: any, resolver?: Resolver, silent = false
 	let quote: INote;
 
 	if (note._misskey_quote && typeof note._misskey_quote == 'string') {
-		quote = await resolveNote(note._misskey_quote).catch(() => null);
+		quote = await resolveNote(note._misskey_quote).catch(e => {
+			// 4xxの場合は引用してないことにする
+			if (e.statusCode >= 400 && e.statusCode < 500) {
+				logger.warn(`Ignored quote target ${note.inReplyTo} - ${e.statusCode} `);
+				return null;
+			}
+			logger.warn(`Error in quote target ${note.inReplyTo} - ${e.statusCode || e}`);
+			throw e;
+		});
 	}
 
 	const cw = note.summary === '' ? null : note.summary;
@@ -189,6 +199,7 @@ export async function createNote(value: any, resolver?: Resolver, silent = false
 		files,
 		reply,
 		renote: quote,
+		name: note.name,
 		cw,
 		text,
 		viaMobile: false,
@@ -214,6 +225,11 @@ export async function createNote(value: any, resolver?: Resolver, silent = false
 export async function resolveNote(value: string | IObject, resolver?: Resolver): Promise<INote> {
 	const uri = typeof value == 'string' ? value : value.id;
 
+	// ブロックしてたら中断
+	// TODO: いちいちデータベースにアクセスするのはコスト高そうなのでどっかにキャッシュしておく
+	const instance = await Instance.findOne({ host: extractDbHost(uri) });
+	if (instance && instance.isBlocked) throw { statusCode: 451 };
+
 	//#region このサーバーに既に登録されていたらそれを返す
 	const exist = await fetchNote(uri);
 

src/remote/logger.ts

@@ -1,3 +1,3 @@
-import Logger from "../services/logger";
+import Logger from '../services/logger';
 
 export const remoteLogger = new Logger('remote', 'cyan');

src/server/api/endpoints/admin/queue/jobs.ts

@@ -0,0 +1,40 @@
+import $ from 'cafy';
+import define from '../../../define';
+import { deliverQueue, inboxQueue } from '../../../../../queue';
+
+export const meta = {
+	tags: ['admin'],
+
+	requireCredential: true,
+	requireModerator: true,
+
+	params: {
+		domain: {
+			validator: $.str,
+		},
+
+		state: {
+			validator: $.str,
+		},
+
+		limit: {
+			validator: $.optional.num,
+			default: 50
+		},
+	}
+};
+
+export default define(meta, async (ps) => {
+	const queue =
+		ps.domain === 'deliver' ? deliverQueue :
+		ps.domain === 'inbox' ? inboxQueue :
+		null;
+
+	const jobs = await queue.getJobs([ps.state], 0, ps.limit);
+
+	return jobs.map(job => ({
+		id: job.id,
+		data: job.data,
+		attempts: job.attemptsMade,
+	}));
+});

src/server/api/endpoints/admin/suspend-user.ts

@@ -1,7 +1,9 @@
 import $ from 'cafy';
 import ID, { transform } from '../../../../misc/cafy-id';
 import define from '../../define';
-import User from '../../../../models/user';
+import User, { IUser } from '../../../../models/user';
+import Following from '../../../../models/following';
+import deleteFollowing from '../../../../services/following/delete';
 
 export const meta = {
 	desc: {
@@ -51,5 +53,25 @@ export default define(meta, async (ps) => {
 		}
 	});
 
+	unFollowAll(user);
+
 	return;
 });
+
+async function unFollowAll(follower: IUser) {
+	const followings = await Following.find({
+		followerId: follower._id
+	});
+
+	for (const following of followings) {
+		const followee = await User.findOne({
+			_id: following.followeeId
+		});
+
+		if (followee == null) {
+			throw `Cant find followee ${following.followeeId}`;
+		}
+
+		await deleteFollowing(follower, followee, true);
+	}
+}

src/server/api/endpoints/admin/update-meta.ts

@@ -69,6 +69,13 @@ export const meta = {
 			}
 		},
 
+		iconUrl: {
+			validator: $.optional.nullable.str,
+			desc: {
+				'ja-JP': 'インスタンスのアイコンURL'
+			}
+		},
+
 		name: {
 			validator: $.optional.nullable.str,
 			desc: {
@@ -356,6 +363,10 @@ export default define(meta, async (ps) => {
 		set.bannerUrl = ps.bannerUrl;
 	}
 
+	if (ps.iconUrl !== undefined) {
+		set.iconUrl = ps.iconUrl;
+	}
+
 	if (ps.name !== undefined) {
 		set.name = ps.name;
 	}

src/server/api/endpoints/ap/show.ts

@@ -8,6 +8,8 @@ import Note, { pack as packNote, INote } from '../../../../models/note';
 import { createNote } from '../../../../remote/activitypub/models/note';
 import Resolver from '../../../../remote/activitypub/resolver';
 import { ApiError } from '../../error';
+import Instance from '../../../../models/instance';
+import { extractDbHost } from '../../../../misc/convert-host';
 
 export const meta = {
 	tags: ['federation'],
@@ -61,6 +63,10 @@ async function fetchAny(uri: string) {
 		if (packed !== null) return packed;
 	}
 
+	// ブロックしてたら中断
+	const instance = await Instance.findOne({ host: extractDbHost(uri) });
+	if (instance && instance.isBlocked) return null;
+
 	// URI(AP Object id)としてDB検索
 	{
 		const [user, note] = await Promise.all([
@@ -97,7 +103,7 @@ async function fetchAny(uri: string) {
 		};
 	}
 
-	if (['Note', 'Question'].includes(object.type)) {
+	if (['Note', 'Question', 'Article'].includes(object.type)) {
 		const note = await createNote(object.id);
 		return {
 			type: 'Note',

src/server/api/endpoints/meta.ts

@@ -116,6 +116,7 @@ export default define(meta, async (ps, me) => {
 		mascotImageUrl: instance.mascotImageUrl,
 		bannerUrl: instance.bannerUrl,
 		errorImageUrl: instance.errorImageUrl,
+		iconUrl: instance.iconUrl,
 		maxNoteTextLength: instance.maxNoteTextLength,
 		emojis: emojis,
 		enableEmail: instance.enableEmail,

src/server/api/endpoints/users/search.ts

@@ -70,7 +70,8 @@ export default define(meta, async (ps, me) => {
 		users = await User
 			.find({
 				host: null,
-				usernameLower: new RegExp('^' + escapeRegexp(ps.query.replace('@', '').toLowerCase()))
+				usernameLower: new RegExp('^' + escapeRegexp(ps.query.replace('@', '').toLowerCase())),
+				isSuspended: false
 			}, {
 				limit: ps.limit,
 				skip: ps.offset
@@ -80,7 +81,8 @@ export default define(meta, async (ps, me) => {
 			const otherUsers = await User
 				.find({
 					host: { $ne: null },
-					usernameLower: new RegExp('^' + escapeRegexp(ps.query.replace('@', '').toLowerCase()))
+					usernameLower: new RegExp('^' + escapeRegexp(ps.query.replace('@', '').toLowerCase())),
+					isSuspended: false
 				}, {
 					limit: ps.limit - users.length
 				});

src/server/api/logger.ts

@@ -1,3 +1,3 @@
-import Logger from "../../services/logger";
+import Logger from '../../services/logger';
 
 export const apiLogger = new Logger('api');

src/server/web/index.ts

@@ -250,7 +250,10 @@ router.get('/reversi', async ctx => ctx.redirect(override(ctx.URL.pathname, 'gam
 router.get('*', async ctx => {
 	const meta = await fetchMeta();
 	await ctx.render('base', {
-		img: meta.bannerUrl
+		img: meta.bannerUrl,
+		title: meta.name,
+		desc: meta.description,
+		icon: meta.iconUrl
 	});
 	ctx.set('Cache-Control', 'public, max-age=300');
 });

src/server/web/views/base.pug

@@ -8,17 +8,19 @@ html
 
 	head
 		meta(charset='utf-8')
-		meta(name='application-name' content='Misskey')
+		meta(name='application-name' content= title || 'Misskey')
 		meta(name='referrer' content='origin')
-		meta(property='og:site_name' content='Misskey')
+		meta(name='theme-color' content='#105779')
+		meta(property='og:site_name' content= title || 'Misskey')
+		link(rel='icon' href= icon || '/favicon.ico')
 		link(rel='manifest' href='/manifest.json')
 
 		title
 			block title
-				| Misskey
+				= title || 'Misskey'
 
 		block desc
-			meta(name='description' content='✨🌎✨ A federated blogging platform ✨🚀✨')
+			meta(name='description' content= desc || '✨🌎✨ A federated blogging platform ✨🚀✨')
 
 		block meta
 

src/services/drive/logger.ts

@@ -1,3 +1,3 @@
-import Logger from "../logger";
+import Logger from '../logger';
 
 export const driveLogger = new Logger('drive', 'blue');

src/services/following/delete.ts

@@ -13,7 +13,7 @@ import instanceChart from '../../services/chart/instance';
 
 const logger = new Logger('following/delete');
 
-export default async function(follower: IUser, followee: IUser) {
+export default async function(follower: IUser, followee: IUser, silent = false) {
 	const following = await Following.findOne({
 		followerId: follower._id,
 		followeeId: followee._id
@@ -71,7 +71,7 @@ export default async function(follower: IUser, followee: IUser) {
 	perUserFollowingChart.update(follower, followee, false);
 
 	// Publish unfollow event
-	if (isLocalUser(follower)) {
+	if (!silent && isLocalUser(follower)) {
 		packUser(followee, follower, {
 			detail: true
 		}).then(packed => publishMainStream(follower._id, 'unfollow', packed));

src/services/note/create.ts

@@ -91,6 +91,7 @@ class NotificationManager {
 
 type Option = {
 	createdAt?: Date;
+	name?: string;
 	text?: string;
 	reply?: INote;
 	renote?: INote;
@@ -437,6 +438,7 @@ async function insertNote(user: IUser, data: Option, tags: string[], emojis: str
 		fileIds: data.files ? data.files.map(file => file._id) : [],
 		replyId: data.reply ? data.reply._id : null,
 		renoteId: data.renote ? data.renote._id : null,
+		name: data.name,
 		text: data.text,
 		poll: data.poll,
 		cw: data.cw == null ? null : data.cw,

test/mfm.ts

@@ -12,7 +12,7 @@ import * as assert from 'assert';
 
 import { parse, parsePlain } from '../src/mfm/parse';
 import { toHtml } from '../src/mfm/toHtml';
-import { createTree as tree, createLeaf as leaf, MfmTree } from '../src/mfm/types';
+import { createTree as tree, createLeaf as leaf, MfmTree } from '../src/mfm/prelude';
 import { removeOrphanedBrackets } from '../src/mfm/language';
 
 function text(text: string): MfmTree {
@@ -840,6 +840,20 @@ describe('MFM', () => {
 					text(')')
 				]);
 			});
+
+			it('ignore non-ascii characters contained url without angle brackets', () => {
+				const tokens = parse('https://大石泉すき.example.com');
+				assert.deepStrictEqual(tokens, [
+					text('https://大石泉すき.example.com')
+				]);
+			});
+
+			it('match non-ascii characters contained url with angle brackets', () => {
+				const tokens = parse('<https://大石泉すき.example.com>');
+				assert.deepStrictEqual(tokens, [
+					leaf('url', { url: 'https://大石泉すき.example.com' })
+				]);
+			});
 		});
 
 		describe('link', () => {