.drone.yml

@@ -1,30 +1,24 @@
 ---
 kind: pipeline
 type: docker
-name: publish-bot
+name: build-app
 
 steps:
 - name: build-dotnet
   image: mcr.microsoft.com/dotnet/sdk:6.0
   commands:
-  - dotnet publish
+  - dotnet build
-
-- name: build-image
-  image: plugins/docker
-  settings:
-    registry: git.kizaing.ca
-    username:
-      from_secret: DOCKER_USER
-    password:
-      from_secret: DOCKER_PASS
-    repo: git.kizaing.ca/kizaing/TeleTok
-    tags: latest
-    platform: linux/amd64,linux/arm64
 
+steps:
+- name: build-docker
+  image: docker:dind
+  volumes:
+  - name: dockersock
+    path: /var/run/docker.sock
 
 # Commented out until stuff actually works
-trigger:
+#trigger:
-  branch:
+#  branch:
-  - main
+#  - main
-  event:
+#  event:
-  - push
+#  - push

Dockerfile

@@ -2,6 +2,10 @@ FROM mcr.microsoft.com/dotnet/runtime:6.0-alpine3
 
 WORKDIR /app/teletok
 
-COPY bin/Debug/net6.0/publish/* /app/teletok/
+RUN apk update && apk add --update nodejs nodejs-npm 
+
+RUN npm i -g tiktok-scraper
+
+COPY bin/Debug/net6.0/* /app/teletok/
 
 CMD [ "TeleTok" ]

TelegramListener.cs

@@ -55,22 +55,15 @@ namespace TeleTok
             // Passes the url along to the video downloader if it is valid AND a tiktok link
             if (isUri)
             {
-                try
+                if(messageText.Contains("tiktok.com"))
                 {
-                    if(messageText.Contains("tiktok.com"))
+                    proxyUrl = VidDownload.TikTokURL(messageText);
-                    {
-                        proxyUrl = VidDownload.TikTokURL(messageText);
 
-                        Message ttVideo = await botClient.SendVideoAsync(
+                    Message ttVideo = await botClient.SendVideoAsync(
-                            chatId: chatId,
+                        chatId: chatId,
-                            video: proxyUrl,
+                        video: proxyUrl,
-                            cancellationToken: cancellationToken
+                        cancellationToken: cancellationToken
-                        );
+                    );
-                    }
-                }
-                catch 
-                {
-                    Console.WriteLine("Valid TikTok URI was sent, but was not a video!");
                 }
             }
         }