1
0
mirror of https://github.com/misskey-dev/misskey.git synced 2026-05-30 08:44:01 +02:00

Post --> Note

Closes #1411
This commit is contained in:
syuilo
2018-04-08 02:30:37 +09:00
parent c7106d250c
commit a1b490afa7
167 changed files with 4440 additions and 1762 deletions

View File

@@ -9,7 +9,7 @@
</div>
</div>
<main>
<mk-post-detail v-if="user.pinnedPost" :post="user.pinnedPost" :compact="true"/>
<mk-note-detail v-if="user.pinnedNote" :note="user.pinnedNote" :compact="true"/>
<x-timeline class="timeline" ref="tl" :user="user"/>
</main>
<div>

View File

@@ -22,13 +22,13 @@ export default Vue.extend({
};
},
mounted() {
(this as any).api('users/posts', {
(this as any).api('users/notes', {
userId: this.user.id,
withMedia: true,
limit: 9
}).then(posts => {
posts.forEach(post => {
post.media.forEach(media => {
}).then(notes => {
notes.forEach(note => {
note.media.forEach(media => {
if (this.images.length < 9) this.images.push(media);
});
});

View File

@@ -14,7 +14,7 @@
<p>%fa:B twitter%<a :href="`https://twitter.com/${user.account.twitter.screenName}`" target="_blank">@{{ user.account.twitter.screenName }}</a></p>
</div>
<div class="status">
<p class="posts-count">%fa:angle-right%<a>{{ user.postsCount }}</a><b>投稿</b></p>
<p class="notes-count">%fa:angle-right%<a>{{ user.notesCount }}</a><b>投稿</b></p>
<p class="following">%fa:angle-right%<a @click="showFollowing">{{ user.followingCount }}</a>人を<b>フォロー</b></p>
<p class="followers">%fa:angle-right%<a @click="showFollowers">{{ user.followersCount }}</a>人の<b>フォロワー</b></p>
</div>

View File

@@ -8,12 +8,12 @@
<mk-ellipsis-icon/>
</div>
<p class="empty" v-if="empty">%fa:R comments%このユーザーはまだ何も投稿していないようです</p>
<mk-posts ref="timeline" :posts="posts">
<mk-notes ref="timeline" :notes="notes">
<div slot="footer">
<template v-if="!moreFetching">%fa:moon%</template>
<template v-if="moreFetching">%fa:spinner .pulse .fw%</template>
</div>
</mk-posts>
</mk-notes>
</div>
</template>
@@ -27,7 +27,7 @@ export default Vue.extend({
moreFetching: false,
mode: 'default',
unreadCount: 0,
posts: [],
notes: [],
date: null
};
},
@@ -38,7 +38,7 @@ export default Vue.extend({
},
computed: {
empty(): boolean {
return this.posts.length == 0;
return this.notes.length == 0;
}
},
mounted() {
@@ -60,26 +60,26 @@ export default Vue.extend({
}
},
fetch(cb?) {
(this as any).api('users/posts', {
(this as any).api('users/notes', {
userId: this.user.id,
untilDate: this.date ? this.date.getTime() : undefined,
with_replies: this.mode == 'with-replies'
}).then(posts => {
this.posts = posts;
}).then(notes => {
this.notes = notes;
this.fetching = false;
if (cb) cb();
});
},
more() {
if (this.moreFetching || this.fetching || this.posts.length == 0) return;
if (this.moreFetching || this.fetching || this.notes.length == 0) return;
this.moreFetching = true;
(this as any).api('users/posts', {
(this as any).api('users/notes', {
userId: this.user.id,
with_replies: this.mode == 'with-replies',
untilId: this.posts[this.posts.length - 1].id
}).then(posts => {
untilId: this.notes[this.notes.length - 1].id
}).then(notes => {
this.moreFetching = false;
this.posts = this.posts.concat(posts);
this.notes = this.notes.concat(notes);
});
},
onScroll() {