jmug/stoatchat
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

chore: switch Reference to using an actual reference

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

6
crates/delta/src/routes/channels/channel_ack.rs
View File

@@ -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)
}

2
crates/delta/src/routes/channels/channel_delete.rs
View File

@@ -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?;

2
crates/delta/src/routes/channels/channel_edit.rs
View File

@@ -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();

2
crates/delta/src/routes/channels/channel_fetch.rs
View File

@@ -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?;

4
crates/delta/src/routes/channels/group_add_member.rs
View File

@@ -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));

4
crates/delta/src/routes/channels/group_remove_member.rs
View File

@@ -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));

2
crates/delta/src/routes/channels/invite_create.rs
View File

@@ -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));

2
crates/delta/src/routes/channels/members_fetch.rs
View File

@@ -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);

4
crates/delta/src/routes/channels/message_bulk_delete.rs
View File

@@ -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)
}

4
crates/delta/src/routes/channels/message_clear_reactions.rs
View File

@@ -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);

6
crates/delta/src/routes/channels/message_delete.rs
View File

@@ -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?;

4
crates/delta/src/routes/channels/message_edit.rs
View File

@@ -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();

4
crates/delta/src/routes/channels/message_fetch.rs
View File

@@ -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);

11
crates/delta/src/routes/channels/message_pin.rs
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_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");

2
crates/delta/src/routes/channels/message_query.rs
View File

@@ -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| {

8
crates/delta/src/routes/channels/message_react.rs
View File

@@ -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)
}

2
crates/delta/src/routes/channels/message_search.rs
View File

@@ -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() {

6
crates/delta/src/routes/channels/message_send.rs
View File

@@ -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");

8
crates/delta/src/routes/channels/message_unpin.rs
View File

@@ -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");

10
crates/delta/src/routes/channels/message_unreact.rs
View File

@@ -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)
}

2
crates/delta/src/routes/channels/permissions_set.rs
View File

@@ -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>> {

2
crates/delta/src/routes/channels/permissions_set_default.rs
View File

@@ -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();

2
crates/delta/src/routes/channels/voice_join.rs
View File

@@ -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);

2
crates/delta/src/routes/channels/webhook_create.rs
View File

@@ -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();

2
crates/delta/src/routes/channels/webhook_fetch_all.rs
View File

@@ -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?;