Merge pull request #2299 from h3poteto/iss-2294

refs #2294 Improve quote architecture for other fediverse

Author: h3poteto

megalodon/src/entities/quote.ts

@@ -0,0 +1,24 @@
+import { Status } from './status.js'
+
+export type ShallowQuote = {
+  state: QuoteState
+  quoted_status_id: string | null
+}
+
+export type QuoteState =
+  | 'pending'
+  | 'accepted'
+  | 'rejected'
+  | 'revoked'
+  | 'deleted'
+  | 'unauthorized'
+  | 'blocked_account'
+  | 'blocked_domain'
+  | 'muted_account'
+
+export type Quote = {
+  state: QuoteState
+  quoted_status: Status | null
+}
+
+export type QuotedStatus = ShallowQuote | Quote

megalodon/src/entities/quote_approval.ts

@@ -0,0 +1,5 @@
+export type QuoteApproval = {
+  automatic: Array<string>
+  manual: Array<string>
+  current_user: string
+}

megalodon/src/entities/status.ts

@@ -6,6 +6,8 @@ import { Mention } from './mention.js'
 import { Reaction } from './reaction.js'
 import { Card } from './card.js'
 import { Poll } from './poll.js'
+import { QuotedStatus } from './quote.js'
+import { QuoteApproval } from './quote_approval.js'
 
 export type Status = {
   id: string
@@ -38,7 +40,8 @@ export type Status = {
   language: string | null
   pinned: boolean | null
   emoji_reactions: Array<Reaction>
-  quote: boolean
+  quote: QuotedStatus | null
+  quote_approval: QuoteApproval
   bookmarked: boolean
 }
 

megalodon/src/entity.ts

@@ -36,6 +36,7 @@ import * as status_source from './entities/status_source.js'
 import * as tag from './entities/tag.js'
 import * as token from './entities/token.js'
 import * as urls from './entities/urls.js'
+import * as quote from './entities/quote.js'
 
 export namespace Entity {
   export type Account = account.Account
@@ -91,6 +92,10 @@ export namespace Entity {
   export type Tag = tag.Tag
   export type Token = token.Token
   export type URLs = urls.URLs
+  export type Quote = quote.Quote
+  export type ShallowQuote = quote.ShallowQuote
+  export type QuotedStatus = quote.QuotedStatus
+  export type QuoteState = quote.QuoteState
 }
 
 export default Entity

megalodon/src/firefish/api_client.ts

@@ -325,7 +325,23 @@ namespace FirefishAPI {
         // Use emojis list to provide URLs for emoji reactions.
         emoji_reactions: mapReactions(n.emojis ? n.emojis : [], n.reactions, n.myReaction),
         bookmarked: false,
-        quote: n.renote !== undefined && n.text !== null
+        quote: quote(n),
+        quote_approval: {
+          automatic: ['unsupported_policy'],
+          manual: [],
+          current_user: 'automatic'
+        }
+      }
+    }
+
+    export const quote = (n: Entity.Note): MegalodonEntity.QuotedStatus | null => {
+      if (n.renote !== undefined && n.text !== null) {
+        return {
+          state: 'accepted',
+          quoted_status: note(n.renote)
+        }
+      } else {
+        return null
       }
     }
 

megalodon/src/friendica/api_client.ts

@@ -689,7 +689,7 @@ namespace FriendicaAPI {
       account: account(s.account),
       in_reply_to_id: s.in_reply_to_id,
       in_reply_to_account_id: s.in_reply_to_account_id,
-      reblog: s.reblog ? status(s.reblog) : s.quote ? status(s.quote) : null,
+      reblog: s.reblog ? status(s.reblog) : null,
       content: s.content,
       plain_content: null,
       created_at: s.created_at,
@@ -714,7 +714,12 @@ namespace FriendicaAPI {
       pinned: s.pinned,
       emoji_reactions: [],
       bookmarked: s.bookmarked ? s.bookmarked : false,
-      quote: false
+      quote: null,
+      quote_approval: {
+        automatic: ['unsupported_policy'],
+        manual: [],
+        current_user: 'automatic'
+      }
     })
     export const status_params = (s: Entity.StatusParams): MegalodonEntity.StatusParams => {
       return {

megalodon/src/friendica/entities/status.ts

@@ -35,9 +35,6 @@ export type Status = {
   language: string | null
   pinned: boolean | null
   bookmarked?: boolean
-  // These parameters are unique parameters in fedibird.com for quote.
-  quote_id?: string
-  quote?: Status | null
 }
 
 export type StatusTag = {

megalodon/src/gotosocial/api_client.ts

@@ -683,7 +683,12 @@ namespace GotosocialAPI {
       pinned: s.pinned,
       emoji_reactions: [],
       bookmarked: s.bookmarked ? s.bookmarked : false,
-      quote: false
+      quote: null,
+      quote_approval: {
+        automatic: ['unsupported_policy'],
+        manual: [],
+        current_user: 'automatic'
+      }
     })
     export const status_params = (s: Entity.StatusParams): MegalodonEntity.StatusParams => s
     export const tag = (t: Entity.Tag): MegalodonEntity.Tag => ({

megalodon/src/mastodon/api_client.ts

@@ -421,6 +421,10 @@ namespace MastodonAPI {
     export type Tag = MastodonEntity.Tag
     export type Token = MastodonEntity.Token
     export type URLs = MastodonEntity.URLs
+    export type ShallowQuote = MastodonEntity.ShallowQuote
+    export type QuotedStatus = MastodonEntity.QuotedStatus
+    export type Quote = MastodonEntity.Quote
+    export type QuoteApproval = MastodonEntity.QuoteApproval
   }
 
   export namespace Converter {
@@ -594,7 +598,7 @@ namespace MastodonAPI {
       account: account(s.account),
       in_reply_to_id: s.in_reply_to_id,
       in_reply_to_account_id: s.in_reply_to_account_id,
-      reblog: s.reblog ? status(s.reblog) : s.quote ? status(s.quote) : null,
+      reblog: s.reblog ? status(s.reblog) : null,
       content: s.content,
       plain_content: null,
       created_at: s.created_at,
@@ -619,14 +623,27 @@ namespace MastodonAPI {
       pinned: s.pinned,
       emoji_reactions: [],
       bookmarked: s.bookmarked ? s.bookmarked : false,
-      // Now quote is supported only fedibird.com.
-      quote: s.quote !== undefined && s.quote !== null
+      quote: s.quote ? quote(s.quote) : null,
+      quote_approval: s.quote_approval
     })
     export const status_params = (s: Entity.StatusParams): MegalodonEntity.StatusParams => s
     export const status_source = (s: Entity.StatusSource): MegalodonEntity.StatusSource => s
     export const tag = (t: Entity.Tag): MegalodonEntity.Tag => t
     export const token = (t: Entity.Token): MegalodonEntity.Token => t
     export const urls = (u: Entity.URLs): MegalodonEntity.URLs => u
+    export const quote = (q: Entity.QuotedStatus): MegalodonEntity.QuotedStatus => {
+      if ('quoted_status' in q) {
+        return {
+          state: q.state,
+          quoted_status: q.quoted_status ? status(q.quoted_status) : null
+        }
+      } else {
+        return {
+          state: q.state,
+          quoted_status_id: q.quoted_status_id
+        }
+      }
+    }
   }
 }
 export default MastodonAPI

megalodon/src/mastodon/entities/quote.ts

@@ -0,0 +1,24 @@
+import { Status } from './status.js'
+
+export type ShallowQuote = {
+  state: QuoteState
+  quoted_status_id: string | null
+}
+
+export type QuoteState =
+  | 'pending'
+  | 'accepted'
+  | 'rejected'
+  | 'revoked'
+  | 'deleted'
+  | 'unauthorized'
+  | 'blocked_account'
+  | 'blocked_domain'
+  | 'muted_account'
+
+export type Quote = {
+  state: QuoteState
+  quoted_status: Status | null
+}
+
+export type QuotedStatus = ShallowQuote | Quote