Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions src/ids.rs
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,6 @@ pub const WEB_ROLE_ID: u64 = 1298553910167994428;
pub const STATUS_UPDATE_CHANNEL_ID: u64 = 764575524127244318;
pub const THE_LAB_CHANNEL_ID: u64 = 1208438766893670451;

pub const AI_STATUS_UPDATE_CHANNEL_ID: u64 = 1343489220068507649;
pub const MOBILE_STATUS_UPDATE_CHANNEL_ID: u64 = 1378685538835365960;
pub const WEB_STATUS_UPDATE_CHANNEL_ID: u64 = 1378685360133115944;
pub const SYSTEMS_STATUS_UPDATE_CHANNEL_ID: u64 = 1378426650152271902;

pub const GROUP_ONE_STATUS_UPDATE_CHANNEL_ID: u64 = 1225098248293716008;
pub const GROUP_TWO_STATUS_UPDATE_CHANNEL_ID: u64 = 1225098298935738489;
pub const GROUP_THREE_STATUS_UPDATE_CHANNEL_ID: u64 = 1225098353378070710;
Expand Down
25 changes: 9 additions & 16 deletions src/tasks/status_update_mirror.rs
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,9 @@ pub struct EmailDetails {
}

use crate::ids::{
AI_STATUS_UPDATE_CHANNEL_ID, GROUP_FOUR_STATUS_UPDATE_CHANNEL_ID,
GROUP_ONE_STATUS_UPDATE_CHANNEL_ID, GROUP_THREE_STATUS_UPDATE_CHANNEL_ID,
GROUP_TWO_STATUS_UPDATE_CHANNEL_ID, MOBILE_STATUS_UPDATE_CHANNEL_ID, STATUS_UPDATE_CHANNEL_ID,
SYSTEMS_STATUS_UPDATE_CHANNEL_ID, WEB_STATUS_UPDATE_CHANNEL_ID,
GROUP_FOUR_STATUS_UPDATE_CHANNEL_ID, GROUP_ONE_STATUS_UPDATE_CHANNEL_ID,
GROUP_THREE_STATUS_UPDATE_CHANNEL_ID, GROUP_TWO_STATUS_UPDATE_CHANNEL_ID,
STATUS_UPDATE_CHANNEL_ID,
};

#[async_trait]
Expand Down Expand Up @@ -78,15 +77,14 @@ pub async fn mirror_new_updates(ctx: ClientContext, client: GraphQLClient) -> an
let sender_email = email.from.trim().to_lowercase();

if let Some(member) = members.get(&sender_email) {
if member.track.is_none() || member.group_id.is_none() {
if member.group_id.is_none() {
continue;
}

send_update(
&ctx,
member.name.clone(),
member.discord_id.as_deref(),
member.track.clone().unwrap(),
member.group_id.unwrap(),
email.body.clone(),
)
Expand Down Expand Up @@ -170,19 +168,14 @@ async fn send_update(
ctx: &ClientContext,
name: String,
discord_id: Option<&str>,
track: String,
group: i32,
content: String,
) -> anyhow::Result<()> {
let channel_id = match (track.as_str(), group) {
("Inductee", 1) => GROUP_ONE_STATUS_UPDATE_CHANNEL_ID,
("Inductee", 2) => GROUP_TWO_STATUS_UPDATE_CHANNEL_ID,
("Inductee", 3) => GROUP_THREE_STATUS_UPDATE_CHANNEL_ID,
("Inductee", 4) => GROUP_FOUR_STATUS_UPDATE_CHANNEL_ID,
("AI", _) => AI_STATUS_UPDATE_CHANNEL_ID,
("Web", _) => WEB_STATUS_UPDATE_CHANNEL_ID,
("Mobile", _) => MOBILE_STATUS_UPDATE_CHANNEL_ID,
("Systems", _) => SYSTEMS_STATUS_UPDATE_CHANNEL_ID,
let channel_id = match group {
1 => GROUP_ONE_STATUS_UPDATE_CHANNEL_ID,
2 => GROUP_TWO_STATUS_UPDATE_CHANNEL_ID,
3 => GROUP_THREE_STATUS_UPDATE_CHANNEL_ID,
4 => GROUP_FOUR_STATUS_UPDATE_CHANNEL_ID,
_ => STATUS_UPDATE_CHANNEL_ID,
};

Expand Down
Loading