Merge pull request #43 from flibusta-apps/dependabot/github_actions/github/codeql-action-4

Bump github/codeql-action from 3 to 4

.github/workflows/build_docker_image.yml

@@ -3,18 +3,16 @@ name: Build docker image
 on:
   push:
     branches:
-      - 'main'
+      - "main"
 
 jobs:
   Build-Docker-Image:
     runs-on: ubuntu-latest
     steps:
-      -
+      - name: Checkout
-        name: Checkout
+        uses: actions/checkout@v5
-        uses: actions/checkout@v4
 
-      -
+      - name: Set up Docker Buildx
-        name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
       - id: repository_name
@@ -22,16 +20,14 @@ jobs:
         with:
           string: ${{ github.repository }}
 
-      -
+      - name: Login to ghcr.io
-        name: Login to ghcr.io
         uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      -
+      - name: Build and push
-        name: Build and push
         id: docker_build
         uses: docker/build-push-action@v6
         env:
@@ -39,12 +35,11 @@ jobs:
         with:
           push: true
           platforms: linux/amd64
-          tags: ghcr.io/${{ env.IMAGE }}:latest
+          tags: ghcr.io/${{ env.IMAGE }}:latest,ghcr.io/${{ env.IMAGE }}:${{ github.sha }}
           context: .
           file: ./docker/production.dockerfile
 
-      -
+      - name: Invoke deployment hook
-        name: Invoke deployment hook
         uses: joelwmale/webhook-action@master
         with:
-          url: ${{ secrets.WEBHOOK_URL }}
+          url: ${{ secrets.WEBHOOK_URL }}?FILES_SERVER_TAG=${{ github.sha }}

.github/workflows/rust-clippy.yml

@@ -0,0 +1,55 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# rust-clippy is a tool that runs a bunch of lints to catch common
+# mistakes in your Rust code and help improve your Rust code.
+# More details at https://github.com/rust-lang/rust-clippy
+# and https://rust-lang.github.io/rust-clippy/
+
+name: rust-clippy analyze
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ "main" ]
+  schedule:
+    - cron: '22 1 * * 1'
+
+jobs:
+  rust-clippy-analyze:
+    name: Run rust-clippy analyzing
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      security-events: write
+      actions: read # only required for a private repository by github/codeql-action/upload-sarif to get the Action run status
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v5
+
+      - name: Install Rust toolchain
+        uses: actions-rs/toolchain@16499b5e05bf2e26879000db0c1d13f7e13fa3af #@v1
+        with:
+          profile: minimal
+          toolchain: stable
+          components: clippy
+          override: true
+
+      - name: Install required cargo
+        run: cargo install clippy-sarif sarif-fmt
+
+      - name: Run rust-clippy
+        run:
+          cargo clippy
+          --all-features
+          --message-format=json | clippy-sarif | tee rust-clippy-results.sarif | sarif-fmt
+        continue-on-error: true
+
+      - name: Upload analysis results to GitHub
+        uses: github/codeql-action/upload-sarif@v4
+        with:
+          sarif_file: rust-clippy-results.sarif
+          wait-for-processing: true

Cargo.toml

@@ -3,28 +3,43 @@ name = "telegram_files_server"
 version = "0.1.0"
 edition = "2021"
 
+
+[profile.release]
+opt-level = 3
+debug = false
+strip = true
+lto = true
+codegen-units = 1
+panic = 'abort'
+
+[profile.profiling]
+inherits = "release"
+debug = true
+strip = false
+
+
 [dependencies]
 serde = "1.0.219"
 serde_json = "1.0.140"
 
 axum = { version = "0.8.1", features = ["multipart"] }
-axum_typed_multipart = "0.15.1"
+axum_typed_multipart = "0.16.3"
 
 tracing = "0.1.41"
 tracing-subscriber = { version = "0.3.19", features = ["env-filter"]}
 tower-http = { version = "0.6.2", features = ["trace"] }
-sentry-tracing = "0.36.0"
+sentry-tracing = "0.42.0"
 
 tokio = { version = "1.44.2", features = [ "full" ] }
 tokio-util = { version = "0.7.14", features = [ "full" ] }
-axum-prometheus = "0.8.0"
+axum-prometheus = "0.9.0"
 
 futures = "0.3.31"
 
 once_cell = "1.21.1"
-teloxide = { git = "https://github.com/teloxide/teloxide.git" }
+teloxide = "0.17.0"
 
-sentry = "0.36.0"
+sentry = "0.42.0"
 
 dotenvy = "0.15.7"
 

src/core/file_utils.rs

@@ -1,6 +1,7 @@
 use std::error::Error;
 
 use axum::body::Bytes;
+use moka::future::Cache;
 use once_cell::sync::Lazy;
 use serde::Serialize;
 use teloxide::{
@@ -9,7 +10,6 @@ use teloxide::{
 };
 use tokio::fs::File;
 use tracing::log;
-use moka::future::Cache;
 
 use super::bot::ROUND_ROBIN_BOT;
 use crate::config::CONFIG;
@@ -44,7 +44,6 @@ pub static TEMP_FILES_CACHE: Lazy<Cache<i32, MessageId>> = Lazy::new(|| {
         .build()
 });
 
-
 pub async fn upload_file(
     file: Bytes,
     filename: String,
@@ -70,7 +69,6 @@ pub async fn upload_file(
     }
 }
 
-
 pub async fn download_file(chat_id: i64, message_id: i32) -> Result<Option<File>, Box<dyn Error>> {
     let bot = ROUND_ROBIN_BOT.get_bot();
 
@@ -84,16 +82,12 @@ pub async fn download_file(chat_id: i64, message_id: i32) -> Result<Option<File>
     {
         Ok(v) => v,
         Err(err) => {
-            if let teloxide::RequestError::Api(ref err) = err {
+            if let teloxide::RequestError::Api(teloxide::ApiError::MessageToForwardNotFound) = err {
-                if let teloxide::ApiError::MessageToForwardNotFound = err {
+                return Ok(None);
-                    return Ok(None);
-                }
             }
 
-            if let teloxide::RequestError::Api(ref err) = err {
+            if let teloxide::RequestError::Api(teloxide::ApiError::MessageIdInvalid) = err {
-                if let teloxide::ApiError::MessageIdInvalid = err {
+                return Ok(None);
-                    return Ok(None);
-                }
             }
 
             log::error!("Error: {}", err);
@@ -103,7 +97,9 @@ pub async fn download_file(chat_id: i64, message_id: i32) -> Result<Option<File>
 
     let file_id = forwarded_message.document().unwrap().file.id.clone();
 
-    TEMP_FILES_CACHE.insert(message_id, forwarded_message.id).await;
+    TEMP_FILES_CACHE
+        .insert(message_id, forwarded_message.id)
+        .await;
 
     let path = match bot.get_file(file_id.clone()).await {
         Ok(v) => v.path,
@@ -116,7 +112,6 @@ pub async fn download_file(chat_id: i64, message_id: i32) -> Result<Option<File>
     Ok(Some(File::open(path).await?))
 }
 
-
 pub async fn clean_files() -> Result<(), Box<dyn Error>> {
     let bots_folder = "/var/lib/telegram-bot-api/";
     let documents_folder_name = "documents";