Merge 212348a624 into 14b9a590d9

api/src/processing/match-action.js

@@ -104,6 +104,7 @@ export default function({
                 case "snapchat":
                 case "bsky":
                 case "xiaohongshu":
+                case "duitang":
                     params = { picker: r.picker };
                     break;
 

api/src/processing/match.js

@@ -29,6 +29,7 @@ import loom from "./services/loom.js";
 import facebook from "./services/facebook.js";
 import bluesky from "./services/bluesky.js";
 import xiaohongshu from "./services/xiaohongshu.js";
+import duitang from "./services/duitang.js";
 
 let freebind;
 
@@ -267,6 +268,13 @@ export default async function({ host, patternMatch, params, authType }) {
                     dispatcher,
                 });
                 break;
+            
+            case "duitang":
+                r = await duitang({
+                    id: patternMatch.id,
+                    type: patternMatch.type,
+                });
+                break;
 
             default:
                 return createResponse("error", {

api/src/processing/service-config.js

@@ -22,6 +22,10 @@ export const services = {
     dailymotion: {
         patterns: ["video/:id"],
     },
+    duitang: {
+        patterns: [ ":type?id=:id" ],
+        subdomains: ["m"]
+    },
     facebook: {
         patterns: [
             "_shortLink/:shortLink",

api/src/processing/service-patterns.js

@@ -5,6 +5,10 @@ export const testers = {
 
     "dailymotion": pattern => pattern.id?.length <= 32,
 
+    "duitang": pattern =>
+        (pattern.type == 'blog' || pattern.type == 'atlas') &&
+        pattern.id?.length <= 10,
+
     "instagram": pattern =>
         pattern.postId?.length <= 48
         || pattern.shareId?.length <= 16

api/src/processing/services/duitang.js

@@ -0,0 +1,84 @@
+import { genericUserAgent } from "../../config.js";
+import { createStream } from "../../stream/manage.js"
+
+export default async function(post) {
+    let filenameBase = `duitang_${post.id}`
+
+    if (post.type == 'blog') {
+        let req = await fetch(`https://www.duitang.com/napi/blog/detail/?blog_id=${post.id}`, {
+            headers: {
+                'User-Agent': genericUserAgent,
+            }
+        })
+        .then(request => request.text())
+        .catch(() => {});
+    
+        if (!req) return { error: 'fetch.fail' };
+
+        let json;
+        try {
+            json = JSON.parse(req);
+        } catch { return { error: 'fetch.empty' }; }
+
+        let originalUrl = json.data.photo.path.toString();
+        let image = {
+            // always proxy here because of headers
+            type: "photo",
+            url: createStream({
+                service: "duitang",
+                type: "proxy",
+                url: originalUrl,
+                filename: `${filenameBase}_photo.jpg`,
+                headers: {
+                    'Host': 'c-ssl.dtstatic.com',
+                    'Referer': 'https://duitang.com'
+                }
+            })
+        }
+
+        return {
+            picker: [image]
+        };
+    }
+
+    if (post.type == 'atlas') {
+        let req = await fetch(`https://www.duitang.com/napi/vienna/atlas/detail/?atlas_id=${post.id}`, {
+            headers: {
+                'User-Agent': genericUserAgent,
+            }
+        })
+        .then(request => request.text())
+        .catch(() => {});
+    
+        if (!req) return { error: 'fetch.fail' };
+
+        let json;
+        try {
+            json = JSON.parse(req);
+        } catch { return { error: 'fetch.empty' }; }
+
+        let imageLinks = json.data.blogs
+            .map(blog => blog.photo?.path)
+            .map((url, i) => {
+                // always proxy here because of headers
+                url = createStream({
+                    service: "duitang",
+                    type: "proxy",
+                    url: url,
+                    filename: `${filenameBase}_photo_${i + 1}.jpg`,
+                    headers: {
+                        'Host': 'c-ssl.dtstatic.com',
+                        'Referer': 'https://duitang.com'
+                    }
+                });
+
+                return {
+                    type: "photo",
+                    url
+                };
+            });
+        return {
+            picker: imageLinks
+        }
+    }
+}

api/src/processing/url.js

@@ -134,6 +134,11 @@ function cleanURL(url) {
     }
 
     switch (host) {
+        case "duitang":
+            if (url.searchParams.get('id')) {
+                limitQuery('id');
+            }
+            break;
         case "pinterest":
             url.hostname = 'pinterest.com';
             break;

api/src/util/tests/duitang.json

@@ -0,0 +1,37 @@
+[
+    {
+        "name": "regular album",
+        "url": "https://www.duitang.com/atlas/?id=135382417",
+        "params": {},
+        "expected": {
+            "code": 200,
+            "status": "picker"
+        }
+    },
+    {
+        "name": "single image",
+        "url": "https://www.duitang.com/blog/?id=1517805784",
+        "params": {},
+        "expected": {
+            "code": 200,
+            "status": "picker"
+        }
+    },
+    {
+        "name": "single image, mobile link",
+        "url": "https://m.duitang.com/blog/?id=1517805784",
+        "params": {},
+        "expected": {
+            "code": 200,
+            "status": "picker"
+        }
+    },
+    {
+        "name": "regular album, mobile link",
+        "url": "https://m.duitang.com/atlas/?id=135382417",
+        "expected": {
+            "code": 200,
+            "status": "picker"
+        }
+    }
+]