Fix ghost guild members erroring
This commit is contained in:
parent
37c369cfcb
commit
2a2697b13f
2
Cargo.lock
generated
2
Cargo.lock
generated
@ -1066,7 +1066,7 @@ dependencies = [
|
|||||||
[[package]]
|
[[package]]
|
||||||
name = "wynncraft"
|
name = "wynncraft"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
source = "git+https://gitlab.com/Sakuhl/wynncraft#5ea547e2298f51bef4ac45759b56801696a795fc"
|
source = "git+https://gitlab.com/Sakuhl/wynncraft#b73034104c1bc02ec3bde74c6a1042943a61bab1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"reqwest 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
"reqwest 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"serde 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)",
|
"serde 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
@ -1,5 +1,4 @@
|
|||||||
extern crate wynncraft;
|
extern crate wynncraft;
|
||||||
use wynncraft::{Guild, Player};
|
|
||||||
|
|
||||||
extern crate serenity;
|
extern crate serenity;
|
||||||
use serenity::prelude::*;
|
use serenity::prelude::*;
|
||||||
@ -46,8 +45,7 @@ impl EventHandler for Handler {
|
|||||||
fn wc_guild(msg: Message) {
|
fn wc_guild(msg: Message) {
|
||||||
let guild = &msg.content[9..];
|
let guild = &msg.content[9..];
|
||||||
|
|
||||||
if let Ok(guild) = wynncraft::guild(guild) {
|
let guild = wynncraft::guild(guild).unwrap();
|
||||||
let guild: Guild = guild;
|
|
||||||
|
|
||||||
let resp = reqwest::get("https://api.wynncraft.com/public_api.php?action=territoryList").unwrap();
|
let resp = reqwest::get("https://api.wynncraft.com/public_api.php?action=territoryList").unwrap();
|
||||||
assert!(resp.status().is_success());
|
assert!(resp.status().is_success());
|
||||||
@ -79,7 +77,6 @@ fn wc_guild(msg: Message) {
|
|||||||
) + &message
|
) + &message
|
||||||
).unwrap();
|
).unwrap();
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
fn wc_status(msg: Message) {
|
fn wc_status(msg: Message) {
|
||||||
let resp = reqwest::get("https://api.wynncraft.com/public_api.php?action=onlinePlayersSum").unwrap();
|
let resp = reqwest::get("https://api.wynncraft.com/public_api.php?action=onlinePlayersSum").unwrap();
|
||||||
@ -124,7 +121,7 @@ fn wc_territory(msg: Message) {
|
|||||||
fn wc_player(msg: Message) {
|
fn wc_player(msg: Message) {
|
||||||
let player = &msg.content[10..];
|
let player = &msg.content[10..];
|
||||||
|
|
||||||
let player: Player = wynncraft::player(player).unwrap();
|
let player = wynncraft::player(player).unwrap();
|
||||||
|
|
||||||
let current_server_msg = if player.current_server != "null" {
|
let current_server_msg = if player.current_server != "null" {
|
||||||
format!("\n**Currently online on**: {}", player.current_server)
|
format!("\n**Currently online on**: {}", player.current_server)
|
||||||
|
Loading…
Reference in New Issue
Block a user