diff --git a/megalodon/src/entities/account.ts b/megalodon/src/entities/account.ts index d88b45b09..89c0f17c4 100644 --- a/megalodon/src/entities/account.ts +++ b/megalodon/src/entities/account.ts @@ -1,6 +1,7 @@ /// /// /// +/// 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 bot: boolean | null source?: Source + role?: Role + mute_expires_at?: string } } diff --git a/megalodon/src/entities/role.ts b/megalodon/src/entities/role.ts new file mode 100644 index 000000000..caaae9ea1 --- /dev/null +++ b/megalodon/src/entities/role.ts @@ -0,0 +1,5 @@ +namespace Entity { + export type Role = { + name: string + } +} diff --git a/megalodon/src/friendica/api_client.ts b/megalodon/src/friendica/api_client.ts index 996b526e9..5a0725d27 100644 --- a/megalodon/src/friendica/api_client.ts +++ b/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, diff --git a/megalodon/src/mastodon/api_client.ts b/megalodon/src/mastodon/api_client.ts index 97f1ed5db..58f56d101 100644 --- a/megalodon/src/mastodon/api_client.ts +++ b/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 diff --git a/megalodon/src/mastodon/entities/account.ts b/megalodon/src/mastodon/entities/account.ts index 00667e6a6..9055fdd91 100644 --- a/megalodon/src/mastodon/entities/account.ts +++ b/megalodon/src/mastodon/entities/account.ts @@ -1,6 +1,7 @@ /// /// /// +/// 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 bot: boolean source?: Source + role?: Role + mute_expires_at?: string } } diff --git a/megalodon/src/mastodon/entities/role.ts b/megalodon/src/mastodon/entities/role.ts new file mode 100644 index 000000000..ebfad59c1 --- /dev/null +++ b/megalodon/src/mastodon/entities/role.ts @@ -0,0 +1,5 @@ +namespace MastodonEntity { + export type Role = { + name: string + } +} diff --git a/megalodon/src/mastodon/entity.ts b/megalodon/src/mastodon/entity.ts index 1af044d7b..dcafdfe74 100644 --- a/megalodon/src/mastodon/entity.ts +++ b/megalodon/src/mastodon/entity.ts @@ -25,6 +25,7 @@ /// /// /// +/// /// /// /// diff --git a/megalodon/src/misskey/api_client.ts b/megalodon/src/misskey/api_client.ts index c65a4b407..6871bb19e 100644 --- a/megalodon/src/misskey/api_client.ts +++ b/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 [] } } diff --git a/megalodon/src/pleroma/api_client.ts b/megalodon/src/pleroma/api_client.ts index ef3853f70..ce2388b0b 100644 --- a/megalodon/src/pleroma/api_client.ts +++ b/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, diff --git a/megalodon/src/pleroma/entities/account.ts b/megalodon/src/pleroma/entities/account.ts index 75e8e1780..29d42643f 100644 --- a/megalodon/src/pleroma/entities/account.ts +++ b/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 diff --git a/megalodon/test/integration/mastodon.spec.ts b/megalodon/test/integration/mastodon.spec.ts index 1accda6ad..172d11a86 100644 --- a/megalodon/test/integration/mastodon.spec.ts +++ b/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, diff --git a/megalodon/test/integration/mastodon/api_client.spec.ts b/megalodon/test/integration/mastodon/api_client.spec.ts index bcebf99a6..950105152 100644 --- a/megalodon/test/integration/mastodon/api_client.spec.ts +++ b/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, diff --git a/megalodon/test/integration/pleroma.spec.ts b/megalodon/test/integration/pleroma.spec.ts index 5bc2b186f..1e1f449e1 100644 --- a/megalodon/test/integration/pleroma.spec.ts +++ b/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, diff --git a/megalodon/test/unit/parser.spec.ts b/megalodon/test/unit/parser.spec.ts index 877289025..94c1d9802 100644 --- a/megalodon/test/unit/parser.spec.ts +++ b/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, diff --git a/megalodon/test/unit/pleroma/api_client.spec.ts b/megalodon/test/unit/pleroma/api_client.spec.ts index e678885f6..98c9ec8e4 100644 --- a/megalodon/test/unit/pleroma/api_client.spec.ts +++ b/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, diff --git a/megalodon/test/unit/webo_socket.spec.ts b/megalodon/test/unit/webo_socket.spec.ts index c298138e4..bb9f997a5 100644 --- a/megalodon/test/unit/webo_socket.spec.ts +++ b/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,