From f5adb62e2e6efdf6bd9a9c7a8c2677c618de53f9 Mon Sep 17 00:00:00 2001
From: dave <starpumadev@gmail.com>
Date: Thu, 28 Feb 2019 14:27:47 -0500
Subject: #392: update defaultState into a function

---
 test/unit/specs/modules/statuses.spec.js | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

(limited to 'test/unit/specs')

diff --git a/test/unit/specs/modules/statuses.spec.js b/test/unit/specs/modules/statuses.spec.js
index 01d2ce06..864b798d 100644
--- a/test/unit/specs/modules/statuses.spec.js
+++ b/test/unit/specs/modules/statuses.spec.js
@@ -1,4 +1,3 @@
-import { cloneDeep } from 'lodash'
 import { defaultState, mutations, prepareStatus } from '../../../../src/modules/statuses.js'
 
 // eslint-disable-next-line camelcase
@@ -24,7 +23,7 @@ describe('Statuses.prepareStatus', () => {
 
 describe('The Statuses module', () => {
   it('adds the status to allStatuses and to the given timeline', () => {
-    const state = cloneDeep(defaultState)
+    const state = defaultState()
     const status = makeMockStatus({id: '1'})
 
     mutations.addNewStatuses(state, { statuses: [status], timeline: 'public' })
@@ -36,7 +35,7 @@ describe('The Statuses module', () => {
   })
 
   it('counts the status as new if it has not been seen on this timeline', () => {
-    const state = cloneDeep(defaultState)
+    const state = defaultState()
     const status = makeMockStatus({id: '1'})
 
     mutations.addNewStatuses(state, { statuses: [status], timeline: 'public' })
@@ -54,7 +53,7 @@ describe('The Statuses module', () => {
   })
 
   it('add the statuses to allStatuses if no timeline is given', () => {
-    const state = cloneDeep(defaultState)
+    const state = defaultState()
     const status = makeMockStatus({id: '1'})
 
     mutations.addNewStatuses(state, { statuses: [status] })
@@ -66,7 +65,7 @@ describe('The Statuses module', () => {
   })
 
   it('adds the status to allStatuses and to the given timeline, directly visible', () => {
-    const state = cloneDeep(defaultState)
+    const state = defaultState()
     const status = makeMockStatus({id: '1'})
 
     mutations.addNewStatuses(state, { statuses: [status], showImmediately: true, timeline: 'public' })
@@ -78,7 +77,7 @@ describe('The Statuses module', () => {
   })
 
   it('removes statuses by tag on deletion', () => {
-    const state = cloneDeep(defaultState)
+    const state = defaultState()
     const status = makeMockStatus({id: '1'})
     const otherStatus = makeMockStatus({id: '3'})
     status.uri = 'xxx'
@@ -96,7 +95,7 @@ describe('The Statuses module', () => {
   })
 
   it('does not update the maxId when the noIdUpdate flag is set', () => {
-    const state = cloneDeep(defaultState)
+    const state = defaultState()
     const status = makeMockStatus({id: '1'})
     const secondStatus = makeMockStatus({id: '2'})
 
@@ -110,7 +109,7 @@ describe('The Statuses module', () => {
   })
 
   it('keeps a descending by id order in timeline.visibleStatuses and timeline.statuses', () => {
-    const state = cloneDeep(defaultState)
+    const state = defaultState()
     const nonVisibleStatus = makeMockStatus({id: '1'})
     const status = makeMockStatus({id: '3'})
     const statusTwo = makeMockStatus({id: '2'})
@@ -130,7 +129,7 @@ describe('The Statuses module', () => {
   })
 
   it('splits retweets from their status and links them', () => {
-    const state = cloneDeep(defaultState)
+    const state = defaultState()
     const status = makeMockStatus({id: '1'})
     const retweet = makeMockStatus({id: '2', type: 'retweet'})
     const modStatus = makeMockStatus({id: '1', text: 'something else'})
@@ -155,7 +154,7 @@ describe('The Statuses module', () => {
   })
 
   it('replaces existing statuses with the same id', () => {
-    const state = cloneDeep(defaultState)
+    const state = defaultState()
     const status = makeMockStatus({id: '1'})
     const modStatus = makeMockStatus({id: '1', text: 'something else'})
 
@@ -172,7 +171,7 @@ describe('The Statuses module', () => {
   })
 
   it('replaces existing statuses with the same id, coming from a retweet', () => {
-    const state = cloneDeep(defaultState)
+    const state = defaultState()
     const status = makeMockStatus({id: '1'})
     const modStatus = makeMockStatus({id: '1', text: 'something else'})
     const retweet = makeMockStatus({id: '2', type: 'retweet'})
@@ -193,7 +192,7 @@ describe('The Statuses module', () => {
   })
 
   it('handles favorite actions', () => {
-    const state = cloneDeep(defaultState)
+    const state = defaultState()
     const status = makeMockStatus({id: '1'})
 
     const favorite = {
@@ -241,7 +240,7 @@ describe('The Statuses module', () => {
   })
 
   it('keeps userId when clearing user timeline', () => {
-    const state = cloneDeep(defaultState)
+    const state = defaultState()
     state.timelines.user.userId = 123
 
     mutations.clearTimeline(state, { timeline: 'user' })
@@ -252,7 +251,7 @@ describe('The Statuses module', () => {
   describe('notifications', () => {
     it('removes a notification when the notice gets removed', () => {
       const user = { id: '1' }
-      const state = cloneDeep(defaultState)
+      const state = defaultState()
       const status = makeMockStatus({id: '1'})
       const otherStatus = makeMockStatus({id: '3'})
       const mentionedStatus = makeMockStatus({id: '2'})
-- 
cgit v1.2.3-70-g09d2


From 7cb13df8adcd9ad24b017a3399137a53acb3eb4c Mon Sep 17 00:00:00 2001
From: taehoon <th.dev91@gmail.com>
Date: Tue, 5 Mar 2019 14:13:22 -0500
Subject: Update tests

---
 test/unit/specs/boot/routes.spec.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'test/unit/specs')

diff --git a/test/unit/specs/boot/routes.spec.js b/test/unit/specs/boot/routes.spec.js
index 383ba90f..a415aeaf 100644
--- a/test/unit/specs/boot/routes.spec.js
+++ b/test/unit/specs/boot/routes.spec.js
@@ -24,7 +24,7 @@ describe('routes', () => {
 
     const matchedComponents = router.getMatchedComponents()
 
-    expect(matchedComponents[0].components.hasOwnProperty('UserCardContent')).to.eql(true)
+    expect(matchedComponents[0].components.hasOwnProperty('UserCard')).to.eql(true)
   })
 
   it('user\'s profile at /users', () => {
@@ -32,6 +32,6 @@ describe('routes', () => {
 
     const matchedComponents = router.getMatchedComponents()
 
-    expect(matchedComponents[0].components.hasOwnProperty('UserCardContent')).to.eql(true)
+    expect(matchedComponents[0].components.hasOwnProperty('UserCard')).to.eql(true)
   })
 })
-- 
cgit v1.2.3-70-g09d2


From 4f3a220487c3c8b3596e5a8de7b65cc7c4f0c981 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Fri, 8 Mar 2019 22:40:57 +0200
Subject: Since BE doesn't support fetching user by screen name over MastoAPI
 we'll gonna just fetching it over QvitterAPI real quick :DDDDDDDDD

---
 src/components/block_card/block_card.js            |  2 +-
 src/components/mute_card/mute_card.js              |  2 +-
 src/components/user_profile/user_profile.js        | 63 +++++++++-------------
 src/components/user_profile/user_profile.vue       |  4 +-
 src/modules/statuses.js                            |  1 +
 src/modules/users.js                               | 12 ++---
 src/services/api/api.service.js                    | 23 ++++++--
 .../backend_interactor_service.js                  |  5 ++
 test/unit/specs/components/user_profile.spec.js    |  3 +-
 test/unit/specs/modules/users.spec.js              |  6 +--
 10 files changed, 65 insertions(+), 56 deletions(-)

(limited to 'test/unit/specs')

diff --git a/src/components/block_card/block_card.js b/src/components/block_card/block_card.js
index 11fa27b4..c459ff1b 100644
--- a/src/components/block_card/block_card.js
+++ b/src/components/block_card/block_card.js
@@ -9,7 +9,7 @@ const BlockCard = {
   },
   computed: {
     user () {
-      return this.$store.getters.userById(this.userId)
+      return this.$store.getters.findUser(this.userId)
     },
     blocked () {
       return this.user.statusnet_blocking
diff --git a/src/components/mute_card/mute_card.js b/src/components/mute_card/mute_card.js
index 5dd0a9e5..65c9cfb5 100644
--- a/src/components/mute_card/mute_card.js
+++ b/src/components/mute_card/mute_card.js
@@ -9,7 +9,7 @@ const MuteCard = {
   },
   computed: {
     user () {
-      return this.$store.getters.userById(this.userId)
+      return this.$store.getters.findUser(this.userId)
     },
     muted () {
       return this.user.muted
diff --git a/src/components/user_profile/user_profile.js b/src/components/user_profile/user_profile.js
index 345e7035..4f920ae2 100644
--- a/src/components/user_profile/user_profile.js
+++ b/src/components/user_profile/user_profile.js
@@ -9,7 +9,7 @@ import withList from '../../hocs/with_list/with_list'
 const FollowerList = compose(
   withLoadMore({
     fetch: (props, $store) => $store.dispatch('addFollowers', props.userId),
-    select: (props, $store) => get($store.getters.userById(props.userId), 'followers', []),
+    select: (props, $store) => get($store.getters.findUser(props.userId), 'followers', []),
     destory: (props, $store) => $store.dispatch('clearFollowers', props.userId),
     childPropName: 'entries',
     additionalPropNames: ['userId']
@@ -20,7 +20,7 @@ const FollowerList = compose(
 const FriendList = compose(
   withLoadMore({
     fetch: (props, $store) => $store.dispatch('addFriends', props.userId),
-    select: (props, $store) => get($store.getters.userById(props.userId), 'friends', []),
+    select: (props, $store) => get($store.getters.findUser(props.userId), 'friends', []),
     destory: (props, $store) => $store.dispatch('clearFriends', props.userId),
     childPropName: 'entries',
     additionalPropNames: ['userId']
@@ -31,19 +31,22 @@ const FriendList = compose(
 const UserProfile = {
   data () {
     return {
-      error: false
+      error: false,
+      fetchedUserId: null
     }
   },
   created () {
-    this.$store.commit('clearTimeline', { timeline: 'user' })
-    this.$store.commit('clearTimeline', { timeline: 'favorites' })
-    this.$store.commit('clearTimeline', { timeline: 'media' })
-    this.$store.dispatch('startFetching', { timeline: 'user', userId: this.fetchBy })
-    this.$store.dispatch('startFetching', { timeline: 'media', userId: this.fetchBy })
-    this.startFetchFavorites()
     if (!this.user.id) {
-      this.$store.dispatch('fetchUser', this.fetchBy)
-        .then(() => this.$store.dispatch('fetchUserRelationship', this.fetchBy))
+      let fetchPromise
+      if (this.userId) {
+        fetchPromise = this.$store.dispatch('fetchUser', this.userId)
+      } else {
+        fetchPromise = this.$store.dispatch('fetchUserByScreenName', this.userName)
+          .then(userId => {
+            this.fetchedUserId = userId
+          })
+      }
+      fetchPromise
         .catch((reason) => {
           const errorMessage = get(reason, 'error.error')
           if (errorMessage === 'No user with such user_id') { // Known error
@@ -54,8 +57,7 @@ const UserProfile = {
             this.error = this.$t('user_profile.profile_loading_error')
           }
         })
-    } else if (typeof this.user.following === 'undefined' || this.user.following === null) {
-      this.$store.dispatch('fetchUserRelationship', this.fetchBy)
+        .then(() => this.startUp())
     }
   },
   destroyed () {
@@ -72,7 +74,7 @@ const UserProfile = {
       return this.$store.state.statuses.timelines.media
     },
     userId () {
-      return this.$route.params.id || this.user.id
+      return this.$route.params.id || this.user.id || this.fetchedUserId
     },
     userName () {
       return this.$route.params.name || this.user.screen_name
@@ -82,10 +84,8 @@ const UserProfile = {
         this.userId === this.$store.state.users.currentUser.id
     },
     userInStore () {
-      if (this.isExternal) {
-        return this.$store.getters.userById(this.userId)
-      }
-      return this.$store.getters.userByName(this.userName)
+      const routeParams = this.$route.params
+      return this.$store.getters.findUser(routeParams.name || routeParams.iid)
     },
     user () {
       if (this.timeline.statuses[0]) {
@@ -96,9 +96,6 @@ const UserProfile = {
       }
       return {}
     },
-    fetchBy () {
-      return this.isExternal ? this.userId : this.userName
-    },
     isExternal () {
       return this.$route.name === 'external-user-profile'
     },
@@ -112,13 +109,13 @@ const UserProfile = {
   methods: {
     startFetchFavorites () {
       if (this.isUs) {
-        this.$store.dispatch('startFetching', { timeline: 'favorites', userId: this.fetchBy })
+        this.$store.dispatch('startFetching', { timeline: 'favorites', userId: this.userId })
       }
     },
     startUp () {
-      this.$store.dispatch('startFetching', { timeline: 'user', userId: this.fetchBy })
-      this.$store.dispatch('startFetching', { timeline: 'media', userId: this.fetchBy })
-
+      this.$store.dispatch('fetchUserRelationship', this.userId)
+      this.$store.dispatch('startFetching', { timeline: 'user', userId: this.userId })
+      this.$store.dispatch('startFetching', { timeline: 'media', userId: this.userId })
       this.startFetchFavorites()
     },
     cleanUp () {
@@ -131,19 +128,11 @@ const UserProfile = {
     }
   },
   watch: {
-    userName () {
-      if (this.isExternal) {
-        return
-      }
-      this.cleanUp()
-      this.startUp()
-    },
-    userId () {
-      if (!this.isExternal) {
-        return
+    userId (newVal, oldVal) {
+      if (newVal) {
+        this.cleanUp()
+        this.startUp()
       }
-      this.cleanUp()
-      this.startUp()
     },
     $route () {
       this.$refs.tabSwitcher.activateTab(0)()
diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue
index 7d4a8b1f..d449eb85 100644
--- a/src/components/user_profile/user_profile.vue
+++ b/src/components/user_profile/user_profile.vue
@@ -11,7 +11,7 @@
         :title="$t('user_profile.timeline_title')"
         :timeline="timeline"
         :timeline-name="'user'"
-        :user-id="fetchBy"
+        :user-id="userId"
       />
       <div :label="$t('user_card.followees')" v-if="followsTabVisible" :disabled="!user.friends_count">
         <FriendList :userId="userId" />
@@ -25,7 +25,7 @@
         :embedded="true" :title="$t('user_card.media')"
         timeline-name="media"
         :timeline="media"
-        :user-id="fetchBy"
+        :user-id="userId"
       />
       <Timeline
         v-if="isUs"
diff --git a/src/modules/statuses.js b/src/modules/statuses.js
index 2b0215f0..4ee75d48 100644
--- a/src/modules/statuses.js
+++ b/src/modules/statuses.js
@@ -135,6 +135,7 @@ const addNewStatuses = (state, { statuses, showImmediately = false, timeline, us
   // This makes sure that user timeline won't get data meant for other
   // user. I.e. opening different user profiles makes request which could
   // return data late after user already viewing different user profile
+  console.log('TIMEINLINE', timelineObject.userId)
   if ((timeline === 'user' || timeline === 'media') && timelineObject.userId !== userId) {
     return
   }
diff --git a/src/modules/users.js b/src/modules/users.js
index a81ed964..4e17ebf2 100644
--- a/src/modules/users.js
+++ b/src/modules/users.js
@@ -138,12 +138,7 @@ export const mutations = {
 }
 
 export const getters = {
-  userById: state => id =>
-    state.users.find(user => user.id === id),
-  userByName: state => name =>
-    state.users.find(user => user.screen_name &&
-      (user.screen_name.toLowerCase() === name.toLowerCase())
-    )
+  findUser: state => query => state.usersObject[query]
 }
 
 export const defaultState = {
@@ -165,6 +160,11 @@ const users = {
       return store.rootState.api.backendInteractor.fetchUser({ id })
         .then((user) => store.commit('addNewUsers', [user]))
     },
+    fetchUserByScreenName (store, screenName) {
+      return store.rootState.api.backendInteractor.figureOutUserId({ screenName })
+        .then((qvitterUserData) => store.rootState.api.backendInteractor.fetchUser({ id: qvitterUserData.id }))
+        .then((user) => store.commit('addNewUsers', [user]) || user.id)
+    },
     fetchUserRelationship (store, id) {
       return store.rootState.api.backendInteractor.fetchUserRelationship({ id })
         .then((relationships) => store.commit('updateUserRelationship', relationships))
diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js
index 744c2f64..5a0aa2de 100644
--- a/src/services/api/api.service.js
+++ b/src/services/api/api.service.js
@@ -32,6 +32,7 @@ const QVITTER_USER_NOTIFICATIONS_URL = '/api/qvitter/statuses/notifications.json
 const QVITTER_USER_NOTIFICATIONS_READ_URL = '/api/qvitter/statuses/notifications/read.json'
 const BLOCKING_URL = '/api/blocks/create.json'
 const UNBLOCKING_URL = '/api/blocks/destroy.json'
+const USER_URL = '/api/users/show.json'
 const FOLLOW_IMPORT_URL = '/api/pleroma/follow_import'
 const DELETE_ACCOUNT_URL = '/api/pleroma/delete_account'
 const CHANGE_PASSWORD_URL = '/api/pleroma/change_password'
@@ -41,7 +42,7 @@ const DENY_USER_URL = '/api/pleroma/friendships/deny'
 const SUGGESTIONS_URL = '/api/v1/suggestions'
 
 const MASTODON_USER_FAVORITES_TIMELINE_URL = '/api/v1/favourites'
-const MASTODON_USER_URL = '/api/v1/accounts/'
+const MASTODON_USER_URL = '/api/v1/accounts'
 const MASTODON_USER_RELATIONSHIPS_URL = '/api/v1/accounts/relationships'
 const MASTODON_USER_TIMELINE_URL = id => `/api/v1/accounts/${id}/statuses`
 
@@ -272,6 +273,22 @@ const fetchUserRelationship = ({id, credentials}) => {
     })
 }
 
+// TODO remove once MastoAPI supports screen_name in fetchUser one
+const figureOutUserId = ({screenName, credentials}) => {
+  let url = `${USER_URL}/?user_id=${screenName}`
+  return fetch(url, { headers: authHeaders(credentials) })
+    .then((response) => {
+      return new Promise((resolve, reject) => response.json()
+        .then((json) => {
+          if (!response.ok) {
+            return reject(new StatusCodeError(response.status, json, { url }, response))
+          }
+          return resolve(json)
+        }))
+    })
+    .then((data) => parseUser(data))
+}
+
 const fetchFriends = ({id, page, credentials}) => {
   let url = `${FRIENDS_URL}?user_id=${id}`
   if (page) {
@@ -382,9 +399,6 @@ const fetchTimeline = ({timeline, credentials, since = false, until = false, use
   if (until) {
     params.push(['max_id', until])
   }
-  if (userId) {
-    params.push(['user_id', userId])
-  }
   if (tag) {
     url += `/${tag}.json`
   }
@@ -608,6 +622,7 @@ const apiService = {
   unblockUser,
   fetchUser,
   fetchUserRelationship,
+  figureOutUserId,
   favorite,
   unfavorite,
   retweet,
diff --git a/src/services/backend_interactor_service/backend_interactor_service.js b/src/services/backend_interactor_service/backend_interactor_service.js
index cbd0b733..48689167 100644
--- a/src/services/backend_interactor_service/backend_interactor_service.js
+++ b/src/services/backend_interactor_service/backend_interactor_service.js
@@ -26,6 +26,10 @@ const backendInteractorService = (credentials) => {
     return apiService.fetchAllFollowing({username, credentials})
   }
 
+  const figureOutUserId = ({screenName}) => {
+    return apiService.figureOutUserId({screenName, credentials})
+  }
+
   const fetchUser = ({id}) => {
     return apiService.fetchUser({id, credentials})
   }
@@ -95,6 +99,7 @@ const backendInteractorService = (credentials) => {
     unfollowUser,
     blockUser,
     unblockUser,
+    figureOutUserId,
     fetchUser,
     fetchUserRelationship,
     fetchAllFollowing,
diff --git a/test/unit/specs/components/user_profile.spec.js b/test/unit/specs/components/user_profile.spec.js
index 41fd9cd0..1524c4eb 100644
--- a/test/unit/specs/components/user_profile.spec.js
+++ b/test/unit/specs/components/user_profile.spec.js
@@ -13,8 +13,7 @@ const mutations = {
 }
 
 const testGetters = {
-  userByName: state => getters.userByName(state.users),
-  userById: state => getters.userById(state.users)
+  findUser: state => getters.findUser(state.users)
 }
 
 const localUser = {
diff --git a/test/unit/specs/modules/users.spec.js b/test/unit/specs/modules/users.spec.js
index 4d49ee24..dae7e580 100644
--- a/test/unit/specs/modules/users.spec.js
+++ b/test/unit/specs/modules/users.spec.js
@@ -43,7 +43,7 @@ describe('The users module', () => {
       }
       const name = 'Guy'
       const expected = { screen_name: 'Guy', id: '1' }
-      expect(getters.userByName(state)(name)).to.eql(expected)
+      expect(getters.findUser(state)(name)).to.eql(expected)
     })
 
     it('returns user with matching screen_name with different case', () => {
@@ -54,7 +54,7 @@ describe('The users module', () => {
       }
       const name = 'Guy'
       const expected = { screen_name: 'guy', id: '1' }
-      expect(getters.userByName(state)(name)).to.eql(expected)
+      expect(getters.findUser(state)(name)).to.eql(expected)
     })
   })
 
@@ -67,7 +67,7 @@ describe('The users module', () => {
       }
       const id = '1'
       const expected = { screen_name: 'Guy', id: '1' }
-      expect(getters.userById(state)(id)).to.eql(expected)
+      expect(getters.findUser(state)(id)).to.eql(expected)
     })
   })
 })
-- 
cgit v1.2.3-70-g09d2


From f3a9200b7c17de04bbedf16cb1ac5d9681ab73f4 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Sat, 9 Mar 2019 02:47:20 +0200
Subject: some test fixes, disabled one test for now since logic now is even
 more async in general

---
 test/unit/specs/components/user_profile.spec.js |  3 ++-
 test/unit/specs/modules/users.spec.js           | 31 +++++++++----------------
 2 files changed, 13 insertions(+), 21 deletions(-)

(limited to 'test/unit/specs')

diff --git a/test/unit/specs/components/user_profile.spec.js b/test/unit/specs/components/user_profile.spec.js
index 1524c4eb..23e5ce20 100644
--- a/test/unit/specs/components/user_profile.spec.js
+++ b/test/unit/specs/components/user_profile.spec.js
@@ -160,7 +160,8 @@ const localProfileStore = new Vuex.Store({
   }
 })
 
-describe('UserProfile', () => {
+// It's a little bit more complicated now
+describe.skip('UserProfile', () => {
   it('renders external profile', () => {
     const wrapper = mount(UserProfile, {
       localVue,
diff --git a/test/unit/specs/modules/users.spec.js b/test/unit/specs/modules/users.spec.js
index dae7e580..a7f18dce 100644
--- a/test/unit/specs/modules/users.spec.js
+++ b/test/unit/specs/modules/users.spec.js
@@ -34,36 +34,27 @@ describe('The users module', () => {
     })
   })
 
-  describe('getUserByName', () => {
+  describe('findUser', () => {
     it('returns user with matching screen_name', () => {
+      const user = { screen_name: 'Guy', id: '1' }
       const state = {
-        users: [
-          { screen_name: 'Guy', id: '1' }
-        ]
+        usersObject: {
+          1: user,
+          Guy: user
+        }
       }
       const name = 'Guy'
       const expected = { screen_name: 'Guy', id: '1' }
       expect(getters.findUser(state)(name)).to.eql(expected)
     })
 
-    it('returns user with matching screen_name with different case', () => {
-      const state = {
-        users: [
-          { screen_name: 'guy', id: '1' }
-        ]
-      }
-      const name = 'Guy'
-      const expected = { screen_name: 'guy', id: '1' }
-      expect(getters.findUser(state)(name)).to.eql(expected)
-    })
-  })
-
-  describe('getUserById', () => {
     it('returns user with matching id', () => {
+      const user = { screen_name: 'Guy', id: '1' }
       const state = {
-        users: [
-          { screen_name: 'Guy', id: '1' }
-        ]
+        usersObject: {
+          1: user,
+          Guy: user
+        }
       }
       const id = '1'
       const expected = { screen_name: 'Guy', id: '1' }
-- 
cgit v1.2.3-70-g09d2


From 70d7ed36076081f22368bceaa42dd0548fd1c89a Mon Sep 17 00:00:00 2001
From: shpuld <shp@cock.li>
Date: Sun, 10 Mar 2019 22:40:48 +0200
Subject: Make minId reset with minVisibleId to prevent gaps when showing new

---
 src/modules/statuses.js                  |   1 +
 test/unit/specs/modules/statuses.spec.js | 418 ++++++++++++++++---------------
 2 files changed, 220 insertions(+), 199 deletions(-)

(limited to 'test/unit/specs')

diff --git a/src/modules/statuses.js b/src/modules/statuses.js
index 7571b62a..6b512fa3 100644
--- a/src/modules/statuses.js
+++ b/src/modules/statuses.js
@@ -333,6 +333,7 @@ export const mutations = {
     oldTimeline.newStatusCount = 0
     oldTimeline.visibleStatuses = slice(oldTimeline.statuses, 0, 50)
     oldTimeline.minVisibleId = last(oldTimeline.visibleStatuses).id
+    oldTimeline.minId = oldTimeline.minVisibleId
     oldTimeline.visibleStatusesObject = {}
     each(oldTimeline.visibleStatuses, (status) => { oldTimeline.visibleStatusesObject[status.id] = status })
   },
diff --git a/test/unit/specs/modules/statuses.spec.js b/test/unit/specs/modules/statuses.spec.js
index 864b798d..0bbcb25a 100644
--- a/test/unit/specs/modules/statuses.spec.js
+++ b/test/unit/specs/modules/statuses.spec.js
@@ -14,238 +14,258 @@ const makeMockStatus = ({id, text, type = 'status'}) => {
   }
 }
 
-describe('Statuses.prepareStatus', () => {
-  it('sets deleted flag to false', () => {
-    const aStatus = makeMockStatus({id: '1', text: 'Hello oniichan'})
-    expect(prepareStatus(aStatus).deleted).to.eq(false)
+describe('Statuses module', () => {
+  describe('prepareStatus', () => {
+    it('sets deleted flag to false', () => {
+      const aStatus = makeMockStatus({id: '1', text: 'Hello oniichan'})
+      expect(prepareStatus(aStatus).deleted).to.eq(false)
+    })
   })
-})
 
-describe('The Statuses module', () => {
-  it('adds the status to allStatuses and to the given timeline', () => {
-    const state = defaultState()
-    const status = makeMockStatus({id: '1'})
+  describe('addNewStatuses', () => {
+    it('adds the status to allStatuses and to the given timeline', () => {
+      const state = defaultState()
+      const status = makeMockStatus({id: '1'})
 
-    mutations.addNewStatuses(state, { statuses: [status], timeline: 'public' })
+      mutations.addNewStatuses(state, { statuses: [status], timeline: 'public' })
 
-    expect(state.allStatuses).to.eql([status])
-    expect(state.timelines.public.statuses).to.eql([status])
-    expect(state.timelines.public.visibleStatuses).to.eql([])
-    expect(state.timelines.public.newStatusCount).to.equal(1)
-  })
+      expect(state.allStatuses).to.eql([status])
+      expect(state.timelines.public.statuses).to.eql([status])
+      expect(state.timelines.public.visibleStatuses).to.eql([])
+      expect(state.timelines.public.newStatusCount).to.equal(1)
+    })
 
-  it('counts the status as new if it has not been seen on this timeline', () => {
-    const state = defaultState()
-    const status = makeMockStatus({id: '1'})
+    it('counts the status as new if it has not been seen on this timeline', () => {
+      const state = defaultState()
+      const status = makeMockStatus({id: '1'})
 
-    mutations.addNewStatuses(state, { statuses: [status], timeline: 'public' })
-    mutations.addNewStatuses(state, { statuses: [status], timeline: 'friends' })
+      mutations.addNewStatuses(state, { statuses: [status], timeline: 'public' })
+      mutations.addNewStatuses(state, { statuses: [status], timeline: 'friends' })
 
-    expect(state.allStatuses).to.eql([status])
-    expect(state.timelines.public.statuses).to.eql([status])
-    expect(state.timelines.public.visibleStatuses).to.eql([])
-    expect(state.timelines.public.newStatusCount).to.equal(1)
+      expect(state.allStatuses).to.eql([status])
+      expect(state.timelines.public.statuses).to.eql([status])
+      expect(state.timelines.public.visibleStatuses).to.eql([])
+      expect(state.timelines.public.newStatusCount).to.equal(1)
 
-    expect(state.allStatuses).to.eql([status])
-    expect(state.timelines.friends.statuses).to.eql([status])
-    expect(state.timelines.friends.visibleStatuses).to.eql([])
-    expect(state.timelines.friends.newStatusCount).to.equal(1)
-  })
+      expect(state.allStatuses).to.eql([status])
+      expect(state.timelines.friends.statuses).to.eql([status])
+      expect(state.timelines.friends.visibleStatuses).to.eql([])
+      expect(state.timelines.friends.newStatusCount).to.equal(1)
+    })
 
-  it('add the statuses to allStatuses if no timeline is given', () => {
-    const state = defaultState()
-    const status = makeMockStatus({id: '1'})
+    it('add the statuses to allStatuses if no timeline is given', () => {
+      const state = defaultState()
+      const status = makeMockStatus({id: '1'})
 
-    mutations.addNewStatuses(state, { statuses: [status] })
+      mutations.addNewStatuses(state, { statuses: [status] })
 
-    expect(state.allStatuses).to.eql([status])
-    expect(state.timelines.public.statuses).to.eql([])
-    expect(state.timelines.public.visibleStatuses).to.eql([])
-    expect(state.timelines.public.newStatusCount).to.equal(0)
-  })
+      expect(state.allStatuses).to.eql([status])
+      expect(state.timelines.public.statuses).to.eql([])
+      expect(state.timelines.public.visibleStatuses).to.eql([])
+      expect(state.timelines.public.newStatusCount).to.equal(0)
+    })
 
-  it('adds the status to allStatuses and to the given timeline, directly visible', () => {
-    const state = defaultState()
-    const status = makeMockStatus({id: '1'})
+    it('adds the status to allStatuses and to the given timeline, directly visible', () => {
+      const state = defaultState()
+      const status = makeMockStatus({id: '1'})
 
-    mutations.addNewStatuses(state, { statuses: [status], showImmediately: true, timeline: 'public' })
+      mutations.addNewStatuses(state, { statuses: [status], showImmediately: true, timeline: 'public' })
 
-    expect(state.allStatuses).to.eql([status])
-    expect(state.timelines.public.statuses).to.eql([status])
-    expect(state.timelines.public.visibleStatuses).to.eql([status])
-    expect(state.timelines.public.newStatusCount).to.equal(0)
-  })
+      expect(state.allStatuses).to.eql([status])
+      expect(state.timelines.public.statuses).to.eql([status])
+      expect(state.timelines.public.visibleStatuses).to.eql([status])
+      expect(state.timelines.public.newStatusCount).to.equal(0)
+    })
 
-  it('removes statuses by tag on deletion', () => {
-    const state = defaultState()
-    const status = makeMockStatus({id: '1'})
-    const otherStatus = makeMockStatus({id: '3'})
-    status.uri = 'xxx'
-    const deletion = makeMockStatus({id: '2', type: 'deletion'})
-    deletion.text = 'Dolus deleted notice {{tag:gs.smuglo.li,2016-11-18:noticeId=1038007:objectType=note}}.'
-    deletion.uri = 'xxx'
-
-    mutations.addNewStatuses(state, { statuses: [status, otherStatus], showImmediately: true, timeline: 'public' })
-    mutations.addNewStatuses(state, { statuses: [deletion], showImmediately: true, timeline: 'public' })
-
-    expect(state.allStatuses).to.eql([otherStatus])
-    expect(state.timelines.public.statuses).to.eql([otherStatus])
-    expect(state.timelines.public.visibleStatuses).to.eql([otherStatus])
-    expect(state.timelines.public.maxId).to.eql('3')
-  })
+    it('removes statuses by tag on deletion', () => {
+      const state = defaultState()
+      const status = makeMockStatus({id: '1'})
+      const otherStatus = makeMockStatus({id: '3'})
+      status.uri = 'xxx'
+      const deletion = makeMockStatus({id: '2', type: 'deletion'})
+      deletion.text = 'Dolus deleted notice {{tag:gs.smuglo.li,2016-11-18:noticeId=1038007:objectType=note}}.'
+      deletion.uri = 'xxx'
 
-  it('does not update the maxId when the noIdUpdate flag is set', () => {
-    const state = defaultState()
-    const status = makeMockStatus({id: '1'})
-    const secondStatus = makeMockStatus({id: '2'})
+      mutations.addNewStatuses(state, { statuses: [status, otherStatus], showImmediately: true, timeline: 'public' })
+      mutations.addNewStatuses(state, { statuses: [deletion], showImmediately: true, timeline: 'public' })
 
-    mutations.addNewStatuses(state, { statuses: [status], showImmediately: true, timeline: 'public' })
-    expect(state.timelines.public.maxId).to.eql('1')
+      expect(state.allStatuses).to.eql([otherStatus])
+      expect(state.timelines.public.statuses).to.eql([otherStatus])
+      expect(state.timelines.public.visibleStatuses).to.eql([otherStatus])
+      expect(state.timelines.public.maxId).to.eql('3')
+    })
 
-    mutations.addNewStatuses(state, { statuses: [secondStatus], showImmediately: true, timeline: 'public', noIdUpdate: true })
-    expect(state.timelines.public.statuses).to.eql([secondStatus, status])
-    expect(state.timelines.public.visibleStatuses).to.eql([secondStatus, status])
-    expect(state.timelines.public.maxId).to.eql('1')
-  })
+    it('does not update the maxId when the noIdUpdate flag is set', () => {
+      const state = defaultState()
+      const status = makeMockStatus({id: '1'})
+      const secondStatus = makeMockStatus({id: '2'})
 
-  it('keeps a descending by id order in timeline.visibleStatuses and timeline.statuses', () => {
-    const state = defaultState()
-    const nonVisibleStatus = makeMockStatus({id: '1'})
-    const status = makeMockStatus({id: '3'})
-    const statusTwo = makeMockStatus({id: '2'})
-    const statusThree = makeMockStatus({id: '4'})
+      mutations.addNewStatuses(state, { statuses: [status], showImmediately: true, timeline: 'public' })
+      expect(state.timelines.public.maxId).to.eql('1')
 
-    mutations.addNewStatuses(state, { statuses: [nonVisibleStatus], showImmediately: false, timeline: 'public' })
+      mutations.addNewStatuses(state, { statuses: [secondStatus], showImmediately: true, timeline: 'public', noIdUpdate: true })
+      expect(state.timelines.public.statuses).to.eql([secondStatus, status])
+      expect(state.timelines.public.visibleStatuses).to.eql([secondStatus, status])
+      expect(state.timelines.public.maxId).to.eql('1')
+    })
 
-    mutations.addNewStatuses(state, { statuses: [status], showImmediately: true, timeline: 'public' })
-    mutations.addNewStatuses(state, { statuses: [statusTwo], showImmediately: true, timeline: 'public' })
+    it('keeps a descending by id order in timeline.visibleStatuses and timeline.statuses', () => {
+      const state = defaultState()
+      const nonVisibleStatus = makeMockStatus({id: '1'})
+      const status = makeMockStatus({id: '3'})
+      const statusTwo = makeMockStatus({id: '2'})
+      const statusThree = makeMockStatus({id: '4'})
 
-    expect(state.timelines.public.minVisibleId).to.equal('2')
+      mutations.addNewStatuses(state, { statuses: [nonVisibleStatus], showImmediately: false, timeline: 'public' })
 
-    mutations.addNewStatuses(state, { statuses: [statusThree], showImmediately: true, timeline: 'public' })
+      mutations.addNewStatuses(state, { statuses: [status], showImmediately: true, timeline: 'public' })
+      mutations.addNewStatuses(state, { statuses: [statusTwo], showImmediately: true, timeline: 'public' })
 
-    expect(state.timelines.public.statuses).to.eql([statusThree, status, statusTwo, nonVisibleStatus])
-    expect(state.timelines.public.visibleStatuses).to.eql([statusThree, status, statusTwo])
-  })
+      expect(state.timelines.public.minVisibleId).to.equal('2')
 
-  it('splits retweets from their status and links them', () => {
-    const state = defaultState()
-    const status = makeMockStatus({id: '1'})
-    const retweet = makeMockStatus({id: '2', type: 'retweet'})
-    const modStatus = makeMockStatus({id: '1', text: 'something else'})
-
-    retweet.retweeted_status = status
-
-    // It adds both statuses, but only the retweet to visible.
-    mutations.addNewStatuses(state, { statuses: [retweet], timeline: 'public', showImmediately: true })
-    expect(state.timelines.public.visibleStatuses).to.have.length(1)
-    expect(state.timelines.public.statuses).to.have.length(1)
-    expect(state.allStatuses).to.have.length(2)
-    expect(state.allStatuses[0].id).to.equal('1')
-    expect(state.allStatuses[1].id).to.equal('2')
-
-    // It refers to the modified status.
-    mutations.addNewStatuses(state, { statuses: [modStatus], timeline: 'public' })
-    expect(state.allStatuses).to.have.length(2)
-    expect(state.allStatuses[0].id).to.equal('1')
-    expect(state.allStatuses[0].text).to.equal(modStatus.text)
-    expect(state.allStatuses[1].id).to.equal('2')
-    expect(retweet.retweeted_status.text).to.eql(modStatus.text)
-  })
+      mutations.addNewStatuses(state, { statuses: [statusThree], showImmediately: true, timeline: 'public' })
 
-  it('replaces existing statuses with the same id', () => {
-    const state = defaultState()
-    const status = makeMockStatus({id: '1'})
-    const modStatus = makeMockStatus({id: '1', text: 'something else'})
-
-    // Add original status
-    mutations.addNewStatuses(state, { statuses: [status], showImmediately: true, timeline: 'public' })
-    expect(state.timelines.public.visibleStatuses).to.have.length(1)
-    expect(state.allStatuses).to.have.length(1)
-
-    // Add new version of status
-    mutations.addNewStatuses(state, { statuses: [modStatus], showImmediately: true, timeline: 'public' })
-    expect(state.timelines.public.visibleStatuses).to.have.length(1)
-    expect(state.allStatuses).to.have.length(1)
-    expect(state.allStatuses[0].text).to.eql(modStatus.text)
-  })
+      expect(state.timelines.public.statuses).to.eql([statusThree, status, statusTwo, nonVisibleStatus])
+      expect(state.timelines.public.visibleStatuses).to.eql([statusThree, status, statusTwo])
+    })
 
-  it('replaces existing statuses with the same id, coming from a retweet', () => {
-    const state = defaultState()
-    const status = makeMockStatus({id: '1'})
-    const modStatus = makeMockStatus({id: '1', text: 'something else'})
-    const retweet = makeMockStatus({id: '2', type: 'retweet'})
-    retweet.retweeted_status = modStatus
-
-    // Add original status
-    mutations.addNewStatuses(state, { statuses: [status], showImmediately: true, timeline: 'public' })
-    expect(state.timelines.public.visibleStatuses).to.have.length(1)
-    expect(state.allStatuses).to.have.length(1)
-
-    // Add new version of status
-    mutations.addNewStatuses(state, { statuses: [retweet], showImmediately: false, timeline: 'public' })
-    expect(state.timelines.public.visibleStatuses).to.have.length(1)
-    // Don't add the retweet itself if the tweet is visible
-    expect(state.timelines.public.statuses).to.have.length(1)
-    expect(state.allStatuses).to.have.length(2)
-    expect(state.allStatuses[0].text).to.eql(modStatus.text)
+    it('splits retweets from their status and links them', () => {
+      const state = defaultState()
+      const status = makeMockStatus({id: '1'})
+      const retweet = makeMockStatus({id: '2', type: 'retweet'})
+      const modStatus = makeMockStatus({id: '1', text: 'something else'})
+
+      retweet.retweeted_status = status
+
+      // It adds both statuses, but only the retweet to visible.
+      mutations.addNewStatuses(state, { statuses: [retweet], timeline: 'public', showImmediately: true })
+      expect(state.timelines.public.visibleStatuses).to.have.length(1)
+      expect(state.timelines.public.statuses).to.have.length(1)
+      expect(state.allStatuses).to.have.length(2)
+      expect(state.allStatuses[0].id).to.equal('1')
+      expect(state.allStatuses[1].id).to.equal('2')
+
+      // It refers to the modified status.
+      mutations.addNewStatuses(state, { statuses: [modStatus], timeline: 'public' })
+      expect(state.allStatuses).to.have.length(2)
+      expect(state.allStatuses[0].id).to.equal('1')
+      expect(state.allStatuses[0].text).to.equal(modStatus.text)
+      expect(state.allStatuses[1].id).to.equal('2')
+      expect(retweet.retweeted_status.text).to.eql(modStatus.text)
+    })
+
+    it('replaces existing statuses with the same id', () => {
+      const state = defaultState()
+      const status = makeMockStatus({id: '1'})
+      const modStatus = makeMockStatus({id: '1', text: 'something else'})
+
+      // Add original status
+      mutations.addNewStatuses(state, { statuses: [status], showImmediately: true, timeline: 'public' })
+      expect(state.timelines.public.visibleStatuses).to.have.length(1)
+      expect(state.allStatuses).to.have.length(1)
+
+      // Add new version of status
+      mutations.addNewStatuses(state, { statuses: [modStatus], showImmediately: true, timeline: 'public' })
+      expect(state.timelines.public.visibleStatuses).to.have.length(1)
+      expect(state.allStatuses).to.have.length(1)
+      expect(state.allStatuses[0].text).to.eql(modStatus.text)
+    })
+
+    it('replaces existing statuses with the same id, coming from a retweet', () => {
+      const state = defaultState()
+      const status = makeMockStatus({id: '1'})
+      const modStatus = makeMockStatus({id: '1', text: 'something else'})
+      const retweet = makeMockStatus({id: '2', type: 'retweet'})
+      retweet.retweeted_status = modStatus
+
+      // Add original status
+      mutations.addNewStatuses(state, { statuses: [status], showImmediately: true, timeline: 'public' })
+      expect(state.timelines.public.visibleStatuses).to.have.length(1)
+      expect(state.allStatuses).to.have.length(1)
+
+      // Add new version of status
+      mutations.addNewStatuses(state, { statuses: [retweet], showImmediately: false, timeline: 'public' })
+      expect(state.timelines.public.visibleStatuses).to.have.length(1)
+      // Don't add the retweet itself if the tweet is visible
+      expect(state.timelines.public.statuses).to.have.length(1)
+      expect(state.allStatuses).to.have.length(2)
+      expect(state.allStatuses[0].text).to.eql(modStatus.text)
+    })
+
+    it('handles favorite actions', () => {
+      const state = defaultState()
+      const status = makeMockStatus({id: '1'})
+
+      const favorite = {
+        id: '2',
+        type: 'favorite',
+        in_reply_to_status_id: '1', // The API uses strings here...
+        uri: 'tag:shitposter.club,2016-08-21:fave:3895:note:773501:2016-08-21T16:52:15+00:00',
+        text: 'a favorited something by b',
+        user: { id: '99' }
+      }
+
+      mutations.addNewStatuses(state, { statuses: [status], showImmediately: true, timeline: 'public' })
+      mutations.addNewStatuses(state, { statuses: [favorite], showImmediately: true, timeline: 'public' })
+
+      expect(state.timelines.public.visibleStatuses.length).to.eql(1)
+      expect(state.timelines.public.visibleStatuses[0].fave_num).to.eql(1)
+      expect(state.timelines.public.maxId).to.eq(favorite.id)
+
+      // Adding it again does nothing
+      mutations.addNewStatuses(state, { statuses: [favorite], showImmediately: true, timeline: 'public' })
+
+      expect(state.timelines.public.visibleStatuses.length).to.eql(1)
+      expect(state.timelines.public.visibleStatuses[0].fave_num).to.eql(1)
+      expect(state.timelines.public.maxId).to.eq(favorite.id)
+
+      // If something is favorited by the current user, it also sets the 'favorited' property but does not increment counter to avoid over-counting. Counter is incremented (updated, really) via response to the favorite request.
+      const user = {
+        id: '1'
+      }
+
+      const ownFavorite = {
+        id: '3',
+        type: 'favorite',
+        in_reply_to_status_id: '1', // The API uses strings here...
+        uri: 'tag:shitposter.club,2016-08-21:fave:3895:note:773501:2016-08-21T16:52:15+00:00',
+        text: 'a favorited something by b',
+        user
+      }
+
+      mutations.addNewStatuses(state, { statuses: [ownFavorite], showImmediately: true, timeline: 'public', user })
+
+      expect(state.timelines.public.visibleStatuses.length).to.eql(1)
+      expect(state.timelines.public.visibleStatuses[0].fave_num).to.eql(1)
+      expect(state.timelines.public.visibleStatuses[0].favorited).to.eql(true)
+    })
   })
 
-  it('handles favorite actions', () => {
-    const state = defaultState()
-    const status = makeMockStatus({id: '1'})
-
-    const favorite = {
-      id: '2',
-      type: 'favorite',
-      in_reply_to_status_id: '1', // The API uses strings here...
-      uri: 'tag:shitposter.club,2016-08-21:fave:3895:note:773501:2016-08-21T16:52:15+00:00',
-      text: 'a favorited something by b',
-      user: { id: '99' }
-    }
-
-    mutations.addNewStatuses(state, { statuses: [status], showImmediately: true, timeline: 'public' })
-    mutations.addNewStatuses(state, { statuses: [favorite], showImmediately: true, timeline: 'public' })
-
-    expect(state.timelines.public.visibleStatuses.length).to.eql(1)
-    expect(state.timelines.public.visibleStatuses[0].fave_num).to.eql(1)
-    expect(state.timelines.public.maxId).to.eq(favorite.id)
-
-    // Adding it again does nothing
-    mutations.addNewStatuses(state, { statuses: [favorite], showImmediately: true, timeline: 'public' })
-
-    expect(state.timelines.public.visibleStatuses.length).to.eql(1)
-    expect(state.timelines.public.visibleStatuses[0].fave_num).to.eql(1)
-    expect(state.timelines.public.maxId).to.eq(favorite.id)
-
-    // If something is favorited by the current user, it also sets the 'favorited' property but does not increment counter to avoid over-counting. Counter is incremented (updated, really) via response to the favorite request.
-    const user = {
-      id: '1'
-    }
-
-    const ownFavorite = {
-      id: '3',
-      type: 'favorite',
-      in_reply_to_status_id: '1', // The API uses strings here...
-      uri: 'tag:shitposter.club,2016-08-21:fave:3895:note:773501:2016-08-21T16:52:15+00:00',
-      text: 'a favorited something by b',
-      user
-    }
-
-    mutations.addNewStatuses(state, { statuses: [ownFavorite], showImmediately: true, timeline: 'public', user })
-
-    expect(state.timelines.public.visibleStatuses.length).to.eql(1)
-    expect(state.timelines.public.visibleStatuses[0].fave_num).to.eql(1)
-    expect(state.timelines.public.visibleStatuses[0].favorited).to.eql(true)
+  describe('showNewStatuses', () => {
+    it('resets the minId to the min of the visible statuses when adding new to visible statuses', () => {
+      const state = defaultState()
+      const status = makeMockStatus({ id: '10' })
+      mutations.addNewStatuses(state, { statuses: [status], showImmediately: true, timeline: 'public' })
+      const newStatus = makeMockStatus({ id: '20' })
+      mutations.addNewStatuses(state, { statuses: [newStatus], showImmediately: false, timeline: 'public' })
+      state.timelines.public.minId = '5'
+      mutations.showNewStatuses(state, { timeline: 'public' })
+
+      expect(state.timelines.public.visibleStatuses.length).to.eql(2)
+      expect(state.timelines.public.minVisibleId).to.eql('10')
+      expect(state.timelines.public.minId).to.eql('10')
+    })
   })
 
-  it('keeps userId when clearing user timeline', () => {
-    const state = defaultState()
-    state.timelines.user.userId = 123
+  describe('clearTimeline', () => {
+    it('keeps userId when clearing user timeline', () => {
+      const state = defaultState()
+      state.timelines.user.userId = 123
 
-    mutations.clearTimeline(state, { timeline: 'user' })
+      mutations.clearTimeline(state, { timeline: 'user' })
 
-    expect(state.timelines.user.userId).to.eql(123)
+      expect(state.timelines.user.userId).to.eql(123)
+    })
   })
 
   describe('notifications', () => {
-- 
cgit v1.2.3-70-g09d2


From 06d39b62a8358c911b18f5acc378047035840465 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Mon, 11 Mar 2019 02:17:49 +0200
Subject: fixed tests, review fixes, now storing local users with downcase
 screen name for better compatibility

---
 src/components/user_profile/user_profile.js     |  7 ++++---
 src/modules/statuses.js                         |  2 +-
 src/modules/users.js                            |  4 ++--
 test/unit/specs/components/user_profile.spec.js | 14 ++++++++++----
 test/unit/specs/modules/users.spec.js           |  4 ++--
 5 files changed, 19 insertions(+), 12 deletions(-)

(limited to 'test/unit/specs')

diff --git a/src/components/user_profile/user_profile.js b/src/components/user_profile/user_profile.js
index 2d186bc5..a8dfce2f 100644
--- a/src/components/user_profile/user_profile.js
+++ b/src/components/user_profile/user_profile.js
@@ -68,7 +68,7 @@ const UserProfile = {
     },
     userInStore () {
       const routeParams = this.$route.params
-      return this.$store.getters.findUser(routeParams.name || routeParams.iid)
+      return this.$store.getters.findUser(routeParams.name || routeParams.id)
     },
     user () {
       if (this.timeline.statuses[0]) {
@@ -135,13 +135,14 @@ const UserProfile = {
     }
   },
   watch: {
-    userId (newVal, oldVal) {
+    // userId can be undefined if we don't know it yet
+    userId (newVal) {
       if (newVal) {
         this.cleanUp()
         this.startUp()
       }
     },
-    userName (newVal, oldVal) {
+    userName () {
       if (this.$route.params.name) {
         this.fetchUserId()
         this.cleanUp()
diff --git a/src/modules/statuses.js b/src/modules/statuses.js
index 2b0215f0..ea1b2de0 100644
--- a/src/modules/statuses.js
+++ b/src/modules/statuses.js
@@ -73,7 +73,7 @@ const mergeOrAdd = (arr, obj, item) => {
   if (oldItem) {
     // We already have this, so only merge the new info.
     // We ignore null values to avoid overwriting existing properties with missing data
-    // we also skip 'used' because that is handled by users module
+    // we also skip 'user' because that is handled by users module
     merge(oldItem, omitBy(item, (v, k) => v === null || k === 'user'))
     // Reactivity fix.
     oldItem.attachments.splice(oldItem.attachments.length)
diff --git a/src/modules/users.js b/src/modules/users.js
index e4146c31..5eabb1ec 100644
--- a/src/modules/users.js
+++ b/src/modules/users.js
@@ -18,7 +18,7 @@ export const mergeOrAdd = (arr, obj, item) => {
     arr.push(item)
     obj[item.id] = item
     if (item.screen_name && !item.screen_name.includes('@')) {
-      obj[item.screen_name] = item
+      obj[item.screen_name.toLowerCase()] = item
     }
     return { item, new: true }
   }
@@ -132,7 +132,7 @@ export const mutations = {
 }
 
 export const getters = {
-  findUser: state => query => state.usersObject[query]
+  findUser: state => query => state.usersObject[typeof query === 'string' ? query.toLowerCase() : query]
 }
 
 export const defaultState = {
diff --git a/test/unit/specs/components/user_profile.spec.js b/test/unit/specs/components/user_profile.spec.js
index 23e5ce20..847481f3 100644
--- a/test/unit/specs/components/user_profile.spec.js
+++ b/test/unit/specs/components/user_profile.spec.js
@@ -12,6 +12,11 @@ const mutations = {
   setError: () => {}
 }
 
+const actions = {
+  fetchUser: () => {},
+  fetchUserByScreenName: () => {}
+}
+
 const testGetters = {
   findUser: state => getters.findUser(state.users)
 }
@@ -30,6 +35,7 @@ const extUser = {
 
 const externalProfileStore = new Vuex.Store({
   mutations,
+  actions,
   getters: testGetters,
   state: {
     api: {
@@ -88,7 +94,7 @@ const externalProfileStore = new Vuex.Store({
       currentUser: {
         credentials: ''
       },
-      usersObject: [extUser],
+      usersObject: { 100: extUser },
       users: [extUser]
     }
   }
@@ -96,6 +102,7 @@ const externalProfileStore = new Vuex.Store({
 
 const localProfileStore = new Vuex.Store({
   mutations,
+  actions,
   getters: testGetters,
   state: {
     api: {
@@ -154,14 +161,13 @@ const localProfileStore = new Vuex.Store({
       currentUser: {
         credentials: ''
       },
-      usersObject: [localUser],
+      usersObject: { 100: localUser, 'testuser': localUser },
       users: [localUser]
     }
   }
 })
 
-// It's a little bit more complicated now
-describe.skip('UserProfile', () => {
+describe('UserProfile', () => {
   it('renders external profile', () => {
     const wrapper = mount(UserProfile, {
       localVue,
diff --git a/test/unit/specs/modules/users.spec.js b/test/unit/specs/modules/users.spec.js
index a7f18dce..c8bc0ae7 100644
--- a/test/unit/specs/modules/users.spec.js
+++ b/test/unit/specs/modules/users.spec.js
@@ -40,7 +40,7 @@ describe('The users module', () => {
       const state = {
         usersObject: {
           1: user,
-          Guy: user
+          guy: user
         }
       }
       const name = 'Guy'
@@ -53,7 +53,7 @@ describe('The users module', () => {
       const state = {
         usersObject: {
           1: user,
-          Guy: user
+          guy: user
         }
       }
       const id = '1'
-- 
cgit v1.2.3-70-g09d2


From 4efcda1b4137fa14659a586d4d8559dcdd0f479b Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Mon, 11 Mar 2019 22:41:08 +0200
Subject: Added some tests

---
 .../entity_normalizer/entity_normalizer.service.js |  2 +-
 .../entity_normalizer/entity_normalizer.spec.js    | 75 +++++++++++++++++++++-
 2 files changed, 75 insertions(+), 2 deletions(-)

(limited to 'test/unit/specs')

diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js
index 633bd3dc..b7e5711e 100644
--- a/src/services/entity_normalizer/entity_normalizer.service.js
+++ b/src/services/entity_normalizer/entity_normalizer.service.js
@@ -142,7 +142,7 @@ const parseAttachment = (data) => {
 
   return output
 }
-const addEmojis = (string, emojis) => {
+export const addEmojis = (string, emojis) => {
   return emojis.reduce((acc, emoji) => {
     return acc.replace(
       new RegExp(`:${emoji.shortcode}:`, 'g'),
diff --git a/test/unit/specs/services/entity_normalizer/entity_normalizer.spec.js b/test/unit/specs/services/entity_normalizer/entity_normalizer.spec.js
index 6245361c..2b0b0d6d 100644
--- a/test/unit/specs/services/entity_normalizer/entity_normalizer.spec.js
+++ b/test/unit/specs/services/entity_normalizer/entity_normalizer.spec.js
@@ -1,4 +1,4 @@
-import { parseStatus, parseUser, parseNotification } from '../../../../../src/services/entity_normalizer/entity_normalizer.service.js'
+import { parseStatus, parseUser, parseNotification, addEmojis } from '../../../../../src/services/entity_normalizer/entity_normalizer.service.js'
 import mastoapidata from '../../../../fixtures/mastoapi.json'
 import qvitterapidata from '../../../../fixtures/statuses.json'
 
@@ -143,6 +143,23 @@ const makeMockNotificationQvitter = (overrides = {}) => {
   }, overrides)
 }
 
+const makeMockEmojiMasto = (overrides = [{}]) => {
+  return [
+    Object.assign({
+      shortcode: 'image',
+      static_url: 'https://example.com/image.png',
+      url: 'https://example.com/image.png',
+      visible_in_picker: false
+    }, overrides[0]),
+    Object.assign({
+      shortcode: 'thinking',
+      static_url: 'https://example.com/think.png',
+      url: 'https://example.com/think.png',
+      visible_in_picker: false
+    }, overrides[1])
+  ]
+}
+
 parseNotification
 parseUser
 parseStatus
@@ -218,6 +235,22 @@ describe('API Entities normalizer', () => {
         expect(parsedRepeat).to.have.property('retweeted_status')
         expect(parsedRepeat).to.have.deep.property('retweeted_status.id', 'deadbeef')
       })
+
+      it('adds emojis to post content', () => {
+        const post = makeMockStatusMasto({ emojis: makeMockEmojiMasto(), content: 'Makes you think :thinking:' })
+
+        const parsedPost = parseStatus(post)
+
+        expect(parsedPost).to.have.property('statusnet_html').that.contains('<img')
+      })
+
+      it('adds emojis to subject line', () => {
+        const post = makeMockStatusMasto({ emojis: makeMockEmojiMasto(), spoiler_text: 'CW: 300 IQ :thinking:' })
+
+        const parsedPost = parseStatus(post)
+
+        expect(parsedPost).to.have.property('summary_html').that.contains('<img')
+      })
     })
   })
 
@@ -230,6 +263,22 @@ describe('API Entities normalizer', () => {
       expect(parseUser(local)).to.have.property('is_local', true)
       expect(parseUser(remote)).to.have.property('is_local', false)
     })
+
+    it('adds emojis to user name', () => {
+      const user = makeMockUserMasto({ emojis: makeMockEmojiMasto(), display_name: 'The :thinking: thinker' })
+
+      const parsedUser = parseUser(user)
+
+      expect(parsedUser).to.have.property('name_html').that.contains('<img')
+    })
+
+    it('adds emojis to user bio', () => {
+      const user = makeMockUserMasto({ emojis: makeMockEmojiMasto(), note: 'Hello i like to :thinking: a lot' })
+
+      const parsedUser = parseUser(user)
+
+      expect(parsedUser).to.have.property('description_html').that.contains('<img')
+    })
   })
 
   // We currently use QvitterAPI notifications only, and especially due to MastoAPI lacking is_seen, support for MastoAPI
@@ -267,4 +316,28 @@ describe('API Entities normalizer', () => {
       expect(parseNotification(notif)).to.have.deep.property('from_profile.id', 'spurdo')
     })
   })
+
+  describe('MastoAPI emoji adder', () => {
+    const emojis = makeMockEmojiMasto()
+    const imageHtml = '<img src="https://example.com/image.png" alt="image" class="emoji" />'
+          .replace(/"/g, '\'')
+    const thinkHtml = '<img src="https://example.com/think.png" alt="thinking" class="emoji" />'
+          .replace(/"/g, '\'')
+
+    it('correctly replaces shortcodes in supplied string', () => {
+      const result = addEmojis('This post has :image: emoji and :thinking: emoji', emojis)
+      expect(result).to.include(thinkHtml)
+      expect(result).to.include(imageHtml)
+    })
+
+    it('handles consecutive emojis correctly', () => {
+      const result = addEmojis('Lelel emoji spam :thinking::thinking::thinking::thinking:', emojis)
+      expect(result).to.include(thinkHtml + thinkHtml + thinkHtml + thinkHtml)
+    })
+
+    it('Doesn\'t replace nonexistent emojis', () => {
+      const result = addEmojis('Admin add the :tenshi: emoji', emojis)
+      expect(result).to.equal('Admin add the :tenshi: emoji')
+    })
+  })
 })
-- 
cgit v1.2.3-70-g09d2


From c50e64f8eecd780246e3ac47c2a54164cfc28b8f Mon Sep 17 00:00:00 2001
From: shpuld <shp@cock.li>
Date: Tue, 26 Mar 2019 22:11:45 +0200
Subject: Add tests for gesture service, fix bug with perpendicular directions

---
 src/services/gesture_service/gesture_service.js    |  15 +--
 .../gesture_service/gesture_service.spec.js        | 120 +++++++++++++++++++++
 2 files changed, 129 insertions(+), 6 deletions(-)
 create mode 100644 test/unit/specs/services/gesture_service/gesture_service.spec.js

(limited to 'test/unit/specs')

diff --git a/src/services/gesture_service/gesture_service.js b/src/services/gesture_service/gesture_service.js
index 2e39003c..efc0ca78 100644
--- a/src/services/gesture_service/gesture_service.js
+++ b/src/services/gesture_service/gesture_service.js
@@ -10,11 +10,14 @@ const touchEventCoord = e => ([e.touches[0].screenX, e.touches[0].screenY])
 
 const vectorLength = v => Math.sqrt(v[0] * v[0] + v[1] * v[1])
 
-const perpendicular = v => [v[1], v[0]]
+const perpendicular = v => [v[1], -v[0]]
 
 const dotProduct = (v1, v2) => v1[0] * v2[0] + v1[1] * v2[1]
 
-const vectorFlatten = (v1, v2) => [v1[0] * v2[0], v1[1] * v2[1]]
+const project = (v1, v2) => {
+  const scalar = (dotProduct(v1, v2) / dotProduct(v2, v2))
+  return [scalar * v2[0], scalar * v2[1]]
+}
 
 // direction: either use the constants above or an arbitrary 2d vector.
 // threshold: how many Px to move from touch origin before checking if the
@@ -46,12 +49,12 @@ const updateSwipe = (event, gesture) => {
   // movement is opposite from direction
   if (dotProduct(delta, gesture.direction) < 0) return
   // movement perpendicular to direction is too much
-  const towardsDir = vectorFlatten(gesture.direction, delta)
+  const towardsDir = project(delta, gesture.direction)
   const perpendicularDir = perpendicular(gesture.direction)
-  const towardsPerpendicular = vectorFlatten(perpendicularDir, delta)
+  const towardsPerpendicular = project(delta, perpendicularDir)
   if (
-    vectorLength(towardsDir) <
-    gesture.perpendicularTolerance * vectorLength(towardsPerpendicular)
+    vectorLength(towardsDir) * gesture.perpendicularTolerance <
+    vectorLength(towardsPerpendicular)
   ) return
 
   gesture.onSwipe()
diff --git a/test/unit/specs/services/gesture_service/gesture_service.spec.js b/test/unit/specs/services/gesture_service/gesture_service.spec.js
new file mode 100644
index 00000000..4a1b009a
--- /dev/null
+++ b/test/unit/specs/services/gesture_service/gesture_service.spec.js
@@ -0,0 +1,120 @@
+import GestureService from 'src/services/gesture_service/gesture_service.js'
+
+const mockTouchEvent = (x, y) => ({
+  touches: [
+    {
+      screenX: x,
+      screenY: y
+    }
+  ]
+})
+
+describe.only('GestureService', () => {
+  describe('swipeGesture', () => {
+    it('calls the callback on a successful swipe', () => {
+      let swiped = false
+      const callback = () => { swiped = true }
+      const gesture = GestureService.swipeGesture(
+        GestureService.DIRECTION_RIGHT,
+        callback
+      )
+
+      GestureService.beginSwipe(mockTouchEvent(100, 100), gesture)
+      GestureService.updateSwipe(mockTouchEvent(200, 100), gesture)
+
+      expect(swiped).to.eql(true)
+    })
+
+    it('calls the callback only once per begin', () => {
+      let hits = 0
+      const callback = () => { hits += 1 }
+      const gesture = GestureService.swipeGesture(
+        GestureService.DIRECTION_RIGHT,
+        callback
+      )
+
+      GestureService.beginSwipe(mockTouchEvent(100, 100), gesture)
+      GestureService.updateSwipe(mockTouchEvent(150, 100), gesture)
+      GestureService.updateSwipe(mockTouchEvent(200, 100), gesture)
+
+      expect(hits).to.eql(1)
+    })
+
+    it('doesn\'t call the callback on an opposite swipe', () => {
+      let swiped = false
+      const callback = () => { swiped = true }
+      const gesture = GestureService.swipeGesture(
+        GestureService.DIRECTION_RIGHT,
+        callback
+      )
+
+      GestureService.beginSwipe(mockTouchEvent(100, 100), gesture)
+      GestureService.updateSwipe(mockTouchEvent(0, 100), gesture)
+
+      expect(swiped).to.eql(false)
+    })
+
+    it('doesn\'t call the callback on a swipe below threshold', () => {
+      let swiped = false
+      const callback = () => { swiped = true }
+      const gesture = GestureService.swipeGesture(
+        GestureService.DIRECTION_RIGHT,
+        callback,
+        100
+      )
+
+      GestureService.beginSwipe(mockTouchEvent(100, 100), gesture)
+      GestureService.updateSwipe(mockTouchEvent(150, 100), gesture)
+
+      expect(swiped).to.eql(false)
+    })
+
+    it('doesn\'t call the callback on a perpendicular swipe', () => {
+      let swiped = false
+      const callback = () => { swiped = true }
+      const gesture = GestureService.swipeGesture(
+        GestureService.DIRECTION_RIGHT,
+        callback,
+        30,
+        0.5
+      )
+
+      GestureService.beginSwipe(mockTouchEvent(100, 100), gesture)
+      GestureService.updateSwipe(mockTouchEvent(150, 200), gesture)
+
+      expect(swiped).to.eql(false)
+    })
+
+    it('calls the callback on perpendicular swipe if within tolerance', () => {
+      let swiped = false
+      const callback = () => { swiped = true }
+      const gesture = GestureService.swipeGesture(
+        GestureService.DIRECTION_RIGHT,
+        callback,
+        30,
+        2.0
+      )
+
+      GestureService.beginSwipe(mockTouchEvent(100, 100), gesture)
+      GestureService.updateSwipe(mockTouchEvent(150, 150), gesture)
+
+      expect(swiped).to.eql(true)
+    })
+
+    it('works with any arbitrary 2d directions', () => {
+      let swiped = false
+      const callback = () => { swiped = true }
+      const gesture = GestureService.swipeGesture(
+        [-1, -1],
+        callback,
+        30,
+        0.1
+      )
+
+      GestureService.beginSwipe(mockTouchEvent(100, 100), gesture)
+      GestureService.updateSwipe(mockTouchEvent(60, 60), gesture)
+
+      expect(swiped).to.eql(true)
+    })
+  })
+})
-- 
cgit v1.2.3-70-g09d2