From ed22b3a5ced582e9906b908b57de4415e4ab8709 Mon Sep 17 00:00:00 2001
From: Zomatree <me@zomatree.live>
Date: Tue, 12 Aug 2025 03:44:29 +0100
Subject: [PATCH] chore: switch Reference to using an actual reference

---
 crates/core/database/src/util/reference.rs    | 39 +++++++++----------
 crates/delta/src/routes/bots/delete.rs        |  2 +-
 crates/delta/src/routes/bots/edit.rs          |  2 +-
 crates/delta/src/routes/bots/fetch.rs         |  2 +-
 crates/delta/src/routes/bots/fetch_public.rs  |  4 +-
 crates/delta/src/routes/bots/invite.rs        |  2 +-
 .../delta/src/routes/channels/channel_ack.rs  |  6 +--
 .../src/routes/channels/channel_delete.rs     |  2 +-
 .../delta/src/routes/channels/channel_edit.rs |  2 +-
 .../src/routes/channels/channel_fetch.rs      |  2 +-
 .../src/routes/channels/group_add_member.rs   |  4 +-
 .../routes/channels/group_remove_member.rs    |  4 +-
 .../src/routes/channels/invite_create.rs      |  2 +-
 .../src/routes/channels/members_fetch.rs      |  2 +-
 .../routes/channels/message_bulk_delete.rs    |  4 +-
 .../channels/message_clear_reactions.rs       |  4 +-
 .../src/routes/channels/message_delete.rs     |  6 +--
 .../delta/src/routes/channels/message_edit.rs |  4 +-
 .../src/routes/channels/message_fetch.rs      |  4 +-
 .../delta/src/routes/channels/message_pin.rs  | 11 ++++--
 .../src/routes/channels/message_query.rs      |  2 +-
 .../src/routes/channels/message_react.rs      |  8 ++--
 .../src/routes/channels/message_search.rs     |  2 +-
 .../delta/src/routes/channels/message_send.rs |  6 +--
 .../src/routes/channels/message_unpin.rs      |  8 ++--
 .../src/routes/channels/message_unreact.rs    | 10 ++---
 .../src/routes/channels/permissions_set.rs    |  2 +-
 .../channels/permissions_set_default.rs       |  2 +-
 .../delta/src/routes/channels/voice_join.rs   |  2 +-
 .../src/routes/channels/webhook_create.rs     |  2 +-
 .../src/routes/channels/webhook_fetch_all.rs  |  2 +-
 .../src/routes/customisation/emoji_delete.rs  |  4 +-
 .../src/routes/customisation/emoji_fetch.rs   |  2 +-
 .../delta/src/routes/invites/invite_delete.rs |  2 +-
 .../delta/src/routes/invites/invite_fetch.rs  |  6 +--
 .../delta/src/routes/invites/invite_join.rs   |  2 +-
 crates/delta/src/routes/servers/ban_create.rs |  6 +--
 crates/delta/src/routes/servers/ban_list.rs   |  2 +-
 crates/delta/src/routes/servers/ban_remove.rs |  4 +-
 .../src/routes/servers/channel_create.rs      |  2 +-
 crates/delta/src/routes/servers/emoji_list.rs |  2 +-
 .../delta/src/routes/servers/invites_fetch.rs |  2 +-
 .../delta/src/routes/servers/member_edit.rs   |  4 +-
 .../servers/member_experimental_query.rs      |  2 +-
 .../delta/src/routes/servers/member_fetch.rs  |  4 +-
 .../src/routes/servers/member_fetch_all.rs    |  2 +-
 .../delta/src/routes/servers/member_remove.rs |  4 +-
 .../src/routes/servers/permissions_set.rs     |  2 +-
 .../routes/servers/permissions_set_default.rs |  2 +-
 .../delta/src/routes/servers/roles_create.rs  |  2 +-
 .../delta/src/routes/servers/roles_delete.rs  |  2 +-
 crates/delta/src/routes/servers/roles_edit.rs |  2 +-
 .../routes/servers/roles_edit_positions.rs    |  2 +-
 .../delta/src/routes/servers/roles_fetch.rs   |  2 +-
 crates/delta/src/routes/servers/server_ack.rs |  2 +-
 .../delta/src/routes/servers/server_delete.rs |  4 +-
 .../delta/src/routes/servers/server_edit.rs   |  2 +-
 .../delta/src/routes/servers/server_fetch.rs  |  2 +-
 crates/delta/src/routes/users/add_friend.rs   |  2 +-
 crates/delta/src/routes/users/block_user.rs   |  2 +-
 crates/delta/src/routes/users/edit_user.rs    |  2 +-
 .../delta/src/routes/users/fetch_profile.rs   |  2 +-
 crates/delta/src/routes/users/fetch_user.rs   |  2 +-
 .../src/routes/users/fetch_user_flags.rs      |  2 +-
 crates/delta/src/routes/users/find_mutual.rs  |  2 +-
 crates/delta/src/routes/users/open_dm.rs      |  2 +-
 .../delta/src/routes/users/remove_friend.rs   |  2 +-
 crates/delta/src/routes/users/unblock_user.rs |  2 +-
 .../src/routes/webhooks/webhook_delete.rs     |  2 +-
 .../routes/webhooks/webhook_delete_token.rs   |  2 +-
 .../delta/src/routes/webhooks/webhook_edit.rs |  2 +-
 .../src/routes/webhooks/webhook_edit_token.rs |  2 +-
 .../src/routes/webhooks/webhook_execute.rs    |  2 +-
 .../routes/webhooks/webhook_execute_github.rs |  2 +-
 .../src/routes/webhooks/webhook_fetch.rs      |  2 +-
 .../routes/webhooks/webhook_fetch_token.rs    |  2 +-
 76 files changed, 133 insertions(+), 131 deletions(-)

diff --git a/crates/core/database/src/util/reference.rs b/crates/core/database/src/util/reference.rs
index 9282d39d..a0aefc40 100644
--- a/crates/core/database/src/util/reference.rs
+++ b/crates/core/database/src/util/reference.rs
@@ -14,41 +14,40 @@ use crate::{
 };
 
 /// Reference to some object in the database
-#[derive(Serialize, Deserialize)]
-pub struct Reference {
+pub struct Reference<'a> {
     /// Id of object
-    pub id: String,
+    pub id: &'a str,
 }
 
-impl Reference {
+impl<'a> Reference<'a> {
     /// Create a Ref from an unchecked string
-    pub fn from_unchecked(id: String) -> Reference {
+    pub fn from_unchecked(id: &'a str) -> Reference<'a> {
         Reference { id }
     }
 
     /// Fetch ban from Ref
     pub async fn as_ban(&self, db: &Database, server: &str) -> Result<ServerBan> {
-        db.fetch_ban(server, &self.id).await
+        db.fetch_ban(server, self.id).await
     }
 
     /// Fetch bot from Ref
     pub async fn as_bot(&self, db: &Database) -> Result<Bot> {
-        db.fetch_bot(&self.id).await
+        db.fetch_bot(self.id).await
     }
 
     /// Fetch emoji from Ref
     pub async fn as_emoji(&self, db: &Database) -> Result<Emoji> {
-        db.fetch_emoji(&self.id).await
+        db.fetch_emoji(self.id).await
     }
 
     /// Fetch channel from Ref
     pub async fn as_channel(&self, db: &Database) -> Result<Channel> {
-        db.fetch_channel(&self.id).await
+        db.fetch_channel(self.id).await
     }
 
     /// Fetch invite from Ref or create invite to server if discoverable
     pub async fn as_invite(&self, db: &Database) -> Result<Invite> {
-        if ulid::Ulid::from_str(&self.id).is_ok() {
+        if ulid::Ulid::from_str(self.id).is_ok() {
             let server = self.as_server(db).await?;
             if !server.discoverable {
                 return Err(create_error!(NotFound));
@@ -65,18 +64,18 @@ impl Reference {
                     .ok_or(create_error!(NotFound))?,
             })
         } else {
-            db.fetch_invite(&self.id).await
+            db.fetch_invite(self.id).await
         }
     }
 
     /// Fetch message from Ref
     pub async fn as_message(&self, db: &Database) -> Result<Message> {
-        db.fetch_message(&self.id).await
+        db.fetch_message(self.id).await
     }
 
     /// Fetch message from Ref and validate channel
     pub async fn as_message_in_channel(&self, db: &Database, channel: &str) -> Result<Message> {
-        let msg = db.fetch_message(&self.id).await?;
+        let msg = db.fetch_message(self.id).await?;
         if msg.channel != channel {
             return Err(create_error!(NotFound));
         }
@@ -86,36 +85,36 @@ impl Reference {
 
     /// Fetch member from Ref
     pub async fn as_member(&self, db: &Database, server: &str) -> Result<Member> {
-        db.fetch_member(server, &self.id).await
+        db.fetch_member(server, self.id).await
     }
 
     /// Fetch server from Ref
     pub async fn as_server(&self, db: &Database) -> Result<Server> {
-        db.fetch_server(&self.id).await
+        db.fetch_server(self.id).await
     }
 
     /// Fetch user from Ref
     pub async fn as_user(&self, db: &Database) -> Result<User> {
-        db.fetch_user(&self.id).await
+        db.fetch_user(self.id).await
     }
 
     /// Fetch webhook from Ref
     pub async fn as_webhook(&self, db: &Database) -> Result<Webhook> {
-        db.fetch_webhook(&self.id).await
+        db.fetch_webhook(self.id).await
     }
 }
 
 #[cfg(feature = "rocket-impl")]
-impl<'r> FromParam<'r> for Reference {
+impl<'r> FromParam<'r> for Reference<'r> {
     type Error = &'r str;
 
     fn from_param(param: &'r str) -> Result<Self, Self::Error> {
-        Ok(Reference::from_unchecked(param.into()))
+        Ok(Reference::from_unchecked(param))
     }
 }
 
 #[cfg(feature = "rocket-impl")]
-impl JsonSchema for Reference {
+impl<'a> JsonSchema for Reference<'a> {
     fn schema_name() -> String {
         "Id".to_string()
     }
diff --git a/crates/delta/src/routes/bots/delete.rs b/crates/delta/src/routes/bots/delete.rs
index 7785a544..4d4daefb 100644
--- a/crates/delta/src/routes/bots/delete.rs
+++ b/crates/delta/src/routes/bots/delete.rs
@@ -11,7 +11,7 @@ use rocket_empty::EmptyResponse;
 pub async fn delete_bot(
     db: &State<Database>,
     user: User,
-    target: Reference,
+    target: Reference<'_>,
 ) -> Result<EmptyResponse> {
     let bot = target.as_bot(db).await?;
     if bot.owner != user.id {
diff --git a/crates/delta/src/routes/bots/edit.rs b/crates/delta/src/routes/bots/edit.rs
index 20136415..6c454e13 100644
--- a/crates/delta/src/routes/bots/edit.rs
+++ b/crates/delta/src/routes/bots/edit.rs
@@ -14,7 +14,7 @@ use validator::Validate;
 pub async fn edit_bot(
     db: &State<Database>,
     user: User,
-    target: Reference,
+    target: Reference<'_>,
     data: Json<DataEditBot>,
 ) -> Result<Json<v0::BotWithUserResponse>> {
     let data = data.into_inner();
diff --git a/crates/delta/src/routes/bots/fetch.rs b/crates/delta/src/routes/bots/fetch.rs
index a5222b8f..586ce124 100644
--- a/crates/delta/src/routes/bots/fetch.rs
+++ b/crates/delta/src/routes/bots/fetch.rs
@@ -11,7 +11,7 @@ use rocket::{serde::json::Json, State};
 pub async fn fetch_bot(
     db: &State<Database>,
     user: User,
-    bot: Reference,
+    bot: Reference<'_>,
 ) -> Result<Json<FetchBotResponse>> {
     if user.bot.is_some() {
         return Err(create_error!(IsBot));
diff --git a/crates/delta/src/routes/bots/fetch_public.rs b/crates/delta/src/routes/bots/fetch_public.rs
index 6fa4f792..7ad97e00 100644
--- a/crates/delta/src/routes/bots/fetch_public.rs
+++ b/crates/delta/src/routes/bots/fetch_public.rs
@@ -13,9 +13,9 @@ use rocket::State;
 pub async fn fetch_public_bot(
     db: &State<Database>,
     user: Option<User>,
-    target: Reference,
+    target: Reference<'_>,
 ) -> Result<Json<PublicBot>> {
-    let bot = db.fetch_bot(&target.id).await?;
+    let bot = db.fetch_bot(target.id).await?;
     if !bot.public && user.is_none_or(|x| x.id != bot.owner) {
         return Err(create_error!(NotFound));
     }
diff --git a/crates/delta/src/routes/bots/invite.rs b/crates/delta/src/routes/bots/invite.rs
index 10c09eed..39517c51 100644
--- a/crates/delta/src/routes/bots/invite.rs
+++ b/crates/delta/src/routes/bots/invite.rs
@@ -20,7 +20,7 @@ pub async fn invite_bot(
     db: &State<Database>,
     amqp: &State<AMQP>,
     user: User,
-    target: Reference,
+    target: Reference<'_>,
     dest: Json<v0::InviteBotDestination>,
 ) -> Result<EmptyResponse> {
     if user.bot.is_some() {
diff --git a/crates/delta/src/routes/channels/channel_ack.rs b/crates/delta/src/routes/channels/channel_ack.rs
index 458ccd1b..2ae0d3b0 100644
--- a/crates/delta/src/routes/channels/channel_ack.rs
+++ b/crates/delta/src/routes/channels/channel_ack.rs
@@ -15,8 +15,8 @@ use rocket_empty::EmptyResponse;
 pub async fn ack(
     db: &State<Database>,
     user: User,
-    target: Reference,
-    message: Reference,
+    target: Reference<'_>,
+    message: Reference<'_>,
 ) -> Result<EmptyResponse> {
     if user.bot.is_some() {
         return Err(create_error!(IsBot));
@@ -29,7 +29,7 @@ pub async fn ack(
         .throw_if_lacking_channel_permission(ChannelPermission::ViewChannel)?;
 
     channel
-        .ack(&user.id, &message.id)
+        .ack(&user.id, message.id)
         .await
         .map(|_| EmptyResponse)
 }
diff --git a/crates/delta/src/routes/channels/channel_delete.rs b/crates/delta/src/routes/channels/channel_delete.rs
index ca09ae2b..9d2b37b8 100644
--- a/crates/delta/src/routes/channels/channel_delete.rs
+++ b/crates/delta/src/routes/channels/channel_delete.rs
@@ -17,7 +17,7 @@ pub async fn delete(
     db: &State<Database>,
     amqp: &State<AMQP>,
     user: User,
-    target: Reference,
+    target: Reference<'_>,
     options: v0::OptionsChannelDelete,
 ) -> Result<EmptyResponse> {
     let mut channel = target.as_channel(db).await?;
diff --git a/crates/delta/src/routes/channels/channel_edit.rs b/crates/delta/src/routes/channels/channel_edit.rs
index 37555f8c..881656f6 100644
--- a/crates/delta/src/routes/channels/channel_edit.rs
+++ b/crates/delta/src/routes/channels/channel_edit.rs
@@ -17,7 +17,7 @@ pub async fn edit(
     db: &State<Database>,
     amqp: &State<AMQP>,
     user: User,
-    target: Reference,
+    target: Reference<'_>,
     data: Json<v0::DataEditChannel>,
 ) -> Result<Json<v0::Channel>> {
     let data = data.into_inner();
diff --git a/crates/delta/src/routes/channels/channel_fetch.rs b/crates/delta/src/routes/channels/channel_fetch.rs
index dfcc918d..b08239bb 100644
--- a/crates/delta/src/routes/channels/channel_fetch.rs
+++ b/crates/delta/src/routes/channels/channel_fetch.rs
@@ -16,7 +16,7 @@ use rocket::{serde::json::Json, State};
 pub async fn fetch(
     db: &State<Database>,
     user: User,
-    target: Reference,
+    target: Reference<'_>,
 ) -> Result<Json<v0::Channel>> {
     let channel = target.as_channel(db).await?;
 
diff --git a/crates/delta/src/routes/channels/group_add_member.rs b/crates/delta/src/routes/channels/group_add_member.rs
index 79d9e633..ac1aa886 100644
--- a/crates/delta/src/routes/channels/group_add_member.rs
+++ b/crates/delta/src/routes/channels/group_add_member.rs
@@ -17,8 +17,8 @@ pub async fn add_member(
     db: &State<Database>,
     amqp: &State<AMQP>,
     user: User,
-    group_id: Reference,
-    member_id: Reference,
+    group_id: Reference<'_>,
+    member_id: Reference<'_>,
 ) -> Result<EmptyResponse> {
     if user.bot.is_some() {
         return Err(create_error!(IsBot));
diff --git a/crates/delta/src/routes/channels/group_remove_member.rs b/crates/delta/src/routes/channels/group_remove_member.rs
index 90cccfef..467168ba 100644
--- a/crates/delta/src/routes/channels/group_remove_member.rs
+++ b/crates/delta/src/routes/channels/group_remove_member.rs
@@ -14,8 +14,8 @@ pub async fn remove_member(
     db: &State<Database>,
     amqp: &State<AMQP>,
     user: User,
-    target: Reference,
-    member: Reference,
+    target: Reference<'_>,
+    member: Reference<'_>,
 ) -> Result<EmptyResponse> {
     if user.bot.is_some() {
         return Err(create_error!(IsBot));
diff --git a/crates/delta/src/routes/channels/invite_create.rs b/crates/delta/src/routes/channels/invite_create.rs
index 1214816e..104f3398 100644
--- a/crates/delta/src/routes/channels/invite_create.rs
+++ b/crates/delta/src/routes/channels/invite_create.rs
@@ -18,7 +18,7 @@ use rocket::{serde::json::Json, State};
 pub async fn create_invite(
     db: &State<Database>,
     user: User,
-    target: Reference,
+    target: Reference<'_>,
 ) -> Result<Json<v0::Invite>> {
     if user.bot.is_some() {
         return Err(create_error!(IsBot));
diff --git a/crates/delta/src/routes/channels/members_fetch.rs b/crates/delta/src/routes/channels/members_fetch.rs
index 4a6688bf..dc681519 100644
--- a/crates/delta/src/routes/channels/members_fetch.rs
+++ b/crates/delta/src/routes/channels/members_fetch.rs
@@ -17,7 +17,7 @@ use rocket::{serde::json::Json, State};
 pub async fn fetch_members(
     db: &State<Database>,
     user: User,
-    target: Reference,
+    target: Reference<'_>,
 ) -> Result<Json<Vec<v0::User>>> {
     let channel = target.as_channel(db).await?;
     let mut query = DatabasePermissionQuery::new(db, &user).channel(&channel);
diff --git a/crates/delta/src/routes/channels/message_bulk_delete.rs b/crates/delta/src/routes/channels/message_bulk_delete.rs
index 446b1e26..fdd538ff 100644
--- a/crates/delta/src/routes/channels/message_bulk_delete.rs
+++ b/crates/delta/src/routes/channels/message_bulk_delete.rs
@@ -22,7 +22,7 @@ use validator::Validate;
 pub async fn bulk_delete_messages(
     db: &State<Database>,
     user: User,
-    target: Reference,
+    target: Reference<'_>,
     options: Json<v0::OptionsBulkDelete>,
 ) -> Result<EmptyResponse> {
     let options = options.into_inner();
@@ -51,7 +51,7 @@ pub async fn bulk_delete_messages(
         .await
         .throw_if_lacking_channel_permission(ChannelPermission::ManageMessages)?;
 
-    Message::bulk_delete(db, &target.id, options.ids)
+    Message::bulk_delete(db, target.id, options.ids)
         .await
         .map(|_| EmptyResponse)
 }
diff --git a/crates/delta/src/routes/channels/message_clear_reactions.rs b/crates/delta/src/routes/channels/message_clear_reactions.rs
index 268bc843..cf9be252 100644
--- a/crates/delta/src/routes/channels/message_clear_reactions.rs
+++ b/crates/delta/src/routes/channels/message_clear_reactions.rs
@@ -17,8 +17,8 @@ use rocket_empty::EmptyResponse;
 pub async fn clear_reactions(
     db: &State<Database>,
     user: User,
-    target: Reference,
-    msg: Reference,
+    target: Reference<'_>,
+    msg: Reference<'_>,
 ) -> Result<EmptyResponse> {
     let channel = target.as_channel(db).await?;
     let mut query = DatabasePermissionQuery::new(db, &user).channel(&channel);
diff --git a/crates/delta/src/routes/channels/message_delete.rs b/crates/delta/src/routes/channels/message_delete.rs
index 3c1f1e7e..437c80ee 100644
--- a/crates/delta/src/routes/channels/message_delete.rs
+++ b/crates/delta/src/routes/channels/message_delete.rs
@@ -15,10 +15,10 @@ use rocket_empty::EmptyResponse;
 pub async fn delete(
     db: &State<Database>,
     user: User,
-    target: Reference,
-    msg: Reference,
+    target: Reference<'_>,
+    msg: Reference<'_>,
 ) -> Result<EmptyResponse> {
-    let message = msg.as_message_in_channel(db, &target.id).await?;
+    let message = msg.as_message_in_channel(db, target.id).await?;
 
     if message.author != user.id {
         let channel = target.as_channel(db).await?;
diff --git a/crates/delta/src/routes/channels/message_edit.rs b/crates/delta/src/routes/channels/message_edit.rs
index 2b5d24f7..53426ec0 100644
--- a/crates/delta/src/routes/channels/message_edit.rs
+++ b/crates/delta/src/routes/channels/message_edit.rs
@@ -18,8 +18,8 @@ use validator::Validate;
 pub async fn edit(
     db: &State<Database>,
     user: User,
-    target: Reference,
-    msg: Reference,
+    target: Reference<'_>,
+    msg: Reference<'_>,
     edit: Json<v0::DataEditMessage>,
 ) -> Result<Json<v0::Message>> {
     let edit = edit.into_inner();
diff --git a/crates/delta/src/routes/channels/message_fetch.rs b/crates/delta/src/routes/channels/message_fetch.rs
index b5e89685..8f09d47f 100644
--- a/crates/delta/src/routes/channels/message_fetch.rs
+++ b/crates/delta/src/routes/channels/message_fetch.rs
@@ -15,8 +15,8 @@ use rocket::{serde::json::Json, State};
 pub async fn fetch(
     db: &State<Database>,
     user: User,
-    target: Reference,
-    msg: Reference,
+    target: Reference<'_>,
+    msg: Reference<'_>,
 ) -> Result<Json<v0::Message>> {
     let channel = target.as_channel(db).await?;
     let mut query = DatabasePermissionQuery::new(db, &user).channel(&channel);
diff --git a/crates/delta/src/routes/channels/message_pin.rs b/crates/delta/src/routes/channels/message_pin.rs
index 8078d35b..bcc97341 100644
--- a/crates/delta/src/routes/channels/message_pin.rs
+++ b/crates/delta/src/routes/channels/message_pin.rs
@@ -1,4 +1,7 @@
-use revolt_database::{util::{permissions::DatabasePermissionQuery, reference::Reference}, Channel, Database, PartialMessage, SystemMessage, User, AMQP};
+use revolt_database::{
+    util::{permissions::DatabasePermissionQuery, reference::Reference},
+    Channel, Database, PartialMessage, SystemMessage, User, AMQP,
+};
 use revolt_models::v0::MessageAuthor;
 use revolt_permissions::{calculate_channel_permissions, ChannelPermission};
 use revolt_result::{create_error, Result};
@@ -14,8 +17,8 @@ pub async fn message_pin(
     db: &State<Database>,
     amqp: &State<AMQP>,
     user: User,
-    target: Reference,
-    msg: Reference,
+    target: Reference<'_>,
+    msg: Reference<'_>,
 ) -> Result<EmptyResponse> {
     let channel = target.as_channel(db).await?;
 
@@ -169,7 +172,7 @@ mod test {
             })
             .await;
 
-        let updated_message = Reference::from_unchecked(message.id)
+        let updated_message = Reference::from_unchecked(&message.id)
             .as_message(&harness.db)
             .await
             .expect("Failed to find updated message");
diff --git a/crates/delta/src/routes/channels/message_query.rs b/crates/delta/src/routes/channels/message_query.rs
index 5193bd02..27df85e4 100644
--- a/crates/delta/src/routes/channels/message_query.rs
+++ b/crates/delta/src/routes/channels/message_query.rs
@@ -16,7 +16,7 @@ use validator::Validate;
 pub async fn query(
     db: &State<Database>,
     user: User,
-    target: Reference,
+    target: Reference<'_>,
     options: v0::OptionsQueryMessages,
 ) -> Result<Json<v0::BulkMessageResponse>> {
     options.validate().map_err(|error| {
diff --git a/crates/delta/src/routes/channels/message_react.rs b/crates/delta/src/routes/channels/message_react.rs
index 5acb00f6..6d3edb2a 100644
--- a/crates/delta/src/routes/channels/message_react.rs
+++ b/crates/delta/src/routes/channels/message_react.rs
@@ -15,9 +15,9 @@ use rocket_empty::EmptyResponse;
 pub async fn react_message(
     db: &State<Database>,
     user: User,
-    target: Reference,
-    msg: Reference,
-    emoji: Reference,
+    target: Reference<'_>,
+    msg: Reference<'_>,
+    emoji: Reference<'_>,
 ) -> Result<EmptyResponse> {
     let channel = target.as_channel(db).await?;
     let mut query = DatabasePermissionQuery::new(db, &user).channel(&channel);
@@ -30,7 +30,7 @@ pub async fn react_message(
 
     // Add the reaction
     message
-        .add_reaction(db, &user, &emoji.id)
+        .add_reaction(db, &user, emoji.id)
         .await
         .map(|_| EmptyResponse)
 }
diff --git a/crates/delta/src/routes/channels/message_search.rs b/crates/delta/src/routes/channels/message_search.rs
index eb173bc0..85676823 100644
--- a/crates/delta/src/routes/channels/message_search.rs
+++ b/crates/delta/src/routes/channels/message_search.rs
@@ -16,7 +16,7 @@ use validator::Validate;
 pub async fn search(
     db: &State<Database>,
     user: User,
-    target: Reference,
+    target: Reference<'_>,
     options: Json<v0::DataMessageSearch>,
 ) -> Result<Json<v0::BulkMessageResponse>> {
     if user.bot.is_some() {
diff --git a/crates/delta/src/routes/channels/message_send.rs b/crates/delta/src/routes/channels/message_send.rs
index 704b9101..cb05f94b 100644
--- a/crates/delta/src/routes/channels/message_send.rs
+++ b/crates/delta/src/routes/channels/message_send.rs
@@ -21,7 +21,7 @@ pub async fn message_send(
     db: &State<Database>,
     amqp: &State<AMQP>,
     user: User,
-    target: Reference,
+    target: Reference<'_>,
     data: Json<v0::DataMessageSend>,
     idempotency: IdempotencyKey,
 ) -> Result<Json<v0::Message>> {
@@ -202,7 +202,7 @@ mod test {
         Member::create(&harness.db, &server, &user, Some(channels.clone()))
             .await
             .expect("Failed to create member");
-        let member = Reference::from_unchecked(user.id.clone())
+        let member = Reference::from_unchecked(&user.id)
             .as_member(&harness.db, &server.id)
             .await
             .expect("Failed to get member");
@@ -242,7 +242,7 @@ mod test {
         Member::create(&harness.db, &server, &second_user, Some(channels.clone()))
             .await
             .expect("Failed to create second member");
-        let mut second_member = Reference::from_unchecked(second_user.id.clone())
+        let mut second_member = Reference::from_unchecked(&second_user.id)
             .as_member(&harness.db, &server.id)
             .await
             .expect("Failed to get second member");
diff --git a/crates/delta/src/routes/channels/message_unpin.rs b/crates/delta/src/routes/channels/message_unpin.rs
index 7fe5fba9..3770606d 100644
--- a/crates/delta/src/routes/channels/message_unpin.rs
+++ b/crates/delta/src/routes/channels/message_unpin.rs
@@ -14,8 +14,8 @@ pub async fn message_unpin(
     db: &State<Database>,
     amqp: &State<AMQP>,
     user: User,
-    target: Reference,
-    msg: Reference,
+    target: Reference<'_>,
+    msg: Reference<'_>,
 ) -> Result<EmptyResponse> {
     let channel = target.as_channel(db).await?;
 
@@ -91,7 +91,7 @@ mod test {
         Member::create(&harness.db, &server, &user, Some(channels.clone()))
             .await
             .expect("Failed to create member");
-        let member = Reference::from_unchecked(user.id.clone())
+        let member = Reference::from_unchecked(&user.id)
             .as_member(&harness.db, &server.id)
             .await
             .expect("Failed to get member");
@@ -174,7 +174,7 @@ mod test {
             })
             .await;
 
-        let updated_message = Reference::from_unchecked(message.id)
+        let updated_message = Reference::from_unchecked(&message.id)
             .as_message(&harness.db)
             .await
             .expect("Failed to find updated message");
diff --git a/crates/delta/src/routes/channels/message_unreact.rs b/crates/delta/src/routes/channels/message_unreact.rs
index d1692d7b..285a1c43 100644
--- a/crates/delta/src/routes/channels/message_unreact.rs
+++ b/crates/delta/src/routes/channels/message_unreact.rs
@@ -18,9 +18,9 @@ use rocket_empty::EmptyResponse;
 pub async fn unreact_message(
     db: &State<Database>,
     user: User,
-    target: Reference,
-    msg: Reference,
-    emoji: Reference,
+    target: Reference<'_>,
+    msg: Reference<'_>,
+    emoji: Reference<'_>,
     options: v0::OptionsUnreact,
 ) -> Result<EmptyResponse> {
     let channel = target.as_channel(db).await?;
@@ -41,14 +41,14 @@ pub async fn unreact_message(
     // Check if we should wipe all of this reaction
     if remove_all {
         return message
-            .clear_reaction(db, &emoji.id)
+            .clear_reaction(db, emoji.id)
             .await
             .map(|_| EmptyResponse);
     }
 
     // Remove the reaction
     message
-        .remove_reaction(db, options.user_id.as_ref().unwrap_or(&user.id), &emoji.id)
+        .remove_reaction(db, options.user_id.as_ref().unwrap_or(&user.id), emoji.id)
         .await
         .map(|_| EmptyResponse)
 }
diff --git a/crates/delta/src/routes/channels/permissions_set.rs b/crates/delta/src/routes/channels/permissions_set.rs
index 70ded35d..ee42e403 100644
--- a/crates/delta/src/routes/channels/permissions_set.rs
+++ b/crates/delta/src/routes/channels/permissions_set.rs
@@ -17,7 +17,7 @@ use rocket::{serde::json::Json, State};
 pub async fn set_role_permissions(
     db: &State<Database>,
     user: User,
-    target: Reference,
+    target: Reference<'_>,
     role_id: String,
     data: Json<v0::DataSetRolePermissions>,
 ) -> Result<Json<v0::Channel>> {
diff --git a/crates/delta/src/routes/channels/permissions_set_default.rs b/crates/delta/src/routes/channels/permissions_set_default.rs
index b69390a7..700b29e4 100644
--- a/crates/delta/src/routes/channels/permissions_set_default.rs
+++ b/crates/delta/src/routes/channels/permissions_set_default.rs
@@ -17,7 +17,7 @@ use rocket::{serde::json::Json, State};
 pub async fn set_default_channel_permissions(
     db: &State<Database>,
     user: User,
-    target: Reference,
+    target: Reference<'_>,
     data: Json<v0::DataDefaultChannelPermissions>,
 ) -> Result<Json<v0::Channel>> {
     let data = data.into_inner();
diff --git a/crates/delta/src/routes/channels/voice_join.rs b/crates/delta/src/routes/channels/voice_join.rs
index b15d59c0..c04e0011 100644
--- a/crates/delta/src/routes/channels/voice_join.rs
+++ b/crates/delta/src/routes/channels/voice_join.rs
@@ -16,7 +16,7 @@ use rocket::{serde::json::Json, State};
 pub async fn call(
     db: &State<Database>,
     user: User,
-    target: Reference,
+    target: Reference<'_>,
 ) -> Result<Json<v0::LegacyCreateVoiceUserResponse>> {
     let channel = target.as_channel(db).await?;
     let mut query = DatabasePermissionQuery::new(db, &user).channel(&channel);
diff --git a/crates/delta/src/routes/channels/webhook_create.rs b/crates/delta/src/routes/channels/webhook_create.rs
index f17c64ff..71f8e8de 100644
--- a/crates/delta/src/routes/channels/webhook_create.rs
+++ b/crates/delta/src/routes/channels/webhook_create.rs
@@ -19,7 +19,7 @@ use validator::Validate;
 pub async fn create_webhook(
     db: &State<Database>,
     user: User,
-    target: Reference,
+    target: Reference<'_>,
     data: Json<v0::CreateWebhookBody>,
 ) -> Result<Json<v0::Webhook>> {
     let data = data.into_inner();
diff --git a/crates/delta/src/routes/channels/webhook_fetch_all.rs b/crates/delta/src/routes/channels/webhook_fetch_all.rs
index 6afc7ac8..4c4fdfd8 100644
--- a/crates/delta/src/routes/channels/webhook_fetch_all.rs
+++ b/crates/delta/src/routes/channels/webhook_fetch_all.rs
@@ -15,7 +15,7 @@ use rocket::{serde::json::Json, State};
 pub async fn fetch_webhooks(
     db: &State<Database>,
     user: User,
-    channel_id: Reference,
+    channel_id: Reference<'_>,
 ) -> Result<Json<Vec<Webhook>>> {
     let channel = channel_id.as_channel(db).await?;
 
diff --git a/crates/delta/src/routes/customisation/emoji_delete.rs b/crates/delta/src/routes/customisation/emoji_delete.rs
index 05d89eb0..155d730d 100644
--- a/crates/delta/src/routes/customisation/emoji_delete.rs
+++ b/crates/delta/src/routes/customisation/emoji_delete.rs
@@ -16,7 +16,7 @@ use rocket_empty::EmptyResponse;
 pub async fn delete_emoji(
     db: &State<Database>,
     user: User,
-    emoji_id: Reference,
+    emoji_id: Reference<'_>,
 ) -> Result<EmptyResponse> {
     // Fetch the emoji
     let emoji = emoji_id.as_emoji(db).await?;
@@ -26,7 +26,7 @@ pub async fn delete_emoji(
         // Otherwise, validate we have permission to delete from parent
         match &emoji.parent {
             EmojiParent::Server { id } => {
-                let server = db.fetch_server(id).await?;
+                let server = db.fetch_server(id.as_str()).await?;
 
                 // Check for permission
                 let mut query = DatabasePermissionQuery::new(db, &user).server(&server);
diff --git a/crates/delta/src/routes/customisation/emoji_fetch.rs b/crates/delta/src/routes/customisation/emoji_fetch.rs
index 375ebe59..cdc9aaed 100644
--- a/crates/delta/src/routes/customisation/emoji_fetch.rs
+++ b/crates/delta/src/routes/customisation/emoji_fetch.rs
@@ -9,7 +9,7 @@ use rocket::{serde::json::Json, State};
 /// Fetch an emoji by its id.
 #[openapi(tag = "Emojis")]
 #[get("/emoji/<emoji_id>")]
-pub async fn fetch_emoji(db: &State<Database>, emoji_id: Reference) -> Result<Json<v0::Emoji>> {
+pub async fn fetch_emoji(db: &State<Database>, emoji_id: Reference<'_>) -> Result<Json<v0::Emoji>> {
     emoji_id
         .as_emoji(db)
         .await
diff --git a/crates/delta/src/routes/invites/invite_delete.rs b/crates/delta/src/routes/invites/invite_delete.rs
index a13c3953..cbdc5db5 100644
--- a/crates/delta/src/routes/invites/invite_delete.rs
+++ b/crates/delta/src/routes/invites/invite_delete.rs
@@ -12,7 +12,7 @@ use rocket_empty::EmptyResponse;
 /// Delete an invite by its id.
 #[openapi(tag = "Invites")]
 #[delete("/<target>")]
-pub async fn delete(db: &State<Database>, user: User, target: Reference) -> Result<EmptyResponse> {
+pub async fn delete(db: &State<Database>, user: User, target: Reference<'_>) -> Result<EmptyResponse> {
     let invite = target.as_invite(db).await?;
 
     if user.id == invite.creator() {
diff --git a/crates/delta/src/routes/invites/invite_fetch.rs b/crates/delta/src/routes/invites/invite_fetch.rs
index 306a680e..7c44d4ae 100644
--- a/crates/delta/src/routes/invites/invite_fetch.rs
+++ b/crates/delta/src/routes/invites/invite_fetch.rs
@@ -8,7 +8,7 @@ use rocket::{serde::json::Json, State};
 /// Fetch an invite by its id.
 #[openapi(tag = "Invites")]
 #[get("/<target>")]
-pub async fn fetch(db: &State<Database>, target: Reference) -> Result<Json<v0::InviteResponse>> {
+pub async fn fetch(db: &State<Database>, target: Reference<'_>) -> Result<Json<v0::InviteResponse>> {
     Ok(Json(match target.as_invite(db).await? {
         Invite::Server {
             channel, creator, ..
@@ -34,7 +34,7 @@ pub async fn fetch(db: &State<Database>, target: Reference) -> Result<Json<v0::I
                     let server = db.fetch_server(&server).await?;
 
                     v0::InviteResponse::Server {
-                        code: target.id,
+                        code: target.id.to_string(),
                         member_count: db.fetch_member_count(&server.id).await? as i64,
                         server_id: server.id,
                         server_name: server.name,
@@ -64,7 +64,7 @@ pub async fn fetch(db: &State<Database>, target: Reference) -> Result<Json<v0::I
                     description,
                     ..
                 } => v0::InviteResponse::Group {
-                    code: target.id,
+                    code: target.id.to_string(),
                     channel_id: id,
                     channel_name: name,
                     channel_description: description,
diff --git a/crates/delta/src/routes/invites/invite_join.rs b/crates/delta/src/routes/invites/invite_join.rs
index 83b59195..a18213f3 100644
--- a/crates/delta/src/routes/invites/invite_join.rs
+++ b/crates/delta/src/routes/invites/invite_join.rs
@@ -12,7 +12,7 @@ pub async fn join(
     db: &State<Database>,
     amqp: &State<AMQP>,
     user: User,
-    target: Reference,
+    target: Reference<'_>,
 ) -> Result<Json<v0::InviteJoinResponse>> {
     if user.bot.is_some() {
         return Err(create_error!(IsBot));
diff --git a/crates/delta/src/routes/servers/ban_create.rs b/crates/delta/src/routes/servers/ban_create.rs
index a73be114..13c0ef3b 100644
--- a/crates/delta/src/routes/servers/ban_create.rs
+++ b/crates/delta/src/routes/servers/ban_create.rs
@@ -17,8 +17,8 @@ use validator::Validate;
 pub async fn ban(
     db: &State<Database>,
     user: User,
-    server: Reference,
-    target: Reference,
+    server: Reference<'_>,
+    target: Reference<'_>,
     data: Json<v0::DataBanCreate>,
 ) -> Result<Json<v0::ServerBan>> {
     let data = data.into_inner();
@@ -56,7 +56,7 @@ pub async fn ban(
             .await?;
     }
 
-    ServerBan::create(db, &server, &target.id, data.reason)
+    ServerBan::create(db, &server, target.id, data.reason)
         .await
         .map(Into::into)
         .map(Json)
diff --git a/crates/delta/src/routes/servers/ban_list.rs b/crates/delta/src/routes/servers/ban_list.rs
index 457fd98e..827e7dc3 100644
--- a/crates/delta/src/routes/servers/ban_list.rs
+++ b/crates/delta/src/routes/servers/ban_list.rs
@@ -17,7 +17,7 @@ use rocket::State;
 pub async fn list(
     db: &State<Database>,
     user: User,
-    target: Reference,
+    target: Reference<'_>,
 ) -> Result<Json<v0::BanListResult>> {
     let server = target.as_server(db).await?;
     let mut query = DatabasePermissionQuery::new(db, &user).server(&server);
diff --git a/crates/delta/src/routes/servers/ban_remove.rs b/crates/delta/src/routes/servers/ban_remove.rs
index 3b1b7285..f01bc8b0 100644
--- a/crates/delta/src/routes/servers/ban_remove.rs
+++ b/crates/delta/src/routes/servers/ban_remove.rs
@@ -15,8 +15,8 @@ use rocket_empty::EmptyResponse;
 pub async fn unban(
     db: &State<Database>,
     user: User,
-    server: Reference,
-    target: Reference,
+    server: Reference<'_>,
+    target: Reference<'_>,
 ) -> Result<EmptyResponse> {
     let server = server.as_server(db).await?;
     let mut query = DatabasePermissionQuery::new(db, &user).server(&server);
diff --git a/crates/delta/src/routes/servers/channel_create.rs b/crates/delta/src/routes/servers/channel_create.rs
index ae35bb46..53aa616d 100644
--- a/crates/delta/src/routes/servers/channel_create.rs
+++ b/crates/delta/src/routes/servers/channel_create.rs
@@ -16,7 +16,7 @@ use validator::Validate;
 pub async fn create_server_channel(
     db: &State<Database>,
     user: User,
-    server: Reference,
+    server: Reference<'_>,
     data: Json<v0::DataCreateServerChannel>,
 ) -> Result<Json<v0::Channel>> {
     let data = data.into_inner();
diff --git a/crates/delta/src/routes/servers/emoji_list.rs b/crates/delta/src/routes/servers/emoji_list.rs
index 405e5d43..bd19c73e 100644
--- a/crates/delta/src/routes/servers/emoji_list.rs
+++ b/crates/delta/src/routes/servers/emoji_list.rs
@@ -15,7 +15,7 @@ use rocket::{serde::json::Json, State};
 pub async fn list_emoji(
     db: &State<Database>,
     user: User,
-    target: Reference,
+    target: Reference<'_>,
 ) -> Result<Json<Vec<v0::Emoji>>> {
     let server = target.as_server(db).await?;
     let mut query = DatabasePermissionQuery::new(db, &user).server(&server);
diff --git a/crates/delta/src/routes/servers/invites_fetch.rs b/crates/delta/src/routes/servers/invites_fetch.rs
index 05958485..b6314207 100644
--- a/crates/delta/src/routes/servers/invites_fetch.rs
+++ b/crates/delta/src/routes/servers/invites_fetch.rs
@@ -15,7 +15,7 @@ use rocket::{serde::json::Json, State};
 pub async fn invites(
     db: &State<Database>,
     user: User,
-    target: Reference,
+    target: Reference<'_>,
 ) -> Result<Json<Vec<v0::Invite>>> {
     let server = target.as_server(db).await?;
     let mut query = DatabasePermissionQuery::new(db, &user).server(&server);
diff --git a/crates/delta/src/routes/servers/member_edit.rs b/crates/delta/src/routes/servers/member_edit.rs
index ef3ff663..e33935e8 100644
--- a/crates/delta/src/routes/servers/member_edit.rs
+++ b/crates/delta/src/routes/servers/member_edit.rs
@@ -19,8 +19,8 @@ use validator::Validate;
 pub async fn edit(
     db: &State<Database>,
     user: User,
-    server: Reference,
-    member: Reference,
+    server: Reference<'_>,
+    member: Reference<'_>,
     data: Json<v0::DataMemberEdit>,
 ) -> Result<Json<v0::Member>> {
     let data = data.into_inner();
diff --git a/crates/delta/src/routes/servers/member_experimental_query.rs b/crates/delta/src/routes/servers/member_experimental_query.rs
index 125b8db9..8126b9f2 100644
--- a/crates/delta/src/routes/servers/member_experimental_query.rs
+++ b/crates/delta/src/routes/servers/member_experimental_query.rs
@@ -36,7 +36,7 @@ pub struct MemberQueryResponse {
 pub async fn member_experimental_query(
     db: &State<Database>,
     user: User,
-    target: Reference,
+    target: Reference<'_>,
     options: OptionsQueryMembers,
 ) -> Result<Json<MemberQueryResponse>> {
     if !options.experimental_api {
diff --git a/crates/delta/src/routes/servers/member_fetch.rs b/crates/delta/src/routes/servers/member_fetch.rs
index b1f39740..c05935be 100644
--- a/crates/delta/src/routes/servers/member_fetch.rs
+++ b/crates/delta/src/routes/servers/member_fetch.rs
@@ -15,8 +15,8 @@ use rocket::{serde::json::Json, State};
 pub async fn fetch(
     db: &State<Database>,
     user: User,
-    target: Reference,
-    member: Reference,
+    target: Reference<'_>,
+    member: Reference<'_>,
     roles: Option<bool>,
 ) -> Result<Json<v0::MemberResponse>> {
     let server = target.as_server(db).await?;
diff --git a/crates/delta/src/routes/servers/member_fetch_all.rs b/crates/delta/src/routes/servers/member_fetch_all.rs
index 29997668..cc85b968 100644
--- a/crates/delta/src/routes/servers/member_fetch_all.rs
+++ b/crates/delta/src/routes/servers/member_fetch_all.rs
@@ -15,7 +15,7 @@ use rocket::{serde::json::Json, State};
 pub async fn fetch_all(
     db: &State<Database>,
     user: User,
-    target: Reference,
+    target: Reference<'_>,
     options: v0::OptionsFetchAllMembers,
 ) -> Result<Json<v0::AllMemberResponse>> {
     let server = target.as_server(db).await?;
diff --git a/crates/delta/src/routes/servers/member_remove.rs b/crates/delta/src/routes/servers/member_remove.rs
index a7e2f50a..23004267 100644
--- a/crates/delta/src/routes/servers/member_remove.rs
+++ b/crates/delta/src/routes/servers/member_remove.rs
@@ -15,8 +15,8 @@ use rocket_empty::EmptyResponse;
 pub async fn kick(
     db: &State<Database>,
     user: User,
-    target: Reference,
-    member: Reference,
+    target: Reference<'_>,
+    member: Reference<'_>,
 ) -> Result<EmptyResponse> {
     let server = target.as_server(db).await?;
 
diff --git a/crates/delta/src/routes/servers/permissions_set.rs b/crates/delta/src/routes/servers/permissions_set.rs
index 0c293aa8..f0d8099f 100644
--- a/crates/delta/src/routes/servers/permissions_set.rs
+++ b/crates/delta/src/routes/servers/permissions_set.rs
@@ -15,7 +15,7 @@ use rocket::{serde::json::Json, State};
 pub async fn set_role_permission(
     db: &State<Database>,
     user: User,
-    target: Reference,
+    target: Reference<'_>,
     role_id: String,
     data: Json<v0::DataSetServerRolePermission>,
 ) -> Result<Json<v0::Server>> {
diff --git a/crates/delta/src/routes/servers/permissions_set_default.rs b/crates/delta/src/routes/servers/permissions_set_default.rs
index 504bba72..6ee5b813 100644
--- a/crates/delta/src/routes/servers/permissions_set_default.rs
+++ b/crates/delta/src/routes/servers/permissions_set_default.rs
@@ -17,7 +17,7 @@ use rocket::{serde::json::Json, State};
 pub async fn set_default_server_permissions(
     db: &State<Database>,
     user: User,
-    target: Reference,
+    target: Reference<'_>,
     data: Json<DataPermissionsValue>,
 ) -> Result<Json<v0::Server>> {
     let data = data.into_inner();
diff --git a/crates/delta/src/routes/servers/roles_create.rs b/crates/delta/src/routes/servers/roles_create.rs
index fe82e578..e68d5ea6 100644
--- a/crates/delta/src/routes/servers/roles_create.rs
+++ b/crates/delta/src/routes/servers/roles_create.rs
@@ -17,7 +17,7 @@ use validator::Validate;
 pub async fn create(
     db: &State<Database>,
     user: User,
-    target: Reference,
+    target: Reference<'_>,
     data: Json<v0::DataCreateRole>,
 ) -> Result<Json<v0::NewRoleResponse>> {
     let data = data.into_inner();
diff --git a/crates/delta/src/routes/servers/roles_delete.rs b/crates/delta/src/routes/servers/roles_delete.rs
index 9063dae2..6867b647 100644
--- a/crates/delta/src/routes/servers/roles_delete.rs
+++ b/crates/delta/src/routes/servers/roles_delete.rs
@@ -15,7 +15,7 @@ use rocket_empty::EmptyResponse;
 pub async fn delete(
     db: &State<Database>,
     user: User,
-    target: Reference,
+    target: Reference<'_>,
     role_id: String,
 ) -> Result<EmptyResponse> {
     let mut server = target.as_server(db).await?;
diff --git a/crates/delta/src/routes/servers/roles_edit.rs b/crates/delta/src/routes/servers/roles_edit.rs
index be62a9b2..f18bd7d3 100644
--- a/crates/delta/src/routes/servers/roles_edit.rs
+++ b/crates/delta/src/routes/servers/roles_edit.rs
@@ -16,7 +16,7 @@ use validator::Validate;
 pub async fn edit(
     db: &State<Database>,
     user: User,
-    target: Reference,
+    target: Reference<'_>,
     role_id: String,
     data: Json<v0::DataEditRole>,
 ) -> Result<Json<v0::Role>> {
diff --git a/crates/delta/src/routes/servers/roles_edit_positions.rs b/crates/delta/src/routes/servers/roles_edit_positions.rs
index 59614162..d27259e5 100644
--- a/crates/delta/src/routes/servers/roles_edit_positions.rs
+++ b/crates/delta/src/routes/servers/roles_edit_positions.rs
@@ -15,7 +15,7 @@ use rocket::{serde::json::Json, State};
 pub async fn edit_role_ranks(
     db: &State<Database>,
     user: User,
-    target: Reference,
+    target: Reference<'_>,
     data: Json<v0::DataEditRoleRanks>,
 ) -> Result<Json<v0::Server>> {
     let data = data.into_inner();
diff --git a/crates/delta/src/routes/servers/roles_fetch.rs b/crates/delta/src/routes/servers/roles_fetch.rs
index 5c646b44..d26365a9 100644
--- a/crates/delta/src/routes/servers/roles_fetch.rs
+++ b/crates/delta/src/routes/servers/roles_fetch.rs
@@ -15,7 +15,7 @@ use rocket::{serde::json::Json, State};
 pub async fn fetch(
     db: &State<Database>,
     user: User,
-    target: Reference,
+    target: Reference<'_>,
     role_id: String,
 ) -> Result<Json<v0::Role>> {
     let mut server = target.as_server(db).await?;
diff --git a/crates/delta/src/routes/servers/server_ack.rs b/crates/delta/src/routes/servers/server_ack.rs
index d70eefec..789617e1 100644
--- a/crates/delta/src/routes/servers/server_ack.rs
+++ b/crates/delta/src/routes/servers/server_ack.rs
@@ -12,7 +12,7 @@ use rocket_empty::EmptyResponse;
 /// Mark all channels in a server as read.
 #[openapi(tag = "Server Information")]
 #[put("/<target>/ack")]
-pub async fn ack(db: &State<Database>, user: User, target: Reference) -> Result<EmptyResponse> {
+pub async fn ack(db: &State<Database>, user: User, target: Reference<'_>) -> Result<EmptyResponse> {
     if user.bot.is_some() {
         return Err(create_error!(IsBot));
     }
diff --git a/crates/delta/src/routes/servers/server_delete.rs b/crates/delta/src/routes/servers/server_delete.rs
index 28a3bf42..1302db5b 100644
--- a/crates/delta/src/routes/servers/server_delete.rs
+++ b/crates/delta/src/routes/servers/server_delete.rs
@@ -13,11 +13,11 @@ use rocket_empty::EmptyResponse;
 pub async fn delete(
     db: &State<Database>,
     user: User,
-    target: Reference,
+    target: Reference<'_>,
     options: v0::OptionsServerDelete,
 ) -> Result<EmptyResponse> {
     let server = target.as_server(db).await?;
-    let member = db.fetch_member(&target.id, &user.id).await?;
+    let member = db.fetch_member(target.id, &user.id).await?;
 
     if server.owner == user.id {
         server.delete(db).await
diff --git a/crates/delta/src/routes/servers/server_edit.rs b/crates/delta/src/routes/servers/server_edit.rs
index 8616e154..23d79c34 100644
--- a/crates/delta/src/routes/servers/server_edit.rs
+++ b/crates/delta/src/routes/servers/server_edit.rs
@@ -18,7 +18,7 @@ use validator::Validate;
 pub async fn edit(
     db: &State<Database>,
     user: User,
-    target: Reference,
+    target: Reference<'_>,
     data: Json<v0::DataEditServer>,
 ) -> Result<Json<v0::Server>> {
     let data = data.into_inner();
diff --git a/crates/delta/src/routes/servers/server_fetch.rs b/crates/delta/src/routes/servers/server_fetch.rs
index e668021c..82eb0c7c 100644
--- a/crates/delta/src/routes/servers/server_fetch.rs
+++ b/crates/delta/src/routes/servers/server_fetch.rs
@@ -15,7 +15,7 @@ use rocket::{serde::json::Json, State};
 pub async fn fetch(
     db: &State<Database>,
     user: User,
-    target: Reference,
+    target: Reference<'_>,
     options: v0::OptionsFetchServer,
 ) -> Result<Json<v0::FetchServerResponse>> {
     let server = target.as_server(db).await?;
diff --git a/crates/delta/src/routes/users/add_friend.rs b/crates/delta/src/routes/users/add_friend.rs
index b7728d0e..946c3296 100644
--- a/crates/delta/src/routes/users/add_friend.rs
+++ b/crates/delta/src/routes/users/add_friend.rs
@@ -14,7 +14,7 @@ pub async fn add(
     db: &State<Database>,
     amqp: &State<AMQP>,
     mut user: User,
-    target: Reference,
+    target: Reference<'_>,
 ) -> Result<Json<v0::User>> {
     let mut target = target.as_user(db).await?;
 
diff --git a/crates/delta/src/routes/users/block_user.rs b/crates/delta/src/routes/users/block_user.rs
index 0e6498aa..cfce993c 100644
--- a/crates/delta/src/routes/users/block_user.rs
+++ b/crates/delta/src/routes/users/block_user.rs
@@ -13,7 +13,7 @@ use rocket::State;
 pub async fn block(
     db: &State<Database>,
     mut user: User,
-    target: Reference,
+    target: Reference<'_>,
 ) -> Result<Json<v0::User>> {
     let mut target = target.as_user(db).await?;
 
diff --git a/crates/delta/src/routes/users/edit_user.rs b/crates/delta/src/routes/users/edit_user.rs
index de8aa002..535fc05c 100644
--- a/crates/delta/src/routes/users/edit_user.rs
+++ b/crates/delta/src/routes/users/edit_user.rs
@@ -14,7 +14,7 @@ use validator::Validate;
 pub async fn edit(
     db: &State<Database>,
     mut user: User,
-    target: Reference,
+    target: Reference<'_>,
     data: Json<v0::DataEditUser>,
 ) -> Result<Json<v0::User>> {
     let data = data.into_inner();
diff --git a/crates/delta/src/routes/users/fetch_profile.rs b/crates/delta/src/routes/users/fetch_profile.rs
index 66acacfa..e0718d4b 100644
--- a/crates/delta/src/routes/users/fetch_profile.rs
+++ b/crates/delta/src/routes/users/fetch_profile.rs
@@ -17,7 +17,7 @@ use rocket::{serde::json::Json, State};
 pub async fn profile(
     db: &State<Database>,
     user: User,
-    target: Reference,
+    target: Reference<'_>,
 ) -> Result<Json<v0::UserProfile>> {
     if user.id == target.id {
         return Ok(Json(user.profile.map(Into::into).unwrap_or_default()));
diff --git a/crates/delta/src/routes/users/fetch_user.rs b/crates/delta/src/routes/users/fetch_user.rs
index 68be67b9..e6aba68e 100644
--- a/crates/delta/src/routes/users/fetch_user.rs
+++ b/crates/delta/src/routes/users/fetch_user.rs
@@ -13,7 +13,7 @@ use rocket::{serde::json::Json, State};
 /// Retrieve a user's information.
 #[openapi(tag = "User Information")]
 #[get("/<target>")]
-pub async fn fetch(db: &State<Database>, user: User, target: Reference) -> Result<Json<v0::User>> {
+pub async fn fetch(db: &State<Database>, user: User, target: Reference<'_>) -> Result<Json<v0::User>> {
     if user.id == target.id {
         return Ok(Json(user.into_self(false).await));
     }
diff --git a/crates/delta/src/routes/users/fetch_user_flags.rs b/crates/delta/src/routes/users/fetch_user_flags.rs
index 92377a57..df021abb 100644
--- a/crates/delta/src/routes/users/fetch_user_flags.rs
+++ b/crates/delta/src/routes/users/fetch_user_flags.rs
@@ -10,7 +10,7 @@ use rocket::{serde::json::Json, State};
 #[get("/<target>/flags")]
 pub async fn fetch_user_flags(
     db: &State<Database>,
-    target: Reference,
+    target: Reference<'_>,
 ) -> Result<Json<v0::FlagResponse>> {
     let flags = if let Ok(target) = target.as_user(db).await {
         target.flags.unwrap_or_default()
diff --git a/crates/delta/src/routes/users/find_mutual.rs b/crates/delta/src/routes/users/find_mutual.rs
index 8f3de313..9f7fd950 100644
--- a/crates/delta/src/routes/users/find_mutual.rs
+++ b/crates/delta/src/routes/users/find_mutual.rs
@@ -16,7 +16,7 @@ use rocket::State;
 pub async fn mutual(
     db: &State<Database>,
     user: User,
-    target: Reference,
+    target: Reference<'_>,
 ) -> Result<Json<v0::MutualResponse>> {
     if target.id == user.id {
         return Err(create_error!(InvalidOperation));
diff --git a/crates/delta/src/routes/users/open_dm.rs b/crates/delta/src/routes/users/open_dm.rs
index a01fa09a..78486523 100644
--- a/crates/delta/src/routes/users/open_dm.rs
+++ b/crates/delta/src/routes/users/open_dm.rs
@@ -17,7 +17,7 @@ use rocket::{serde::json::Json, State};
 pub async fn open_dm(
     db: &State<Database>,
     user: User,
-    target: Reference,
+    target: Reference<'_>,
 ) -> Result<Json<v0::Channel>> {
     let target = target.as_user(db).await?;
 
diff --git a/crates/delta/src/routes/users/remove_friend.rs b/crates/delta/src/routes/users/remove_friend.rs
index 6ae38eeb..59b85ecb 100644
--- a/crates/delta/src/routes/users/remove_friend.rs
+++ b/crates/delta/src/routes/users/remove_friend.rs
@@ -13,7 +13,7 @@ use rocket::State;
 pub async fn remove(
     db: &State<Database>,
     mut user: User,
-    target: Reference,
+    target: Reference<'_>,
 ) -> Result<Json<v0::User>> {
     let mut target = target.as_user(db).await?;
 
diff --git a/crates/delta/src/routes/users/unblock_user.rs b/crates/delta/src/routes/users/unblock_user.rs
index d379c665..a464ecc5 100644
--- a/crates/delta/src/routes/users/unblock_user.rs
+++ b/crates/delta/src/routes/users/unblock_user.rs
@@ -13,7 +13,7 @@ use rocket::State;
 pub async fn unblock(
     db: &State<Database>,
     mut user: User,
-    target: Reference,
+    target: Reference<'_>,
 ) -> Result<Json<v0::User>> {
     let mut target = target.as_user(db).await?;
 
diff --git a/crates/delta/src/routes/webhooks/webhook_delete.rs b/crates/delta/src/routes/webhooks/webhook_delete.rs
index 2a5bbc35..fcd428d3 100644
--- a/crates/delta/src/routes/webhooks/webhook_delete.rs
+++ b/crates/delta/src/routes/webhooks/webhook_delete.rs
@@ -15,7 +15,7 @@ use rocket_empty::EmptyResponse;
 pub async fn webhook_delete(
     db: &State<Database>,
     user: User,
-    webhook_id: Reference,
+    webhook_id: Reference<'_>,
 ) -> Result<EmptyResponse> {
     let webhook = webhook_id.as_webhook(db).await?;
     let channel = db.fetch_channel(&webhook.channel_id).await?;
diff --git a/crates/delta/src/routes/webhooks/webhook_delete_token.rs b/crates/delta/src/routes/webhooks/webhook_delete_token.rs
index c5435302..aa5fc2e9 100644
--- a/crates/delta/src/routes/webhooks/webhook_delete_token.rs
+++ b/crates/delta/src/routes/webhooks/webhook_delete_token.rs
@@ -10,7 +10,7 @@ use rocket_empty::EmptyResponse;
 #[delete("/<webhook_id>/<token>")]
 pub async fn webhook_delete_token(
     db: &State<Database>,
-    webhook_id: Reference,
+    webhook_id: Reference<'_>,
     token: String,
 ) -> Result<EmptyResponse> {
     let webhook = webhook_id.as_webhook(db).await?;
diff --git a/crates/delta/src/routes/webhooks/webhook_edit.rs b/crates/delta/src/routes/webhooks/webhook_edit.rs
index 42a54f1a..aa06930a 100644
--- a/crates/delta/src/routes/webhooks/webhook_edit.rs
+++ b/crates/delta/src/routes/webhooks/webhook_edit.rs
@@ -15,7 +15,7 @@ use validator::Validate;
 #[patch("/<webhook_id>", data = "<data>")]
 pub async fn webhook_edit(
     db: &State<Database>,
-    webhook_id: Reference,
+    webhook_id: Reference<'_>,
     user: User,
     data: Json<DataEditWebhook>,
 ) -> Result<Json<Webhook>> {
diff --git a/crates/delta/src/routes/webhooks/webhook_edit_token.rs b/crates/delta/src/routes/webhooks/webhook_edit_token.rs
index 8690f420..4f4dde0d 100644
--- a/crates/delta/src/routes/webhooks/webhook_edit_token.rs
+++ b/crates/delta/src/routes/webhooks/webhook_edit_token.rs
@@ -12,7 +12,7 @@ use rocket::{serde::json::Json, State};
 #[patch("/<webhook_id>/<token>", data = "<data>")]
 pub async fn webhook_edit_token(
     db: &State<Database>,
-    webhook_id: Reference,
+    webhook_id: Reference<'_>,
     token: String,
     data: Json<DataEditWebhook>,
 ) -> Result<Json<Webhook>> {
diff --git a/crates/delta/src/routes/webhooks/webhook_execute.rs b/crates/delta/src/routes/webhooks/webhook_execute.rs
index 4d64688d..f46004f7 100644
--- a/crates/delta/src/routes/webhooks/webhook_execute.rs
+++ b/crates/delta/src/routes/webhooks/webhook_execute.rs
@@ -18,7 +18,7 @@ use validator::Validate;
 pub async fn webhook_execute(
     db: &State<Database>,
     amqp: &State<AMQP>,
-    webhook_id: Reference,
+    webhook_id: Reference<'_>,
     token: String,
     data: Json<v0::DataMessageSend>,
     idempotency: IdempotencyKey,
diff --git a/crates/delta/src/routes/webhooks/webhook_execute_github.rs b/crates/delta/src/routes/webhooks/webhook_execute_github.rs
index cde16548..f84ecc63 100644
--- a/crates/delta/src/routes/webhooks/webhook_execute_github.rs
+++ b/crates/delta/src/routes/webhooks/webhook_execute_github.rs
@@ -752,7 +752,7 @@ fn convert_event(data: &str, event_name: &str) -> Result<Event> {
 pub async fn webhook_execute_github(
     db: &State<Database>,
     amqp: &State<AMQP>,
-    webhook_id: Reference,
+    webhook_id: Reference<'_>,
     token: String,
     event: EventHeader<'_>,
     data: String,
diff --git a/crates/delta/src/routes/webhooks/webhook_fetch.rs b/crates/delta/src/routes/webhooks/webhook_fetch.rs
index 28afad2f..c8569e17 100644
--- a/crates/delta/src/routes/webhooks/webhook_fetch.rs
+++ b/crates/delta/src/routes/webhooks/webhook_fetch.rs
@@ -14,7 +14,7 @@ use rocket::{serde::json::Json, State};
 #[get("/<webhook_id>")]
 pub async fn webhook_fetch(
     db: &State<Database>,
-    webhook_id: Reference,
+    webhook_id: Reference<'_>,
     user: User,
 ) -> Result<Json<ResponseWebhook>> {
     let webhook = webhook_id.as_webhook(db).await?;
diff --git a/crates/delta/src/routes/webhooks/webhook_fetch_token.rs b/crates/delta/src/routes/webhooks/webhook_fetch_token.rs
index 3ccec4f3..70c95825 100644
--- a/crates/delta/src/routes/webhooks/webhook_fetch_token.rs
+++ b/crates/delta/src/routes/webhooks/webhook_fetch_token.rs
@@ -10,7 +10,7 @@ use rocket::{serde::json::Json, State};
 #[get("/<webhook_id>/<token>")]
 pub async fn webhook_fetch_token(
     db: &State<Database>,
-    webhook_id: Reference,
+    webhook_id: Reference<'_>,
     token: String,
 ) -> Result<Json<Webhook>> {
     let webhook = webhook_id.as_webhook(db).await?;