sorceress/rustcord
sorceress
/
rustcord
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Add lazy_static to dependencies 

Replace multiple owner variables with a static variable
This commit is contained in:
Agatha 2020-04-03 02:01:53 +03:00
parent 5dae504c02
commit 5867137555
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Cargo.lock generated
View File

@ -1032,6 +1032,7 @@ dependencies = [
name = "rustcord" name = "rustcord"
version = "0.3.0" version = "0.3.0"
dependencies = [ dependencies = [
"lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"owoify 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "owoify 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
"rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.105 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.105 (registry+https://github.com/rust-lang/crates.io-index)",

1
Cargo.toml
View File

@ -13,6 +13,7 @@ toml = "0.5.6"
sys-info = "0.6.0" sys-info = "0.6.0"
urbandict = "0.2.0" urbandict = "0.2.0"
owoify = "0.1.5" owoify = "0.1.5"
lazy_static = "1.4.0"
[patch.crates-io] [patch.crates-io]
openssl = { git = "https://github.com/ishitatsuyuki/rust-openssl", branch = "0.9.x" } openssl = { git = "https://github.com/ishitatsuyuki/rust-openssl", branch = "0.9.x" }

16
src/main.rs
View File

@ -1,5 +1,8 @@
#![allow(clippy::unreadable_literal)] #![allow(clippy::unreadable_literal)]
#[macro_use]
extern crate lazy_static;
use rand::Rng; use rand::Rng;
use serenity::{ use serenity::{
client::Client, client::Client,
@ -40,6 +43,11 @@ impl EventHandler for Handler {
)] )]
struct General; struct General;
lazy_static! {
static ref OWNERS: std::vec::Vec<serenity::model::id::UserId> =
vec![UserId(254310746450690048), UserId(687740609703706630)];
}
// Calculates hash of a type that implements Hash // Calculates hash of a type that implements Hash
fn calculate_hash<T: Hash>(t: &T) -> u64 { fn calculate_hash<T: Hash>(t: &T) -> u64 {
let mut s = DefaultHasher::new(); let mut s = DefaultHasher::new();
@ -55,11 +63,7 @@ fn main() {
StandardFramework::new() StandardFramework::new()
.configure(|c| { .configure(|c| {
c.with_whitespace(true) c.with_whitespace(true)
.owners( .owners(OWNERS.clone().into_iter().collect())
vec![UserId(254310746450690048), UserId(687740609703706630)]
.into_iter()
.collect(),
)
.prefixes(vec!["owo ", "OwO "]) .prefixes(vec!["owo ", "OwO "])
.no_dm_prefix(true) .no_dm_prefix(true)
.case_insensitivity(true) .case_insensitivity(true)
@ -85,7 +89,7 @@ fn main() {
#[check] #[check]
#[name = "Owner"] #[name = "Owner"]
fn owner_check(_: &mut Context, msg: &Message, _: &mut Args, _: &CommandOptions) -> CheckResult { fn owner_check(_: &mut Context, msg: &Message, _: &mut Args, _: &CommandOptions) -> CheckResult {
if msg.author.id == 254310746450690048 || msg.author.id == 687740609703706630 { if OWNERS.clone().contains(&msg.author.id) {
CheckResult::Success CheckResult::Success
} else { } else {
CheckResult::Failure(Reason::Unknown) CheckResult::Failure(Reason::Unknown)