feat: show # of pictures in slideshow and stop using player for images

okdargy · Jan 24, 2024 · c9e533c · c9e533c
1 parent d62e5f6
commit c9e533c
Show file tree

Hide file tree

Showing 4 changed files with 51 additions and 10 deletions.
diff --git a/src/templates/pages/VideoResponse.tsx b/src/templates/pages/VideoResponse.tsx
@@ -16,7 +16,7 @@ export function VideoResponse(data: AwemeList): JSX.Element {
                 },
                 {
                     name: 'twitter:card',
-                    content: 'player'
+                    content: `${data.video.duration !== 0 ? 'player' : 'summary_large_image'}`
                 },
                 {
                     name: 'twitter:site',
@@ -36,7 +36,7 @@ export function VideoResponse(data: AwemeList): JSX.Element {
                 },
                 {
                     name: 'og:description',
-                    content: data.desc
+                    content: data.video.duration !== 0 ? data.desc : null
                 },
                 {
                     name: `og:${data.video.duration !== 0 ? 'video' : 'image'}`,
@@ -57,12 +57,13 @@ export function VideoResponse(data: AwemeList): JSX.Element {
                 {
                    name: `og:${data.video.duration !== 0 ? 'video' : 'image'}:height`,
                    content: `${data.video.duration !== 0 ? data.video.height : data.video.cover.height}` 
-                }
+                },
             ], {
                 likes: data.statistics.digg_count,
                 comments: data.statistics.comment_count,
                 shares: data.statistics.share_count,
-                unique_id: data.author.unique_id
+                unique_id: data.author.unique_id,
+                images: data.image_post_info ? data.image_post_info.images.length : 0
             })
             }
         </>

diff --git a/src/types/Services.ts b/src/types/Services.ts
@@ -91,6 +91,7 @@ export interface AwemeList {
     products_info:                   null;
     follow_up_publish_from_id:       number;
     disable_search_trending_bar:     boolean;
+    image_post_info?:                 ImagePostInfo;
     music_begin_time_in_ms:          number;
     music_end_time_in_ms?:           number;
     item_distribute_source:          string;
@@ -598,3 +599,41 @@ export interface TikTokAPIResponseLogInfo {
 export interface LogPb {
     impr_id: string;
 }
+
+export interface Image {
+    display_image: {
+        uri: string;
+        url_list: string[];
+        width: number;
+        height: number;
+        url_prefix: string | null;
+    }
+    owner_watermark_image: {
+        uri: string;
+        url_list: string[];
+        width: number;
+        height: number;
+        url_prefix: string | null;
+    },
+    user_watermark_image: {
+        uri: string;
+        url_list: string[];
+        width: number;
+        height: number;
+        url_prefix: string | null;
+    },
+    thumbnail: {
+        uri: string;
+        url_list: string[];
+        width: number;
+        height: number;
+        url_prefix: string | null;
+    },
+    bitratre_images: string | null
+}
+
+export interface ImagePostInfo {
+    images: Image[];
+    image_post_cover: Image[];
+    post_extra: String
+}
diff --git a/src/util/MetaHelper.tsx b/src/util/MetaHelper.tsx
@@ -1,21 +1,22 @@
 export default function MetaHelper(tags: {
     name: string,
-    content: string,
+    content: string | null,
 }[], alternate?: {
     likes: number,
     comments: number,
     shares: number
-    unique_id: string
+    unique_id: string,
+    images: number
 }): JSX.Element {
     return (
         <html lang="en">
             <head>
                 {tags.map((tag) => (
-                    <meta property={tag.name} content={tag.content} />
+                    tag.content ? <meta property={tag.name} content={tag.content} /> : null
                 ))}
                 {
                     alternate ? (
-                        <link rel="alternate" href={`https://fxtiktok-rewrite.dargy.workers.dev/generate/alternate?likes=${alternate.likes}&comments=${alternate.comments}&shares=${alternate.shares}&unique_id=${encodeURIComponent(alternate.unique_id)}`} type="application/json+oembed" />
+                        <link rel="alternate" href={`https://fxtiktok-rewrite.dargy.workers.dev/generate/alternate?likes=${alternate.likes}&comments=${alternate.comments}&shares=${alternate.shares}&unique_id=${encodeURIComponent(alternate.unique_id)}${alternate.images > 0 ? '&images=' + alternate.images : ''}`} type="application/json+oembed" />
                     ) : null
                 }
             </head>

diff --git a/src/util/generateAlternate.tsx b/src/util/generateAlternate.tsx
@@ -25,12 +25,12 @@ export default function generateAlternate(c: Context): {
     provider_url: string
     title: string
 } {
-    const { likes, comments, shares, unique_id } = c.req.query()
+    const { likes, comments, shares, unique_id, images } = c.req.query()
 
     return {
         "version": "1.0",
         "type": "link",
-        "author_name": `❤️ ${formatNumber(likes)} 💬 ${formatNumber(comments)} 📤 ${formatNumber(shares)}`,
+        "author_name": `❤️ ${formatNumber(likes)} 💬 ${formatNumber(comments)} 📤 ${formatNumber(shares)} ${images ? '🖼️ ' + images : ''}`,
         "provider_name": 'fxTikTok',
         "provider_url": "https://tnktok.com",
         "title": `TikTok by @${unique_id}`