diff options
| author | syuilo <syuilotan@yahoo.co.jp> | 2019-04-15 22:09:10 +0900 |
|---|---|---|
| committer | syuilo <syuilotan@yahoo.co.jp> | 2019-04-15 22:09:10 +0900 |
| commit | ff625253ceb32fe4a4acb65ffa1e46abac948349 (patch) | |
| tree | 00d0c6fd434623ec08ba4767edaaae0ea85b4886 /src | |
| parent | Merge branch 'develop' (diff) | |
| parent | 11.1.1 (diff) | |
| download | misskey-ff625253ceb32fe4a4acb65ffa1e46abac948349.tar.gz misskey-ff625253ceb32fe4a4acb65ffa1e46abac948349.tar.bz2 misskey-ff625253ceb32fe4a4acb65ffa1e46abac948349.zip | |
Merge branch 'develop'
Diffstat (limited to 'src')
| -rw-r--r-- | src/client/app/desktop/views/home/timeline.vue | 2 | ||||
| -rw-r--r-- | src/client/app/mobile/views/pages/home.vue | 2 | ||||
| -rw-r--r-- | src/server/api/stream/channels/messaging.ts | 2 | ||||
| -rw-r--r-- | src/server/web/views/base.pug | 2 |
4 files changed, 2 insertions, 6 deletions
diff --git a/src/client/app/desktop/views/home/timeline.vue b/src/client/app/desktop/views/home/timeline.vue index f257f1fa97..1e6abac823 100644 --- a/src/client/app/desktop/views/home/timeline.vue +++ b/src/client/app/desktop/views/home/timeline.vue @@ -88,8 +88,6 @@ export default Vue.extend({ } else if (this.src == 'tag') { this.tagTl = this.$store.state.device.tl.arg; } - } else if (this.$store.state.i.followingCount == 0) { - this.src = 'hybrid'; } }, diff --git a/src/client/app/mobile/views/pages/home.vue b/src/client/app/mobile/views/pages/home.vue index af008ae26e..0d110bf2ee 100644 --- a/src/client/app/mobile/views/pages/home.vue +++ b/src/client/app/mobile/views/pages/home.vue @@ -130,8 +130,6 @@ export default Vue.extend({ } else if (this.src == 'tag') { this.tagTl = this.$store.state.device.tl.arg; } - } else if (this.$store.state.i.followingCount == 0) { - this.src = 'hybrid'; } }, diff --git a/src/server/api/stream/channels/messaging.ts b/src/server/api/stream/channels/messaging.ts index 8397f849ff..ce766e28e9 100644 --- a/src/server/api/stream/channels/messaging.ts +++ b/src/server/api/stream/channels/messaging.ts @@ -23,7 +23,7 @@ export default class extends Channel { public onMessage(type: string, body: any) { switch (type) { case 'read': - read(this.user!.id, this.otherpartyId, body.id); + read(this.user!.id, this.otherpartyId, [body.id]); break; } } diff --git a/src/server/web/views/base.pug b/src/server/web/views/base.pug index 8e0595e905..e61d29685a 100644 --- a/src/server/web/views/base.pug +++ b/src/server/web/views/base.pug @@ -8,7 +8,7 @@ html head meta(charset='utf-8') - meta(name='application-name' content= title || 'Misskey') + meta(name='application-name' content='Misskey') meta(name='referrer' content='origin') meta(name='theme-color' content='#105779') meta(property='og:site_name' content= title || 'Misskey') |