10.28.0

locales/ja-JP.yml

@@ -124,6 +124,10 @@ common:
 
   do-not-use-in-production: 'これは開発ビルドです。本番環境で使用しないでください。'
 
+  error:
+    title: '問題が発生しました'
+    retry: 'やり直す'
+
   reversi:
     drawn: "引き分け"
     my-turn: "あなたのターンです"

package.json

@@ -1,8 +1,8 @@
 {
 	"name": "misskey",
 	"author": "syuilo <i@syuilo.com>",
-	"version": "10.27.0",
+	"version": "10.28.0",
-	"clientVersion": "1.0.10768",
+	"clientVersion": "1.0.10776",
 	"codename": "nighthike",
 	"main": "./built/index.js",
 	"private": true,

src/client/app/common/views/components/misskey-flavored-markdown.ts

@@ -114,10 +114,9 @@ export default Vue.component('misskey-flavored-markdown', {
 				}
 
 				case 'mention': {
-					return (createElement as any)('a', {
+					return (createElement as any)('router-link', {
 						attrs: {
-							href: `${url}/${token.canonical}`,
+							to: `/${token.canonical}`,
-							target: '_blank',
 							dataIsMe: (this as any).i && getAcct((this as any).i) == getAcct(token),
 							style: 'color:var(--mfmMention);'
 						},
@@ -129,10 +128,9 @@ export default Vue.component('misskey-flavored-markdown', {
 				}
 
 				case 'hashtag': {
-					return [createElement('a', {
+					return [createElement('router-link', {
 						attrs: {
-							href: `${url}/tags/${encodeURIComponent(token.hashtag)}`,
+							to: `/tags/${encodeURIComponent(token.hashtag)}`,
-							target: '_blank',
 							style: 'color:var(--mfmHashtag);'
 						}
 					}, token.content)];

src/client/app/desktop/views/components/notes.vue

@@ -4,9 +4,9 @@
 
 	<slot name="empty" v-if="notes.length == 0 && !fetching && requestInitPromise == null"></slot>
 
-	<div v-if="!fetching && requestInitPromise != null">
+	<div v-if="!fetching && requestInitPromise != null" class="error">
-		<p>%i18n:@error%</p>
+		<p>%fa:exclamation-triangle% %i18n:common.error.title%</p>
-		<button @click="resolveInitPromise">%i18n:@retry%</button>
+		<ui-button @click="resolveInitPromise">%i18n:common.error.retry%</ui-button>
 	</div>
 
 	<div class="placeholder" v-if="fetching">
@@ -215,6 +215,13 @@ export default Vue.extend({
 		> *
 			transition transform .3s ease, opacity .3s ease
 
+	> .error
+		max-width 300px
+		margin 0 auto
+		padding 16px
+		text-align center
+		color var(--text)
+
 	> .placeholder
 		padding 32px
 		opacity 0.3

src/client/app/desktop/views/pages/deck/deck.hashtag-tl.vue

@@ -47,14 +47,16 @@ export default Vue.extend({
 
 	mounted() {
 		if (this.connection) this.connection.close();
-		this.connection = (this as any).os.stream.connectToChannel('hashtag', this.tagTl.query);
+		this.connection = (this as any).os.stream.connectToChannel('hashtag', {
+			q: this.tagTl.query
+		});
 		this.connection.on('note', this.onNote);
 
 		this.fetch();
 	},
 
 	beforeDestroy() {
-		this.connection.close();
+		this.connection.dispose();
 	},
 
 	methods: {

src/client/app/desktop/views/pages/deck/deck.notes.vue

@@ -8,9 +8,9 @@
 		</template>
 	</div>
 
-	<div v-if="!fetching && requestInitPromise != null">
+	<div v-if="!fetching && requestInitPromise != null" class="error">
-		<p>%i18n:@error%</p>
+		<p>%fa:exclamation-triangle% %i18n:common.error.title%</p>
-		<button @click="resolveInitPromise">%i18n:@retry%</button>
+		<ui-button @click="resolveInitPromise">%i18n:common.error.retry%</ui-button>
 	</div>
 
 	<!-- トランジションを有効にするとなぜかメモリリークする -->
@@ -226,6 +226,13 @@ export default Vue.extend({
 		> *
 			transition transform .3s ease, opacity .3s ease
 
+	> .error
+		max-width 300px
+		margin 0 auto
+		padding 16px
+		text-align center
+		color var(--text)
+
 	> .placeholder
 		padding 16px
 		opacity 0.3

src/mfm/parse/elements/hashtag.ts

@@ -9,9 +9,9 @@ export type TextElementHashtag = {
 };
 
 export default function(text: string, i: number) {
-	if (!(/^\s#[^\s\.,]+/.test(text) || (i == 0 && /^#[^\s\.,]+/.test(text)))) return null;
+	if (!(/^\s#[^\s\.,!\?]+/.test(text) || (i == 0 && /^#[^\s\.,!\?]+/.test(text)))) return null;
 	const isHead = text.startsWith('#');
-	const hashtag = text.match(/^\s?#[^\s\.,]+/)[0];
+	const hashtag = text.match(/^\s?#[^\s\.,!\?]+/)[0];
 	const res: any[] = !isHead ? [{
 		type: 'text',
 		content: text[0]

src/server/api/stream/channels/hashtag.ts

@@ -15,6 +15,8 @@ export default class extends Channel {
 
 		const q: Array<string[]> = params.q;
 
+		if (q == null) return;
+
 		// Subscribe stream
 		this.subscriber.on('hashtag', async note => {
 			const matched = q.some(tags => tags.every(tag => note.tags.map((t: string) => t.toLowerCase()).includes(tag.toLowerCase())));

test/mfm.ts

@@ -122,6 +122,12 @@ describe('Text', () => {
 				{ type: 'hashtag', content: '#piyo', hashtag: 'piyo' },
 				{ type: 'text', content: '.' }
 			], tokens2);
+
+			const tokens3 = analyze('#Foo!');
+			assert.deepEqual([
+				{ type: 'hashtag', content: '#Foo', hashtag: 'Foo' },
+				{ type: 'text', content: '!' },
+			], tokens3);
 		});
 
 		it('quote', () => {