Merge branch 'develop'

CHANGELOG.md

@@ -17,42 +17,13 @@ npm i -g ts-node
 npm run migrate
 ```
 
-How to migrate to v11 from v10
+11.19.1 (2019/05/26)
-------------------------------
+--------------------
-### 移行の注意点
+### 🐛Fixes
-**以下のデータは引き継がれません**
+* タグページを遷移してもタイムラインが変わらない問題を修正
-* 通知
+* インスタンス名を空にしてもMisskeyロゴが表示されない問題を修正
-* リモートの投稿
+* 投稿内のローカルなURLをクリックしたとき not found になることがある問題を修正
-* リバーシの対局
+* npm run init がプロセス終了しない問題を修正
-
-### 手順
-1. v11をインストールしたい場所に syuilo/misskey をクローン
-2. config を設定する
-	* PostgreSQL(`db`)の設定とは別に、v10からMongoDBの設定をコピペしてくる(例は下にあります)
-	* `id`の設定を`meid`または`objectid`にする
-
-``` yml
-db:
-  host: localhost
-  port: 5432
-  db: misskey
-  user: x
-  pass: x
-
-mongodb:
-  user: x
-  pass: x
-  host: localhost
-  port: 27017
-  db: misskey
-```
-3. migration ブランチに切り替え
-4. `npm i`
-5. `npm run build`
-6. `npm run init`
-7. `npm run migrate`
-8. master ブランチに戻す
-9. enjoy
 
 11.19.0 (2019/05/25)
 --------------------
@@ -497,7 +468,40 @@ mongodb:
   * 依存ライブラリの問題と思わるため、対応が難しい
 
 ### Migration
-coming soon...
+#### 移行の注意点
+**以下のデータは引き継がれません**
+* 通知
+* リモートの投稿
+* リバーシの対局
+
+#### 手順
+1. v11をインストールしたい場所に syuilo/misskey をクローン
+2. config を設定する
+	* PostgreSQL(`db`)の設定とは別に、v10からMongoDBの設定をコピペしてくる(例は下にあります)
+	* `id`の設定を`meid`または`objectid`にする
+
+``` yml
+db:
+  host: localhost
+  port: 5432
+  db: misskey
+  user: x
+  pass: x
+
+mongodb:
+  user: x
+  pass: x
+  host: localhost
+  port: 27017
+  db: misskey
+```
+3. migration ブランチに切り替え
+4. `npm i`
+5. `npm run build`
+6. `npm run init`
+7. `npm run migrate`
+8. master ブランチに戻す
+9. enjoy
 
 10.100.0
 ----------

CONTRIBUTING.md

@@ -3,8 +3,10 @@
 
 ## Issues
 Feature suggestions and bug reports are filed in https://github.com/syuilo/misskey/issues .
-Before creating a new issue, please search existing issues to avoid duplication.
+
-If you find the existing issue, please add your reaction or comment to the issue.
+* Please search existing issues to avoid duplication. If your issue is already filed, please add your reaction or comment to the existing one.
+* If you have multiple independent issues, please submit them separately.
+
 
 ## Localization (l10n)
 Misskey uses [Crowdin](https://crowdin.com/project/misskey) for localization management.
@@ -19,16 +21,16 @@ If you can't find the language you want to contribute with, please open an issue
 Misskey uses [vue-i18n](https://github.com/kazupon/vue-i18n).
 
 ## Documentation
-* Documents for contributors are located in `/docs`.
+* Documents for contributors are located in [`/docs`](/docs).
-* Documents for instance admins are located in `/docs`.
+* Documents for instance admins are located in [`/docs`](/docs).
-* Documents for end users are located in `src/docs`.
+* Documents for end users are located in [`/src/docs`](/src/docs).
 
 ## Test
-* Test codes are located in `/test`.
+* Test codes are located in [`/test`](/test).
 
 ## Continuous integration
 Misskey uses CircleCI for automated test.
-Configuration files are located in `/.circleci`.
+Configuration files are located in [`/.circleci`](/.circleci).
 
 ## Glossary
 ### AP

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "misskey",
 	"author": "syuilo <i@syuilo.com>",
-	"version": "11.19.0",
+	"version": "11.19.1",
 	"codename": "daybreak",
 	"repository": {
 		"type": "git",
@@ -33,13 +33,11 @@
 		"@fortawesome/free-solid-svg-icons": "5.7.2",
 		"@fortawesome/vue-fontawesome": "0.1.5",
 		"@koa/cors": "2.2.3",
-		"@prezzemolo/zip": "0.0.3",
 		"@types/bcryptjs": "2.4.2",
 		"@types/bull": "3.5.11",
 		"@types/dateformat": "3.0.0",
 		"@types/deep-equal": "1.0.1",
 		"@types/double-ended-queue": "2.1.0",
-		"@types/file-type": "10.9.1",
 		"@types/gulp": "4.0.6",
 		"@types/gulp-mocha": "0.0.32",
 		"@types/gulp-rename": "0.0.33",

src/client/app/common/views/components/mfm.ts

@@ -8,7 +8,7 @@ import { concat, sum } from '../../../../../prelude/array';
 import MkFormula from './formula.vue';
 import MkCode from './code.vue';
 import MkGoogle from './google.vue';
-import { host, url } from '../../../config';
+import { host } from '../../../config';
 import { preorderF, countNodesF } from '../../../../../prelude/tree';
 
 function sumTextsLength(ts: MfmForest): number {
@@ -175,9 +175,6 @@ export default Vue.component('misskey-flavored-markdown', {
 						props: {
 							url: token.node.props.url,
 							rel: 'nofollow noopener',
-							...(token.node.props.url.startsWith(url) ? {} : {
-								target: '_blank'
-							})
 						},
 						attrs: {
 							style: 'color:var(--mfmUrl);'

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

@@ -1,5 +1,5 @@
 <template>
-<component :is="self ? 'router-link' : 'a'" class="mk-url" :[attr]="self ? url.substr(local.length) : url" :rel="rel" :target="target">
+<component :is="hasRoute ? 'router-link' : 'a'" class="mk-url" :[attr]="hasRoute ? url.substr(local.length) : url" :rel="rel" :target="target">
 	<template v-if="!self">
 		<span class="schema">{{ schema }}//</span>
 		<span class="hostname">{{ hostname }}</span>
@@ -8,7 +8,7 @@
 	<span class="pathname" v-if="pathname != ''">{{ self ? pathname.substr(1) : pathname }}</span>
 	<span class="query">{{ query }}</span>
 	<span class="hash">{{ hash }}</span>
-	<fa icon="external-link-square-alt" v-if="!self"/>
+	<fa icon="external-link-square-alt" v-if="target === '_blank'"/>
 </component>
 </template>
 
@@ -18,8 +18,13 @@ import { toUnicode as decodePunycode } from 'punycode';
 import { url as local } from '../../../config';
 
 export default Vue.extend({
-	props: ['url', 'rel', 'target'],
+	props: ['url', 'rel'],
 	data() {
+		const isSelf = this.url.startsWith(local);
+		const hasRoute =
+			this.url.substr(local.length).startsWith('/@') ||
+			this.url.substr(local.length).startsWith('/notes/') ||
+			this.url.substr(local.length).startsWith('/pages/');
 		return {
 			local,
 			schema: null,
@@ -28,8 +33,10 @@ export default Vue.extend({
 			pathname: null,
 			query: null,
 			hash: null,
-			self: this.url.startsWith(local),
+			self: isSelf,
-			attr: this.url.startsWith(local) ? 'to' : 'href'
+			hasRoute: hasRoute,
+			attr: hasRoute ? 'to' : 'href',
+			target: hasRoute ? null : '_blank'
 		};
 	},
 	created() {

src/client/app/desktop/views/home/tag.vue

@@ -17,20 +17,15 @@ import Progress from '../../../common/scripts/loading';
 
 export default Vue.extend({
 	i18n: i18n('desktop/views/pages/tag.vue'),
-	data() {
+	computed: {
-		return {
+		pagination() {
-			pagination: {
+			return {
 				endpoint: 'notes/search-by-tag',
 				limit: 20,
 				params: {
 					tag: this.$route.params.tag
 				}
-			}
+			};
-		};
-	},
-	watch: {
-		$route() {
-			this.$refs.timeline.reload();
 		}
 	},
 	mounted() {

src/client/app/desktop/views/pages/welcome.vue

@@ -13,7 +13,7 @@
 		<div class="body">
 			<div class="main block">
 				<div>
-					<h1 v-if="name != null">{{ name }}</h1>
+					<h1 v-if="name != null && name != ''">{{ name }}</h1>
 					<h1 v-else><img svg-inline src="../../../../assets/title.svg" alt="Misskey"></h1>
 
 					<div class="info">

src/init.ts

@@ -4,6 +4,7 @@ console.log('Init database...');
 
 initDb(false, true, true).then(() => {
 	console.log('Done :)');
+	process.exit(0);
 }, e => {
 	console.error('Failed to init database');
 	console.error(e);