LemmyNet
/
lemmy
3
2
Fork 3
Code Pull Requests 1 Releases Wiki Activity

Add person name to PersonIsBannedFromSite error (#3786) (#3855) 

* Add person name to PersonIsBannedFromSite error (#3786)

* Log PersonId instead of Person name (#3850)

* Log actor_id for PersonIsBannedFromSite (#3850)

---------

Co-authored-by: Freek van Zee <freek.van.zee@mediamonks.com>
This commit is contained in:
Freakazoid182 2023-08-16 11:36:58 +02:00 committed by GitHub
parent c8063f3267
commit ee7b35a04a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crates/apub/src/activities/mod.rs
View File

@ -97,7 +97,9 @@ pub(crate) async fn verify_person_in_community(
) -> Result<(), LemmyError> { ) -> Result<(), LemmyError> {
let person = person_id.dereference(context).await?; let person = person_id.dereference(context).await?;
if person.banned { if person.banned {
return Err(LemmyErrorType::PersonIsBannedFromSite)?; return Err(LemmyErrorType::PersonIsBannedFromSite(
person.actor_id.to_string(),
))?;
} }
let person_id = person.id; let person_id = person.id;
let community_id = community.id; let community_id = community.id;

4
crates/apub/src/objects/private_message.rs
View File

@ -107,7 +107,9 @@ impl Object for ApubPrivateMessage {
check_apub_id_valid_with_strictness(note.id.inner(), false, context).await?; check_apub_id_valid_with_strictness(note.id.inner(), false, context).await?;
let person = note.attributed_to.dereference(context).await?; let person = note.attributed_to.dereference(context).await?;
if person.banned { if person.banned {
return Err(LemmyErrorType::PersonIsBannedFromSite)?; return Err(LemmyErrorType::PersonIsBannedFromSite(
person.actor_id.to_string(),
))?;
} }
Ok(()) Ok(())
} }

2
crates/utils/src/error.rs
View File

@ -142,7 +142,7 @@ pub enum LemmyErrorType {
InvalidQuery, InvalidQuery,
ObjectNotLocal, ObjectNotLocal,
PostIsLocked, PostIsLocked,
PersonIsBannedFromSite, PersonIsBannedFromSite(String),
InvalidVoteValue, InvalidVoteValue,
PageDoesNotSpecifyCreator, PageDoesNotSpecifyCreator,
PageDoesNotSpecifyGroup, PageDoesNotSpecifyGroup,