profxadke/misskey
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'develop'

Browse source
This commit is contained in:
syuilo 2019-04-15 22:09:10 +09:00
commit ff625253ce
No known key found for this signature in database
GPG key ID: BDC4C49D06AB9D69
6 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/client/app/desktop/views/home/timeline.vue
View file

@ -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';
}
},

2
src/client/app/mobile/views/pages/home.vue
View file

@ -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';
}
},

2
src/server/api/stream/channels/messaging.ts
View file

@ -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;
}
}

2
src/server/web/views/base.pug
View file

@ -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')