tests for the tests god! bugfixes for bugfixes throne!

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

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,13 +66,97 @@ 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', () => {
+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)
+      })
+
       it('identifies favorites', () => {
         const fav = {
           uri: 'tag:soykaf.com,2016-08-21:fave:2558:note:339495:2016-08-21T16:54:04+00:00',
@@ -86,6 +172,19 @@ describe('QVitter preprocessing', () => {
         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'})
@@ -99,4 +198,72 @@ describe('QVitter preprocessing', () => {
 
         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)
+    })
+  })
+
+  // 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')
+    })
+
+    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')
+    })
+  })
 })