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: [PATCH 01/48] 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 ++--
 src/modules/statuses.js                               | 10 ++++++----
 src/services/notification_utils/notification_utils.js |  4 ++--
 5 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/components/conversation-page/conversation-page.js b/src/components/conversation-page/conversation-page.js
index beffa5bbc1..bdf84d0c6c 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 9d9f7bbe16..95432248fb 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 73d53694e6..7e1e7dabf3 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) {
diff --git a/src/modules/statuses.js b/src/modules/statuses.js
index dccccf7248..fe65d843e8 100644
--- a/src/modules/statuses.js
+++ b/src/modules/statuses.js
@@ -1,4 +1,4 @@
-import { includes, remove, slice, sortBy, toInteger, each, find, flatten, maxBy, minBy, merge, last, isArray } from 'lodash'
+import { includes, remove, slice, each, find, flatten, maxBy, minBy, merge, last, isArray } from 'lodash'
 import apiService from '../services/api/api.service.js'
 // import parse from '../services/status_parser/status_parser.js'
 
@@ -122,9 +122,11 @@ const mergeOrAdd = (arr, obj, item) => {
   }
 }
 
+const sortById = (a, b) => a.id > b.id ? -1 : 1
+
 const sortTimeline = (timeline) => {
-  timeline.visibleStatuses = sortBy(timeline.visibleStatuses, ({id}) => -id)
-  timeline.statuses = sortBy(timeline.statuses, ({id}) => -id)
+  timeline.visibleStatuses = timeline.visibleStatuses.sort(sortById)
+  timeline.statuses = timeline.statuses.sort(sortById)
   timeline.minVisibleId = (last(timeline.visibleStatuses) || {}).id
   return timeline
 }
@@ -200,7 +202,7 @@ const addNewStatuses = (state, { statuses, showImmediately = false, timeline, us
   }
 
   const favoriteStatus = (favorite, counter) => {
-    const status = find(allStatuses, { id: toInteger(favorite.in_reply_to_status_id) })
+    const status = find(allStatuses, { id: String(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/services/notification_utils/notification_utils.js b/src/services/notification_utils/notification_utils.js
index f5ac0d4766..c6782af4fc 100644
--- a/src/services/notification_utils/notification_utils.js
+++ b/src/services/notification_utils/notification_utils.js
@@ -10,8 +10,8 @@ export const visibleTypes = store => ([
 ].filter(_ => _))
 
 export const visibleNotificationsFromStore = store => {
-  // Don't know why, but sortBy([seen, -action.id]) doesn't work.
-  let sortedNotifications = sortBy(notificationsFromStore(store), ({action}) => -action.id)
+  // map is just to clone the array since sort mutates it and it causes some issues
+  let sortedNotifications = notificationsFromStore(store).map(_ => _).sort((a, b) => a.id > b.id ? -1 : 1)
   sortedNotifications = sortBy(sortedNotifications, 'seen')
   return sortedNotifications.filter((notification) => visibleTypes(store).includes(notification.type))
 }

From 48e811e6edc774affa3526e7a25df6bb07597c9d Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Fri, 11 Jan 2019 03:00:11 +0300
Subject: [PATCH 02/48] added some more explicit to string conversion since BE
 seem to be sending numbers and it could cause an issue.

---
 src/modules/statuses.js | 8 ++++++++
 src/modules/users.js    | 7 +++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/modules/statuses.js b/src/modules/statuses.js
index fe65d843e8..05626a024a 100644
--- a/src/modules/statuses.js
+++ b/src/modules/statuses.js
@@ -105,6 +105,9 @@ export const findMaxId = (...args) => {
 }
 
 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) {
@@ -292,8 +295,13 @@ const addNewNotifications = (state, { dispatch, notifications, older, visibleNot
   each(notifications, (notification) => {
     const result = mergeOrAdd(allStatuses, allStatusesObject, notification.notice)
     const action = result.item
+    // For sequential IDs BE passes numbers as numbers, we want them as strings.
+    action.id = String(action.id)
+
     // Only add a new notification if we don't have one for the same action
+    // TODO: this technically works but should be checking for notification.id, not action.id i think
     if (!find(state.notifications.data, (oldNotification) => oldNotification.action.id === action.id)) {
+      // TODO: adapt to "what if notification ids are not actually numbers"
       state.notifications.maxId = Math.max(notification.id, state.notifications.maxId)
       state.notifications.minId = Math.min(notification.id, state.notifications.minId)
 
diff --git a/src/modules/users.js b/src/modules/users.js
index adbd37dd4b..9d00b78287 100644
--- a/src/modules/users.js
+++ b/src/modules/users.js
@@ -7,6 +7,9 @@ import { humanizeErrors } from './errors'
 
 // TODO: Unify with mergeOrAdd in statuses.js
 export const mergeOrAdd = (arr, obj, item) => {
+  // For sequential IDs BE passes numbers as numbers, we want them as strings.
+  item.id = String(item.id)
+
   if (!item) { return false }
   const oldItem = obj[item.id]
   if (oldItem) {
@@ -64,10 +67,10 @@ export const mutations = {
     each(users, (user) => mergeOrAdd(state.users, state.usersObject, user))
   },
   setUserForStatus (state, status) {
-    status.user = state.usersObject[status.user.id]
+    status.user = state.usersObject[String(status.user.id)]
   },
   setUserForNotification (state, notification) {
-    notification.action.user = state.usersObject[notification.action.user.id]
+    notification.action.user = state.usersObject[String(notification.action.user.id)]
   },
   setColor (state, { user: { id }, highlighted }) {
     const user = state.usersObject[id]

From b18e27c6d4d2b3d681be8dd81dafcdfeaf20fb35 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Fri, 11 Jan 2019 03:38:23 +0300
Subject: [PATCH 03/48] fix tests, removed one unused function, fix real
 problem that tests helped to surface

---
 src/modules/statuses.js                       |   4 -
 .../notification_utils/notification_utils.js  |   2 +-
 test/unit/specs/modules/statuses.spec.js      | 105 ++++++++----------
 test/unit/specs/modules/users.spec.js         |  16 +--
 .../notification_utils.spec.js                |  16 +--
 5 files changed, 62 insertions(+), 81 deletions(-)

diff --git a/src/modules/statuses.js b/src/modules/statuses.js
index 05626a024a..a931fd9725 100644
--- a/src/modules/statuses.js
+++ b/src/modules/statuses.js
@@ -100,10 +100,6 @@ export const statusType = (status) => {
   return 'unknown'
 }
 
-export const findMaxId = (...args) => {
-  return (maxBy(flatten(args), 'id') || {}).id
-}
-
 const mergeOrAdd = (arr, obj, item) => {
   // For sequential IDs BE passes numbers as numbers, we want them as strings.
   item.id = String(item.id)
diff --git a/src/services/notification_utils/notification_utils.js b/src/services/notification_utils/notification_utils.js
index c6782af4fc..c38796779e 100644
--- a/src/services/notification_utils/notification_utils.js
+++ b/src/services/notification_utils/notification_utils.js
@@ -11,7 +11,7 @@ export const visibleTypes = store => ([
 
 export const visibleNotificationsFromStore = store => {
   // map is just to clone the array since sort mutates it and it causes some issues
-  let sortedNotifications = notificationsFromStore(store).map(_ => _).sort((a, b) => a.id > b.id ? -1 : 1)
+  let sortedNotifications = notificationsFromStore(store).map(_ => _).sort((a, b) => a.action.id > b.action.id ? -1 : 1)
   sortedNotifications = sortBy(sortedNotifications, 'seen')
   return sortedNotifications.filter((notification) => visibleTypes(store).includes(notification.type))
 }
diff --git a/test/unit/specs/modules/statuses.spec.js b/test/unit/specs/modules/statuses.spec.js
index 7d403312a1..f4d0ddf42d 100644
--- a/test/unit/specs/modules/statuses.spec.js
+++ b/test/unit/specs/modules/statuses.spec.js
@@ -1,11 +1,11 @@
 import { cloneDeep } from 'lodash'
-import { defaultState, mutations, findMaxId, prepareStatus, statusType } from '../../../../src/modules/statuses.js'
+import { defaultState, mutations, prepareStatus, statusType } from '../../../../src/modules/statuses.js'
 
 // eslint-disable-next-line camelcase
 const makeMockStatus = ({id, text, is_post_verb = true}) => {
   return {
     id,
-    user: {id: 0},
+    user: {id: '0'},
     name: 'status',
     text: text || `Text number ${id}`,
     fave_num: 0,
@@ -32,45 +32,30 @@ describe('Statuses.statusType', () => {
 
 describe('Statuses.prepareStatus', () => {
   it('sets nsfw for statuses with the #nsfw tag', () => {
-    const safe = makeMockStatus({id: 1, text: 'Hello oniichan'})
-    const nsfw = makeMockStatus({id: 1, text: 'Hello oniichan #nsfw'})
+    const safe = makeMockStatus({id: '1', text: 'Hello oniichan'})
+    const nsfw = makeMockStatus({id: '1', text: 'Hello oniichan #nsfw'})
 
     expect(prepareStatus(safe).nsfw).to.eq(false)
     expect(prepareStatus(nsfw).nsfw).to.eq(true)
   })
 
   it('leaves existing nsfw settings alone', () => {
-    const nsfw = makeMockStatus({id: 1, text: 'Hello oniichan #nsfw'})
+    const nsfw = makeMockStatus({id: '1', text: 'Hello oniichan #nsfw'})
     nsfw.nsfw = false
 
     expect(prepareStatus(nsfw).nsfw).to.eq(false)
   })
 
   it('sets deleted flag to false', () => {
-    const aStatus = makeMockStatus({id: 1, text: 'Hello oniichan'})
+    const aStatus = makeMockStatus({id: '1', text: 'Hello oniichan'})
     expect(prepareStatus(aStatus).deleted).to.eq(false)
   })
 })
 
-describe('Statuses.findMaxId', () => {
-  it('returns the largest id in any of the given arrays', () => {
-    const statusesOne = [{ id: 100 }, { id: 2 }]
-    const statusesTwo = [{ id: 3 }]
-
-    const maxId = findMaxId(statusesOne, statusesTwo)
-    expect(maxId).to.eq(100)
-  })
-
-  it('returns undefined for empty arrays', () => {
-    const maxId = findMaxId([], [])
-    expect(maxId).to.eq(undefined)
-  })
-})
-
 describe('The Statuses module', () => {
   it('adds the status to allStatuses and to the given timeline', () => {
     const state = cloneDeep(defaultState)
-    const status = makeMockStatus({id: 1})
+    const status = makeMockStatus({id: '1'})
 
     mutations.addNewStatuses(state, { statuses: [status], timeline: 'public' })
 
@@ -82,7 +67,7 @@ describe('The Statuses module', () => {
 
   it('counts the status as new if it has not been seen on this timeline', () => {
     const state = cloneDeep(defaultState)
-    const status = makeMockStatus({id: 1})
+    const status = makeMockStatus({id: '1'})
 
     mutations.addNewStatuses(state, { statuses: [status], timeline: 'public' })
     mutations.addNewStatuses(state, { statuses: [status], timeline: 'friends' })
@@ -100,7 +85,7 @@ describe('The Statuses module', () => {
 
   it('add the statuses to allStatuses if no timeline is given', () => {
     const state = cloneDeep(defaultState)
-    const status = makeMockStatus({id: 1})
+    const status = makeMockStatus({id: '1'})
 
     mutations.addNewStatuses(state, { statuses: [status] })
 
@@ -112,7 +97,7 @@ describe('The Statuses module', () => {
 
   it('adds the status to allStatuses and to the given timeline, directly visible', () => {
     const state = cloneDeep(defaultState)
-    const status = makeMockStatus({id: 1})
+    const status = makeMockStatus({id: '1'})
 
     mutations.addNewStatuses(state, { statuses: [status], showImmediately: true, timeline: 'public' })
 
@@ -124,10 +109,10 @@ describe('The Statuses module', () => {
 
   it('removes statuses by tag on deletion', () => {
     const state = cloneDeep(defaultState)
-    const status = makeMockStatus({id: 1})
-    const otherStatus = makeMockStatus({id: 3})
+    const status = makeMockStatus({id: '1'})
+    const otherStatus = makeMockStatus({id: '3'})
     status.uri = 'xxx'
-    const deletion = makeMockStatus({id: 2, is_post_verb: false})
+    const deletion = makeMockStatus({id: '2', is_post_verb: false})
     deletion.text = 'Dolus deleted notice {{tag:gs.smuglo.li,2016-11-18:noticeId=1038007:objectType=note}}.'
     deletion.uri = 'xxx'
 
@@ -137,36 +122,36 @@ describe('The Statuses module', () => {
     expect(state.allStatuses).to.eql([otherStatus])
     expect(state.timelines.public.statuses).to.eql([otherStatus])
     expect(state.timelines.public.visibleStatuses).to.eql([otherStatus])
-    expect(state.timelines.public.maxId).to.eql(3)
+    expect(state.timelines.public.maxId).to.eql('3')
   })
 
   it('does not update the maxId when the noIdUpdate flag is set', () => {
     const state = cloneDeep(defaultState)
-    const status = makeMockStatus({id: 1})
-    const secondStatus = makeMockStatus({id: 2})
+    const status = makeMockStatus({id: '1'})
+    const secondStatus = makeMockStatus({id: '2'})
 
     mutations.addNewStatuses(state, { statuses: [status], showImmediately: true, timeline: 'public' })
-    expect(state.timelines.public.maxId).to.eql(1)
+    expect(state.timelines.public.maxId).to.eql('1')
 
     mutations.addNewStatuses(state, { statuses: [secondStatus], showImmediately: true, timeline: 'public', noIdUpdate: true })
     expect(state.timelines.public.statuses).to.eql([secondStatus, status])
     expect(state.timelines.public.visibleStatuses).to.eql([secondStatus, status])
-    expect(state.timelines.public.maxId).to.eql(1)
+    expect(state.timelines.public.maxId).to.eql('1')
   })
 
   it('keeps a descending by id order in timeline.visibleStatuses and timeline.statuses', () => {
     const state = cloneDeep(defaultState)
-    const nonVisibleStatus = makeMockStatus({id: 1})
-    const status = makeMockStatus({id: 3})
-    const statusTwo = makeMockStatus({id: 2})
-    const statusThree = makeMockStatus({id: 4})
+    const nonVisibleStatus = makeMockStatus({id: '1'})
+    const status = makeMockStatus({id: '3'})
+    const statusTwo = makeMockStatus({id: '2'})
+    const statusThree = makeMockStatus({id: '4'})
 
     mutations.addNewStatuses(state, { statuses: [nonVisibleStatus], showImmediately: false, timeline: 'public' })
 
     mutations.addNewStatuses(state, { statuses: [status], showImmediately: true, timeline: 'public' })
     mutations.addNewStatuses(state, { statuses: [statusTwo], showImmediately: true, timeline: 'public' })
 
-    expect(state.timelines.public.minVisibleId).to.equal(2)
+    expect(state.timelines.public.minVisibleId).to.equal('2')
 
     mutations.addNewStatuses(state, { statuses: [statusThree], showImmediately: true, timeline: 'public' })
 
@@ -176,9 +161,9 @@ describe('The Statuses module', () => {
 
   it('splits retweets from their status and links them', () => {
     const state = cloneDeep(defaultState)
-    const status = makeMockStatus({id: 1})
-    const retweet = makeMockStatus({id: 2, is_post_verb: false})
-    const modStatus = makeMockStatus({id: 1, text: 'something else'})
+    const status = makeMockStatus({id: '1'})
+    const retweet = makeMockStatus({id: '2', is_post_verb: false})
+    const modStatus = makeMockStatus({id: '1', text: 'something else'})
 
     retweet.retweeted_status = status
 
@@ -187,22 +172,22 @@ describe('The Statuses module', () => {
     expect(state.timelines.public.visibleStatuses).to.have.length(1)
     expect(state.timelines.public.statuses).to.have.length(1)
     expect(state.allStatuses).to.have.length(2)
-    expect(state.allStatuses[0].id).to.equal(1)
-    expect(state.allStatuses[1].id).to.equal(2)
+    expect(state.allStatuses[0].id).to.equal('1')
+    expect(state.allStatuses[1].id).to.equal('2')
 
     // It refers to the modified status.
     mutations.addNewStatuses(state, { statuses: [modStatus], timeline: 'public' })
     expect(state.allStatuses).to.have.length(2)
-    expect(state.allStatuses[0].id).to.equal(1)
+    expect(state.allStatuses[0].id).to.equal('1')
     expect(state.allStatuses[0].text).to.equal(modStatus.text)
-    expect(state.allStatuses[1].id).to.equal(2)
+    expect(state.allStatuses[1].id).to.equal('2')
     expect(retweet.retweeted_status.text).to.eql(modStatus.text)
   })
 
   it('replaces existing statuses with the same id', () => {
     const state = cloneDeep(defaultState)
-    const status = makeMockStatus({id: 1})
-    const modStatus = makeMockStatus({id: 1, text: 'something else'})
+    const status = makeMockStatus({id: '1'})
+    const modStatus = makeMockStatus({id: '1', text: 'something else'})
 
     // Add original status
     mutations.addNewStatuses(state, { statuses: [status], showImmediately: true, timeline: 'public' })
@@ -218,9 +203,9 @@ describe('The Statuses module', () => {
 
   it('replaces existing statuses with the same id, coming from a retweet', () => {
     const state = cloneDeep(defaultState)
-    const status = makeMockStatus({id: 1})
-    const modStatus = makeMockStatus({id: 1, text: 'something else'})
-    const retweet = makeMockStatus({id: 2, is_post_verb: false})
+    const status = makeMockStatus({id: '1'})
+    const modStatus = makeMockStatus({id: '1', text: 'something else'})
+    const retweet = makeMockStatus({id: '2', is_post_verb: false})
     retweet.retweeted_status = modStatus
 
     // Add original status
@@ -239,15 +224,15 @@ describe('The Statuses module', () => {
 
   it('handles favorite actions', () => {
     const state = cloneDeep(defaultState)
-    const status = makeMockStatus({id: 1})
+    const status = makeMockStatus({id: '1'})
 
     const favorite = {
-      id: 2,
+      id: '2',
       is_post_verb: false,
       in_reply_to_status_id: '1', // The API uses strings here...
       uri: 'tag:shitposter.club,2016-08-21:fave:3895:note:773501:2016-08-21T16:52:15+00:00',
       text: 'a favorited something by b',
-      user: { id: 99 }
+      user: { id: '99' }
     }
 
     mutations.addNewStatuses(state, { statuses: [status], showImmediately: true, timeline: 'public' })
@@ -266,11 +251,11 @@ describe('The Statuses module', () => {
 
     // If something is favorited by the current user, it also sets the 'favorited' property but does not increment counter to avoid over-counting. Counter is incremented (updated, really) via response to the favorite request.
     const user = {
-      id: 1
+      id: '1'
     }
 
     const ownFavorite = {
-      id: 3,
+      id: '3',
       is_post_verb: false,
       in_reply_to_status_id: '1', // The API uses strings here...
       uri: 'tag:shitposter.club,2016-08-21:fave:3895:note:773501:2016-08-21T16:52:15+00:00',
@@ -287,16 +272,16 @@ describe('The Statuses module', () => {
 
   describe('notifications', () => {
     it('removes a notification when the notice gets removed', () => {
-      const user = { id: 1 }
+      const user = { id: '1' }
       const state = cloneDeep(defaultState)
-      const status = makeMockStatus({id: 1})
-      const otherStatus = makeMockStatus({id: 3})
-      const mentionedStatus = makeMockStatus({id: 2})
+      const status = makeMockStatus({id: '1'})
+      const otherStatus = makeMockStatus({id: '3'})
+      const mentionedStatus = makeMockStatus({id: '2'})
       mentionedStatus.attentions = [user]
       mentionedStatus.uri = 'xxx'
       otherStatus.attentions = [user]
 
-      const deletion = makeMockStatus({id: 4, is_post_verb: false})
+      const deletion = makeMockStatus({id: '4', is_post_verb: false})
       deletion.text = 'Dolus deleted notice {{tag:gs.smuglo.li,2016-11-18:noticeId=1038007:objectType=note}}.'
       deletion.uri = 'xxx'
 
diff --git a/test/unit/specs/modules/users.spec.js b/test/unit/specs/modules/users.spec.js
index af60c9b399..b0f3c51eeb 100644
--- a/test/unit/specs/modules/users.spec.js
+++ b/test/unit/specs/modules/users.spec.js
@@ -6,8 +6,8 @@ describe('The users module', () => {
   describe('mutations', () => {
     it('adds new users to the set, merging in new information for old users', () => {
       const state = cloneDeep(defaultState)
-      const user = { id: 1, name: 'Guy' }
-      const modUser = { id: 1, name: 'Dude' }
+      const user = { id: '1', name: 'Guy' }
+      const modUser = { id: '1', name: 'Dude' }
 
       mutations.addNewUsers(state, [user])
       expect(state.users).to.have.length(1)
@@ -21,7 +21,7 @@ describe('The users module', () => {
 
     it('sets a mute bit on users', () => {
       const state = cloneDeep(defaultState)
-      const user = { id: 1, name: 'Guy' }
+      const user = { id: '1', name: 'Guy' }
 
       mutations.addNewUsers(state, [user])
       mutations.setMuted(state, {user, muted: true})
@@ -38,11 +38,11 @@ describe('The users module', () => {
     it('returns user with matching screen_name', () => {
       const state = {
         users: [
-          { screen_name: 'Guy', id: 1 }
+          { screen_name: 'Guy', id: '1' }
         ]
       }
       const name = 'Guy'
-      const expected = { screen_name: 'Guy', id: 1 }
+      const expected = { screen_name: 'Guy', id: '1' }
       expect(getters.userByName(state)(name)).to.eql(expected)
     })
   })
@@ -51,11 +51,11 @@ describe('The users module', () => {
     it('returns user with matching id', () => {
       const state = {
         users: [
-          { screen_name: 'Guy', id: 1 }
+          { screen_name: 'Guy', id: '1' }
         ]
       }
-      const id = 1
-      const expected = { screen_name: 'Guy', id: 1 }
+      const id = '1'
+      const expected = { screen_name: 'Guy', id: '1' }
       expect(getters.userById(state)(id)).to.eql(expected)
     })
   })
diff --git a/test/unit/specs/services/notification_utils/notification_utils.spec.js b/test/unit/specs/services/notification_utils/notification_utils.spec.js
index c44b8c9e0d..e945459edd 100644
--- a/test/unit/specs/services/notification_utils/notification_utils.spec.js
+++ b/test/unit/specs/services/notification_utils/notification_utils.spec.js
@@ -9,15 +9,15 @@ describe('NotificationUtils', () => {
             notifications: {
               data: [
                 {
-                  action: { id: 1 },
+                  action: { id: '1' },
                   type: 'like'
                 },
                 {
-                  action: { id: 2 },
+                  action: { id: '2' },
                   type: 'mention'
                 },
                 {
-                  action: { id: 3 },
+                  action: { id: '3' },
                   type: 'repeat'
                 }
               ]
@@ -34,11 +34,11 @@ describe('NotificationUtils', () => {
       }
       const expected = [
         {
-          action: { id: 3 },
+          action: { id: '3' },
           type: 'repeat'
         },
         {
-          action: { id: 1 },
+          action: { id: '1' },
           type: 'like'
         }
       ]
@@ -54,12 +54,12 @@ describe('NotificationUtils', () => {
             notifications: {
               data: [
                 {
-                  action: { id: 1 },
+                  action: { id: '1' },
                   type: 'like',
                   seen: false
                 },
                 {
-                  action: { id: 2 },
+                  action: { id: '2' },
                   type: 'mention',
                   seen: true
                 }
@@ -77,7 +77,7 @@ describe('NotificationUtils', () => {
       }
       const expected = [
         {
-          action: { id: 1 },
+          action: { id: '1' },
           type: 'like',
           seen: false
         }

From 22e0686395de023eb4c26b94be11954fc4803331 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Fri, 11 Jan 2019 03:41:57 +0300
Subject: [PATCH 04/48] fix lint

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

diff --git a/src/modules/statuses.js b/src/modules/statuses.js
index a931fd9725..f90b0ed3bf 100644
--- a/src/modules/statuses.js
+++ b/src/modules/statuses.js
@@ -1,4 +1,4 @@
-import { includes, remove, slice, each, find, flatten, maxBy, minBy, merge, last, isArray } from 'lodash'
+import { includes, remove, slice, each, find, maxBy, minBy, merge, last, isArray } from 'lodash'
 import apiService from '../services/api/api.service.js'
 // import parse from '../services/status_parser/status_parser.js'
 

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: [PATCH 05/48] 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.service.js               |  4 +--
 7 files changed, 43 insertions(+), 31 deletions(-)

diff --git a/src/components/timeline/timeline.js b/src/components/timeline/timeline.js
index 98da86607b..23d2c1e817 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 2ca098171d..d6edd25aaf 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 a46befa53d..15f7d44f6e 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 a61340c223..b85b24be56 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 dccccf7248..33804d3999 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 4ee95bd10e..24b38dfd36 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 c2a7de5605..6c9d59ff2b 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

From 4be737b4df76b4ff730ac7a474ff744d5d42d256 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Sun, 13 Jan 2019 01:26:24 +0300
Subject: [PATCH 06/48] moved some stuff from statuses to api service. added
 initial adapter (currently mastoapi status -> qvitter status, would change
 some naming in the future)

favorites timeline works somewhat, notifications are broken because they are
fetched using same code to fetch usual timeline/using old architechture
---
 src/modules/statuses.js         | 50 ++---------------
 src/services/api/api.service.js | 97 +++++++++++++++++++++++++++++++++
 2 files changed, 103 insertions(+), 44 deletions(-)

diff --git a/src/modules/statuses.js b/src/modules/statuses.js
index 33804d3999..b4d61b13f9 100644
--- a/src/modules/statuses.js
+++ b/src/modules/statuses.js
@@ -1,4 +1,4 @@
-import { includes, remove, slice, sortBy, toInteger, each, find, flatten, maxBy, minBy, merge, last, isArray } from 'lodash'
+import { remove, slice, sortBy, toInteger, each, find, flatten, maxBy, minBy, merge, last, isArray } from 'lodash'
 import apiService from '../services/api/api.service.js'
 // import parse from '../services/status_parser/status_parser.js'
 
@@ -43,20 +43,7 @@ export const defaultState = {
   }
 }
 
-const isNsfw = (status) => {
-  const nsfwRegex = /#nsfw/i
-  return includes(status.tags, 'nsfw') || !!status.text.match(nsfwRegex)
-}
-
 export const prepareStatus = (status) => {
-  // Parse nsfw tags
-  if (status.nsfw === undefined) {
-    status.nsfw = isNsfw(status)
-    if (status.retweeted_status) {
-      status.nsfw = status.retweeted_status.nsfw
-    }
-  }
-
   // Set deleted flag
   status.deleted = false
 
@@ -75,31 +62,6 @@ const visibleNotificationTypes = (rootState) => {
   ].filter(_ => _)
 }
 
-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'
-}
-
 export const findMaxId = (...args) => {
   return (maxBy(flatten(args), 'id') || {}).id
 }
@@ -153,13 +115,13 @@ const addNewStatuses = (state, { statuses, showImmediately = false, timeline, us
     return
   }
 
-  const addStatus = (status, showImmediately, addToTimeline = true) => {
-    const result = mergeOrAdd(allStatuses, allStatusesObject, status)
-    status = result.item
+  const addStatus = (data, showImmediately, addToTimeline = true) => {
+    const result = mergeOrAdd(allStatuses, allStatusesObject, data)
+    const status = result.item
 
     if (result.new) {
       // We are mentioned in a post
-      if (statusType(status) === 'status' && find(status.attentions, { id: user.id })) {
+      if (status.type === 'status' && find(status.attentions, { id: user.id })) {
         const mentions = state.timelines.mentions
 
         // Add the mention to the mentions timeline
@@ -270,7 +232,7 @@ const addNewStatuses = (state, { statuses, showImmediately = false, timeline, us
   }
 
   each(statuses, (status) => {
-    const type = statusType(status)
+    const type = status.type
     const processor = processors[type] || processors['default']
     processor(status)
   })
diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js
index 24b38dfd36..ff36a59bf4 100644
--- a/src/services/api/api.service.js
+++ b/src/services/api/api.service.js
@@ -72,6 +72,7 @@ const updateAvatar = ({credentials, params}) => {
       form.append(key, value)
     }
   })
+
   return fetch(url, {
     headers: authHeaders(credentials),
     method: 'POST',
@@ -89,6 +90,7 @@ const updateBg = ({credentials, params}) => {
       form.append(key, value)
     }
   })
+
   return fetch(url, {
     headers: authHeaders(credentials),
     method: 'POST',
@@ -112,6 +114,7 @@ const updateBanner = ({credentials, params}) => {
       form.append(key, value)
     }
   })
+
   return fetch(url, {
     headers: authHeaders(credentials),
     method: 'POST',
@@ -293,6 +296,99 @@ 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,
@@ -336,6 +432,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))
 }
 
 const verifyCredentials = (user) => {

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: [PATCH 07/48] 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.service.js              | 118 ++++++++++++++++++
 3 files changed, 131 insertions(+), 101 deletions(-)
 create mode 100644 src/services/status_normalizer/status_normalizer.service.js

diff --git a/src/components/conversation/conversation.js b/src/components/conversation/conversation.js
index 9d9f7bbe16..7bad14a5ec 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 ff36a59bf4..48e5d4801e 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 0000000000..ce7cd0507f
--- /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)
+}

From 5a3c9cfc9bf702943e95f9f62c0c5cab4ce6122c Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Sun, 13 Jan 2019 22:25:06 +0300
Subject: [PATCH 08/48] post-merge fix

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

diff --git a/src/modules/statuses.js b/src/modules/statuses.js
index 97b6d2ee5f..3118e686ea 100644
--- a/src/modules/statuses.js
+++ b/src/modules/statuses.js
@@ -2,7 +2,7 @@ import { remove, slice, sortBy, toInteger, each, find, flatten, maxBy, minBy, me
 import apiService from '../services/api/api.service.js'
 // import parse from '../services/status_parser/status_parser.js'
 
-export const emptyTl = (tl, userId) => (Object.assign(tl, {
+export const emptyTl = (tl, userId = 0) => (Object.assign(tl, {
   statuses: [],
   statusesObject: {},
   faves: [],
@@ -14,7 +14,6 @@ export const emptyTl = (tl, userId) => (Object.assign(tl, {
   loading: false,
   followers: [],
   friends: [],
-  userId: 0,
   flushMarker: 0,
   userId
 }))

From e0fd6d12ed8e4105a5c95bf4f5b36bec4bd31183 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Mon, 14 Jan 2019 15:30:14 +0300
Subject: [PATCH 09/48] user normalizer works

---
 src/services/api/api.service.js               |  8 ++-
 .../status_normalizer.service.js              | 70 +++++++++++++++++--
 2 files changed, 71 insertions(+), 7 deletions(-)

diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js
index 48e5d4801e..de72bdbb27 100644
--- a/src/services/api/api.service.js
+++ b/src/services/api/api.service.js
@@ -44,7 +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 { parseStatus, parseUser } from '../status_normalizer/status_normalizer.service.js'
 import 'whatwg-fetch'
 
 const oldfetch = window.fetch
@@ -243,24 +243,28 @@ const fetchUser = ({id, credentials}) => {
   let url = `${USER_URL}?user_id=${id}`
   return fetch(url, { headers: authHeaders(credentials) })
     .then((data) => data.json())
+    .then((data) => parseUser(data))
 }
 
 const fetchFriends = ({id, credentials}) => {
   let url = `${FRIENDS_URL}?user_id=${id}`
   return fetch(url, { headers: authHeaders(credentials) })
     .then((data) => data.json())
+    .then((data) => data.map(parseUser))
 }
 
 const fetchFollowers = ({id, credentials}) => {
   let url = `${FOLLOWERS_URL}?user_id=${id}`
   return fetch(url, { headers: authHeaders(credentials) })
     .then((data) => data.json())
+    .then((data) => data.map(parseUser))
 }
 
 const fetchAllFollowing = ({username, credentials}) => {
   const url = `${ALL_FOLLOWING_URL}/${username}.json`
   return fetch(url, { headers: authHeaders(credentials) })
     .then((data) => data.json())
+    .then((data) => data.map(parseUser))
 }
 
 const fetchFollowRequests = ({credentials}) => {
@@ -280,7 +284,7 @@ const fetchStatus = ({id, credentials}) => {
   let url = `${STATUS_URL}/${id}.json`
   return fetch(url, { headers: authHeaders(credentials) })
     .then((data) => data.json())
-    .then((data) => parseStatus(data))
+    .then((data) => data.map(parseStatus))
 }
 
 const setUserMute = ({id, credentials, muted = true}) => {
diff --git a/src/services/status_normalizer/status_normalizer.service.js b/src/services/status_normalizer/status_normalizer.service.js
index ce7cd0507f..6a575bf5ac 100644
--- a/src/services/status_normalizer/status_normalizer.service.js
+++ b/src/services/status_normalizer/status_normalizer.service.js
@@ -1,4 +1,4 @@
-export const qvitterStatusType = (status) => {
+const qvitterStatusType = (status) => {
   if (status.is_post_verb) {
     return 'status'
   }
@@ -27,11 +27,71 @@ const isMastoAPI = (status) => {
   return status.hasOwnProperty('account')
 }
 
-const parseUser = (data) => {
-  return {
-    id: data.id,
-    screen_name: data.screen_name || data.acct
+export const parseUser = (data) => {
+  const output = {}
+  const masto = data.hasOwnProperty('acct')
+  // case for users in "mentions" property for statuses in MastoAPI
+  const mastoShort = masto && !data.hasOwnProperty('avatar')
+
+  output.id = data.id
+
+  if (masto) {
+    output.screen_name = data.acct
+
+    // There's nothing else to get
+    if (mastoShort) {
+      return output
+    }
+
+    output.name = null // missing
+    output.name_html = data.display_name
+
+    output.description = null // missing
+    output.description_html = data.note
+
+    // Utilize avatar_static for gif avatars?
+    output.profile_image_url = data.avatar
+    output.profile_image_url_original = data.avatar
+
+    // Same, utilize header_static?
+    output.cover_photo = data.header
+
+    output.friends_count = data.following_count
+
+    output.bot = data.bot
+
+    output.statusnet_profile_url = data.url
+
+    // Missing, trying to recover
+    output.is_local = !output.screen_name.includes('@')
+  } else {
+    output.screen_name = data.screen_name
+
+    output.name = data.name
+    output.name_html = data.name_html
+
+    output.description = data.description
+    output.description_html = data.description_html
+
+    output.profile_image_url = data.profile_image_url
+    output.profile_image_url_original = data.profile_image_url_original
+
+    output.cover_photo = data.cover_photo
+
+    output.friends_count = data.friends_count
+
+    output.bot = null // missing
+
+    output.statusnet_profile_url = data.statusnet_profile_url
+    output.is_local = data.is_local
   }
+
+  output.created_at = new Date(data.created_at)
+  output.locked = data.locked
+  output.followers_count = data.followers_count
+  output.statuses_count = data.statuses_count
+
+  return output
 }
 
 const parseAttachment = (data) => {

From 790fcf37d223f129640aca20c7e185a26b226cdd Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Mon, 14 Jan 2019 22:38:37 +0300
Subject: [PATCH 10/48] notifications now also undergo some parsing,
 hypothetically could use MastoAPI notifications, maybe.

---
 src/modules/statuses.js                       | 37 +++++++-----------
 src/modules/users.js                          |  5 ++-
 src/services/api/api.service.js               |  4 +-
 .../status_normalizer.service.js              | 39 ++++++++++++++++---
 4 files changed, 53 insertions(+), 32 deletions(-)

diff --git a/src/modules/statuses.js b/src/modules/statuses.js
index 3118e686ea..88791191a2 100644
--- a/src/modules/statuses.js
+++ b/src/modules/statuses.js
@@ -250,42 +250,33 @@ const addNewNotifications = (state, { dispatch, notifications, older, visibleNot
   const allStatuses = state.allStatuses
   const allStatusesObject = state.allStatusesObject
   each(notifications, (notification) => {
-    const result = mergeOrAdd(allStatuses, allStatusesObject, notification.notice)
-    const action = result.item
+    notification.action = mergeOrAdd(allStatuses, allStatusesObject, notification.action).item
+    notification.status = notification.status && mergeOrAdd(allStatuses, allStatusesObject, notification.status).item
+
     // Only add a new notification if we don't have one for the same action
-    if (!find(state.notifications.data, (oldNotification) => oldNotification.action.id === action.id)) {
+    if (!state.notifications.idStore.hasOwnProperty(notification.id)) {
       state.notifications.maxId = Math.max(notification.id, state.notifications.maxId)
       state.notifications.minId = Math.min(notification.id, state.notifications.minId)
 
-      const fresh = !notification.is_seen
-      const status = notification.ntype === 'like'
-            ? action.favorited_status
-            : action
-
-      const result = {
-        type: notification.ntype,
-        status,
-        action,
-        seen: !fresh
-      }
-
-      state.notifications.data.push(result)
-      state.notifications.idStore[notification.id] = result
+      console.log('AWOOOOOO', notification)
+      state.notifications.data.push(notification)
+      state.notifications.idStore[notification.id] = notification
 
       if ('Notification' in window && window.Notification.permission === 'granted') {
+        const notifObj = {}
+        const action = notification.action
         const title = action.user.name
-        const result = {}
-        result.icon = action.user.profile_image_url
-        result.body = action.text // there's a problem that it doesn't put a space before links tho
+        notifObj.icon = action.user.profile_image_url
+        notifObj.body = action.text // there's a problem that it doesn't put a space before links tho
 
         // Shows first attached non-nsfw image, if any. Should add configuration for this somehow...
         if (action.attachments && action.attachments.length > 0 && !action.nsfw &&
             action.attachments[0].mimetype.startsWith('image/')) {
-          result.image = action.attachments[0].url
+          notifObj.image = action.attachments[0].url
         }
 
-        if (fresh && !state.notifications.desktopNotificationSilence && visibleNotificationTypes.includes(notification.ntype)) {
-          let notification = new window.Notification(title, result)
+        if (notification.fresh && !state.notifications.desktopNotificationSilence && visibleNotificationTypes.includes(notification.ntype)) {
+          let notification = new window.Notification(title, notifObj)
           // Chrome is known for not closing notifications automatically
           // according to MDN, anyway.
           setTimeout(notification.close.bind(notification), 5000)
diff --git a/src/modules/users.js b/src/modules/users.js
index adbd37dd4b..33c02a0787 100644
--- a/src/modules/users.js
+++ b/src/modules/users.js
@@ -68,6 +68,7 @@ export const mutations = {
   },
   setUserForNotification (state, notification) {
     notification.action.user = state.usersObject[notification.action.user.id]
+    notification.from_profile = state.usersObject[notification.action.user.id]
   },
   setColor (state, { user: { id }, highlighted }) {
     const user = state.usersObject[id]
@@ -149,8 +150,8 @@ const users = {
       })
     },
     addNewNotifications (store, { notifications }) {
-      const users = compact(map(notifications, 'from_profile'))
-      const notificationIds = compact(notifications.map(_ => String(_.id)))
+      const users = map(notifications, 'from_profile')
+      const notificationIds = notifications.map(_ => String(_.id))
       store.commit('addNewUsers', users)
 
       const notificationsObject = store.rootState.statuses.notifications.idStore
diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js
index de72bdbb27..b6180403c3 100644
--- a/src/services/api/api.service.js
+++ b/src/services/api/api.service.js
@@ -44,7 +44,7 @@ const SUGGESTIONS_URL = '/api/v1/suggestions'
 const MASTODON_USER_FAVORITES_TIMELINE_URL = '/api/v1/favourites'
 
 import { each, map } from 'lodash'
-import { parseStatus, parseUser } from '../status_normalizer/status_normalizer.service.js'
+import { parseStatus, parseUser, parseNotification } from '../status_normalizer/status_normalizer.service.js'
 import 'whatwg-fetch'
 
 const oldfetch = window.fetch
@@ -347,7 +347,7 @@ const fetchTimeline = ({timeline, credentials, since = false, until = false, use
       throw new Error('Error fetching timeline')
     })
     .then((data) => data.json())
-    .then((data) => data.map(isNotifications ? _ => _ : parseStatus))
+    .then((data) => data.map(isNotifications ? parseNotification : parseStatus))
 }
 
 const verifyCredentials = (user) => {
diff --git a/src/services/status_normalizer/status_normalizer.service.js b/src/services/status_normalizer/status_normalizer.service.js
index 6a575bf5ac..0dbceaa4b9 100644
--- a/src/services/status_normalizer/status_normalizer.service.js
+++ b/src/services/status_normalizer/status_normalizer.service.js
@@ -23,10 +23,6 @@ const qvitterStatusType = (status) => {
   return 'unknown'
 }
 
-const isMastoAPI = (status) => {
-  return status.hasOwnProperty('account')
-}
-
 export const parseUser = (data) => {
   const output = {}
   const masto = data.hasOwnProperty('acct')
@@ -95,6 +91,7 @@ export const parseUser = (data) => {
 }
 
 const parseAttachment = (data) => {
+  // TODO A little bit messy ATM but works with both APIs
   return {
     ...data,
     mimetype: data.mimetype || data.type
@@ -103,11 +100,12 @@ const parseAttachment = (data) => {
 
 export const parseStatus = (data) => {
   const output = {}
-  const masto = isMastoAPI(data)
+  const masto = data.hasOwnProperty('account')
   output.raw = data
 
   console.log(masto ? 'MAMMAL' : 'OLD SHIT')
   console.log(data)
+
   if (masto) {
     output.favorited = data.favourited
     output.fave_num = data.favourites_count
@@ -172,6 +170,37 @@ export const parseStatus = (data) => {
   return output
 }
 
+export const parseNotification = (data) => {
+  const mastoDict = {
+    'favourite': 'like',
+    'reblog': 'repeat'
+  }
+  const masto = !data.hasOwnProperty('ntype')
+  const output = {}
+
+  if (masto) {
+    output.type = mastoDict[data.type] || data.type
+    output.seen = null // missing
+    output.status = parseStatus(data.status)
+    output.action = null // missing
+    output.from_profile = parseUser(data.account)
+  } else {
+    const parsedNotice = parseStatus(data.notice)
+    output.type = data.ntype
+    output.seen = data.is_seen
+    output.status = output.type === 'like'
+      ? parseStatus(data.notice.favorited_status)
+      : parsedNotice
+    output.action = parsedNotice
+    output.from_profile = parseUser(data.from_profile)
+  }
+
+  output.created_at = new Date(data.created_at)
+  output.id = data.id
+
+  return output
+}
+
 const isNsfw = (status) => {
   const nsfwRegex = /#nsfw/i
   return (status.tags || []).includes('nsfw') || !!status.text.match(nsfwRegex)

From fd27c78c4b85ff889833bd247ab0cfc53ad7b176 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Mon, 14 Jan 2019 22:58:23 +0300
Subject: [PATCH 11/48] fixes, guards

---
 src/modules/statuses.js                            |  2 +-
 src/services/api/api.service.js                    | 14 +++++++++++++-
 .../status_normalizer/status_normalizer.service.js |  8 +++++++-
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/src/modules/statuses.js b/src/modules/statuses.js
index 88791191a2..73d034f174 100644
--- a/src/modules/statuses.js
+++ b/src/modules/statuses.js
@@ -300,7 +300,7 @@ export const mutations = {
   },
   clearTimeline (state, { timeline }) {
     const timelineObject = typeof timeline === 'object' ? timeline : state.timelines[timeline]
-    emptyTl(timelineObject, state.timelines[timeline].userId)
+    emptyTl(timelineObject, timeline.userId)
   },
   setFavorited (state, { status, value }) {
     const newStatus = state.allStatusesObject[status.id]
diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js
index b6180403c3..e82f4f81f3 100644
--- a/src/services/api/api.service.js
+++ b/src/services/api/api.service.js
@@ -277,6 +277,12 @@ const fetchConversation = ({id, credentials}) => {
   let url = `${CONVERSATION_URL}/${id}.json?count=100`
   return fetch(url, { headers: authHeaders(credentials) })
     .then((data) => data.json())
+    .then((data) => {
+      if (data.ok) {
+        return data
+      }
+      throw new Error('Error fetching timeline')
+    })
     .then((data) => data.map(parseStatus))
 }
 
@@ -284,7 +290,13 @@ const fetchStatus = ({id, credentials}) => {
   let url = `${STATUS_URL}/${id}.json`
   return fetch(url, { headers: authHeaders(credentials) })
     .then((data) => data.json())
-    .then((data) => data.map(parseStatus))
+    .then((data) => {
+      if (data.ok) {
+        return data
+      }
+      throw new Error('Error fetching timeline')
+    })
+    .then((data) => parseStatus(data))
 }
 
 const setUserMute = ({id, credentials, muted = true}) => {
diff --git a/src/services/status_normalizer/status_normalizer.service.js b/src/services/status_normalizer/status_normalizer.service.js
index 0dbceaa4b9..5ca5a2791c 100644
--- a/src/services/status_normalizer/status_normalizer.service.js
+++ b/src/services/status_normalizer/status_normalizer.service.js
@@ -117,11 +117,15 @@ export const parseStatus = (data) => {
     output.nsfw = data.sensitive
 
     output.statusnet_html = data.content
-    // Not exactly the same...
+
+    // Not exactly the same but works?
     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
+
+    // Not exactly the same but works
+    output.statusnet_conversation_id = data.id
   } else {
     output.favorited = data.favorited
     output.fave_num = data.fave_num
@@ -145,6 +149,8 @@ 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.statusnet_conversation_id = data.statusnet_conversation_id
   }
 
   output.id = Number(data.id)

From 966a9e78aff1c714e4429f8828ba7d656cb300e6 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Mon, 14 Jan 2019 22:59:02 +0300
Subject: [PATCH 12/48] cleanup

---
 src/modules/statuses.js                                     | 1 -
 src/services/status_normalizer/status_normalizer.service.js | 4 ----
 2 files changed, 5 deletions(-)

diff --git a/src/modules/statuses.js b/src/modules/statuses.js
index 73d034f174..fde019b780 100644
--- a/src/modules/statuses.js
+++ b/src/modules/statuses.js
@@ -258,7 +258,6 @@ const addNewNotifications = (state, { dispatch, notifications, older, visibleNot
       state.notifications.maxId = Math.max(notification.id, state.notifications.maxId)
       state.notifications.minId = Math.min(notification.id, state.notifications.minId)
 
-      console.log('AWOOOOOO', notification)
       state.notifications.data.push(notification)
       state.notifications.idStore[notification.id] = notification
 
diff --git a/src/services/status_normalizer/status_normalizer.service.js b/src/services/status_normalizer/status_normalizer.service.js
index 5ca5a2791c..784c7f20ca 100644
--- a/src/services/status_normalizer/status_normalizer.service.js
+++ b/src/services/status_normalizer/status_normalizer.service.js
@@ -101,10 +101,6 @@ const parseAttachment = (data) => {
 export const parseStatus = (data) => {
   const output = {}
   const masto = data.hasOwnProperty('account')
-  output.raw = data
-
-  console.log(masto ? 'MAMMAL' : 'OLD SHIT')
-  console.log(data)
 
   if (masto) {
     output.favorited = data.favourited

From d7bd294666cba08b6f6a8d447fbdf4cd59e66b2b Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Tue, 15 Jan 2019 18:39:24 +0300
Subject: [PATCH 13/48] migrated some tests to normalizer, fixed some potential
 bug, fixed tests to use normalized naming instead of raw qvitter api objects.
 needs more tests tho.

---
 src/modules/statuses.js                       |   3 +
 src/services/api/api.service.js               |   2 +-
 .../entity_normalizer.service.js}             |   3 +
 test/unit/specs/modules/statuses.spec.js      |  64 ++++-------
 .../entity_normalizer.spec.js                 | 102 ++++++++++++++++++
 5 files changed, 128 insertions(+), 46 deletions(-)
 rename src/services/{status_normalizer/status_normalizer.service.js => entity_normalizer/entity_normalizer.service.js} (99%)
 create mode 100644 test/unit/specs/services/entity_normalizer/entity_normalizer.spec.js

diff --git a/src/modules/statuses.js b/src/modules/statuses.js
index fde019b780..2ece12baad 100644
--- a/src/modules/statuses.js
+++ b/src/modules/statuses.js
@@ -225,6 +225,9 @@ const addNewStatuses = (state, { statuses, showImmediately = false, timeline, us
         remove(timelineObject.visibleStatuses, { uri })
       }
     },
+    'follow': (follow) => {
+      // NOOP, it is known status but we don't do anything about it for now
+    },
     'default': (unknown) => {
       console.log('unknown status type')
       console.log(unknown)
diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js
index e82f4f81f3..14a526ef10 100644
--- a/src/services/api/api.service.js
+++ b/src/services/api/api.service.js
@@ -44,7 +44,7 @@ const SUGGESTIONS_URL = '/api/v1/suggestions'
 const MASTODON_USER_FAVORITES_TIMELINE_URL = '/api/v1/favourites'
 
 import { each, map } from 'lodash'
-import { parseStatus, parseUser, parseNotification } from '../status_normalizer/status_normalizer.service.js'
+import { parseStatus, parseUser, parseNotification } from '../entity_normalizer/entity_normalizer.service.js'
 import 'whatwg-fetch'
 
 const oldfetch = window.fetch
diff --git a/src/services/status_normalizer/status_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js
similarity index 99%
rename from src/services/status_normalizer/status_normalizer.service.js
rename to src/services/entity_normalizer/entity_normalizer.service.js
index 784c7f20ca..adc7f04751 100644
--- a/src/services/status_normalizer/status_normalizer.service.js
+++ b/src/services/entity_normalizer/entity_normalizer.service.js
@@ -139,7 +139,10 @@ export const parseStatus = (data) => {
       if (data.retweeted_status) {
         output.nsfw = data.retweeted_status.nsfw
       }
+    } else {
+      output.nsfw = data.nsfw
     }
+
     output.statusnet_html = data.statusnet_html
     output.text = data.text
 
diff --git a/test/unit/specs/modules/statuses.spec.js b/test/unit/specs/modules/statuses.spec.js
index 7d403312a1..0b511b8047 100644
--- a/test/unit/specs/modules/statuses.spec.js
+++ b/test/unit/specs/modules/statuses.spec.js
@@ -1,8 +1,8 @@
 import { cloneDeep } from 'lodash'
-import { defaultState, mutations, findMaxId, prepareStatus, statusType } from '../../../../src/modules/statuses.js'
+import { defaultState, mutations, findMaxId, prepareStatus } from '../../../../src/modules/statuses.js'
 
 // eslint-disable-next-line camelcase
-const makeMockStatus = ({id, text, is_post_verb = true}) => {
+const makeMockStatus = ({id, text, type = 'status'}) => {
   return {
     id,
     user: {id: 0},
@@ -10,42 +10,12 @@ const makeMockStatus = ({id, text, is_post_verb = true}) => {
     text: text || `Text number ${id}`,
     fave_num: 0,
     uri: '',
-    is_post_verb,
+    type,
     attentions: []
   }
 }
 
-describe('Statuses.statusType', () => {
-  it('identifies favorites', () => {
-    const fav = {
-      uri: 'tag:soykaf.com,2016-08-21:fave:2558:note:339495:2016-08-21T16:54:04+00:00'
-    }
-
-    const mastoFav = {
-      uri: 'tag:mastodon.social,2016-11-27:objectId=73903:objectType=Favourite'
-    }
-
-    expect(statusType(fav)).to.eql('favorite')
-    expect(statusType(mastoFav)).to.eql('favorite')
-  })
-})
-
 describe('Statuses.prepareStatus', () => {
-  it('sets nsfw for statuses with the #nsfw tag', () => {
-    const safe = makeMockStatus({id: 1, text: 'Hello oniichan'})
-    const nsfw = makeMockStatus({id: 1, text: 'Hello oniichan #nsfw'})
-
-    expect(prepareStatus(safe).nsfw).to.eq(false)
-    expect(prepareStatus(nsfw).nsfw).to.eq(true)
-  })
-
-  it('leaves existing nsfw settings alone', () => {
-    const nsfw = makeMockStatus({id: 1, text: 'Hello oniichan #nsfw'})
-    nsfw.nsfw = false
-
-    expect(prepareStatus(nsfw).nsfw).to.eq(false)
-  })
-
   it('sets deleted flag to false', () => {
     const aStatus = makeMockStatus({id: 1, text: 'Hello oniichan'})
     expect(prepareStatus(aStatus).deleted).to.eq(false)
@@ -127,7 +97,7 @@ describe('The Statuses module', () => {
     const status = makeMockStatus({id: 1})
     const otherStatus = makeMockStatus({id: 3})
     status.uri = 'xxx'
-    const deletion = makeMockStatus({id: 2, is_post_verb: false})
+    const deletion = makeMockStatus({id: 2, type: 'deletion'})
     deletion.text = 'Dolus deleted notice {{tag:gs.smuglo.li,2016-11-18:noticeId=1038007:objectType=note}}.'
     deletion.uri = 'xxx'
 
@@ -177,7 +147,7 @@ describe('The Statuses module', () => {
   it('splits retweets from their status and links them', () => {
     const state = cloneDeep(defaultState)
     const status = makeMockStatus({id: 1})
-    const retweet = makeMockStatus({id: 2, is_post_verb: false})
+    const retweet = makeMockStatus({id: 2, type: 'retweet'})
     const modStatus = makeMockStatus({id: 1, text: 'something else'})
 
     retweet.retweeted_status = status
@@ -220,7 +190,7 @@ describe('The Statuses module', () => {
     const state = cloneDeep(defaultState)
     const status = makeMockStatus({id: 1})
     const modStatus = makeMockStatus({id: 1, text: 'something else'})
-    const retweet = makeMockStatus({id: 2, is_post_verb: false})
+    const retweet = makeMockStatus({id: 2, type: 'retweet'})
     retweet.retweeted_status = modStatus
 
     // Add original status
@@ -243,7 +213,7 @@ describe('The Statuses module', () => {
 
     const favorite = {
       id: 2,
-      is_post_verb: false,
+      type: 'favorite',
       in_reply_to_status_id: '1', // The API uses strings here...
       uri: 'tag:shitposter.club,2016-08-21:fave:3895:note:773501:2016-08-21T16:52:15+00:00',
       text: 'a favorited something by b',
@@ -271,7 +241,7 @@ describe('The Statuses module', () => {
 
     const ownFavorite = {
       id: 3,
-      is_post_verb: false,
+      type: 'favorite',
       in_reply_to_status_id: '1', // The API uses strings here...
       uri: 'tag:shitposter.club,2016-08-21:fave:3895:note:773501:2016-08-21T16:52:15+00:00',
       text: 'a favorited something by b',
@@ -296,7 +266,7 @@ describe('The Statuses module', () => {
       mentionedStatus.uri = 'xxx'
       otherStatus.attentions = [user]
 
-      const deletion = makeMockStatus({id: 4, is_post_verb: false})
+      const deletion = makeMockStatus({id: 4, type: 'deletion'})
       deletion.text = 'Dolus deleted notice {{tag:gs.smuglo.li,2016-11-18:noticeId=1038007:objectType=note}}.'
       deletion.uri = 'xxx'
 
@@ -305,10 +275,12 @@ describe('The Statuses module', () => {
         state,
         {
           notifications: [{
-            ntype: 'mention',
+            from_profile: { id: 2 },
+            id: 998,
+            type: 'mention',
             status: otherStatus,
-            notice: otherStatus,
-            is_seen: false
+            action: otherStatus,
+            seen: false
           }]
         })
 
@@ -317,10 +289,12 @@ describe('The Statuses module', () => {
         state,
         {
           notifications: [{
-            ntype: 'mention',
+            from_profile: { id: 2 },
+            id: 999,
+            type: 'mention',
             status: mentionedStatus,
-            notice: mentionedStatus,
-            is_seen: false
+            action: mentionedStatus,
+            seen: false
           }]
         })
 
diff --git a/test/unit/specs/services/entity_normalizer/entity_normalizer.spec.js b/test/unit/specs/services/entity_normalizer/entity_normalizer.spec.js
new file mode 100644
index 0000000000..e58827252c
--- /dev/null
+++ b/test/unit/specs/services/entity_normalizer/entity_normalizer.spec.js
@@ -0,0 +1,102 @@
+import { parseStatus, parseUser, parseNotification } from '../../../../../src/services/entity_normalizer/entity_normalizer.service.js'
+
+const makeMockStatusQvitter = (overrides = {}) => {
+  return Object.assign({
+    activity_type: 'post',
+    attachments: [],
+    attentions: [],
+    created_at: 'Tue Jan 15 13:57:56 +0000 2019',
+    external_url: 'https://ap.example/whatever',
+    fave_num: 1,
+    favorited: false,
+    id: 10335970,
+    in_reply_to_ostatus_uri: null,
+    in_reply_to_profileurl: null,
+    in_reply_to_screen_name: null,
+    in_reply_to_status_id: null,
+    in_reply_to_user_id: null,
+    is_local: false,
+    is_post_verb: true,
+    possibly_sensitive: false,
+    repeat_num: 0,
+    repeated: false,
+    statusnet_conversation_id: 16300488,
+    statusnet_html: '<p>haha benis</p>',
+    summary: null,
+    tags: [],
+    text: 'haha benis',
+    uri: 'https://ap.example/whatever',
+    user: makeMockUserQvitter(),
+    visibility: 'public'
+  }, overrides)
+}
+
+const makeMockUserQvitter = (overrides = {}) => {
+  return Object.assign({
+    background_image: null,
+    cover_photo: '',
+    created_at: 'Mon Jan 14 13:56:51 +0000 2019',
+    default_scope: 'public',
+    description: 'ebin',
+    description_html: '<p>ebin</p>',
+    favourites_count: 0,
+    fields: [],
+    followers_count: 1,
+    following: true,
+    follows_you: true,
+    friends_count: 1,
+    id: 60717,
+    is_local: false,
+    locked: false,
+    name: 'Spurdo :ebin:',
+    name_html: 'Spurdo <img src="whatever">',
+    no_rich_text: false,
+    pleroma: { confirmation_pending: false, tags: [] },
+    profile_image_url: 'https://ap.example/whatever',
+    profile_image_url_https: 'https://ap.example/whatever',
+    profile_image_url_original: 'https://ap.example/whatever',
+    profile_image_url_profile_size: 'https://ap.example/whatever',
+    rights: { delete_others_notice: false },
+    screen_name: 'spurdo@ap.example',
+    statuses_count: 46,
+    statusnet_blocking: false,
+    statusnet_profile_url: ''
+  }, overrides)
+}
+
+parseNotification
+parseUser
+parseStatus
+makeMockStatusQvitter
+makeMockUserQvitter
+
+describe('QVitter preprocessing', () => {
+  it('identifies favorites', () => {
+    const fav = {
+      uri: 'tag:soykaf.com,2016-08-21:fave:2558:note:339495:2016-08-21T16:54:04+00:00',
+      is_post_verb: false
+    }
+
+    const mastoFav = {
+      uri: 'tag:mastodon.social,2016-11-27:objectId=73903:objectType=Favourite',
+      is_post_verb: false
+    }
+
+    expect(parseStatus(makeMockStatusQvitter(fav))).to.have.property('type', 'favorite')
+    expect(parseStatus(makeMockStatusQvitter(mastoFav))).to.have.property('type', 'favorite')
+  })
+
+  it('sets nsfw for statuses with the #nsfw tag', () => {
+    const safe = makeMockStatusQvitter({id: 1, text: 'Hello oniichan'})
+    const nsfw = makeMockStatusQvitter({id: 1, text: 'Hello oniichan #nsfw'})
+
+    expect(parseStatus(safe).nsfw).to.eq(false)
+    expect(parseStatus(nsfw).nsfw).to.eq(true)
+  })
+
+  it('leaves existing nsfw settings alone', () => {
+    const nsfw = makeMockStatusQvitter({id: 1, text: 'Hello oniichan #nsfw', nsfw: false})
+
+    expect(parseStatus(nsfw).nsfw).to.eq(false)
+  })
+})

From 7d157203392adcbd9752db05d259d5dc32aa19a0 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Wed, 16 Jan 2019 17:30:47 +0300
Subject: [PATCH 14/48] fix notifications?

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

diff --git a/src/modules/statuses.js b/src/modules/statuses.js
index f90b0ed3bf..84f6525880 100644
--- a/src/modules/statuses.js
+++ b/src/modules/statuses.js
@@ -297,9 +297,12 @@ const addNewNotifications = (state, { dispatch, notifications, older, visibleNot
     // Only add a new notification if we don't have one for the same action
     // TODO: this technically works but should be checking for notification.id, not action.id i think
     if (!find(state.notifications.data, (oldNotification) => oldNotification.action.id === action.id)) {
-      // TODO: adapt to "what if notification ids are not actually numbers"
-      state.notifications.maxId = Math.max(notification.id, state.notifications.maxId)
-      state.notifications.minId = Math.min(notification.id, state.notifications.minId)
+      state.notifications.maxId = notification.id > state.notifications.maxId
+        ? notification.id
+        : state.notifications.maxId
+      state.notifications.minId = notification.id < state.notifications.minId
+        ? notification.id
+        : state.notifications.minId
 
       const fresh = !notification.is_seen
       const status = notification.ntype === 'like'

From 387bf794ffbfb202fc426a578f174e7d6e3681d6 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Wed, 16 Jan 2019 18:52:30 +0300
Subject: [PATCH 15/48] fixx?????

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

diff --git a/src/modules/statuses.js b/src/modules/statuses.js
index 84f6525880..c564dec188 100644
--- a/src/modules/statuses.js
+++ b/src/modules/statuses.js
@@ -289,6 +289,7 @@ const addNewNotifications = (state, { dispatch, notifications, older, visibleNot
   const allStatuses = state.allStatuses
   const allStatusesObject = state.allStatusesObject
   each(notifications, (notification) => {
+    notification.notice.id = String(notification.notice.id)
     const result = mergeOrAdd(allStatuses, allStatusesObject, notification.notice)
     const action = result.item
     // For sequential IDs BE passes numbers as numbers, we want them as strings.

From 9682ee66ce82505fce9a11056bcda2af9b8c4e5a Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Thu, 17 Jan 2019 19:23:14 +0300
Subject: [PATCH 16/48] added conversions to ids for consistency from the
 get-go

---
 src/services/entity_normalizer/entity_normalizer.service.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js
index adc7f04751..2c8f5b54a3 100644
--- a/src/services/entity_normalizer/entity_normalizer.service.js
+++ b/src/services/entity_normalizer/entity_normalizer.service.js
@@ -29,7 +29,7 @@ export const parseUser = (data) => {
   // case for users in "mentions" property for statuses in MastoAPI
   const mastoShort = masto && !data.hasOwnProperty('avatar')
 
-  output.id = data.id
+  output.id = String(data.id)
 
   if (masto) {
     output.screen_name = data.acct
@@ -152,7 +152,7 @@ export const parseStatus = (data) => {
     output.statusnet_conversation_id = data.statusnet_conversation_id
   }
 
-  output.id = Number(data.id)
+  output.id = String(data.id)
   output.visibility = data.visibility
   output.created_at = new Date(data.created_at)
 
@@ -201,7 +201,7 @@ export const parseNotification = (data) => {
   }
 
   output.created_at = new Date(data.created_at)
-  output.id = data.id
+  output.id = String(data.id)
 
   return output
 }

From a2ef716f3b4b82564fb14d19665d64257d3d629b Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Thu, 17 Jan 2019 19:27:57 +0300
Subject: [PATCH 17/48] consistency in tests too

---
 test/unit/specs/modules/statuses.spec.js      | 28 +++++++++----------
 .../entity_normalizer.spec.js                 | 12 ++++----
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/test/unit/specs/modules/statuses.spec.js b/test/unit/specs/modules/statuses.spec.js
index 076e238c4d..33628b9b28 100644
--- a/test/unit/specs/modules/statuses.spec.js
+++ b/test/unit/specs/modules/statuses.spec.js
@@ -82,7 +82,7 @@ describe('The Statuses module', () => {
     const status = makeMockStatus({id: '1'})
     const otherStatus = makeMockStatus({id: '3'})
     status.uri = 'xxx'
-    const deletion = makeMockStatus({id: 2, type: 'deletion'})
+    const deletion = makeMockStatus({id: '2', type: 'deletion'})
     deletion.text = 'Dolus deleted notice {{tag:gs.smuglo.li,2016-11-18:noticeId=1038007:objectType=note}}.'
     deletion.uri = 'xxx'
 
@@ -131,9 +131,9 @@ describe('The Statuses module', () => {
 
   it('splits retweets from their status and links them', () => {
     const state = cloneDeep(defaultState)
-    const status = makeMockStatus({id: 1})
-    const retweet = makeMockStatus({id: 2, type: 'retweet'})
-    const modStatus = makeMockStatus({id: 1, text: 'something else'})
+    const status = makeMockStatus({id: '1'})
+    const retweet = makeMockStatus({id: '2', type: 'retweet'})
+    const modStatus = makeMockStatus({id: '1', text: 'something else'})
 
     retweet.retweeted_status = status
 
@@ -173,9 +173,9 @@ describe('The Statuses module', () => {
 
   it('replaces existing statuses with the same id, coming from a retweet', () => {
     const state = cloneDeep(defaultState)
-    const status = makeMockStatus({id: 1})
-    const modStatus = makeMockStatus({id: 1, text: 'something else'})
-    const retweet = makeMockStatus({id: 2, type: 'retweet'})
+    const status = makeMockStatus({id: '1'})
+    const modStatus = makeMockStatus({id: '1', text: 'something else'})
+    const retweet = makeMockStatus({id: '2', type: 'retweet'})
     retweet.retweeted_status = modStatus
 
     // Add original status
@@ -197,7 +197,7 @@ describe('The Statuses module', () => {
     const status = makeMockStatus({id: '1'})
 
     const favorite = {
-      id: 2,
+      id: '2',
       type: 'favorite',
       in_reply_to_status_id: '1', // The API uses strings here...
       uri: 'tag:shitposter.club,2016-08-21:fave:3895:note:773501:2016-08-21T16:52:15+00:00',
@@ -225,7 +225,7 @@ describe('The Statuses module', () => {
     }
 
     const ownFavorite = {
-      id: 3,
+      id: '3',
       type: 'favorite',
       in_reply_to_status_id: '1', // The API uses strings here...
       uri: 'tag:shitposter.club,2016-08-21:fave:3895:note:773501:2016-08-21T16:52:15+00:00',
@@ -251,7 +251,7 @@ describe('The Statuses module', () => {
       mentionedStatus.uri = 'xxx'
       otherStatus.attentions = [user]
 
-      const deletion = makeMockStatus({id: 4, type: 'deletion'})
+      const deletion = makeMockStatus({id: '4', type: 'deletion'})
       deletion.text = 'Dolus deleted notice {{tag:gs.smuglo.li,2016-11-18:noticeId=1038007:objectType=note}}.'
       deletion.uri = 'xxx'
 
@@ -260,8 +260,8 @@ describe('The Statuses module', () => {
         state,
         {
           notifications: [{
-            from_profile: { id: 2 },
-            id: 998,
+            from_profile: { id: '2' },
+            id: '998',
             type: 'mention',
             status: otherStatus,
             action: otherStatus,
@@ -274,8 +274,8 @@ describe('The Statuses module', () => {
         state,
         {
           notifications: [{
-            from_profile: { id: 2 },
-            id: 999,
+            from_profile: { id: '2' },
+            id: '999',
             type: 'mention',
             status: mentionedStatus,
             action: mentionedStatus,
diff --git a/test/unit/specs/services/entity_normalizer/entity_normalizer.spec.js b/test/unit/specs/services/entity_normalizer/entity_normalizer.spec.js
index e58827252c..2eddd47091 100644
--- a/test/unit/specs/services/entity_normalizer/entity_normalizer.spec.js
+++ b/test/unit/specs/services/entity_normalizer/entity_normalizer.spec.js
@@ -9,7 +9,7 @@ const makeMockStatusQvitter = (overrides = {}) => {
     external_url: 'https://ap.example/whatever',
     fave_num: 1,
     favorited: false,
-    id: 10335970,
+    id: '10335970',
     in_reply_to_ostatus_uri: null,
     in_reply_to_profileurl: null,
     in_reply_to_screen_name: null,
@@ -20,7 +20,7 @@ const makeMockStatusQvitter = (overrides = {}) => {
     possibly_sensitive: false,
     repeat_num: 0,
     repeated: false,
-    statusnet_conversation_id: 16300488,
+    statusnet_conversation_id: '16300488',
     statusnet_html: '<p>haha benis</p>',
     summary: null,
     tags: [],
@@ -45,7 +45,7 @@ const makeMockUserQvitter = (overrides = {}) => {
     following: true,
     follows_you: true,
     friends_count: 1,
-    id: 60717,
+    id: '60717',
     is_local: false,
     locked: false,
     name: 'Spurdo :ebin:',
@@ -87,15 +87,15 @@ describe('QVitter preprocessing', () => {
   })
 
   it('sets nsfw for statuses with the #nsfw tag', () => {
-    const safe = makeMockStatusQvitter({id: 1, text: 'Hello oniichan'})
-    const nsfw = makeMockStatusQvitter({id: 1, text: 'Hello oniichan #nsfw'})
+    const safe = makeMockStatusQvitter({id: '1', text: 'Hello oniichan'})
+    const nsfw = makeMockStatusQvitter({id: '1', text: 'Hello oniichan #nsfw'})
 
     expect(parseStatus(safe).nsfw).to.eq(false)
     expect(parseStatus(nsfw).nsfw).to.eq(true)
   })
 
   it('leaves existing nsfw settings alone', () => {
-    const nsfw = makeMockStatusQvitter({id: 1, text: 'Hello oniichan #nsfw', nsfw: false})
+    const nsfw = makeMockStatusQvitter({id: '1', text: 'Hello oniichan #nsfw', nsfw: false})
 
     expect(parseStatus(nsfw).nsfw).to.eq(false)
   })

From 1e61c8140b3921183f7721ec3e0db00e671a4410 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Thu, 17 Jan 2019 20:44:37 +0300
Subject: [PATCH 18/48] tests for the tests god! bugfixes for bugfixes throne!

---
 .../entity_normalizer.service.js              |  12 +-
 .../entity_normalizer.spec.js                 | 213 ++++++++++++++++--
 2 files changed, 200 insertions(+), 25 deletions(-)

diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js
index 2c8f5b54a3..ca0f36dba4 100644
--- a/src/services/entity_normalizer/entity_normalizer.service.js
+++ b/src/services/entity_normalizer/entity_normalizer.service.js
@@ -122,6 +122,10 @@ export const parseStatus = (data) => {
 
     // Not exactly the same but works
     output.statusnet_conversation_id = data.id
+
+    if (output.type === 'retweet') {
+      output.retweeted_status = parseStatus(data.reblog)
+    }
   } else {
     output.favorited = data.favorited
     output.fave_num = data.fave_num
@@ -150,6 +154,10 @@ export const parseStatus = (data) => {
     output.in_reply_to_user_id = data.in_reply_to_account_id
 
     output.statusnet_conversation_id = data.statusnet_conversation_id
+
+    if (output.type === 'retweet') {
+      output.retweeted_status = parseStatus(data.retweeted_status)
+    }
   }
 
   output.id = String(data.id)
@@ -187,12 +195,12 @@ export const parseNotification = (data) => {
     output.type = mastoDict[data.type] || data.type
     output.seen = null // missing
     output.status = parseStatus(data.status)
-    output.action = null // missing
+    output.action = output.status // not sure
     output.from_profile = parseUser(data.account)
   } else {
     const parsedNotice = parseStatus(data.notice)
     output.type = data.ntype
-    output.seen = data.is_seen
+    output.seen = Boolean(data.is_seen)
     output.status = output.type === 'like'
       ? parseStatus(data.notice.favorited_status)
       : parsedNotice
diff --git a/test/unit/specs/services/entity_normalizer/entity_normalizer.spec.js b/test/unit/specs/services/entity_normalizer/entity_normalizer.spec.js
index 2eddd47091..bc127f79b5 100644
--- a/test/unit/specs/services/entity_normalizer/entity_normalizer.spec.js
+++ b/test/unit/specs/services/entity_normalizer/entity_normalizer.spec.js
@@ -1,4 +1,6 @@
 import { parseStatus, parseUser, parseNotification } from '../../../../../src/services/entity_normalizer/entity_normalizer.service.js'
+import mastoapidata from '../../../../fixtures/mastoapi.json'
+import qvitterapidata from '../../../../fixtures/statuses.json'
 
 const makeMockStatusQvitter = (overrides = {}) => {
   return Object.assign({
@@ -64,39 +66,204 @@ const makeMockUserQvitter = (overrides = {}) => {
   }, overrides)
 }
 
+const makeMockUserMasto = (overrides = {}) => {
+  return Object.assign({
+    acct: 'hj',
+    avatar:
+    'https://shigusegubu.club/media/1657b945-8d5b-4ce6-aafb-4c3fc5772120/8ce851029af84d55de9164e30cc7f46d60cbf12eee7e96c5c0d35d9038ddade1.png',
+    avatar_static:
+    'https://shigusegubu.club/media/1657b945-8d5b-4ce6-aafb-4c3fc5772120/8ce851029af84d55de9164e30cc7f46d60cbf12eee7e96c5c0d35d9038ddade1.png',
+    bot: false,
+    created_at: '2017-12-17T21:54:14.000Z',
+    display_name: 'whatever whatever whatever witch',
+    emojis: [],
+    fields: [],
+    followers_count: 705,
+    following_count: 326,
+    header:
+    'https://shigusegubu.club/media/7ab024d9-2a8a-4fbc-9ce8-da06756ae2db/6aadefe4e264133bc377ab450e6b045b6f5458542a5c59e6c741f86107f0388b.png',
+    header_static:
+    'https://shigusegubu.club/media/7ab024d9-2a8a-4fbc-9ce8-da06756ae2db/6aadefe4e264133bc377ab450e6b045b6f5458542a5c59e6c741f86107f0388b.png',
+    id: '1',
+    locked: false,
+    note:
+    'Volatile Internet Weirdo. Name pronounced as Hee Jay. JS and Java dark arts mage, Elixir trainee. I love sampo and lain. Matrix is <span><a data-user="1" href="https://shigusegubu.club/users/hj">@<span>hj</span></a></span>:matrix.heldscal.la Pronouns are whatever. Do not DM me unless it\'s truly private matter and you\'re instance\'s admin or you risk your DM to be reposted publicly.Wish i was Finnish girl.',
+    pleroma: { confirmation_pending: false, tags: null },
+    source: { note: '', privacy: 'public', sensitive: false },
+    statuses_count: 41775,
+    url: 'https://shigusegubu.club/users/hj',
+    username: 'hj'
+  }, overrides)
+}
+
+const makeMockStatusMasto = (overrides = {}) => {
+  return Object.assign({
+    account: makeMockUserMasto(),
+    application: { name: 'Web', website: null },
+    content:
+    '<span><a data-user="14660" href="https://pleroma.soykaf.com/users/sampo">@<span>sampo</span></a></span> god i wish i was there',
+    created_at: '2019-01-17T16:29:23.000Z',
+    emojis: [],
+    favourited: false,
+    favourites_count: 1,
+    id: '10423476',
+    in_reply_to_account_id: '14660',
+    in_reply_to_id: '10423197',
+    language: null,
+    media_attachments: [],
+    mentions: [
+      {
+        acct: 'sampo@pleroma.soykaf.com',
+        id: '14660',
+        url: 'https://pleroma.soykaf.com/users/sampo',
+        username: 'sampo'
+      }
+    ],
+    muted: false,
+    reblog: null,
+    reblogged: false,
+    reblogs_count: 0,
+    replies_count: 0,
+    sensitive: false,
+    spoiler_text: '',
+    tags: [],
+    uri: 'https://shigusegubu.club/objects/16033fbb-97c0-4f0e-b834-7abb92fb8639',
+    url: 'https://shigusegubu.club/objects/16033fbb-97c0-4f0e-b834-7abb92fb8639',
+    visibility: 'public'
+  }, overrides)
+}
+
+const makeMockNotificationQvitter = (overrides = {}) => {
+  return Object.assign({
+    notice: makeMockStatusQvitter(),
+    ntype: 'follow',
+    from_profile: makeMockUserQvitter(),
+    is_seen: 0,
+    id: 123
+  }, overrides)
+}
+
 parseNotification
 parseUser
 parseStatus
 makeMockStatusQvitter
 makeMockUserQvitter
 
-describe('QVitter preprocessing', () => {
-  it('identifies favorites', () => {
-    const fav = {
-      uri: 'tag:soykaf.com,2016-08-21:fave:2558:note:339495:2016-08-21T16:54:04+00:00',
-      is_post_verb: false
-    }
+describe.only('API Entities normalizer', () => {
+  describe('statuses', () => {
+    describe('QVitter preprocessing', () => {
+      it('doesn\'t blow up', () => {
+        const parsed = qvitterapidata.map(parseStatus)
+        expect(parsed.length).to.eq(qvitterapidata.length)
+      })
 
-    const mastoFav = {
-      uri: 'tag:mastodon.social,2016-11-27:objectId=73903:objectType=Favourite',
-      is_post_verb: false
-    }
+      it('identifies favorites', () => {
+        const fav = {
+          uri: 'tag:soykaf.com,2016-08-21:fave:2558:note:339495:2016-08-21T16:54:04+00:00',
+          is_post_verb: false
+        }
 
-    expect(parseStatus(makeMockStatusQvitter(fav))).to.have.property('type', 'favorite')
-    expect(parseStatus(makeMockStatusQvitter(mastoFav))).to.have.property('type', 'favorite')
+        const mastoFav = {
+          uri: 'tag:mastodon.social,2016-11-27:objectId=73903:objectType=Favourite',
+          is_post_verb: false
+        }
+
+        expect(parseStatus(makeMockStatusQvitter(fav))).to.have.property('type', 'favorite')
+        expect(parseStatus(makeMockStatusQvitter(mastoFav))).to.have.property('type', 'favorite')
+      })
+
+      it('processes repeats correctly', () => {
+        const post = makeMockStatusQvitter({ retweeted_status: null, id: 'deadbeef' })
+        const repeat = makeMockStatusQvitter({ retweeted_status: post, is_post_verb: false, id: 'foobar' })
+
+        const parsedPost = parseStatus(post)
+        const parsedRepeat = parseStatus(repeat)
+
+        expect(parsedPost).to.have.property('type', 'status')
+        expect(parsedRepeat).to.have.property('type', 'retweet')
+        expect(parsedRepeat).to.have.property('retweeted_status')
+        expect(parsedRepeat).to.have.deep.property('retweeted_status.id', 'deadbeef')
+      })
+
+      it('sets nsfw for statuses with the #nsfw tag', () => {
+        const safe = makeMockStatusQvitter({id: '1', text: 'Hello oniichan'})
+        const nsfw = makeMockStatusQvitter({id: '1', text: 'Hello oniichan #nsfw'})
+
+        expect(parseStatus(safe).nsfw).to.eq(false)
+        expect(parseStatus(nsfw).nsfw).to.eq(true)
+      })
+
+      it('leaves existing nsfw settings alone', () => {
+        const nsfw = makeMockStatusQvitter({id: '1', text: 'Hello oniichan #nsfw', nsfw: false})
+
+        expect(parseStatus(nsfw).nsfw).to.eq(false)
+      })
+    })
+
+    describe('Mastoapi preprocessing and converting', () => {
+      it('doesn\'t blow up', () => {
+        const parsed = mastoapidata.map(parseStatus)
+        expect(parsed.length).to.eq(mastoapidata.length)
+      })
+
+      it('processes repeats correctly', () => {
+        const post = makeMockStatusMasto({ reblog: null, id: 'deadbeef' })
+        const repeat = makeMockStatusMasto({ reblog: post, id: 'foobar' })
+
+        const parsedPost = parseStatus(post)
+        const parsedRepeat = parseStatus(repeat)
+
+        expect(parsedPost).to.have.property('type', 'status')
+        expect(parsedRepeat).to.have.property('type', 'retweet')
+        expect(parsedRepeat).to.have.property('retweeted_status')
+        expect(parsedRepeat).to.have.deep.property('retweeted_status.id', 'deadbeef')
+      })
+    })
+  })
+  // Statuses generally already contain some info regarding users and there's nearly 1:1 mapping, so very little to test
+  describe('users (MastoAPI)', () => {
+    it('sets correct is_local for users depending on their screen_name', () => {
+      const local = makeMockUserMasto({ acct: 'foo' })
+      const remote = makeMockUserMasto({ acct: 'foo@bar.baz' })
+
+      expect(parseUser(local)).to.have.property('is_local', true)
+      expect(parseUser(remote)).to.have.property('is_local', false)
+    })
   })
 
-  it('sets nsfw for statuses with the #nsfw tag', () => {
-    const safe = makeMockStatusQvitter({id: '1', text: 'Hello oniichan'})
-    const nsfw = makeMockStatusQvitter({id: '1', text: 'Hello oniichan #nsfw'})
+  // We currently use QvitterAPI notifications only, and especially due to MastoAPI lacking is_seen, support for MastoAPI
+  // is more of an afterthought
+  describe('notifications (QvitterAPI)', () => {
+    it('correctly normalizes data to FE\'s format', () => {
+      const notif = makeMockNotificationQvitter({
+        id: 123,
+        notice: makeMockStatusQvitter({ id: 444 }),
+        from_profile: makeMockUserQvitter({ id: 'spurdo' })
+      })
+      expect(parseNotification(notif)).to.have.property('id', '123')
+      expect(parseNotification(notif)).to.have.property('seen', false)
+      expect(parseNotification(notif)).to.have.deep.property('status.id', '444')
+      expect(parseNotification(notif)).to.have.deep.property('action.id', '444')
+      expect(parseNotification(notif)).to.have.deep.property('from_profile.id', 'spurdo')
+    })
 
-    expect(parseStatus(safe).nsfw).to.eq(false)
-    expect(parseStatus(nsfw).nsfw).to.eq(true)
-  })
-
-  it('leaves existing nsfw settings alone', () => {
-    const nsfw = makeMockStatusQvitter({id: '1', text: 'Hello oniichan #nsfw', nsfw: false})
-
-    expect(parseStatus(nsfw).nsfw).to.eq(false)
+    it('correctly normalizes favorite notifications', () => {
+      const notif = makeMockNotificationQvitter({
+        id: 123,
+        ntype: 'like',
+        notice: makeMockStatusQvitter({
+          id: 444,
+          favorited_status: makeMockStatusQvitter({ id: 4412 })
+        }),
+        is_seen: 1,
+        from_profile: makeMockUserQvitter({ id: 'spurdo' })
+      })
+      expect(parseNotification(notif)).to.have.property('id', '123')
+      expect(parseNotification(notif)).to.have.property('type', 'like')
+      expect(parseNotification(notif)).to.have.property('seen', true)
+      expect(parseNotification(notif)).to.have.deep.property('status.id', '4412')
+      expect(parseNotification(notif)).to.have.deep.property('action.id', '444')
+      expect(parseNotification(notif)).to.have.deep.property('from_profile.id', 'spurdo')
+    })
   })
 })

From 0f8baff5a3cd865ca5e2bb420c44d7409a8dec9c Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Thu, 17 Jan 2019 21:26:02 +0300
Subject: [PATCH 19/48] forgot the file

---
 test/fixtures/mastoapi.json | 1582 +++++++++++++++++++++++++++++++++++
 1 file changed, 1582 insertions(+)
 create mode 100644 test/fixtures/mastoapi.json

diff --git a/test/fixtures/mastoapi.json b/test/fixtures/mastoapi.json
new file mode 100644
index 0000000000..858d7a0d32
--- /dev/null
+++ b/test/fixtures/mastoapi.json
@@ -0,0 +1,1582 @@
+[{
+    "account": {
+        "acct": "hj",
+        "avatar": "https://shigusegubu.club/media/1657b945-8d5b-4ce6-aafb-4c3fc5772120/8ce851029af84d55de9164e30cc7f46d60cbf12eee7e96c5c0d35d9038ddade1.png",
+        "avatar_static": "https://shigusegubu.club/media/1657b945-8d5b-4ce6-aafb-4c3fc5772120/8ce851029af84d55de9164e30cc7f46d60cbf12eee7e96c5c0d35d9038ddade1.png",
+        "bot": false,
+        "created_at": "2017-12-17T21:54:14.000Z",
+        "display_name": "whatever whatever whatever witch",
+        "emojis": [],
+        "fields": [],
+        "followers_count": 705,
+        "following_count": 326,
+        "header": "https://shigusegubu.club/media/7ab024d9-2a8a-4fbc-9ce8-da06756ae2db/6aadefe4e264133bc377ab450e6b045b6f5458542a5c59e6c741f86107f0388b.png",
+        "header_static": "https://shigusegubu.club/media/7ab024d9-2a8a-4fbc-9ce8-da06756ae2db/6aadefe4e264133bc377ab450e6b045b6f5458542a5c59e6c741f86107f0388b.png",
+        "id": "1",
+        "locked": false,
+        "note": "Volatile Internet Weirdo. Name pronounced as Hee Jay. JS and Java dark arts mage, Elixir trainee. I love sampo and lain. Matrix is <span><a data-user=\"1\" href=\"https://shigusegubu.club/users/hj\">@<span>hj</span></a></span>:matrix.heldscal.la Pronouns are whatever. Do not DM me unless it's truly private matter and you're instance's admin or you risk your DM to be reposted publicly.Wish i was Finnish girl.",
+        "pleroma": {
+            "confirmation_pending": false,
+            "tags": null
+        },
+        "source": {
+            "note": "",
+            "privacy": "public",
+            "sensitive": false
+        },
+        "statuses_count": 41775,
+        "url": "https://shigusegubu.club/users/hj",
+        "username": "hj"
+    },
+    "application": {
+        "name": "Web",
+        "website": null
+    },
+    "content": "<span><a data-user=\"14660\" href=\"https://pleroma.soykaf.com/users/sampo\">@<span>sampo</span></a></span> god i wish i was there",
+    "created_at": "2019-01-17T16:29:23.000Z",
+    "emojis": [],
+    "favourited": false,
+    "favourites_count": 1,
+    "id": "10423476",
+    "in_reply_to_account_id": "14660",
+    "in_reply_to_id": "10423197",
+    "language": null,
+    "media_attachments": [],
+    "mentions": [{
+        "acct": "sampo@pleroma.soykaf.com",
+        "id": "14660",
+        "url": "https://pleroma.soykaf.com/users/sampo",
+        "username": "sampo"
+    }],
+    "muted": false,
+    "reblog": null,
+    "reblogged": false,
+    "reblogs_count": 0,
+    "replies_count": 0,
+    "sensitive": false,
+    "spoiler_text": "",
+    "tags": [],
+    "uri": "https://shigusegubu.club/objects/16033fbb-97c0-4f0e-b834-7abb92fb8639",
+    "url": "https://shigusegubu.club/objects/16033fbb-97c0-4f0e-b834-7abb92fb8639",
+    "visibility": "public"
+}, {
+    "account": {
+        "acct": "hj",
+        "avatar": "https://shigusegubu.club/media/1657b945-8d5b-4ce6-aafb-4c3fc5772120/8ce851029af84d55de9164e30cc7f46d60cbf12eee7e96c5c0d35d9038ddade1.png",
+        "avatar_static": "https://shigusegubu.club/media/1657b945-8d5b-4ce6-aafb-4c3fc5772120/8ce851029af84d55de9164e30cc7f46d60cbf12eee7e96c5c0d35d9038ddade1.png",
+        "bot": false,
+        "created_at": "2017-12-17T21:54:14.000Z",
+        "display_name": "whatever whatever whatever witch",
+        "emojis": [],
+        "fields": [],
+        "followers_count": 705,
+        "following_count": 326,
+        "header": "https://shigusegubu.club/media/7ab024d9-2a8a-4fbc-9ce8-da06756ae2db/6aadefe4e264133bc377ab450e6b045b6f5458542a5c59e6c741f86107f0388b.png",
+        "header_static": "https://shigusegubu.club/media/7ab024d9-2a8a-4fbc-9ce8-da06756ae2db/6aadefe4e264133bc377ab450e6b045b6f5458542a5c59e6c741f86107f0388b.png",
+        "id": "1",
+        "locked": false,
+        "note": "Volatile Internet Weirdo. Name pronounced as Hee Jay. JS and Java dark arts mage, Elixir trainee. I love sampo and lain. Matrix is <span><a data-user=\"1\" href=\"https://shigusegubu.club/users/hj\">@<span>hj</span></a></span>:matrix.heldscal.la Pronouns are whatever. Do not DM me unless it's truly private matter and you're instance's admin or you risk your DM to be reposted publicly.Wish i was Finnish girl.",
+        "pleroma": {
+            "confirmation_pending": false,
+            "tags": null
+        },
+        "source": {
+            "note": "",
+            "privacy": "public",
+            "sensitive": false
+        },
+        "statuses_count": 41775,
+        "url": "https://shigusegubu.club/users/hj",
+        "username": "hj"
+    },
+    "application": {
+        "name": "Web",
+        "website": null
+    },
+    "content": "<span><a data-user=\"982\" href=\"https://bikeshed.party/users/feld\">@<span>feld</span></a></span><br /><a href=\"https://shigusegubu.club/media/4596ab2f-28e6-4f26-83db-0f26f29848cd/Jotaro - YES YES YES YES YES-sq_Fm7qfRQk.webm\">Jotaro - YES YES YES YES YES-sq…</a>",
+    "created_at": "2019-01-17T16:29:12.000Z",
+    "emojis": [],
+    "favourited": false,
+    "favourites_count": 1,
+    "id": "10423465",
+    "in_reply_to_account_id": "982",
+    "in_reply_to_id": "10423446",
+    "language": null,
+    "media_attachments": [{
+        "description": "Jotaro - YES YES YES YES YES-sq_Fm7qfRQk.webm",
+        "id": "1104859167",
+        "preview_url": "https://shigusegubu.club/media/4596ab2f-28e6-4f26-83db-0f26f29848cd/Jotaro - YES YES YES YES YES-sq_Fm7qfRQk.webm",
+        "remote_url": "https://shigusegubu.club/media/4596ab2f-28e6-4f26-83db-0f26f29848cd/Jotaro - YES YES YES YES YES-sq_Fm7qfRQk.webm",
+        "text_url": "https://shigusegubu.club/media/4596ab2f-28e6-4f26-83db-0f26f29848cd/Jotaro - YES YES YES YES YES-sq_Fm7qfRQk.webm",
+        "type": "video",
+        "url": "https://shigusegubu.club/media/4596ab2f-28e6-4f26-83db-0f26f29848cd/Jotaro - YES YES YES YES YES-sq_Fm7qfRQk.webm"
+    }],
+    "mentions": [{
+        "acct": "feld@bikeshed.party",
+        "id": "982",
+        "url": "https://bikeshed.party/users/feld",
+        "username": "feld"
+    }],
+    "muted": false,
+    "reblog": null,
+    "reblogged": false,
+    "reblogs_count": 1,
+    "replies_count": 0,
+    "sensitive": false,
+    "spoiler_text": "",
+    "tags": [],
+    "uri": "https://shigusegubu.club/objects/6634d32b-96a8-4852-a3db-ac8730715779",
+    "url": "https://shigusegubu.club/objects/6634d32b-96a8-4852-a3db-ac8730715779",
+    "visibility": "public"
+}, {
+    "account": {
+        "acct": "hj",
+        "avatar": "https://shigusegubu.club/media/1657b945-8d5b-4ce6-aafb-4c3fc5772120/8ce851029af84d55de9164e30cc7f46d60cbf12eee7e96c5c0d35d9038ddade1.png",
+        "avatar_static": "https://shigusegubu.club/media/1657b945-8d5b-4ce6-aafb-4c3fc5772120/8ce851029af84d55de9164e30cc7f46d60cbf12eee7e96c5c0d35d9038ddade1.png",
+        "bot": false,
+        "created_at": "2017-12-17T21:54:14.000Z",
+        "display_name": "whatever whatever whatever witch",
+        "emojis": [],
+        "fields": [],
+        "followers_count": 705,
+        "following_count": 326,
+        "header": "https://shigusegubu.club/media/7ab024d9-2a8a-4fbc-9ce8-da06756ae2db/6aadefe4e264133bc377ab450e6b045b6f5458542a5c59e6c741f86107f0388b.png",
+        "header_static": "https://shigusegubu.club/media/7ab024d9-2a8a-4fbc-9ce8-da06756ae2db/6aadefe4e264133bc377ab450e6b045b6f5458542a5c59e6c741f86107f0388b.png",
+        "id": "1",
+        "locked": false,
+        "note": "Volatile Internet Weirdo. Name pronounced as Hee Jay. JS and Java dark arts mage, Elixir trainee. I love sampo and lain. Matrix is <span><a data-user=\"1\" href=\"https://shigusegubu.club/users/hj\">@<span>hj</span></a></span>:matrix.heldscal.la Pronouns are whatever. Do not DM me unless it's truly private matter and you're instance's admin or you risk your DM to be reposted publicly.Wish i was Finnish girl.",
+        "pleroma": {
+            "confirmation_pending": false,
+            "tags": null
+        },
+        "source": {
+            "note": "",
+            "privacy": "public",
+            "sensitive": false
+        },
+        "statuses_count": 41775,
+        "url": "https://shigusegubu.club/users/hj",
+        "username": "hj"
+    },
+    "application": {
+        "name": "Web",
+        "website": null
+    },
+    "content": "heh<br /><a href=\"https://pleroma.soykaf.com/media/fd13d009-2c1f-4a53-9762-257e592a7ff6/scrot_17-01-19_18-16-40.png\">scrot_17-01-19_18-16-40.png</a>",
+    "created_at": "2019-01-17T16:28:49.000Z",
+    "emojis": [],
+    "favourited": false,
+    "favourites_count": 0,
+    "id": "10423449",
+    "in_reply_to_account_id": null,
+    "in_reply_to_id": null,
+    "language": null,
+    "media_attachments": [{
+        "description": "scrot_17-01-19_18-16-40.png",
+        "id": "-804793492",
+        "preview_url": "https://pleroma.soykaf.com/media/fd13d009-2c1f-4a53-9762-257e592a7ff6/scrot_17-01-19_18-16-40.png",
+        "remote_url": "https://pleroma.soykaf.com/media/fd13d009-2c1f-4a53-9762-257e592a7ff6/scrot_17-01-19_18-16-40.png",
+        "text_url": "https://pleroma.soykaf.com/media/fd13d009-2c1f-4a53-9762-257e592a7ff6/scrot_17-01-19_18-16-40.png",
+        "type": "image",
+        "url": "https://pleroma.soykaf.com/media/fd13d009-2c1f-4a53-9762-257e592a7ff6/scrot_17-01-19_18-16-40.png"
+    }],
+    "mentions": [{
+        "acct": "sampo@pleroma.soykaf.com",
+        "id": "14660",
+        "url": "https://pleroma.soykaf.com/users/sampo",
+        "username": "sampo"
+    }],
+    "muted": false,
+    "reblog": {
+        "account": {
+            "acct": "sampo@pleroma.soykaf.com",
+            "avatar": "https://pleroma.soykaf.com/media/f820f4cb-0fc8-4e4d-9521-c896ad2f93b5/c6e8d2e6d471616b82031e8348782e057aee7f1ed3214fe1522415e65694aa07.png",
+            "avatar_static": "https://pleroma.soykaf.com/media/f820f4cb-0fc8-4e4d-9521-c896ad2f93b5/c6e8d2e6d471616b82031e8348782e057aee7f1ed3214fe1522415e65694aa07.png",
+            "bot": false,
+            "created_at": "2018-04-02T21:19:46.000Z",
+            "display_name": "sampo",
+            "emojis": [],
+            "fields": [],
+            "followers_count": 23,
+            "following_count": 7,
+            "header": "https://pleroma.soykaf.com/media/23c3c6e1-863f-4aa2-9711-ab25bfeadd10/6aa0c00c79010d9a735c3e25d7e53da5a9fb4231720b4bd5b6904cd963b4c1cd.png",
+            "header_static": "https://pleroma.soykaf.com/media/23c3c6e1-863f-4aa2-9711-ab25bfeadd10/6aa0c00c79010d9a735c3e25d7e53da5a9fb4231720b4bd5b6904cd963b4c1cd.png",
+            "id": "14660",
+            "locked": false,
+            "note": "welcome to binlan 🇫🇮 prööh",
+            "pleroma": {
+                "confirmation_pending": false,
+                "tags": null
+            },
+            "source": {
+                "note": "",
+                "privacy": "public",
+                "sensitive": false
+            },
+            "statuses_count": 17647,
+            "url": "https://pleroma.soykaf.com/users/sampo",
+            "username": "sampo"
+        },
+        "application": {
+            "name": "Web",
+            "website": null
+        },
+        "content": "heh<br /><a href=\"https://pleroma.soykaf.com/media/fd13d009-2c1f-4a53-9762-257e592a7ff6/scrot_17-01-19_18-16-40.png\">scrot_17-01-19_18-16-40.png</a>",
+        "created_at": "2019-01-17T16:20:06.000Z",
+        "emojis": [],
+        "favourited": false,
+        "favourites_count": 7,
+        "id": "10423197",
+        "in_reply_to_account_id": null,
+        "in_reply_to_id": null,
+        "language": null,
+        "media_attachments": [{
+            "description": "scrot_17-01-19_18-16-40.png",
+            "id": "-804793492",
+            "preview_url": "https://pleroma.soykaf.com/media/fd13d009-2c1f-4a53-9762-257e592a7ff6/scrot_17-01-19_18-16-40.png",
+            "remote_url": "https://pleroma.soykaf.com/media/fd13d009-2c1f-4a53-9762-257e592a7ff6/scrot_17-01-19_18-16-40.png",
+            "text_url": "https://pleroma.soykaf.com/media/fd13d009-2c1f-4a53-9762-257e592a7ff6/scrot_17-01-19_18-16-40.png",
+            "type": "image",
+            "url": "https://pleroma.soykaf.com/media/fd13d009-2c1f-4a53-9762-257e592a7ff6/scrot_17-01-19_18-16-40.png"
+        }],
+        "mentions": [],
+        "muted": false,
+        "reblog": null,
+        "reblogged": false,
+        "reblogs_count": 2,
+        "replies_count": 0,
+        "sensitive": false,
+        "spoiler_text": "",
+        "tags": [],
+        "uri": "https://pleroma.soykaf.com/objects/bf7e43d4-5048-4176-8519-58e3e1014f8b",
+        "url": "https://pleroma.soykaf.com/objects/bf7e43d4-5048-4176-8519-58e3e1014f8b",
+        "visibility": "public"
+    },
+    "reblogged": false,
+    "reblogs_count": 0,
+    "replies_count": 0,
+    "sensitive": false,
+    "spoiler_text": "",
+    "tags": [],
+    "uri": "https://pleroma.soykaf.com/objects/bf7e43d4-5048-4176-8519-58e3e1014f8b",
+    "url": "https://pleroma.soykaf.com/objects/bf7e43d4-5048-4176-8519-58e3e1014f8b",
+    "visibility": "public"
+}, {
+    "account": {
+        "acct": "hj",
+        "avatar": "https://shigusegubu.club/media/1657b945-8d5b-4ce6-aafb-4c3fc5772120/8ce851029af84d55de9164e30cc7f46d60cbf12eee7e96c5c0d35d9038ddade1.png",
+        "avatar_static": "https://shigusegubu.club/media/1657b945-8d5b-4ce6-aafb-4c3fc5772120/8ce851029af84d55de9164e30cc7f46d60cbf12eee7e96c5c0d35d9038ddade1.png",
+        "bot": false,
+        "created_at": "2017-12-17T21:54:14.000Z",
+        "display_name": "whatever whatever whatever witch",
+        "emojis": [],
+        "fields": [],
+        "followers_count": 705,
+        "following_count": 326,
+        "header": "https://shigusegubu.club/media/7ab024d9-2a8a-4fbc-9ce8-da06756ae2db/6aadefe4e264133bc377ab450e6b045b6f5458542a5c59e6c741f86107f0388b.png",
+        "header_static": "https://shigusegubu.club/media/7ab024d9-2a8a-4fbc-9ce8-da06756ae2db/6aadefe4e264133bc377ab450e6b045b6f5458542a5c59e6c741f86107f0388b.png",
+        "id": "1",
+        "locked": false,
+        "note": "Volatile Internet Weirdo. Name pronounced as Hee Jay. JS and Java dark arts mage, Elixir trainee. I love sampo and lain. Matrix is <span><a data-user=\"1\" href=\"https://shigusegubu.club/users/hj\">@<span>hj</span></a></span>:matrix.heldscal.la Pronouns are whatever. Do not DM me unless it's truly private matter and you're instance's admin or you risk your DM to be reposted publicly.Wish i was Finnish girl.",
+        "pleroma": {
+            "confirmation_pending": false,
+            "tags": null
+        },
+        "source": {
+            "note": "",
+            "privacy": "public",
+            "sensitive": false
+        },
+        "statuses_count": 41775,
+        "url": "https://shigusegubu.club/users/hj",
+        "username": "hj"
+    },
+    "application": {
+        "name": "Web",
+        "website": null
+    },
+    "content": "<span><a data-user=\"982\" href=\"https://bikeshed.party/users/feld\">@<span>feld</span></a></span><br /><a href=\"https://shigusegubu.club/media/65de40a9-a99b-4207-97d0-40dd836532db/Uhh No.avi-Xrne2-gOoqU.webm\">Uhh No.avi-Xrne2-gOoqU.webm</a>",
+    "created_at": "2019-01-17T16:27:29.000Z",
+    "emojis": [],
+    "favourited": false,
+    "favourites_count": 0,
+    "id": "10423391",
+    "in_reply_to_account_id": "982",
+    "in_reply_to_id": "10423380",
+    "language": null,
+    "media_attachments": [{
+        "description": "Uhh No.avi-Xrne2-gOoqU.webm",
+        "id": "483179103",
+        "preview_url": "https://shigusegubu.club/media/65de40a9-a99b-4207-97d0-40dd836532db/Uhh No.avi-Xrne2-gOoqU.webm",
+        "remote_url": "https://shigusegubu.club/media/65de40a9-a99b-4207-97d0-40dd836532db/Uhh No.avi-Xrne2-gOoqU.webm",
+        "text_url": "https://shigusegubu.club/media/65de40a9-a99b-4207-97d0-40dd836532db/Uhh No.avi-Xrne2-gOoqU.webm",
+        "type": "video",
+        "url": "https://shigusegubu.club/media/65de40a9-a99b-4207-97d0-40dd836532db/Uhh No.avi-Xrne2-gOoqU.webm"
+    }],
+    "mentions": [{
+        "acct": "feld@bikeshed.party",
+        "id": "982",
+        "url": "https://bikeshed.party/users/feld",
+        "username": "feld"
+    }],
+    "muted": false,
+    "reblog": null,
+    "reblogged": false,
+    "reblogs_count": 0,
+    "replies_count": 0,
+    "sensitive": false,
+    "spoiler_text": "",
+    "tags": [],
+    "uri": "https://shigusegubu.club/objects/0f963ca1-a263-41ca-a43c-b5d26d0a08e9",
+    "url": "https://shigusegubu.club/objects/0f963ca1-a263-41ca-a43c-b5d26d0a08e9",
+    "visibility": "public"
+}, {
+    "account": {
+        "acct": "hj",
+        "avatar": "https://shigusegubu.club/media/1657b945-8d5b-4ce6-aafb-4c3fc5772120/8ce851029af84d55de9164e30cc7f46d60cbf12eee7e96c5c0d35d9038ddade1.png",
+        "avatar_static": "https://shigusegubu.club/media/1657b945-8d5b-4ce6-aafb-4c3fc5772120/8ce851029af84d55de9164e30cc7f46d60cbf12eee7e96c5c0d35d9038ddade1.png",
+        "bot": false,
+        "created_at": "2017-12-17T21:54:14.000Z",
+        "display_name": "whatever whatever whatever witch",
+        "emojis": [],
+        "fields": [],
+        "followers_count": 705,
+        "following_count": 326,
+        "header": "https://shigusegubu.club/media/7ab024d9-2a8a-4fbc-9ce8-da06756ae2db/6aadefe4e264133bc377ab450e6b045b6f5458542a5c59e6c741f86107f0388b.png",
+        "header_static": "https://shigusegubu.club/media/7ab024d9-2a8a-4fbc-9ce8-da06756ae2db/6aadefe4e264133bc377ab450e6b045b6f5458542a5c59e6c741f86107f0388b.png",
+        "id": "1",
+        "locked": false,
+        "note": "Volatile Internet Weirdo. Name pronounced as Hee Jay. JS and Java dark arts mage, Elixir trainee. I love sampo and lain. Matrix is <span><a data-user=\"1\" href=\"https://shigusegubu.club/users/hj\">@<span>hj</span></a></span>:matrix.heldscal.la Pronouns are whatever. Do not DM me unless it's truly private matter and you're instance's admin or you risk your DM to be reposted publicly.Wish i was Finnish girl.",
+        "pleroma": {
+            "confirmation_pending": false,
+            "tags": null
+        },
+        "source": {
+            "note": "",
+            "privacy": "public",
+            "sensitive": false
+        },
+        "statuses_count": 41775,
+        "url": "https://shigusegubu.club/users/hj",
+        "username": "hj"
+    },
+    "application": {
+        "name": "Web",
+        "website": null
+    },
+    "content": "<span><a data-user=\"16633\" href=\"https://social.super-niche.club/user/31\">@<span>fedebot</span></a></span> lewd",
+    "created_at": "2019-01-17T16:17:46.000Z",
+    "emojis": [],
+    "favourited": false,
+    "favourites_count": 0,
+    "id": "10423144",
+    "in_reply_to_account_id": "16633",
+    "in_reply_to_id": "10423114",
+    "language": null,
+    "media_attachments": [],
+    "mentions": [{
+        "acct": "fedebot@social.super-niche.club",
+        "id": "16633",
+        "url": "https://social.super-niche.club/user/31",
+        "username": "fedebot"
+    }],
+    "muted": false,
+    "reblog": null,
+    "reblogged": false,
+    "reblogs_count": 0,
+    "replies_count": 0,
+    "sensitive": false,
+    "spoiler_text": "",
+    "tags": [],
+    "uri": "https://shigusegubu.club/objects/3f809bd8-656f-4a29-81d4-80eed6916eb0",
+    "url": "https://shigusegubu.club/objects/3f809bd8-656f-4a29-81d4-80eed6916eb0",
+    "visibility": "public"
+}, {
+    "account": {
+        "acct": "hj",
+        "avatar": "https://shigusegubu.club/media/1657b945-8d5b-4ce6-aafb-4c3fc5772120/8ce851029af84d55de9164e30cc7f46d60cbf12eee7e96c5c0d35d9038ddade1.png",
+        "avatar_static": "https://shigusegubu.club/media/1657b945-8d5b-4ce6-aafb-4c3fc5772120/8ce851029af84d55de9164e30cc7f46d60cbf12eee7e96c5c0d35d9038ddade1.png",
+        "bot": false,
+        "created_at": "2017-12-17T21:54:14.000Z",
+        "display_name": "whatever whatever whatever witch",
+        "emojis": [],
+        "fields": [],
+        "followers_count": 705,
+        "following_count": 326,
+        "header": "https://shigusegubu.club/media/7ab024d9-2a8a-4fbc-9ce8-da06756ae2db/6aadefe4e264133bc377ab450e6b045b6f5458542a5c59e6c741f86107f0388b.png",
+        "header_static": "https://shigusegubu.club/media/7ab024d9-2a8a-4fbc-9ce8-da06756ae2db/6aadefe4e264133bc377ab450e6b045b6f5458542a5c59e6c741f86107f0388b.png",
+        "id": "1",
+        "locked": false,
+        "note": "Volatile Internet Weirdo. Name pronounced as Hee Jay. JS and Java dark arts mage, Elixir trainee. I love sampo and lain. Matrix is <span><a data-user=\"1\" href=\"https://shigusegubu.club/users/hj\">@<span>hj</span></a></span>:matrix.heldscal.la Pronouns are whatever. Do not DM me unless it's truly private matter and you're instance's admin or you risk your DM to be reposted publicly.Wish i was Finnish girl.",
+        "pleroma": {
+            "confirmation_pending": false,
+            "tags": null
+        },
+        "source": {
+            "note": "",
+            "privacy": "public",
+            "sensitive": false
+        },
+        "statuses_count": 41775,
+        "url": "https://shigusegubu.club/users/hj",
+        "username": "hj"
+    },
+    "application": {
+        "name": "Web",
+        "website": null
+    },
+    "content": "#<span><a href=\"https://social.super-niche.club/tag/animeirl\">animeirl</a></span> <a href=\"https://social.super-niche.club/file/c366cae1e5820d68dc1e6bc7a06a2f2bc15166de1faabea4f060490d45fdf527.jpg\" title=\"https://social.super-niche.club/file/c366cae1e5820d68dc1e6bc7a06a2f2bc15166de1faabea4f060490d45fdf527.jpg\">https://social.super-niche.club/attachment/368974</a>",
+    "created_at": "2019-01-17T14:20:42.000Z",
+    "emojis": [],
+    "favourited": false,
+    "favourites_count": 0,
+    "id": "10419966",
+    "in_reply_to_account_id": null,
+    "in_reply_to_id": null,
+    "language": null,
+    "media_attachments": [{
+        "description": null,
+        "id": "1373175917",
+        "preview_url": "https://social.super-niche.club/file/c366cae1e5820d68dc1e6bc7a06a2f2bc15166de1faabea4f060490d45fdf527.jpg",
+        "remote_url": "https://social.super-niche.club/file/c366cae1e5820d68dc1e6bc7a06a2f2bc15166de1faabea4f060490d45fdf527.jpg",
+        "text_url": "https://social.super-niche.club/file/c366cae1e5820d68dc1e6bc7a06a2f2bc15166de1faabea4f060490d45fdf527.jpg",
+        "type": "image",
+        "url": "https://social.super-niche.club/file/c366cae1e5820d68dc1e6bc7a06a2f2bc15166de1faabea4f060490d45fdf527.jpg"
+    }],
+    "mentions": [{
+        "acct": "fedebot@social.super-niche.club",
+        "id": "16633",
+        "url": "https://social.super-niche.club/user/31",
+        "username": "fedebot"
+    }],
+    "muted": false,
+    "reblog": {
+        "account": {
+            "acct": "fedebot@social.super-niche.club",
+            "avatar": "https://social.super-niche.club/avatar/31-300-20180411174535.jpeg",
+            "avatar_static": "https://social.super-niche.club/avatar/31-300-20180411174535.jpeg",
+            "bot": false,
+            "created_at": "2018-04-11T21:08:46.000Z",
+            "display_name": "Federation Bot",
+            "emojis": [],
+            "fields": [],
+            "followers_count": 6,
+            "following_count": 135,
+            "header": "https://shigusegubu.club/images/banner.png",
+            "header_static": "https://shigusegubu.club/images/banner.png",
+            "id": "16633",
+            "locked": false,
+            "note": "",
+            "pleroma": {
+                "confirmation_pending": false,
+                "tags": null
+            },
+            "source": {
+                "note": "",
+                "privacy": "public",
+                "sensitive": false
+            },
+            "statuses_count": 6335,
+            "url": "https://social.super-niche.club/user/31",
+            "username": "fedebot"
+        },
+        "application": {
+            "name": "Web",
+            "website": null
+        },
+        "content": "#<span><a href=\"https://social.super-niche.club/tag/animeirl\">animeirl</a></span> <a href=\"https://social.super-niche.club/file/c366cae1e5820d68dc1e6bc7a06a2f2bc15166de1faabea4f060490d45fdf527.jpg\" title=\"https://social.super-niche.club/file/c366cae1e5820d68dc1e6bc7a06a2f2bc15166de1faabea4f060490d45fdf527.jpg\">https://social.super-niche.club/attachment/368974</a>",
+        "created_at": "2019-01-17T14:11:08.000Z",
+        "emojis": [],
+        "favourited": false,
+        "favourites_count": 4,
+        "id": "10419912",
+        "in_reply_to_account_id": null,
+        "in_reply_to_id": null,
+        "language": null,
+        "media_attachments": [{
+            "description": null,
+            "id": "1373175917",
+            "preview_url": "https://social.super-niche.club/file/c366cae1e5820d68dc1e6bc7a06a2f2bc15166de1faabea4f060490d45fdf527.jpg",
+            "remote_url": "https://social.super-niche.club/file/c366cae1e5820d68dc1e6bc7a06a2f2bc15166de1faabea4f060490d45fdf527.jpg",
+            "text_url": "https://social.super-niche.club/file/c366cae1e5820d68dc1e6bc7a06a2f2bc15166de1faabea4f060490d45fdf527.jpg",
+            "type": "image",
+            "url": "https://social.super-niche.club/file/c366cae1e5820d68dc1e6bc7a06a2f2bc15166de1faabea4f060490d45fdf527.jpg"
+        }],
+        "mentions": [],
+        "muted": false,
+        "reblog": null,
+        "reblogged": false,
+        "reblogs_count": 3,
+        "replies_count": 0,
+        "sensitive": false,
+        "spoiler_text": "",
+        "tags": [{
+            "name": "animeirl",
+            "url": "/tag/animeirl"
+        }],
+        "uri": "tag:social.super-niche.club,2019-01-17:noticeId=2353002:objectType=note",
+        "url": "https://social.super-niche.club/notice/2353002",
+        "visibility": "public"
+    },
+    "reblogged": false,
+    "reblogs_count": 0,
+    "replies_count": 0,
+    "sensitive": false,
+    "spoiler_text": "",
+    "tags": [{
+        "name": "animeirl",
+        "url": "/tag/animeirl"
+    }],
+    "uri": "tag:social.super-niche.club,2019-01-17:noticeId=2353002:objectType=note",
+    "url": "tag:social.super-niche.club,2019-01-17:noticeId=2353002:objectType=note",
+    "visibility": "public"
+}, {
+    "account": {
+        "acct": "hj",
+        "avatar": "https://shigusegubu.club/media/1657b945-8d5b-4ce6-aafb-4c3fc5772120/8ce851029af84d55de9164e30cc7f46d60cbf12eee7e96c5c0d35d9038ddade1.png",
+        "avatar_static": "https://shigusegubu.club/media/1657b945-8d5b-4ce6-aafb-4c3fc5772120/8ce851029af84d55de9164e30cc7f46d60cbf12eee7e96c5c0d35d9038ddade1.png",
+        "bot": false,
+        "created_at": "2017-12-17T21:54:14.000Z",
+        "display_name": "whatever whatever whatever witch",
+        "emojis": [],
+        "fields": [],
+        "followers_count": 705,
+        "following_count": 326,
+        "header": "https://shigusegubu.club/media/7ab024d9-2a8a-4fbc-9ce8-da06756ae2db/6aadefe4e264133bc377ab450e6b045b6f5458542a5c59e6c741f86107f0388b.png",
+        "header_static": "https://shigusegubu.club/media/7ab024d9-2a8a-4fbc-9ce8-da06756ae2db/6aadefe4e264133bc377ab450e6b045b6f5458542a5c59e6c741f86107f0388b.png",
+        "id": "1",
+        "locked": false,
+        "note": "Volatile Internet Weirdo. Name pronounced as Hee Jay. JS and Java dark arts mage, Elixir trainee. I love sampo and lain. Matrix is <span><a data-user=\"1\" href=\"https://shigusegubu.club/users/hj\">@<span>hj</span></a></span>:matrix.heldscal.la Pronouns are whatever. Do not DM me unless it's truly private matter and you're instance's admin or you risk your DM to be reposted publicly.Wish i was Finnish girl.",
+        "pleroma": {
+            "confirmation_pending": false,
+            "tags": null
+        },
+        "source": {
+            "note": "",
+            "privacy": "public",
+            "sensitive": false
+        },
+        "statuses_count": 41775,
+        "url": "https://shigusegubu.club/users/hj",
+        "username": "hj"
+    },
+    "application": {
+        "name": "Web",
+        "website": null
+    },
+    "content": "ruin a distro in 3 words<br /><a href=\"https://miniwa.moe/media/4076945a-4a3b-4fb3-8b62-04eb401697ff/image.png\">image.png</a>",
+    "created_at": "2019-01-17T14:13:36.000Z",
+    "emojis": [],
+    "favourited": false,
+    "favourites_count": 0,
+    "id": "10419787",
+    "in_reply_to_account_id": null,
+    "in_reply_to_id": null,
+    "language": null,
+    "media_attachments": [{
+        "description": "image.png",
+        "id": "-948580066",
+        "preview_url": "https://miniwa.moe/media/4076945a-4a3b-4fb3-8b62-04eb401697ff/image.png",
+        "remote_url": "https://miniwa.moe/media/4076945a-4a3b-4fb3-8b62-04eb401697ff/image.png",
+        "text_url": "https://miniwa.moe/media/4076945a-4a3b-4fb3-8b62-04eb401697ff/image.png",
+        "type": "image",
+        "url": "https://miniwa.moe/media/4076945a-4a3b-4fb3-8b62-04eb401697ff/image.png"
+    }],
+    "mentions": [{
+        "acct": "ivesen@miniwa.moe",
+        "id": "39686",
+        "url": "https://miniwa.moe/users/ivesen",
+        "username": "ivesen"
+    }],
+    "muted": false,
+    "reblog": {
+        "account": {
+            "acct": "ivesen@miniwa.moe",
+            "avatar": "https://miniwa.moe/media/745353b1-89b0-4597-bd76-3ed6ec122c03/504e655c84a6a6d61d34f8daaf3baa6627088f73427763a044729dbf85cff4b8.png",
+            "avatar_static": "https://miniwa.moe/media/745353b1-89b0-4597-bd76-3ed6ec122c03/504e655c84a6a6d61d34f8daaf3baa6627088f73427763a044729dbf85cff4b8.png",
+            "bot": false,
+            "created_at": "2018-09-08T17:55:27.000Z",
+            "display_name": "tsumiki :bun:",
+            "emojis": [{
+                "shortcode": "bun",
+                "static_url": "https://miniwa.moe/emoji/custom/bun.png",
+                "url": "https://miniwa.moe/emoji/custom/bun.png",
+                "visible_in_picker": false
+            }],
+            "fields": [],
+            "followers_count": 8,
+            "following_count": 3,
+            "header": "https://miniwa.moe/media/bff7489f-22bb-4170-a68b-ba0e1c52116e/cf69fbec904a109f8c41b97ec03bfa7dbe49992fd7d61528a933740789b55eb1.gif",
+            "header_static": "https://miniwa.moe/media/bff7489f-22bb-4170-a68b-ba0e1c52116e/cf69fbec904a109f8c41b97ec03bfa7dbe49992fd7d61528a933740789b55eb1.gif",
+            "id": "39686",
+            "locked": false,
+            "note": "native resident of the black lizard planet trying to understand hoomanslocated near niflheimr xmpp: ivesen@xmpp.xyz | matrix: no | email: anything you could imagine @ ivesen.moe",
+            "pleroma": {
+                "confirmation_pending": false,
+                "tags": null
+            },
+            "source": {
+                "note": "",
+                "privacy": "public",
+                "sensitive": false
+            },
+            "statuses_count": 13174,
+            "url": "https://miniwa.moe/users/ivesen",
+            "username": "ivesen"
+        },
+        "application": {
+            "name": "Web",
+            "website": null
+        },
+        "content": "ruin a distro in 3 words<br /><a href=\"https://miniwa.moe/media/4076945a-4a3b-4fb3-8b62-04eb401697ff/image.png\">image.png</a>",
+        "created_at": "2019-01-17T13:41:35.000Z",
+        "emojis": [],
+        "favourited": false,
+        "favourites_count": 3,
+        "id": "10418865",
+        "in_reply_to_account_id": null,
+        "in_reply_to_id": null,
+        "language": null,
+        "media_attachments": [{
+            "description": "image.png",
+            "id": "-948580066",
+            "preview_url": "https://miniwa.moe/media/4076945a-4a3b-4fb3-8b62-04eb401697ff/image.png",
+            "remote_url": "https://miniwa.moe/media/4076945a-4a3b-4fb3-8b62-04eb401697ff/image.png",
+            "text_url": "https://miniwa.moe/media/4076945a-4a3b-4fb3-8b62-04eb401697ff/image.png",
+            "type": "image",
+            "url": "https://miniwa.moe/media/4076945a-4a3b-4fb3-8b62-04eb401697ff/image.png"
+        }],
+        "mentions": [],
+        "muted": false,
+        "reblog": null,
+        "reblogged": false,
+        "reblogs_count": 6,
+        "replies_count": 0,
+        "sensitive": false,
+        "spoiler_text": "",
+        "tags": [],
+        "uri": "https://miniwa.moe/objects/448e2944-0ecd-457f-92c3-cb454f2b0fab",
+        "url": "https://miniwa.moe/objects/448e2944-0ecd-457f-92c3-cb454f2b0fab",
+        "visibility": "public"
+    },
+    "reblogged": false,
+    "reblogs_count": 0,
+    "replies_count": 0,
+    "sensitive": false,
+    "spoiler_text": "",
+    "tags": [],
+    "uri": "https://miniwa.moe/objects/448e2944-0ecd-457f-92c3-cb454f2b0fab",
+    "url": "https://miniwa.moe/objects/448e2944-0ecd-457f-92c3-cb454f2b0fab",
+    "visibility": "public"
+}, {
+    "account": {
+        "acct": "hj",
+        "avatar": "https://shigusegubu.club/media/1657b945-8d5b-4ce6-aafb-4c3fc5772120/8ce851029af84d55de9164e30cc7f46d60cbf12eee7e96c5c0d35d9038ddade1.png",
+        "avatar_static": "https://shigusegubu.club/media/1657b945-8d5b-4ce6-aafb-4c3fc5772120/8ce851029af84d55de9164e30cc7f46d60cbf12eee7e96c5c0d35d9038ddade1.png",
+        "bot": false,
+        "created_at": "2017-12-17T21:54:14.000Z",
+        "display_name": "whatever whatever whatever witch",
+        "emojis": [],
+        "fields": [],
+        "followers_count": 705,
+        "following_count": 326,
+        "header": "https://shigusegubu.club/media/7ab024d9-2a8a-4fbc-9ce8-da06756ae2db/6aadefe4e264133bc377ab450e6b045b6f5458542a5c59e6c741f86107f0388b.png",
+        "header_static": "https://shigusegubu.club/media/7ab024d9-2a8a-4fbc-9ce8-da06756ae2db/6aadefe4e264133bc377ab450e6b045b6f5458542a5c59e6c741f86107f0388b.png",
+        "id": "1",
+        "locked": false,
+        "note": "Volatile Internet Weirdo. Name pronounced as Hee Jay. JS and Java dark arts mage, Elixir trainee. I love sampo and lain. Matrix is <span><a data-user=\"1\" href=\"https://shigusegubu.club/users/hj\">@<span>hj</span></a></span>:matrix.heldscal.la Pronouns are whatever. Do not DM me unless it's truly private matter and you're instance's admin or you risk your DM to be reposted publicly.Wish i was Finnish girl.",
+        "pleroma": {
+            "confirmation_pending": false,
+            "tags": null
+        },
+        "source": {
+            "note": "",
+            "privacy": "public",
+            "sensitive": false
+        },
+        "statuses_count": 41775,
+        "url": "https://shigusegubu.club/users/hj",
+        "username": "hj"
+    },
+    "application": {
+        "name": "Web",
+        "website": null
+    },
+    "content": "<span><a data-user=\"570\" href=\"https://social.sakamoto.gq/users/eal\">@<span>eal</span></a></span> thanks, alex jacobson :denton:",
+    "created_at": "2019-01-17T14:12:42.000Z",
+    "emojis": [{
+        "shortcode": "denton",
+        "static_url": "https://shigusegubu.club/emoji/sgsgb/denton.png",
+        "url": "https://shigusegubu.club/emoji/sgsgb/denton.png",
+        "visible_in_picker": false
+    }],
+    "favourited": false,
+    "favourites_count": 0,
+    "id": "10419752",
+    "in_reply_to_account_id": "570",
+    "in_reply_to_id": "10419729",
+    "language": null,
+    "media_attachments": [],
+    "mentions": [{
+        "acct": "eal@social.sakamoto.gq",
+        "id": "570",
+        "url": "https://social.sakamoto.gq/users/eal",
+        "username": "eal"
+    }],
+    "muted": false,
+    "reblog": null,
+    "reblogged": false,
+    "reblogs_count": 0,
+    "replies_count": 0,
+    "sensitive": false,
+    "spoiler_text": "",
+    "tags": [],
+    "uri": "https://shigusegubu.club/objects/38b1bc44-15d8-40dd-b1aa-937e0ff4a86d",
+    "url": "https://shigusegubu.club/objects/38b1bc44-15d8-40dd-b1aa-937e0ff4a86d",
+    "visibility": "public"
+}, {
+    "account": {
+        "acct": "hj",
+        "avatar": "https://shigusegubu.club/media/1657b945-8d5b-4ce6-aafb-4c3fc5772120/8ce851029af84d55de9164e30cc7f46d60cbf12eee7e96c5c0d35d9038ddade1.png",
+        "avatar_static": "https://shigusegubu.club/media/1657b945-8d5b-4ce6-aafb-4c3fc5772120/8ce851029af84d55de9164e30cc7f46d60cbf12eee7e96c5c0d35d9038ddade1.png",
+        "bot": false,
+        "created_at": "2017-12-17T21:54:14.000Z",
+        "display_name": "whatever whatever whatever witch",
+        "emojis": [],
+        "fields": [],
+        "followers_count": 705,
+        "following_count": 326,
+        "header": "https://shigusegubu.club/media/7ab024d9-2a8a-4fbc-9ce8-da06756ae2db/6aadefe4e264133bc377ab450e6b045b6f5458542a5c59e6c741f86107f0388b.png",
+        "header_static": "https://shigusegubu.club/media/7ab024d9-2a8a-4fbc-9ce8-da06756ae2db/6aadefe4e264133bc377ab450e6b045b6f5458542a5c59e6c741f86107f0388b.png",
+        "id": "1",
+        "locked": false,
+        "note": "Volatile Internet Weirdo. Name pronounced as Hee Jay. JS and Java dark arts mage, Elixir trainee. I love sampo and lain. Matrix is <span><a data-user=\"1\" href=\"https://shigusegubu.club/users/hj\">@<span>hj</span></a></span>:matrix.heldscal.la Pronouns are whatever. Do not DM me unless it's truly private matter and you're instance's admin or you risk your DM to be reposted publicly.Wish i was Finnish girl.",
+        "pleroma": {
+            "confirmation_pending": false,
+            "tags": null
+        },
+        "source": {
+            "note": "",
+            "privacy": "public",
+            "sensitive": false
+        },
+        "statuses_count": 41775,
+        "url": "https://shigusegubu.club/users/hj",
+        "username": "hj"
+    },
+    "application": {
+        "name": "Web",
+        "website": null
+    },
+    "content": "<span><a data-user=\"4395\" href=\"https://blovice.bahnhof.cz/users/pony\">@<span>pony</span></a></span> yeah",
+    "created_at": "2019-01-17T14:11:01.000Z",
+    "emojis": [],
+    "favourited": false,
+    "favourites_count": 1,
+    "id": "10419697",
+    "in_reply_to_account_id": "4395",
+    "in_reply_to_id": "10419694",
+    "language": null,
+    "media_attachments": [],
+    "mentions": [{
+        "acct": "pony@blovice.bahnhof.cz",
+        "id": "4395",
+        "url": "https://blovice.bahnhof.cz/users/pony",
+        "username": "pony"
+    }],
+    "muted": false,
+    "reblog": null,
+    "reblogged": false,
+    "reblogs_count": 0,
+    "replies_count": 0,
+    "sensitive": false,
+    "spoiler_text": "",
+    "tags": [],
+    "uri": "https://shigusegubu.club/objects/fbff5da4-a517-42a9-bca9-17cae8cf2542",
+    "url": "https://shigusegubu.club/objects/fbff5da4-a517-42a9-bca9-17cae8cf2542",
+    "visibility": "public"
+}, {
+    "account": {
+        "acct": "hj",
+        "avatar": "https://shigusegubu.club/media/1657b945-8d5b-4ce6-aafb-4c3fc5772120/8ce851029af84d55de9164e30cc7f46d60cbf12eee7e96c5c0d35d9038ddade1.png",
+        "avatar_static": "https://shigusegubu.club/media/1657b945-8d5b-4ce6-aafb-4c3fc5772120/8ce851029af84d55de9164e30cc7f46d60cbf12eee7e96c5c0d35d9038ddade1.png",
+        "bot": false,
+        "created_at": "2017-12-17T21:54:14.000Z",
+        "display_name": "whatever whatever whatever witch",
+        "emojis": [],
+        "fields": [],
+        "followers_count": 705,
+        "following_count": 326,
+        "header": "https://shigusegubu.club/media/7ab024d9-2a8a-4fbc-9ce8-da06756ae2db/6aadefe4e264133bc377ab450e6b045b6f5458542a5c59e6c741f86107f0388b.png",
+        "header_static": "https://shigusegubu.club/media/7ab024d9-2a8a-4fbc-9ce8-da06756ae2db/6aadefe4e264133bc377ab450e6b045b6f5458542a5c59e6c741f86107f0388b.png",
+        "id": "1",
+        "locked": false,
+        "note": "Volatile Internet Weirdo. Name pronounced as Hee Jay. JS and Java dark arts mage, Elixir trainee. I love sampo and lain. Matrix is <span><a data-user=\"1\" href=\"https://shigusegubu.club/users/hj\">@<span>hj</span></a></span>:matrix.heldscal.la Pronouns are whatever. Do not DM me unless it's truly private matter and you're instance's admin or you risk your DM to be reposted publicly.Wish i was Finnish girl.",
+        "pleroma": {
+            "confirmation_pending": false,
+            "tags": null
+        },
+        "source": {
+            "note": "",
+            "privacy": "public",
+            "sensitive": false
+        },
+        "statuses_count": 41775,
+        "url": "https://shigusegubu.club/users/hj",
+        "username": "hj"
+    },
+    "application": {
+        "name": "Web",
+        "website": null
+    },
+    "content": "i probably shouldn't be watchng 4-hour stream vods of joel playing doom",
+    "created_at": "2019-01-17T14:10:34.000Z",
+    "emojis": [],
+    "favourited": false,
+    "favourites_count": 0,
+    "id": "10419684",
+    "in_reply_to_account_id": null,
+    "in_reply_to_id": null,
+    "language": null,
+    "media_attachments": [],
+    "mentions": [],
+    "muted": false,
+    "reblog": null,
+    "reblogged": false,
+    "reblogs_count": 0,
+    "replies_count": 0,
+    "sensitive": false,
+    "spoiler_text": "",
+    "tags": [],
+    "uri": "https://shigusegubu.club/objects/4007d659-27c6-4577-be10-fd134f5e4e7e",
+    "url": "https://shigusegubu.club/objects/4007d659-27c6-4577-be10-fd134f5e4e7e",
+    "visibility": "public"
+}, {
+    "account": {
+        "acct": "hj",
+        "avatar": "https://shigusegubu.club/media/1657b945-8d5b-4ce6-aafb-4c3fc5772120/8ce851029af84d55de9164e30cc7f46d60cbf12eee7e96c5c0d35d9038ddade1.png",
+        "avatar_static": "https://shigusegubu.club/media/1657b945-8d5b-4ce6-aafb-4c3fc5772120/8ce851029af84d55de9164e30cc7f46d60cbf12eee7e96c5c0d35d9038ddade1.png",
+        "bot": false,
+        "created_at": "2017-12-17T21:54:14.000Z",
+        "display_name": "whatever whatever whatever witch",
+        "emojis": [],
+        "fields": [],
+        "followers_count": 705,
+        "following_count": 326,
+        "header": "https://shigusegubu.club/media/7ab024d9-2a8a-4fbc-9ce8-da06756ae2db/6aadefe4e264133bc377ab450e6b045b6f5458542a5c59e6c741f86107f0388b.png",
+        "header_static": "https://shigusegubu.club/media/7ab024d9-2a8a-4fbc-9ce8-da06756ae2db/6aadefe4e264133bc377ab450e6b045b6f5458542a5c59e6c741f86107f0388b.png",
+        "id": "1",
+        "locked": false,
+        "note": "Volatile Internet Weirdo. Name pronounced as Hee Jay. JS and Java dark arts mage, Elixir trainee. I love sampo and lain. Matrix is <span><a data-user=\"1\" href=\"https://shigusegubu.club/users/hj\">@<span>hj</span></a></span>:matrix.heldscal.la Pronouns are whatever. Do not DM me unless it's truly private matter and you're instance's admin or you risk your DM to be reposted publicly.Wish i was Finnish girl.",
+        "pleroma": {
+            "confirmation_pending": false,
+            "tags": null
+        },
+        "source": {
+            "note": "",
+            "privacy": "public",
+            "sensitive": false
+        },
+        "statuses_count": 41775,
+        "url": "https://shigusegubu.club/users/hj",
+        "username": "hj"
+    },
+    "application": {
+        "name": "Web",
+        "website": null
+    },
+    "content": "i got out of bed.",
+    "created_at": "2019-01-17T14:10:18.000Z",
+    "emojis": [],
+    "favourited": false,
+    "favourites_count": 1,
+    "id": "10419671",
+    "in_reply_to_account_id": null,
+    "in_reply_to_id": null,
+    "language": null,
+    "media_attachments": [],
+    "mentions": [],
+    "muted": false,
+    "reblog": null,
+    "reblogged": false,
+    "reblogs_count": 0,
+    "replies_count": 0,
+    "sensitive": false,
+    "spoiler_text": "",
+    "tags": [],
+    "uri": "https://shigusegubu.club/objects/59912d51-1cc6-4dc7-828c-f167e6c8b391",
+    "url": "https://shigusegubu.club/objects/59912d51-1cc6-4dc7-828c-f167e6c8b391",
+    "visibility": "public"
+}, {
+    "account": {
+        "acct": "hj",
+        "avatar": "https://shigusegubu.club/media/1657b945-8d5b-4ce6-aafb-4c3fc5772120/8ce851029af84d55de9164e30cc7f46d60cbf12eee7e96c5c0d35d9038ddade1.png",
+        "avatar_static": "https://shigusegubu.club/media/1657b945-8d5b-4ce6-aafb-4c3fc5772120/8ce851029af84d55de9164e30cc7f46d60cbf12eee7e96c5c0d35d9038ddade1.png",
+        "bot": false,
+        "created_at": "2017-12-17T21:54:14.000Z",
+        "display_name": "whatever whatever whatever witch",
+        "emojis": [],
+        "fields": [],
+        "followers_count": 705,
+        "following_count": 326,
+        "header": "https://shigusegubu.club/media/7ab024d9-2a8a-4fbc-9ce8-da06756ae2db/6aadefe4e264133bc377ab450e6b045b6f5458542a5c59e6c741f86107f0388b.png",
+        "header_static": "https://shigusegubu.club/media/7ab024d9-2a8a-4fbc-9ce8-da06756ae2db/6aadefe4e264133bc377ab450e6b045b6f5458542a5c59e6c741f86107f0388b.png",
+        "id": "1",
+        "locked": false,
+        "note": "Volatile Internet Weirdo. Name pronounced as Hee Jay. JS and Java dark arts mage, Elixir trainee. I love sampo and lain. Matrix is <span><a data-user=\"1\" href=\"https://shigusegubu.club/users/hj\">@<span>hj</span></a></span>:matrix.heldscal.la Pronouns are whatever. Do not DM me unless it's truly private matter and you're instance's admin or you risk your DM to be reposted publicly.Wish i was Finnish girl.",
+        "pleroma": {
+            "confirmation_pending": false,
+            "tags": null
+        },
+        "source": {
+            "note": "",
+            "privacy": "public",
+            "sensitive": false
+        },
+        "statuses_count": 41775,
+        "url": "https://shigusegubu.club/users/hj",
+        "username": "hj"
+    },
+    "application": {
+        "name": "Web",
+        "website": null
+    },
+    "content": "New day!",
+    "created_at": "2019-01-17T13:25:56.000Z",
+    "emojis": [],
+    "favourited": false,
+    "favourites_count": 2,
+    "id": "10418390",
+    "in_reply_to_account_id": null,
+    "in_reply_to_id": null,
+    "language": null,
+    "media_attachments": [],
+    "mentions": [],
+    "muted": false,
+    "reblog": null,
+    "reblogged": false,
+    "reblogs_count": 1,
+    "replies_count": 0,
+    "sensitive": false,
+    "spoiler_text": "",
+    "tags": [],
+    "uri": "https://shigusegubu.club/objects/62690bce-3f49-4047-9c8e-8941f2f79e10",
+    "url": "https://shigusegubu.club/objects/62690bce-3f49-4047-9c8e-8941f2f79e10",
+    "visibility": "public"
+}, {
+    "account": {
+        "acct": "hj",
+        "avatar": "https://shigusegubu.club/media/1657b945-8d5b-4ce6-aafb-4c3fc5772120/8ce851029af84d55de9164e30cc7f46d60cbf12eee7e96c5c0d35d9038ddade1.png",
+        "avatar_static": "https://shigusegubu.club/media/1657b945-8d5b-4ce6-aafb-4c3fc5772120/8ce851029af84d55de9164e30cc7f46d60cbf12eee7e96c5c0d35d9038ddade1.png",
+        "bot": false,
+        "created_at": "2017-12-17T21:54:14.000Z",
+        "display_name": "whatever whatever whatever witch",
+        "emojis": [],
+        "fields": [],
+        "followers_count": 705,
+        "following_count": 326,
+        "header": "https://shigusegubu.club/media/7ab024d9-2a8a-4fbc-9ce8-da06756ae2db/6aadefe4e264133bc377ab450e6b045b6f5458542a5c59e6c741f86107f0388b.png",
+        "header_static": "https://shigusegubu.club/media/7ab024d9-2a8a-4fbc-9ce8-da06756ae2db/6aadefe4e264133bc377ab450e6b045b6f5458542a5c59e6c741f86107f0388b.png",
+        "id": "1",
+        "locked": false,
+        "note": "Volatile Internet Weirdo. Name pronounced as Hee Jay. JS and Java dark arts mage, Elixir trainee. I love sampo and lain. Matrix is <span><a data-user=\"1\" href=\"https://shigusegubu.club/users/hj\">@<span>hj</span></a></span>:matrix.heldscal.la Pronouns are whatever. Do not DM me unless it's truly private matter and you're instance's admin or you risk your DM to be reposted publicly.Wish i was Finnish girl.",
+        "pleroma": {
+            "confirmation_pending": false,
+            "tags": null
+        },
+        "source": {
+            "note": "",
+            "privacy": "public",
+            "sensitive": false
+        },
+        "statuses_count": 41775,
+        "url": "https://shigusegubu.club/users/hj",
+        "username": "hj"
+    },
+    "application": {
+        "name": "Web",
+        "website": null
+    },
+    "content": "<span><a data-user=\"27194\" href=\"https://queer.hacktivis.me/users/lanodan\">@<span>lanodan</span></a></span> you either use nvidia-blob or don't use nvidia. Unless it's a very VERY old GPU.",
+    "created_at": "2019-01-16T22:21:10.000Z",
+    "emojis": [],
+    "favourited": false,
+    "favourites_count": 0,
+    "id": "10395196",
+    "in_reply_to_account_id": "27194",
+    "in_reply_to_id": "10394997",
+    "language": null,
+    "media_attachments": [],
+    "mentions": [{
+        "acct": "lanodan@queer.hacktivis.me",
+        "id": "27194",
+        "url": "https://queer.hacktivis.me/users/lanodan",
+        "username": "lanodan"
+    }],
+    "muted": false,
+    "reblog": null,
+    "reblogged": false,
+    "reblogs_count": 0,
+    "replies_count": 0,
+    "sensitive": false,
+    "spoiler_text": "",
+    "tags": [],
+    "uri": "https://shigusegubu.club/objects/818f3dd0-2ff8-4def-a170-e4d4c405f387",
+    "url": "https://shigusegubu.club/objects/818f3dd0-2ff8-4def-a170-e4d4c405f387",
+    "visibility": "public"
+}, {
+    "account": {
+        "acct": "hj",
+        "avatar": "https://shigusegubu.club/media/1657b945-8d5b-4ce6-aafb-4c3fc5772120/8ce851029af84d55de9164e30cc7f46d60cbf12eee7e96c5c0d35d9038ddade1.png",
+        "avatar_static": "https://shigusegubu.club/media/1657b945-8d5b-4ce6-aafb-4c3fc5772120/8ce851029af84d55de9164e30cc7f46d60cbf12eee7e96c5c0d35d9038ddade1.png",
+        "bot": false,
+        "created_at": "2017-12-17T21:54:14.000Z",
+        "display_name": "whatever whatever whatever witch",
+        "emojis": [],
+        "fields": [],
+        "followers_count": 705,
+        "following_count": 326,
+        "header": "https://shigusegubu.club/media/7ab024d9-2a8a-4fbc-9ce8-da06756ae2db/6aadefe4e264133bc377ab450e6b045b6f5458542a5c59e6c741f86107f0388b.png",
+        "header_static": "https://shigusegubu.club/media/7ab024d9-2a8a-4fbc-9ce8-da06756ae2db/6aadefe4e264133bc377ab450e6b045b6f5458542a5c59e6c741f86107f0388b.png",
+        "id": "1",
+        "locked": false,
+        "note": "Volatile Internet Weirdo. Name pronounced as Hee Jay. JS and Java dark arts mage, Elixir trainee. I love sampo and lain. Matrix is <span><a data-user=\"1\" href=\"https://shigusegubu.club/users/hj\">@<span>hj</span></a></span>:matrix.heldscal.la Pronouns are whatever. Do not DM me unless it's truly private matter and you're instance's admin or you risk your DM to be reposted publicly.Wish i was Finnish girl.",
+        "pleroma": {
+            "confirmation_pending": false,
+            "tags": null
+        },
+        "source": {
+            "note": "",
+            "privacy": "public",
+            "sensitive": false
+        },
+        "statuses_count": 41775,
+        "url": "https://shigusegubu.club/users/hj",
+        "username": "hj"
+    },
+    "application": {
+        "name": "Web",
+        "website": null
+    },
+    "content": "<span><a data-user=\"58\" href=\"https://pleroma.soykaf.com/users/lain\">@<span>lain</span></a></span> <br />1. 🔪<br />2. trigger trypophobia<br />3. sprinkle with spices<br />4. pee on it<br />5. pat pat<br />6. blanket time<br />7. bring in the cocaine<br />8. ?????????????<br />9. ???? hitler ???????<br />10. ???????????<br />11. ???? Adobe After Effects ????<br />12. !!!!!!!!!!!!!!BREAK IT!!!!!!!!!!!<br />13. !!!kindar suprize!!<br />14. (time skip for two hours, realisation that using cocaine was a bad idea)<br />15. (still not over from cocaine)<br />16. куличики! Плов, огурцы, это еще что бля<br />17. fuck it, play it cool, just put meat on the mounds<br />18. note to self: never use cocaine in culinary ever again",
+    "created_at": "2019-01-16T22:20:50.000Z",
+    "emojis": [],
+    "favourited": false,
+    "favourites_count": 1,
+    "id": "10395183",
+    "in_reply_to_account_id": "58",
+    "in_reply_to_id": "10394990",
+    "language": null,
+    "media_attachments": [],
+    "mentions": [{
+        "acct": "lain@pleroma.soykaf.com",
+        "id": "58",
+        "url": "https://pleroma.soykaf.com/users/lain",
+        "username": "lain"
+    }],
+    "muted": false,
+    "reblog": null,
+    "reblogged": false,
+    "reblogs_count": 0,
+    "replies_count": 0,
+    "sensitive": false,
+    "spoiler_text": "",
+    "tags": [],
+    "uri": "https://shigusegubu.club/objects/0783a193-c097-488d-8944-47df9372cd6e",
+    "url": "https://shigusegubu.club/objects/0783a193-c097-488d-8944-47df9372cd6e",
+    "visibility": "public"
+}, {
+    "account": {
+        "acct": "hj",
+        "avatar": "https://shigusegubu.club/media/1657b945-8d5b-4ce6-aafb-4c3fc5772120/8ce851029af84d55de9164e30cc7f46d60cbf12eee7e96c5c0d35d9038ddade1.png",
+        "avatar_static": "https://shigusegubu.club/media/1657b945-8d5b-4ce6-aafb-4c3fc5772120/8ce851029af84d55de9164e30cc7f46d60cbf12eee7e96c5c0d35d9038ddade1.png",
+        "bot": false,
+        "created_at": "2017-12-17T21:54:14.000Z",
+        "display_name": "whatever whatever whatever witch",
+        "emojis": [],
+        "fields": [],
+        "followers_count": 705,
+        "following_count": 326,
+        "header": "https://shigusegubu.club/media/7ab024d9-2a8a-4fbc-9ce8-da06756ae2db/6aadefe4e264133bc377ab450e6b045b6f5458542a5c59e6c741f86107f0388b.png",
+        "header_static": "https://shigusegubu.club/media/7ab024d9-2a8a-4fbc-9ce8-da06756ae2db/6aadefe4e264133bc377ab450e6b045b6f5458542a5c59e6c741f86107f0388b.png",
+        "id": "1",
+        "locked": false,
+        "note": "Volatile Internet Weirdo. Name pronounced as Hee Jay. JS and Java dark arts mage, Elixir trainee. I love sampo and lain. Matrix is <span><a data-user=\"1\" href=\"https://shigusegubu.club/users/hj\">@<span>hj</span></a></span>:matrix.heldscal.la Pronouns are whatever. Do not DM me unless it's truly private matter and you're instance's admin or you risk your DM to be reposted publicly.Wish i was Finnish girl.",
+        "pleroma": {
+            "confirmation_pending": false,
+            "tags": null
+        },
+        "source": {
+            "note": "",
+            "privacy": "public",
+            "sensitive": false
+        },
+        "statuses_count": 41775,
+        "url": "https://shigusegubu.club/users/hj",
+        "username": "hj"
+    },
+    "application": {
+        "name": "Web",
+        "website": null
+    },
+    "content": "<span><a data-user=\"55339\" href=\"https://pleroma.site/users/cathode\">@<span>cathode</span></a></span> me too",
+    "created_at": "2019-01-16T22:09:28.000Z",
+    "emojis": [],
+    "favourited": false,
+    "favourites_count": 1,
+    "id": "10394697",
+    "in_reply_to_account_id": "55339",
+    "in_reply_to_id": "10394677",
+    "language": null,
+    "media_attachments": [],
+    "mentions": [{
+        "acct": "cathode@pleroma.site",
+        "id": "55339",
+        "url": "https://pleroma.site/users/cathode",
+        "username": "cathode"
+    }],
+    "muted": false,
+    "reblog": null,
+    "reblogged": false,
+    "reblogs_count": 0,
+    "replies_count": 0,
+    "sensitive": false,
+    "spoiler_text": "",
+    "tags": [],
+    "uri": "https://shigusegubu.club/objects/145d5252-7b8e-467d-9f36-1db0818f452f",
+    "url": "https://shigusegubu.club/objects/145d5252-7b8e-467d-9f36-1db0818f452f",
+    "visibility": "public"
+}, {
+    "account": {
+        "acct": "hj",
+        "avatar": "https://shigusegubu.club/media/1657b945-8d5b-4ce6-aafb-4c3fc5772120/8ce851029af84d55de9164e30cc7f46d60cbf12eee7e96c5c0d35d9038ddade1.png",
+        "avatar_static": "https://shigusegubu.club/media/1657b945-8d5b-4ce6-aafb-4c3fc5772120/8ce851029af84d55de9164e30cc7f46d60cbf12eee7e96c5c0d35d9038ddade1.png",
+        "bot": false,
+        "created_at": "2017-12-17T21:54:14.000Z",
+        "display_name": "whatever whatever whatever witch",
+        "emojis": [],
+        "fields": [],
+        "followers_count": 705,
+        "following_count": 326,
+        "header": "https://shigusegubu.club/media/7ab024d9-2a8a-4fbc-9ce8-da06756ae2db/6aadefe4e264133bc377ab450e6b045b6f5458542a5c59e6c741f86107f0388b.png",
+        "header_static": "https://shigusegubu.club/media/7ab024d9-2a8a-4fbc-9ce8-da06756ae2db/6aadefe4e264133bc377ab450e6b045b6f5458542a5c59e6c741f86107f0388b.png",
+        "id": "1",
+        "locked": false,
+        "note": "Volatile Internet Weirdo. Name pronounced as Hee Jay. JS and Java dark arts mage, Elixir trainee. I love sampo and lain. Matrix is <span><a data-user=\"1\" href=\"https://shigusegubu.club/users/hj\">@<span>hj</span></a></span>:matrix.heldscal.la Pronouns are whatever. Do not DM me unless it's truly private matter and you're instance's admin or you risk your DM to be reposted publicly.Wish i was Finnish girl.",
+        "pleroma": {
+            "confirmation_pending": false,
+            "tags": null
+        },
+        "source": {
+            "note": "",
+            "privacy": "public",
+            "sensitive": false
+        },
+        "statuses_count": 41775,
+        "url": "https://shigusegubu.club/users/hj",
+        "username": "hj"
+    },
+    "application": {
+        "name": "Web",
+        "website": null
+    },
+    "content": "I love pleroma and lain",
+    "created_at": "2019-01-16T22:09:24.000Z",
+    "emojis": [],
+    "favourited": false,
+    "favourites_count": 0,
+    "id": "10394690",
+    "in_reply_to_account_id": null,
+    "in_reply_to_id": null,
+    "language": null,
+    "media_attachments": [],
+    "mentions": [{
+        "acct": "cathode@pleroma.site",
+        "id": "55339",
+        "url": "https://pleroma.site/users/cathode",
+        "username": "cathode"
+    }],
+    "muted": false,
+    "reblog": {
+        "account": {
+            "acct": "cathode@pleroma.site",
+            "avatar": "https://pleroma.site/media/cc874883-fafb-4f25-80f2-e16677e83621/c50a4ea55a99fdf3b69bf66ce2768bc2c48c6135332914bb49445aab1211d794.gif",
+            "avatar_static": "https://pleroma.site/media/cc874883-fafb-4f25-80f2-e16677e83621/c50a4ea55a99fdf3b69bf66ce2768bc2c48c6135332914bb49445aab1211d794.gif",
+            "bot": false,
+            "created_at": "2018-12-14T21:47:14.000Z",
+            "display_name": "gay hug bug loves you",
+            "emojis": [],
+            "fields": [],
+            "followers_count": 0,
+            "following_count": 0,
+            "header": "https://pleroma.site/media/8170fac2-fc17-4b9c-8624-52491d56f769/8cb558d3960254180b10860012a519253baaa1db88a0476da02be6a558015b34.jpg",
+            "header_static": "https://pleroma.site/media/8170fac2-fc17-4b9c-8624-52491d56f769/8cb558d3960254180b10860012a519253baaa1db88a0476da02be6a558015b34.jpg",
+            "id": "55339",
+            "locked": false,
+            "note": "he/him but you can call me anything really<br /><br />welcome to my profile :333<br /><br /><a href=\"https://cathode.neocities.org/\">https://cathode.neocities.org/</a>",
+            "pleroma": {
+                "confirmation_pending": false,
+                "tags": null
+            },
+            "source": {
+                "note": "",
+                "privacy": "public",
+                "sensitive": false
+            },
+            "statuses_count": 16,
+            "url": "https://pleroma.site/users/cathode",
+            "username": "cathode"
+        },
+        "application": {
+            "name": "Web",
+            "website": null
+        },
+        "content": "I love pleroma and lain",
+        "created_at": "2019-01-16T22:08:50.000Z",
+        "emojis": [],
+        "favourited": false,
+        "favourites_count": 4,
+        "id": "10394677",
+        "in_reply_to_account_id": null,
+        "in_reply_to_id": null,
+        "language": null,
+        "media_attachments": [],
+        "mentions": [],
+        "muted": false,
+        "reblog": null,
+        "reblogged": false,
+        "reblogs_count": 2,
+        "replies_count": 0,
+        "sensitive": false,
+        "spoiler_text": "",
+        "tags": [],
+        "uri": "https://pleroma.site/objects/3076c055-0e34-4cf9-86ca-2d148b9b694a",
+        "url": "https://pleroma.site/objects/3076c055-0e34-4cf9-86ca-2d148b9b694a",
+        "visibility": "public"
+    },
+    "reblogged": false,
+    "reblogs_count": 0,
+    "replies_count": 0,
+    "sensitive": false,
+    "spoiler_text": "",
+    "tags": [],
+    "uri": "https://pleroma.site/objects/3076c055-0e34-4cf9-86ca-2d148b9b694a",
+    "url": "https://pleroma.site/objects/3076c055-0e34-4cf9-86ca-2d148b9b694a",
+    "visibility": "public"
+}, {
+    "account": {
+        "acct": "hj",
+        "avatar": "https://shigusegubu.club/media/1657b945-8d5b-4ce6-aafb-4c3fc5772120/8ce851029af84d55de9164e30cc7f46d60cbf12eee7e96c5c0d35d9038ddade1.png",
+        "avatar_static": "https://shigusegubu.club/media/1657b945-8d5b-4ce6-aafb-4c3fc5772120/8ce851029af84d55de9164e30cc7f46d60cbf12eee7e96c5c0d35d9038ddade1.png",
+        "bot": false,
+        "created_at": "2017-12-17T21:54:14.000Z",
+        "display_name": "whatever whatever whatever witch",
+        "emojis": [],
+        "fields": [],
+        "followers_count": 705,
+        "following_count": 326,
+        "header": "https://shigusegubu.club/media/7ab024d9-2a8a-4fbc-9ce8-da06756ae2db/6aadefe4e264133bc377ab450e6b045b6f5458542a5c59e6c741f86107f0388b.png",
+        "header_static": "https://shigusegubu.club/media/7ab024d9-2a8a-4fbc-9ce8-da06756ae2db/6aadefe4e264133bc377ab450e6b045b6f5458542a5c59e6c741f86107f0388b.png",
+        "id": "1",
+        "locked": false,
+        "note": "Volatile Internet Weirdo. Name pronounced as Hee Jay. JS and Java dark arts mage, Elixir trainee. I love sampo and lain. Matrix is <span><a data-user=\"1\" href=\"https://shigusegubu.club/users/hj\">@<span>hj</span></a></span>:matrix.heldscal.la Pronouns are whatever. Do not DM me unless it's truly private matter and you're instance's admin or you risk your DM to be reposted publicly.Wish i was Finnish girl.",
+        "pleroma": {
+            "confirmation_pending": false,
+            "tags": null
+        },
+        "source": {
+            "note": "",
+            "privacy": "public",
+            "sensitive": false
+        },
+        "statuses_count": 41775,
+        "url": "https://shigusegubu.club/users/hj",
+        "username": "hj"
+    },
+    "application": {
+        "name": "Web",
+        "website": null
+    },
+    "content": "<span><a data-user=\"58\" href=\"https://pleroma.soykaf.com/users/lain\">@<span>lain</span></a></span> that trick he does in the very beginning with that smile oh my god",
+    "created_at": "2019-01-16T22:08:15.000Z",
+    "emojis": [],
+    "favourited": false,
+    "favourites_count": 2,
+    "id": "10394647",
+    "in_reply_to_account_id": "58",
+    "in_reply_to_id": "10394582",
+    "language": null,
+    "media_attachments": [],
+    "mentions": [{
+        "acct": "lain@pleroma.soykaf.com",
+        "id": "58",
+        "url": "https://pleroma.soykaf.com/users/lain",
+        "username": "lain"
+    }],
+    "muted": false,
+    "reblog": null,
+    "reblogged": false,
+    "reblogs_count": 0,
+    "replies_count": 0,
+    "sensitive": false,
+    "spoiler_text": "",
+    "tags": [],
+    "uri": "https://shigusegubu.club/objects/d4eb7c46-02f9-4b1f-83af-926cefa21f33",
+    "url": "https://shigusegubu.club/objects/d4eb7c46-02f9-4b1f-83af-926cefa21f33",
+    "visibility": "public"
+}, {
+    "account": {
+        "acct": "hj",
+        "avatar": "https://shigusegubu.club/media/1657b945-8d5b-4ce6-aafb-4c3fc5772120/8ce851029af84d55de9164e30cc7f46d60cbf12eee7e96c5c0d35d9038ddade1.png",
+        "avatar_static": "https://shigusegubu.club/media/1657b945-8d5b-4ce6-aafb-4c3fc5772120/8ce851029af84d55de9164e30cc7f46d60cbf12eee7e96c5c0d35d9038ddade1.png",
+        "bot": false,
+        "created_at": "2017-12-17T21:54:14.000Z",
+        "display_name": "whatever whatever whatever witch",
+        "emojis": [],
+        "fields": [],
+        "followers_count": 705,
+        "following_count": 326,
+        "header": "https://shigusegubu.club/media/7ab024d9-2a8a-4fbc-9ce8-da06756ae2db/6aadefe4e264133bc377ab450e6b045b6f5458542a5c59e6c741f86107f0388b.png",
+        "header_static": "https://shigusegubu.club/media/7ab024d9-2a8a-4fbc-9ce8-da06756ae2db/6aadefe4e264133bc377ab450e6b045b6f5458542a5c59e6c741f86107f0388b.png",
+        "id": "1",
+        "locked": false,
+        "note": "Volatile Internet Weirdo. Name pronounced as Hee Jay. JS and Java dark arts mage, Elixir trainee. I love sampo and lain. Matrix is <span><a data-user=\"1\" href=\"https://shigusegubu.club/users/hj\">@<span>hj</span></a></span>:matrix.heldscal.la Pronouns are whatever. Do not DM me unless it's truly private matter and you're instance's admin or you risk your DM to be reposted publicly.Wish i was Finnish girl.",
+        "pleroma": {
+            "confirmation_pending": false,
+            "tags": null
+        },
+        "source": {
+            "note": "",
+            "privacy": "public",
+            "sensitive": false
+        },
+        "statuses_count": 41775,
+        "url": "https://shigusegubu.club/users/hj",
+        "username": "hj"
+    },
+    "application": {
+        "name": "Web",
+        "website": null
+    },
+    "content": ".",
+    "created_at": "2019-01-16T22:08:01.000Z",
+    "emojis": [],
+    "favourited": false,
+    "favourites_count": 0,
+    "id": "10394636",
+    "in_reply_to_account_id": null,
+    "in_reply_to_id": null,
+    "language": null,
+    "media_attachments": [{
+        "description": null,
+        "id": "-1089888084",
+        "preview_url": "https://pleroma.soykaf.com/media/d985e90d-b079-4f6a-a5bc-9b5e26b1fa5a/Tusky_1547676391813_2VJ7ITWJ3T.webm",
+        "remote_url": "https://pleroma.soykaf.com/media/d985e90d-b079-4f6a-a5bc-9b5e26b1fa5a/Tusky_1547676391813_2VJ7ITWJ3T.webm",
+        "text_url": "https://pleroma.soykaf.com/media/d985e90d-b079-4f6a-a5bc-9b5e26b1fa5a/Tusky_1547676391813_2VJ7ITWJ3T.webm",
+        "type": "video",
+        "url": "https://pleroma.soykaf.com/media/d985e90d-b079-4f6a-a5bc-9b5e26b1fa5a/Tusky_1547676391813_2VJ7ITWJ3T.webm"
+    }],
+    "mentions": [{
+        "acct": "lain@pleroma.soykaf.com",
+        "id": "58",
+        "url": "https://pleroma.soykaf.com/users/lain",
+        "username": "lain"
+    }],
+    "muted": false,
+    "reblog": {
+        "account": {
+            "acct": "lain@pleroma.soykaf.com",
+            "avatar": "https://pleroma.soykaf.com/media/57abd080-73da-4541-92c7-506d0008bce3/04c76c19e87b23f759fac1118db5e5c4fe0b0ba8d67942a9a8f4e88108543abd.jpeg",
+            "avatar_static": "https://pleroma.soykaf.com/media/57abd080-73da-4541-92c7-506d0008bce3/04c76c19e87b23f759fac1118db5e5c4fe0b0ba8d67942a9a8f4e88108543abd.jpeg",
+            "bot": false,
+            "created_at": "2017-12-17T22:26:31.000Z",
+            "display_name": "you're looking at an ace",
+            "emojis": [],
+            "fields": [],
+            "followers_count": 29,
+            "following_count": 1389,
+            "header": "https://pleroma.soykaf.com/images/banner.png",
+            "header_static": "https://pleroma.soykaf.com/images/banner.png",
+            "id": "58",
+            "locked": false,
+            "note": "blushy-crushy fediverse idol + pleroma dev.<br />let's be friends <br />ぷれろまの生徒会長。謎の外人。日本語OK. <br />公主病.<br />I invented the internet.<br />xmpp: lain@trashserver.net<br />matrix: lambadalambda@matrix.heldscal.la<br />pgp: 58B48DE582EE103C964735A1F9C6698E14CCE33C",
+            "pleroma": {
+                "confirmation_pending": false,
+                "tags": null
+            },
+            "source": {
+                "note": "",
+                "privacy": "public",
+                "sensitive": false
+            },
+            "statuses_count": 35042,
+            "url": "https://pleroma.soykaf.com/users/lain",
+            "username": "lain"
+        },
+        "application": {
+            "name": "Web",
+            "website": null
+        },
+        "content": ".",
+        "created_at": "2019-01-16T22:06:35.000Z",
+        "emojis": [],
+        "favourited": false,
+        "favourites_count": 2,
+        "id": "10394582",
+        "in_reply_to_account_id": null,
+        "in_reply_to_id": null,
+        "language": null,
+        "media_attachments": [{
+            "description": null,
+            "id": "-1089888084",
+            "preview_url": "https://pleroma.soykaf.com/media/d985e90d-b079-4f6a-a5bc-9b5e26b1fa5a/Tusky_1547676391813_2VJ7ITWJ3T.webm",
+            "remote_url": "https://pleroma.soykaf.com/media/d985e90d-b079-4f6a-a5bc-9b5e26b1fa5a/Tusky_1547676391813_2VJ7ITWJ3T.webm",
+            "text_url": "https://pleroma.soykaf.com/media/d985e90d-b079-4f6a-a5bc-9b5e26b1fa5a/Tusky_1547676391813_2VJ7ITWJ3T.webm",
+            "type": "video",
+            "url": "https://pleroma.soykaf.com/media/d985e90d-b079-4f6a-a5bc-9b5e26b1fa5a/Tusky_1547676391813_2VJ7ITWJ3T.webm"
+        }],
+        "mentions": [],
+        "muted": false,
+        "reblog": null,
+        "reblogged": false,
+        "reblogs_count": 1,
+        "replies_count": 0,
+        "sensitive": false,
+        "spoiler_text": "",
+        "tags": [],
+        "uri": "https://pleroma.soykaf.com/objects/338b6bd2-3c2d-40fe-93a3-28b688782733",
+        "url": "https://pleroma.soykaf.com/objects/338b6bd2-3c2d-40fe-93a3-28b688782733",
+        "visibility": "public"
+    },
+    "reblogged": false,
+    "reblogs_count": 0,
+    "replies_count": 0,
+    "sensitive": false,
+    "spoiler_text": "",
+    "tags": [],
+    "uri": "https://pleroma.soykaf.com/objects/338b6bd2-3c2d-40fe-93a3-28b688782733",
+    "url": "https://pleroma.soykaf.com/objects/338b6bd2-3c2d-40fe-93a3-28b688782733",
+    "visibility": "public"
+}, {
+    "account": {
+        "acct": "hj",
+        "avatar": "https://shigusegubu.club/media/1657b945-8d5b-4ce6-aafb-4c3fc5772120/8ce851029af84d55de9164e30cc7f46d60cbf12eee7e96c5c0d35d9038ddade1.png",
+        "avatar_static": "https://shigusegubu.club/media/1657b945-8d5b-4ce6-aafb-4c3fc5772120/8ce851029af84d55de9164e30cc7f46d60cbf12eee7e96c5c0d35d9038ddade1.png",
+        "bot": false,
+        "created_at": "2017-12-17T21:54:14.000Z",
+        "display_name": "whatever whatever whatever witch",
+        "emojis": [],
+        "fields": [],
+        "followers_count": 705,
+        "following_count": 326,
+        "header": "https://shigusegubu.club/media/7ab024d9-2a8a-4fbc-9ce8-da06756ae2db/6aadefe4e264133bc377ab450e6b045b6f5458542a5c59e6c741f86107f0388b.png",
+        "header_static": "https://shigusegubu.club/media/7ab024d9-2a8a-4fbc-9ce8-da06756ae2db/6aadefe4e264133bc377ab450e6b045b6f5458542a5c59e6c741f86107f0388b.png",
+        "id": "1",
+        "locked": false,
+        "note": "Volatile Internet Weirdo. Name pronounced as Hee Jay. JS and Java dark arts mage, Elixir trainee. I love sampo and lain. Matrix is <span><a data-user=\"1\" href=\"https://shigusegubu.club/users/hj\">@<span>hj</span></a></span>:matrix.heldscal.la Pronouns are whatever. Do not DM me unless it's truly private matter and you're instance's admin or you risk your DM to be reposted publicly.Wish i was Finnish girl.",
+        "pleroma": {
+            "confirmation_pending": false,
+            "tags": null
+        },
+        "source": {
+            "note": "",
+            "privacy": "public",
+            "sensitive": false
+        },
+        "statuses_count": 41775,
+        "url": "https://shigusegubu.club/users/hj",
+        "username": "hj"
+    },
+    "application": {
+        "name": "Web",
+        "website": null
+    },
+    "content": "<span><a data-user=\"17544\" href=\"https://iscute.moe/users/proxeus\">@<span>proxeus</span></a></span> good song",
+    "created_at": "2019-01-16T22:04:23.000Z",
+    "emojis": [],
+    "favourited": false,
+    "favourites_count": 1,
+    "id": "10394506",
+    "in_reply_to_account_id": "17544",
+    "in_reply_to_id": "10393849",
+    "language": null,
+    "media_attachments": [],
+    "mentions": [{
+        "acct": "proxeus@iscute.moe",
+        "id": "17544",
+        "url": "https://iscute.moe/users/proxeus",
+        "username": "proxeus"
+    }],
+    "muted": false,
+    "reblog": null,
+    "reblogged": false,
+    "reblogs_count": 0,
+    "replies_count": 0,
+    "sensitive": false,
+    "spoiler_text": "",
+    "tags": [],
+    "uri": "https://shigusegubu.club/objects/f472f4ed-8b0b-492f-9d53-d69eda79629d",
+    "url": "https://shigusegubu.club/objects/f472f4ed-8b0b-492f-9d53-d69eda79629d",
+    "visibility": "public"
+}, {
+    "account": {
+        "acct": "hj",
+        "avatar": "https://shigusegubu.club/media/1657b945-8d5b-4ce6-aafb-4c3fc5772120/8ce851029af84d55de9164e30cc7f46d60cbf12eee7e96c5c0d35d9038ddade1.png",
+        "avatar_static": "https://shigusegubu.club/media/1657b945-8d5b-4ce6-aafb-4c3fc5772120/8ce851029af84d55de9164e30cc7f46d60cbf12eee7e96c5c0d35d9038ddade1.png",
+        "bot": false,
+        "created_at": "2017-12-17T21:54:14.000Z",
+        "display_name": "whatever whatever whatever witch",
+        "emojis": [],
+        "fields": [],
+        "followers_count": 705,
+        "following_count": 326,
+        "header": "https://shigusegubu.club/media/7ab024d9-2a8a-4fbc-9ce8-da06756ae2db/6aadefe4e264133bc377ab450e6b045b6f5458542a5c59e6c741f86107f0388b.png",
+        "header_static": "https://shigusegubu.club/media/7ab024d9-2a8a-4fbc-9ce8-da06756ae2db/6aadefe4e264133bc377ab450e6b045b6f5458542a5c59e6c741f86107f0388b.png",
+        "id": "1",
+        "locked": false,
+        "note": "Volatile Internet Weirdo. Name pronounced as Hee Jay. JS and Java dark arts mage, Elixir trainee. I love sampo and lain. Matrix is <span><a data-user=\"1\" href=\"https://shigusegubu.club/users/hj\">@<span>hj</span></a></span>:matrix.heldscal.la Pronouns are whatever. Do not DM me unless it's truly private matter and you're instance's admin or you risk your DM to be reposted publicly.Wish i was Finnish girl.",
+        "pleroma": {
+            "confirmation_pending": false,
+            "tags": null
+        },
+        "source": {
+            "note": "",
+            "privacy": "public",
+            "sensitive": false
+        },
+        "statuses_count": 41775,
+        "url": "https://shigusegubu.club/users/hj",
+        "username": "hj"
+    },
+    "application": {
+        "name": "Web",
+        "website": null
+    },
+    "content": "<span><a data-user=\"60913\" href=\"https://shigusegubu.club/users/cdmnky\">@<span>cdmnky</span></a></span> olivia been repeating \"hey i moved\" post like once every day or so",
+    "created_at": "2019-01-16T21:56:05.000Z",
+    "emojis": [],
+    "favourited": false,
+    "favourites_count": 1,
+    "id": "10393859",
+    "in_reply_to_account_id": "60913",
+    "in_reply_to_id": "10393808",
+    "language": null,
+    "media_attachments": [],
+    "mentions": [{
+        "acct": "cdmnky",
+        "id": "60913",
+        "url": "https://shigusegubu.club/users/cdmnky",
+        "username": "cdmnky"
+    }],
+    "muted": false,
+    "reblog": null,
+    "reblogged": false,
+    "reblogs_count": 0,
+    "replies_count": 0,
+    "sensitive": false,
+    "spoiler_text": "",
+    "tags": [],
+    "uri": "https://shigusegubu.club/objects/d6fb4fd2-1f6a-4446-a1a6-5edd34050096",
+    "url": "https://shigusegubu.club/objects/d6fb4fd2-1f6a-4446-a1a6-5edd34050096",
+    "visibility": "public"
+}]

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: [PATCH 20/48] 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.service.js               |  4 +--
 6 files changed, 38 insertions(+), 43 deletions(-)

diff --git a/src/components/timeline/timeline.js b/src/components/timeline/timeline.js
index 23d2c1e817..98da86607b 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 245d55ca29..7f17ef69e8 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 b85b24be56..a61340c223 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 baeef8bf3b..f976fa42a6 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 14a526ef10..0e2672764e 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 126e07cf76..727f6c6043 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

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: [PATCH 21/48] 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.service.js              |  8 +++
 5 files changed, 64 insertions(+), 32 deletions(-)

diff --git a/src/components/user_profile/user_profile.js b/src/components/user_profile/user_profile.js
index 7f17ef69e8..c9197a1cf5 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 265fc65b92..e53727ff5d 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 33c02a0787..c4d479f91d 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 0e2672764e..c45f8572d8 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 ca0f36dba4..fa35bba3b1 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)

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: [PATCH 22/48] 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(-)

diff --git a/src/components/tab_switcher/tab_switcher.jsx b/src/components/tab_switcher/tab_switcher.jsx
index 2f362c4d0b..175ae77784 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
+      }
     }
   },
-  render(h) {
+  beforeUpdate () {
+    const currentSlot = this.$slots.default[this.active]
+    if (!currentSlot.tag) {
+      this.active = this.$slots.default.findIndex(_ => _.tag)
+    }
+  },
+  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 e53727ff5d..d64ce27703 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">

From a680f7d6842b5382d132865c6fd00ab7c53b3109 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Thu, 17 Jan 2019 22:49:33 +0300
Subject: [PATCH 23/48] localization strings

---
 src/i18n/en.json | 1 +
 src/i18n/ru.json | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/i18n/en.json b/src/i18n/en.json
index 8a6d131043..cb26487bdf 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -323,6 +323,7 @@
     "block": "Block",
     "blocked": "Blocked!",
     "deny": "Deny",
+    "favorites": "Favorites",
     "follow": "Follow",
     "follow_sent": "Request sent!",
     "follow_progress": "Requesting…",
diff --git a/src/i18n/ru.json b/src/i18n/ru.json
index 249eab6965..0887bb5908 100644
--- a/src/i18n/ru.json
+++ b/src/i18n/ru.json
@@ -279,6 +279,7 @@
   "user_card": {
     "block": "Заблокировать",
     "blocked": "Заблокирован",
+    "favorites": "Понравившиеся",
     "follow": "Читать",
     "follow_sent": "Запрос отправлен!",
     "follow_progress": "Запрашиваем…",

From 8f4fbf857121983ab19de657751cbfb47f91ee09 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Thu, 17 Jan 2019 23:01:38 +0300
Subject: [PATCH 24/48] some consistency

---
 src/modules/users.js                               |  2 +-
 src/services/api/api.service.js                    | 14 +++++++++++---
 .../status_poster/status_poster.service.js         |  1 -
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/modules/users.js b/src/modules/users.js
index c4d479f91d..0b55d701e5 100644
--- a/src/modules/users.js
+++ b/src/modules/users.js
@@ -209,7 +209,7 @@ const users = {
         store.rootState.api.backendInteractor.verifyCredentials(accessToken)
           .then((data) => {
             if (!data.error) {
-              const { user } = data
+              const user = data
               // user.credentials = userCredentials
               user.credentials = accessToken
               commit('setCurrentUser', user)
diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js
index c45f8572d8..62d35d333a 100644
--- a/src/services/api/api.service.js
+++ b/src/services/api/api.service.js
@@ -375,9 +375,7 @@ const verifyCredentials = (user) => {
         }
       }
     })
-    .then((data) => ({
-      user: parseUser(data)
-    }))
+    .then((data) => data.error ? data : parseUser(data))
 }
 
 const favorite = ({ id, credentials }) => {
@@ -429,6 +427,16 @@ const postStatus = ({credentials, status, spoilerText, visibility, sensitive, me
     method: 'POST',
     headers: authHeaders(credentials)
   })
+    .then((response) => {
+      if (response.ok) {
+        return response.json()
+      } else {
+        return {
+          error: response
+        }
+      }
+    })
+    .then((data) => data.error ? data : parseStatus(data))
 }
 
 const deleteStatus = ({ id, credentials }) => {
diff --git a/src/services/status_poster/status_poster.service.js b/src/services/status_poster/status_poster.service.js
index 1e20d336e3..f1932bb613 100644
--- a/src/services/status_poster/status_poster.service.js
+++ b/src/services/status_poster/status_poster.service.js
@@ -5,7 +5,6 @@ const postStatus = ({ store, status, spoilerText, visibility, sensitive, media =
   const mediaIds = map(media, 'id')
 
   return apiService.postStatus({credentials: store.state.users.currentUser.credentials, status, spoilerText, visibility, sensitive, mediaIds, inReplyToStatusId, contentType, noAttachmentLinks: store.state.instance.noAttachmentLinks})
-    .then((data) => data.json())
     .then((data) => {
       if (!data.error) {
         store.dispatch('addNewStatuses', {

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: [PATCH 25/48] fix indents

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

diff --git a/src/components/tab_switcher/tab_switcher.jsx b/src/components/tab_switcher/tab_switcher.jsx
index 175ae77784..2eb30ea605 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>
     )
   }

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: [PATCH 26/48] 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(-)

diff --git a/src/components/conversation-page/conversation-page.js b/src/components/conversation-page/conversation-page.js
index bdf84d0c6c..8f1ac3d90d 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 237de7e510..9bf5e136a1 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 f976fa42a6..83cf725642 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 0b55d701e5..d83f0dd898 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

From af36f4915a1a67a05a9fd98a7299889cba43d94e Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Thu, 17 Jan 2019 23:22:51 +0300
Subject: [PATCH 27/48] support for CW/Subject. fix replies.

---
 src/services/api/api.service.js                        | 10 +++++-----
 .../entity_normalizer/entity_normalizer.service.js     | 10 +++++++---
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js
index 62d35d333a..2b1ef5dfe4 100644
--- a/src/services/api/api.service.js
+++ b/src/services/api/api.service.js
@@ -276,26 +276,26 @@ const fetchFollowRequests = ({credentials}) => {
 const fetchConversation = ({id, credentials}) => {
   let url = `${CONVERSATION_URL}/${id}.json?count=100`
   return fetch(url, { headers: authHeaders(credentials) })
-    .then((data) => data.json())
     .then((data) => {
       if (data.ok) {
         return data
       }
-      throw new Error('Error fetching timeline')
+      throw new Error('Error fetching timeline', data)
     })
+    .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) => {
       if (data.ok) {
         return data
       }
-      throw new Error('Error fetching timeline')
+      throw new Error('Error fetching timeline', data)
     })
+    .then((data) => data.json())
     .then((data) => parseStatus(data))
 }
 
@@ -355,7 +355,7 @@ const fetchTimeline = ({timeline, credentials, since = false, until = false, use
       if (data.ok) {
         return data
       }
-      throw new Error('Error fetching timeline')
+      throw new Error('Error fetching timeline', data)
     })
     .then((data) => data.json())
     .then((data) => data.map(isNotifications ? parseNotification : parseStatus))
diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js
index fa35bba3b1..9b4905a704 100644
--- a/src/services/entity_normalizer/entity_normalizer.service.js
+++ b/src/services/entity_normalizer/entity_normalizer.service.js
@@ -126,7 +126,7 @@ export const parseStatus = (data) => {
     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
+    output.in_reply_to_user_id = data.in_reply_to_account_id
 
     // Not exactly the same but works
     output.statusnet_conversation_id = data.id
@@ -134,6 +134,8 @@ export const parseStatus = (data) => {
     if (output.type === 'retweet') {
       output.retweeted_status = parseStatus(data.reblog)
     }
+
+    output.summary = data.spoiler_text
   } else {
     output.favorited = data.favorited
     output.fave_num = data.fave_num
@@ -158,14 +160,16 @@ export const parseStatus = (data) => {
     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.in_reply_to_status_id = data.in_reply_to_status_id
+    output.in_reply_to_user_id = data.in_reply_to_user_id
 
     output.statusnet_conversation_id = data.statusnet_conversation_id
 
     if (output.type === 'retweet') {
       output.retweeted_status = parseStatus(data.retweeted_status)
     }
+
+    output.summary = data.summary
   }
 
   output.id = String(data.id)

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: [PATCH 28/48] some more post fields

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

diff --git a/src/components/status/status.js b/src/components/status/status.js
index b648ab70f2..27f7bafa93 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 9b4905a704..7321a1b3f9 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)

From bac7154bc6025f97aabd66421880e0766d2a585d Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Thu, 17 Jan 2019 23:53:05 +0300
Subject: [PATCH 29/48] more fields for users

---
 .../entity_normalizer.service.js                 | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js
index 7321a1b3f9..a5931f1790 100644
--- a/src/services/entity_normalizer/entity_normalizer.service.js
+++ b/src/services/entity_normalizer/entity_normalizer.service.js
@@ -58,6 +58,15 @@ export const parseUser = (data) => {
 
     output.statusnet_profile_url = data.url
 
+    // FIXME missing
+    output.follows_you = null
+
+    // FIXME ???????
+    output.statusnet_blocking = false
+
+    // FIXME missing
+    output.muted = null
+
     // Missing, trying to recover
     output.is_local = !output.screen_name.includes('@')
   } else {
@@ -79,8 +88,15 @@ export const parseUser = (data) => {
     output.bot = null // missing
 
     output.statusnet_profile_url = data.statusnet_profile_url
+
+    output.statusnet_blocking = data.statusnet_blocking
+
     output.is_local = data.is_local
 
+    output.follows_you = data.follows_you
+
+    output.muted = data.muted
+
     // QVITTER ONLY FOR NOW
     // Really only applies to logged in user, really.. I THINK
     output.rights = data.rights

From d231a45644a14cae167b7b40b9a9fd5919056664 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Sat, 19 Jan 2019 04:10:16 +0300
Subject: [PATCH 30/48] support for extended fields (for future, doesn't work
 yet), fix reply bug

---
 .../entity_normalizer.service.js              | 20 +++++++------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js
index a5931f1790..82187a7505 100644
--- a/src/services/entity_normalizer/entity_normalizer.service.js
+++ b/src/services/entity_normalizer/entity_normalizer.service.js
@@ -58,14 +58,12 @@ export const parseUser = (data) => {
 
     output.statusnet_profile_url = data.url
 
-    // FIXME missing
-    output.follows_you = null
-
-    // FIXME ???????
-    output.statusnet_blocking = false
-
-    // FIXME missing
-    output.muted = null
+    if (data.pleroma) {
+      const pleroma = data.pleroma
+      output.follows_you = pleroma.follows_you
+      output.statusnet_blocking = pleroma.statusnet_blocking
+      output.muted = pleroma.muted
+    }
 
     // Missing, trying to recover
     output.is_local = !output.screen_name.includes('@')
@@ -204,11 +202,7 @@ export const parseStatus = (data) => {
 
   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.attentions = ((masto ? data.mentions : data.attentions) || []).map(parseUser)
 
   output.attachments = ((masto ? data.media_attachments : data.attachments) || [])
     .map(parseAttachment)

From 031c044297ed6286c0e6b6c1b8333ee62f8b14b8 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Mon, 21 Jan 2019 16:28:36 +0300
Subject: [PATCH 31/48] better handling of attachments

---
 .../entity_normalizer.service.js              | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js
index 82187a7505..087f789b83 100644
--- a/src/services/entity_normalizer/entity_normalizer.service.js
+++ b/src/services/entity_normalizer/entity_normalizer.service.js
@@ -113,11 +113,22 @@ export const parseUser = (data) => {
 }
 
 const parseAttachment = (data) => {
-  // TODO A little bit messy ATM but works with both APIs
-  return {
-    ...data,
-    mimetype: data.mimetype || data.type
+  const output = {}
+  const masto = !data.hasOwnProperty('oembed')
+
+  if (masto) {
+    // Not exactly same...
+    output.mimetype = data.type
+    output.meta = data.meta // not present in BE yet
+  } else {
+    output.mimetype = data.mimetype
+    output.meta = null // missing
   }
+
+  output.url = data.url
+  output.description = data.description
+
+  return output
 }
 
 export const parseStatus = (data) => {

From 42f8d01b66d68e492f00b9f1480692769b830e06 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Mon, 21 Jan 2019 21:41:17 +0300
Subject: [PATCH 32/48] confusion

---
 .../entity_normalizer/entity_normalizer.service.js        | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js
index 087f789b83..6fc6d15242 100644
--- a/src/services/entity_normalizer/entity_normalizer.service.js
+++ b/src/services/entity_normalizer/entity_normalizer.service.js
@@ -152,7 +152,9 @@ 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
+
+    // Missing!! fix in UI?
+    output.in_reply_to_screen_name = null
 
     // Not exactly the same but works
     output.statusnet_conversation_id = data.id
@@ -192,9 +194,7 @@ 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.in_reply_to_screen_name = data.in_reply_to_screen_name
 
     output.statusnet_conversation_id = data.statusnet_conversation_id
 

From d405bfe6deb79b4079965c1118a734b96fc20a09 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Tue, 22 Jan 2019 19:58:59 +0300
Subject: [PATCH 33/48] update test names

---
 .../services/entity_normalizer/entity_normalizer.spec.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/test/unit/specs/services/entity_normalizer/entity_normalizer.spec.js b/test/unit/specs/services/entity_normalizer/entity_normalizer.spec.js
index bc127f79b5..703fecf1c8 100644
--- a/test/unit/specs/services/entity_normalizer/entity_normalizer.spec.js
+++ b/test/unit/specs/services/entity_normalizer/entity_normalizer.spec.js
@@ -149,8 +149,8 @@ parseStatus
 makeMockStatusQvitter
 makeMockUserQvitter
 
-describe.only('API Entities normalizer', () => {
-  describe('statuses', () => {
+describe('API Entities normalizer', () => {
+  describe('parseStatus', () => {
     describe('QVitter preprocessing', () => {
       it('doesn\'t blow up', () => {
         const parsed = qvitterapidata.map(parseStatus)
@@ -220,8 +220,9 @@ describe.only('API Entities normalizer', () => {
       })
     })
   })
+
   // Statuses generally already contain some info regarding users and there's nearly 1:1 mapping, so very little to test
-  describe('users (MastoAPI)', () => {
+  describe('parseUsers (MastoAPI)', () => {
     it('sets correct is_local for users depending on their screen_name', () => {
       const local = makeMockUserMasto({ acct: 'foo' })
       const remote = makeMockUserMasto({ acct: 'foo@bar.baz' })
@@ -233,7 +234,7 @@ describe.only('API Entities normalizer', () => {
 
   // We currently use QvitterAPI notifications only, and especially due to MastoAPI lacking is_seen, support for MastoAPI
   // is more of an afterthought
-  describe('notifications (QvitterAPI)', () => {
+  describe('parseNotifications (QvitterAPI)', () => {
     it('correctly normalizes data to FE\'s format', () => {
       const notif = makeMockNotificationQvitter({
         id: 123,

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: [PATCH 34/48] linting

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

diff --git a/src/components/tab_switcher/tab_switcher.jsx b/src/components/tab_switcher/tab_switcher.jsx
index 2eb30ea605..9038733cd2 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>
       )
     })

From 8946ff983831a6509cab61102d2354d28de486f6 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Tue, 22 Jan 2019 23:57:27 +0300
Subject: [PATCH 35/48] fix errors in console

---
 src/components/attachment/attachment.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/attachment/attachment.vue b/src/components/attachment/attachment.vue
index b80300b45a..d7f25953e4 100644
--- a/src/components/attachment/attachment.vue
+++ b/src/components/attachment/attachment.vue
@@ -10,7 +10,7 @@
       <a href="#" @click.prevent="toggleHidden()">Hide</a>
     </div>
     <a v-if="type === 'image' && (!hidden || preloadImage)" class="image-attachment" :class="{'hidden': hidden && preloadImage}" :href="attachment.url" target="_blank" :title="attachment.description">
-      <StillImage :class="{'small': isSmall}" :referrerpolicy="referrerPolicy" :mimetype="attachment.mimetype" :src="attachment.large_thumb_url || attachment.url"/>
+      <StillImage :class="{'small': isSmall}" :referrerpolicy="referrerpolicy" :mimetype="attachment.mimetype" :src="attachment.large_thumb_url || attachment.url"/>
     </a>
 
     <video :class="{'small': isSmall}" v-if="type === 'video' && !hidden" @loadeddata="onVideoDataLoad" :src="attachment.url" controls :loop="loopVideo" playsinline></video>

From 66dc72deb2b4b518ba09b984d792be57451c4bfc Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Tue, 22 Jan 2019 23:57:51 +0300
Subject: [PATCH 36/48] fix reply-to tooltip being somewhat unreliable

---
 src/components/status/status.js               | 20 ++++++++++++++++++-
 src/components/status/status.vue              | 12 +++++------
 .../entity_normalizer.service.js              |  8 ++++++++
 3 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/src/components/status/status.js b/src/components/status/status.js
index 105a736b41..44a6d5c505 100644
--- a/src/components/status/status.js
+++ b/src/components/status/status.js
@@ -73,6 +73,16 @@ const Status = {
       return (this.$store.state.config.hideAttachments && !this.inConversation) ||
         (this.$store.state.config.hideAttachmentsInConv && this.inConversation)
     },
+    userProfileLink () {
+      return this.generateUserProfileLink(this.status.user.id, this.status.user.screen_name)
+    },
+    replyProfileLink () {
+      if (this.isReply) {
+        return this.generateUserProfileLink(this.status.in_reply_to_status_id, this.replyToName)
+      } else {
+        return ''
+      }
+    },
     retweet () { return !!this.statusoid.retweeted_status },
     retweeter () { return this.statusoid.user.name },
     retweeterHtml () { return this.statusoid.user.name_html },
@@ -119,6 +129,14 @@ const Status = {
     isReply () {
       return !!this.status.in_reply_to_status_id
     },
+    replyToName () {
+      const user = this.$store.state.users.usersObject[this.status.in_reply_to_user_id]
+      if (user) {
+        return user.screen_name
+      } else {
+        return this.status.in_reply_to_screen_name || ''
+      }
+    },
     hideReply () {
       if (this.$store.state.config.replyVisibility === 'all') {
         return false
@@ -277,7 +295,7 @@ const Status = {
     replyLeave () {
       this.showPreview = false
     },
-    userProfileLink (id, name) {
+    generateUserProfileLink (id, name) {
       return generateProfileLink(id, name, this.$store.state.instance.restrictedNicknames)
     }
   },
diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index 4a1aef8fc4..5c956467e2 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -3,7 +3,7 @@
     <template v-if="muted && !noReplyLinks">
       <div class="media status container muted">
         <small>
-          <router-link :to="userProfileLink(status.user.id, status.user.screen_name)">
+          <router-link :to="userProfileLink">
             {{status.user.screen_name}}
           </router-link>
         </small>
@@ -38,16 +38,16 @@
                 <h4 class="user-name" v-if="status.user.name_html" v-html="status.user.name_html"></h4>
                 <h4 class="user-name" v-else>{{status.user.name}}</h4>
                 <span class="links">
-                  <router-link :to="userProfileLink(status.user.id, status.user.screen_name)">
+                  <router-link :to="userProfileLink">
                     {{status.user.screen_name}}
                   </router-link>
-                  <span v-if="status.in_reply_to_screen_name" class="faint reply-info">
+                  <span v-if="isReply" class="faint reply-info">
                     <i class="icon-right-open"></i>
-                    <router-link :to="userProfileLink(status.in_reply_to_user_id, status.in_reply_to_screen_name)">
-                      {{status.in_reply_to_screen_name}}
+                    <router-link :to="replyProfileLink">
+                      {{replyToName}}
                     </router-link>
                   </span>
-                  <a v-if="isReply && !noReplyLinks" href="#" @click.prevent="gotoOriginal(status.in_reply_to_status_id)" :title="$t('tool_tip.reply')">
+                  <a v-if="isReply && !noReplyLinks" href="#" @click.prevent="gotoOriginal(status.in_reply_to_status_id)" :aria-label="$t('tool_tip.reply')">
                     <i class="button-icon icon-reply" @mouseenter="replyEnter(status.in_reply_to_status_id, $event)" @mouseout="replyLeave()"></i>
                   </a>
                 </span>
diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js
index 6fc6d15242..abbc8ddf6f 100644
--- a/src/services/entity_normalizer/entity_normalizer.service.js
+++ b/src/services/entity_normalizer/entity_normalizer.service.js
@@ -211,6 +211,14 @@ export const parseStatus = (data) => {
   output.visibility = data.visibility
   output.created_at = new Date(data.created_at)
 
+  // Converting to string, the right way.
+  output.in_reply_to_status_id = output.in_reply_to_status_id
+    ? String(output.in_reply_to_status_id)
+    : null
+  output.in_reply_to_user_id = output.in_reply_to_user_id
+    ? String(output.in_reply_to_user_id)
+    : null
+
   output.user = parseUser(masto ? data.account : data.user)
 
   output.attentions = ((masto ? data.mentions : data.attentions) || []).map(parseUser)

From c8caa477d7f9d6b793ba0f75c736510f47298014 Mon Sep 17 00:00:00 2001
From: HJ <spam@hjkos.com>
Date: Tue, 22 Jan 2019 21:08:28 +0000
Subject: [PATCH 37/48] Revert "fix reply-to tooltip being somewhat unreliable"

This reverts commit 66dc72deb2b4b518ba09b984d792be57451c4bfc
---
 src/components/status/status.js               | 20 +------------------
 src/components/status/status.vue              | 12 +++++------
 .../entity_normalizer.service.js              |  8 --------
 3 files changed, 7 insertions(+), 33 deletions(-)

diff --git a/src/components/status/status.js b/src/components/status/status.js
index 44a6d5c505..105a736b41 100644
--- a/src/components/status/status.js
+++ b/src/components/status/status.js
@@ -73,16 +73,6 @@ const Status = {
       return (this.$store.state.config.hideAttachments && !this.inConversation) ||
         (this.$store.state.config.hideAttachmentsInConv && this.inConversation)
     },
-    userProfileLink () {
-      return this.generateUserProfileLink(this.status.user.id, this.status.user.screen_name)
-    },
-    replyProfileLink () {
-      if (this.isReply) {
-        return this.generateUserProfileLink(this.status.in_reply_to_status_id, this.replyToName)
-      } else {
-        return ''
-      }
-    },
     retweet () { return !!this.statusoid.retweeted_status },
     retweeter () { return this.statusoid.user.name },
     retweeterHtml () { return this.statusoid.user.name_html },
@@ -129,14 +119,6 @@ const Status = {
     isReply () {
       return !!this.status.in_reply_to_status_id
     },
-    replyToName () {
-      const user = this.$store.state.users.usersObject[this.status.in_reply_to_user_id]
-      if (user) {
-        return user.screen_name
-      } else {
-        return this.status.in_reply_to_screen_name || ''
-      }
-    },
     hideReply () {
       if (this.$store.state.config.replyVisibility === 'all') {
         return false
@@ -295,7 +277,7 @@ const Status = {
     replyLeave () {
       this.showPreview = false
     },
-    generateUserProfileLink (id, name) {
+    userProfileLink (id, name) {
       return generateProfileLink(id, name, this.$store.state.instance.restrictedNicknames)
     }
   },
diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index 5c956467e2..4a1aef8fc4 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -3,7 +3,7 @@
     <template v-if="muted && !noReplyLinks">
       <div class="media status container muted">
         <small>
-          <router-link :to="userProfileLink">
+          <router-link :to="userProfileLink(status.user.id, status.user.screen_name)">
             {{status.user.screen_name}}
           </router-link>
         </small>
@@ -38,16 +38,16 @@
                 <h4 class="user-name" v-if="status.user.name_html" v-html="status.user.name_html"></h4>
                 <h4 class="user-name" v-else>{{status.user.name}}</h4>
                 <span class="links">
-                  <router-link :to="userProfileLink">
+                  <router-link :to="userProfileLink(status.user.id, status.user.screen_name)">
                     {{status.user.screen_name}}
                   </router-link>
-                  <span v-if="isReply" class="faint reply-info">
+                  <span v-if="status.in_reply_to_screen_name" class="faint reply-info">
                     <i class="icon-right-open"></i>
-                    <router-link :to="replyProfileLink">
-                      {{replyToName}}
+                    <router-link :to="userProfileLink(status.in_reply_to_user_id, status.in_reply_to_screen_name)">
+                      {{status.in_reply_to_screen_name}}
                     </router-link>
                   </span>
-                  <a v-if="isReply && !noReplyLinks" href="#" @click.prevent="gotoOriginal(status.in_reply_to_status_id)" :aria-label="$t('tool_tip.reply')">
+                  <a v-if="isReply && !noReplyLinks" href="#" @click.prevent="gotoOriginal(status.in_reply_to_status_id)" :title="$t('tool_tip.reply')">
                     <i class="button-icon icon-reply" @mouseenter="replyEnter(status.in_reply_to_status_id, $event)" @mouseout="replyLeave()"></i>
                   </a>
                 </span>
diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js
index abbc8ddf6f..6fc6d15242 100644
--- a/src/services/entity_normalizer/entity_normalizer.service.js
+++ b/src/services/entity_normalizer/entity_normalizer.service.js
@@ -211,14 +211,6 @@ export const parseStatus = (data) => {
   output.visibility = data.visibility
   output.created_at = new Date(data.created_at)
 
-  // Converting to string, the right way.
-  output.in_reply_to_status_id = output.in_reply_to_status_id
-    ? String(output.in_reply_to_status_id)
-    : null
-  output.in_reply_to_user_id = output.in_reply_to_user_id
-    ? String(output.in_reply_to_user_id)
-    : null
-
   output.user = parseUser(masto ? data.account : data.user)
 
   output.attentions = ((masto ? data.mentions : data.attentions) || []).map(parseUser)

From 61c9ecd855eaa557610246c48abe276058d11ee6 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Tue, 22 Jan 2019 23:57:51 +0300
Subject: [PATCH 38/48] fix reply-to tooltip being somewhat unreliable

---
 src/components/status/status.js               | 20 ++++++++++++++++++-
 src/components/status/status.vue              | 12 +++++------
 .../entity_normalizer.service.js              |  8 ++++++++
 3 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/src/components/status/status.js b/src/components/status/status.js
index 105a736b41..44a6d5c505 100644
--- a/src/components/status/status.js
+++ b/src/components/status/status.js
@@ -73,6 +73,16 @@ const Status = {
       return (this.$store.state.config.hideAttachments && !this.inConversation) ||
         (this.$store.state.config.hideAttachmentsInConv && this.inConversation)
     },
+    userProfileLink () {
+      return this.generateUserProfileLink(this.status.user.id, this.status.user.screen_name)
+    },
+    replyProfileLink () {
+      if (this.isReply) {
+        return this.generateUserProfileLink(this.status.in_reply_to_status_id, this.replyToName)
+      } else {
+        return ''
+      }
+    },
     retweet () { return !!this.statusoid.retweeted_status },
     retweeter () { return this.statusoid.user.name },
     retweeterHtml () { return this.statusoid.user.name_html },
@@ -119,6 +129,14 @@ const Status = {
     isReply () {
       return !!this.status.in_reply_to_status_id
     },
+    replyToName () {
+      const user = this.$store.state.users.usersObject[this.status.in_reply_to_user_id]
+      if (user) {
+        return user.screen_name
+      } else {
+        return this.status.in_reply_to_screen_name || ''
+      }
+    },
     hideReply () {
       if (this.$store.state.config.replyVisibility === 'all') {
         return false
@@ -277,7 +295,7 @@ const Status = {
     replyLeave () {
       this.showPreview = false
     },
-    userProfileLink (id, name) {
+    generateUserProfileLink (id, name) {
       return generateProfileLink(id, name, this.$store.state.instance.restrictedNicknames)
     }
   },
diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index 4a1aef8fc4..5c956467e2 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -3,7 +3,7 @@
     <template v-if="muted && !noReplyLinks">
       <div class="media status container muted">
         <small>
-          <router-link :to="userProfileLink(status.user.id, status.user.screen_name)">
+          <router-link :to="userProfileLink">
             {{status.user.screen_name}}
           </router-link>
         </small>
@@ -38,16 +38,16 @@
                 <h4 class="user-name" v-if="status.user.name_html" v-html="status.user.name_html"></h4>
                 <h4 class="user-name" v-else>{{status.user.name}}</h4>
                 <span class="links">
-                  <router-link :to="userProfileLink(status.user.id, status.user.screen_name)">
+                  <router-link :to="userProfileLink">
                     {{status.user.screen_name}}
                   </router-link>
-                  <span v-if="status.in_reply_to_screen_name" class="faint reply-info">
+                  <span v-if="isReply" class="faint reply-info">
                     <i class="icon-right-open"></i>
-                    <router-link :to="userProfileLink(status.in_reply_to_user_id, status.in_reply_to_screen_name)">
-                      {{status.in_reply_to_screen_name}}
+                    <router-link :to="replyProfileLink">
+                      {{replyToName}}
                     </router-link>
                   </span>
-                  <a v-if="isReply && !noReplyLinks" href="#" @click.prevent="gotoOriginal(status.in_reply_to_status_id)" :title="$t('tool_tip.reply')">
+                  <a v-if="isReply && !noReplyLinks" href="#" @click.prevent="gotoOriginal(status.in_reply_to_status_id)" :aria-label="$t('tool_tip.reply')">
                     <i class="button-icon icon-reply" @mouseenter="replyEnter(status.in_reply_to_status_id, $event)" @mouseout="replyLeave()"></i>
                   </a>
                 </span>
diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js
index 6fc6d15242..abbc8ddf6f 100644
--- a/src/services/entity_normalizer/entity_normalizer.service.js
+++ b/src/services/entity_normalizer/entity_normalizer.service.js
@@ -211,6 +211,14 @@ export const parseStatus = (data) => {
   output.visibility = data.visibility
   output.created_at = new Date(data.created_at)
 
+  // Converting to string, the right way.
+  output.in_reply_to_status_id = output.in_reply_to_status_id
+    ? String(output.in_reply_to_status_id)
+    : null
+  output.in_reply_to_user_id = output.in_reply_to_user_id
+    ? String(output.in_reply_to_user_id)
+    : null
+
   output.user = parseUser(masto ? data.account : data.user)
 
   output.attentions = ((masto ? data.mentions : data.attentions) || []).map(parseUser)

From ac64e908987ef07e49e4ed26b7e0574e67c01856 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Wed, 23 Jan 2019 00:10:59 +0300
Subject: [PATCH 39/48] fix custom nsfwCensorImage not working

---
 src/boot/after_store.js                 | 6 ++----
 src/components/attachment/attachment.js | 2 +-
 static/config.json                      | 3 ++-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/boot/after_store.js b/src/boot/after_store.js
index 08c00c641f..0169953b72 100644
--- a/src/boot/after_store.js
+++ b/src/boot/after_store.js
@@ -24,10 +24,6 @@ const afterStoreSetup = ({ store, i18n }) => {
         store.dispatch('setInstanceOption', { name: 'bannerlimit', value: parseInt(uploadlimit.bannerlimit) })
       }
 
-      if (data.nsfwCensorImage) {
-        store.dispatch('setInstanceOption', { name: 'nsfwCensorImage', value: data.nsfwCensorImage })
-      }
-
       if (vapidPublicKey) {
         store.dispatch('setInstanceOption', { name: 'vapidPublicKey', value: vapidPublicKey })
       }
@@ -73,7 +69,9 @@ const afterStoreSetup = ({ store, i18n }) => {
           var subjectLineBehavior = (config.subjectLineBehavior)
           var alwaysShowSubjectInput = (config.alwaysShowSubjectInput)
           var noAttachmentLinks = (config.noAttachmentLinks)
+          var nsfwCensorImage = (config.nsfwCensorImage)
 
+          store.dispatch('setInstanceOption', { name: 'nsfwCensorImage', value: nsfwCensorImage })
           store.dispatch('setInstanceOption', { name: 'theme', value: theme })
           store.dispatch('setInstanceOption', { name: 'background', value: background })
           store.dispatch('setInstanceOption', { name: 'hidePostStats', value: hidePostStats })
diff --git a/src/components/attachment/attachment.js b/src/components/attachment/attachment.js
index 18a0377071..9212b74b52 100644
--- a/src/components/attachment/attachment.js
+++ b/src/components/attachment/attachment.js
@@ -11,7 +11,7 @@ const Attachment = {
   ],
   data () {
     return {
-      nsfwImage: this.$store.state.config.nsfwCensorImage || nsfwImage,
+      nsfwImage: this.$store.state.instance.nsfwCensorImage || nsfwImage,
       hideNsfwLocal: this.$store.state.config.hideNsfw,
       preloadImage: this.$store.state.config.preloadImage,
       loopVideo: this.$store.state.config.loopVideo,
diff --git a/static/config.json b/static/config.json
index cc72900a8f..24e26696fa 100644
--- a/static/config.json
+++ b/static/config.json
@@ -18,5 +18,6 @@
   "hideUserStats": false,
   "loginMethod": "password",
   "webPushNotifications": false,
-  "noAttachmentLinks": false
+  "noAttachmentLinks": false,
+  "nsfwCensorImage": ""
 }

From 958557201a95f125f40392fbeb33c284301ca7fd Mon Sep 17 00:00:00 2001
From: Maxim Filippov <colixer@gmail.com>
Date: Wed, 23 Jan 2019 19:46:35 +0300
Subject: [PATCH 40/48] Always send "hide_network" when updating user profile

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

diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js
index 2b1ef5dfe4..776d8daef1 100644
--- a/src/services/api/api.service.js
+++ b/src/services/api/api.service.js
@@ -129,13 +129,14 @@ const updateBanner = ({credentials, params}) => {
 // location
 // description
 const updateProfile = ({credentials, params}) => {
+  // Always include these fields, because they might be empty or false
+  const fields = ['description', 'locked', 'no_rich_text', 'hide_network']
   let url = PROFILE_UPDATE_URL
 
   const form = new FormData()
 
   each(params, (value, key) => {
-    /* Always include description, no_rich_text and locked, because it might be empty or false */
-    if (key === 'description' || key === 'locked' || key === 'no_rich_text' || value) {
+    if (fields.includes(key) || value) {
       form.append(key, value)
     }
   })

From efa0c85ac006ece069430693c0a7e136e9bfaaa2 Mon Sep 17 00:00:00 2001
From: Hakaba Hitoyo <hakabahitoyo@yahoo.co.jp>
Date: Thu, 24 Jan 2019 15:17:35 +0000
Subject: [PATCH 41/48] Fix who to follow panel shuffling

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

diff --git a/src/components/who_to_follow_panel/who_to_follow_panel.js b/src/components/who_to_follow_panel/who_to_follow_panel.js
index 5e204001ae..a56a27eafa 100644
--- a/src/components/who_to_follow_panel/who_to_follow_panel.js
+++ b/src/components/who_to_follow_panel/who_to_follow_panel.js
@@ -1,12 +1,12 @@
 import apiService from '../../services/api/api.service.js'
 import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
-import _ from 'lodash'
+import { shuffle } from 'lodash'
 
 function showWhoToFollow (panel, reply) {
-  _.shuffle(reply)
+  const shuffled = shuffle(reply)
 
   panel.usersToFollow.forEach((toFollow, index) => {
-    let user = reply[index]
+    let user = shuffled[index]
     let img = user.avatar || '/images/avi.png'
     let name = user.acct
 

From 416424d04838bdb174279f2494eaadb7ac7505c1 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Thu, 24 Jan 2019 20:27:20 +0300
Subject: [PATCH 42/48] review

---
 src/components/status/status.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/components/status/status.js b/src/components/status/status.js
index 44a6d5c505..b14a74ec40 100644
--- a/src/components/status/status.js
+++ b/src/components/status/status.js
@@ -79,8 +79,6 @@ const Status = {
     replyProfileLink () {
       if (this.isReply) {
         return this.generateUserProfileLink(this.status.in_reply_to_status_id, this.replyToName)
-      } else {
-        return ''
       }
     },
     retweet () { return !!this.statusoid.retweeted_status },
@@ -134,7 +132,7 @@ const Status = {
       if (user) {
         return user.screen_name
       } else {
-        return this.status.in_reply_to_screen_name || ''
+        return this.status.in_reply_to_screen_name
       }
     },
     hideReply () {

From f38da239d9d420d9ba3af25c67864bb015303fca Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Thu, 24 Jan 2019 21:03:13 +0300
Subject: [PATCH 43/48] "spring" cleaning

---
 src/boot/after_store.js | 76 +++++++++++++++++++----------------------
 1 file changed, 36 insertions(+), 40 deletions(-)

diff --git a/src/boot/after_store.js b/src/boot/after_store.js
index 0169953b72..505005825d 100644
--- a/src/boot/after_store.js
+++ b/src/boot/after_store.js
@@ -50,48 +50,44 @@ const afterStoreSetup = ({ store, i18n }) => {
             config = Object.assign({}, staticConfig, apiConfig)
           }
 
-          var theme = (config.theme)
-          var background = (config.background)
-          var hidePostStats = (config.hidePostStats)
-          var hideUserStats = (config.hideUserStats)
-          var logo = (config.logo)
-          var logoMask = (typeof config.logoMask === 'undefined' ? true : config.logoMask)
-          var logoMargin = (typeof config.logoMargin === 'undefined' ? 0 : config.logoMargin)
-          var redirectRootNoLogin = (config.redirectRootNoLogin)
-          var redirectRootLogin = (config.redirectRootLogin)
-          var chatDisabled = (config.chatDisabled)
-          var showInstanceSpecificPanel = (config.showInstanceSpecificPanel)
-          var scopeOptionsEnabled = (config.scopeOptionsEnabled)
-          var formattingOptionsEnabled = (config.formattingOptionsEnabled)
-          var collapseMessageWithSubject = (config.collapseMessageWithSubject)
-          var loginMethod = (config.loginMethod)
-          var scopeCopy = (config.scopeCopy)
-          var subjectLineBehavior = (config.subjectLineBehavior)
-          var alwaysShowSubjectInput = (config.alwaysShowSubjectInput)
-          var noAttachmentLinks = (config.noAttachmentLinks)
-          var nsfwCensorImage = (config.nsfwCensorImage)
+          const copyInstanceOption = (name) => {
+            store.dispatch('setInstanceOption', {name, value: config[name]})
+          }
 
-          store.dispatch('setInstanceOption', { name: 'nsfwCensorImage', value: nsfwCensorImage })
-          store.dispatch('setInstanceOption', { name: 'theme', value: theme })
-          store.dispatch('setInstanceOption', { name: 'background', value: background })
-          store.dispatch('setInstanceOption', { name: 'hidePostStats', value: hidePostStats })
-          store.dispatch('setInstanceOption', { name: 'hideUserStats', value: hideUserStats })
-          store.dispatch('setInstanceOption', { name: 'logo', value: logo })
-          store.dispatch('setInstanceOption', { name: 'logoMask', value: logoMask })
-          store.dispatch('setInstanceOption', { name: 'logoMargin', value: logoMargin })
-          store.dispatch('setInstanceOption', { name: 'redirectRootNoLogin', value: redirectRootNoLogin })
-          store.dispatch('setInstanceOption', { name: 'redirectRootLogin', value: redirectRootLogin })
-          store.dispatch('setInstanceOption', { name: 'showInstanceSpecificPanel', value: showInstanceSpecificPanel })
-          store.dispatch('setInstanceOption', { name: 'scopeOptionsEnabled', value: scopeOptionsEnabled })
-          store.dispatch('setInstanceOption', { name: 'formattingOptionsEnabled', value: formattingOptionsEnabled })
-          store.dispatch('setInstanceOption', { name: 'collapseMessageWithSubject', value: collapseMessageWithSubject })
-          store.dispatch('setInstanceOption', { name: 'loginMethod', value: loginMethod })
-          store.dispatch('setInstanceOption', { name: 'scopeCopy', value: scopeCopy })
-          store.dispatch('setInstanceOption', { name: 'subjectLineBehavior', value: subjectLineBehavior })
-          store.dispatch('setInstanceOption', { name: 'alwaysShowSubjectInput', value: alwaysShowSubjectInput })
-          store.dispatch('setInstanceOption', { name: 'noAttachmentLinks', value: noAttachmentLinks })
+          copyInstanceOption('nsfwCensorImage')
+          copyInstanceOption('theme')
+          copyInstanceOption('background')
+          copyInstanceOption('hidePostStats')
+          copyInstanceOption('hideUserStats')
+          copyInstanceOption('logo')
 
-          if (chatDisabled) {
+          store.dispatch('setInstanceOption', {
+            name: 'logoMask',
+            value: typeof config.logoMask === 'undefined'
+              ? true
+              : config.logoMask
+          })
+
+          store.dispatch('setInstanceOption', {
+            name: 'logoMargin',
+            value: typeof config.logoMargin === 'undefined'
+              ? 0
+              : config.logoMargin
+          })
+
+          copyInstanceOption('redirectRootNoLogin')
+          copyInstanceOption('redirectRootLogin')
+          copyInstanceOption('showInstanceSpecificPanel')
+          copyInstanceOption('scopeOptionsEnabled')
+          copyInstanceOption('formattingOptionsEnabled')
+          copyInstanceOption('collapseMessageWithSubject')
+          copyInstanceOption('loginMethod')
+          copyInstanceOption('scopeCopy')
+          copyInstanceOption('subjectLineBehavior')
+          copyInstanceOption('alwaysShowSubjectInput')
+          copyInstanceOption('noAttachmentLinks')
+
+          if ((config.chatDisabled)) {
             store.dispatch('disableChat')
           }
 

From 9d0d6b86c83a4fad4038077a65149f0f3677fb82 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Fri, 25 Jan 2019 00:49:37 +0300
Subject: [PATCH 44/48] this attempts converting id to number to sort them
 numerically, since "99" > "100" while 99 < 100

---
 src/components/conversation/conversation.js    | 18 +++++++++++++++++-
 src/modules/statuses.js                        | 18 ++++++++++++++++--
 .../notification_utils/notification_utils.js   | 18 +++++++++++++++++-
 3 files changed, 50 insertions(+), 4 deletions(-)

diff --git a/src/components/conversation/conversation.js b/src/components/conversation/conversation.js
index 9bf5e136a1..07b7c69220 100644
--- a/src/components/conversation/conversation.js
+++ b/src/components/conversation/conversation.js
@@ -1,9 +1,25 @@
 import { reduce, filter, sortBy } from 'lodash'
 import Status from '../status/status.vue'
 
+const sortById = (a, b) => {
+  const seqA = Number(a.action.id)
+  const seqB = Number(b.action.id)
+  const isSeqA = Number.isNaN(seqA)
+  const isSeqB = Number.isNaN(seqB)
+  if (isSeqA && isSeqB) {
+    return seqA > seqB ? -1 : 1
+  } else if (isSeqA && !isSeqB) {
+    return 1
+  } else if (!isSeqA && isSeqB) {
+    return -1
+  } else {
+    return a.action.id > b.action.id ? -1 : 1
+  }
+}
+
 const sortAndFilterConversation = (conversation) => {
   conversation = filter(conversation, (status) => status.type !== 'retweet')
-  return sortBy(conversation, 'id')
+  return sortBy(conversation, sortById)
 }
 
 const conversation = {
diff --git a/src/modules/statuses.js b/src/modules/statuses.js
index 83cf725642..27d4e94cf9 100644
--- a/src/modules/statuses.js
+++ b/src/modules/statuses.js
@@ -81,7 +81,21 @@ const mergeOrAdd = (arr, obj, item) => {
   }
 }
 
-const sortById = (a, b) => a.id > b.id ? -1 : 1
+const sortById = (a, b) => {
+  const seqA = Number(a.id)
+  const seqB = Number(b.id)
+  const isSeqA = Number.isNaN(seqA)
+  const isSeqB = Number.isNaN(seqB)
+  if (isSeqA && isSeqB) {
+    return seqA > seqB ? -1 : 1
+  } else if (isSeqA && !isSeqB) {
+    return 1
+  } else if (!isSeqA && isSeqB) {
+    return -1
+  } else {
+    return a.id > b.id ? -1 : 1
+  }
+}
 
 const sortTimeline = (timeline) => {
   timeline.visibleStatuses = timeline.visibleStatuses.sort(sortById)
@@ -239,7 +253,7 @@ const addNewStatuses = (state, { statuses, showImmediately = false, timeline, us
     processor(status)
   })
 
-  // Keep the visible statuses sorted
+    // Keep the visible statuses sorted
   if (timeline) {
     sortTimeline(timelineObject)
     if ((older || timelineObject.minVisibleId <= 0) && statuses.length > 0) {
diff --git a/src/services/notification_utils/notification_utils.js b/src/services/notification_utils/notification_utils.js
index c38796779e..4a59bef2d1 100644
--- a/src/services/notification_utils/notification_utils.js
+++ b/src/services/notification_utils/notification_utils.js
@@ -9,9 +9,25 @@ export const visibleTypes = store => ([
   store.state.config.notificationVisibility.follows && 'follow'
 ].filter(_ => _))
 
+const sortById = (a, b) => {
+  const seqA = Number(a.action.id)
+  const seqB = Number(b.action.id)
+  const isSeqA = Number.isNaN(seqA)
+  const isSeqB = Number.isNaN(seqB)
+  if (isSeqA && isSeqB) {
+    return seqA > seqB ? -1 : 1
+  } else if (isSeqA && !isSeqB) {
+    return 1
+  } else if (!isSeqA && isSeqB) {
+    return -1
+  } else {
+    return a.action.id > b.action.id ? -1 : 1
+  }
+}
+
 export const visibleNotificationsFromStore = store => {
   // map is just to clone the array since sort mutates it and it causes some issues
-  let sortedNotifications = notificationsFromStore(store).map(_ => _).sort((a, b) => a.action.id > b.action.id ? -1 : 1)
+  let sortedNotifications = notificationsFromStore(store).map(_ => _).sort(sortById)
   sortedNotifications = sortBy(sortedNotifications, 'seen')
   return sortedNotifications.filter((notification) => visibleTypes(store).includes(notification.type))
 }

From f48e3d0db8029701461250bb8f47ec33f0d68606 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Fri, 25 Jan 2019 01:39:19 +0300
Subject: [PATCH 45/48] quickfix

---
 src/components/conversation/conversation.js           | 4 ++--
 src/modules/statuses.js                               | 4 ++--
 src/services/notification_utils/notification_utils.js | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/components/conversation/conversation.js b/src/components/conversation/conversation.js
index 07b7c69220..ae8ab4fc7e 100644
--- a/src/components/conversation/conversation.js
+++ b/src/components/conversation/conversation.js
@@ -4,8 +4,8 @@ import Status from '../status/status.vue'
 const sortById = (a, b) => {
   const seqA = Number(a.action.id)
   const seqB = Number(b.action.id)
-  const isSeqA = Number.isNaN(seqA)
-  const isSeqB = Number.isNaN(seqB)
+  const isSeqA = !Number.isNaN(seqA)
+  const isSeqB = !Number.isNaN(seqB)
   if (isSeqA && isSeqB) {
     return seqA > seqB ? -1 : 1
   } else if (isSeqA && !isSeqB) {
diff --git a/src/modules/statuses.js b/src/modules/statuses.js
index 27d4e94cf9..20a8d2eb43 100644
--- a/src/modules/statuses.js
+++ b/src/modules/statuses.js
@@ -84,8 +84,8 @@ const mergeOrAdd = (arr, obj, item) => {
 const sortById = (a, b) => {
   const seqA = Number(a.id)
   const seqB = Number(b.id)
-  const isSeqA = Number.isNaN(seqA)
-  const isSeqB = Number.isNaN(seqB)
+  const isSeqA = !Number.isNaN(seqA)
+  const isSeqB = !Number.isNaN(seqB)
   if (isSeqA && isSeqB) {
     return seqA > seqB ? -1 : 1
   } else if (isSeqA && !isSeqB) {
diff --git a/src/services/notification_utils/notification_utils.js b/src/services/notification_utils/notification_utils.js
index 4a59bef2d1..cd8f3f9efd 100644
--- a/src/services/notification_utils/notification_utils.js
+++ b/src/services/notification_utils/notification_utils.js
@@ -12,8 +12,8 @@ export const visibleTypes = store => ([
 const sortById = (a, b) => {
   const seqA = Number(a.action.id)
   const seqB = Number(b.action.id)
-  const isSeqA = Number.isNaN(seqA)
-  const isSeqB = Number.isNaN(seqB)
+  const isSeqA = !Number.isNaN(seqA)
+  const isSeqB = !Number.isNaN(seqB)
   if (isSeqA && isSeqB) {
     return seqA > seqB ? -1 : 1
   } else if (isSeqA && !isSeqB) {

From 5e68161d916e903dfb62cb1d357772646d255dde Mon Sep 17 00:00:00 2001
From: William Pitcock <nenolod@dereferenced.org>
Date: Fri, 25 Jan 2019 10:05:19 +0000
Subject: [PATCH 46/48] entity normalizer: provide summary_html property

Mastodon API returns HTML always in spoiler_text, while TwitterAPI sends both a
text version as well as an HTML version of the message subject, which we started
to use when we allowed custom emoji in message subjects.
---
 src/services/entity_normalizer/entity_normalizer.service.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js
index abbc8ddf6f..becbab154d 100644
--- a/src/services/entity_normalizer/entity_normalizer.service.js
+++ b/src/services/entity_normalizer/entity_normalizer.service.js
@@ -164,6 +164,7 @@ export const parseStatus = (data) => {
     }
 
     output.summary = data.spoiler_text
+    output.summary_html = data.spoiler_text
     output.external_url = data.url
 
     // FIXME missing!!
@@ -203,6 +204,7 @@ export const parseStatus = (data) => {
     }
 
     output.summary = data.summary
+    output.summary_html = data.summary_html
     output.external_url = data.external_url
     output.is_local = data.is_local
   }

From eb339511864a89ecf2e8381a161034fdd6a8b130 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Fri, 25 Jan 2019 16:20:42 +0300
Subject: [PATCH 47/48] hotfix

---
 src/components/conversation/conversation.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/components/conversation/conversation.js b/src/components/conversation/conversation.js
index ae8ab4fc7e..0ecbaddce9 100644
--- a/src/components/conversation/conversation.js
+++ b/src/components/conversation/conversation.js
@@ -1,9 +1,9 @@
-import { reduce, filter, sortBy } from 'lodash'
+import { reduce, filter } from 'lodash'
 import Status from '../status/status.vue'
 
 const sortById = (a, b) => {
-  const seqA = Number(a.action.id)
-  const seqB = Number(b.action.id)
+  const seqA = Number(a.id)
+  const seqB = Number(b.id)
   const isSeqA = !Number.isNaN(seqA)
   const isSeqB = !Number.isNaN(seqB)
   if (isSeqA && isSeqB) {
@@ -13,13 +13,13 @@ const sortById = (a, b) => {
   } else if (!isSeqA && isSeqB) {
     return -1
   } else {
-    return a.action.id > b.action.id ? -1 : 1
+    return a.id > b.id ? -1 : 1
   }
 }
 
 const sortAndFilterConversation = (conversation) => {
   conversation = filter(conversation, (status) => status.type !== 'retweet')
-  return sortBy(conversation, sortById)
+  return conversation.filter(_ => _).sort(sortById)
 }
 
 const conversation = {

From 9f914824cb7713c55b6563f31b510fc83e4c1e4d Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Fri, 25 Jan 2019 17:55:56 +0300
Subject: [PATCH 48/48] i should take it easy

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

diff --git a/src/components/conversation/conversation.js b/src/components/conversation/conversation.js
index 0ecbaddce9..c18781de54 100644
--- a/src/components/conversation/conversation.js
+++ b/src/components/conversation/conversation.js
@@ -7,13 +7,13 @@ const sortById = (a, b) => {
   const isSeqA = !Number.isNaN(seqA)
   const isSeqB = !Number.isNaN(seqB)
   if (isSeqA && isSeqB) {
-    return seqA > seqB ? -1 : 1
+    return seqA < seqB ? -1 : 1
   } else if (isSeqA && !isSeqB) {
     return 1
   } else if (!isSeqA && isSeqB) {
     return -1
   } else {
-    return a.id > b.id ? -1 : 1
+    return a.id < b.id ? -1 : 1
   }
 }