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

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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