Noratrieb/killjoy-turret
1
0
Fork 0
mirror of https://github.com/Noratrieb/killjoy-turret.git synced 2026-01-14 22:55:01 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/master'

Browse source 
# Conflicts:
#	Cargo.lock
#	Cargo.toml
#	src/autorole.rs
#	src/commands.rs
#	src/main.rs
This commit is contained in:
nora 2021-07-28 21:04:14 +02:00
commit bde1ec8ed1
2 changed files with 17 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

1
rustfmt.toml Normal file
View file

@ -0,0 +1 @@
max_width = 120

26
src/autorole.rs
View file

@ -5,6 +5,15 @@ use serenity::framework::standard::{
}; };
use serenity::model::prelude::*; use serenity::model::prelude::*;
use serenity::prelude::*; use serenity::prelude::*;
use serenity::{
async_trait,
collector::MessageCollectorBuilder,
framework::standard::{help_commands, CommandGroup, HelpOptions, StandardFramework},
futures::stream::StreamExt,
http::Http,
model::prelude::*,
prelude::*,
};
use std::collections::HashMap; use std::collections::HashMap;
use std::time::Duration; use std::time::Duration;
@ -17,15 +26,15 @@ impl TypeMapKey for AutoRoleDataKey {
#[group] #[group]
#[commands(autorole)] #[commands(autorole)]
#[description = "Auto role related commands"] #[description = "Auto role related commands"]
struct _AutoRole; struct AutoRole;
#[command] #[command]
#[description = "Add auto assign roles"] #[description = "Add auto assign roles"]
#[usage = "sdakhnfj"] #[usage = "sdakhnfj"]
async fn autorole(ctx: &Context, msg: &Message, _: Args) -> CommandResult { async fn autorole(ctx: &Context, msg: &Message, args: Args) -> CommandResult {
let http = &ctx.http; let http = &ctx.http;
//let mut data = ctx.data.write().await; let mut data = ctx.data.write().await;
//let mut auto_roles = data.get_mut::<AutoRoleDataKey>(); let mut auto_roles = data.get_mut::<AutoRoleDataKey>();
msg.channel_id msg.channel_id
.send_message(http, |m| { .send_message(http, |m| {
@ -42,13 +51,10 @@ async fn autorole(ctx: &Context, msg: &Message, _: Args) -> CommandResult {
}) })
.await?; .await?;
while let Some(answer) = &msg while let Some(answer) = &msg.author.await_reply(&ctx).timeout(Duration::from_secs(30)).await {
.author
.await_reply(&ctx)
.timeout(Duration::from_secs(30))
.await
{
if let Some(emote) = answer.content.split(' ').next() { if let Some(emote) = answer.content.split(' ').next() {
lazy_static! {}
println!("should add emote: {}", emote); println!("should add emote: {}", emote);
answer.react(http, '☑').await?; answer.react(http, '☑').await?;
} }