forked from jmug/stoatchat
chore: switch Reference to using an actual reference
This commit is contained in:
@@ -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?;
|
||||
|
||||
|
||||
@@ -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?;
|
||||
|
||||
|
||||
@@ -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();
|
||||
|
||||
@@ -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()));
|
||||
|
||||
@@ -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));
|
||||
}
|
||||
|
||||
@@ -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()
|
||||
|
||||
@@ -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));
|
||||
|
||||
@@ -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?;
|
||||
|
||||
|
||||
@@ -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?;
|
||||
|
||||
|
||||
@@ -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?;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user