Upgrade to Nim 2.0

Signed-off-by: baalajimaestro <me@baalajimaestro.me>

Dockerfile

@@ -1,37 +1,57 @@
-FROM nimlang/nim:alpine as builder
+FROM nimlang/nim:2.0.0-alpine as builder
 
-RUN apk update && apk add git \
+RUN apk update && apk add autoconf \
-                          build-base \
+                          automake \
-                          curl \
                           bash \
-                          openssl \
+                          build-base \
-                          openssl-dev \
+                          cmake \
-                          openssl-libs-static \
+                          curl \
+                          git \
+                          libtool \
+                          ninja \
+                          perl \
                           sqlite-dev \
                           sqlite-static
 
+
+ENV LIBRESSL_VERSION v3.8.0
+
+# Compile LibreSSL Portable from source
+RUN git clone https://github.com/libressl/portable --depth=1 -b ${LIBRESSL_VERSION} libressl && \
+    cd libressl && \
+    ./autogen.sh && \
+    mkdir build-ninja && \
+    cd build-ninja && \
+    cmake -G"Ninja" .. && \
+    ninja
+
 COPY . /app
 WORKDIR /app
 
-RUN nimble install nimble --accept
-
 # Build with necessary params to enable statically linking openssl, glibc and sqlite3
-RUN /root/.nimble/bin/nimble build --passL:-L/usr/lib \
+RUN nimble build --passL:-L/usr/lib \
-                            -d:ssl \
+                 -d:ssl \
-                            -p:. \
+                 -d:libressl \
-                            --dynlibOverride:ssl \
+                 -p:. \
-                            --dynlibOverride:crypto \
+                 --dynlibOverride:ssl \
-                            --dynlibOverride:sqlite3 \
+                 --dynlibOverride:crypto \
-                            --passl:-lssl \
+                 --dynlibOverride:sqlite3 \
-                            --passl:-lsqlite3 \
+                 --dynlibOverride:tls \
-                            --passl:-lcrypto \
+                 --passl:-lssl \
-                            --passL:-static \
+                 --passl:-lsqlite3 \
-                            --passL:"-flto" \
+                 --passl:-lcrypto \
-                            -d:release \
+                 --passl:-ltls \
-                            --opt:speed \
+                 --passL:-L/libressl/build-ninja/ssl \
-                            --mm:orc \
+                 --passL:-L/libressl/build-ninja/crypto \
-                            --deepcopy=on \
+                 --passL:-L/libressl/build-ninja/tls \
-                            --accept
+                 --passL:-static \
+                 --passL:"-flto" \
+                 -d:release \
+                 --opt:speed \
+                 --mm:orc \
+                 --threadAnalysis:off \
+                 --deepcopy=on \
+                 --accept
 
 RUN strip -s /app/nim_censor_bot && \
     strip -R .comment -R .note -R .note.ABI-tag /app/nim_censor_bot

nim_censor_bot.nimble

@@ -1,6 +1,6 @@
 # Package
 
-version       = "0.2.0"
+version       = "0.3.0"
 author        = "baalajimaestro"
 description   = "Censor Bot for Telegram written in Nim"
 license       = "AGPL-3.0-or-later"
@@ -10,6 +10,6 @@ bin           = @["nim_censor_bot"]
 
 # Dependencies
 
-requires "nim >= 1.6.0"
+requires "nim >= 2.0.0"
-requires "telebot >= 2023.04.13"
+requires "telebot >= 2023.08.20"
-requires "norm >= 2.8.0"
+requires "norm >= 2.8.1"

src/nim_censor_bot.nim

@@ -1,6 +1,6 @@
 
 #
-# Copyright © 2022 Maestro Creativescape
+# Copyright © 2022-23 Maestro Creativescape
 #
 # SPDX-License-Identifier: AGPL-3.0-or-later
 #
@@ -209,8 +209,8 @@ proc inlineHandler(b: Telebot, u: InlineQuery): Future[bool]{.gcsafe, async.} =
             res.inputMessageContent = InputMessageContent(kind: TextMessage,
                   messageText:"*NSFW " &
                   capitalizeAscii(ftype) &
-                  "*\n\n[Tap to View](tg://resolve?domain=" &
+                  "*\n\n[Tap to View](https://t.me/" &
-                  b.username & "&start=" &
+                  b.username & "?start=" &
                   u.query &
                   ")",
                   parseMode: some("Markdown")).some
@@ -274,12 +274,13 @@ proc updateHandler(b: Telebot, u: Update): Future[bool] {.async, gcsafe.} =
               discard await b.sendMessage(response.chat.id,
                   "*NSFW " & 
                   "Album" &
-                  "*\n\n[Tap to View](tg://resolve?domain=" &
+                  "*\n\n[Tap to View](https://t.me/" &
                   b.username &
-                  "&start=" &
+                  "?start=" &
                   filehash &
                   ")",
                   replyMarkup = replymark,
+                  disableWebPagePreview=true,
                   parseMode="Markdown")
             else:
               let filehash = GroupMedia[parseInt(response.mediaGroupId.get)]
@@ -297,12 +298,13 @@ proc updateHandler(b: Telebot, u: Update): Future[bool] {.async, gcsafe.} =
             discard await b.sendMessage(response.chat.id,
                 "*NSFW " & 
                 capitalizeAscii(ftype) &
-                "*\n\n[Tap to View](tg://resolve?domain=" &
+                "*\n\n[Tap to View](https://t.me/" &
                 b.username &
-                "&start=" &
+                "?start=" &
                 filehash &
                 ")",
                 replyMarkup = replymark,
+                disableWebPagePreview=true,
                 parseMode="Markdown")
       OldDataCleanup()