Skip to content
This repository has been archived by the owner on Nov 23, 2022. It is now read-only.

Fix #40 #62

Merged
merged 6 commits into from
Nov 16, 2021
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 34 additions & 8 deletions ferrischat_webserver/src/users/get_user.rs
Original file line number Diff line number Diff line change
Expand Up @@ -103,17 +103,43 @@ pub async fn get_user(req: HttpRequest, auth: crate::Authorization) -> impl Resp
.await;

Some(match resp {
Ok(resp) => resp
.iter()
.filter_map(|x| {
Some(Member {
Ok(resp) => {
let mut members = Vec::with_capacity(resp.len());

for x in resp {
let user = {
let resp = sqlx::query!("SELECT * FROM users WHERE id = $1", x.user_id.clone())
.fetch_one(db)
.await;

match resp {
Ok(user) => Some(User {
id: bigdecimal_to_u128!(user.id),
name: user.name,
avatar: None,
guilds: None,
discriminator: user.discriminator,
flags: UserFlags::from_bits_truncate(user.flags)
}),
Err(e) => {
return HttpResponse::InternalServerError().json(InternalServerErrorJson {
reason: format!("database returned a error: {}", e),
})
}
}
};

let member = Member {
user_id: x.user_id.with_scale(0).into_bigint_and_exponent().0.to_u128(),
user: None,
user: user,
guild_id: x.guild_id.with_scale(0).into_bigint_and_exponent().0.to_u128(),
guild: None,
})
})
.collect(),
};

members.push(member);
}
members
},
Err(e) => {
return HttpResponse::InternalServerError().json(InternalServerErrorJson {
reason: format!("database returned a error: {}", e),
Expand Down