Mizah/Sharkey
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Resolve conflicts

Browse source
This commit is contained in:
syuilo 2018-03-29 14:48:47 +09:00
parent 281b388e39
commit bfc193d8cd
308 changed files with 3045 additions and 3200 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/server/web/app/mobile/views/components/user-timeline.vue
View file

@ -33,8 +33,8 @@ export default Vue.extend({
},
mounted() {
(this as any).api('users/posts', {
user_id: this.user.id,
with_media: this.withMedia,
userId: this.user.id,
withMedia: this.withMedia,
limit: limit + 1
}).then(posts => {
if (posts.length == limit + 1) {
@ -50,10 +50,10 @@ export default Vue.extend({
more() {
this.moreFetching = true;
(this as any).api('users/posts', {
user_id: this.user.id,
with_media: this.withMedia,
userId: this.user.id,
withMedia: this.withMedia,
limit: limit + 1,
until_id: this.posts[this.posts.length - 1].id
untilId: this.posts[this.posts.length - 1].id
}).then(posts => {
if (posts.length == limit + 1) {
posts.pop();