tegakituesday/ji-chan
tegakituesday/ji-chan
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

Compare commits

base: tegakituesday:5e6bb8f2d0bdd92e4c33722d9618589ed5011566
Branches Tags
tegakituesday:main
tegakituesday:late-submissions
..
compare: tegakituesday:1dfa68452b063b7aa79119091e1b7209ac39d219
Branches Tags
tegakituesday:main
tegakituesday:late-submissions

No commits in common. "5e6bb8f2d0bdd92e4c33722d9618589ed5011566" and "1dfa68452b063b7aa79119091e1b7209ac39d219" have entirely different histories.
5e6bb8f2d0 ... 1dfa68452b

2 changed files with 6 additions and 19 deletions
Show stats Expand all files Collapse all files

12
src/commands/challenge.rs
View file

@ -149,17 +149,11 @@ pub async fn submit(ctx: Context<'_>, submission: serenity::Attachment) -> Resul
break; break;
} }
} }
let username = if author.discriminator == 0 { // new usernames
author.name.clone()
} else {
format!("{}#{}", author.name, author.discriminator)
};
let username = &username;
if !existing_submitter { if !existing_submitter {
let mut submitter_data = Map::new(); let mut submitter_data = Map::new();
submitter_data.insert( submitter_data.insert(
String::from("username"), String::from("username"),
username.clone().into(), format!("{}#{}", author.name, author.discriminator).into(),
); );
let mut images: Vec<String> = Vec::new(); let mut images: Vec<String> = Vec::new();
for (i, attachment) in attachments.iter().enumerate() { for (i, attachment) in attachments.iter().enumerate() {
@ -179,9 +173,10 @@ pub async fn submit(ctx: Context<'_>, submission: serenity::Attachment) -> Resul
} }
requires_rebuild = true; requires_rebuild = true;
let file_name = format!( let file_name = format!(
"{}-{}-{}{}.{}", "{}-{}-{}-{}{}.{}",
submission_data.len() + 1, submission_data.len() + 1,
slugify(&author.name), slugify(&author.name),
author.discriminator,
timestamp, timestamp,
if i == 0 { if i == 0 {
"".to_owned() "".to_owned()
@ -261,6 +256,7 @@ pub async fn submit(ctx: Context<'_>, submission: serenity::Attachment) -> Resul
channel channel
.send_message(&ctx.serenity_context().http, |m| { .send_message(&ctx.serenity_context().http, |m| {
m.embed(|e| { m.embed(|e| {
let username = format!("{}#{}", author.name, author.discriminator);
let domain = get_domain(); let domain = get_domain();
let n = get_challenge_number(); let n = get_challenge_number();
let mut description = format!( let mut description = format!(

13
src/utils.rs
View file

@ -67,10 +67,6 @@ pub fn get_submission_data(challenge: i32) -> Vec<Value> {
json json
} }
Err(ref e) if e.kind() == std::io::ErrorKind::NotFound => { Err(ref e) if e.kind() == std::io::ErrorKind::NotFound => {
// Create parent directory if not exists
if let Some(parent_dir) = std::path::Path::new(&submission_data_path).parent() {
fs::create_dir_all(parent_dir).unwrap();
}
let mut file = File::create(&submission_data_path).unwrap(); let mut file = File::create(&submission_data_path).unwrap();
file.write_all(b"[]").unwrap(); file.write_all(b"[]").unwrap();
file.flush().unwrap(); file.flush().unwrap();
@ -375,7 +371,7 @@ pub async fn leaderboard(ctx: &Context<'_>) -> Result<(), Error> {
let mut top_submitters: Vec<(&String, &u32)> = submission_counts.iter().collect(); let mut top_submitters: Vec<(&String, &u32)> = submission_counts.iter().collect();
top_submitters.sort_by(|a, b| b.1.cmp(a.1)); top_submitters.sort_by(|a, b| b.1.cmp(a.1));
let mut leaderboard_html = String::from("<table id=\"leaderboard\">"); let mut leaderboard_html = String::from("<table id=\"leaderboard\">");
for (i, (id, count)) in top_submitters[0..std::cmp::min(top_submitters.len(), LENGTH)].iter().enumerate() { for (i, (id, count)) in top_submitters[0..LENGTH].iter().enumerate() {
let place = i + 1; let place = i + 1;
let user = serenity::UserId(id.parse::<u64>().unwrap()) let user = serenity::UserId(id.parse::<u64>().unwrap())
.to_user(&ctx.serenity_context().http) .to_user(&ctx.serenity_context().http)
@ -384,12 +380,7 @@ pub async fn leaderboard(ctx: &Context<'_>) -> Result<(), Error> {
let profile = format!("https://discord.com/users/{id}"); let profile = format!("https://discord.com/users/{id}");
let name = &user.name; let name = &user.name;
let discriminator = user.discriminator; let discriminator = user.discriminator;
leaderboard_html.push_str(&format!("<tr><td>{place}</td><td><a href=\"{profile}\" target=\"_blank\" class=\"no-underline\"><img src=\"{avatar}\" onerror=\"this.src='/default.png'\"> <span class=\"underline\">{name}")); leaderboard_html.push_str(&format!("<tr><td>{place}</td><td><a href=\"{profile}\" target=\"_blank\" class=\"no-underline\"><img src=\"{avatar}\" onerror=\"this.src='/default.png'\"> <span class=\"underline\">{name}<span class=\"muted\">#{:0>4}</span></span></a></td><td>{count}</td></tr>", discriminator));
// New usernames have #0000 discriminator
if discriminator != 0 {
leaderboard_html.push_str(&format!("<span class=\"muted\">#{:0>4}</span>", discriminator));
}
leaderboard_html.push_str(&format!("</span></a></td><td>{count}</td></tr>"));
} }
leaderboard_html.push_str("</table>"); leaderboard_html.push_str("</table>");
let mut file = std::fs::OpenOptions::new() let mut file = std::fs::OpenOptions::new()