ReVanced/revanced-discord-bot
1
0
Fork 0
mirror of https://github.com/revanced/revanced-discord-bot.git synced 2025-05-06 17:24:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

feat: simplify code block embeds

Browse Source
This commit is contained in:
oSumAtrIX 2023-01-07 00:02:19 +01:00
parent fd4bf5a6b7
commit 8376eb9b4e
No known key found for this signature in database
GPG Key ID: A9B3094ACDB604B4
2 changed files with 24 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/events/message_create.rs
View File

@ -1,6 +1,6 @@
use super::*; use super::*;
use crate::utils::autorespond::auto_respond; use crate::utils::autorespond::auto_respond;
use crate::utils::code_embed::utils::handle_code_url; use crate::utils::code_embed::utils::code_preview;
use crate::utils::media_channel::handle_media_channel; use crate::utils::media_channel::handle_media_channel;
pub async fn message_create(ctx: &serenity::Context, new_message: &serenity::Message) { pub async fn message_create(ctx: &serenity::Context, new_message: &serenity::Message) {
@ -12,5 +12,5 @@ pub async fn message_create(ctx: &serenity::Context, new_message: &serenity::Mes
auto_respond(ctx, new_message).await; auto_respond(ctx, new_message).await;
handle_code_url(ctx, new_message).await; code_preview(ctx, new_message).await;
} }

70
src/utils/code_embed/utils.rs
View File

@ -1,12 +1,11 @@
use chrono::Utc;
use reqwest::Url; use reqwest::Url;
use tracing::{debug, error}; use tracing::{debug, error, trace};
use super::*; use super::*;
use crate::utils::bot::get_data_lock; use crate::utils::bot::get_data_lock;
use crate::utils::code_embed::url_parser::{CodePreview, CodeUrlParser, GitHubCodeUrl}; use crate::utils::code_embed::url_parser::{CodePreview, CodeUrlParser, GitHubCodeUrl};
pub async fn handle_code_url(ctx: &serenity::Context, new_message: &serenity::Message) { pub async fn code_preview(ctx: &serenity::Context, new_message: &serenity::Message) {
let data_lock = get_data_lock(ctx).await; let data_lock = get_data_lock(ctx).await;
let configuration = &data_lock.read().await.configuration; let configuration = &data_lock.read().await.configuration;
@ -55,8 +54,12 @@ pub async fn handle_code_url(ctx: &serenity::Context, new_message: &serenity::Me
}; };
match code_url.parse().await { match code_url.parse().await {
Err(e) => error!("Failed to parse url: {} ({:?})", url, e), Err(e) => trace!("Failed to parse url: {} ({:?})", url, e),
Ok(code_preview) => code_previews.push(code_preview), Ok(code_preview) => {
if code_preview.preview.is_some() {
code_previews.push(code_preview)
}
},
} }
} }
@ -66,53 +69,23 @@ pub async fn handle_code_url(ctx: &serenity::Context, new_message: &serenity::Me
if let Err(err) = new_message if let Err(err) = new_message
.channel_id .channel_id
.send_message(&ctx.http, |m| { .send_message(&ctx.http, |message| {
let mut message = m; let mut message = message.reference_message(new_message);
let icon_url = &new_message.guild(&ctx.cache).unwrap().icon_url();
for code_preview in code_previews { for code_preview in code_previews {
message = message.add_embed(|e| { message = message.add_embed(|embed| {
let mut e = e if let Some(url) = icon_url {
.title("Source code") embed.footer(|f| f.text("ReVanced").icon_url(url))
.url(code_preview.code.original_code_url) } else {
.color(configuration.general.embed_color) embed
.field(
"Raw link",
format!("[Click here]({})", code_preview.code.raw_code_url),
true,
)
.field("Branch/Sha", code_preview.code.branch_or_sha, true);
if let Some(preview) = code_preview.preview {
e = e.field("Preview", preview, false)
} }
.color(configuration.general.embed_color)
let guild = &new_message.guild(&ctx.cache).unwrap(); .description(code_preview.preview.unwrap())
if let Some(url) = &guild.icon_url() {
e = e.footer(|f| {
f.icon_url(url).text(format!(
"{} • {}",
guild.name,
Utc::today().format("%Y/%m/%d")
))
})
}
e.field(
format!("Original message by {}", new_message.author.tag()),
new_message.content.clone(),
false,
)
}); });
} }
message.content( message
new_message
.mentions
.iter()
.map(|m| format!("<@{}>", m.id))
.collect::<Vec<_>>()
.join(" "),
)
}) })
.await .await
{ {
@ -121,9 +94,10 @@ pub async fn handle_code_url(ctx: &serenity::Context, new_message: &serenity::Me
new_message.author.tag(), new_message.author.tag(),
err err
); );
return;
} }
if let Err(err) = new_message.delete(&ctx.http).await { if let Err(err) = new_message.clone().suppress_embeds(&ctx.http).await {
error!("Failed to delete the message. Error: {:?}", err); error!("Failed to remove embeds. Error: {:?}", err);
} }
} }