From ef2585e32b546722f2157bd6203701deb495d2e9 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Fri, 11 Jan 2019 02:40:17 +0300
Subject: Remove all explicit and implicit conversions of statusId to number,
 changed explicit ones so that they convert them to string

---
 src/components/conversation-page/conversation-page.js | 4 ++--
 src/components/conversation/conversation.js           | 6 +++---
 src/components/status/status.js                       | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'src/components')

diff --git a/src/components/conversation-page/conversation-page.js b/src/components/conversation-page/conversation-page.js
index beffa5bb..bdf84d0c 100644
--- a/src/components/conversation-page/conversation-page.js
+++ b/src/components/conversation-page/conversation-page.js
@@ -1,5 +1,5 @@
 import Conversation from '../conversation/conversation.vue'
-import { find, toInteger } from 'lodash'
+import { find } from 'lodash'
 
 const conversationPage = {
   components: {
@@ -7,7 +7,7 @@ const conversationPage = {
   },
   computed: {
     statusoid () {
-      const id = toInteger(this.$route.params.id)
+      const id = String(this.$route.params.id)
       const statuses = this.$store.state.statuses.allStatuses
       const status = find(statuses, {id})
 
diff --git a/src/components/conversation/conversation.js b/src/components/conversation/conversation.js
index 9d9f7bbe..95432248 100644
--- a/src/components/conversation/conversation.js
+++ b/src/components/conversation/conversation.js
@@ -32,7 +32,7 @@ const conversation = {
     replies () {
       let i = 1
       return reduce(this.conversation, (result, {id, in_reply_to_status_id}) => {
-        const irid = Number(in_reply_to_status_id)
+        const irid = String(in_reply_to_status_id)
         if (irid) {
           result[irid] = result[irid] || []
           result[irid].push({
@@ -69,7 +69,7 @@ const conversation = {
       }
     },
     getReplies (id) {
-      id = Number(id)
+      id = String(id)
       return this.replies[id] || []
     },
     focused (id) {
@@ -80,7 +80,7 @@ const conversation = {
       }
     },
     setHighlight (id) {
-      this.highlight = Number(id)
+      this.highlight = String(id)
     }
   }
 }
diff --git a/src/components/status/status.js b/src/components/status/status.js
index 73d53694..7e1e7dab 100644
--- a/src/components/status/status.js
+++ b/src/components/status/status.js
@@ -270,7 +270,7 @@ const Status = {
     },
     replyEnter (id, event) {
       this.showPreview = true
-      const targetId = Number(id)
+      const targetId = String(id)
       const statuses = this.$store.state.statuses.allStatuses
 
       if (!this.preview) {
@@ -295,7 +295,7 @@ const Status = {
   },
   watch: {
     'highlight': function (id) {
-      id = Number(id)
+      id = String(id)
       if (this.status.id === id) {
         let rect = this.$el.getBoundingClientRect()
         if (rect.top < 100) {
-- 
cgit v1.2.3-70-g09d2


From 039a4074006fb91ac9031b41b4e9af4a15766dfa Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Sat, 12 Jan 2019 23:33:45 +0300
Subject: some initial work to make it possible to use "unregistered"
 timelines, i.e. not reserving a timeline by name, instead just passing
 timeline object itself.

---
 src/components/timeline/timeline.js                | 17 ++++++------
 src/components/user_profile/user_profile.js        |  6 +++++
 src/components/user_profile/user_profile.vue       |  1 +
 src/modules/api.js                                 | 10 +++----
 src/modules/statuses.js                            | 31 ++++++++++++----------
 src/services/api/api.service.js                    |  5 +++-
 .../timeline_fetcher/timeline_fetcher.service.js   |  4 +--
 7 files changed, 43 insertions(+), 31 deletions(-)

(limited to 'src/components')

diff --git a/src/components/timeline/timeline.js b/src/components/timeline/timeline.js
index 98da8660..23d2c1e8 100644
--- a/src/components/timeline/timeline.js
+++ b/src/components/timeline/timeline.js
@@ -7,7 +7,6 @@ import { throttle } from 'lodash'
 const Timeline = {
   props: [
     'timeline',
-    'timelineName',
     'title',
     'userId',
     'tag',
@@ -55,7 +54,7 @@ const Timeline = {
     timelineFetcher.fetchAndUpdate({
       store,
       credentials,
-      timeline: this.timelineName,
+      timeline: this.timeline,
       showImmediately,
       userId: this.userId,
       tag: this.tag
@@ -70,32 +69,32 @@ const Timeline = {
   destroyed () {
     window.removeEventListener('scroll', this.scrollLoad)
     if (typeof document.hidden !== 'undefined') document.removeEventListener('visibilitychange', this.handleVisibilityChange, false)
-    this.$store.commit('setLoading', { timeline: this.timelineName, value: false })
+    this.$store.commit('setLoading', { timeline: this.timeline, value: false })
   },
   methods: {
     showNewStatuses () {
       if (this.timeline.flushMarker !== 0) {
-        this.$store.commit('clearTimeline', { timeline: this.timelineName })
-        this.$store.commit('queueFlush', { timeline: this.timelineName, id: 0 })
+        this.$store.commit('clearTimeline', { timeline: this.timeline })
+        this.$store.commit('queueFlush', { timeline: this.timeline, id: 0 })
         this.fetchOlderStatuses()
       } else {
-        this.$store.commit('showNewStatuses', { timeline: this.timelineName })
+        this.$store.commit('showNewStatuses', { timeline: this.timeline })
         this.paused = false
       }
     },
     fetchOlderStatuses: throttle(function () {
       const store = this.$store
       const credentials = store.state.users.currentUser.credentials
-      store.commit('setLoading', { timeline: this.timelineName, value: true })
+      store.commit('setLoading', { timeline: this.timeline, value: true })
       timelineFetcher.fetchAndUpdate({
         store,
         credentials,
-        timeline: this.timelineName,
+        timeline: this.timeline,
         older: true,
         showImmediately: true,
         userId: this.userId,
         tag: this.tag
-      }).then(() => store.commit('setLoading', { timeline: this.timelineName, value: false }))
+      }).then(() => store.commit('setLoading', { timeline: this.timeline, value: false }))
     }, 1000, this),
     scrollLoad (e) {
       const bodyBRect = document.body.getBoundingClientRect()
diff --git a/src/components/user_profile/user_profile.js b/src/components/user_profile/user_profile.js
index 2ca09817..d6edd25a 100644
--- a/src/components/user_profile/user_profile.js
+++ b/src/components/user_profile/user_profile.js
@@ -1,6 +1,7 @@
 import UserCardContent from '../user_card_content/user_card_content.vue'
 import UserCard from '../user_card/user_card.vue'
 import Timeline from '../timeline/timeline.vue'
+import { emptyTl } from '../../modules/statuses.js'
 
 const UserProfile = {
   created () {
@@ -13,6 +14,11 @@ const UserProfile = {
   destroyed () {
     this.$store.dispatch('stopFetching', 'user')
   },
+  data () {
+    return {
+      favorites: emptyTl({ type: 'favorites', userId: this.userId })
+    }
+  },
   computed: {
     timeline () {
       return this.$store.state.statuses.timelines.user
diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue
index a46befa5..15f7d44f 100644
--- a/src/components/user_profile/user_profile.vue
+++ b/src/components/user_profile/user_profile.vue
@@ -20,6 +20,7 @@
           <i class="icon-spin3 animate-spin"></i>
         </div>
       </div>
+      <Timeline :label="$t('user_card.favorites')" :embedded="true" :title="$t('user_profile.favorites_title')" :timeline="favorites"/>
     </tab-switcher>
   </div>
   <div v-else class="panel user-profile-placeholder">
diff --git a/src/modules/api.js b/src/modules/api.js
index a61340c2..b85b24be 100644
--- a/src/modules/api.js
+++ b/src/modules/api.js
@@ -5,7 +5,7 @@ import { Socket } from 'phoenix'
 const api = {
   state: {
     backendInteractor: backendInteractorService(),
-    fetchers: {},
+    fetchers: new Map(),
     socket: null,
     chatDisabled: false,
     followRequests: []
@@ -15,10 +15,10 @@ const api = {
       state.backendInteractor = backendInteractor
     },
     addFetcher (state, {timeline, fetcher}) {
-      state.fetchers[timeline] = fetcher
+      state.fetchers.set(timeline, fetcher)
     },
     removeFetcher (state, {timeline}) {
-      delete state.fetchers[timeline]
+      delete state.fetchers.delete(timeline)
     },
     setSocket (state, socket) {
       state.socket = socket
@@ -41,13 +41,13 @@ const api = {
       }
 
       // Don't start fetching if we already are.
-      if (!store.state.fetchers[timeline]) {
+      if (!store.state.fetchers.has(timeline)) {
         const fetcher = store.state.backendInteractor.startFetching({timeline, store, userId})
         store.commit('addFetcher', {timeline, fetcher})
       }
     },
     stopFetching (store, timeline) {
-      const fetcher = store.state.fetchers[timeline]
+      const fetcher = store.state.fetchers.get(timeline)
       window.clearInterval(fetcher)
       store.commit('removeFetcher', {timeline})
     },
diff --git a/src/modules/statuses.js b/src/modules/statuses.js
index dccccf72..33804d39 100644
--- a/src/modules/statuses.js
+++ b/src/modules/statuses.js
@@ -2,7 +2,7 @@ import { includes, remove, slice, sortBy, toInteger, each, find, flatten, maxBy,
 import apiService from '../services/api/api.service.js'
 // import parse from '../services/status_parser/status_parser.js'
 
-const emptyTl = () => ({
+export const emptyTl = (tl) => (Object.assign(tl, {
   statuses: [],
   statusesObject: {},
   faves: [],
@@ -16,7 +16,7 @@ const emptyTl = () => ({
   friends: [],
   userId: 0,
   flushMarker: 0
-})
+}))
 
 export const defaultState = {
   allStatuses: [],
@@ -33,13 +33,13 @@ export const defaultState = {
   favorites: new Set(),
   error: false,
   timelines: {
-    mentions: emptyTl(),
-    public: emptyTl(),
-    user: emptyTl(),
-    publicAndExternal: emptyTl(),
-    friends: emptyTl(),
-    tag: emptyTl(),
-    dms: emptyTl()
+    mentions: emptyTl({ type: 'mentions' }),
+    public: emptyTl({ type: 'public' }),
+    user: emptyTl({ type: 'user' }), // TODO: switch to unregistered
+    publicAndExternal: emptyTl({ type: 'publicAndExternal' }),
+    friends: emptyTl({ type: 'friends' }),
+    tag: emptyTl({ type: 'tag' }),
+    dms: emptyTl({ type: 'dms' })
   }
 }
 
@@ -137,7 +137,7 @@ const addNewStatuses = (state, { statuses, showImmediately = false, timeline, us
 
   const allStatuses = state.allStatuses
   const allStatusesObject = state.allStatusesObject
-  const timelineObject = state.timelines[timeline]
+  const timelineObject = typeof timeline === 'object' ? timeline : state.timelines[timeline]
 
   const maxNew = statuses.length > 0 ? maxBy(statuses, 'id').id : 0
   const older = timeline && maxNew < timelineObject.maxId
@@ -337,7 +337,7 @@ export const mutations = {
   addNewStatuses,
   addNewNotifications,
   showNewStatuses (state, { timeline }) {
-    const oldTimeline = (state.timelines[timeline])
+    const oldTimeline = (typeof timeline === 'object' ? timeline : state.timelines[timeline])
 
     oldTimeline.newStatusCount = 0
     oldTimeline.visibleStatuses = slice(oldTimeline.statuses, 0, 50)
@@ -346,7 +346,8 @@ export const mutations = {
     each(oldTimeline.visibleStatuses, (status) => { oldTimeline.visibleStatusesObject[status.id] = status })
   },
   clearTimeline (state, { timeline }) {
-    state.timelines[timeline] = emptyTl()
+    const timelineObject = typeof timeline === 'object' ? timeline : state.timelines[timeline]
+    emptyTl(timelineObject)
   },
   setFavorited (state, { status, value }) {
     const newStatus = state.allStatusesObject[status.id]
@@ -366,7 +367,8 @@ export const mutations = {
     newStatus.deleted = true
   },
   setLoading (state, { timeline, value }) {
-    state.timelines[timeline].loading = value
+    const timelineObject = typeof timeline === 'object' ? timeline : state.timelines[timeline]
+    timelineObject.loading = value
   },
   setNsfw (state, { id, nsfw }) {
     const newStatus = state.allStatusesObject[id]
@@ -387,7 +389,8 @@ export const mutations = {
     })
   },
   queueFlush (state, { timeline, id }) {
-    state.timelines[timeline].flushMarker = id
+    const timelineObject = typeof timeline === 'object' ? timeline : state.timelines[timeline]
+    timelineObject.flushMarker = id
   }
 }
 
diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js
index 4ee95bd1..24b38dfd 100644
--- a/src/services/api/api.service.js
+++ b/src/services/api/api.service.js
@@ -41,6 +41,8 @@ const APPROVE_USER_URL = '/api/pleroma/friendships/approve'
 const DENY_USER_URL = '/api/pleroma/friendships/deny'
 const SUGGESTIONS_URL = '/api/v1/suggestions'
 
+const MASTODON_USER_FAVORITES_TIMELINE_URL = '/api/v1/favourites'
+
 import { each, map } from 'lodash'
 import 'whatwg-fetch'
 
@@ -300,10 +302,11 @@ const fetchTimeline = ({timeline, credentials, since = false, until = false, use
     notifications: QVITTER_USER_NOTIFICATIONS_URL,
     'publicAndExternal': PUBLIC_AND_EXTERNAL_TIMELINE_URL,
     user: QVITTER_USER_TIMELINE_URL,
+    favorites: MASTODON_USER_FAVORITES_TIMELINE_URL,
     tag: TAG_TIMELINE_URL
   }
 
-  let url = timelineUrls[timeline]
+  let url = timelineUrls[timeline.type || timeline]
 
   let params = []
 
diff --git a/src/services/timeline_fetcher/timeline_fetcher.service.js b/src/services/timeline_fetcher/timeline_fetcher.service.js
index c2a7de56..6c9d59ff 100644
--- a/src/services/timeline_fetcher/timeline_fetcher.service.js
+++ b/src/services/timeline_fetcher/timeline_fetcher.service.js
@@ -3,7 +3,7 @@ import { camelCase } from 'lodash'
 import apiService from '../api/api.service.js'
 
 const update = ({store, statuses, timeline, showImmediately, userId}) => {
-  const ccTimeline = camelCase(timeline)
+  const ccTimeline = typeof timeline === 'object' ? timeline : camelCase(timeline)
 
   store.dispatch('setError', { value: false })
 
@@ -18,7 +18,7 @@ const update = ({store, statuses, timeline, showImmediately, userId}) => {
 const fetchAndUpdate = ({store, credentials, timeline = 'friends', older = false, showImmediately = false, userId = false, tag = false, until}) => {
   const args = { timeline, credentials }
   const rootState = store.rootState || store.state
-  const timelineData = rootState.statuses.timelines[camelCase(timeline)]
+  const timelineData = typeof timeline === 'object' ? timeline : rootState.statuses.timelines[camelCase(timeline)]
 
   if (older) {
     args['until'] = until || timelineData.minVisibleId
-- 
cgit v1.2.3-70-g09d2


From 519f49e29b38e568727dd7f59618002459a64d64 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Sun, 13 Jan 2019 22:07:55 +0300
Subject: separated normalization into a another file, removed catchall and
 added more stuff

---
 src/components/conversation/conversation.js        |   9 +-
 src/services/api/api.service.js                    | 105 ++----------------
 .../status_normalizer/status_normalizer.service.js | 118 +++++++++++++++++++++
 3 files changed, 131 insertions(+), 101 deletions(-)
 create mode 100644 src/services/status_normalizer/status_normalizer.service.js

(limited to 'src/components')

diff --git a/src/components/conversation/conversation.js b/src/components/conversation/conversation.js
index 9d9f7bbe..7bad14a5 100644
--- a/src/components/conversation/conversation.js
+++ b/src/components/conversation/conversation.js
@@ -1,9 +1,8 @@
 import { reduce, filter, sortBy } from 'lodash'
-import { statusType } from '../../modules/statuses.js'
 import Status from '../status/status.vue'
 
 const sortAndFilterConversation = (conversation) => {
-  conversation = filter(conversation, (status) => statusType(status) !== 'retweet')
+  conversation = filter(conversation, (status) => status.type !== 'retweet')
   return sortBy(conversation, 'id')
 }
 
@@ -18,10 +17,12 @@ const conversation = {
     'collapsable'
   ],
   computed: {
-    status () { return this.statusoid },
+    status () {
+      return this.statusoid
+    },
     conversation () {
       if (!this.status) {
-        return false
+        return []
       }
 
       const conversationId = this.status.statusnet_conversation_id
diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js
index ff36a59b..48e5d480 100644
--- a/src/services/api/api.service.js
+++ b/src/services/api/api.service.js
@@ -44,6 +44,7 @@ const SUGGESTIONS_URL = '/api/v1/suggestions'
 const MASTODON_USER_FAVORITES_TIMELINE_URL = '/api/v1/favourites'
 
 import { each, map } from 'lodash'
+import { parseStatus } from '../status_normalizer/status_normalizer.service.js'
 import 'whatwg-fetch'
 
 const oldfetch = window.fetch
@@ -272,12 +273,14 @@ const fetchConversation = ({id, credentials}) => {
   let url = `${CONVERSATION_URL}/${id}.json?count=100`
   return fetch(url, { headers: authHeaders(credentials) })
     .then((data) => data.json())
+    .then((data) => data.map(parseStatus))
 }
 
 const fetchStatus = ({id, credentials}) => {
   let url = `${STATUS_URL}/${id}.json`
   return fetch(url, { headers: authHeaders(credentials) })
     .then((data) => data.json())
+    .then((data) => parseStatus(data))
 }
 
 const setUserMute = ({id, credentials, muted = true}) => {
@@ -296,99 +299,6 @@ const setUserMute = ({id, credentials, muted = true}) => {
   })
 }
 
-export const statusType = (status) => {
-  if (status.is_post_verb) {
-    return 'status'
-  }
-
-  if (status.retweeted_status) {
-    return 'retweet'
-  }
-
-  if ((typeof status.uri === 'string' && status.uri.match(/(fave|objectType=Favourite)/)) ||
-      (typeof status.text === 'string' && status.text.match(/favorited/))) {
-    return 'favorite'
-  }
-
-  if (status.text.match(/deleted notice {{tag/) || status.qvitter_delete_notice) {
-    return 'deletion'
-  }
-
-  if (status.text.match(/started following/) || status.activity_type === 'follow') {
-    return 'follow'
-  }
-
-  return 'unknown'
-}
-
-const isMastoAPI = (status) => {
-  return status.hasOwnProperty('account')
-}
-
-const parseUser = (data) => {
-  return {
-    id: data.id,
-    screen_name: data.screen_name || data.acct
-  }
-}
-
-const parseAttachment = (data) => {
-  return {
-    ...data,
-    mimetype: data.mimetype || data.type
-  }
-}
-
-const parseData = (data) => {
-  const output = {}
-  const masto = isMastoAPI(data)
-  output.raw = data
-  output.id = data.id
-
-  output.user = parseUser(masto ? data.account : data.user)
-
-  output.attentions = ((masto ? data.mentions : data.attentions) || []).map(_ => ({
-    id: _.id,
-    following: _.following // FIXME: MastoAPI doesn't have this
-  }))
-
-  // FIXME: Masto doesn't have "raw text" data, using html data...
-  output.text = masto ? data.content : data.text
-
-  output.attachments = ((masto ? data.media_attachments : data.attachments) || []).map(parseAttachment)
-
-  const retweetedStatus = masto ? data.reblog : data.retweeted_status
-  if (retweetedStatus) {
-    output.retweeted_status = parseData(retweetedStatus)
-  }
-
-  if (masto) {
-    output.type = data.reblog ? 'retweet' : 'status'
-    output.nsfw = data.sensitive
-    output.statusnet_html = data.content
-  } else {
-    // catchall, temporary
-    Object.assign(output, data)
-
-    // QVitterAPI
-    output.type = statusType(data)
-
-    if (data.nsfw === undefined) {
-      output.nsfw = isNsfw(data)
-      if (data.retweeted_status) {
-        output.nsfw = data.retweeted_status.nsfw
-      }
-    }
-  }
-
-  return output
-}
-
-const isNsfw = (status) => {
-  const nsfwRegex = /#nsfw/i
-  return (status.tags || []).includes('nsfw') || !!status.text.match(nsfwRegex)
-}
-
 const fetchTimeline = ({timeline, credentials, since = false, until = false, userId = false, tag = false}) => {
   const timelineUrls = {
     public: PUBLIC_TIMELINE_URL,
@@ -401,10 +311,11 @@ const fetchTimeline = ({timeline, credentials, since = false, until = false, use
     favorites: MASTODON_USER_FAVORITES_TIMELINE_URL,
     tag: TAG_TIMELINE_URL
   }
+  const type = timeline.type || timeline
+  const isNotifications = type === 'notifications'
+  const params = []
 
-  let url = timelineUrls[timeline.type || timeline]
-
-  let params = []
+  let url = timelineUrls[type]
 
   if (since) {
     params.push(['since_id', since])
@@ -432,7 +343,7 @@ const fetchTimeline = ({timeline, credentials, since = false, until = false, use
       throw new Error('Error fetching timeline')
     })
     .then((data) => data.json())
-    .then((data) => data.map(parseData))
+    .then((data) => data.map(isNotifications ? _ => _ : parseStatus))
 }
 
 const verifyCredentials = (user) => {
diff --git a/src/services/status_normalizer/status_normalizer.service.js b/src/services/status_normalizer/status_normalizer.service.js
new file mode 100644
index 00000000..ce7cd050
--- /dev/null
+++ b/src/services/status_normalizer/status_normalizer.service.js
@@ -0,0 +1,118 @@
+export const qvitterStatusType = (status) => {
+  if (status.is_post_verb) {
+    return 'status'
+  }
+
+  if (status.retweeted_status) {
+    return 'retweet'
+  }
+
+  if ((typeof status.uri === 'string' && status.uri.match(/(fave|objectType=Favourite)/)) ||
+      (typeof status.text === 'string' && status.text.match(/favorited/))) {
+    return 'favorite'
+  }
+
+  if (status.text.match(/deleted notice {{tag/) || status.qvitter_delete_notice) {
+    return 'deletion'
+  }
+
+  if (status.text.match(/started following/) || status.activity_type === 'follow') {
+    return 'follow'
+  }
+
+  return 'unknown'
+}
+
+const isMastoAPI = (status) => {
+  return status.hasOwnProperty('account')
+}
+
+const parseUser = (data) => {
+  return {
+    id: data.id,
+    screen_name: data.screen_name || data.acct
+  }
+}
+
+const parseAttachment = (data) => {
+  return {
+    ...data,
+    mimetype: data.mimetype || data.type
+  }
+}
+
+export const parseStatus = (data) => {
+  const output = {}
+  const masto = isMastoAPI(data)
+  output.raw = data
+
+  console.log(masto ? 'MAMMAL' : 'OLD SHIT')
+  console.log(data)
+  if (masto) {
+    output.favorited = data.favourited
+    output.fave_num = data.favourites_count
+
+    output.repeated = data.reblogged
+    output.repeat_num = data.reblogs_count
+
+    output.type = data.reblog ? 'retweet' : 'status'
+    output.nsfw = data.sensitive
+
+    output.statusnet_html = data.content
+    // Not exactly the same...
+    output.text = data.content
+
+    output.in_reply_to_status_id = data.in_reply_to_id
+    output.in_reply_to_user_id = data.in_reply_to_user_id
+  } else {
+    output.favorited = data.favorited
+    output.fave_num = data.fave_num
+
+    output.repeated = data.repeated
+    output.repeat_num = data.repeat_num
+
+    // catchall, temporary
+    // Object.assign(output, data)
+
+    output.type = qvitterStatusType(data)
+
+    if (data.nsfw === undefined) {
+      output.nsfw = isNsfw(data)
+      if (data.retweeted_status) {
+        output.nsfw = data.retweeted_status.nsfw
+      }
+    }
+    output.statusnet_html = data.statusnet_html
+    output.text = data.text
+
+    output.in_reply_to_status_id = data.in_reply_to_id
+    output.in_reply_to_user_id = data.in_reply_to_account_id
+  }
+
+  output.id = Number(data.id)
+  output.visibility = data.visibility
+  output.created_at = new Date(data.created_at)
+
+  output.user = parseUser(masto ? data.account : data.user)
+
+  output.attentions = ((masto ? data.mentions : data.attentions) || [])
+    .map(_ => ({
+      id: _.id,
+      following: _.following // FIXME: MastoAPI doesn't have this
+    }))
+
+  output.attachments = ((masto ? data.media_attachments : data.attachments) || [])
+    .map(parseAttachment)
+
+  const retweetedStatus = masto ? data.reblog : data.retweeted_status
+  if (retweetedStatus) {
+    output.retweeted_status = parseStatus(retweetedStatus)
+  }
+
+  return output
+}
+
+const isNsfw = (status) => {
+  const nsfwRegex = /#nsfw/i
+  return (status.tags || []).includes('nsfw') || !!status.text.match(nsfwRegex)
+}
-- 
cgit v1.2.3-70-g09d2


From cab87744c830e4411ec20c1dcb2d454d657219bc Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Thu, 17 Jan 2019 21:46:03 +0300
Subject: Revert "some initial work to make it possible to use "unregistered"
 timelines, i.e. not" and some stuff to make favorites still work

This reverts commit 039a4074006fb91ac9031b41b4e9af4a15766dfa.
---
 src/components/timeline/timeline.js                | 17 +++++-----
 src/components/user_profile/user_profile.js        |  9 ++----
 src/modules/api.js                                 | 10 +++---
 src/modules/statuses.js                            | 36 ++++++++++------------
 src/services/api/api.service.js                    |  5 ++-
 .../timeline_fetcher/timeline_fetcher.service.js   |  4 +--
 6 files changed, 38 insertions(+), 43 deletions(-)

(limited to 'src/components')

diff --git a/src/components/timeline/timeline.js b/src/components/timeline/timeline.js
index 23d2c1e8..98da8660 100644
--- a/src/components/timeline/timeline.js
+++ b/src/components/timeline/timeline.js
@@ -7,6 +7,7 @@ import { throttle } from 'lodash'
 const Timeline = {
   props: [
     'timeline',
+    'timelineName',
     'title',
     'userId',
     'tag',
@@ -54,7 +55,7 @@ const Timeline = {
     timelineFetcher.fetchAndUpdate({
       store,
       credentials,
-      timeline: this.timeline,
+      timeline: this.timelineName,
       showImmediately,
       userId: this.userId,
       tag: this.tag
@@ -69,32 +70,32 @@ const Timeline = {
   destroyed () {
     window.removeEventListener('scroll', this.scrollLoad)
     if (typeof document.hidden !== 'undefined') document.removeEventListener('visibilitychange', this.handleVisibilityChange, false)
-    this.$store.commit('setLoading', { timeline: this.timeline, value: false })
+    this.$store.commit('setLoading', { timeline: this.timelineName, value: false })
   },
   methods: {
     showNewStatuses () {
       if (this.timeline.flushMarker !== 0) {
-        this.$store.commit('clearTimeline', { timeline: this.timeline })
-        this.$store.commit('queueFlush', { timeline: this.timeline, id: 0 })
+        this.$store.commit('clearTimeline', { timeline: this.timelineName })
+        this.$store.commit('queueFlush', { timeline: this.timelineName, id: 0 })
         this.fetchOlderStatuses()
       } else {
-        this.$store.commit('showNewStatuses', { timeline: this.timeline })
+        this.$store.commit('showNewStatuses', { timeline: this.timelineName })
         this.paused = false
       }
     },
     fetchOlderStatuses: throttle(function () {
       const store = this.$store
       const credentials = store.state.users.currentUser.credentials
-      store.commit('setLoading', { timeline: this.timeline, value: true })
+      store.commit('setLoading', { timeline: this.timelineName, value: true })
       timelineFetcher.fetchAndUpdate({
         store,
         credentials,
-        timeline: this.timeline,
+        timeline: this.timelineName,
         older: true,
         showImmediately: true,
         userId: this.userId,
         tag: this.tag
-      }).then(() => store.commit('setLoading', { timeline: this.timeline, value: false }))
+      }).then(() => store.commit('setLoading', { timeline: this.timelineName, value: false }))
     }, 1000, this),
     scrollLoad (e) {
       const bodyBRect = document.body.getBoundingClientRect()
diff --git a/src/components/user_profile/user_profile.js b/src/components/user_profile/user_profile.js
index 245d55ca..7f17ef69 100644
--- a/src/components/user_profile/user_profile.js
+++ b/src/components/user_profile/user_profile.js
@@ -1,7 +1,6 @@
 import UserCardContent from '../user_card_content/user_card_content.vue'
 import UserCard from '../user_card/user_card.vue'
 import Timeline from '../timeline/timeline.vue'
-import { emptyTl } from '../../modules/statuses.js'
 
 const UserProfile = {
   created () {
@@ -14,15 +13,13 @@ const UserProfile = {
   destroyed () {
     this.$store.dispatch('stopFetching', 'user')
   },
-  data () {
-    return {
-      favorites: emptyTl({ type: 'favorites', userId: this.userId })
-    }
-  },
   computed: {
     timeline () {
       return this.$store.state.statuses.timelines.user
     },
+    favorites () {
+      return this.$store.state.statuses.timelines.favorites
+    },
     userId () {
       return this.$route.params.id || this.user.id
     },
diff --git a/src/modules/api.js b/src/modules/api.js
index b85b24be..a61340c2 100644
--- a/src/modules/api.js
+++ b/src/modules/api.js
@@ -5,7 +5,7 @@ import { Socket } from 'phoenix'
 const api = {
   state: {
     backendInteractor: backendInteractorService(),
-    fetchers: new Map(),
+    fetchers: {},
     socket: null,
     chatDisabled: false,
     followRequests: []
@@ -15,10 +15,10 @@ const api = {
       state.backendInteractor = backendInteractor
     },
     addFetcher (state, {timeline, fetcher}) {
-      state.fetchers.set(timeline, fetcher)
+      state.fetchers[timeline] = fetcher
     },
     removeFetcher (state, {timeline}) {
-      delete state.fetchers.delete(timeline)
+      delete state.fetchers[timeline]
     },
     setSocket (state, socket) {
       state.socket = socket
@@ -41,13 +41,13 @@ const api = {
       }
 
       // Don't start fetching if we already are.
-      if (!store.state.fetchers.has(timeline)) {
+      if (!store.state.fetchers[timeline]) {
         const fetcher = store.state.backendInteractor.startFetching({timeline, store, userId})
         store.commit('addFetcher', {timeline, fetcher})
       }
     },
     stopFetching (store, timeline) {
-      const fetcher = store.state.fetchers.get(timeline)
+      const fetcher = store.state.fetchers[timeline]
       window.clearInterval(fetcher)
       store.commit('removeFetcher', {timeline})
     },
diff --git a/src/modules/statuses.js b/src/modules/statuses.js
index baeef8bf..f976fa42 100644
--- a/src/modules/statuses.js
+++ b/src/modules/statuses.js
@@ -2,7 +2,7 @@ import { remove, slice, each, find, maxBy, minBy, merge, last, isArray } from 'l
 import apiService from '../services/api/api.service.js'
 // import parse from '../services/status_parser/status_parser.js'
 
-export const emptyTl = (tl, userId = 0) => (Object.assign(tl, {
+const emptyTl = () => ({
   statuses: [],
   statusesObject: {},
   faves: [],
@@ -14,9 +14,9 @@ export const emptyTl = (tl, userId = 0) => (Object.assign(tl, {
   loading: false,
   followers: [],
   friends: [],
-  flushMarker: 0,
-  userId
-}))
+  userId: 0,
+  flushMarker: 0
+})
 
 export const defaultState = {
   allStatuses: [],
@@ -33,13 +33,14 @@ export const defaultState = {
   favorites: new Set(),
   error: false,
   timelines: {
-    mentions: emptyTl({ type: 'mentions' }),
-    public: emptyTl({ type: 'public' }),
-    user: emptyTl({ type: 'user' }), // TODO: switch to unregistered
-    publicAndExternal: emptyTl({ type: 'publicAndExternal' }),
-    friends: emptyTl({ type: 'friends' }),
-    tag: emptyTl({ type: 'tag' }),
-    dms: emptyTl({ type: 'dms' })
+    mentions: emptyTl(),
+    public: emptyTl(),
+    user: emptyTl(),
+    favorites: emptyTl(),
+    publicAndExternal: emptyTl(),
+    friends: emptyTl(),
+    tag: emptyTl(),
+    dms: emptyTl()
   }
 }
 
@@ -100,7 +101,7 @@ const addNewStatuses = (state, { statuses, showImmediately = false, timeline, us
 
   const allStatuses = state.allStatuses
   const allStatusesObject = state.allStatusesObject
-  const timelineObject = typeof timeline === 'object' ? timeline : state.timelines[timeline]
+  const timelineObject = state.timelines[timeline]
 
   const maxNew = statuses.length > 0 ? maxBy(statuses, 'id').id : 0
   const older = timeline && maxNew < timelineObject.maxId
@@ -297,7 +298,7 @@ export const mutations = {
   addNewStatuses,
   addNewNotifications,
   showNewStatuses (state, { timeline }) {
-    const oldTimeline = (typeof timeline === 'object' ? timeline : state.timelines[timeline])
+    const oldTimeline = (state.timelines[timeline])
 
     oldTimeline.newStatusCount = 0
     oldTimeline.visibleStatuses = slice(oldTimeline.statuses, 0, 50)
@@ -306,8 +307,7 @@ export const mutations = {
     each(oldTimeline.visibleStatuses, (status) => { oldTimeline.visibleStatusesObject[status.id] = status })
   },
   clearTimeline (state, { timeline }) {
-    const timelineObject = typeof timeline === 'object' ? timeline : state.timelines[timeline]
-    emptyTl(timelineObject, timeline.userId)
+    state.timelines[timeline] = emptyTl()
   },
   setFavorited (state, { status, value }) {
     const newStatus = state.allStatusesObject[status.id]
@@ -327,8 +327,7 @@ export const mutations = {
     newStatus.deleted = true
   },
   setLoading (state, { timeline, value }) {
-    const timelineObject = typeof timeline === 'object' ? timeline : state.timelines[timeline]
-    timelineObject.loading = value
+    state.timelines[timeline].loading = value
   },
   setNsfw (state, { id, nsfw }) {
     const newStatus = state.allStatusesObject[id]
@@ -349,8 +348,7 @@ export const mutations = {
     })
   },
   queueFlush (state, { timeline, id }) {
-    const timelineObject = typeof timeline === 'object' ? timeline : state.timelines[timeline]
-    timelineObject.flushMarker = id
+    state.timelines[timeline].flushMarker = id
   }
 }
 
diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js
index 14a526ef..0e267276 100644
--- a/src/services/api/api.service.js
+++ b/src/services/api/api.service.js
@@ -327,11 +327,10 @@ const fetchTimeline = ({timeline, credentials, since = false, until = false, use
     favorites: MASTODON_USER_FAVORITES_TIMELINE_URL,
     tag: TAG_TIMELINE_URL
   }
-  const type = timeline.type || timeline
-  const isNotifications = type === 'notifications'
+  const isNotifications = timeline === 'notifications'
   const params = []
 
-  let url = timelineUrls[type]
+  let url = timelineUrls[timeline]
 
   if (since) {
     params.push(['since_id', since])
diff --git a/src/services/timeline_fetcher/timeline_fetcher.service.js b/src/services/timeline_fetcher/timeline_fetcher.service.js
index 126e07cf..727f6c60 100644
--- a/src/services/timeline_fetcher/timeline_fetcher.service.js
+++ b/src/services/timeline_fetcher/timeline_fetcher.service.js
@@ -3,7 +3,7 @@ import { camelCase } from 'lodash'
 import apiService from '../api/api.service.js'
 
 const update = ({store, statuses, timeline, showImmediately, userId}) => {
-  const ccTimeline = typeof timeline === 'object' ? timeline : camelCase(timeline)
+  const ccTimeline = camelCase(timeline)
 
   store.dispatch('setError', { value: false })
 
@@ -18,7 +18,7 @@ const update = ({store, statuses, timeline, showImmediately, userId}) => {
 const fetchAndUpdate = ({store, credentials, timeline = 'friends', older = false, showImmediately = false, userId = false, tag = false, until}) => {
   const args = { timeline, credentials }
   const rootState = store.rootState || store.state
-  const timelineData = typeof timeline === 'object' ? timeline : rootState.statuses.timelines[camelCase(timeline)]
+  const timelineData = rootState.statuses.timelines[camelCase(timeline)]
 
   if (older) {
     args['until'] = until || timelineData.minVisibleId
-- 
cgit v1.2.3-70-g09d2


From 93cbb58212ebb83cee5bc89f8cef1ebb58969f5c Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Thu, 17 Jan 2019 22:11:51 +0300
Subject: fix login and favorites tab...

---
 src/components/user_profile/user_profile.js        | 13 +++++
 src/components/user_profile/user_profile.vue       |  2 +-
 src/modules/users.js                               | 61 +++++++++++-----------
 src/services/api/api.service.js                    | 12 +++++
 .../entity_normalizer/entity_normalizer.service.js |  8 +++
 5 files changed, 64 insertions(+), 32 deletions(-)

(limited to 'src/components')

diff --git a/src/components/user_profile/user_profile.js b/src/components/user_profile/user_profile.js
index 7f17ef69..c9197a1c 100644
--- a/src/components/user_profile/user_profile.js
+++ b/src/components/user_profile/user_profile.js
@@ -5,13 +5,16 @@ import Timeline from '../timeline/timeline.vue'
 const UserProfile = {
   created () {
     this.$store.commit('clearTimeline', { timeline: 'user' })
+    this.$store.commit('clearTimeline', { timeline: 'favorites' })
     this.$store.dispatch('startFetching', ['user', this.fetchBy])
+    this.$store.dispatch('startFetching', ['favorites', this.fetchBy])
     if (!this.user.id) {
       this.$store.dispatch('fetchUser', this.fetchBy)
     }
   },
   destroyed () {
     this.$store.dispatch('stopFetching', 'user')
+    this.$store.dispatch('stopFetching', 'favorites')
   },
   computed: {
     timeline () {
@@ -26,6 +29,9 @@ const UserProfile = {
     userName () {
       return this.$route.params.name || this.user.screen_name
     },
+    isUs () {
+      return this.userId === this.$store.state.users.currentUser.id
+    },
     friends () {
       return this.user.friends
     },
@@ -65,21 +71,28 @@ const UserProfile = {
     }
   },
   watch: {
+    // TODO get rid of this copypasta
     userName () {
       if (this.isExternal) {
         return
       }
       this.$store.dispatch('stopFetching', 'user')
+      this.$store.dispatch('stopFetching', 'favorites')
       this.$store.commit('clearTimeline', { timeline: 'user' })
+      this.$store.commit('clearTimeline', { timeline: 'favorites' })
       this.$store.dispatch('startFetching', ['user', this.fetchBy])
+      this.$store.dispatch('startFetching', ['favorites', this.fetchBy])
     },
     userId () {
       if (!this.isExternal) {
         return
       }
       this.$store.dispatch('stopFetching', 'user')
+      this.$store.dispatch('stopFetching', 'favorites')
       this.$store.commit('clearTimeline', { timeline: 'user' })
+      this.$store.commit('clearTimeline', { timeline: 'favorites' })
       this.$store.dispatch('startFetching', ['user', this.fetchBy])
+      this.$store.dispatch('startFetching', ['favorites', this.fetchBy])
     },
     user () {
       if (this.user.id && !this.user.followers) {
diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue
index 265fc65b..e53727ff 100644
--- a/src/components/user_profile/user_profile.vue
+++ b/src/components/user_profile/user_profile.vue
@@ -20,7 +20,7 @@
           <i class="icon-spin3 animate-spin"></i>
         </div>
       </div>
-      <Timeline :label="$t('user_card.favorites')" :embedded="true" :title="$t('user_profile.favorites_title')" :timeline="favorites"/>
+      <Timeline v-if="isUs" :label="$t('user_card.favorites')" :embedded="true" :title="$t('user_profile.favorites_title')" :timeline="favorites"/>
     </tab-switcher>
   </div>
   <div v-else class="panel user-profile-placeholder">
diff --git a/src/modules/users.js b/src/modules/users.js
index 33c02a07..c4d479f9 100644
--- a/src/modules/users.js
+++ b/src/modules/users.js
@@ -207,39 +207,38 @@ const users = {
         const commit = store.commit
         commit('beginLogin')
         store.rootState.api.backendInteractor.verifyCredentials(accessToken)
-          .then((response) => {
-            if (response.ok) {
-              response.json()
-                .then((user) => {
-                  // user.credentials = userCredentials
-                  user.credentials = accessToken
-                  commit('setCurrentUser', user)
-                  commit('addNewUsers', [user])
+          .then((data) => {
+            if (!data.error) {
+              const { user } = data
+              // user.credentials = userCredentials
+              user.credentials = accessToken
+              commit('setCurrentUser', user)
+              commit('addNewUsers', [user])
 
-                  getNotificationPermission()
-                    .then(permission => commit('setNotificationPermission', permission))
+              getNotificationPermission()
+                .then(permission => commit('setNotificationPermission', permission))
 
-                  // Set our new backend interactor
-                  commit('setBackendInteractor', backendInteractorService(accessToken))
+              // Set our new backend interactor
+              commit('setBackendInteractor', backendInteractorService(accessToken))
 
-                  if (user.token) {
-                    store.dispatch('initializeSocket', user.token)
-                  }
+              if (user.token) {
+                store.dispatch('initializeSocket', user.token)
+              }
 
-                  // Start getting fresh tweets.
-                  store.dispatch('startFetching', 'friends')
+              // Start getting fresh tweets.
+              store.dispatch('startFetching', 'friends')
 
-                  // Get user mutes and follower info
-                  store.rootState.api.backendInteractor.fetchMutes().then((mutedUsers) => {
-                    each(mutedUsers, (user) => { user.muted = true })
-                    store.commit('addNewUsers', mutedUsers)
-                  })
+              // Get user mutes and follower info
+              store.rootState.api.backendInteractor.fetchMutes().then((mutedUsers) => {
+                each(mutedUsers, (user) => { user.muted = true })
+                store.commit('addNewUsers', mutedUsers)
+              })
 
-                  // Fetch our friends
-                  store.rootState.api.backendInteractor.fetchFriends({ id: user.id })
-                    .then((friends) => commit('addNewUsers', friends))
-                })
+              // Fetch our friends
+              store.rootState.api.backendInteractor.fetchFriends({ id: user.id })
+                .then((friends) => commit('addNewUsers', friends))
             } else {
+              const response = data.error
               // Authentication failed
               commit('endLogin')
               if (response.status === 401) {
@@ -251,11 +250,11 @@ const users = {
             commit('endLogin')
             resolve()
           })
-          .catch((error) => {
-            console.log(error)
-            commit('endLogin')
-            reject('Failed to connect to server, try again')
-          })
+        .catch((error) => {
+          console.log(error)
+          commit('endLogin')
+          reject('Failed to connect to server, try again')
+        })
       })
     }
   }
diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js
index 0e267276..c45f8572 100644
--- a/src/services/api/api.service.js
+++ b/src/services/api/api.service.js
@@ -366,6 +366,18 @@ const verifyCredentials = (user) => {
     method: 'POST',
     headers: authHeaders(user)
   })
+    .then((response) => {
+      if (response.ok) {
+        return response.json()
+      } else {
+        return {
+          error: response
+        }
+      }
+    })
+    .then((data) => ({
+      user: parseUser(data)
+    }))
 }
 
 const favorite = ({ id, credentials }) => {
diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js
index ca0f36db..fa35bba3 100644
--- a/src/services/entity_normalizer/entity_normalizer.service.js
+++ b/src/services/entity_normalizer/entity_normalizer.service.js
@@ -80,6 +80,14 @@ export const parseUser = (data) => {
 
     output.statusnet_profile_url = data.statusnet_profile_url
     output.is_local = data.is_local
+
+    // QVITTER ONLY FOR NOW
+    // Really only applies to logged in user, really.. I THINK
+    output.rights = data.rights
+    output.no_rich_text = data.no_rich_text
+    output.default_scope = data.default_scope
+    output.hide_network = data.hide_network
+    output.background_image = data.background_image
   }
 
   output.created_at = new Date(data.created_at)
-- 
cgit v1.2.3-70-g09d2


From 6e219c2961ddd205d618f2775076c25f49c63ca2 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Thu, 17 Jan 2019 22:25:50 +0300
Subject: add support for tab-switcher to automatically switch to first tab if
 asked index is invalid

---
 src/components/tab_switcher/tab_switcher.jsx | 45 ++++++++++++++++++----------
 src/components/user_profile/user_profile.vue |  2 +-
 2 files changed, 30 insertions(+), 17 deletions(-)

(limited to 'src/components')

diff --git a/src/components/tab_switcher/tab_switcher.jsx b/src/components/tab_switcher/tab_switcher.jsx
index 2f362c4d..175ae777 100644
--- a/src/components/tab_switcher/tab_switcher.jsx
+++ b/src/components/tab_switcher/tab_switcher.jsx
@@ -1,23 +1,32 @@
 import Vue from 'vue'
 
+
 import './tab_switcher.scss'
 
 export default Vue.component('tab-switcher', {
   name: 'TabSwitcher',
   data () {
     return {
-      active: 0
+      active: this.$slots.default.findIndex(_ => _.tag)
     }
   },
   methods: {
-    activateTab(index) {
-      return () => this.active = index;
+    activateTab (index) {
+      return () => {
+        this.active = index
+      }
+    }
+  },
+  beforeUpdate () {
+    const currentSlot = this.$slots.default[this.active]
+    if (!currentSlot.tag) {
+      this.active = this.$slots.default.findIndex(_ => _.tag)
     }
   },
-  render(h) {
+  render (h) {
     const tabs = this.$slots.default
-          .filter(slot => slot.data)
           .map((slot, index) => {
+            if (!slot.tag) return
             const classesTab = ['tab']
             const classesWrapper = ['tab-wrapper']
 
@@ -25,28 +34,32 @@ export default Vue.component('tab-switcher', {
               classesTab.push('active')
               classesWrapper.push('active')
             }
+
             return (
               <div class={ classesWrapper.join(' ')}>
-                <button onClick={this.activateTab(index)} class={ classesTab.join(' ') }>{slot.data.attrs.label}</button>
+              <button onClick={this.activateTab(index)} class={ classesTab.join(' ') }>{slot.data.attrs.label}</button>
               </div>
             )
-          });
-    const contents = this.$slots.default.filter(_=>_.data).map(( slot, index ) => {
+          })
+
+    const contents = this.$slots.default.map((slot, index) => {
+      if (!slot.tag) return
       const active = index === this.active
       return (
         <div class={active ? 'active' : 'hidden'}>
-          {slot}
+        {slot}
         </div>
       )
-    });
+    })
+
     return (
       <div class="tab-switcher">
-        <div class="tabs">
-          {tabs}
-        </div>
-        <div class="contents">
-          {contents}
-        </div>
+      <div class="tabs">
+      {tabs}
+      </div>
+      <div class="contents">
+      {contents}
+      </div>
       </div>
     )
   }
diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue
index e53727ff..d64ce277 100644
--- a/src/components/user_profile/user_profile.vue
+++ b/src/components/user_profile/user_profile.vue
@@ -20,7 +20,7 @@
           <i class="icon-spin3 animate-spin"></i>
         </div>
       </div>
-      <Timeline v-if="isUs" :label="$t('user_card.favorites')" :embedded="true" :title="$t('user_profile.favorites_title')" :timeline="favorites"/>
+      <Timeline v-if="isUs" :label="$t('user_card.favorites')" :embedded="true" :title="$t('user_profile.favorites_title')" timeline-name="favorites" :timeline="favorites"/>
     </tab-switcher>
   </div>
   <div v-else class="panel user-profile-placeholder">
-- 
cgit v1.2.3-70-g09d2


From 8172eeb1e070c96fd086093088918a6e9abeeb8b Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Thu, 17 Jan 2019 23:05:58 +0300
Subject: fix indents

---
 src/components/tab_switcher/tab_switcher.jsx | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/components')

diff --git a/src/components/tab_switcher/tab_switcher.jsx b/src/components/tab_switcher/tab_switcher.jsx
index 175ae777..2eb30ea6 100644
--- a/src/components/tab_switcher/tab_switcher.jsx
+++ b/src/components/tab_switcher/tab_switcher.jsx
@@ -54,12 +54,12 @@ export default Vue.component('tab-switcher', {
 
     return (
       <div class="tab-switcher">
-      <div class="tabs">
-      {tabs}
-      </div>
-      <div class="contents">
-      {contents}
-      </div>
+        <div class="tabs">
+          {tabs}
+        </div>
+        <div class="contents">
+          {contents}
+        </div>
       </div>
     )
   }
-- 
cgit v1.2.3-70-g09d2


From 80a7035154ccd4ccf9f761d4117f286e352676e9 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Thu, 17 Jan 2019 23:08:44 +0300
Subject: removing unnecessary conversions since it should already be converted
 in normalizer

---
 src/components/conversation-page/conversation-page.js | 2 +-
 src/components/conversation/conversation.js           | 7 ++++---
 src/modules/statuses.js                               | 5 +----
 src/modules/users.js                                  | 2 +-
 4 files changed, 7 insertions(+), 9 deletions(-)

(limited to 'src/components')

diff --git a/src/components/conversation-page/conversation-page.js b/src/components/conversation-page/conversation-page.js
index bdf84d0c..8f1ac3d9 100644
--- a/src/components/conversation-page/conversation-page.js
+++ b/src/components/conversation-page/conversation-page.js
@@ -7,7 +7,7 @@ const conversationPage = {
   },
   computed: {
     statusoid () {
-      const id = String(this.$route.params.id)
+      const id = this.$route.params.id
       const statuses = this.$store.state.statuses.allStatuses
       const status = find(statuses, {id})
 
diff --git a/src/components/conversation/conversation.js b/src/components/conversation/conversation.js
index 237de7e5..9bf5e136 100644
--- a/src/components/conversation/conversation.js
+++ b/src/components/conversation/conversation.js
@@ -33,7 +33,9 @@ const conversation = {
     replies () {
       let i = 1
       return reduce(this.conversation, (result, {id, in_reply_to_status_id}) => {
-        const irid = String(in_reply_to_status_id)
+        /* eslint-disable camelcase */
+        const irid = in_reply_to_status_id
+        /* eslint-enable camelcase */
         if (irid) {
           result[irid] = result[irid] || []
           result[irid].push({
@@ -70,7 +72,6 @@ const conversation = {
       }
     },
     getReplies (id) {
-      id = String(id)
       return this.replies[id] || []
     },
     focused (id) {
@@ -81,7 +82,7 @@ const conversation = {
       }
     },
     setHighlight (id) {
-      this.highlight = String(id)
+      this.highlight = id
     }
   }
 }
diff --git a/src/modules/statuses.js b/src/modules/statuses.js
index f976fa42..83cf7256 100644
--- a/src/modules/statuses.js
+++ b/src/modules/statuses.js
@@ -64,9 +64,6 @@ const visibleNotificationTypes = (rootState) => {
 }
 
 const mergeOrAdd = (arr, obj, item) => {
-  // For sequential IDs BE passes numbers as numbers, we want them as strings.
-  item.id = String(item.id)
-
   const oldItem = obj[item.id]
 
   if (oldItem) {
@@ -164,7 +161,7 @@ const addNewStatuses = (state, { statuses, showImmediately = false, timeline, us
   }
 
   const favoriteStatus = (favorite, counter) => {
-    const status = find(allStatuses, { id: String(favorite.in_reply_to_status_id) })
+    const status = find(allStatuses, { id: favorite.in_reply_to_status_id })
     if (status) {
       // This is our favorite, so the relevant bit.
       if (favorite.user.id === user.id) {
diff --git a/src/modules/users.js b/src/modules/users.js
index 0b55d701..d83f0dd8 100644
--- a/src/modules/users.js
+++ b/src/modules/users.js
@@ -151,7 +151,7 @@ const users = {
     },
     addNewNotifications (store, { notifications }) {
       const users = map(notifications, 'from_profile')
-      const notificationIds = notifications.map(_ => String(_.id))
+      const notificationIds = notifications.map(_ => _.id)
       store.commit('addNewUsers', users)
 
       const notificationsObject = store.rootState.statuses.notifications.idStore
-- 
cgit v1.2.3-70-g09d2


From 6c70e9950c34eaffff79368a9e89ee1e58964296 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Thu, 17 Jan 2019 23:44:31 +0300
Subject: some more post fields

---
 src/components/status/status.js                             |  2 +-
 src/services/entity_normalizer/entity_normalizer.service.js | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

(limited to 'src/components')

diff --git a/src/components/status/status.js b/src/components/status/status.js
index b648ab70..27f7bafa 100644
--- a/src/components/status/status.js
+++ b/src/components/status/status.js
@@ -141,7 +141,7 @@ const Status = {
       if (this.status.user.id === this.$store.state.users.currentUser.id) {
         return false
       }
-      if (this.status.activity_type === 'repeat') {
+      if (this.status.type === 'retweet') {
         return false
       }
       var checkFollowing = this.$store.state.config.replyVisibility === 'following'
diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js
index 9b4905a7..7321a1b3 100644
--- a/src/services/entity_normalizer/entity_normalizer.service.js
+++ b/src/services/entity_normalizer/entity_normalizer.service.js
@@ -127,6 +127,7 @@ export const parseStatus = (data) => {
 
     output.in_reply_to_status_id = data.in_reply_to_id
     output.in_reply_to_user_id = data.in_reply_to_account_id
+    output.in_reply_to_screen_name = data.in_reply_to_screen_name
 
     // Not exactly the same but works
     output.statusnet_conversation_id = data.id
@@ -136,6 +137,10 @@ export const parseStatus = (data) => {
     }
 
     output.summary = data.spoiler_text
+    output.external_url = data.url
+
+    // FIXME missing!!
+    output.is_local = false
   } else {
     output.favorited = data.favorited
     output.fave_num = data.fave_num
@@ -163,6 +168,9 @@ export const parseStatus = (data) => {
     output.in_reply_to_status_id = data.in_reply_to_status_id
     output.in_reply_to_user_id = data.in_reply_to_user_id
 
+    // Missing!! fix in UI?
+    output.in_reply_to_screen_name = null
+
     output.statusnet_conversation_id = data.statusnet_conversation_id
 
     if (output.type === 'retweet') {
@@ -170,6 +178,8 @@ export const parseStatus = (data) => {
     }
 
     output.summary = data.summary
+    output.external_url = data.external_url
+    output.is_local = data.is_local
   }
 
   output.id = String(data.id)
-- 
cgit v1.2.3-70-g09d2


From 92dedcd53e56562205e704eea2754f159eb9707d Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Tue, 22 Jan 2019 20:26:06 +0300
Subject: linting

---
 src/components/tab_switcher/tab_switcher.jsx | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'src/components')

diff --git a/src/components/tab_switcher/tab_switcher.jsx b/src/components/tab_switcher/tab_switcher.jsx
index 2eb30ea6..9038733c 100644
--- a/src/components/tab_switcher/tab_switcher.jsx
+++ b/src/components/tab_switcher/tab_switcher.jsx
@@ -1,6 +1,5 @@
 import Vue from 'vue'
 
-
 import './tab_switcher.scss'
 
 export default Vue.component('tab-switcher', {
@@ -37,7 +36,7 @@ export default Vue.component('tab-switcher', {
 
             return (
               <div class={ classesWrapper.join(' ')}>
-              <button onClick={this.activateTab(index)} class={ classesTab.join(' ') }>{slot.data.attrs.label}</button>
+                <button onClick={this.activateTab(index)} class={ classesTab.join(' ') }>{slot.data.attrs.label}</button>
               </div>
             )
           })
@@ -47,7 +46,7 @@ export default Vue.component('tab-switcher', {
       const active = index === this.active
       return (
         <div class={active ? 'active' : 'hidden'}>
-        {slot}
+          {slot}
         </div>
       )
     })
-- 
cgit v1.2.3-70-g09d2