From 81dffed237e2a754ba83145e7092c75efebe1c49 Mon Sep 17 00:00:00 2001
From: tec <tec@ucc.gu.uwa.edu.au>
Date: Tue, 4 Feb 2020 01:05:39 +0800
Subject: [PATCH] A touch of clean-up
---
src/main.rs | 2 --
src/token_management.rs | 7 ++-----
src/user_management.rs | 12 +++++-------
3 files changed, 7 insertions(+), 14 deletions(-)
diff --git a/src/main.rs b/src/main.rs
index 41679d2..235e7dd 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,7 +1,5 @@
#[macro_use]
extern crate lazy_static;
-#[macro_use]
-extern crate hex_literal;
#[macro_use]
extern crate log;
diff --git a/src/token_management.rs b/src/token_management.rs
index fc37f93..9bdf049 100644
--- a/src/token_management.rs
+++ b/src/token_management.rs
@@ -1,13 +1,10 @@
-use chrono::{
- prelude::{SecondsFormat, Utc},
- DateTime,
-};
+use chrono::{prelude::Utc, DateTime};
use rand::Rng;
use serenity::model::user::User;
use std::str;
lazy_static! {
- static ref key: [u8; 32] = rand::thread_rng().gen::<[u8; 32]>();
+ static ref KEY: [u8; 32] = rand::thread_rng().gen::<[u8; 32]>();
}
fn encrypt(plaintext: &str) -> &str {
diff --git a/src/user_management.rs b/src/user_management.rs
index 0ba3f2e..8f511c0 100644
--- a/src/user_management.rs
+++ b/src/user_management.rs
@@ -50,9 +50,8 @@ impl Commands {
.map(|member| new_member(&ctx, member))
);
}
- pub fn register(ctx: Context, msg: Message, content: &str) {
- let name = content;
- if name.len() <= 0 {
+ pub fn register(ctx: Context, msg: Message, account_name: &str) {
+ if account_name.len() <= 0 {
e!(
"Error sending message: {:?}",
msg.channel_id
@@ -64,13 +63,12 @@ impl Commands {
"Error sending message: {:?}",
// TODO convert to email
msg.channel_id
- .say(&ctx.http, generate_token(&msg.author, name))
+ .say(&ctx.http, generate_token(&msg.author, account_name))
);
e!("Error deleting register message: {:?}", msg.delete(ctx));
}
- pub fn verify(ctx: Context, msg: Message, content: &str) {
- let token = content;
- match parse_token(&msg.author, content) {
+ pub fn verify(ctx: Context, msg: Message, token: &str) {
+ match parse_token(&msg.author, token) {
Ok(name) => {
e!(
"Unable to get member: {:?}",
--
GitLab