From 550080482cebb91cb79c1c91deaf28c4816f20d1 Mon Sep 17 00:00:00 2001
From: Aadi Desai <21363892+supleed2@users.noreply.github.com>
Date: Mon, 9 Oct 2023 17:28:34 +0100
Subject: [PATCH] Add membership flow code for Associate Union Members

---
 src/ea.rs                |  2 ++
 src/verify/membership.rs | 10 ++++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/ea.rs b/src/ea.rs
index c96b013..00d2654 100644
--- a/src/ea.rs
+++ b/src/ea.rs
@@ -3,6 +3,8 @@
 pub struct Member {
     pub first_name: String,
     pub surname: String,
+    #[serde(rename = "CID")]
+    pub cid: String,
     pub login: String,
     pub order_no: usize,
 }
diff --git a/src/verify/membership.rs b/src/verify/membership.rs
index 2f2f99f..fb78ff5 100644
--- a/src/verify/membership.rs
+++ b/src/verify/membership.rs
@@ -6,6 +6,8 @@ const MEMBERSHIP_INTRO: &str = indoc::indoc! {"
     To use automatic verification via Membership:
     - Enter your Union order number (from this academic year)
     - Enter your Imperial shortcode
+      - For Life members, your shortcode will be from when you were a student
+      - For Associate members, this is your CID, in the format `AM-12345` or similar
     - Enter your preferred name for Nano whois commands
     - Your shortcode will then be connected to your Discord Account by Nano
 
@@ -117,10 +119,10 @@ pub(crate) async fn membership_3(
                     return Ok(());
                 }
             };
-            let Some(member) = members
-                .iter()
-                .find(|&member| member.order_no.to_string() == order && member.login == shortcode)
-            else {
+            let Some(member) = members.iter().find(|member| {
+                ((member.login.is_empty() && member.cid == shortcode) || member.login == shortcode)
+                    && member.order_no.to_string() == order
+            }) else {
                 m.create_interaction_response(&ctx.http, |i| {
                     let msg = "Sorry, your order was not found, please check the \
                             order number and that it is for your current year's membership";