graphite/Sharkey
1
0
Fork 0
mirror of https://git.joinsharkey.org/Sharkey/Sharkey.git synced 2024-11-26 17:03:09 +02:00
Code Issues Projects Releases Packages Wiki Activity

merge: fix: incorrect type for quote property (!480)

Browse source 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/480

Closes #401

Approved-by: dakkar <dakkar@thenautilus.net>
This commit is contained in:
Marie 2024-04-07 15:42:37 +00:00
commit 7bdaf8f649
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packages/backend/src/server/api/mastodon/converters.ts
View file

@ -278,7 +278,7 @@ export class MastoConverters {
reactions: status.emoji_reactions, reactions: status.emoji_reactions,
emoji_reactions: status.emoji_reactions, emoji_reactions: status.emoji_reactions,
bookmarked: false, bookmarked: false,
quote: isQuote ? await this.convertReblog(status.reblog) : false, quote: isQuote ? await this.convertReblog(status.reblog) : null,
// optional chaining cannot be used, as it evaluates to undefined, not null // optional chaining cannot be used, as it evaluates to undefined, not null
edited_at: note.updatedAt ? note.updatedAt.toISOString() : null, edited_at: note.updatedAt ? note.updatedAt.toISOString() : null,
}); });

2
packages/megalodon/src/entities/status.ts
View file

@ -39,7 +39,7 @@ namespace Entity {
language: string | null language: string | null
pinned: boolean | null pinned: boolean | null
emoji_reactions: Array<Reaction> emoji_reactions: Array<Reaction>
quote: Status | boolean quote: Status | boolean | null
bookmarked: boolean bookmarked: boolean
} }

2
packages/megalodon/src/misskey/api_client.ts
View file

@ -304,7 +304,7 @@ namespace MisskeyAPI {
pinned: null, pinned: null,
emoji_reactions: typeof n.reactions === 'object' ? mapReactions(n.reactions, n.myReaction) : [], emoji_reactions: typeof n.reactions === 'object' ? mapReactions(n.reactions, n.myReaction) : [],
bookmarked: false, bookmarked: false,
quote: n.renote && n.text ? note(n.renote, n.user.host ? n.user.host : host ? host : null) : false quote: n.renote && n.text ? note(n.renote, n.user.host ? n.user.host : host ? host : null) : null
} }
} }