Merge branch 'feat/follows-following-pagination' into 'develop'

Follows + followers pagination #285

See merge request pleroma/pleroma-fe!510

src/components/follow_list/follow_list.js

@@ -0,0 +1,62 @@
+import UserCard from '../user_card/user_card.vue'
+
+const FollowList = {
+  data () {
+    return {
+      loading: false,
+      bottomedOut: false,
+      error: false
+    }
+  },
+  props: ['userId', 'showFollowers'],
+  created () {
+    window.addEventListener('scroll', this.scrollLoad)
+    if (this.entries.length === 0) {
+      this.fetchEntries()
+    }
+  },
+  destroyed () {
+    window.removeEventListener('scroll', this.scrollLoad)
+    this.$store.dispatch('clearFriendsAndFollowers', this.userId)
+  },
+  computed: {
+    user () {
+      return this.$store.getters.userById(this.userId)
+    },
+    entries () {
+      return this.showFollowers ? this.user.followers : this.user.friends
+    }
+  },
+  methods: {
+    fetchEntries () {
+      if (!this.loading) {
+        const command = this.showFollowers ? 'addFollowers' : 'addFriends'
+        this.loading = true
+        this.$store.dispatch(command, this.userId).then(entries => {
+          this.error = false
+          this.loading = false
+          this.bottomedOut = entries.length === 0
+        }).catch(() => {
+          this.error = true
+          this.loading = false
+        })
+      }
+    },
+    scrollLoad (e) {
+      const bodyBRect = document.body.getBoundingClientRect()
+      const height = Math.max(bodyBRect.height, -(bodyBRect.y))
+      if (this.loading === false &&
+        this.bottomedOut === false &&
+        this.$el.offsetHeight > 0 &&
+        (window.innerHeight + window.pageYOffset) >= (height - 750)
+      ) {
+        this.fetchEntries()
+      }
+    }
+  },
+  components: {
+    UserCard
+  }
+}
+
+export default FollowList

src/components/follow_list/follow_list.vue

@@ -0,0 +1,33 @@
+<template>
+  <div class="follow-list">
+    <user-card
+      v-for="entry in entries"
+      :key="entry.id" :user="entry"
+      :showFollows="true"
+    />
+    <div class="text-center panel-footer">
+      <a v-if="error" @click="fetchEntries" class="alert error">
+        {{$t('general.generic_error')}}
+      </a>
+      <i v-else-if="loading" class="icon-spin3 animate-spin"/>
+      <span v-else-if="bottomedOut"></span>
+      <a v-else @click="fetchEntries">{{$t('general.more')}}</a>
+    </div>
+  </div>
+</template>
+
+<script src="./follow_list.js"></script>
+
+<style lang="scss">
+
+.follow-list {
+  .panel-footer {
+    padding: 10px;
+  }
+
+  .error {
+    font-size: 14px;
+  }
+}
+
+</style>

src/components/user_card/user_card.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="card">
     <a href="#">
-      <UserAvatar :compact="true" @click.prevent="toggleUserExpanded" :src="user.profile_image_url"/>
+      <UserAvatar class="avatar" :compact="true" @click.prevent.native="toggleUserExpanded" :src="user.profile_image_url"/>
     </a>
     <div class="usercard" v-if="userExpanded">
       <user-card-content :user="user" :switcher="false"></user-card-content>
@@ -69,13 +69,13 @@
 	border-bottom-color: var(--border, $fallback--border);
 
   .avatar {
-    margin-top: 0.2em;
+    padding: 0;
   }
 }
 
 .usercard {
   width: fill-available;
-  margin: 0.2em 0 0.7em 0;
+  margin: 0.2em 0 0 0.7em;
   border-radius: $fallback--panelRadius;
   border-radius: var(--panelRadius, $fallback--panelRadius);
   border-style: solid;

src/components/user_profile/user_profile.js

@@ -1,6 +1,7 @@
 import UserCardContent from '../user_card_content/user_card_content.vue'
 import UserCard from '../user_card/user_card.vue'
 import Timeline from '../timeline/timeline.vue'
+import FollowList from '../follow_list/follow_list.vue'
 
 const UserProfile = {
   created () {
@@ -15,9 +16,7 @@ const UserProfile = {
     }
   },
   destroyed () {
-    this.$store.dispatch('stopFetching', 'user')
+    this.cleanUp(this.userId)
-    this.$store.dispatch('stopFetching', 'favorites')
-    this.$store.dispatch('stopFetching', 'media')
   },
   computed: {
     timeline () {
@@ -39,12 +38,6 @@ const UserProfile = {
       return this.userId && this.$store.state.users.currentUser.id &&
         this.userId === this.$store.state.users.currentUser.id
     },
-    friends () {
-      return this.user.friends
-    },
-    followers () {
-      return this.user.followers
-    },
     userInStore () {
       if (this.isExternal) {
         return this.$store.getters.userById(this.userId)
@@ -68,61 +61,47 @@ const UserProfile = {
     }
   },
   methods: {
-    fetchFollowers () {
-      const id = this.userId
-      this.$store.dispatch('addFollowers', { id })
-    },
-    fetchFriends () {
-      const id = this.userId
-      this.$store.dispatch('addFriends', { id })
-    },
     startFetchFavorites () {
       if (this.isUs) {
         this.$store.dispatch('startFetching', ['favorites', this.fetchBy])
       }
-    }
+    },
-  },
+    startUp () {
-  watch: {
+      this.$store.dispatch('startFetching', ['user', this.fetchBy])
-    // TODO get rid of this copypasta
+      this.$store.dispatch('startFetching', ['media', this.fetchBy])
-    userName () {
+
-      if (this.isExternal) {
+      this.startFetchFavorites()
-        return
+    },
-      }
+    cleanUp () {
       this.$store.dispatch('stopFetching', 'user')
       this.$store.dispatch('stopFetching', 'favorites')
       this.$store.dispatch('stopFetching', 'media')
       this.$store.commit('clearTimeline', { timeline: 'user' })
       this.$store.commit('clearTimeline', { timeline: 'favorites' })
       this.$store.commit('clearTimeline', { timeline: 'media' })
-      this.$store.dispatch('startFetching', ['user', this.fetchBy])
+    }
-      this.$store.dispatch('startFetching', ['media', this.fetchBy])
+  },
-      this.startFetchFavorites()
+  watch: {
+    userName () {
+      if (this.isExternal) {
+        return
+      }
+      this.cleanUp()
+      this.startUp()
     },
     userId () {
       if (!this.isExternal) {
         return
       }
-      this.$store.dispatch('stopFetching', 'user')
+      this.cleanUp()
-      this.$store.dispatch('stopFetching', 'favorites')
+      this.startUp()
-      this.$store.dispatch('stopFetching', 'media')
-      this.$store.commit('clearTimeline', { timeline: 'user' })
-      this.$store.commit('clearTimeline', { timeline: 'favorites' })
-      this.$store.commit('clearTimeline', { timeline: 'media' })
-      this.$store.dispatch('startFetching', ['user', this.fetchBy])
-      this.$store.dispatch('startFetching', ['media', this.fetchBy])
-      this.startFetchFavorites()
-    },
-    user () {
-      if (this.user.id && !this.user.followers) {
-        this.fetchFollowers()
-        this.fetchFriends()
-      }
     }
   },
   components: {
     UserCardContent,
     UserCard,
-    Timeline
+    Timeline,
+    FollowList
   }
 }
 

src/components/user_profile/user_profile.vue

@@ -16,27 +16,13 @@
         :user-id="fetchBy"
       />
       <div :label="$t('user_card.followees')">
-        <div v-if="friends">
+        <FollowList v-if="user.friends_count > 0" :userId="userId" :showFollowers="false" />
-          <user-card
-            v-for="friend in friends"
-            :key="friend.id"
-            :user="friend"
-            :showFollows="true"
-          />
-        </div>
         <div class="userlist-placeholder" v-else>
           <i class="icon-spin3 animate-spin"></i>
         </div>
       </div>
       <div :label="$t('user_card.followers')">
-        <div v-if="followers">
+        <FollowList v-if="user.followers_count > 0" :userId="userId" :showFollowers="true" />
-          <user-card
-            v-for="follower in followers"
-            :key="follower.id"
-            :user="follower"
-            :showFollows="false"
-          />
-        </div>
         <div class="userlist-placeholder" v-else>
           <i class="icon-spin3 animate-spin"></i>
         </div>

src/i18n/en.json

@@ -17,7 +17,9 @@
   },
   "general": {
     "apply": "Apply",
-    "submit": "Submit"
+    "submit": "Submit",
+    "more": "More",
+    "generic_error": "An error occured"
   },
   "login": {
     "login": "Log in",
@@ -364,9 +366,9 @@
   },
   "upload":{
     "error": {
-    "base": "Upload failed.",
+      "base": "Upload failed.",
-    "file_too_big": "File too big [{filesize}{filesizeunit} / {allowedsize}{allowedsizeunit}]",
+      "file_too_big": "File too big [{filesize}{filesizeunit} / {allowedsize}{allowedsizeunit}]",
-    "default": "Try again later"
+      "default": "Try again later"
     },
     "file_size_units": {
       "B": "B",

src/i18n/fi.json

@@ -17,7 +17,9 @@
   },
   "general": {
     "apply": "Aseta",
-    "submit": "Lähetä"
+    "submit": "Lähetä",
+    "more": "Lisää",
+    "generic_error": "Virhe tapahtui"
   },
   "login": {
     "login": "Kirjaudu sisään",

src/modules/users.js

@@ -1,5 +1,5 @@
 import backendInteractorService from '../services/backend_interactor_service/backend_interactor_service.js'
-import { compact, map, each, merge } from 'lodash'
+import { compact, map, each, merge, find } from 'lodash'
 import { set } from 'vue'
 import { registerPushNotifications, unregisterPushNotifications } from '../services/push/push.js'
 import oauthApi from '../services/new_api/oauth'
@@ -52,13 +52,35 @@ export const mutations = {
     state.loggingIn = false
   },
   // TODO Clean after ourselves?
-  addFriends (state, { id, friends }) {
+  addFriends (state, { id, friends, page }) {
     const user = state.usersObject[id]
-    user.friends = friends
+    each(friends, friend => {
+      if (!find(user.friends, { id: friend.id })) {
+        user.friends.push(friend)
+      }
+    })
+    user.friendsPage = page + 1
   },
-  addFollowers (state, { id, followers }) {
+  addFollowers (state, { id, followers, page }) {
     const user = state.usersObject[id]
-    user.followers = followers
+    each(followers, follower => {
+      if (!find(user.followers, { id: follower.id })) {
+        user.followers.push(follower)
+      }
+    })
+    user.followersPage = page + 1
+  },
+  // Because frontend doesn't have a reason to keep these stuff in memory
+  // outside of viewing someones user profile.
+  clearFriendsAndFollowers (state, userKey) {
+    const user = state.usersObject[userKey]
+    if (!user) {
+      return
+    }
+    user.friends = []
+    user.followers = []
+    user.friendsPage = 0
+    user.followersPage = 0
   },
   addNewUsers (state, users) {
     each(users, (user) => mergeOrAdd(state.users, state.usersObject, user))
@@ -115,13 +137,34 @@ const users = {
       store.rootState.api.backendInteractor.fetchUser({ id })
         .then((user) => store.commit('addNewUsers', [user]))
     },
-    addFriends ({ rootState, commit }, { id }) {
+    addFriends ({ rootState, commit }, fetchBy) {
-      rootState.api.backendInteractor.fetchFriends({ id })
+      return new Promise((resolve, reject) => {
-        .then((friends) => commit('addFriends', { id, friends }))
+        const user = rootState.users.usersObject[fetchBy]
+        const page = user.friendsPage || 1
+        rootState.api.backendInteractor.fetchFriends({ id: user.id, page })
+          .then((friends) => {
+            commit('addFriends', { id: user.id, friends, page })
+            resolve(friends)
+          }).catch(() => {
+            reject()
+          })
+      })
     },
-    addFollowers ({ rootState, commit }, { id }) {
+    addFollowers ({ rootState, commit }, fetchBy) {
-      rootState.api.backendInteractor.fetchFollowers({ id })
+      return new Promise((resolve, reject) => {
-        .then((followers) => commit('addFollowers', { id, followers }))
+        const user = rootState.users.usersObject[fetchBy]
+        const page = user.followersPage || 1
+        rootState.api.backendInteractor.fetchFollowers({ id: user.id, page })
+          .then((followers) => {
+            commit('addFollowers', { id: user.id, followers, page })
+            resolve(followers)
+          }).catch(() => {
+            reject()
+          })
+      })
+    },
+    clearFriendsAndFollowers ({ commit }, userKey) {
+      commit('clearFriendsAndFollowers', userKey)
     },
     registerPushNotifications (store) {
       const token = store.state.currentUser.credentials

src/services/api/api.service.js

@@ -247,15 +247,21 @@ const fetchUser = ({id, credentials}) => {
     .then((data) => parseUser(data))
 }
 
-const fetchFriends = ({id, credentials}) => {
+const fetchFriends = ({id, page, credentials}) => {
   let url = `${FRIENDS_URL}?user_id=${id}`
+  if (page) {
+    url = url + `&page=${page}`
+  }
   return fetch(url, { headers: authHeaders(credentials) })
     .then((data) => data.json())
     .then((data) => data.map(parseUser))
 }
 
-const fetchFollowers = ({id, credentials}) => {
+const fetchFollowers = ({id, page, credentials}) => {
   let url = `${FOLLOWERS_URL}?user_id=${id}`
+  if (page) {
+    url = url + `&page=${page}`
+  }
   return fetch(url, { headers: authHeaders(credentials) })
     .then((data) => data.json())
     .then((data) => data.map(parseUser))

src/services/backend_interactor_service/backend_interactor_service.js

@@ -10,12 +10,12 @@ const backendInteractorService = (credentials) => {
     return apiService.fetchConversation({id, credentials})
   }
 
-  const fetchFriends = ({id}) => {
+  const fetchFriends = ({id, page}) => {
-    return apiService.fetchFriends({id, credentials})
+    return apiService.fetchFriends({id, page, credentials})
   }
 
-  const fetchFollowers = ({id}) => {
+  const fetchFollowers = ({id, page}) => {
-    return apiService.fetchFollowers({id, credentials})
+    return apiService.fetchFollowers({id, page, credentials})
   }
 
   const fetchAllFollowing = ({username}) => {

src/services/entity_normalizer/entity_normalizer.service.js

@@ -112,6 +112,8 @@ export const parseUser = (data) => {
   output.locked = data.locked
   output.followers_count = data.followers_count
   output.statuses_count = data.statuses_count
+  output.friends = []
+  output.followers = []
 
   return output
 }

src/services/user_profile_link_generator/user_profile_link_generator.js

@@ -8,6 +8,6 @@ const generateProfileLink = (id, screenName, restrictedNicknames) => {
   }
 }
 
-const isExternal = screenName => screenName.includes('@')
+const isExternal = screenName => screenName && screenName.includes('@')
 
 export default generateProfileLink