Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,882 changes: 1,135 additions & 747 deletions Cargo.lock

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,16 @@
name = "tabletbot"
version = "1.0.0"
authors = [ "InfinityGhost" ]
edition = "2021"
edition = "2024"

[dependencies]
# Serialization
serde = { version = "1.0", features = ["derive"] }
serde_json = { version = "1.0" }

# Discord API
poise = "0.6"
serenity = "0.12"
poise = { git = "https://github.com/serenity-rs/poise", branch = "next" }
serenity = { git = "https://github.com/serenity-rs/serenity", branch = "next" }
tokio = { version = "1.29.1", features = ["macros", "signal", "rt-multi-thread"] }

# Misc
Expand Down
4 changes: 2 additions & 2 deletions src/commands/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ use to_arraystring::ToArrayString;

use crate::{Context, Error};

use poise::CreateReply;
use poise::serenity_prelude::{
self as serenity, Colour, ComponentInteraction, ComponentInteractionCollector, CreateActionRow,
CreateButton, CreateEmbed, CreateEmbedFooter, CreateInteractionResponse,
CreateInteractionResponseMessage,
};
use poise::CreateReply;

#[poise::command(prefix_command, hide_in_help)]
pub async fn register(ctx: Context<'_>) -> Result<(), Error> {
Expand Down Expand Up @@ -137,7 +137,7 @@ pub async fn paginate_lists(
if pages.len() > 1 {
while let Some(press) = ComponentInteractionCollector::new(ctx)
.filter(move |press| press.data.custom_id.starts_with(&ctx_id.to_string()))
.timeout(std::time::Duration::from_secs(180))
.timeout(std::time::Duration::from_mins(3))
.await
{
match Kind::from_id(&press.data.custom_id, &ctx_id) {
Expand Down
23 changes: 13 additions & 10 deletions src/commands/snippets.rs
Original file line number Diff line number Diff line change
@@ -1,19 +1,18 @@
use crate::{
Context, Error,
commands::{respond_embed, respond_err, respond_ok},
structures::{Embeddable, Snippet},
Context, Error,
};
use ::serenity::futures::{Stream, StreamExt};
use poise::serenity_prelude::{
self as serenity, futures, CreateAttachment, CreateEmbed, CreateInteractionResponse,
CreateInteractionResponseMessage,
self as serenity, AutocompleteChoice, CreateAttachment, CreateAutocompleteResponse,
CreateEmbed, CreateInteractionResponse, CreateInteractionResponseMessage,
};

#[allow(clippy::unused_async)]
async fn autocomplete_snippet<'a>(
ctx: Context<'a>,
partial: &'a str,
) -> impl Stream<Item = String> + 'a {
) -> CreateAutocompleteResponse {
let snippet_list: Vec<String> = {
ctx.data()
.state
Expand All @@ -25,9 +24,13 @@ async fn autocomplete_snippet<'a>(
.collect()
};

futures::stream::iter(snippet_list).filter(move |name| {
futures::future::ready(name.to_lowercase().contains(&partial.to_lowercase()))
})
CreateAutocompleteResponse::new().set_choices(
snippet_list
.iter()
.filter(|name| name.to_lowercase().contains(&partial.to_lowercase()))
.map(|name| AutocompleteChoice::new(name, name.clone()))
.collect(),
)
}

/// Show a snippet
Expand Down Expand Up @@ -131,7 +134,7 @@ pub async fn edit_snippet(
let content = &&format!("The snippet '{id}' does not exist");
respond_err(&ctx, title, content).await;
}
};
}

Ok(())
}
Expand Down Expand Up @@ -299,7 +302,7 @@ async fn remove_snippet_confirm(ctx: &Context<'_>, snippet: &Snippet) -> Result<

while let Some(press) = serenity::ComponentInteractionCollector::new(ctx)
.filter(move |press| press.data.custom_id.starts_with(&ctx_id.to_string()))
.timeout(std::time::Duration::from_secs(60))
.timeout(std::time::Duration::from_mins(1))
.await
{
if press.data.custom_id == delete_id {
Expand Down
2 changes: 1 addition & 1 deletion src/commands/udev.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ use crate::{Context, Error};

use std::fmt::Write;

use poise::serenity_prelude::{CreateAttachment, CreateEmbed};
use poise::CreateReply;
use poise::serenity_prelude::{CreateAttachment, CreateEmbed};

/// Generates udev rules for the given vendor and product Ids.
#[poise::command(
Expand Down
33 changes: 20 additions & 13 deletions src/commands/utils.rs
Original file line number Diff line number Diff line change
@@ -1,20 +1,19 @@
use std::sync::OnceLock;

use crate::{
Context, Error,
commands::{respond_embed, respond_err, respond_ok},
structures::RepositoryDetails,
Context, Error,
};

use poise::serenity_prelude::{Colour, CreateEmbed, CreateEmbedFooter, EditMessage, Message};
use poise::serenity_prelude::{
AutocompleteChoice, Colour, CreateAutocompleteResponse, CreateEmbed, CreateEmbedFooter,
EditMessage, Message, MessageInteractionMetadata,
};
use regex::Regex;
use serenity::futures::{self, Stream, StreamExt};

#[allow(clippy::unused_async)]
async fn autocomplete_key<'a>(
ctx: Context<'a>,
partial: &'a str,
) -> impl Stream<Item = String> + 'a {
async fn autocomplete_key<'a>(ctx: Context<'a>, partial: &'a str) -> CreateAutocompleteResponse {
let snippet_list: Vec<String> = {
ctx.data()
.state
Expand All @@ -26,8 +25,13 @@ async fn autocomplete_key<'a>(
.collect()
};

futures::stream::iter(snippet_list)
.filter(move |name| futures::future::ready(name.contains(partial)))
CreateAutocompleteResponse::new().set_choices(
snippet_list
.iter()
.filter(|name| name.contains(partial))
.map(|name| AutocompleteChoice::new(name, name.clone()))
.collect(),
)
}

/// Create an embed in the current channel.
Expand Down Expand Up @@ -150,10 +154,13 @@ pub async fn edit_embed(
"I am not the author of the specified message!",
)
.await;
return Ok(());
}

if let Some(interaction) = message.interaction {
if interaction.name == "embed" {
if let Some(interaction) = message.interaction_metadata
&& let MessageInteractionMetadata::Command(_) = *interaction
{
if !message.embeds.is_empty() {
// Embed for checking reasons.
let embed = &message.embeds[0];
let mut embedb = CreateEmbed::default();
Expand Down Expand Up @@ -258,7 +265,7 @@ pub async fn edit_embed(
"This message is not an interaction!",
)
.await;
};
}

Ok(())
}
Expand Down Expand Up @@ -346,7 +353,7 @@ pub async fn remove_repo(
let content = format!("The key '{key}' does not exist.");
respond_err(&ctx, title, &content).await;
}
};
}

Ok(())
}
Expand Down
16 changes: 6 additions & 10 deletions src/events/code.rs
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,10 @@ async fn http_get_body_text(url: &String) -> Option<String> {
}

fn try_parse<F: FromStr + Clone>(m: Option<Match>) -> Option<F> {
if let Some(m) = m {
if let Ok(f) = m.as_str().parse::<F>() {
return Some(f.to_owned());
}
if let Some(m) = m
&& let Ok(f) = m.as_str().parse::<F>()
{
return Some(f.to_owned());
}

None
Expand All @@ -79,7 +79,7 @@ struct FileReference<'a> {
}

impl FileReference<'_> {
pub fn try_from_str(text: &str) -> Option<Vec<FileReference>> {
pub fn try_from_str(text: &str) -> Option<Vec<FileReference<'_>>> {
let r = get_file_reference_regex();

let files: Vec<FileReference> = r
Expand All @@ -94,11 +94,7 @@ impl FileReference<'_> {
})
.collect();

if files.is_empty() {
None
} else {
Some(files)
}
if files.is_empty() { None } else { Some(files) }
}

pub async fn create_embed(&self) -> Option<CreateEmbed> {
Expand Down
32 changes: 16 additions & 16 deletions src/events/issues/mod.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use std::{sync::OnceLock, time::Duration};

use crate::{commands::interaction_err, structures::Embeddable, Data};
use crate::{Data, commands::interaction_err, structures::Embeddable};

use arrayvec::ArrayString;
use poise::serenity_prelude::{
Expand Down Expand Up @@ -55,9 +55,11 @@ pub async fn message(data: &Data, ctx: &Context, message: &Message) {
hide_body_id.push_str(&ctx_id);
hide_body_id.push_str("hide_body");

let remove = CreateActionRow::Buttons(vec![CreateButton::new(&*remove_id)
.label("delete")
.style(ButtonStyle::Danger)]);
let remove = CreateActionRow::Buttons(vec![
CreateButton::new(&*remove_id)
.label("delete")
.style(ButtonStyle::Danger),
]);

let components = serenity::CreateActionRow::Buttons(vec![
CreateButton::new(&*remove_id)
Expand All @@ -77,13 +79,13 @@ pub async fn message(data: &Data, ctx: &Context, message: &Message) {
let mut body_hid = false;
while let Some(press) = serenity::ComponentInteractionCollector::new(ctx)
.filter(move |press| press.data.custom_id.starts_with(&*ctx_id))
.timeout(Duration::from_secs(60))
.timeout(Duration::from_mins(1))
.await
{
let has_perms = press.member.as_ref().map_or(false, |member| {
member.permissions.map_or(false, |member_perms| {
member_perms.contains(Permissions::MANAGE_MESSAGES)
})
let has_perms = press.member.as_ref().is_some_and(|member| {
member
.permissions
.is_some_and(|member_perms| member_perms.contains(Permissions::MANAGE_MESSAGES))
});

// Users who do not own the message or have permissions cannot execute the interactions.
Expand Down Expand Up @@ -137,12 +139,10 @@ pub async fn message(data: &Data, ctx: &Context, message: &Message) {
}

// Triggers on timeout.
if !msg_deleted {
if let Ok(mut msg) = msg_result {
let _ = msg
.edit(ctx, serenity::EditMessage::default().components(vec![]))
.await;
}
if !msg_deleted && let Ok(mut msg) = msg_result {
let _ = msg
.edit(ctx, serenity::EditMessage::default().components(vec![]))
.await;
}
}
}
Expand Down Expand Up @@ -172,7 +172,7 @@ async fn issue_embeds(data: &Data, message: &Message) -> Option<Vec<CreateEmbed>
prs = client.pulls(owner, repo);
} else {
continue; // discards when it doesn't match a repo.
};
}
}

let ratelimit = ratelimit
Expand Down
18 changes: 9 additions & 9 deletions src/events/issues/utils.rs
Original file line number Diff line number Diff line change
Expand Up @@ -144,15 +144,15 @@ impl Document for PullRequest {
}

fn get_labels(&self) -> Option<String> {
if let Some(labels) = &self.labels {
if !labels.is_empty() {
let labels = labels
.iter()
.map(|l| l.name.clone())
.collect::<Vec<String>>();

return Some(format!("`{}`", labels.join("`, `")));
}
if let Some(labels) = &self.labels
&& !labels.is_empty()
{
let labels = labels
.iter()
.map(|l| l.name.clone())
.collect::<Vec<String>>();

return Some(format!("`{}`", labels.join("`, `")));
}

None
Expand Down
1 change: 0 additions & 1 deletion src/events/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ pub mod issues;
pub async fn event_handler(
ctx: &serenity::Context,
event: &serenity::FullEvent,
_framework: poise::FrameworkContext<'_, Data, Error>,
data: &Data,
) -> Result<(), Error> {
#[allow(clippy::single_match)]
Expand Down
14 changes: 10 additions & 4 deletions src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ async fn main() {
prefix_options: poise::PrefixFrameworkOptions {
prefix: Some("!".into()),
edit_tracker: Some(Arc::new(poise::EditTracker::for_timespan(
Duration::from_secs(600),
Duration::from_mins(10),
))),
..Default::default()
},
Expand All @@ -111,8 +111,12 @@ async fn main() {
},

skip_checks_for_owners: false,
event_handler: |ctx, event: &serenity::FullEvent, framework, data| {
Box::pin(events::event_handler(ctx, event, framework, data))
event_handler: |ctx, event: &serenity::FullEvent| {
Box::pin(events::event_handler(
ctx.serenity_context,
event,
ctx.user_data,
))
},
..Default::default()
};
Expand All @@ -129,7 +133,9 @@ async fn main() {
| GatewayIntents::DIRECT_MESSAGES
| GatewayIntents::MESSAGE_CONTENT;

let mut client = serenity::Client::builder(discord_token, intents)
let http = serenity::Http::new(&discord_token);

let mut client = serenity::ClientBuilder::new_with_http(http, intents)
.framework(framework)
.await
.unwrap();
Expand Down
8 changes: 4 additions & 4 deletions src/structures.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use poise::serenity_prelude::CreateEmbed;
use poise::serenity_prelude::prelude::TypeMapKey;
use serde::{Deserialize, Serialize};
use serde_json::{from_reader, to_writer_pretty};
use serenity::builder::CreateEmbed;
use serenity::prelude::TypeMapKey;
use std::collections::HashMap;
use std::env;
use std::fs::{self, File, OpenOptions};
Expand Down Expand Up @@ -86,10 +86,10 @@ impl BotState {

match writer {
Ok(writer) => match to_writer_pretty(writer, self) {
Ok(()) => println!("Successfully saved state to '{path_str}'",),
Ok(()) => println!("Successfully saved state to '{path_str}'"),
Err(e) => println!("Failed to save state to '{path_str}': {e}"),
},
Err(e) => println!("Unable to write state to '{path_str}': {e}"),
};
}
}
}
Loading