Update account entity according to the latest mastodon

megalodon/src/entities/account.ts

@@ -1,6 +1,7 @@
 /// <reference path="emoji.ts" />
 /// <reference path="source.ts" />
 /// <reference path="field.ts" />
+/// <reference path="role.ts" />
 namespace Entity {
   export type Account = {
     id: string
@@ -10,6 +11,9 @@ namespace Entity {
     locked: boolean
     discoverable?: boolean
     group: boolean | null
+    noindex: boolean | null
+    suspended: boolean | null
+    limited: boolean | null
     created_at: string
     followers_count: number
     following_count: number
@@ -25,5 +29,7 @@ namespace Entity {
     fields: Array<Field>
     bot: boolean | null
     source?: Source
+    role?: Role
+    mute_expires_at?: string
   }
 }

megalodon/src/entities/role.ts

@@ -0,0 +1,5 @@
+namespace Entity {
+  export type Role = {
+    name: string
+  }
+}

megalodon/src/friendica/api_client.ts

@@ -539,6 +539,9 @@ namespace FriendicaAPI {
       locked: a.locked,
       discoverable: a.discoverable,
       group: a.group,
+      noindex: null,
+      suspended: null,
+      limited: null,
       created_at: a.created_at,
       followers_count: a.followers_count,
       following_count: a.following_count,

megalodon/src/mastodon/api_client.ts

@@ -469,6 +469,7 @@ namespace MastodonAPI {
     export type Relationship = MastodonEntity.Relationship
     export type Report = MastodonEntity.Report
     export type Results = MastodonEntity.Results
+    export type Role = MastodonEntity.Role
     export type ScheduledStatus = MastodonEntity.ScheduledStatus
     export type Source = MastodonEntity.Source
     export type Stats = MastodonEntity.Stats

megalodon/src/mastodon/entities/account.ts

@@ -1,6 +1,7 @@
 /// <reference path="emoji.ts" />
 /// <reference path="source.ts" />
 /// <reference path="field.ts" />
+/// <reference path="role.ts" />
 namespace MastodonEntity {
   export type Account = {
     id: string
@@ -10,6 +11,9 @@ namespace MastodonEntity {
     locked: boolean
     discoverable?: boolean
     group: boolean | null
+    noindex: boolean | null
+    suspended: boolean | null
+    limited: boolean | null
     created_at: string
     followers_count: number
     following_count: number
@@ -25,5 +29,7 @@ namespace MastodonEntity {
     fields: Array<Field>
     bot: boolean
     source?: Source
+    role?: Role
+    mute_expires_at?: string
   }
 }

megalodon/src/mastodon/entities/role.ts

@@ -0,0 +1,5 @@
+namespace MastodonEntity {
+  export type Role = {
+    name: string
+  }
+}

megalodon/src/mastodon/entity.ts

@@ -25,6 +25,7 @@
 /// <reference path="./entities/relationship.ts" />
 /// <reference path="./entities/report.ts" />
 /// <reference path="./entities/results.ts" />
+/// <reference path="./entities/role.ts" />
 /// <reference path="./entities/scheduled_status.ts" />
 /// <reference path="./entities/source.ts" />
 /// <reference path="./entities/stats.ts" />

megalodon/src/misskey/api_client.ts

@@ -80,6 +80,9 @@ namespace MisskeyAPI {
         display_name: u.name,
         locked: false,
         group: null,
+        noindex: null,
+        suspended: null,
+        limited: null,
         created_at: '',
         followers_count: 0,
         following_count: 0,
@@ -109,6 +112,9 @@ namespace MisskeyAPI {
         display_name: u.name,
         locked: u.isLocked,
         group: null,
+        noindex: null,
+        suspended: null,
+        limited: null,
         created_at: u.createdAt,
         followers_count: u.followersCount,
         following_count: u.followingCount,
@@ -283,7 +289,7 @@ namespace MisskeyAPI {
       } else if (e) {
         return mapReactionEmojis(e)
       } else {
-        return [];
+        return []
       }
     }
 

megalodon/src/pleroma/api_client.ts

@@ -115,6 +115,9 @@ namespace PleromaAPI {
         locked: a.locked,
         discoverable: a.discoverable,
         group: null,
+        noindex: a.noindex,
+        suspended: a.suspended,
+        limited: a.limited,
         created_at: a.created_at,
         followers_count: a.followers_count,
         following_count: a.following_count,

megalodon/src/pleroma/entities/account.ts

@@ -9,6 +9,9 @@ namespace PleromaEntity {
     display_name: string
     locked: boolean
     discoverable?: boolean
+    noindex: boolean | null
+    suspended: boolean | null
+    limited: boolean | null
     created_at: string
     followers_count: number
     following_count: number

megalodon/test/integration/mastodon.spec.ts

@@ -13,6 +13,9 @@ const account: MastodonEntity.Account = {
   display_name: 'h3poteto',
   locked: false,
   group: false,
+  noindex: false,
+  suspended: false,
+  limited: false,
   created_at: '2019-03-26T21:30:32',
   followers_count: 10,
   following_count: 10,

megalodon/test/integration/mastodon/api_client.spec.ts

@@ -12,6 +12,9 @@ const account: Entity.Account = {
   display_name: 'h3poteto',
   locked: false,
   group: false,
+  noindex: false,
+  suspended: false,
+  limited: false,
   created_at: '2019-03-26T21:30:32',
   followers_count: 10,
   following_count: 10,

megalodon/test/integration/pleroma.spec.ts

@@ -12,6 +12,9 @@ const account: PleromaEntity.Account = {
   acct: 'h3poteto@pleroma.io',
   display_name: 'h3poteto',
   locked: false,
+  noindex: null,
+  suspended: null,
+  limited: null,
   created_at: '2019-03-26T21:30:32',
   followers_count: 10,
   following_count: 10,

megalodon/test/unit/parser.spec.ts

@@ -8,6 +8,9 @@ const account: Entity.Account = {
   display_name: 'h3poteto',
   locked: false,
   group: false,
+  noindex: null,
+  suspended: null,
+  limited: null,
   created_at: '2019-03-26T21:30:32',
   followers_count: 10,
   following_count: 10,

megalodon/test/unit/pleroma/api_client.spec.ts

@@ -10,6 +10,9 @@ const account: PleromaEntity.Account = {
   acct: 'h3poteto@pleroma.io',
   display_name: 'h3poteto',
   locked: false,
+  noindex: null,
+  suspended: null,
+  limited: null,
   created_at: '2019-03-26T21:30:32',
   followers_count: 10,
   following_count: 10,

megalodon/test/unit/webo_socket.spec.ts

@@ -8,6 +8,9 @@ const account: Entity.Account = {
   display_name: 'h3poteto',
   locked: false,
   group: false,
+  noindex: null,
+  suspended: null,
+  limited: null,
   created_at: '2019-03-26T21:30:32',
   followers_count: 10,
   following_count: 10,