OxideTalis/oxidetalis
OxideTalis/oxidetalis
1
Fork 0
Code Issues 10 Pull requests Projects 1 Releases Activity Actions

refactor: Use get_user_status util in more places
All checks were successful
DCO checker / DCO checker (pull_request) Successful in 9s
Details
Rust CI / Rust CI (pull_request) Successful in 4m52s
Details

Browse source 
Signed-off-by: Awiteb <a@4rs.nl>
This commit is contained in:
Awiteb 2024-07-18 11:14:49 +03:00
parent 4e50cb34c0
commit 21880c5f82
Signed by: awiteb
GPG key ID: 3F6B55640AA6682F
1 changed files with 32 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

72
crates/oxidetalis/src/database/user_status.rs
View file

@ -103,17 +103,15 @@ impl UsersStatusExt for DatabaseConnection {
whitelister: &UserModel, whitelister: &UserModel,
target_public_key: &PublicKey, target_public_key: &PublicKey,
) -> ServerResult<bool> { ) -> ServerResult<bool> {
whitelister get_user_status(
.find_related(UsersStatusEntity) self,
.filter( whitelister,
UsersStatusColumn::Target target_public_key,
.eq(target_public_key.to_string()) AccessStatus::Whitelisted,
.and(UsersStatusColumn::Status.eq(AccessStatus::Whitelisted)), )
) .await
.one(self) .map(|u| u.is_some())
.await .map_err(Into::into)
.map(|u| u.is_some())
.map_err(Into::into)
} }
async fn is_blacklisted( async fn is_blacklisted(
@ -121,17 +119,15 @@ impl UsersStatusExt for DatabaseConnection {
blacklister: &UserModel, blacklister: &UserModel,
target_public_key: &PublicKey, target_public_key: &PublicKey,
) -> ServerResult<bool> { ) -> ServerResult<bool> {
blacklister get_user_status(
.find_related(UsersStatusEntity) self,
.filter( blacklister,
UsersStatusColumn::Target target_public_key,
.eq(target_public_key.to_string()) AccessStatus::Blacklisted,
.and(UsersStatusColumn::Status.eq(AccessStatus::Blacklisted)), )
) .await
.one(self) .map(|u| u.is_some())
.await .map_err(Into::into)
.map(|u| u.is_some())
.map_err(Into::into)
} }
async fn add_to_whitelist( async fn add_to_whitelist(
@ -223,15 +219,13 @@ impl UsersStatusExt for DatabaseConnection {
whitelister: &UserModel, whitelister: &UserModel,
target_public_key: &PublicKey, target_public_key: &PublicKey,
) -> ServerResult<()> { ) -> ServerResult<()> {
if let Some(target_user) = whitelister if let Some(target_user) = get_user_status(
.find_related(UsersStatusEntity) self,
.filter( whitelister,
UsersStatusColumn::Target target_public_key,
.eq(target_public_key.to_string()) AccessStatus::Whitelisted,
.and(UsersStatusColumn::Status.eq(AccessStatus::Whitelisted)), )
) .await?
.one(self)
.await?
{ {
target_user.delete(self).await?; target_user.delete(self).await?;
} }
@ -243,15 +237,13 @@ impl UsersStatusExt for DatabaseConnection {
blacklister: &UserModel, blacklister: &UserModel,
target_public_key: &PublicKey, target_public_key: &PublicKey,
) -> ServerResult<()> { ) -> ServerResult<()> {
if let Some(target_user) = blacklister if let Some(target_user) = get_user_status(
.find_related(UsersStatusEntity) self,
.filter( blacklister,
UsersStatusColumn::Target target_public_key,
.eq(target_public_key.to_string()) AccessStatus::Blacklisted,
.and(UsersStatusColumn::Status.eq(AccessStatus::Blacklisted)), )
) .await?
.one(self)
.await?
{ {
target_user.delete(self).await?; target_user.delete(self).await?;
} }