summaryrefslogtreecommitdiff
path: root/packages/megalodon/src/misskey
diff options
context:
space:
mode:
authorHazelnoot <acomputerdog@gmail.com>2025-01-31 11:14:21 -0500
committerHazelnoot <acomputerdog@gmail.com>2025-02-08 13:17:50 -0500
commitbd95e8a555e2fcb8b72ae4fbe496495af28fc8b3 (patch)
tree83ef8655ede379a8f68e03f0858b2aaad7d7c75c /packages/megalodon/src/misskey
parentadd `memo` and `isInstanceMuted` to UserRelation API entity (diff)
downloadsharkey-bd95e8a555e2fcb8b72ae4fbe496495af28fc8b3.tar.gz
sharkey-bd95e8a555e2fcb8b72ae4fbe496495af28fc8b3.tar.bz2
sharkey-bd95e8a555e2fcb8b72ae4fbe496495af28fc8b3.zip
fix relationship data for Mastodon API (resolves #714)
Diffstat (limited to 'packages/megalodon/src/misskey')
-rw-r--r--packages/megalodon/src/misskey/api_client.ts11
-rw-r--r--packages/megalodon/src/misskey/entities/relation.ts3
2 files changed, 9 insertions, 5 deletions
diff --git a/packages/megalodon/src/misskey/api_client.ts b/packages/megalodon/src/misskey/api_client.ts
index 8996b802c8..a4352613eb 100644
--- a/packages/megalodon/src/misskey/api_client.ts
+++ b/packages/megalodon/src/misskey/api_client.ts
@@ -227,13 +227,14 @@ namespace MisskeyAPI {
blocking: r.isBlocking,
blocked_by: r.isBlocked,
muting: r.isMuted,
- muting_notifications: false,
+ muting_notifications: r.isMuted,
requested: r.hasPendingFollowRequestFromYou,
- domain_blocking: false,
- showing_reblogs: true,
+ requested_by: r.hasPendingFollowRequestToYou,
+ domain_blocking: r.isInstanceMuted ?? false,
+ showing_reblogs: !r.isRenoteMuted,
endorsed: false,
- notifying: false,
- note: null
+ notifying: !r.isMuted,
+ note: r.memo ?? '',
}
}
diff --git a/packages/megalodon/src/misskey/entities/relation.ts b/packages/megalodon/src/misskey/entities/relation.ts
index 07653b4865..a43dfbab4e 100644
--- a/packages/megalodon/src/misskey/entities/relation.ts
+++ b/packages/megalodon/src/misskey/entities/relation.ts
@@ -8,5 +8,8 @@ namespace MisskeyEntity {
isBlocking: boolean
isBlocked: boolean
isMuted: boolean
+ isRenoteMuted: boolean
+ isInstanceMuted?: boolean
+ memo?: string | null
}
}