chore: switch Reference to using an actual reference

This commit is contained in:
Zomatree
2025-08-12 03:44:29 +01:00
parent 65fbd36624
commit ed22b3a5ce
76 changed files with 133 additions and 131 deletions

View File

@@ -14,41 +14,40 @@ use crate::{
}; };
/// Reference to some object in the database /// Reference to some object in the database
#[derive(Serialize, Deserialize)] pub struct Reference<'a> {
pub struct Reference {
/// Id of object /// Id of object
pub id: String, pub id: &'a str,
} }
impl Reference { impl<'a> Reference<'a> {
/// Create a Ref from an unchecked string /// 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 } Reference { id }
} }
/// Fetch ban from Ref /// Fetch ban from Ref
pub async fn as_ban(&self, db: &Database, server: &str) -> Result<ServerBan> { 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 /// Fetch bot from Ref
pub async fn as_bot(&self, db: &Database) -> Result<Bot> { 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 /// Fetch emoji from Ref
pub async fn as_emoji(&self, db: &Database) -> Result<Emoji> { 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 /// Fetch channel from Ref
pub async fn as_channel(&self, db: &Database) -> Result<Channel> { 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 /// Fetch invite from Ref or create invite to server if discoverable
pub async fn as_invite(&self, db: &Database) -> Result<Invite> { 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?; let server = self.as_server(db).await?;
if !server.discoverable { if !server.discoverable {
return Err(create_error!(NotFound)); return Err(create_error!(NotFound));
@@ -65,18 +64,18 @@ impl Reference {
.ok_or(create_error!(NotFound))?, .ok_or(create_error!(NotFound))?,
}) })
} else { } else {
db.fetch_invite(&self.id).await db.fetch_invite(self.id).await
} }
} }
/// Fetch message from Ref /// Fetch message from Ref
pub async fn as_message(&self, db: &Database) -> Result<Message> { 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 /// Fetch message from Ref and validate channel
pub async fn as_message_in_channel(&self, db: &Database, channel: &str) -> Result<Message> { 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 { if msg.channel != channel {
return Err(create_error!(NotFound)); return Err(create_error!(NotFound));
} }
@@ -86,36 +85,36 @@ impl Reference {
/// Fetch member from Ref /// Fetch member from Ref
pub async fn as_member(&self, db: &Database, server: &str) -> Result<Member> { 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 /// Fetch server from Ref
pub async fn as_server(&self, db: &Database) -> Result<Server> { 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 /// Fetch user from Ref
pub async fn as_user(&self, db: &Database) -> Result<User> { 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 /// Fetch webhook from Ref
pub async fn as_webhook(&self, db: &Database) -> Result<Webhook> { 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")] #[cfg(feature = "rocket-impl")]
impl<'r> FromParam<'r> for Reference { impl<'r> FromParam<'r> for Reference<'r> {
type Error = &'r str; type Error = &'r str;
fn from_param(param: &'r str) -> Result<Self, Self::Error> { 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")] #[cfg(feature = "rocket-impl")]
impl JsonSchema for Reference { impl<'a> JsonSchema for Reference<'a> {
fn schema_name() -> String { fn schema_name() -> String {
"Id".to_string() "Id".to_string()
} }

View File

@@ -11,7 +11,7 @@ use rocket_empty::EmptyResponse;
pub async fn delete_bot( pub async fn delete_bot(
db: &State<Database>, db: &State<Database>,
user: User, user: User,
target: Reference, target: Reference<'_>,
) -> Result<EmptyResponse> { ) -> Result<EmptyResponse> {
let bot = target.as_bot(db).await?; let bot = target.as_bot(db).await?;
if bot.owner != user.id { if bot.owner != user.id {

View File

@@ -14,7 +14,7 @@ use validator::Validate;
pub async fn edit_bot( pub async fn edit_bot(
db: &State<Database>, db: &State<Database>,
user: User, user: User,
target: Reference, target: Reference<'_>,
data: Json<DataEditBot>, data: Json<DataEditBot>,
) -> Result<Json<v0::BotWithUserResponse>> { ) -> Result<Json<v0::BotWithUserResponse>> {
let data = data.into_inner(); let data = data.into_inner();

View File

@@ -11,7 +11,7 @@ use rocket::{serde::json::Json, State};
pub async fn fetch_bot( pub async fn fetch_bot(
db: &State<Database>, db: &State<Database>,
user: User, user: User,
bot: Reference, bot: Reference<'_>,
) -> Result<Json<FetchBotResponse>> { ) -> Result<Json<FetchBotResponse>> {
if user.bot.is_some() { if user.bot.is_some() {
return Err(create_error!(IsBot)); return Err(create_error!(IsBot));

View File

@@ -13,9 +13,9 @@ use rocket::State;
pub async fn fetch_public_bot( pub async fn fetch_public_bot(
db: &State<Database>, db: &State<Database>,
user: Option<User>, user: Option<User>,
target: Reference, target: Reference<'_>,
) -> Result<Json<PublicBot>> { ) -> 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) { if !bot.public && user.is_none_or(|x| x.id != bot.owner) {
return Err(create_error!(NotFound)); return Err(create_error!(NotFound));
} }

View File

@@ -20,7 +20,7 @@ pub async fn invite_bot(
db: &State<Database>, db: &State<Database>,
amqp: &State<AMQP>, amqp: &State<AMQP>,
user: User, user: User,
target: Reference, target: Reference<'_>,
dest: Json<v0::InviteBotDestination>, dest: Json<v0::InviteBotDestination>,
) -> Result<EmptyResponse> { ) -> Result<EmptyResponse> {
if user.bot.is_some() { if user.bot.is_some() {

View File

@@ -15,8 +15,8 @@ use rocket_empty::EmptyResponse;
pub async fn ack( pub async fn ack(
db: &State<Database>, db: &State<Database>,
user: User, user: User,
target: Reference, target: Reference<'_>,
message: Reference, message: Reference<'_>,
) -> Result<EmptyResponse> { ) -> Result<EmptyResponse> {
if user.bot.is_some() { if user.bot.is_some() {
return Err(create_error!(IsBot)); return Err(create_error!(IsBot));
@@ -29,7 +29,7 @@ pub async fn ack(
.throw_if_lacking_channel_permission(ChannelPermission::ViewChannel)?; .throw_if_lacking_channel_permission(ChannelPermission::ViewChannel)?;
channel channel
.ack(&user.id, &message.id) .ack(&user.id, message.id)
.await .await
.map(|_| EmptyResponse) .map(|_| EmptyResponse)
} }

View File

@@ -17,7 +17,7 @@ pub async fn delete(
db: &State<Database>, db: &State<Database>,
amqp: &State<AMQP>, amqp: &State<AMQP>,
user: User, user: User,
target: Reference, target: Reference<'_>,
options: v0::OptionsChannelDelete, options: v0::OptionsChannelDelete,
) -> Result<EmptyResponse> { ) -> Result<EmptyResponse> {
let mut channel = target.as_channel(db).await?; let mut channel = target.as_channel(db).await?;

View File

@@ -17,7 +17,7 @@ pub async fn edit(
db: &State<Database>, db: &State<Database>,
amqp: &State<AMQP>, amqp: &State<AMQP>,
user: User, user: User,
target: Reference, target: Reference<'_>,
data: Json<v0::DataEditChannel>, data: Json<v0::DataEditChannel>,
) -> Result<Json<v0::Channel>> { ) -> Result<Json<v0::Channel>> {
let data = data.into_inner(); let data = data.into_inner();

View File

@@ -16,7 +16,7 @@ use rocket::{serde::json::Json, State};
pub async fn fetch( pub async fn fetch(
db: &State<Database>, db: &State<Database>,
user: User, user: User,
target: Reference, target: Reference<'_>,
) -> Result<Json<v0::Channel>> { ) -> Result<Json<v0::Channel>> {
let channel = target.as_channel(db).await?; let channel = target.as_channel(db).await?;

View File

@@ -17,8 +17,8 @@ pub async fn add_member(
db: &State<Database>, db: &State<Database>,
amqp: &State<AMQP>, amqp: &State<AMQP>,
user: User, user: User,
group_id: Reference, group_id: Reference<'_>,
member_id: Reference, member_id: Reference<'_>,
) -> Result<EmptyResponse> { ) -> Result<EmptyResponse> {
if user.bot.is_some() { if user.bot.is_some() {
return Err(create_error!(IsBot)); return Err(create_error!(IsBot));

View File

@@ -14,8 +14,8 @@ pub async fn remove_member(
db: &State<Database>, db: &State<Database>,
amqp: &State<AMQP>, amqp: &State<AMQP>,
user: User, user: User,
target: Reference, target: Reference<'_>,
member: Reference, member: Reference<'_>,
) -> Result<EmptyResponse> { ) -> Result<EmptyResponse> {
if user.bot.is_some() { if user.bot.is_some() {
return Err(create_error!(IsBot)); return Err(create_error!(IsBot));

View File

@@ -18,7 +18,7 @@ use rocket::{serde::json::Json, State};
pub async fn create_invite( pub async fn create_invite(
db: &State<Database>, db: &State<Database>,
user: User, user: User,
target: Reference, target: Reference<'_>,
) -> Result<Json<v0::Invite>> { ) -> Result<Json<v0::Invite>> {
if user.bot.is_some() { if user.bot.is_some() {
return Err(create_error!(IsBot)); return Err(create_error!(IsBot));

View File

@@ -17,7 +17,7 @@ use rocket::{serde::json::Json, State};
pub async fn fetch_members( pub async fn fetch_members(
db: &State<Database>, db: &State<Database>,
user: User, user: User,
target: Reference, target: Reference<'_>,
) -> Result<Json<Vec<v0::User>>> { ) -> Result<Json<Vec<v0::User>>> {
let channel = target.as_channel(db).await?; let channel = target.as_channel(db).await?;
let mut query = DatabasePermissionQuery::new(db, &user).channel(&channel); let mut query = DatabasePermissionQuery::new(db, &user).channel(&channel);

View File

@@ -22,7 +22,7 @@ use validator::Validate;
pub async fn bulk_delete_messages( pub async fn bulk_delete_messages(
db: &State<Database>, db: &State<Database>,
user: User, user: User,
target: Reference, target: Reference<'_>,
options: Json<v0::OptionsBulkDelete>, options: Json<v0::OptionsBulkDelete>,
) -> Result<EmptyResponse> { ) -> Result<EmptyResponse> {
let options = options.into_inner(); let options = options.into_inner();
@@ -51,7 +51,7 @@ pub async fn bulk_delete_messages(
.await .await
.throw_if_lacking_channel_permission(ChannelPermission::ManageMessages)?; .throw_if_lacking_channel_permission(ChannelPermission::ManageMessages)?;
Message::bulk_delete(db, &target.id, options.ids) Message::bulk_delete(db, target.id, options.ids)
.await .await
.map(|_| EmptyResponse) .map(|_| EmptyResponse)
} }

View File

@@ -17,8 +17,8 @@ use rocket_empty::EmptyResponse;
pub async fn clear_reactions( pub async fn clear_reactions(
db: &State<Database>, db: &State<Database>,
user: User, user: User,
target: Reference, target: Reference<'_>,
msg: Reference, msg: Reference<'_>,
) -> Result<EmptyResponse> { ) -> Result<EmptyResponse> {
let channel = target.as_channel(db).await?; let channel = target.as_channel(db).await?;
let mut query = DatabasePermissionQuery::new(db, &user).channel(&channel); let mut query = DatabasePermissionQuery::new(db, &user).channel(&channel);

View File

@@ -15,10 +15,10 @@ use rocket_empty::EmptyResponse;
pub async fn delete( pub async fn delete(
db: &State<Database>, db: &State<Database>,
user: User, user: User,
target: Reference, target: Reference<'_>,
msg: Reference, msg: Reference<'_>,
) -> Result<EmptyResponse> { ) -> 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 { if message.author != user.id {
let channel = target.as_channel(db).await?; let channel = target.as_channel(db).await?;

View File

@@ -18,8 +18,8 @@ use validator::Validate;
pub async fn edit( pub async fn edit(
db: &State<Database>, db: &State<Database>,
user: User, user: User,
target: Reference, target: Reference<'_>,
msg: Reference, msg: Reference<'_>,
edit: Json<v0::DataEditMessage>, edit: Json<v0::DataEditMessage>,
) -> Result<Json<v0::Message>> { ) -> Result<Json<v0::Message>> {
let edit = edit.into_inner(); let edit = edit.into_inner();

View File

@@ -15,8 +15,8 @@ use rocket::{serde::json::Json, State};
pub async fn fetch( pub async fn fetch(
db: &State<Database>, db: &State<Database>,
user: User, user: User,
target: Reference, target: Reference<'_>,
msg: Reference, msg: Reference<'_>,
) -> Result<Json<v0::Message>> { ) -> Result<Json<v0::Message>> {
let channel = target.as_channel(db).await?; let channel = target.as_channel(db).await?;
let mut query = DatabasePermissionQuery::new(db, &user).channel(&channel); let mut query = DatabasePermissionQuery::new(db, &user).channel(&channel);

View File

@@ -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_models::v0::MessageAuthor;
use revolt_permissions::{calculate_channel_permissions, ChannelPermission}; use revolt_permissions::{calculate_channel_permissions, ChannelPermission};
use revolt_result::{create_error, Result}; use revolt_result::{create_error, Result};
@@ -14,8 +17,8 @@ pub async fn message_pin(
db: &State<Database>, db: &State<Database>,
amqp: &State<AMQP>, amqp: &State<AMQP>,
user: User, user: User,
target: Reference, target: Reference<'_>,
msg: Reference, msg: Reference<'_>,
) -> Result<EmptyResponse> { ) -> Result<EmptyResponse> {
let channel = target.as_channel(db).await?; let channel = target.as_channel(db).await?;
@@ -169,7 +172,7 @@ mod test {
}) })
.await; .await;
let updated_message = Reference::from_unchecked(message.id) let updated_message = Reference::from_unchecked(&message.id)
.as_message(&harness.db) .as_message(&harness.db)
.await .await
.expect("Failed to find updated message"); .expect("Failed to find updated message");

View File

@@ -16,7 +16,7 @@ use validator::Validate;
pub async fn query( pub async fn query(
db: &State<Database>, db: &State<Database>,
user: User, user: User,
target: Reference, target: Reference<'_>,
options: v0::OptionsQueryMessages, options: v0::OptionsQueryMessages,
) -> Result<Json<v0::BulkMessageResponse>> { ) -> Result<Json<v0::BulkMessageResponse>> {
options.validate().map_err(|error| { options.validate().map_err(|error| {

View File

@@ -15,9 +15,9 @@ use rocket_empty::EmptyResponse;
pub async fn react_message( pub async fn react_message(
db: &State<Database>, db: &State<Database>,
user: User, user: User,
target: Reference, target: Reference<'_>,
msg: Reference, msg: Reference<'_>,
emoji: Reference, emoji: Reference<'_>,
) -> Result<EmptyResponse> { ) -> Result<EmptyResponse> {
let channel = target.as_channel(db).await?; let channel = target.as_channel(db).await?;
let mut query = DatabasePermissionQuery::new(db, &user).channel(&channel); let mut query = DatabasePermissionQuery::new(db, &user).channel(&channel);
@@ -30,7 +30,7 @@ pub async fn react_message(
// Add the reaction // Add the reaction
message message
.add_reaction(db, &user, &emoji.id) .add_reaction(db, &user, emoji.id)
.await .await
.map(|_| EmptyResponse) .map(|_| EmptyResponse)
} }

View File

@@ -16,7 +16,7 @@ use validator::Validate;
pub async fn search( pub async fn search(
db: &State<Database>, db: &State<Database>,
user: User, user: User,
target: Reference, target: Reference<'_>,
options: Json<v0::DataMessageSearch>, options: Json<v0::DataMessageSearch>,
) -> Result<Json<v0::BulkMessageResponse>> { ) -> Result<Json<v0::BulkMessageResponse>> {
if user.bot.is_some() { if user.bot.is_some() {

View File

@@ -21,7 +21,7 @@ pub async fn message_send(
db: &State<Database>, db: &State<Database>,
amqp: &State<AMQP>, amqp: &State<AMQP>,
user: User, user: User,
target: Reference, target: Reference<'_>,
data: Json<v0::DataMessageSend>, data: Json<v0::DataMessageSend>,
idempotency: IdempotencyKey, idempotency: IdempotencyKey,
) -> Result<Json<v0::Message>> { ) -> Result<Json<v0::Message>> {
@@ -202,7 +202,7 @@ mod test {
Member::create(&harness.db, &server, &user, Some(channels.clone())) Member::create(&harness.db, &server, &user, Some(channels.clone()))
.await .await
.expect("Failed to create member"); .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) .as_member(&harness.db, &server.id)
.await .await
.expect("Failed to get member"); .expect("Failed to get member");
@@ -242,7 +242,7 @@ mod test {
Member::create(&harness.db, &server, &second_user, Some(channels.clone())) Member::create(&harness.db, &server, &second_user, Some(channels.clone()))
.await .await
.expect("Failed to create second member"); .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) .as_member(&harness.db, &server.id)
.await .await
.expect("Failed to get second member"); .expect("Failed to get second member");

View File

@@ -14,8 +14,8 @@ pub async fn message_unpin(
db: &State<Database>, db: &State<Database>,
amqp: &State<AMQP>, amqp: &State<AMQP>,
user: User, user: User,
target: Reference, target: Reference<'_>,
msg: Reference, msg: Reference<'_>,
) -> Result<EmptyResponse> { ) -> Result<EmptyResponse> {
let channel = target.as_channel(db).await?; let channel = target.as_channel(db).await?;
@@ -91,7 +91,7 @@ mod test {
Member::create(&harness.db, &server, &user, Some(channels.clone())) Member::create(&harness.db, &server, &user, Some(channels.clone()))
.await .await
.expect("Failed to create member"); .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) .as_member(&harness.db, &server.id)
.await .await
.expect("Failed to get member"); .expect("Failed to get member");
@@ -174,7 +174,7 @@ mod test {
}) })
.await; .await;
let updated_message = Reference::from_unchecked(message.id) let updated_message = Reference::from_unchecked(&message.id)
.as_message(&harness.db) .as_message(&harness.db)
.await .await
.expect("Failed to find updated message"); .expect("Failed to find updated message");

View File

@@ -18,9 +18,9 @@ use rocket_empty::EmptyResponse;
pub async fn unreact_message( pub async fn unreact_message(
db: &State<Database>, db: &State<Database>,
user: User, user: User,
target: Reference, target: Reference<'_>,
msg: Reference, msg: Reference<'_>,
emoji: Reference, emoji: Reference<'_>,
options: v0::OptionsUnreact, options: v0::OptionsUnreact,
) -> Result<EmptyResponse> { ) -> Result<EmptyResponse> {
let channel = target.as_channel(db).await?; 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 // Check if we should wipe all of this reaction
if remove_all { if remove_all {
return message return message
.clear_reaction(db, &emoji.id) .clear_reaction(db, emoji.id)
.await .await
.map(|_| EmptyResponse); .map(|_| EmptyResponse);
} }
// Remove the reaction // Remove the reaction
message 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 .await
.map(|_| EmptyResponse) .map(|_| EmptyResponse)
} }

View File

@@ -17,7 +17,7 @@ use rocket::{serde::json::Json, State};
pub async fn set_role_permissions( pub async fn set_role_permissions(
db: &State<Database>, db: &State<Database>,
user: User, user: User,
target: Reference, target: Reference<'_>,
role_id: String, role_id: String,
data: Json<v0::DataSetRolePermissions>, data: Json<v0::DataSetRolePermissions>,
) -> Result<Json<v0::Channel>> { ) -> Result<Json<v0::Channel>> {

View File

@@ -17,7 +17,7 @@ use rocket::{serde::json::Json, State};
pub async fn set_default_channel_permissions( pub async fn set_default_channel_permissions(
db: &State<Database>, db: &State<Database>,
user: User, user: User,
target: Reference, target: Reference<'_>,
data: Json<v0::DataDefaultChannelPermissions>, data: Json<v0::DataDefaultChannelPermissions>,
) -> Result<Json<v0::Channel>> { ) -> Result<Json<v0::Channel>> {
let data = data.into_inner(); let data = data.into_inner();

View File

@@ -16,7 +16,7 @@ use rocket::{serde::json::Json, State};
pub async fn call( pub async fn call(
db: &State<Database>, db: &State<Database>,
user: User, user: User,
target: Reference, target: Reference<'_>,
) -> Result<Json<v0::LegacyCreateVoiceUserResponse>> { ) -> Result<Json<v0::LegacyCreateVoiceUserResponse>> {
let channel = target.as_channel(db).await?; let channel = target.as_channel(db).await?;
let mut query = DatabasePermissionQuery::new(db, &user).channel(&channel); let mut query = DatabasePermissionQuery::new(db, &user).channel(&channel);

View File

@@ -19,7 +19,7 @@ use validator::Validate;
pub async fn create_webhook( pub async fn create_webhook(
db: &State<Database>, db: &State<Database>,
user: User, user: User,
target: Reference, target: Reference<'_>,
data: Json<v0::CreateWebhookBody>, data: Json<v0::CreateWebhookBody>,
) -> Result<Json<v0::Webhook>> { ) -> Result<Json<v0::Webhook>> {
let data = data.into_inner(); let data = data.into_inner();

View File

@@ -15,7 +15,7 @@ use rocket::{serde::json::Json, State};
pub async fn fetch_webhooks( pub async fn fetch_webhooks(
db: &State<Database>, db: &State<Database>,
user: User, user: User,
channel_id: Reference, channel_id: Reference<'_>,
) -> Result<Json<Vec<Webhook>>> { ) -> Result<Json<Vec<Webhook>>> {
let channel = channel_id.as_channel(db).await?; let channel = channel_id.as_channel(db).await?;

View File

@@ -16,7 +16,7 @@ use rocket_empty::EmptyResponse;
pub async fn delete_emoji( pub async fn delete_emoji(
db: &State<Database>, db: &State<Database>,
user: User, user: User,
emoji_id: Reference, emoji_id: Reference<'_>,
) -> Result<EmptyResponse> { ) -> Result<EmptyResponse> {
// Fetch the emoji // Fetch the emoji
let emoji = emoji_id.as_emoji(db).await?; 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 // Otherwise, validate we have permission to delete from parent
match &emoji.parent { match &emoji.parent {
EmojiParent::Server { id } => { EmojiParent::Server { id } => {
let server = db.fetch_server(id).await?; let server = db.fetch_server(id.as_str()).await?;
// Check for permission // Check for permission
let mut query = DatabasePermissionQuery::new(db, &user).server(&server); let mut query = DatabasePermissionQuery::new(db, &user).server(&server);

View File

@@ -9,7 +9,7 @@ use rocket::{serde::json::Json, State};
/// Fetch an emoji by its id. /// Fetch an emoji by its id.
#[openapi(tag = "Emojis")] #[openapi(tag = "Emojis")]
#[get("/emoji/<emoji_id>")] #[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 emoji_id
.as_emoji(db) .as_emoji(db)
.await .await

View File

@@ -12,7 +12,7 @@ use rocket_empty::EmptyResponse;
/// Delete an invite by its id. /// Delete an invite by its id.
#[openapi(tag = "Invites")] #[openapi(tag = "Invites")]
#[delete("/<target>")] #[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?; let invite = target.as_invite(db).await?;
if user.id == invite.creator() { if user.id == invite.creator() {

View File

@@ -8,7 +8,7 @@ use rocket::{serde::json::Json, State};
/// Fetch an invite by its id. /// Fetch an invite by its id.
#[openapi(tag = "Invites")] #[openapi(tag = "Invites")]
#[get("/<target>")] #[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? { Ok(Json(match target.as_invite(db).await? {
Invite::Server { Invite::Server {
channel, creator, .. 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?; let server = db.fetch_server(&server).await?;
v0::InviteResponse::Server { v0::InviteResponse::Server {
code: target.id, code: target.id.to_string(),
member_count: db.fetch_member_count(&server.id).await? as i64, member_count: db.fetch_member_count(&server.id).await? as i64,
server_id: server.id, server_id: server.id,
server_name: server.name, server_name: server.name,
@@ -64,7 +64,7 @@ pub async fn fetch(db: &State<Database>, target: Reference) -> Result<Json<v0::I
description, description,
.. ..
} => v0::InviteResponse::Group { } => v0::InviteResponse::Group {
code: target.id, code: target.id.to_string(),
channel_id: id, channel_id: id,
channel_name: name, channel_name: name,
channel_description: description, channel_description: description,

View File

@@ -12,7 +12,7 @@ pub async fn join(
db: &State<Database>, db: &State<Database>,
amqp: &State<AMQP>, amqp: &State<AMQP>,
user: User, user: User,
target: Reference, target: Reference<'_>,
) -> Result<Json<v0::InviteJoinResponse>> { ) -> Result<Json<v0::InviteJoinResponse>> {
if user.bot.is_some() { if user.bot.is_some() {
return Err(create_error!(IsBot)); return Err(create_error!(IsBot));

View File

@@ -17,8 +17,8 @@ use validator::Validate;
pub async fn ban( pub async fn ban(
db: &State<Database>, db: &State<Database>,
user: User, user: User,
server: Reference, server: Reference<'_>,
target: Reference, target: Reference<'_>,
data: Json<v0::DataBanCreate>, data: Json<v0::DataBanCreate>,
) -> Result<Json<v0::ServerBan>> { ) -> Result<Json<v0::ServerBan>> {
let data = data.into_inner(); let data = data.into_inner();
@@ -56,7 +56,7 @@ pub async fn ban(
.await?; .await?;
} }
ServerBan::create(db, &server, &target.id, data.reason) ServerBan::create(db, &server, target.id, data.reason)
.await .await
.map(Into::into) .map(Into::into)
.map(Json) .map(Json)

View File

@@ -17,7 +17,7 @@ use rocket::State;
pub async fn list( pub async fn list(
db: &State<Database>, db: &State<Database>,
user: User, user: User,
target: Reference, target: Reference<'_>,
) -> Result<Json<v0::BanListResult>> { ) -> Result<Json<v0::BanListResult>> {
let server = target.as_server(db).await?; let server = target.as_server(db).await?;
let mut query = DatabasePermissionQuery::new(db, &user).server(&server); let mut query = DatabasePermissionQuery::new(db, &user).server(&server);

View File

@@ -15,8 +15,8 @@ use rocket_empty::EmptyResponse;
pub async fn unban( pub async fn unban(
db: &State<Database>, db: &State<Database>,
user: User, user: User,
server: Reference, server: Reference<'_>,
target: Reference, target: Reference<'_>,
) -> Result<EmptyResponse> { ) -> Result<EmptyResponse> {
let server = server.as_server(db).await?; let server = server.as_server(db).await?;
let mut query = DatabasePermissionQuery::new(db, &user).server(&server); let mut query = DatabasePermissionQuery::new(db, &user).server(&server);

View File

@@ -16,7 +16,7 @@ use validator::Validate;
pub async fn create_server_channel( pub async fn create_server_channel(
db: &State<Database>, db: &State<Database>,
user: User, user: User,
server: Reference, server: Reference<'_>,
data: Json<v0::DataCreateServerChannel>, data: Json<v0::DataCreateServerChannel>,
) -> Result<Json<v0::Channel>> { ) -> Result<Json<v0::Channel>> {
let data = data.into_inner(); let data = data.into_inner();

View File

@@ -15,7 +15,7 @@ use rocket::{serde::json::Json, State};
pub async fn list_emoji( pub async fn list_emoji(
db: &State<Database>, db: &State<Database>,
user: User, user: User,
target: Reference, target: Reference<'_>,
) -> Result<Json<Vec<v0::Emoji>>> { ) -> Result<Json<Vec<v0::Emoji>>> {
let server = target.as_server(db).await?; let server = target.as_server(db).await?;
let mut query = DatabasePermissionQuery::new(db, &user).server(&server); let mut query = DatabasePermissionQuery::new(db, &user).server(&server);

View File

@@ -15,7 +15,7 @@ use rocket::{serde::json::Json, State};
pub async fn invites( pub async fn invites(
db: &State<Database>, db: &State<Database>,
user: User, user: User,
target: Reference, target: Reference<'_>,
) -> Result<Json<Vec<v0::Invite>>> { ) -> Result<Json<Vec<v0::Invite>>> {
let server = target.as_server(db).await?; let server = target.as_server(db).await?;
let mut query = DatabasePermissionQuery::new(db, &user).server(&server); let mut query = DatabasePermissionQuery::new(db, &user).server(&server);

View File

@@ -19,8 +19,8 @@ use validator::Validate;
pub async fn edit( pub async fn edit(
db: &State<Database>, db: &State<Database>,
user: User, user: User,
server: Reference, server: Reference<'_>,
member: Reference, member: Reference<'_>,
data: Json<v0::DataMemberEdit>, data: Json<v0::DataMemberEdit>,
) -> Result<Json<v0::Member>> { ) -> Result<Json<v0::Member>> {
let data = data.into_inner(); let data = data.into_inner();

View File

@@ -36,7 +36,7 @@ pub struct MemberQueryResponse {
pub async fn member_experimental_query( pub async fn member_experimental_query(
db: &State<Database>, db: &State<Database>,
user: User, user: User,
target: Reference, target: Reference<'_>,
options: OptionsQueryMembers, options: OptionsQueryMembers,
) -> Result<Json<MemberQueryResponse>> { ) -> Result<Json<MemberQueryResponse>> {
if !options.experimental_api { if !options.experimental_api {

View File

@@ -15,8 +15,8 @@ use rocket::{serde::json::Json, State};
pub async fn fetch( pub async fn fetch(
db: &State<Database>, db: &State<Database>,
user: User, user: User,
target: Reference, target: Reference<'_>,
member: Reference, member: Reference<'_>,
roles: Option<bool>, roles: Option<bool>,
) -> Result<Json<v0::MemberResponse>> { ) -> Result<Json<v0::MemberResponse>> {
let server = target.as_server(db).await?; let server = target.as_server(db).await?;

View File

@@ -15,7 +15,7 @@ use rocket::{serde::json::Json, State};
pub async fn fetch_all( pub async fn fetch_all(
db: &State<Database>, db: &State<Database>,
user: User, user: User,
target: Reference, target: Reference<'_>,
options: v0::OptionsFetchAllMembers, options: v0::OptionsFetchAllMembers,
) -> Result<Json<v0::AllMemberResponse>> { ) -> Result<Json<v0::AllMemberResponse>> {
let server = target.as_server(db).await?; let server = target.as_server(db).await?;

View File

@@ -15,8 +15,8 @@ use rocket_empty::EmptyResponse;
pub async fn kick( pub async fn kick(
db: &State<Database>, db: &State<Database>,
user: User, user: User,
target: Reference, target: Reference<'_>,
member: Reference, member: Reference<'_>,
) -> Result<EmptyResponse> { ) -> Result<EmptyResponse> {
let server = target.as_server(db).await?; let server = target.as_server(db).await?;

View File

@@ -15,7 +15,7 @@ use rocket::{serde::json::Json, State};
pub async fn set_role_permission( pub async fn set_role_permission(
db: &State<Database>, db: &State<Database>,
user: User, user: User,
target: Reference, target: Reference<'_>,
role_id: String, role_id: String,
data: Json<v0::DataSetServerRolePermission>, data: Json<v0::DataSetServerRolePermission>,
) -> Result<Json<v0::Server>> { ) -> Result<Json<v0::Server>> {

View File

@@ -17,7 +17,7 @@ use rocket::{serde::json::Json, State};
pub async fn set_default_server_permissions( pub async fn set_default_server_permissions(
db: &State<Database>, db: &State<Database>,
user: User, user: User,
target: Reference, target: Reference<'_>,
data: Json<DataPermissionsValue>, data: Json<DataPermissionsValue>,
) -> Result<Json<v0::Server>> { ) -> Result<Json<v0::Server>> {
let data = data.into_inner(); let data = data.into_inner();

View File

@@ -17,7 +17,7 @@ use validator::Validate;
pub async fn create( pub async fn create(
db: &State<Database>, db: &State<Database>,
user: User, user: User,
target: Reference, target: Reference<'_>,
data: Json<v0::DataCreateRole>, data: Json<v0::DataCreateRole>,
) -> Result<Json<v0::NewRoleResponse>> { ) -> Result<Json<v0::NewRoleResponse>> {
let data = data.into_inner(); let data = data.into_inner();

View File

@@ -15,7 +15,7 @@ use rocket_empty::EmptyResponse;
pub async fn delete( pub async fn delete(
db: &State<Database>, db: &State<Database>,
user: User, user: User,
target: Reference, target: Reference<'_>,
role_id: String, role_id: String,
) -> Result<EmptyResponse> { ) -> Result<EmptyResponse> {
let mut server = target.as_server(db).await?; let mut server = target.as_server(db).await?;

View File

@@ -16,7 +16,7 @@ use validator::Validate;
pub async fn edit( pub async fn edit(
db: &State<Database>, db: &State<Database>,
user: User, user: User,
target: Reference, target: Reference<'_>,
role_id: String, role_id: String,
data: Json<v0::DataEditRole>, data: Json<v0::DataEditRole>,
) -> Result<Json<v0::Role>> { ) -> Result<Json<v0::Role>> {

View File

@@ -15,7 +15,7 @@ use rocket::{serde::json::Json, State};
pub async fn edit_role_ranks( pub async fn edit_role_ranks(
db: &State<Database>, db: &State<Database>,
user: User, user: User,
target: Reference, target: Reference<'_>,
data: Json<v0::DataEditRoleRanks>, data: Json<v0::DataEditRoleRanks>,
) -> Result<Json<v0::Server>> { ) -> Result<Json<v0::Server>> {
let data = data.into_inner(); let data = data.into_inner();

View File

@@ -15,7 +15,7 @@ use rocket::{serde::json::Json, State};
pub async fn fetch( pub async fn fetch(
db: &State<Database>, db: &State<Database>,
user: User, user: User,
target: Reference, target: Reference<'_>,
role_id: String, role_id: String,
) -> Result<Json<v0::Role>> { ) -> Result<Json<v0::Role>> {
let mut server = target.as_server(db).await?; let mut server = target.as_server(db).await?;

View File

@@ -12,7 +12,7 @@ use rocket_empty::EmptyResponse;
/// Mark all channels in a server as read. /// Mark all channels in a server as read.
#[openapi(tag = "Server Information")] #[openapi(tag = "Server Information")]
#[put("/<target>/ack")] #[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() { if user.bot.is_some() {
return Err(create_error!(IsBot)); return Err(create_error!(IsBot));
} }

View File

@@ -13,11 +13,11 @@ use rocket_empty::EmptyResponse;
pub async fn delete( pub async fn delete(
db: &State<Database>, db: &State<Database>,
user: User, user: User,
target: Reference, target: Reference<'_>,
options: v0::OptionsServerDelete, options: v0::OptionsServerDelete,
) -> Result<EmptyResponse> { ) -> Result<EmptyResponse> {
let server = target.as_server(db).await?; 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 { if server.owner == user.id {
server.delete(db).await server.delete(db).await

View File

@@ -18,7 +18,7 @@ use validator::Validate;
pub async fn edit( pub async fn edit(
db: &State<Database>, db: &State<Database>,
user: User, user: User,
target: Reference, target: Reference<'_>,
data: Json<v0::DataEditServer>, data: Json<v0::DataEditServer>,
) -> Result<Json<v0::Server>> { ) -> Result<Json<v0::Server>> {
let data = data.into_inner(); let data = data.into_inner();

View File

@@ -15,7 +15,7 @@ use rocket::{serde::json::Json, State};
pub async fn fetch( pub async fn fetch(
db: &State<Database>, db: &State<Database>,
user: User, user: User,
target: Reference, target: Reference<'_>,
options: v0::OptionsFetchServer, options: v0::OptionsFetchServer,
) -> Result<Json<v0::FetchServerResponse>> { ) -> Result<Json<v0::FetchServerResponse>> {
let server = target.as_server(db).await?; let server = target.as_server(db).await?;

View File

@@ -14,7 +14,7 @@ pub async fn add(
db: &State<Database>, db: &State<Database>,
amqp: &State<AMQP>, amqp: &State<AMQP>,
mut user: User, mut user: User,
target: Reference, target: Reference<'_>,
) -> Result<Json<v0::User>> { ) -> Result<Json<v0::User>> {
let mut target = target.as_user(db).await?; let mut target = target.as_user(db).await?;

View File

@@ -13,7 +13,7 @@ use rocket::State;
pub async fn block( pub async fn block(
db: &State<Database>, db: &State<Database>,
mut user: User, mut user: User,
target: Reference, target: Reference<'_>,
) -> Result<Json<v0::User>> { ) -> Result<Json<v0::User>> {
let mut target = target.as_user(db).await?; let mut target = target.as_user(db).await?;

View File

@@ -14,7 +14,7 @@ use validator::Validate;
pub async fn edit( pub async fn edit(
db: &State<Database>, db: &State<Database>,
mut user: User, mut user: User,
target: Reference, target: Reference<'_>,
data: Json<v0::DataEditUser>, data: Json<v0::DataEditUser>,
) -> Result<Json<v0::User>> { ) -> Result<Json<v0::User>> {
let data = data.into_inner(); let data = data.into_inner();

View File

@@ -17,7 +17,7 @@ use rocket::{serde::json::Json, State};
pub async fn profile( pub async fn profile(
db: &State<Database>, db: &State<Database>,
user: User, user: User,
target: Reference, target: Reference<'_>,
) -> Result<Json<v0::UserProfile>> { ) -> Result<Json<v0::UserProfile>> {
if user.id == target.id { if user.id == target.id {
return Ok(Json(user.profile.map(Into::into).unwrap_or_default())); return Ok(Json(user.profile.map(Into::into).unwrap_or_default()));

View File

@@ -13,7 +13,7 @@ use rocket::{serde::json::Json, State};
/// Retrieve a user's information. /// Retrieve a user's information.
#[openapi(tag = "User Information")] #[openapi(tag = "User Information")]
#[get("/<target>")] #[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 { if user.id == target.id {
return Ok(Json(user.into_self(false).await)); return Ok(Json(user.into_self(false).await));
} }

View File

@@ -10,7 +10,7 @@ use rocket::{serde::json::Json, State};
#[get("/<target>/flags")] #[get("/<target>/flags")]
pub async fn fetch_user_flags( pub async fn fetch_user_flags(
db: &State<Database>, db: &State<Database>,
target: Reference, target: Reference<'_>,
) -> Result<Json<v0::FlagResponse>> { ) -> Result<Json<v0::FlagResponse>> {
let flags = if let Ok(target) = target.as_user(db).await { let flags = if let Ok(target) = target.as_user(db).await {
target.flags.unwrap_or_default() target.flags.unwrap_or_default()

View File

@@ -16,7 +16,7 @@ use rocket::State;
pub async fn mutual( pub async fn mutual(
db: &State<Database>, db: &State<Database>,
user: User, user: User,
target: Reference, target: Reference<'_>,
) -> Result<Json<v0::MutualResponse>> { ) -> Result<Json<v0::MutualResponse>> {
if target.id == user.id { if target.id == user.id {
return Err(create_error!(InvalidOperation)); return Err(create_error!(InvalidOperation));

View File

@@ -17,7 +17,7 @@ use rocket::{serde::json::Json, State};
pub async fn open_dm( pub async fn open_dm(
db: &State<Database>, db: &State<Database>,
user: User, user: User,
target: Reference, target: Reference<'_>,
) -> Result<Json<v0::Channel>> { ) -> Result<Json<v0::Channel>> {
let target = target.as_user(db).await?; let target = target.as_user(db).await?;

View File

@@ -13,7 +13,7 @@ use rocket::State;
pub async fn remove( pub async fn remove(
db: &State<Database>, db: &State<Database>,
mut user: User, mut user: User,
target: Reference, target: Reference<'_>,
) -> Result<Json<v0::User>> { ) -> Result<Json<v0::User>> {
let mut target = target.as_user(db).await?; let mut target = target.as_user(db).await?;

View File

@@ -13,7 +13,7 @@ use rocket::State;
pub async fn unblock( pub async fn unblock(
db: &State<Database>, db: &State<Database>,
mut user: User, mut user: User,
target: Reference, target: Reference<'_>,
) -> Result<Json<v0::User>> { ) -> Result<Json<v0::User>> {
let mut target = target.as_user(db).await?; let mut target = target.as_user(db).await?;

View File

@@ -15,7 +15,7 @@ use rocket_empty::EmptyResponse;
pub async fn webhook_delete( pub async fn webhook_delete(
db: &State<Database>, db: &State<Database>,
user: User, user: User,
webhook_id: Reference, webhook_id: Reference<'_>,
) -> Result<EmptyResponse> { ) -> Result<EmptyResponse> {
let webhook = webhook_id.as_webhook(db).await?; let webhook = webhook_id.as_webhook(db).await?;
let channel = db.fetch_channel(&webhook.channel_id).await?; let channel = db.fetch_channel(&webhook.channel_id).await?;

View File

@@ -10,7 +10,7 @@ use rocket_empty::EmptyResponse;
#[delete("/<webhook_id>/<token>")] #[delete("/<webhook_id>/<token>")]
pub async fn webhook_delete_token( pub async fn webhook_delete_token(
db: &State<Database>, db: &State<Database>,
webhook_id: Reference, webhook_id: Reference<'_>,
token: String, token: String,
) -> Result<EmptyResponse> { ) -> Result<EmptyResponse> {
let webhook = webhook_id.as_webhook(db).await?; let webhook = webhook_id.as_webhook(db).await?;

View File

@@ -15,7 +15,7 @@ use validator::Validate;
#[patch("/<webhook_id>", data = "<data>")] #[patch("/<webhook_id>", data = "<data>")]
pub async fn webhook_edit( pub async fn webhook_edit(
db: &State<Database>, db: &State<Database>,
webhook_id: Reference, webhook_id: Reference<'_>,
user: User, user: User,
data: Json<DataEditWebhook>, data: Json<DataEditWebhook>,
) -> Result<Json<Webhook>> { ) -> Result<Json<Webhook>> {

View File

@@ -12,7 +12,7 @@ use rocket::{serde::json::Json, State};
#[patch("/<webhook_id>/<token>", data = "<data>")] #[patch("/<webhook_id>/<token>", data = "<data>")]
pub async fn webhook_edit_token( pub async fn webhook_edit_token(
db: &State<Database>, db: &State<Database>,
webhook_id: Reference, webhook_id: Reference<'_>,
token: String, token: String,
data: Json<DataEditWebhook>, data: Json<DataEditWebhook>,
) -> Result<Json<Webhook>> { ) -> Result<Json<Webhook>> {

View File

@@ -18,7 +18,7 @@ use validator::Validate;
pub async fn webhook_execute( pub async fn webhook_execute(
db: &State<Database>, db: &State<Database>,
amqp: &State<AMQP>, amqp: &State<AMQP>,
webhook_id: Reference, webhook_id: Reference<'_>,
token: String, token: String,
data: Json<v0::DataMessageSend>, data: Json<v0::DataMessageSend>,
idempotency: IdempotencyKey, idempotency: IdempotencyKey,

View File

@@ -752,7 +752,7 @@ fn convert_event(data: &str, event_name: &str) -> Result<Event> {
pub async fn webhook_execute_github( pub async fn webhook_execute_github(
db: &State<Database>, db: &State<Database>,
amqp: &State<AMQP>, amqp: &State<AMQP>,
webhook_id: Reference, webhook_id: Reference<'_>,
token: String, token: String,
event: EventHeader<'_>, event: EventHeader<'_>,
data: String, data: String,

View File

@@ -14,7 +14,7 @@ use rocket::{serde::json::Json, State};
#[get("/<webhook_id>")] #[get("/<webhook_id>")]
pub async fn webhook_fetch( pub async fn webhook_fetch(
db: &State<Database>, db: &State<Database>,
webhook_id: Reference, webhook_id: Reference<'_>,
user: User, user: User,
) -> Result<Json<ResponseWebhook>> { ) -> Result<Json<ResponseWebhook>> {
let webhook = webhook_id.as_webhook(db).await?; let webhook = webhook_id.as_webhook(db).await?;

View File

@@ -10,7 +10,7 @@ use rocket::{serde::json::Json, State};
#[get("/<webhook_id>/<token>")] #[get("/<webhook_id>/<token>")]
pub async fn webhook_fetch_token( pub async fn webhook_fetch_token(
db: &State<Database>, db: &State<Database>,
webhook_id: Reference, webhook_id: Reference<'_>,
token: String, token: String,
) -> Result<Json<Webhook>> { ) -> Result<Json<Webhook>> {
let webhook = webhook_id.as_webhook(db).await?; let webhook = webhook_id.as_webhook(db).await?;