Everything should be working fine now!

[Fixed] issue #10 [Added] long URL support [Removed] inline queries due to compatibility issues related to #10 Signed-off-by: Anatoli Nicolae <[email protected]>
thundersquared · Nov 5, 2020 · 6347197 · 6347197
1 parent 60aa80f
commit 6347197
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 220 deletions.
diff --git a/bot.js b/bot.js
@@ -82,10 +82,11 @@ bot.command("help", (ctx) =>
 
 bot.command("lang", lang);
 
-bot.on("inline_query", fetch.inlineMessage);
+// Disabled inline queries as TikTok requires specific headers to display a video,
+// which we can't control since preview downloads are server-side
+// bot.on("inline_query", fetch.inlineMessage);
 
-// TODO: add full link support
-// bot.hears(fetch.fullLink, fetch.chatMessage);
+bot.hears(fetch.fullLink, fetch.chatMessage);
 bot.hears(fetch.shortLink, fetch.chatMessage);
 
 bot.launch();
diff --git a/handler/fetch.js b/handler/fetch.js
@@ -1,9 +1,7 @@
+const {unlink} = require('fs');
 const validUrl = require("valid-url");
 const getUrls = require("get-urls");
-const got = require("got");
 const TikTokScraper = require("tiktok-scraper");
-const Extra = require("telegraf/extra");
-const Markup = require("telegraf/markup");
 
 // Config import and checks
 const config = require("../config");
@@ -12,17 +10,9 @@ if (!config.http || !config.http.agent) {
     process.exit();
 }
 
-// TODO: add full link support
-// const fullLinkRegex = /https??:\/\/(vm\.)??tiktok\.com\/(\w|\W|\d)+/;
+const fullLinkRegex = /https:\/\/www\.tiktok\.com\/@.*\/video\/\d{18,}.*/;
 const shortLinkRegex = /https??:\/\/(v[m|t]\.)??tiktok\.com\/(\w|\W|\d)+/;
 
-const gotOptions = {
-    headers: {
-        'User-Agent': config.http.agent,
-        'Referer': 'https://www.tiktok.com/',
-    },
-};
-
 const isWhitelisted = (username) => {
     return config.whitelist.length == 0 || config.whitelist.includes(username);
 };
@@ -98,32 +88,34 @@ const handleInlineMessage = async (ctx) => {
 };
 
 const replyWithVideo = async (ctx, url) => {
+    let dest = '/tmp';
+    let path = null;
+
     try {
-        let video = await fetchVideoMeta(url);
-        if (!video) {
-            return ctx.reply(ctx.i18n.t("errors.stream"));
-        }
+        let meta = await TikTokScraper.getVideoMeta(url);
 
-        if (!validUrl.isUri(video.videoUrlNoWaterMark)) {
-            return false;
-        }
+        let download = await TikTokScraper.video(url, {
+            download: true,
+            filepath: dest,
+            noWaterMark: true,
+        });
 
-        try {
-            const response = await got(video.videoUrlNoWaterMark, gotOptions);
-            if (response.statusCode === 200) {
-                const source = await got.stream(video.videoUrlNoWaterMark, gotOptions);
-                return await ctx.replyWithVideo(
-                    {source: source},
-                    {reply_to_message_id: ctx.message.message_id}
-                );
-            } else {
-                return await ctx.reply(ctx.i18n.t("errors.stream"));
-            }
-        } catch (e) {
-            return await ctx.reply(ctx.i18n.t("errors.stream"));
-        }
-    } catch (e) {
+        path = `${dest}/${meta.id}.mp4`;
+
+        return await ctx.replyWithVideo(
+            {source: path},
+            {reply_to_message_id: ctx.message.message_id}
+        );
+    } catch (err) {
         return ctx.reply(ctx.i18n.t("errors.stream"));
+    } finally {
+        if (path) {
+            unlink(path, (err) => {
+                if (err) {
+                    console.error(err);
+                }
+            });
+        }
     }
 };
 
@@ -145,8 +137,7 @@ const fetchVideoMeta = async (url) => {
 };
 
 module.exports = {
-    // TODO: add full link support
-    // fullLink: fullLinkRegex,
+    fullLink: fullLinkRegex,
     shortLink: shortLinkRegex,
     chatMessage: handleChatMessage,
     inlineMessage: handleInlineMessage,

diff --git a/package.json b/package.json
@@ -1,13 +1,12 @@
 {
   "name": "tikvidbot",
-  "version": "1.3.3",
+  "version": "1.3.7",
   "description": "TikTok Video Download Telegram Bot",
   "main": "bot.js",
   "author": "thundersquared (https://thundersquared.com)",
   "license": "MIT",
   "dependencies": {
     "get-urls": "^10.0.0",
-    "got": "^11.8.0",
     "telegraf": "^3.38.0",
     "telegraf-command-parts": "^1.0.3",
     "telegraf-i18n": "^6.6.0",