Fixed runner repo links

Reviewed-on: #1

.drone.yml

@@ -1,20 +1,21 @@
 ---
 kind: pipeline
-name: build-app
+type: docker
+name: publish-bot
 
 steps:
-- name: build-dotnet
-  image: mcr.microsoft.com/dotnet/sdk:6.0
-  commands:
-  - dotnet build
-
-steps:
-- name: build-docker
-  image: docker:dind
-  volumes:
-  - name: dockersock
-    path: /var/run/docker.sock
+- 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
 
+# Commented out until stuff actually works
 trigger:
   branch:
   - main

.gitea/workflows/build.yml

@@ -0,0 +1,36 @@
+# .gitea/workflows/build.yaml
+name: Publish Docker image
+
+on:
+  push:
+    branches: [main]
+
+jobs:
+  push_to_registry:
+    name: Push Docker image to registries
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out the repo
+        uses: actions/checkout@v3
+        with:
+          token: ${{ secrets.GITEA_TOKEN }}
+
+      - name: Login to DockerHub
+        uses: https://github.com/docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_USER }}
+          password: ${{ secrets.DOCKER_TOKEN }}
+
+      - name: Login to Gitea registry
+        uses: https://github.com/docker/login-action@v2
+        with:
+          registry: git.kizaing.ca
+          username: ${{ gitea.actor }}
+          password: ${{ secrets.GITEA_TOKEN }}
+
+      - name: Build and push Docker image
+        uses: https://github.com/docker/build-push-action@v4
+        with:
+          context: .
+          push: true
+          tags: git.kizaing.ca/kizaing/teletok:latest, kizaing

.gitignore

@@ -1,2 +1,4 @@
 bin
-obj
+obj
+.vscode
+config.Dev.json

Dockerfile

@@ -1,11 +1,14 @@
-FROM mcr.microsoft.com/dotnet/runtime:6.0-alpine3
+#Builds the bot from source
+FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build-task
+
+COPY . /build
+RUN cd /build && dotnet publish
+
+# Actually runs the bot
+FROM mcr.microsoft.com/dotnet/runtime:6.0
 
 WORKDIR /app/teletok
 
-RUN apk update && apk add --update nodejs nodejs-npm 
+COPY --from=build-task /build/bin/Debug/net6.0/publish/* /app/teletok/
 
-RUN npm i -g tiktok-scraper
-
-COPY bin/Debug/net6.0/* /app/teletok/
-
-CMD [ "TeleTok" ]
+CMD [ "./TeleTok" ]

Program.cs

@@ -1,93 +1,43 @@
 using Microsoft.Extensions.Configuration;
 using System;
-using System.Web;
-using System.Text.RegularExpressions;
-using Telegram.Bot;
-using Telegram.Bot.Exceptions;
-using Telegram.Bot.Polling;
-using Telegram.Bot.Types;
-using Telegram.Bot.Types.Enums;
 
 namespace TeleTok
 {
-    class TeleTok
+    public class TeleTok
     {
+        public static IConfigurationRoot config = new ConfigurationBuilder()
+            .SetBasePath(Directory.GetCurrentDirectory())
+            .AddJsonFile("config.json", true)
+            .Build();
+
+        public static string token = config.GetSection("TeleTokConf:token").Value;
+        public static string ptInstance = config.GetSection("TeleTokConf:proxitokInstance").Value;
+
         static async Task Main(string[] args)
         {
-            var config = new ConfigurationBuilder()
-                .SetBasePath(Directory.GetCurrentDirectory())
-                .AddJsonFile("config.json", true)
-                .Build();
-
-            var token = config.GetSection("TeleTokConf:token").Value;
-
-            var botClient = new TelegramBotClient(token);
-            using var cts = new CancellationTokenSource();
-
-            // StartReceiving does not block the caller thread. Receiving is done on the ThreadPool.
-            ReceiverOptions receiverOptions = new ()
+            //Checks if the config json data is valid
+            if(token == "" || token == null || token == "INSERT TOKEN HERE")
             {
-                AllowedUpdates = Array.Empty<UpdateType>() // receive all update types
-            };
-
-            // HandleUpdateAsync and HandlePollingErrorAsync no worky Tyler help
-            botClient.StartReceiving(
-                updateHandler: HandleUpdateAsync,
-                pollingErrorHandler: HandlePollingErrorAsync,
-                receiverOptions: receiverOptions,
-                cancellationToken: cts.Token
-            );
-
-            
-            var me = await botClient.GetMeAsync();
-
-            Console.WriteLine($"Start listening for @{me.Username}");
-            while (true)
-            {
-                // Do nothing until the stuff happens
+                LogMessage("Telegram bot token is invalid! Exiting...");
             }
+            else if(ptInstance == "" || ptInstance == null || ptInstance == "PROXITOK INSTANCE URL")
+            {
+                LogMessage("Proxitok instance is invalid! Exiting...");
+            }
+            else
+            {
+                TelegramListener listener = new TelegramListener();
+                LogMessage("Now listening...");
 
-            cts.Cancel();
+                listener.RunListener();
+            }            
         }
 
-        async Task HandleUpdateAsync(ITelegramBotClient botClient, Update update, CancellationToken cancellationToken)
-        {
-            // Only process Message updates: https://core.telegram.org/bots/api#message
-            if (update.Message is not { } message)
-                return;
-            // Only process text messages
-            if (message.Text is not { } messageText)
-                return;
+        public static void LogMessage(string text)
+        {   
+            DateTime now =DateTime.Now;
 
-            var chatId = message.Chat.Id;
-
-            bool isUri = Uri.IsWellFormedUriString(message.ToString(), UriKind.RelativeOrAbsolute);
-
-            if (isUri)
-            {
-                Regex isTikTok = new Regex(@"(?x)(http(s)?:\/\/)?(?:www|m)\.(?:tiktok.com)\/(?:v|embed|trending)(?:\/)?(?:\?shareId=)?(?P<id>[\da-z]+)", RegexOptions.Singleline);
-            }
-
-            Console.WriteLine($"Received a '{messageText}' message in chat {chatId}.");
-
-            // Echo received message text
-            Message sentMessage = await botClient.SendTextMessageAsync(
-                chatId: chatId,
-                text: "You said:\n" + messageText,
-                cancellationToken: cancellationToken);
-        }
-
-        Task HandlePollingErrorAsync(ITelegramBotClient botClient, Exception exception, CancellationToken cancellationToken)
-        {
-            var ErrorMessage = exception switch
-            {
-                ApiRequestException apiRequestException
-                    => $"Telegram API Error:\n[{apiRequestException.ErrorCode}]\n{apiRequestException.Message}",
-                _ => exception.ToString()
-            };
-
-            Console.WriteLine(ErrorMessage);
-            return Task.CompletedTask;
+            Console.WriteLine("[" + now.ToString() + "] " + text);
         }
     }
 }

README.md

@@ -1,5 +1,31 @@
-[![Build Status](https://ci.kizaing.ca/api/badges/kizaing/TeleTok/status.svg)](https://ci.kizaing.ca/kizaing/TeleTok)
-
 # TeleTok Telegram Bot
+This bot will monitor any chats for TikTok links that are posted, and then will run the link through a [ProxiTok](https://github.com/pablouser1/ProxiTok) instance to generate a download link. The resulting video file will then get directly uploaded directly to your chat.
 
-This bot is in early development, but the end goal is to have this bot automatically convert all tiktok links in a chat into a videofile that can be re-uploaded to the telegram chat
+## Building
+Requirements: Dotnet SDK 6.0
+
+Run `dotnet build` for a Debug instance
+Run `dotnet publish` for a full release
+
+## Installation
+### Requirements
+ * A telegram bot token
+ * A working [ProxiTok](https://github.com/pablouser1/ProxiTok) instance, either public or hosted yourself. (Please be kind and take bandwidth into account when using a public instance)
+
+### Binary
+ 1. Either build the application or download a release zip for your OS/architecture
+ 2. Edit the config.json and put your telegram bot token in the "token" field, and your chosen ProxiTok instance in the "ptInstance" field
+ 3. Run the TeleTok.exe/TeleTok executable
+
+### Docker
+ 1. You can build an image for yourself with `docker build teletok .` or you can pull a prebuilt image with `docker pull kizaing/teletok:latest`
+ 2. Copy the placeholder config.json from the repo to a location of your choosing
+ 3. Edit the config.json and put your telegram bot token in the "token" field, and your chosen ProxiTok instance in the "ptInstance" field
+ 4. Run the container with `docker run -v ${PWD}/config.json:/app/teletok/config.json -d kizaing/teletok:latest`
+
+
+## To Do
+ - [x] Add better error and link handling
+ - [x] Process videos into telegram
+ - [ ] Add [Matrix](https://matrix.org) support
+ - [ ] Automate binary release publishing

TeleTok.csproj

@@ -10,7 +10,8 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="7.0.2" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
-    <PackageReference Include="Telegram.Bot" Version="18.0.0" />
+    <PackageReference Include="Telegram.Bot" Version="17.0.0" />
+    <PackageReference Include="Telegram.Bot.Extensions.Polling" Version="1.0.2" />
   </ItemGroup>
 
 </Project>

TelegramListener.cs

@@ -0,0 +1,84 @@
+using System;
+using System.Configuration;
+using Telegram.Bot;
+using Telegram.Bot.Exceptions;
+using Telegram.Bot.Extensions.Polling;
+using Telegram.Bot.Types;
+using Telegram.Bot.Types.Enums;
+
+namespace TeleTok
+{
+    public class TelegramListener
+    {
+        public void RunListener()
+        {
+            var botClient = new TelegramBotClient(TeleTok.token);
+            using var cts = new CancellationTokenSource();
+
+            // StartReceiving does not block the caller thread. Receiving is done on the ThreadPool.
+            ReceiverOptions receiverOptions = new ()
+            {
+                AllowedUpdates = Array.Empty<UpdateType>() // receive all update types
+            };
+
+            botClient.StartReceiving(
+                updateHandler: HandleUpdateAsync,
+                errorHandler: HandlePollingErrorAsync,
+                receiverOptions: receiverOptions,
+                cancellationToken: cts.Token
+            );
+
+            while (true)
+            {
+                // Do nothing until the stuff happens
+            };
+
+            cts.Cancel();
+        }
+
+        async Task HandleUpdateAsync(ITelegramBotClient botClient, Update update, CancellationToken cancellationToken)
+        {
+            // Only process Message updates: https://core.telegram.org/bots/api#message
+            if (update.Message is not { } message)
+                return;
+            // Only process text messages
+            if (message.Text is not { } messageText)
+                return;
+
+            var chatId = message.Chat.Id;
+
+            string proxyUrl;
+
+            // Checks if the text contains a valid URL
+            bool isUri = Uri.IsWellFormedUriString(messageText, UriKind.RelativeOrAbsolute);
+
+            // Passes the url along to the video downloader if it is valid AND a tiktok link
+            if (isUri)
+            {
+                if(messageText.Contains("tiktok.com"))
+                {
+                    proxyUrl = VidDownload.TikTokURL(messageText);
+
+                    Message ttVideo = await botClient.SendVideoAsync(
+                        chatId: chatId,
+                        video: proxyUrl,
+                        cancellationToken: cancellationToken
+                    );
+                }
+            }
+        }
+
+        Task HandlePollingErrorAsync(ITelegramBotClient botClient, Exception exception, CancellationToken cancellationToken)
+        {
+            var ErrorMessage = exception switch
+            {
+                ApiRequestException apiRequestException
+                    => $"Telegram API Error:\n[{apiRequestException.ErrorCode}]\n{apiRequestException.Message}",
+                _ => exception.ToString()
+            };
+
+            TeleTok.LogMessage(ErrorMessage);
+            return Task.CompletedTask;
+        }
+    }
+}

VidDownload.cs

@@ -1,10 +1,60 @@
 using System;
 using System.Diagnostics;
+using System.Net;
 
 namespace TeleTok
 {
     public class VidDownload
     {
-        
+        // Takes the scraped TikTok URL and appends it to the proxy downloader link then returns it
+        public static string TikTokURL(string videourl)
+        {
+            string url = videourl;
+            string proxyUrl;
+
+            TeleTok.LogMessage("Video for " + videourl + " processing..");
+
+            if(url.Contains("vm.tiktok.com"))
+            {
+                url = UnshortenUrl(url);
+            }
+
+            proxyUrl = CreateDownloadLink(url);
+
+            TeleTok.LogMessage("Sending video link for " + proxyUrl);
+
+            return proxyUrl;
+        }
+
+        // Runs the URL through a web request then returns the full url
+        static string UnshortenUrl(string videourl)
+        {
+            HttpWebRequest req = (HttpWebRequest)WebRequest.Create(videourl);
+            req.AllowAutoRedirect = false;
+            var resp = req.GetResponse();
+            string realUrl = resp.Headers["Location"];
+
+            return realUrl;
+        }
+
+        //Breaks apart the URL and extracts the User and Video ID to be processed into a working download link
+        static string CreateDownloadLink(string videourl)
+        {
+            Uri segmentedUri = new Uri(videourl);
+            segmentedUri = new Uri(segmentedUri.AbsoluteUri.Replace(segmentedUri.Query, string.Empty));
+
+            string videoUser = segmentedUri.Segments[1];
+            videoUser = videoUser.Replace(@"/", "");
+            string videoID = segmentedUri.Segments[3];
+
+            string fixedUrl = "https://www.tiktok.com/" + videoUser + "/video/" + videoID + @"&id=" + videoID + @"&user=" + videoUser.Remove(0, 1);
+
+            string proxyLink = TeleTok.ptInstance + "/download?url=" + fixedUrl;
+
+            TeleTok.LogMessage("Input User ID is: " + videoUser);
+            TeleTok.LogMessage("Input video ID is: " + videoID);
+
+            return proxyLink;
+        }
     }
 }

config.json

@@ -1,6 +1,6 @@
 {
     "TeleTokConf": {
         "token": "INSERT TOKEN HERE",
-        "port": 5000
+        "proxitokInstance": "PROXITOK INSTANCE URL"
     }
 }