From affbe8700ec85cf39afd4c4cdf978a9a579e57c7 Mon Sep 17 00:00:00 2001
From: dave <starpumadev@gmail.com>
Date: Thu, 4 Apr 2019 11:27:02 -0400
Subject: #468 - integrate endpoints

---
 src/services/api/api.service.js                      | 20 ++++++++++++++++++++
 .../backend_interactor_service.js                    | 10 ++++++++++
 2 files changed, 30 insertions(+)

(limited to 'src')

diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js
index b7a602b8..65cebe78 100644
--- a/src/services/api/api.service.js
+++ b/src/services/api/api.service.js
@@ -51,6 +51,8 @@ const MASTODON_STATUS_FAVORITEDBY_URL = id => `/api/v1/statuses/${id}/favourited
 const MASTODON_STATUS_REBLOGGEDBY_URL = id => `/api/v1/statuses/${id}/reblogged_by`
 const MASTODON_PROFILE_UPDATE_URL = '/api/v1/accounts/update_credentials'
 const MASTODON_REPORT_USER_URL = '/api/v1/reports'
+const MASTODON_PIN_OWN_STATUS = id => `/api/v1/statuses/${id}/pin`
+const MASTODON_UNPIN_OWN_STATUS = id => `/api/v1/statuses/${id}/unpin`
 
 import { each, map, concat, last } from 'lodash'
 import { parseStatus, parseUser, parseNotification, parseAttachment } from '../entity_normalizer/entity_normalizer.service.js'
@@ -210,6 +212,22 @@ const unfollowUser = ({id, credentials}) => {
   }).then((data) => data.json())
 }
 
+const pinOwnStatus = ({ id, credentials }) => {
+  let url = MASTODON_PIN_OWN_STATUS(id)
+  return fetch(url, {
+    headers: authHeaders(credentials),
+    method: 'POST'
+  }).then((data) => data.json())
+}
+
+const unpinOwnStatus = ({ id, credentials }) => {
+  let url = MASTODON_UNPIN_OWN_STATUS(id)
+  return fetch(url, {
+    headers: authHeaders(credentials),
+    method: 'POST'
+  }).then((data) => data.json())
+}
+
 const blockUser = ({id, credentials}) => {
   return fetch(MASTODON_BLOCK_USER_URL(id), {
     headers: authHeaders(credentials),
@@ -715,6 +733,8 @@ const apiService = {
   fetchFollowers,
   followUser,
   unfollowUser,
+  pinOwnStatus,
+  unpinOwnStatus,
   blockUser,
   unblockUser,
   fetchUser,
diff --git a/src/services/backend_interactor_service/backend_interactor_service.js b/src/services/backend_interactor_service/backend_interactor_service.js
index c2b93de4..816e73c1 100644
--- a/src/services/backend_interactor_service/backend_interactor_service.js
+++ b/src/services/backend_interactor_service/backend_interactor_service.js
@@ -43,6 +43,14 @@ const backendInteractorService = (credentials) => {
     return apiService.unfollowUser({credentials, id})
   }
 
+  const pinOwnStatus = (id) => {
+    return apiService.pinOwnStatus({credentials, id})
+  }
+
+  const unpinOwnStatus = (id) => {
+    return apiService.unpinOwnStatus({ credentials, id })
+  }
+
   const blockUser = (id) => {
     return apiService.blockUser({credentials, id})
   }
@@ -130,6 +138,8 @@ const backendInteractorService = (credentials) => {
     fetchFollowers,
     followUser,
     unfollowUser,
+    pinOwnStatus,
+    unpinOwnStatus,
     blockUser,
     unblockUser,
     fetchUser,
-- 
cgit v1.2.3-70-g09d2


From 1aa0e8d7e026267aa2af82fbd18cf7521ad842e9 Mon Sep 17 00:00:00 2001
From: dave <starpumadev@gmail.com>
Date: Thu, 4 Apr 2019 12:47:25 -0400
Subject: #468 - pin/unpin status

---
 src/components/status/status.js                    | 10 ++++++++++
 src/components/status/status.vue                   | 22 ++++++++++++++++------
 src/modules/statuses.js                            |  7 +++++++
 .../entity_normalizer/entity_normalizer.service.js |  1 +
 4 files changed, 34 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/components/status/status.js b/src/components/status/status.js
index c01cfe79..c52e026a 100644
--- a/src/components/status/status.js
+++ b/src/components/status/status.js
@@ -353,6 +353,16 @@ const Status = {
         this.expandingSubject = true
       }
     },
+    pinStatus () {
+      this.$store.state.api.backendInteractor.pinOwnStatus(this.status.id).then((status) => {
+        this.$store.dispatch('updatePinned', status)
+      })
+    },
+    unpinStatus () {
+      this.$store.state.api.backendInteractor.unpinOwnStatus(this.status.id).then((status) => {
+        this.$store.dispatch('updatePinned', status)
+      })
+    },
     replyEnter (id, event) {
       this.showPreview = true
       const targetId = id
diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index 21077972..0a2562c0 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -52,12 +52,18 @@
                 <a :href="status.external_url" target="_blank" v-if="!status.is_local && !isPreview" class="source_url" title="Source">
                   <i class="button-icon icon-link-ext-alt"></i>
                 </a>
-                <template v-if="expandable && !isPreview">
-                  <a href="#" @click.prevent="toggleExpanded" title="Expand">
-                    <i class="button-icon icon-plus-squared"></i>
-                  </a>
-                </template>
-                <a href="#" @click.prevent="toggleMute" v-if="unmuted"><i class="button-icon icon-eye-off"></i></a>
+                <div class="button-icon button-action-icon" v-if="!status.pinned" @click.prevent="pinStatus" title="Pin">
+                  <i class="fa icon-pin"></i>
+                </div>
+                <div class="button-icon button-action-icon" v-else @click.prevent="unpinStatus" title="Unpin">
+                  <i class="fa icon-cancel"></i>
+                </div>
+                <div class="button-icon button-action-icon" v-if="expandable && !isPreview" @click.prevent="toggleExpanded" title="Expand">
+                  <i class="button-icon icon-plus-squared"></i>
+                </div>
+                <div class="button-icon button-action-icon" v-if="unmuted" @click.prevent="toggleMute" title="Toggle Mute">
+                  <i class="button-icon icon-eye-off"></i>
+                </div>
               </span>
             </div>
 
@@ -678,6 +684,10 @@ a.unmute {
   }
 }
 
+.button-action-icon {
+  cursor: pointer;
+}
+
 @media all and (max-width: 800px) {
   .status-el {
     .retweet-info {
diff --git a/src/modules/statuses.js b/src/modules/statuses.js
index 4c92d4e1..176e5f42 100644
--- a/src/modules/statuses.js
+++ b/src/modules/statuses.js
@@ -424,6 +424,10 @@ export const mutations = {
       newStatus.favoritedBy.push(user)
     }
   },
+  setPinned (state, { status }) {
+    const newStatus = state.allStatusesObject[status.id]
+    newStatus.pinned = status.pinned
+  },
   setRetweeted (state, { status, value }) {
     const newStatus = state.allStatusesObject[status.id]
 
@@ -533,6 +537,9 @@ const statuses = {
       rootState.api.backendInteractor.unfavorite(status.id)
         .then(status => commit('setFavoritedConfirm', { status, user: rootState.users.currentUser }))
     },
+    updatePinned ({ rootState, commit }, status) {
+      commit('setPinned', { status })
+    },
     retweet ({ rootState, commit }, status) {
       // Optimistic retweeting...
       commit('setRetweeted', { status, value: true })
diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js
index 7a8708d5..97e20b99 100644
--- a/src/services/entity_normalizer/entity_normalizer.service.js
+++ b/src/services/entity_normalizer/entity_normalizer.service.js
@@ -211,6 +211,7 @@ export const parseStatus = (data) => {
 
     output.summary_html = addEmojis(data.spoiler_text, data.emojis)
     output.external_url = data.url
+    output.pinned = data.pinned
   } else {
     output.favorited = data.favorited
     output.fave_num = data.fave_num
-- 
cgit v1.2.3-70-g09d2


From e28b19645aa6a546f8d1980fa479f20d3c48ff36 Mon Sep 17 00:00:00 2001
From: dave <starpumadev@gmail.com>
Date: Thu, 4 Apr 2019 12:56:13 -0400
Subject: #468 - show pin for own statuses only

---
 src/components/status/status.js  | 3 +++
 src/components/status/status.vue | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/components/status/status.js b/src/components/status/status.js
index c52e026a..a3596b69 100644
--- a/src/components/status/status.js
+++ b/src/components/status/status.js
@@ -269,6 +269,9 @@ const Status = {
         this.statusFromGlobalRepository.rebloggedBy
       )
       return uniqBy(combinedUsers, 'id')
+    },
+    ownStatus () {
+      return this.status.user.id === this.$store.state.users.currentUser.id
     }
   },
   components: {
diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index 0a2562c0..0443e758 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -52,10 +52,10 @@
                 <a :href="status.external_url" target="_blank" v-if="!status.is_local && !isPreview" class="source_url" title="Source">
                   <i class="button-icon icon-link-ext-alt"></i>
                 </a>
-                <div class="button-icon button-action-icon" v-if="!status.pinned" @click.prevent="pinStatus" title="Pin">
+                <div class="button-icon button-action-icon" v-if="!status.pinned && ownStatus" @click.prevent="pinStatus" title="Pin">
                   <i class="fa icon-pin"></i>
                 </div>
-                <div class="button-icon button-action-icon" v-else @click.prevent="unpinStatus" title="Unpin">
+                <div class="button-icon button-action-icon" v-if="status.pinned && ownStatus" @click.prevent="unpinStatus" title="Unpin">
                   <i class="fa icon-cancel"></i>
                 </div>
                 <div class="button-icon button-action-icon" v-if="expandable && !isPreview" @click.prevent="toggleExpanded" title="Expand">
-- 
cgit v1.2.3-70-g09d2


From 2c89d49a3d22ed2813a6a57fb6049341fa8624ba Mon Sep 17 00:00:00 2001
From: dave <starpumadev@gmail.com>
Date: Thu, 4 Apr 2019 15:10:34 -0400
Subject: #468 - show pinned timeline and add pinned label to the status

---
 src/components/conversation/conversation.js        |  3 ++-
 src/components/conversation/conversation.vue       |  1 +
 src/components/status/status.js                    |  3 ++-
 src/components/status/status.vue                   | 17 ++++++++++---
 src/components/timeline/timeline.js                |  3 ++-
 src/components/timeline/timeline.vue               |  3 ++-
 src/components/user_profile/user_profile.js        |  5 ++++
 src/components/user_profile/user_profile.vue       | 29 ++++++++++++++--------
 src/modules/statuses.js                            |  3 ++-
 src/services/api/api.service.js                    | 14 +++++++++++
 .../timeline_fetcher/timeline_fetcher.service.js   |  6 +++++
 11 files changed, 69 insertions(+), 18 deletions(-)

(limited to 'src')

diff --git a/src/components/conversation/conversation.js b/src/components/conversation/conversation.js
index ffeb7244..fc239ee9 100644
--- a/src/components/conversation/conversation.js
+++ b/src/components/conversation/conversation.js
@@ -41,7 +41,8 @@ const conversation = {
   props: [
     'statusoid',
     'collapsable',
-    'isPage'
+    'isPage',
+    'pinned'
   ],
   created () {
     if (this.isPage) {
diff --git a/src/components/conversation/conversation.vue b/src/components/conversation/conversation.vue
index d04ff722..40011113 100644
--- a/src/components/conversation/conversation.vue
+++ b/src/components/conversation/conversation.vue
@@ -13,6 +13,7 @@
       :key="status.id"
       :inlineExpanded="collapsable && isExpanded"
       :statusoid="status"
+      :pinned="pinned"
       :expandable='!isExpanded'
       :focused="focused(status.id)"
       :inConversation="isExpanded"
diff --git a/src/components/status/status.js b/src/components/status/status.js
index a3596b69..f2881742 100644
--- a/src/components/status/status.js
+++ b/src/components/status/status.js
@@ -26,7 +26,8 @@ const Status = {
     'replies',
     'isPreview',
     'noHeading',
-    'inlineExpanded'
+    'inlineExpanded',
+    'pinned'
   ],
   data () {
     return {
diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index 0443e758..a5614f59 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -12,6 +12,13 @@
       </div>
     </template>
     <template v-else>
+      <div v-if="pinned" class="status-pin">
+        <i class="fa icon-pin faint"></i>
+        <span class="faint">Pinned</span>
+        <div class="button-icon button-action-icon" v-if="status.pinned && ownStatus" @click.prevent="unpinStatus" title="Unpin">
+          <i class="fa icon-cancel"></i>
+        </div>
+      </div>
       <div v-if="retweet && !noHeading && !inConversation" :class="[repeaterClass, { highlighted: repeaterStyle }]" :style="[repeaterStyle]" class="media container retweet-info">
         <UserAvatar class="media-left" v-if="retweet" :betterShadow="betterShadow" :user="statusoid.user"/>
         <div class="media-body faint">
@@ -55,9 +62,6 @@
                 <div class="button-icon button-action-icon" v-if="!status.pinned && ownStatus" @click.prevent="pinStatus" title="Pin">
                   <i class="fa icon-pin"></i>
                 </div>
-                <div class="button-icon button-action-icon" v-if="status.pinned && ownStatus" @click.prevent="unpinStatus" title="Unpin">
-                  <i class="fa icon-cancel"></i>
-                </div>
                 <div class="button-icon button-action-icon" v-if="expandable && !isPreview" @click.prevent="toggleExpanded" title="Expand">
                   <i class="button-icon icon-plus-squared"></i>
                 </div>
@@ -205,6 +209,13 @@ $status-margin: 0.75em;
   max-width: 100%;
 }
 
+.status-pin {
+  padding: 0.75em 0.75em 0;
+  display: flex;
+  align-items: center;
+  justify-content: flex-end;
+}
+
 .status-preview {
   position: absolute;
   max-width: 95%;
diff --git a/src/components/timeline/timeline.js b/src/components/timeline/timeline.js
index 19d9a9ac..953b4a06 100644
--- a/src/components/timeline/timeline.js
+++ b/src/components/timeline/timeline.js
@@ -11,7 +11,8 @@ const Timeline = {
     'userId',
     'tag',
     'embedded',
-    'count'
+    'count',
+    'noLoadMore'
   ],
   data () {
     return {
diff --git a/src/components/timeline/timeline.vue b/src/components/timeline/timeline.vue
index e6a8d458..870fe4f5 100644
--- a/src/components/timeline/timeline.vue
+++ b/src/components/timeline/timeline.vue
@@ -21,11 +21,12 @@
           class="status-fadein"
           :key="status.id"
           :statusoid="status"
+          :pinned="timelineName === 'pinned'"
           :collapsable="true"
         />
       </div>
     </div>
-    <div :class="classes.footer">
+    <div :class="classes.footer" v-if="!noLoadMore">
       <div v-if="count===0" class="new-status-notification text-center panel-footer faint">
         {{$t('timeline.no_statuses')}}
       </div>
diff --git a/src/components/user_profile/user_profile.js b/src/components/user_profile/user_profile.js
index 4eddb8b1..71a88dcf 100644
--- a/src/components/user_profile/user_profile.js
+++ b/src/components/user_profile/user_profile.js
@@ -40,6 +40,9 @@ const UserProfile = {
     timeline () {
       return this.$store.state.statuses.timelines.user
     },
+    pinned () {
+      return this.$store.state.statuses.timelines.pinned
+    },
     favorites () {
       return this.$store.state.statuses.timelines.favorites
     },
@@ -91,6 +94,7 @@ const UserProfile = {
     fetchTimelines () {
       const userId = this.userId
       this.$store.dispatch('startFetchingTimeline', { timeline: 'user', userId })
+      this.$store.dispatch('startFetchingTimeline', { timeline: 'pinned', userId })
       this.$store.dispatch('startFetchingTimeline', { timeline: 'media', userId })
       if (this.isUs) {
         this.$store.dispatch('startFetchingTimeline', { timeline: 'favorites', userId })
@@ -98,6 +102,7 @@ const UserProfile = {
     },
     cleanUp () {
       this.$store.dispatch('stopFetching', 'user')
+      this.$store.dispatch('stopFetching', 'pinned')
       this.$store.dispatch('stopFetching', 'favorites')
       this.$store.dispatch('stopFetching', 'media')
       this.$store.commit('clearTimeline', { timeline: 'user' })
diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue
index 71c625b7..caf297c6 100644
--- a/src/components/user_profile/user_profile.vue
+++ b/src/components/user_profile/user_profile.vue
@@ -3,16 +3,25 @@
   <div v-if="user" class="user-profile panel panel-default">
     <UserCard :user="user" :switcher="true" :selected="timeline.viewing" rounded="top"/>
     <tab-switcher :renderOnlyFocused="true" ref="tabSwitcher">
-      <Timeline
-        :label="$t('user_card.statuses')"
-        :disabled="!user.statuses_count"
-        :count="user.statuses_count"
-        :embedded="true"
-        :title="$t('user_profile.timeline_title')"
-        :timeline="timeline"
-        :timeline-name="'user'"
-        :user-id="userId"
-      />
+      <div :label="$t('user_card.statuses')" :disabled="!user.statuses_count">
+        <Timeline
+          :count="user.statuses_count"
+          :embedded="true"
+          :title="$t('user_profile.timeline_title')"
+          :timeline="pinned"
+          :timeline-name="'pinned'"
+          :user-id="userId"
+          :no-load-more="true"
+        />
+        <Timeline
+          :count="user.statuses_count"
+          :embedded="true"
+          :title="$t('user_profile.timeline_title')"
+          :timeline="timeline"
+          :timeline-name="'user'"
+          :user-id="userId"
+        />
+      </div>
       <div :label="$t('user_card.followees')" v-if="followsTabVisible" :disabled="!user.friends_count">
         <FriendList :userId="userId">
           <template slot="item" slot-scope="{item}">
diff --git a/src/modules/statuses.js b/src/modules/statuses.js
index 176e5f42..94d7f30b 100644
--- a/src/modules/statuses.js
+++ b/src/modules/statuses.js
@@ -47,7 +47,8 @@ export const defaultState = () => ({
     publicAndExternal: emptyTl(),
     friends: emptyTl(),
     tag: emptyTl(),
-    dms: emptyTl()
+    dms: emptyTl(),
+    pinned: emptyTl()
   }
 })
 
diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js
index 65cebe78..03137d20 100644
--- a/src/services/api/api.service.js
+++ b/src/services/api/api.service.js
@@ -506,6 +506,19 @@ const fetchTimeline = ({timeline, credentials, since = false, until = false, use
     .then((data) => data.map(isNotifications ? parseNotification : parseStatus))
 }
 
+const fetchPinnedStatuses = ({ id, credentials }) => {
+  const url = MASTODON_USER_TIMELINE_URL(id) + '?pinned=true'
+  return fetch(url, { headers: authHeaders(credentials) })
+    .then((data) => {
+      if (data.ok) {
+        return data
+      }
+      throw new Error('Error fetching pinned timeline', data)
+    })
+    .then((data) => data.json())
+    .then((data) => data.map(parseStatus))
+}
+
 const verifyCredentials = (user) => {
   return fetch(LOGIN_URL, {
     method: 'POST',
@@ -726,6 +739,7 @@ const reportUser = ({credentials, userId, statusIds, comment, forward}) => {
 const apiService = {
   verifyCredentials,
   fetchTimeline,
+  fetchPinnedStatuses,
   fetchConversation,
   fetchStatus,
   fetchFriends,
diff --git a/src/services/timeline_fetcher/timeline_fetcher.service.js b/src/services/timeline_fetcher/timeline_fetcher.service.js
index 8e954cdf..e8d9a2ed 100644
--- a/src/services/timeline_fetcher/timeline_fetcher.service.js
+++ b/src/services/timeline_fetcher/timeline_fetcher.service.js
@@ -16,6 +16,12 @@ const update = ({store, statuses, timeline, showImmediately, userId}) => {
 }
 
 const fetchAndUpdate = ({store, credentials, timeline = 'friends', older = false, showImmediately = false, userId = false, tag = false, until}) => {
+  if (timeline === 'pinned') {
+    return apiService.fetchPinnedStatuses({ id: userId, credentials })
+      .then(statuses => {
+        update({ store, statuses, timeline, showImmediately, userId })
+      })
+  }
   const args = { timeline, credentials }
   const rootState = store.rootState || store.state
   const timelineData = rootState.statuses.timelines[camelCase(timeline)]
-- 
cgit v1.2.3-70-g09d2


From f1ff48ffd6a38aca585762c061900fb36affde00 Mon Sep 17 00:00:00 2001
From: dave <starpumadev@gmail.com>
Date: Fri, 5 Apr 2019 15:33:55 -0400
Subject: #468 - remove unpinned status from timeline

---
 src/modules/statuses.js | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/modules/statuses.js b/src/modules/statuses.js
index 94d7f30b..649cb83c 100644
--- a/src/modules/statuses.js
+++ b/src/modules/statuses.js
@@ -365,11 +365,22 @@ const addNewNotifications = (state, { dispatch, notifications, older, visibleNot
   })
 }
 
-const removeStatus = (state, { timeline, userId }) => {
+const removeStatus = (state, { timeline, userId, statusId }) => {
   const timelineObject = state.timelines[timeline]
+  let removed = false
   if (userId) {
     remove(timelineObject.statuses, { user: { id: userId } })
     remove(timelineObject.visibleStatuses, { user: { id: userId } })
+    removed = true
+  } else if (statusId) {
+    remove(timelineObject.statuses, { id: statusId })
+    remove(timelineObject.visibleStatuses, { id: statusId })
+    removed = true
+    delete timelineObject.statusesObject[statusId]
+    delete timelineObject.visibleStatusesObject[statusId]
+  }
+
+  if (removed) {
     timelineObject.minVisibleId = timelineObject.visibleStatuses.length > 0 ? last(timelineObject.visibleStatuses).id : 0
     timelineObject.maxId = timelineObject.statuses.length > 0 ? first(timelineObject.statuses).id : 0
   }
@@ -540,6 +551,9 @@ const statuses = {
     },
     updatePinned ({ rootState, commit }, status) {
       commit('setPinned', { status })
+      if (!status.pinned) {
+        commit('removeStatus', { timeline: 'pinned', statusId: status.id })
+      }
     },
     retweet ({ rootState, commit }, status) {
       // Optimistic retweeting...
-- 
cgit v1.2.3-70-g09d2


From df207593e9ff4826adf0cf25d01b1471b2e0834c Mon Sep 17 00:00:00 2001
From: dave <starpumadev@gmail.com>
Date: Sun, 7 Apr 2019 11:30:14 -0400
Subject: #468 - update pinned status after actions(remove, add)

---
 src/components/status/status.vue |  2 +-
 src/modules/statuses.js          | 15 +++++++++++++--
 2 files changed, 14 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index a5614f59..ca5e4a1c 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -105,7 +105,7 @@
               v-if="preview"
               :isPreview="true"
               :statusoid="preview"
-              :compact=true
+              :compact="true"
             />
             <div v-else class="status-preview status-preview-loading">
               <i class="icon-spin4 animate-spin"></i>
diff --git a/src/modules/statuses.js b/src/modules/statuses.js
index 649cb83c..bbc1a45b 100644
--- a/src/modules/statuses.js
+++ b/src/modules/statuses.js
@@ -171,7 +171,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
-  if ((timeline === 'user' || timeline === 'media') && timelineObject.userId !== userId) {
+  if ((timeline === 'user' || timeline === 'media' || timeline === 'pinned') && timelineObject.userId !== userId) {
     return
   }
 
@@ -378,6 +378,7 @@ const removeStatus = (state, { timeline, userId, statusId }) => {
     removed = true
     delete timelineObject.statusesObject[statusId]
     delete timelineObject.visibleStatusesObject[statusId]
+    sortTimeline(timelineObject)
   }
 
   if (removed) {
@@ -551,7 +552,17 @@ const statuses = {
     },
     updatePinned ({ rootState, commit }, status) {
       commit('setPinned', { status })
-      if (!status.pinned) {
+      if (status.pinned) {
+        const statusObj = rootState.statuses.allStatusesObject[status.id]
+        const user = rootState.users.currentUser
+        commit('addNewStatuses', {
+          statuses: [statusObj],
+          showImmediately: true,
+          timeline: 'pinned',
+          user,
+          userId: user.id
+        })
+      } else {
         commit('removeStatus', { timeline: 'pinned', statusId: status.id })
       }
     },
-- 
cgit v1.2.3-70-g09d2


From 5ab0e71500071d3a760f1a67258d10c564b4425e Mon Sep 17 00:00:00 2001
From: dave <starpumadev@gmail.com>
Date: Sun, 7 Apr 2019 11:38:16 -0400
Subject: #468 - show pin status API error

---
 src/components/status/status.js  | 8 +++++++-
 src/components/status/status.vue | 1 +
 2 files changed, 8 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/components/status/status.js b/src/components/status/status.js
index f2881742..39a1b236 100644
--- a/src/components/status/status.js
+++ b/src/components/status/status.js
@@ -38,6 +38,7 @@ const Status = {
       showPreview: false,
       showingTall: this.inConversation && this.focused,
       showingLongSubject: false,
+      error: null,
       expandingSubject: typeof this.$store.state.config.collapseMessageWithSubject === 'undefined'
         ? !this.$store.state.instance.collapseMessageWithSubject
         : !this.$store.state.config.collapseMessageWithSubject,
@@ -359,7 +360,12 @@ const Status = {
     },
     pinStatus () {
       this.$store.state.api.backendInteractor.pinOwnStatus(this.status.id).then((status) => {
-        this.$store.dispatch('updatePinned', status)
+        if (status.error) {
+          this.error = status.error
+          setTimeout(() => this.error = null, 5000)
+        } else {
+          this.$store.dispatch('updatePinned', status)
+        }
       })
     },
     unpinStatus () {
diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index ca5e4a1c..d55f3d95 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -1,5 +1,6 @@
 <template>
   <div class="status-el" v-if="!hideStatus" :class="[{ 'status-el_focused': isFocused }, { 'status-conversation': inlineExpanded }]">
+    <div v-if="error" class="alert error">{{error}}</div>
     <template v-if="muted && !isPreview">
       <div class="media status container muted">
         <small>
-- 
cgit v1.2.3-70-g09d2


From e6268c492e77f45794af9e8ee8e334e194a6de15 Mon Sep 17 00:00:00 2001
From: dave <starpumadev@gmail.com>
Date: Sun, 7 Apr 2019 11:44:45 -0400
Subject: #468 - clean up

---
 src/components/status/status.js |  4 +++-
 src/modules/statuses.js         | 20 ++++++--------------
 2 files changed, 9 insertions(+), 15 deletions(-)

(limited to 'src')

diff --git a/src/components/status/status.js b/src/components/status/status.js
index 39a1b236..85159fc4 100644
--- a/src/components/status/status.js
+++ b/src/components/status/status.js
@@ -362,7 +362,9 @@ const Status = {
       this.$store.state.api.backendInteractor.pinOwnStatus(this.status.id).then((status) => {
         if (status.error) {
           this.error = status.error
-          setTimeout(() => this.error = null, 5000)
+          setTimeout(() => {
+            this.error = null
+          }, 5000)
         } else {
           this.$store.dispatch('updatePinned', status)
         }
diff --git a/src/modules/statuses.js b/src/modules/statuses.js
index bbc1a45b..b93f9cb5 100644
--- a/src/modules/statuses.js
+++ b/src/modules/statuses.js
@@ -367,24 +367,16 @@ const addNewNotifications = (state, { dispatch, notifications, older, visibleNot
 
 const removeStatus = (state, { timeline, userId, statusId }) => {
   const timelineObject = state.timelines[timeline]
-  let removed = false
-  if (userId) {
-    remove(timelineObject.statuses, { user: { id: userId } })
-    remove(timelineObject.visibleStatuses, { user: { id: userId } })
-    removed = true
-  } else if (statusId) {
-    remove(timelineObject.statuses, { id: statusId })
-    remove(timelineObject.visibleStatuses, { id: statusId })
-    removed = true
+  const status = userId ? { user: { id: userId } } : { id: statusId }
+  remove(timelineObject.statuses, status)
+  remove(timelineObject.visibleStatuses, status)
+  if (statusId) {
     delete timelineObject.statusesObject[statusId]
     delete timelineObject.visibleStatusesObject[statusId]
     sortTimeline(timelineObject)
   }
-
-  if (removed) {
-    timelineObject.minVisibleId = timelineObject.visibleStatuses.length > 0 ? last(timelineObject.visibleStatuses).id : 0
-    timelineObject.maxId = timelineObject.statuses.length > 0 ? first(timelineObject.statuses).id : 0
-  }
+  timelineObject.minVisibleId = timelineObject.visibleStatuses.length > 0 ? last(timelineObject.visibleStatuses).id : 0
+  timelineObject.maxId = timelineObject.statuses.length > 0 ? first(timelineObject.statuses).id : 0
 }
 
 export const mutations = {
-- 
cgit v1.2.3-70-g09d2


From 006bf1ce63c2f24f89781838ed499ee3829b9933 Mon Sep 17 00:00:00 2001
From: dave <starpumadev@gmail.com>
Date: Fri, 12 Apr 2019 13:53:13 -0400
Subject: #468 - fix plus button size issue, use scss variable properly

---
 src/components/status/status.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index d55f3d95..bc7ff43c 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -64,10 +64,10 @@
                   <i class="fa icon-pin"></i>
                 </div>
                 <div class="button-icon button-action-icon" v-if="expandable && !isPreview" @click.prevent="toggleExpanded" title="Expand">
-                  <i class="button-icon icon-plus-squared"></i>
+                  <i class="icon-plus-squared"></i>
                 </div>
                 <div class="button-icon button-action-icon" v-if="unmuted" @click.prevent="toggleMute" title="Toggle Mute">
-                  <i class="button-icon icon-eye-off"></i>
+                  <i class="icon-eye-off"></i>
                 </div>
               </span>
             </div>
@@ -211,7 +211,7 @@ $status-margin: 0.75em;
 }
 
 .status-pin {
-  padding: 0.75em 0.75em 0;
+  padding: $status-margin $status-margin 0;
   display: flex;
   align-items: center;
   justify-content: flex-end;
-- 
cgit v1.2.3-70-g09d2


From 9fc997500e33d561a1aa5d26c8ed8f4446a0248e Mon Sep 17 00:00:00 2001
From: dave <starpumadev@gmail.com>
Date: Fri, 12 Apr 2019 15:35:29 -0400
Subject: #468 - add extra buttons for status actions

---
 src/components/delete_button/delete_button.js      | 21 ---------
 src/components/delete_button/delete_button.vue     | 21 ---------
 src/components/extra_buttons/extra_buttons.js      | 51 ++++++++++++++++++++++
 src/components/extra_buttons/extra_buttons.vue     | 46 +++++++++++++++++++
 .../moderation_tools/moderation_tools.vue          |  8 ++++
 src/components/status/status.js                    | 27 ++++--------
 src/components/status/status.vue                   |  8 +---
 src/i18n/en.json                                   |  4 ++
 8 files changed, 118 insertions(+), 68 deletions(-)
 delete mode 100644 src/components/delete_button/delete_button.js
 delete mode 100644 src/components/delete_button/delete_button.vue
 create mode 100644 src/components/extra_buttons/extra_buttons.js
 create mode 100644 src/components/extra_buttons/extra_buttons.vue

(limited to 'src')

diff --git a/src/components/delete_button/delete_button.js b/src/components/delete_button/delete_button.js
deleted file mode 100644
index 22f24625..00000000
--- a/src/components/delete_button/delete_button.js
+++ /dev/null
@@ -1,21 +0,0 @@
-const DeleteButton = {
-  props: [ 'status' ],
-  methods: {
-    deleteStatus () {
-      const confirmed = window.confirm('Do you really want to delete this status?')
-      if (confirmed) {
-        this.$store.dispatch('deleteStatus', { id: this.status.id })
-      }
-    }
-  },
-  computed: {
-    currentUser () { return this.$store.state.users.currentUser },
-    canDelete () {
-      if (!this.currentUser) { return }
-      const superuser = this.currentUser.rights.moderator || this.currentUser.rights.admin
-      return superuser || this.status.user.id === this.currentUser.id
-    }
-  }
-}
-
-export default DeleteButton
diff --git a/src/components/delete_button/delete_button.vue b/src/components/delete_button/delete_button.vue
deleted file mode 100644
index f4c91cfd..00000000
--- a/src/components/delete_button/delete_button.vue
+++ /dev/null
@@ -1,21 +0,0 @@
-<template>
-  <div v-if="canDelete">
-    <a href="#" v-on:click.prevent="deleteStatus()">
-      <i class='button-icon icon-cancel delete-status'></i>
-    </a>
-  </div>
-</template>
-
-<script src="./delete_button.js" ></script>
-
-<style lang="scss">
-@import '../../_variables.scss';
-
-.icon-cancel,.delete-status {
-  cursor: pointer;
-  &:hover {
-    color: $fallback--cRed;
-    color: var(--cRed, $fallback--cRed);
-  }
-}
-</style>
diff --git a/src/components/extra_buttons/extra_buttons.js b/src/components/extra_buttons/extra_buttons.js
new file mode 100644
index 00000000..40bab2ab
--- /dev/null
+++ b/src/components/extra_buttons/extra_buttons.js
@@ -0,0 +1,51 @@
+import Popper from 'vue-popperjs/src/component/popper.js.vue'
+
+const ExtraButtons = {
+  props: [ 'status' ],
+  components: {
+    Popper
+  },
+  data () {
+    return {
+      showDropDown: false
+    }
+  },
+  methods: {
+    deleteStatus () {
+      const confirmed = window.confirm(this.$t('status.delete_confirm'))
+      if (confirmed) {
+        this.$store.dispatch('deleteStatus', { id: this.status.id })
+      }
+    },
+    toggleMenu () {
+      this.showDropDown = !this.showDropDown
+    },
+    pinStatus () {
+      this.$store.state.api.backendInteractor.pinOwnStatus(this.status.id).then((status) => {
+        if (status.error) {
+          this.$emit('onError', status.error)
+        } else {
+          this.$store.dispatch('updatePinned', status)
+        }
+      })
+    },
+    unpinStatus () {
+      this.$store.state.api.backendInteractor.unpinOwnStatus(this.status.id).then((status) => {
+        this.$store.dispatch('updatePinned', status)
+      })
+    }
+  },
+  computed: {
+    currentUser () { return this.$store.state.users.currentUser },
+    canDelete () {
+      if (!this.currentUser) { return }
+      const superuser = this.currentUser.rights.moderator || this.currentUser.rights.admin
+      return superuser || this.status.user.id === this.currentUser.id
+    },
+    ownStatus () {
+      return this.status.user.id === this.currentUser.id
+    }
+  }
+}
+
+export default ExtraButtons
diff --git a/src/components/extra_buttons/extra_buttons.vue b/src/components/extra_buttons/extra_buttons.vue
new file mode 100644
index 00000000..13f8587b
--- /dev/null
+++ b/src/components/extra_buttons/extra_buttons.vue
@@ -0,0 +1,46 @@
+<template>
+  <Popper
+    trigger="click"
+    @hide='showDropDown = false'
+    append-to-body
+    :options="{
+      placement: 'top',
+      modifiers: {
+        arrow: { enabled: true },
+        offset: { offset: '0, 5px' },
+      }
+    }"
+  >
+    <div class="popper-wrapper">
+      <div class="dropdown-menu"> 
+        <button class="dropdown-item dropdown-item-icon" @click.prevent="pinStatus" v-if="!status.pinned && ownStatus">
+          <i class="icon-pin"></i><span>{{$t("status.pin")}}</span>
+        </button>
+        <button class="dropdown-item dropdown-item-icon" @click.prevent="unpinStatus" v-if="status.pinned && ownStatus">
+          <i class="icon-pin"></i><span>{{$t("status.unpin")}}</span>
+        </button>
+        <button class="dropdown-item dropdown-item-icon" @click.prevent="deleteStatus" v-if="canDelete">
+          <i class="icon-cancel"></i><span>{{$t("status.delete")}}</span>
+        </button>
+      </div>
+    </div>
+    <div class="button-icon" slot="reference" @click="toggleMenu">
+      <i class='icon-ellipsis' :class="{'icon-clicked': showDropDown}"></i>
+    </div>
+  </Popper>
+</template>
+
+<script src="./extra_buttons.js" ></script>
+
+<style lang="scss">
+@import '../../_variables.scss';
+
+.icon-ellipsis {
+  cursor: pointer;
+
+  &:hover, &.icon-clicked {
+    color: $fallback--cBlue;
+    color: var(--cBlue, $fallback--cBlue);
+  }
+}
+</style>
diff --git a/src/components/moderation_tools/moderation_tools.vue b/src/components/moderation_tools/moderation_tools.vue
index c24a2280..c9e3fc78 100644
--- a/src/components/moderation_tools/moderation_tools.vue
+++ b/src/components/moderation_tools/moderation_tools.vue
@@ -127,6 +127,14 @@
     width: 100%;
     height: 100%;
 
+    &-icon {
+      padding-left: 0.5rem;
+
+      i {
+        margin-right: 0.25rem;
+      }
+    }
+
     &:hover {
       // TODO: improve the look on breeze themes
       background-color: $fallback--fg;
diff --git a/src/components/status/status.js b/src/components/status/status.js
index 85159fc4..fa4b426c 100644
--- a/src/components/status/status.js
+++ b/src/components/status/status.js
@@ -1,7 +1,7 @@
 import Attachment from '../attachment/attachment.vue'
 import FavoriteButton from '../favorite_button/favorite_button.vue'
 import RetweetButton from '../retweet_button/retweet_button.vue'
-import DeleteButton from '../delete_button/delete_button.vue'
+import ExtraButtons from '../extra_buttons/extra_buttons.vue'
 import PostStatusForm from '../post_status_form/post_status_form.vue'
 import UserCard from '../user_card/user_card.vue'
 import UserAvatar from '../user_avatar/user_avatar.vue'
@@ -280,7 +280,7 @@ const Status = {
     Attachment,
     FavoriteButton,
     RetweetButton,
-    DeleteButton,
+    ExtraButtons,
     PostStatusForm,
     UserCard,
     UserAvatar,
@@ -301,6 +301,12 @@ const Status = {
           return 'icon-globe'
       }
     },
+    showError (error) {
+      this.error = error
+      setTimeout(() => {
+        this.error = null
+      }, 5000)
+    },
     linkClicked (event) {
       let { target } = event
       if (target.tagName === 'SPAN') {
@@ -358,23 +364,6 @@ const Status = {
         this.expandingSubject = true
       }
     },
-    pinStatus () {
-      this.$store.state.api.backendInteractor.pinOwnStatus(this.status.id).then((status) => {
-        if (status.error) {
-          this.error = status.error
-          setTimeout(() => {
-            this.error = null
-          }, 5000)
-        } else {
-          this.$store.dispatch('updatePinned', status)
-        }
-      })
-    },
-    unpinStatus () {
-      this.$store.state.api.backendInteractor.unpinOwnStatus(this.status.id).then((status) => {
-        this.$store.dispatch('updatePinned', status)
-      })
-    },
     replyEnter (id, event) {
       this.showPreview = true
       const targetId = id
diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index bc7ff43c..1644f6b0 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -16,9 +16,6 @@
       <div v-if="pinned" class="status-pin">
         <i class="fa icon-pin faint"></i>
         <span class="faint">Pinned</span>
-        <div class="button-icon button-action-icon" v-if="status.pinned && ownStatus" @click.prevent="unpinStatus" title="Unpin">
-          <i class="fa icon-cancel"></i>
-        </div>
       </div>
       <div v-if="retweet && !noHeading && !inConversation" :class="[repeaterClass, { highlighted: repeaterStyle }]" :style="[repeaterStyle]" class="media container retweet-info">
         <UserAvatar class="media-left" v-if="retweet" :betterShadow="betterShadow" :user="statusoid.user"/>
@@ -60,9 +57,6 @@
                 <a :href="status.external_url" target="_blank" v-if="!status.is_local && !isPreview" class="source_url" title="Source">
                   <i class="button-icon icon-link-ext-alt"></i>
                 </a>
-                <div class="button-icon button-action-icon" v-if="!status.pinned && ownStatus" @click.prevent="pinStatus" title="Pin">
-                  <i class="fa icon-pin"></i>
-                </div>
                 <div class="button-icon button-action-icon" v-if="expandable && !isPreview" @click.prevent="toggleExpanded" title="Expand">
                   <i class="icon-plus-squared"></i>
                 </div>
@@ -175,7 +169,7 @@
             </div>
             <retweet-button :visibility='status.visibility' :loggedIn='loggedIn' :status='status'></retweet-button>
             <favorite-button :loggedIn='loggedIn' :status='status'></favorite-button>
-            <delete-button :status='status'></delete-button>
+            <extra-buttons :status="status" @onError="showError"></extra-buttons>
           </div>
         </div>
       </div>
diff --git a/src/i18n/en.json b/src/i18n/en.json
index b4f0deb2..8429367c 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -402,6 +402,10 @@
   "status": {
     "favorites": "Favorites",
     "repeats": "Repeats",
+    "delete": "Delete status",
+    "pin": "Pin on profile",
+    "unpin": "Unpin form profile",
+    "delete_confirm": "Do you really want to delete this status?",
     "reply_to": "Reply to",
     "replies_list": "Replies:"
   },
-- 
cgit v1.2.3-70-g09d2


From 075ddc34f1e3139d8a7b6c28802347ecdbe48f34 Mon Sep 17 00:00:00 2001
From: dave <starpumadev@gmail.com>
Date: Sun, 14 Apr 2019 13:18:56 -0400
Subject: #468 - shwo pin button for valid statuses (public & unlisted)

---
 src/components/extra_buttons/extra_buttons.js  | 3 +++
 src/components/extra_buttons/extra_buttons.vue | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/components/extra_buttons/extra_buttons.js b/src/components/extra_buttons/extra_buttons.js
index 40bab2ab..0b12f993 100644
--- a/src/components/extra_buttons/extra_buttons.js
+++ b/src/components/extra_buttons/extra_buttons.js
@@ -44,6 +44,9 @@ const ExtraButtons = {
     },
     ownStatus () {
       return this.status.user.id === this.currentUser.id
+    },
+    canPin () {
+      return this.ownStatus && (this.status.visibility === 'public' || this.status.visibility === 'unlisted')
     }
   }
 }
diff --git a/src/components/extra_buttons/extra_buttons.vue b/src/components/extra_buttons/extra_buttons.vue
index 13f8587b..7b86d257 100644
--- a/src/components/extra_buttons/extra_buttons.vue
+++ b/src/components/extra_buttons/extra_buttons.vue
@@ -13,10 +13,10 @@
   >
     <div class="popper-wrapper">
       <div class="dropdown-menu"> 
-        <button class="dropdown-item dropdown-item-icon" @click.prevent="pinStatus" v-if="!status.pinned && ownStatus">
+        <button class="dropdown-item dropdown-item-icon" @click.prevent="pinStatus" v-if="!status.pinned && canPin">
           <i class="icon-pin"></i><span>{{$t("status.pin")}}</span>
         </button>
-        <button class="dropdown-item dropdown-item-icon" @click.prevent="unpinStatus" v-if="status.pinned && ownStatus">
+        <button class="dropdown-item dropdown-item-icon" @click.prevent="unpinStatus" v-if="status.pinned && canPin">
           <i class="icon-pin"></i><span>{{$t("status.unpin")}}</span>
         </button>
         <button class="dropdown-item dropdown-item-icon" @click.prevent="deleteStatus" v-if="canDelete">
-- 
cgit v1.2.3-70-g09d2


From 8095ce8f6263115979a784c51b79ff089a8b16d3 Mon Sep 17 00:00:00 2001
From: dave <starpumadev@gmail.com>
Date: Sun, 14 Apr 2019 22:27:16 -0400
Subject: #468 - hide status menu after action button is clicked

---
 src/components/extra_buttons/extra_buttons.js  | 13 ++++++++++++-
 src/components/extra_buttons/extra_buttons.vue |  1 +
 2 files changed, 13 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/components/extra_buttons/extra_buttons.js b/src/components/extra_buttons/extra_buttons.js
index 0b12f993..71f5946d 100644
--- a/src/components/extra_buttons/extra_buttons.js
+++ b/src/components/extra_buttons/extra_buttons.js
@@ -7,11 +7,13 @@ const ExtraButtons = {
   },
   data () {
     return {
-      showDropDown: false
+      showDropDown: false,
+      showPopper: true
     }
   },
   methods: {
     deleteStatus () {
+      this.refreshPopper()
       const confirmed = window.confirm(this.$t('status.delete_confirm'))
       if (confirmed) {
         this.$store.dispatch('deleteStatus', { id: this.status.id })
@@ -21,6 +23,7 @@ const ExtraButtons = {
       this.showDropDown = !this.showDropDown
     },
     pinStatus () {
+      this.refreshPopper()
       this.$store.state.api.backendInteractor.pinOwnStatus(this.status.id).then((status) => {
         if (status.error) {
           this.$emit('onError', status.error)
@@ -30,9 +33,17 @@ const ExtraButtons = {
       })
     },
     unpinStatus () {
+      this.refreshPopper()
       this.$store.state.api.backendInteractor.unpinOwnStatus(this.status.id).then((status) => {
         this.$store.dispatch('updatePinned', status)
       })
+    },
+    refreshPopper () {
+      this.showPopper = false
+      this.showDropDown = false
+      setTimeout(() => {
+        this.showPopper = true
+      })
     }
   },
   computed: {
diff --git a/src/components/extra_buttons/extra_buttons.vue b/src/components/extra_buttons/extra_buttons.vue
index 7b86d257..b55a020f 100644
--- a/src/components/extra_buttons/extra_buttons.vue
+++ b/src/components/extra_buttons/extra_buttons.vue
@@ -3,6 +3,7 @@
     trigger="click"
     @hide='showDropDown = false'
     append-to-body
+    v-if="showPopper"
     :options="{
       placement: 'top',
       modifiers: {
-- 
cgit v1.2.3-70-g09d2


From 9e22d6212acaeba271d847b565d066ae92165d09 Mon Sep 17 00:00:00 2001
From: taehoon <th.dev91@gmail.com>
Date: Wed, 24 Apr 2019 08:33:12 -0400
Subject: revert pinned timeline polling logic

---
 src/services/timeline_fetcher/timeline_fetcher.service.js | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'src')

diff --git a/src/services/timeline_fetcher/timeline_fetcher.service.js b/src/services/timeline_fetcher/timeline_fetcher.service.js
index e8d9a2ed..8e954cdf 100644
--- a/src/services/timeline_fetcher/timeline_fetcher.service.js
+++ b/src/services/timeline_fetcher/timeline_fetcher.service.js
@@ -16,12 +16,6 @@ const update = ({store, statuses, timeline, showImmediately, userId}) => {
 }
 
 const fetchAndUpdate = ({store, credentials, timeline = 'friends', older = false, showImmediately = false, userId = false, tag = false, until}) => {
-  if (timeline === 'pinned') {
-    return apiService.fetchPinnedStatuses({ id: userId, credentials })
-      .then(statuses => {
-        update({ store, statuses, timeline, showImmediately, userId })
-      })
-  }
   const args = { timeline, credentials }
   const rootState = store.rootState || store.state
   const timelineData = rootState.statuses.timelines[camelCase(timeline)]
-- 
cgit v1.2.3-70-g09d2


From cd0a7afa06cafc93510286d35a60e9e40ead36bf Mon Sep 17 00:00:00 2001
From: taehoon <th.dev91@gmail.com>
Date: Wed, 24 Apr 2019 13:56:53 -0400
Subject: remove pinned timeline, instead, use simple entity of user object

---
 src/components/timeline/timeline.js                   |  3 +--
 src/components/timeline/timeline.vue                  |  3 +--
 src/components/user_profile/user_profile.js           | 13 +++++++------
 src/components/user_profile/user_profile.vue          | 19 ++++++++++---------
 src/modules/statuses.js                               | 14 ++++++++++----
 src/modules/users.js                                  |  3 +++
 .../backend_interactor_service.js                     |  2 ++
 .../entity_normalizer/entity_normalizer.service.js    |  2 ++
 8 files changed, 36 insertions(+), 23 deletions(-)

(limited to 'src')

diff --git a/src/components/timeline/timeline.js b/src/components/timeline/timeline.js
index 953b4a06..19d9a9ac 100644
--- a/src/components/timeline/timeline.js
+++ b/src/components/timeline/timeline.js
@@ -11,8 +11,7 @@ const Timeline = {
     'userId',
     'tag',
     'embedded',
-    'count',
-    'noLoadMore'
+    'count'
   ],
   data () {
     return {
diff --git a/src/components/timeline/timeline.vue b/src/components/timeline/timeline.vue
index 870fe4f5..e6a8d458 100644
--- a/src/components/timeline/timeline.vue
+++ b/src/components/timeline/timeline.vue
@@ -21,12 +21,11 @@
           class="status-fadein"
           :key="status.id"
           :statusoid="status"
-          :pinned="timelineName === 'pinned'"
           :collapsable="true"
         />
       </div>
     </div>
-    <div :class="classes.footer" v-if="!noLoadMore">
+    <div :class="classes.footer">
       <div v-if="count===0" class="new-status-notification text-center panel-footer faint">
         {{$t('timeline.no_statuses')}}
       </div>
diff --git a/src/components/user_profile/user_profile.js b/src/components/user_profile/user_profile.js
index 71a88dcf..0071fa89 100644
--- a/src/components/user_profile/user_profile.js
+++ b/src/components/user_profile/user_profile.js
@@ -2,6 +2,7 @@ import get from 'lodash/get'
 import UserCard from '../user_card/user_card.vue'
 import FollowCard from '../follow_card/follow_card.vue'
 import Timeline from '../timeline/timeline.vue'
+import Conversation from '../conversation/conversation.vue'
 import ModerationTools from '../moderation_tools/moderation_tools.vue'
 import List from '../list/list.vue'
 import withLoadMore from '../../hocs/with_load_more/with_load_more'
@@ -40,9 +41,6 @@ const UserProfile = {
     timeline () {
       return this.$store.state.statuses.timelines.user
     },
-    pinned () {
-      return this.$store.state.statuses.timelines.pinned
-    },
     favorites () {
       return this.$store.state.statuses.timelines.favorites
     },
@@ -56,6 +54,9 @@ const UserProfile = {
     user () {
       return this.$store.getters.findUser(this.userId)
     },
+    pinnedStatuses () {
+      return this.user.pinnedStatusIds.map(id => this.$store.state.statuses.allStatusesObject[id])
+    },
     isExternal () {
       return this.$route.name === 'external-user-profile'
     },
@@ -94,15 +95,14 @@ const UserProfile = {
     fetchTimelines () {
       const userId = this.userId
       this.$store.dispatch('startFetchingTimeline', { timeline: 'user', userId })
-      this.$store.dispatch('startFetchingTimeline', { timeline: 'pinned', userId })
       this.$store.dispatch('startFetchingTimeline', { timeline: 'media', userId })
       if (this.isUs) {
         this.$store.dispatch('startFetchingTimeline', { timeline: 'favorites', userId })
       }
+      this.$store.dispatch('fetchPinnedStatuses', userId)
     },
     cleanUp () {
       this.$store.dispatch('stopFetching', 'user')
-      this.$store.dispatch('stopFetching', 'pinned')
       this.$store.dispatch('stopFetching', 'favorites')
       this.$store.dispatch('stopFetching', 'media')
       this.$store.commit('clearTimeline', { timeline: 'user' })
@@ -133,7 +133,8 @@ const UserProfile = {
     FollowerList,
     FriendList,
     ModerationTools,
-    FollowCard
+    FollowCard,
+    Conversation
   }
 }
 
diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue
index caf297c6..46561e2a 100644
--- a/src/components/user_profile/user_profile.vue
+++ b/src/components/user_profile/user_profile.vue
@@ -4,15 +4,16 @@
     <UserCard :user="user" :switcher="true" :selected="timeline.viewing" rounded="top"/>
     <tab-switcher :renderOnlyFocused="true" ref="tabSwitcher">
       <div :label="$t('user_card.statuses')" :disabled="!user.statuses_count">
-        <Timeline
-          :count="user.statuses_count"
-          :embedded="true"
-          :title="$t('user_profile.timeline_title')"
-          :timeline="pinned"
-          :timeline-name="'pinned'"
-          :user-id="userId"
-          :no-load-more="true"
-        />
+        <div class="timeline">
+          <Conversation
+            v-for="status in pinnedStatuses"
+            class="status-fadein"
+            :key="status.id"
+            :statusoid="status"
+            :pinned="true"
+            :collapsable="true"
+          />
+        </div>
         <Timeline
           :count="user.statuses_count"
           :embedded="true"
diff --git a/src/modules/statuses.js b/src/modules/statuses.js
index b93f9cb5..3b3ae9e3 100644
--- a/src/modules/statuses.js
+++ b/src/modules/statuses.js
@@ -1,4 +1,4 @@
-import { remove, slice, each, findIndex, find, maxBy, minBy, merge, first, last, isArray, omitBy } from 'lodash'
+import { remove, slice, each, findIndex, find, maxBy, minBy, merge, first, last, isArray, omitBy, map } from 'lodash'
 import { set } from 'vue'
 import apiService from '../services/api/api.service.js'
 // import parse from '../services/status_parser/status_parser.js'
@@ -47,8 +47,7 @@ export const defaultState = () => ({
     publicAndExternal: emptyTl(),
     friends: emptyTl(),
     tag: emptyTl(),
-    dms: emptyTl(),
-    pinned: emptyTl()
+    dms: emptyTl()
   }
 })
 
@@ -171,7 +170,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
-  if ((timeline === 'user' || timeline === 'media' || timeline === 'pinned') && timelineObject.userId !== userId) {
+  if ((timeline === 'user' || timeline === 'media') && timelineObject.userId !== userId) {
     return
   }
 
@@ -542,6 +541,13 @@ const statuses = {
       rootState.api.backendInteractor.unfavorite(status.id)
         .then(status => commit('setFavoritedConfirm', { status, user: rootState.users.currentUser }))
     },
+    fetchPinnedStatuses ({ rootState, dispatch, commit }, userId) {
+      rootState.api.backendInteractor.fetchPinnedStatuses(userId)
+        .then(statuses => {
+          dispatch('addNewStatuses', { statuses })
+          commit('savePinnedStatusIds', { userId, statusIds: map(statuses, 'id') })
+        })
+    },
     updatePinned ({ rootState, commit }, status) {
       commit('setPinned', { status })
       if (status.pinned) {
diff --git a/src/modules/users.js b/src/modules/users.js
index adcab233..def2b38c 100644
--- a/src/modules/users.js
+++ b/src/modules/users.js
@@ -160,6 +160,9 @@ export const mutations = {
   saveMuteIds (state, muteIds) {
     state.currentUser.muteIds = muteIds
   },
+  savePinnedStatusIds (state, { userId, statusIds }) {
+    state.usersObject[userId].pinnedStatusIds = statusIds
+  },
   addMuteId (state, muteId) {
     if (state.currentUser.muteIds.indexOf(muteId) === -1) {
       state.currentUser.muteIds.push(muteId)
diff --git a/src/services/backend_interactor_service/backend_interactor_service.js b/src/services/backend_interactor_service/backend_interactor_service.js
index 816e73c1..7a302f57 100644
--- a/src/services/backend_interactor_service/backend_interactor_service.js
+++ b/src/services/backend_interactor_service/backend_interactor_service.js
@@ -106,6 +106,7 @@ const backendInteractorService = (credentials) => {
   const fetchFollowRequests = () => apiService.fetchFollowRequests({credentials})
   const fetchOAuthTokens = () => apiService.fetchOAuthTokens({credentials})
   const revokeOAuthToken = (id) => apiService.revokeOAuthToken({id, credentials})
+  const fetchPinnedStatuses = (id) => apiService.fetchPinnedStatuses({ id, credentials })
 
   const getCaptcha = () => apiService.getCaptcha()
   const register = (params) => apiService.register(params)
@@ -154,6 +155,7 @@ const backendInteractorService = (credentials) => {
     fetchBlocks,
     fetchOAuthTokens,
     revokeOAuthToken,
+    fetchPinnedStatuses,
     tagUser,
     untagUser,
     addRight,
diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js
index 97e20b99..3636c05b 100644
--- a/src/services/entity_normalizer/entity_normalizer.service.js
+++ b/src/services/entity_normalizer/entity_normalizer.service.js
@@ -131,6 +131,8 @@ export const parseUser = (data) => {
   output.statuses_count = data.statuses_count
   output.friendIds = []
   output.followerIds = []
+  output.pinnedStatusIds = []
+
   if (data.pleroma) {
     output.follow_request_count = data.pleroma.follow_request_count
   }
-- 
cgit v1.2.3-70-g09d2


From e8abe1273b5c860b78b219973c2a2926014c0ca5 Mon Sep 17 00:00:00 2001
From: taehoon <th.dev91@gmail.com>
Date: Wed, 24 Apr 2019 14:34:55 -0400
Subject: filter pinned statuses based on pinned entity instead of a separate
 user entity

---
 src/components/user_profile/user_profile.js                 | 8 +++++---
 src/modules/statuses.js                                     | 9 +++------
 src/modules/users.js                                        | 3 ---
 src/services/entity_normalizer/entity_normalizer.service.js | 1 -
 4 files changed, 8 insertions(+), 13 deletions(-)

(limited to 'src')

diff --git a/src/components/user_profile/user_profile.js b/src/components/user_profile/user_profile.js
index 0071fa89..176ec228 100644
--- a/src/components/user_profile/user_profile.js
+++ b/src/components/user_profile/user_profile.js
@@ -1,4 +1,5 @@
 import get from 'lodash/get'
+import filter from 'lodash/filter'
 import UserCard from '../user_card/user_card.vue'
 import FollowCard from '../follow_card/follow_card.vue'
 import Timeline from '../timeline/timeline.vue'
@@ -41,6 +42,9 @@ const UserProfile = {
     timeline () {
       return this.$store.state.statuses.timelines.user
     },
+    pinnedStatuses () {
+      return filter(this.timeline.statuses, { pinned: true })
+    },
     favorites () {
       return this.$store.state.statuses.timelines.favorites
     },
@@ -54,9 +58,6 @@ const UserProfile = {
     user () {
       return this.$store.getters.findUser(this.userId)
     },
-    pinnedStatuses () {
-      return this.user.pinnedStatusIds.map(id => this.$store.state.statuses.allStatusesObject[id])
-    },
     isExternal () {
       return this.$route.name === 'external-user-profile'
     },
@@ -99,6 +100,7 @@ const UserProfile = {
       if (this.isUs) {
         this.$store.dispatch('startFetchingTimeline', { timeline: 'favorites', userId })
       }
+      // Fetch all pinned statuses immediately
       this.$store.dispatch('fetchPinnedStatuses', userId)
     },
     cleanUp () {
diff --git a/src/modules/statuses.js b/src/modules/statuses.js
index 3b3ae9e3..8edd2e11 100644
--- a/src/modules/statuses.js
+++ b/src/modules/statuses.js
@@ -1,4 +1,4 @@
-import { remove, slice, each, findIndex, find, maxBy, minBy, merge, first, last, isArray, omitBy, map } from 'lodash'
+import { remove, slice, each, findIndex, find, maxBy, minBy, merge, first, last, isArray, omitBy } from 'lodash'
 import { set } from 'vue'
 import apiService from '../services/api/api.service.js'
 // import parse from '../services/status_parser/status_parser.js'
@@ -541,12 +541,9 @@ const statuses = {
       rootState.api.backendInteractor.unfavorite(status.id)
         .then(status => commit('setFavoritedConfirm', { status, user: rootState.users.currentUser }))
     },
-    fetchPinnedStatuses ({ rootState, dispatch, commit }, userId) {
+    fetchPinnedStatuses ({ rootState, dispatch }, userId) {
       rootState.api.backendInteractor.fetchPinnedStatuses(userId)
-        .then(statuses => {
-          dispatch('addNewStatuses', { statuses })
-          commit('savePinnedStatusIds', { userId, statusIds: map(statuses, 'id') })
-        })
+        .then(statuses => dispatch('addNewStatuses', { statuses, timeline: 'user', userId }))
     },
     updatePinned ({ rootState, commit }, status) {
       commit('setPinned', { status })
diff --git a/src/modules/users.js b/src/modules/users.js
index def2b38c..adcab233 100644
--- a/src/modules/users.js
+++ b/src/modules/users.js
@@ -160,9 +160,6 @@ export const mutations = {
   saveMuteIds (state, muteIds) {
     state.currentUser.muteIds = muteIds
   },
-  savePinnedStatusIds (state, { userId, statusIds }) {
-    state.usersObject[userId].pinnedStatusIds = statusIds
-  },
   addMuteId (state, muteId) {
     if (state.currentUser.muteIds.indexOf(muteId) === -1) {
       state.currentUser.muteIds.push(muteId)
diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js
index 3636c05b..7f03ae2a 100644
--- a/src/services/entity_normalizer/entity_normalizer.service.js
+++ b/src/services/entity_normalizer/entity_normalizer.service.js
@@ -131,7 +131,6 @@ export const parseUser = (data) => {
   output.statuses_count = data.statuses_count
   output.friendIds = []
   output.followerIds = []
-  output.pinnedStatusIds = []
 
   if (data.pleroma) {
     output.follow_request_count = data.pleroma.follow_request_count
-- 
cgit v1.2.3-70-g09d2


From ce1d19136de322637695891b11117946664eacd6 Mon Sep 17 00:00:00 2001
From: taehoon <th.dev91@gmail.com>
Date: Wed, 24 Apr 2019 15:34:30 -0400
Subject: refactor pin/unpin status logic

---
 src/components/extra_buttons/extra_buttons.js |  8 ++------
 src/modules/statuses.js                       | 26 +++++++++++---------------
 2 files changed, 13 insertions(+), 21 deletions(-)

(limited to 'src')

diff --git a/src/components/extra_buttons/extra_buttons.js b/src/components/extra_buttons/extra_buttons.js
index 71f5946d..55a4caad 100644
--- a/src/components/extra_buttons/extra_buttons.js
+++ b/src/components/extra_buttons/extra_buttons.js
@@ -24,19 +24,15 @@ const ExtraButtons = {
     },
     pinStatus () {
       this.refreshPopper()
-      this.$store.state.api.backendInteractor.pinOwnStatus(this.status.id).then((status) => {
+      this.$store.dispatch('pinStatus', this.status.id).then((status) => {
         if (status.error) {
           this.$emit('onError', status.error)
-        } else {
-          this.$store.dispatch('updatePinned', status)
         }
       })
     },
     unpinStatus () {
       this.refreshPopper()
-      this.$store.state.api.backendInteractor.unpinOwnStatus(this.status.id).then((status) => {
-        this.$store.dispatch('updatePinned', status)
-      })
+      this.$store.dispatch('unpinStatus', this.status.id)
     },
     refreshPopper () {
       this.showPopper = false
diff --git a/src/modules/statuses.js b/src/modules/statuses.js
index 8edd2e11..9b4eb0f7 100644
--- a/src/modules/statuses.js
+++ b/src/modules/statuses.js
@@ -545,21 +545,17 @@ const statuses = {
       rootState.api.backendInteractor.fetchPinnedStatuses(userId)
         .then(statuses => dispatch('addNewStatuses', { statuses, timeline: 'user', userId }))
     },
-    updatePinned ({ rootState, commit }, status) {
-      commit('setPinned', { status })
-      if (status.pinned) {
-        const statusObj = rootState.statuses.allStatusesObject[status.id]
-        const user = rootState.users.currentUser
-        commit('addNewStatuses', {
-          statuses: [statusObj],
-          showImmediately: true,
-          timeline: 'pinned',
-          user,
-          userId: user.id
-        })
-      } else {
-        commit('removeStatus', { timeline: 'pinned', statusId: status.id })
-      }
+    pinStatus ({ rootState, commit }, statusId) {
+      return rootState.api.backendInteractor.pinOwnStatus(statusId).then((status) => {
+        if (!status.error) {
+          commit('setPinned', { status })
+        }
+        return status
+      })
+    },
+    unpinStatus ({ rootState, commit }, statusId) {
+      rootState.api.backendInteractor.unpinOwnStatus(statusId)
+        .then((status) => commit('setPinned', { status }))
     },
     retweet ({ rootState, commit }, status) {
       // Optimistic retweeting...
-- 
cgit v1.2.3-70-g09d2


From 1229622fedf4401f2ce2e5aa6741de3a8b1291a3 Mon Sep 17 00:00:00 2001
From: taehoon <th.dev91@gmail.com>
Date: Wed, 24 Apr 2019 16:19:27 -0400
Subject: refactor error handling of pinStatus

---
 src/components/extra_buttons/extra_buttons.js |  7 ++-----
 src/modules/statuses.js                       |  8 ++------
 src/services/api/api.service.js               | 10 ++++------
 3 files changed, 8 insertions(+), 17 deletions(-)

(limited to 'src')

diff --git a/src/components/extra_buttons/extra_buttons.js b/src/components/extra_buttons/extra_buttons.js
index 55a4caad..51892d0d 100644
--- a/src/components/extra_buttons/extra_buttons.js
+++ b/src/components/extra_buttons/extra_buttons.js
@@ -24,11 +24,8 @@ const ExtraButtons = {
     },
     pinStatus () {
       this.refreshPopper()
-      this.$store.dispatch('pinStatus', this.status.id).then((status) => {
-        if (status.error) {
-          this.$emit('onError', status.error)
-        }
-      })
+      this.$store.dispatch('pinStatus', this.status.id)
+        .catch(err => this.$emit('onError', err.error.error))
     },
     unpinStatus () {
       this.refreshPopper()
diff --git a/src/modules/statuses.js b/src/modules/statuses.js
index 9b4eb0f7..b3d6802c 100644
--- a/src/modules/statuses.js
+++ b/src/modules/statuses.js
@@ -546,12 +546,8 @@ const statuses = {
         .then(statuses => dispatch('addNewStatuses', { statuses, timeline: 'user', userId }))
     },
     pinStatus ({ rootState, commit }, statusId) {
-      return rootState.api.backendInteractor.pinOwnStatus(statusId).then((status) => {
-        if (!status.error) {
-          commit('setPinned', { status })
-        }
-        return status
-      })
+      return rootState.api.backendInteractor.pinOwnStatus(statusId)
+        .then((status) => commit('setPinned', { status }))
     },
     unpinStatus ({ rootState, commit }, statusId) {
       rootState.api.backendInteractor.unpinOwnStatus(statusId)
diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js
index 03137d20..86fb6365 100644
--- a/src/services/api/api.service.js
+++ b/src/services/api/api.service.js
@@ -213,19 +213,17 @@ const unfollowUser = ({id, credentials}) => {
 }
 
 const pinOwnStatus = ({ id, credentials }) => {
-  let url = MASTODON_PIN_OWN_STATUS(id)
-  return fetch(url, {
+  return promisedRequest(MASTODON_PIN_OWN_STATUS(id), {
     headers: authHeaders(credentials),
     method: 'POST'
-  }).then((data) => data.json())
+  })
 }
 
 const unpinOwnStatus = ({ id, credentials }) => {
-  let url = MASTODON_UNPIN_OWN_STATUS(id)
-  return fetch(url, {
+  return promisedRequest(MASTODON_UNPIN_OWN_STATUS(id), {
     headers: authHeaders(credentials),
     method: 'POST'
-  }).then((data) => data.json())
+  })
 }
 
 const blockUser = ({id, credentials}) => {
-- 
cgit v1.2.3-70-g09d2


From 8308315038b6e672e79aee5956d9feabe8d1004d Mon Sep 17 00:00:00 2001
From: taehoon <th.dev91@gmail.com>
Date: Wed, 24 Apr 2019 21:49:44 -0400
Subject: revert removeStatus changes

---
 src/modules/statuses.js | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

(limited to 'src')

diff --git a/src/modules/statuses.js b/src/modules/statuses.js
index b3d6802c..68666982 100644
--- a/src/modules/statuses.js
+++ b/src/modules/statuses.js
@@ -364,18 +364,14 @@ const addNewNotifications = (state, { dispatch, notifications, older, visibleNot
   })
 }
 
-const removeStatus = (state, { timeline, userId, statusId }) => {
+const removeStatus = (state, { timeline, userId }) => {
   const timelineObject = state.timelines[timeline]
-  const status = userId ? { user: { id: userId } } : { id: statusId }
-  remove(timelineObject.statuses, status)
-  remove(timelineObject.visibleStatuses, status)
-  if (statusId) {
-    delete timelineObject.statusesObject[statusId]
-    delete timelineObject.visibleStatusesObject[statusId]
-    sortTimeline(timelineObject)
+  if (userId) {
+    remove(timelineObject.statuses, { user: { id: userId } })
+    remove(timelineObject.visibleStatuses, { user: { id: userId } })
+    timelineObject.minVisibleId = timelineObject.visibleStatuses.length > 0 ? last(timelineObject.visibleStatuses).id : 0
+    timelineObject.maxId = timelineObject.statuses.length > 0 ? first(timelineObject.statuses).id : 0
   }
-  timelineObject.minVisibleId = timelineObject.visibleStatuses.length > 0 ? last(timelineObject.visibleStatuses).id : 0
-  timelineObject.maxId = timelineObject.statuses.length > 0 ? first(timelineObject.statuses).id : 0
 }
 
 export const mutations = {
-- 
cgit v1.2.3-70-g09d2


From 93e9bc019ec153f01910a3e0391d96ea776cf2ff Mon Sep 17 00:00:00 2001
From: taehoon <th.dev91@gmail.com>
Date: Wed, 24 Apr 2019 21:52:50 -0400
Subject: clean up fetchPinnedStatuses api service

---
 src/services/api/api.service.js | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js
index 86fb6365..426d40e4 100644
--- a/src/services/api/api.service.js
+++ b/src/services/api/api.service.js
@@ -506,14 +506,7 @@ const fetchTimeline = ({timeline, credentials, since = false, until = false, use
 
 const fetchPinnedStatuses = ({ id, credentials }) => {
   const url = MASTODON_USER_TIMELINE_URL(id) + '?pinned=true'
-  return fetch(url, { headers: authHeaders(credentials) })
-    .then((data) => {
-      if (data.ok) {
-        return data
-      }
-      throw new Error('Error fetching pinned timeline', data)
-    })
-    .then((data) => data.json())
+  return promisedRequest(url, { headers: authHeaders(credentials) })
     .then((data) => data.map(parseStatus))
 }
 
-- 
cgit v1.2.3-70-g09d2


From a601337a208e37dd5a2ecb4a5193c27a352c811b Mon Sep 17 00:00:00 2001
From: taehoon <th.dev91@gmail.com>
Date: Wed, 24 Apr 2019 21:56:09 -0400
Subject: clean up

---
 .../backend_interactor_service.js                        | 16 +++++-----------
 .../entity_normalizer/entity_normalizer.service.js       |  1 -
 2 files changed, 5 insertions(+), 12 deletions(-)

(limited to 'src')

diff --git a/src/services/backend_interactor_service/backend_interactor_service.js b/src/services/backend_interactor_service/backend_interactor_service.js
index 7a302f57..e23e1222 100644
--- a/src/services/backend_interactor_service/backend_interactor_service.js
+++ b/src/services/backend_interactor_service/backend_interactor_service.js
@@ -43,14 +43,6 @@ const backendInteractorService = (credentials) => {
     return apiService.unfollowUser({credentials, id})
   }
 
-  const pinOwnStatus = (id) => {
-    return apiService.pinOwnStatus({credentials, id})
-  }
-
-  const unpinOwnStatus = (id) => {
-    return apiService.unpinOwnStatus({ credentials, id })
-  }
-
   const blockUser = (id) => {
     return apiService.blockUser({credentials, id})
   }
@@ -106,7 +98,9 @@ const backendInteractorService = (credentials) => {
   const fetchFollowRequests = () => apiService.fetchFollowRequests({credentials})
   const fetchOAuthTokens = () => apiService.fetchOAuthTokens({credentials})
   const revokeOAuthToken = (id) => apiService.revokeOAuthToken({id, credentials})
-  const fetchPinnedStatuses = (id) => apiService.fetchPinnedStatuses({ id, credentials })
+  const fetchPinnedStatuses = (id) => apiService.fetchPinnedStatuses({credentials, id})
+  const pinOwnStatus = (id) => apiService.pinOwnStatus({credentials, id})
+  const unpinOwnStatus = (id) => apiService.unpinOwnStatus({credentials, id})
 
   const getCaptcha = () => apiService.getCaptcha()
   const register = (params) => apiService.register(params)
@@ -139,8 +133,6 @@ const backendInteractorService = (credentials) => {
     fetchFollowers,
     followUser,
     unfollowUser,
-    pinOwnStatus,
-    unpinOwnStatus,
     blockUser,
     unblockUser,
     fetchUser,
@@ -156,6 +148,8 @@ const backendInteractorService = (credentials) => {
     fetchOAuthTokens,
     revokeOAuthToken,
     fetchPinnedStatuses,
+    pinOwnStatus,
+    unpinOwnStatus,
     tagUser,
     untagUser,
     addRight,
diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js
index 7f03ae2a..97e20b99 100644
--- a/src/services/entity_normalizer/entity_normalizer.service.js
+++ b/src/services/entity_normalizer/entity_normalizer.service.js
@@ -131,7 +131,6 @@ export const parseUser = (data) => {
   output.statuses_count = data.statuses_count
   output.friendIds = []
   output.followerIds = []
-
   if (data.pleroma) {
     output.follow_request_count = data.pleroma.follow_request_count
   }
-- 
cgit v1.2.3-70-g09d2


From f8186bfc744c66426635208838c3e2a4dcbecfd2 Mon Sep 17 00:00:00 2001
From: taehoon <th.dev91@gmail.com>
Date: Wed, 24 Apr 2019 22:02:57 -0400
Subject: show immediately pinned statuses

---
 src/modules/statuses.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/modules/statuses.js b/src/modules/statuses.js
index 68666982..0650a86b 100644
--- a/src/modules/statuses.js
+++ b/src/modules/statuses.js
@@ -539,7 +539,7 @@ const statuses = {
     },
     fetchPinnedStatuses ({ rootState, dispatch }, userId) {
       rootState.api.backendInteractor.fetchPinnedStatuses(userId)
-        .then(statuses => dispatch('addNewStatuses', { statuses, timeline: 'user', userId }))
+        .then(statuses => dispatch('addNewStatuses', { statuses, timeline: 'user', userId, showImmediately: true }))
     },
     pinStatus ({ rootState, commit }, statusId) {
       return rootState.api.backendInteractor.pinOwnStatus(statusId)
-- 
cgit v1.2.3-70-g09d2


From 32be0e15d11c14513ff4fdc984aeaa4a5f462eac Mon Sep 17 00:00:00 2001
From: taehoon <th.dev91@gmail.com>
Date: Fri, 26 Apr 2019 15:46:40 -0400
Subject: use pinned property from status directly

---
 src/components/conversation/conversation.js  | 3 +--
 src/components/conversation/conversation.vue | 1 -
 src/components/status/status.js              | 3 +--
 src/components/status/status.vue             | 2 +-
 src/components/user_profile/user_profile.vue | 1 -
 5 files changed, 3 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/components/conversation/conversation.js b/src/components/conversation/conversation.js
index fc239ee9..ffeb7244 100644
--- a/src/components/conversation/conversation.js
+++ b/src/components/conversation/conversation.js
@@ -41,8 +41,7 @@ const conversation = {
   props: [
     'statusoid',
     'collapsable',
-    'isPage',
-    'pinned'
+    'isPage'
   ],
   created () {
     if (this.isPage) {
diff --git a/src/components/conversation/conversation.vue b/src/components/conversation/conversation.vue
index 40011113..d04ff722 100644
--- a/src/components/conversation/conversation.vue
+++ b/src/components/conversation/conversation.vue
@@ -13,7 +13,6 @@
       :key="status.id"
       :inlineExpanded="collapsable && isExpanded"
       :statusoid="status"
-      :pinned="pinned"
       :expandable='!isExpanded'
       :focused="focused(status.id)"
       :inConversation="isExpanded"
diff --git a/src/components/status/status.js b/src/components/status/status.js
index fa4b426c..09a2a010 100644
--- a/src/components/status/status.js
+++ b/src/components/status/status.js
@@ -26,8 +26,7 @@ const Status = {
     'replies',
     'isPreview',
     'noHeading',
-    'inlineExpanded',
-    'pinned'
+    'inlineExpanded'
   ],
   data () {
     return {
diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index 1644f6b0..41662576 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -13,7 +13,7 @@
       </div>
     </template>
     <template v-else>
-      <div v-if="pinned" class="status-pin">
+      <div v-if="statusoid.pinned" class="status-pin">
         <i class="fa icon-pin faint"></i>
         <span class="faint">Pinned</span>
       </div>
diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue
index 46561e2a..1e104403 100644
--- a/src/components/user_profile/user_profile.vue
+++ b/src/components/user_profile/user_profile.vue
@@ -10,7 +10,6 @@
             class="status-fadein"
             :key="status.id"
             :statusoid="status"
-            :pinned="true"
             :collapsable="true"
           />
         </div>
-- 
cgit v1.2.3-70-g09d2


From d76bd0044fd0543f07a24f81fb24615f5a3bc638 Mon Sep 17 00:00:00 2001
From: taehoon <th.dev91@gmail.com>
Date: Fri, 26 Apr 2019 16:03:46 -0400
Subject: fix typo

---
 src/i18n/en.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/i18n/en.json b/src/i18n/en.json
index 8429367c..9c5789e3 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -404,7 +404,7 @@
     "repeats": "Repeats",
     "delete": "Delete status",
     "pin": "Pin on profile",
-    "unpin": "Unpin form profile",
+    "unpin": "Unpin from profile",
     "delete_confirm": "Do you really want to delete this status?",
     "reply_to": "Reply to",
     "replies_list": "Replies:"
-- 
cgit v1.2.3-70-g09d2


From beaf51257380ec62d3cfe6a0c876fec24ee61e1a Mon Sep 17 00:00:00 2001
From: taehoon <th.dev91@gmail.com>
Date: Fri, 26 Apr 2019 16:08:16 -0400
Subject: add translation

---
 src/components/status/status.vue | 2 +-
 src/i18n/en.json                 | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index 41662576..a033074c 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -15,7 +15,7 @@
     <template v-else>
       <div v-if="statusoid.pinned" class="status-pin">
         <i class="fa icon-pin faint"></i>
-        <span class="faint">Pinned</span>
+        <span class="faint">{{$t('status.pinned')}}</span>
       </div>
       <div v-if="retweet && !noHeading && !inConversation" :class="[repeaterClass, { highlighted: repeaterStyle }]" :style="[repeaterStyle]" class="media container retweet-info">
         <UserAvatar class="media-left" v-if="retweet" :betterShadow="betterShadow" :user="statusoid.user"/>
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 9c5789e3..dac0e38d 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -405,6 +405,7 @@
     "delete": "Delete status",
     "pin": "Pin on profile",
     "unpin": "Unpin from profile",
+    "pinned": "Pinned",
     "delete_confirm": "Do you really want to delete this status?",
     "reply_to": "Reply to",
     "replies_list": "Replies:"
-- 
cgit v1.2.3-70-g09d2


From 19e79895bbedf66560fcb13d9d07d38dfc1577e2 Mon Sep 17 00:00:00 2001
From: taehoon <th.dev91@gmail.com>
Date: Fri, 26 Apr 2019 16:22:03 -0400
Subject: revert unnecessary changes

---
 src/components/status/status.vue | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

(limited to 'src')

diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index a033074c..77949a52 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -57,12 +57,12 @@
                 <a :href="status.external_url" target="_blank" v-if="!status.is_local && !isPreview" class="source_url" title="Source">
                   <i class="button-icon icon-link-ext-alt"></i>
                 </a>
-                <div class="button-icon button-action-icon" v-if="expandable && !isPreview" @click.prevent="toggleExpanded" title="Expand">
-                  <i class="icon-plus-squared"></i>
-                </div>
-                <div class="button-icon button-action-icon" v-if="unmuted" @click.prevent="toggleMute" title="Toggle Mute">
-                  <i class="icon-eye-off"></i>
-                </div>
+                <template v-if="expandable && !isPreview">
+                  <a href="#" @click.prevent="toggleExpanded" title="Expand">
+                    <i class="button-icon icon-plus-squared"></i>
+                  </a>
+                </template>
+                <a href="#" @click.prevent="toggleMute" v-if="unmuted"><i class="button-icon icon-eye-off"></i></a>
               </span>
             </div>
 
@@ -690,10 +690,6 @@ a.unmute {
   }
 }
 
-.button-action-icon {
-  cursor: pointer;
-}
-
 @media all and (max-width: 800px) {
   .status-el {
     .retweet-info {
-- 
cgit v1.2.3-70-g09d2


From 1747cd87717e5658cdae70d8b86216612c58bc81 Mon Sep 17 00:00:00 2001
From: taehoon <th.dev91@gmail.com>
Date: Fri, 26 Apr 2019 16:30:04 -0400
Subject: use text color instead

---
 src/components/extra_buttons/extra_buttons.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/components/extra_buttons/extra_buttons.vue b/src/components/extra_buttons/extra_buttons.vue
index b55a020f..38e933bb 100644
--- a/src/components/extra_buttons/extra_buttons.vue
+++ b/src/components/extra_buttons/extra_buttons.vue
@@ -40,8 +40,8 @@
   cursor: pointer;
 
   &:hover, &.icon-clicked {
-    color: $fallback--cBlue;
-    color: var(--cBlue, $fallback--cBlue);
+    color: $fallback--text;
+    color: var(--text, $fallback--text);
   }
 }
 </style>
-- 
cgit v1.2.3-70-g09d2


From 12f8269f0136b00319ef5fe58ae98848fc9d8059 Mon Sep 17 00:00:00 2001
From: taehoon <th.dev91@gmail.com>
Date: Sat, 27 Apr 2019 08:56:37 -0400
Subject: make sure to have rights property of user object

---
 src/services/entity_normalizer/entity_normalizer.service.js | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src')

diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js
index 97e20b99..5b8ad8a4 100644
--- a/src/services/entity_normalizer/entity_normalizer.service.js
+++ b/src/services/entity_normalizer/entity_normalizer.service.js
@@ -141,6 +141,7 @@ export const parseUser = (data) => {
   }
 
   output.tags = output.tags || []
+  output.rights = output.rights || {}
 
   return output
 }
-- 
cgit v1.2.3-70-g09d2


From 2af088969a26f8a3063336cc3885c10441087e81 Mon Sep 17 00:00:00 2001
From: taehoon <th.dev91@gmail.com>
Date: Sat, 27 Apr 2019 09:36:10 -0400
Subject: improve error handling logic

---
 src/components/extra_buttons/extra_buttons.js | 3 +++
 src/components/status/status.js               | 6 +++---
 src/components/status/status.vue              | 7 +++++--
 3 files changed, 11 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/components/extra_buttons/extra_buttons.js b/src/components/extra_buttons/extra_buttons.js
index 51892d0d..f70ecd1d 100644
--- a/src/components/extra_buttons/extra_buttons.js
+++ b/src/components/extra_buttons/extra_buttons.js
@@ -25,11 +25,14 @@ const ExtraButtons = {
     pinStatus () {
       this.refreshPopper()
       this.$store.dispatch('pinStatus', this.status.id)
+        .then(() => this.$emit('onSuccess'))
         .catch(err => this.$emit('onError', err.error.error))
     },
     unpinStatus () {
       this.refreshPopper()
       this.$store.dispatch('unpinStatus', this.status.id)
+        .then(() => this.$emit('onSuccess'))
+        .catch(err => this.$emit('onError', err.error.error))
     },
     refreshPopper () {
       this.showPopper = false
diff --git a/src/components/status/status.js b/src/components/status/status.js
index 09a2a010..a1ffb026 100644
--- a/src/components/status/status.js
+++ b/src/components/status/status.js
@@ -302,9 +302,9 @@ const Status = {
     },
     showError (error) {
       this.error = error
-      setTimeout(() => {
-        this.error = null
-      }, 5000)
+    },
+    clearError () {
+      this.error = undefined
     },
     linkClicked (event) {
       let { target } = event
diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index 77949a52..8575a95e 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -1,6 +1,9 @@
 <template>
   <div class="status-el" v-if="!hideStatus" :class="[{ 'status-el_focused': isFocused }, { 'status-conversation': inlineExpanded }]">
-    <div v-if="error" class="alert error">{{error}}</div>
+    <div v-if="error" class="alert error">
+      {{error}}
+      <i class="button-icon icon-cancel" @click="clearError"></i>
+    </div>
     <template v-if="muted && !isPreview">
       <div class="media status container muted">
         <small>
@@ -169,7 +172,7 @@
             </div>
             <retweet-button :visibility='status.visibility' :loggedIn='loggedIn' :status='status'></retweet-button>
             <favorite-button :loggedIn='loggedIn' :status='status'></favorite-button>
-            <extra-buttons :status="status" @onError="showError"></extra-buttons>
+            <extra-buttons :status="status" @onError="showError" @onSuccess="clearError"></extra-buttons>
           </div>
         </div>
       </div>
-- 
cgit v1.2.3-70-g09d2


From 87de130ee56fdd448934c8f442342302982ec579 Mon Sep 17 00:00:00 2001
From: taehoon <th.dev91@gmail.com>
Date: Tue, 30 Apr 2019 08:04:22 -0400
Subject: apply status normalizer

---
 src/services/api/api.service.js | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src')

diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js
index 426d40e4..b5858e9d 100644
--- a/src/services/api/api.service.js
+++ b/src/services/api/api.service.js
@@ -217,6 +217,7 @@ const pinOwnStatus = ({ id, credentials }) => {
     headers: authHeaders(credentials),
     method: 'POST'
   })
+  .then((data) => parseStatus(data))
 }
 
 const unpinOwnStatus = ({ id, credentials }) => {
@@ -224,6 +225,7 @@ const unpinOwnStatus = ({ id, credentials }) => {
     headers: authHeaders(credentials),
     method: 'POST'
   })
+  .then((data) => parseStatus(data))
 }
 
 const blockUser = ({id, credentials}) => {
-- 
cgit v1.2.3-70-g09d2


From 110c9d3b26e3871c8fc8157458be201ed4316d49 Mon Sep 17 00:00:00 2001
From: taehoon <th.dev91@gmail.com>
Date: Tue, 30 Apr 2019 08:20:19 -0400
Subject: improve performance by caching pinned status ids into user object

---
 src/components/user_profile/user_profile.js             |  3 ---
 src/components/user_profile/user_profile.vue            | 16 +++++++++-------
 src/modules/statuses.js                                 |  6 +++---
 src/modules/users.js                                    | 17 +++++++++++++++--
 .../entity_normalizer/entity_normalizer.service.js      |  2 ++
 5 files changed, 29 insertions(+), 15 deletions(-)

(limited to 'src')

diff --git a/src/components/user_profile/user_profile.js b/src/components/user_profile/user_profile.js
index 176ec228..8d660780 100644
--- a/src/components/user_profile/user_profile.js
+++ b/src/components/user_profile/user_profile.js
@@ -42,9 +42,6 @@ const UserProfile = {
     timeline () {
       return this.$store.state.statuses.timelines.user
     },
-    pinnedStatuses () {
-      return filter(this.timeline.statuses, { pinned: true })
-    },
     favorites () {
       return this.$store.state.statuses.timelines.favorites
     },
diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue
index 1e104403..36d75b9e 100644
--- a/src/components/user_profile/user_profile.vue
+++ b/src/components/user_profile/user_profile.vue
@@ -5,13 +5,15 @@
     <tab-switcher :renderOnlyFocused="true" ref="tabSwitcher">
       <div :label="$t('user_card.statuses')" :disabled="!user.statuses_count">
         <div class="timeline">
-          <Conversation
-            v-for="status in pinnedStatuses"
-            class="status-fadein"
-            :key="status.id"
-            :statusoid="status"
-            :collapsable="true"
-          />
+          <template v-for="statusId in user.pinnedStatuseIds">
+            <Conversation
+              v-if="timeline.statusesObject[statusId]"
+              class="status-fadein"
+              :key="statusId"
+              :statusoid="timeline.statusesObject[statusId]"
+              :collapsable="true"
+            />
+          </template>
         </div>
         <Timeline
           :count="user.statuses_count"
diff --git a/src/modules/statuses.js b/src/modules/statuses.js
index 0650a86b..e6ee5447 100644
--- a/src/modules/statuses.js
+++ b/src/modules/statuses.js
@@ -424,7 +424,7 @@ export const mutations = {
       newStatus.favoritedBy.push(user)
     }
   },
-  setPinned (state, { status }) {
+  setPinned (state, status) {
     const newStatus = state.allStatusesObject[status.id]
     newStatus.pinned = status.pinned
   },
@@ -543,11 +543,11 @@ const statuses = {
     },
     pinStatus ({ rootState, commit }, statusId) {
       return rootState.api.backendInteractor.pinOwnStatus(statusId)
-        .then((status) => commit('setPinned', { status }))
+        .then((status) => commit('setPinned', status))
     },
     unpinStatus ({ rootState, commit }, statusId) {
       rootState.api.backendInteractor.unpinOwnStatus(statusId)
-        .then((status) => commit('setPinned', { status }))
+        .then((status) => commit('setPinned', status))
     },
     retweet ({ rootState, commit }, status) {
       // Optimistic retweeting...
diff --git a/src/modules/users.js b/src/modules/users.js
index adcab233..e72a657c 100644
--- a/src/modules/users.js
+++ b/src/modules/users.js
@@ -165,6 +165,15 @@ export const mutations = {
       state.currentUser.muteIds.push(muteId)
     }
   },
+  setPinned (state, status) {
+    const user = state.usersObject[status.user.id]
+    const index = user.pinnedStatuseIds.indexOf(status.id)
+    if (status.pinned && index === -1) {
+      user.pinnedStatuseIds.push(status.id)
+    } else if (!status.pinned && index !== -1) {
+      user.pinnedStatuseIds.splice(index, 1)
+    }
+  },
   setUserForStatus (state, status) {
     status.user = state.usersObject[status.user.id]
   },
@@ -318,13 +327,17 @@ const users = {
       store.commit('addNewUsers', users)
       store.commit('addNewUsers', retweetedUsers)
 
-      // Reconnect users to statuses
       each(statuses, (status) => {
+        // Reconnect users to statuses
         store.commit('setUserForStatus', status)
+        // Set pinned statuses to user
+        store.commit('setPinned', status)
       })
-      // Reconnect users to retweets
       each(compact(map(statuses, 'retweeted_status')), (status) => {
+        // Reconnect users to retweets
         store.commit('setUserForStatus', status)
+        // Set pinned retweets to user
+        store.commit('setPinned', status)
       })
     },
     addNewNotifications (store, { notifications }) {
diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js
index 5b8ad8a4..e3d1646a 100644
--- a/src/services/entity_normalizer/entity_normalizer.service.js
+++ b/src/services/entity_normalizer/entity_normalizer.service.js
@@ -131,6 +131,8 @@ export const parseUser = (data) => {
   output.statuses_count = data.statuses_count
   output.friendIds = []
   output.followerIds = []
+  output.pinnedStatuseIds = []
+
   if (data.pleroma) {
     output.follow_request_count = data.pleroma.follow_request_count
   }
-- 
cgit v1.2.3-70-g09d2


From f68653d0dd0b374aa28eca35b424b6c834c701d6 Mon Sep 17 00:00:00 2001
From: taehoon <th.dev91@gmail.com>
Date: Tue, 30 Apr 2019 11:06:22 -0400
Subject: show pinned state only in the user timeline

---
 src/components/conversation/conversation.js  | 3 ++-
 src/components/conversation/conversation.vue | 1 +
 src/components/status/status.js              | 3 ++-
 src/components/status/status.vue             | 2 +-
 src/components/user_profile/user_profile.vue | 1 +
 5 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/components/conversation/conversation.js b/src/components/conversation/conversation.js
index ffeb7244..b3074590 100644
--- a/src/components/conversation/conversation.js
+++ b/src/components/conversation/conversation.js
@@ -41,7 +41,8 @@ const conversation = {
   props: [
     'statusoid',
     'collapsable',
-    'isPage'
+    'isPage',
+    'showPinned'
   ],
   created () {
     if (this.isPage) {
diff --git a/src/components/conversation/conversation.vue b/src/components/conversation/conversation.vue
index d04ff722..0b4998c3 100644
--- a/src/components/conversation/conversation.vue
+++ b/src/components/conversation/conversation.vue
@@ -14,6 +14,7 @@
       :inlineExpanded="collapsable && isExpanded"
       :statusoid="status"
       :expandable='!isExpanded'
+      :showPinned="showPinned"
       :focused="focused(status.id)"
       :inConversation="isExpanded"
       :highlight="getHighlight()"
diff --git a/src/components/status/status.js b/src/components/status/status.js
index a1ffb026..5b3d98c3 100644
--- a/src/components/status/status.js
+++ b/src/components/status/status.js
@@ -26,7 +26,8 @@ const Status = {
     'replies',
     'isPreview',
     'noHeading',
-    'inlineExpanded'
+    'inlineExpanded',
+    'showPinned'
   ],
   data () {
     return {
diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index 8575a95e..997c1b31 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -16,7 +16,7 @@
       </div>
     </template>
     <template v-else>
-      <div v-if="statusoid.pinned" class="status-pin">
+      <div v-if="showPinned && statusoid.pinned" class="status-pin">
         <i class="fa icon-pin faint"></i>
         <span class="faint">{{$t('status.pinned')}}</span>
       </div>
diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue
index 36d75b9e..48b774ea 100644
--- a/src/components/user_profile/user_profile.vue
+++ b/src/components/user_profile/user_profile.vue
@@ -12,6 +12,7 @@
               :key="statusId"
               :statusoid="timeline.statusesObject[statusId]"
               :collapsable="true"
+              :showPinned="true"
             />
           </template>
         </div>
-- 
cgit v1.2.3-70-g09d2


From daba688f461be0c35b5501e799be66ec375dbae1 Mon Sep 17 00:00:00 2001
From: taehoon <th.dev91@gmail.com>
Date: Tue, 30 Apr 2019 11:50:57 -0400
Subject: remove needless importing

---
 src/components/user_profile/user_profile.js | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src')

diff --git a/src/components/user_profile/user_profile.js b/src/components/user_profile/user_profile.js
index 8d660780..eab330e7 100644
--- a/src/components/user_profile/user_profile.js
+++ b/src/components/user_profile/user_profile.js
@@ -1,5 +1,4 @@
 import get from 'lodash/get'
-import filter from 'lodash/filter'
 import UserCard from '../user_card/user_card.vue'
 import FollowCard from '../follow_card/follow_card.vue'
 import Timeline from '../timeline/timeline.vue'
-- 
cgit v1.2.3-70-g09d2


From 2ce01863273fdefad7bca945f5d58d50a0e8d77b Mon Sep 17 00:00:00 2001
From: taehoon <th.dev91@gmail.com>
Date: Sat, 4 May 2019 13:11:19 -0400
Subject: update api service functions

---
 src/services/api/api.service.js | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

(limited to 'src')

diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js
index b5858e9d..5f40cfa6 100644
--- a/src/services/api/api.service.js
+++ b/src/services/api/api.service.js
@@ -213,19 +213,13 @@ const unfollowUser = ({id, credentials}) => {
 }
 
 const pinOwnStatus = ({ id, credentials }) => {
-  return promisedRequest(MASTODON_PIN_OWN_STATUS(id), {
-    headers: authHeaders(credentials),
-    method: 'POST'
-  })
-  .then((data) => parseStatus(data))
+  return promisedRequest({ url: MASTODON_PIN_OWN_STATUS(id), credentials, method: 'POST' })
+    .then((data) => parseStatus(data))
 }
 
 const unpinOwnStatus = ({ id, credentials }) => {
-  return promisedRequest(MASTODON_UNPIN_OWN_STATUS(id), {
-    headers: authHeaders(credentials),
-    method: 'POST'
-  })
-  .then((data) => parseStatus(data))
+  return promisedRequest({ url: MASTODON_UNPIN_OWN_STATUS(id), credentials, method: 'POST' })
+    .then((data) => parseStatus(data))
 }
 
 const blockUser = ({id, credentials}) => {
@@ -508,7 +502,7 @@ const fetchTimeline = ({timeline, credentials, since = false, until = false, use
 
 const fetchPinnedStatuses = ({ id, credentials }) => {
   const url = MASTODON_USER_TIMELINE_URL(id) + '?pinned=true'
-  return promisedRequest(url, { headers: authHeaders(credentials) })
+  return promisedRequest({ url, credentials })
     .then((data) => data.map(parseStatus))
 }
 
-- 
cgit v1.2.3-70-g09d2