Merge pull request #1694 from h3poteto/feat/scheduled

Fix ScheduledStatus entity
h3poteto · Apr 26, 2023 · fef2cd3 · fef2cd3
2 parents 7bd0401 + a62f79e
commit fef2cd3
Show file tree

Hide file tree

Showing 15 changed files with 118 additions and 22 deletions.
diff --git a/example/typescript/src/mastodon/toot.ts → ...le/typescript/src/mastodon/post_status.ts b/example/typescript/src/mastodon/toot.ts → ...le/typescript/src/mastodon/post_status.ts
@@ -6,7 +6,7 @@ const rl: readline.ReadLine = readline.createInterface({
   output: process.stdout
 })
 
-const BASE_URL: string = 'https://fedibird.com'
+const BASE_URL: string = process.env.MASTODON_URL as string
 
 const access_token: string = process.env.MASTODON_ACCESS_TOKEN as string
 
@@ -16,7 +16,7 @@ new Promise(resolve => {
   rl.question('Toot: ', status => {
     client
       .postStatus(status)
-      .then((res: Response<Entity.Status|Entity.ScheduledStatus>) => {
+      .then((res: Response<Entity.Status | Entity.ScheduledStatus>) => {
         console.log(res)
         rl.close()
         resolve(res)

diff --git a/example/typescript/src/mastodon/post_status_with_schedule.ts b/example/typescript/src/mastodon/post_status_with_schedule.ts
@@ -0,0 +1,34 @@
+import * as readline from 'readline'
+import generator, { Entity, Response } from 'megalodon'
+
+const rl: readline.ReadLine = readline.createInterface({
+  input: process.stdin,
+  output: process.stdout
+})
+
+const BASE_URL: string = process.env.MASTODON_URL as string
+
+const access_token: string = process.env.MASTODON_ACCESS_TOKEN as string
+
+const client = generator('mastodon', BASE_URL, access_token)
+
+new Promise(resolve => {
+  rl.question('Toot: ', status => {
+    let now = new Date()
+    now.setMinutes(now.getMinutes() + 6)
+    client
+      .postStatus(status, {
+        scheduled_at: now.toISOString(),
+        visibility: 'private'
+      })
+      .then((res: Response<Entity.Status | Entity.ScheduledStatus>) => {
+        console.log(res)
+        rl.close()
+        resolve(res)
+      })
+      .catch(err => {
+        console.error(err)
+        rl.close()
+      })
+  })
+})
diff --git a/example/typescript/src/pleroma/toot.ts → ...ple/typescript/src/pleroma/post_status.ts b/example/typescript/src/pleroma/toot.ts → ...ple/typescript/src/pleroma/post_status.ts
@@ -6,7 +6,7 @@ const rl: readline.ReadLine = readline.createInterface({
   output: process.stdout
 })
 
-const BASE_URL: string = 'https://pleroma.io'
+const BASE_URL: string = process.env.PLEROMA_URL as string
 
 const access_token: string = process.env.PLEROMA_ACCESS_TOKEN as string
 
@@ -16,7 +16,7 @@ new Promise(resolve => {
   rl.question('Toot: ', status => {
     client
       .postStatus(status)
-      .then((res: Response<Entity.Status|Entity.ScheduledStatus>) => {
+      .then((res: Response<Entity.Status | Entity.ScheduledStatus>) => {
         console.log(res)
         rl.close()
         resolve(res)

diff --git a/example/typescript/src/pleroma/post_status_with_schedule.ts b/example/typescript/src/pleroma/post_status_with_schedule.ts
@@ -0,0 +1,34 @@
+import * as readline from 'readline'
+import generator, { Entity, Response } from 'megalodon'
+
+const rl: readline.ReadLine = readline.createInterface({
+  input: process.stdin,
+  output: process.stdout
+})
+
+const BASE_URL: string = process.env.PLEROMA_URL as string
+
+const access_token: string = process.env.PLEROMA_ACCESS_TOKEN as string
+
+const client = generator('pleroma', BASE_URL, access_token)
+
+new Promise(resolve => {
+  rl.question('Toot: ', status => {
+    let now = new Date()
+    now.setMinutes(now.getMinutes() + 6)
+    client
+      .postStatus(status, {
+        scheduled_at: now.toISOString(),
+        visibility: 'private'
+      })
+      .then((res: Response<Entity.Status | Entity.ScheduledStatus>) => {
+        console.log(res)
+        rl.close()
+        resolve(res)
+      })
+      .catch(err => {
+        console.error(err)
+        rl.close()
+      })
+  })
+})
diff --git a/megalodon/src/entities/scheduled_status.ts b/megalodon/src/entities/scheduled_status.ts
@@ -5,6 +5,6 @@ namespace Entity {
     id: string
     scheduled_at: string
     params: StatusParams
-    media_attachments: Array<Attachment>
+    media_attachments: Array<Attachment> | null
   }
 }
diff --git a/megalodon/src/entities/status_params.ts b/megalodon/src/entities/status_params.ts
@@ -5,8 +5,8 @@ namespace Entity {
     media_ids: Array<string> | null
     sensitive: boolean | null
     spoiler_text: string | null
-    visibility: 'public' | 'unlisted' | 'private' | 'direct'
+    visibility: 'public' | 'unlisted' | 'private' | 'direct' | null
     scheduled_at: string | null
-    application_id: string
+    application_id: number | null
   }
 }
diff --git a/megalodon/src/friendica/api_client.ts b/megalodon/src/friendica/api_client.ts
@@ -621,7 +621,14 @@ namespace FriendicaAPI {
       statuses: Array.isArray(r.statuses) ? r.statuses.map(s => status(s)) : [],
       hashtags: Array.isArray(r.hashtags) ? r.hashtags.map(h => tag(h)) : []
     })
-    export const scheduled_status = (s: Entity.ScheduledStatus): MegalodonEntity.ScheduledStatus => s
+    export const scheduled_status = (s: Entity.ScheduledStatus): MegalodonEntity.ScheduledStatus => {
+      return {
+        id: s.id,
+        scheduled_at: s.scheduled_at,
+        params: status_params(s.params),
+        media_attachments: s.media_attachments ? s.media_attachments.map(a => attachment(a)) : null
+      }
+    }
     export const source = (s: Entity.Source): MegalodonEntity.Source => s
     export const stats = (s: Entity.Stats): MegalodonEntity.Stats => s
     export const status = (s: Entity.Status): MegalodonEntity.Status => ({
@@ -658,7 +665,18 @@ namespace FriendicaAPI {
       // Now quote is supported only fedibird.com.
       quote: s.quote !== undefined && s.quote !== null
     })
-    export const status_params = (s: Entity.StatusParams): MegalodonEntity.StatusParams => s
+    export const status_params = (s: Entity.StatusParams): MegalodonEntity.StatusParams => {
+      return {
+        text: s.text,
+        in_reply_to_id: s.in_reply_to_id,
+        media_ids: s.media_ids,
+        sensitive: s.sensitive,
+        spoiler_text: s.spoiler_text,
+        visibility: s.visibility,
+        scheduled_at: s.scheduled_at,
+        application_id: parseInt(s.application_id)
+      }
+    }
     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

diff --git a/megalodon/src/friendica/entities/account.ts b/megalodon/src/friendica/entities/account.ts
@@ -24,6 +24,6 @@ namespace FriendicaEntity {
     moved: Account | null
     fields: Array<Field>
     bot: boolean
-    source: Source
+    source?: Source
   }
 }
diff --git a/megalodon/src/friendica/entities/status_params.ts b/megalodon/src/friendica/entities/status_params.ts
@@ -5,7 +5,7 @@ namespace FriendicaEntity {
     media_ids: Array<string> | null
     sensitive: boolean | null
     spoiler_text: string | null
-    visibility: 'public' | 'unlisted' | 'private' | 'direct'
+    visibility: 'public' | 'unlisted' | 'private' | null
     scheduled_at: string | null
     application_id: string
   }

diff --git a/megalodon/src/mastodon/entities/account.ts b/megalodon/src/mastodon/entities/account.ts
@@ -24,6 +24,6 @@ namespace MastodonEntity {
     moved: Account | null
     fields: Array<Field>
     bot: boolean
-    source: Source
+    source?: Source
   }
 }
diff --git a/megalodon/src/mastodon/entities/status_params.ts b/megalodon/src/mastodon/entities/status_params.ts
@@ -5,8 +5,8 @@ namespace MastodonEntity {
     media_ids: Array<string> | null
     sensitive: boolean | null
     spoiler_text: string | null
-    visibility: 'public' | 'unlisted' | 'private' | 'direct'
+    visibility: 'public' | 'unlisted' | 'private' | 'direct' | null
     scheduled_at: string | null
-    application_id: string
+    application_id: number
   }
 }
diff --git a/megalodon/src/pleroma/api_client.ts b/megalodon/src/pleroma/api_client.ts
@@ -292,8 +292,8 @@ namespace PleromaAPI {
     export const scheduled_status = (s: Entity.ScheduledStatus): MegalodonEntity.ScheduledStatus => ({
       id: s.id,
       scheduled_at: s.scheduled_at,
-      params: s.params,
-      media_attachments: Array.isArray(s.media_attachments) ? s.media_attachments.map(m => attachment(m)) : []
+      params: status_params(s.params),
+      media_attachments: Array.isArray(s.media_attachments) ? s.media_attachments.map(m => attachment(m)) : null
     })
     export const source = (s: Entity.Source): MegalodonEntity.Source => s
     export const stats = (s: Entity.Stats): MegalodonEntity.Stats => s
@@ -330,7 +330,18 @@ namespace PleromaAPI {
       bookmarked: s.bookmarked ? s.bookmarked : false,
       quote: s.reblog !== null && s.reblog.content !== s.content
     })
-    export const status_params = (s: Entity.StatusParams): MegalodonEntity.StatusParams => s
+    export const status_params = (s: Entity.StatusParams): MegalodonEntity.StatusParams => {
+      return {
+        text: s.text,
+        in_reply_to_id: s.in_reply_to_id,
+        media_ids: Array.isArray(s.media_ids) ? s.media_ids : null,
+        sensitive: s.sensitive,
+        spoiler_text: s.spoiler_text,
+        visibility: s.visibility,
+        scheduled_at: s.scheduled_at,
+        application_id: null
+      }
+    }
     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

diff --git a/megalodon/src/pleroma/entities/account.ts b/megalodon/src/pleroma/entities/account.ts
@@ -23,6 +23,6 @@ namespace PleromaEntity {
     moved: Account | null
     fields: Array<Field>
     bot: boolean
-    source: Source
+    source?: Source
   }
 }
diff --git a/megalodon/src/pleroma/entities/scheduled_status.ts b/megalodon/src/pleroma/entities/scheduled_status.ts
@@ -5,6 +5,6 @@ namespace PleromaEntity {
     id: string
     scheduled_at: string
     params: StatusParams
-    media_attachments: Array<Attachment>
+    media_attachments: Array<Attachment> | null
   }
 }
diff --git a/megalodon/src/pleroma/entities/status_params.ts b/megalodon/src/pleroma/entities/status_params.ts
@@ -2,11 +2,10 @@ namespace PleromaEntity {
   export type StatusParams = {
     text: string
     in_reply_to_id: string | null
-    media_ids: Array<string> | null
+    media_ids?: Array<string> | null
     sensitive: boolean | null
     spoiler_text: string | null
-    visibility: 'public' | 'unlisted' | 'private' | 'direct'
+    visibility: 'public' | 'unlisted' | 'private' | 'direct' | null
     scheduled_at: string | null
-    application_id: string
   }
 }