From d81b815a12ab1fb0a1a64c57449aa63a9a5b6ae4 Mon Sep 17 00:00:00 2001 From: trivernis Date: Mon, 19 Apr 2021 11:52:40 +0200 Subject: [PATCH 1/3] Remove thumbnails from now playing message in nsfw channels Signed-off-by: trivernis --- src/messages/music/now_playing.rs | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/src/messages/music/now_playing.rs b/src/messages/music/now_playing.rs index 3f37bed..2e8a7c8 100644 --- a/src/messages/music/now_playing.rs +++ b/src/messages/music/now_playing.rs @@ -34,6 +34,7 @@ pub async fn create_now_playing_msg( channel_id: ChannelId, ) -> BotResult>> { log::debug!("Creating now playing menu"); + let nsfw = channel_id.to_channel(ctx).await?.is_nsfw(); let handle = MenuBuilder::default() .add_control(-1, DELETE_BUTTON, |c, m, r| { Box::pin(delete_action(c, m, r)) @@ -68,7 +69,9 @@ pub async fn create_now_playing_msg( let mut page = CreateMessage::default(); if let Some((current, _)) = queue.current() { - page.embed(|e| create_now_playing_embed(current.metadata(), e, queue.paused())); + page.embed(|e| { + create_now_playing_embed(current.metadata(), e, queue.paused(), nsfw) + }); } else { page.embed(|e| e.description("Queue is empty")); } @@ -97,10 +100,11 @@ pub async fn update_now_playing_msg( log::debug!("Updating now playing message"); let handle = handle.read().await; let mut message = handle.get_message(http).await?; + let nsfw = http.get_channel(handle.channel_id).await?.is_nsfw(); message .edit(http, |m| { - m.embed(|e| create_now_playing_embed(meta, e, paused)) + m.embed(|e| create_now_playing_embed(meta, e, paused, nsfw)) }) .await?; log::debug!("Message updated."); @@ -113,6 +117,7 @@ fn create_now_playing_embed<'a>( meta: &Metadata, mut embed: &'a mut CreateEmbed, paused: bool, + nsfw: bool, ) -> &'a mut CreateEmbed { embed = embed .title(if paused { "Paused" } else { "Playing" }) @@ -129,8 +134,10 @@ fn create_now_playing_embed<'a>( )) }); - if let Some(thumb) = meta.thumbnail.clone() { - embed = embed.thumbnail(thumb); + if nsfw { + if let Some(thumb) = meta.thumbnail.clone() { + embed = embed.thumbnail(thumb); + } } embed From a4d58d33f6e66b7a164a0a50c7d96a5f4fc2944b Mon Sep 17 00:00:00 2001 From: Trivernis Date: Mon, 19 Apr 2021 11:15:15 +0000 Subject: [PATCH 2/3] Docker integration (#23) * Add Dockerfile Signed-off-by: trivernis * Fix docker build Signed-off-by: trivernis * Remove build-essential package from runtime container Signed-off-by: trivernis * Swap postgresql-client for libpq5 in docker build Signed-off-by: trivernis * Add docker action Signed-off-by: trivernis --- .dockerignore | 2 ++ .github/workflows/build-docker.yml | 47 ++++++++++++++++++++++++++++++ Dockerfile | 24 +++++++++++++++ bot-database/src/lib.rs | 11 +++++-- src/main.rs | 6 +++- 5 files changed, 86 insertions(+), 4 deletions(-) create mode 100644 .dockerignore create mode 100644 .github/workflows/build-docker.yml create mode 100644 Dockerfile diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000..796603f --- /dev/null +++ b/.dockerignore @@ -0,0 +1,2 @@ +target +.env \ No newline at end of file diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml new file mode 100644 index 0000000..1027958 --- /dev/null +++ b/.github/workflows/build-docker.yml @@ -0,0 +1,47 @@ +name: Build and Test + +on: + workflow_dispatch: + push: + branches: [ main, actions ] + +env: + CARGO_TERM_COLOR: always + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + - name: Set up toolchain + uses: actions-rs/toolchain@v1 + with: + toolchain: stable + override: true + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v1 + - name: Cache Docker layers + uses: actions/cache@v2 + with: + path: /tmp/.buildx-cache + key: ${{ runner.os }}-buildx-${{ hashFiles('Cargo.lock') }} + restore-keys: | + ${{ runner.os }}-buildx- + - name: Login to DockerHub + uses: docker/login-action@v1 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + - name: Build and push + uses: docker/build-push-action@v2 + with: + context: . + file: ./Dockerfile + platforms: ${{github.event.inputs.platforms}} + push: true + cache-from: type=local,src=/tmp/.buildx-cache + cache-to: type=local,dest=/tmp/.buildx-cache + tags: | + trivernis/tobi:latest \ No newline at end of file diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..fa0dc9d --- /dev/null +++ b/Dockerfile @@ -0,0 +1,24 @@ +# syntax=docker/dockerfile:1.0-experimental +FROM rust:latest AS builder +RUN apt-get update +RUN apt-get install -y build-essential libssl-dev libopus-dev libpq-dev +WORKDIR /usr/src +RUN USER=root cargo new tobi +WORKDIR /usr/src/tobi +COPY Cargo.toml Cargo.lock ./ +COPY src ./src +COPY bot-coreutils ./bot-coreutils +COPY bot-database ./bot-database +COPY bot-serenityutils ./bot-serenityutils +RUN --mount=type=cache,target=/usr/local/cargo/registry \ + --mount=type=cache,target=target \ + cargo build --release +RUN mkdir /tmp/tobi +RUN --mount=type=cache,target=target cp target/release/tobi-rs /tmp/tobi/ + +FROM bitnami/minideb:latest +RUN install_packages openssl libopus0 ffmpeg python3 python3-pip libpq5 +RUN pip3 install youtube-dl +RUN rm -rf /var/lib/{apt,dpkg,cache,log}/ +COPY --from=builder /tmp/tobi/tobi-rs . +ENTRYPOINT ["/tobi-rs"] \ No newline at end of file diff --git a/bot-database/src/lib.rs b/bot-database/src/lib.rs index 831a1c2..364a7ab 100644 --- a/bot-database/src/lib.rs +++ b/bot-database/src/lib.rs @@ -4,9 +4,9 @@ extern crate diesel; #[macro_use] extern crate diesel_migrations; -use crate::error::DatabaseResult; +use crate::error::{DatabaseError, DatabaseResult}; use diesel::prelude::*; -use diesel::r2d2::{ConnectionManager, Pool}; +use diesel::r2d2::{ConnectionManager, ManageConnection, Pool}; use std::env; pub mod database; @@ -22,11 +22,16 @@ type PoolConnection = Pool>; embed_migrations!("../bot-database/migrations"); fn get_connection() -> DatabaseResult { - dotenv::dotenv()?; let database_url = env::var("DATABASE_URL").expect("No DATABASE_URL in path"); log::debug!("Establishing database connection..."); let manager = ConnectionManager::::new(database_url); + log::trace!("Connecting..."); + manager + .connect() + .map_err(|e| DatabaseError::Msg(format!("{:?}", e)))?; + log::trace!("Creating pool..."); let pool = Pool::builder().max_size(16).build(manager)?; + log::trace!("Getting one connection to run migrations..."); let connection = pool.get()?; log::debug!("Running migrations..."); embedded_migrations::run(&connection)?; diff --git a/src/main.rs b/src/main.rs index 946cf23..8e9fd01 100644 --- a/src/main.rs +++ b/src/main.rs @@ -15,8 +15,12 @@ pub static VERSION: &str = env!("CARGO_PKG_VERSION"); #[tokio::main] async fn main() { + let _ = dotenv::dotenv(); init_logger(); - let mut client = get_client().await.unwrap(); + let mut client = get_client() + .await + .map_err(|e| log::error!("Failed to get client: {:?}", e)) + .expect("Failed to get client"); // start listening for events by starting a single shard if let Err(why) = client.start_autosharded().await { From 4b5d222f556bed6eaa223b2782cebf8292e8b276 Mon Sep 17 00:00:00 2001 From: trivernis Date: Mon, 19 Apr 2021 13:19:09 +0200 Subject: [PATCH 3/3] Bump version Signed-off-by: trivernis --- Cargo.lock | 2 +- Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d261251..62ab676 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2483,7 +2483,7 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tobi-rs" -version = "0.6.5" +version = "0.6.6" dependencies = [ "aspotify", "bot-coreutils", diff --git a/Cargo.toml b/Cargo.toml index 66d7500..998ba74 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tobi-rs" -version = "0.6.5" +version = "0.6.6" authors = ["trivernis "] edition = "2018"