Merge branch 'develop'

This commit is contained in:
syuilo 2019-04-15 12:23:20 +09:00
commit d040dc19bc
No known key found for this signature in database
GPG key ID: BDC4C49D06AB9D69
35 changed files with 295 additions and 99 deletions

View file

@ -39,7 +39,7 @@
<span :data-active="src == 'messages'" @click="src = 'messages'"><fa :icon="['far', 'envelope']"/> {{ $t('messages') }}<i class="badge" v-if="$store.state.i.hasUnreadSpecifiedNotes"><fa icon="circle"/></i></span>
<template v-if="lists">
<div class="hr" v-if="lists.length > 0"></div>
<span v-for="l in lists" :data-active="src == 'list' && list == l" @click="src = 'list'; list = l" :key="l.id"><fa icon="list"/> {{ l.title }}</span>
<span v-for="l in lists" :data-active="src == 'list' && list == l" @click="src = 'list'; list = l" :key="l.id"><fa icon="list"/> {{ l.name }}</span>
</template>
<div class="hr" v-if="$store.state.settings.tagTimelines && $store.state.settings.tagTimelines.length > 0"></div>
<span v-for="tl in $store.state.settings.tagTimelines" :data-active="src == 'tag' && tagTl == tl" @click="src = 'tag'; tagTl = tl" :key="tl.id"><fa icon="hashtag"/> {{ tl.title }}</span>

View file

@ -23,7 +23,6 @@ export default Vue.extend({
mounted() {
this.$root.api('users/notes', {
userId: this.user.id,
untilDate: new Date().getTime() + 1000 * 86400 * 365
}).then(notes => {
this.notes = notes;
this.fetching = false;

View file

@ -37,7 +37,6 @@ export default Vue.extend({
fileType: image,
excludeNsfw: !this.$store.state.device.alwaysShowNsfw,
limit: 9,
untilDate: new Date().getTime() + 1000 * 86400 * 365
}).then(notes => {
for (const note of notes) {
for (const file of note.files) {