ash/iceshrimp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[mastodon-client] populate note details for notifications

Browse source
This commit is contained in:
Laura Hausmann 2023-07-07 22:06:26 +02:00
parent afc9cf3259
commit c02fec7f36
No known key found for this signature in database
GPG key ID: D044E84C5BE01605
1 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
packages/megalodon/src/misskey.ts
View file

@ -1244,6 +1244,13 @@ export default class Misskey implements MegalodonInterface {
} }
} }
public async notificationWithDetails(n: MisskeyAPI.Entity.Notification, host: string, cache: AccountCache): Promise<MegalodonEntity.Notification> {
const notification = this.converter.notification(n, host);
if (n.note)
notification.status = await this.noteWithDetails(n.note, host, cache);
return notification;
}
public async noteWithDetails(n: MisskeyAPI.Entity.Note, host: string, cache: AccountCache): Promise<MegalodonEntity.Status> { public async noteWithDetails(n: MisskeyAPI.Entity.Note, host: string, cache: AccountCache): Promise<MegalodonEntity.Status> {
const status = await this.addUserDetailsToStatus(this.converter.note(n, host), cache); const status = await this.addUserDetailsToStatus(this.converter.note(n, host), cache);
return this.addMentionsToStatus(status, cache); return this.addMentionsToStatus(status, cache);
@ -2264,13 +2271,15 @@ export default class Misskey implements MegalodonInterface {
limit: 20 limit: 20
}) })
} }
const cache = this.getFreshAccountCache();
return this.client return this.client
.post<Array<MisskeyAPI.Entity.Notification>>('/api/i/notifications', params) .post<Array<MisskeyAPI.Entity.Notification>>('/api/i/notifications', params)
.then(res => ({ .then(async res => ({
...res, ...res,
data: res.data data: await Promise.all(res.data
.filter(p => p.type != MisskeyNotificationType.FollowRequestAccepted) // these aren't supported on mastodon .filter(p => p.type != MisskeyNotificationType.FollowRequestAccepted) // these aren't supported on mastodon
.map(n => this.converter.notification(n, this.baseUrlToHost(this.baseUrl))) })) .map(n => this.notificationWithDetails(n, this.baseUrlToHost(this.baseUrl), cache)))
}))
} }
public async getNotification(_id: string): Promise<Response<Entity.Notification>> { public async getNotification(_id: string): Promise<Response<Entity.Notification>> {