Mystara/refraction
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: cleanup unused config properties

Browse source
This commit is contained in:
seth 2024-01-27 23:03:34 -05:00
parent 2acb319821
commit 72e171b960
No known key found for this signature in database
GPG key ID: D31BD0D494BBEE86
6 changed files with 23 additions and 152 deletions
Download patch file Download diff file Expand all files Collapse all files

79
src/config/discord.rs
View file

@ -1,15 +1,7 @@
use crate::required_var;
use std::str::FromStr;
use color_eyre::eyre::{Context as _, Result};
use log::*;
use poise::serenity_prelude::{ApplicationId, ChannelId};
use url::Url;
#[derive(Debug, Clone)]
pub struct RefractionOAuth2 {
pub redirect_uri: Url,
pub scope: String,
}
use poise::serenity_prelude::ChannelId;
#[derive(Debug, Clone, Default)]
pub struct RefractionChannels {
@ -18,70 +10,33 @@ pub struct RefractionChannels {
#[derive(Debug, Clone, Default)]
pub struct DiscordConfig {
pub client_id: ApplicationId,
pub client_secret: String,
pub bot_token: String,
pub oauth2: RefractionOAuth2,
pub channels: RefractionChannels,
}
impl Default for RefractionOAuth2 {
fn default() -> Self {
Self {
scope: "identify connections role_connections.write".to_string(),
redirect_uri: Url::parse("https://google.com").unwrap(),
}
}
}
impl RefractionOAuth2 {
pub fn new_from_env() -> Result<Self> {
let unparsed = format!("{}/oauth2/callback", required_var!("PUBLIC_URI"));
let redirect_uri = Url::parse(&unparsed)?;
debug!("OAuth2 Redirect URI is {redirect_uri}");
Ok(Self {
redirect_uri,
..Default::default()
})
}
}
impl RefractionChannels {
pub fn new_from_env() -> Result<Self> {
let unparsed = std::env::var("DISCORD_SAY_LOG_CHANNELID");
if let Ok(unparsed) = unparsed {
let id = unparsed.parse::<u64>()?;
let channel_id = ChannelId::from(id);
pub fn new_from_env() -> Self {
let say_log_channel_id = Self::get_channel_from_env("DISCORD_SAY_LOG_CHANNELID");
debug!("Log channel is {id}");
Ok(Self {
say_log_channel_id: Some(channel_id),
})
if let Some(channel_id) = say_log_channel_id {
info!("Log channel is {channel_id}");
} else {
warn!("DISCORD_SAY_LOG_CHANNELID is empty; this will disable logging in your server.");
Ok(Self {
say_log_channel_id: None,
})
}
Self { say_log_channel_id }
}
fn get_channel_from_env(var: &str) -> Option<ChannelId> {
std::env::var(var)
.ok()
.and_then(|env_var| ChannelId::from_str(&env_var).ok())
}
}
impl DiscordConfig {
pub fn new_from_env() -> Result<Self> {
let unparsed_client = required_var!("DISCORD_CLIENT_ID").parse::<u64>()?;
let client_id = ApplicationId::from(unparsed_client);
let client_secret = required_var!("DISCORD_CLIENT_SECRET");
let bot_token = required_var!("DISCORD_BOT_TOKEN");
let oauth2 = RefractionOAuth2::new_from_env()?;
let channels = RefractionChannels::new_from_env()?;
pub fn new_from_env() -> Self {
let channels = RefractionChannels::new_from_env();
Ok(Self {
client_id,
client_secret,
bot_token,
oauth2,
channels,
})
Self { channels }
}
}