From 1ad9a211c9e09ecdb14a4ff6af22124b97794ef5 Mon Sep 17 00:00:00 2001 From: Nutomic Date: Tue, 5 Mar 2024 15:14:15 +0100 Subject: [PATCH 1/4] Improve contributing instructions (#4504) --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 524b7cf69..b2864cec7 100644 --- a/README.md +++ b/README.md @@ -137,10 +137,14 @@ Lemmy is made possible by a generous grant from the [NLnet foundation](https://n ## Contributing +Read the following documentation to setup the development environment and start coding: + - [Contributing instructions](https://join-lemmy.org/docs/contributors/01-overview.html) - [Docker Development](https://join-lemmy.org/docs/contributors/03-docker-development.html) - [Local Development](https://join-lemmy.org/docs/contributors/02-local-development.html) +When working on an issue or pull request, you can comment with any questions you may have so that maintainers can answer them. You can also join the [Matrix Development Chat](https://matrix.to/#/#lemmydev:matrix.org) for general assistance. + ### Translations - If you want to help with translating, take a look at [Weblate](https://weblate.join-lemmy.org/projects/lemmy/). You can also help by [translating the documentation](https://github.com/LemmyNet/lemmy-docs#adding-a-new-language). From 6778279bb66719cbbba2058cc5f41c36ae59f01a Mon Sep 17 00:00:00 2001 From: Dessalines Date: Tue, 5 Mar 2024 09:31:04 -0500 Subject: [PATCH 2/4] When purging a federated user, federate local community removals. (#4505) --- crates/api/src/site/purge/person.rs | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/crates/api/src/site/purge/person.rs b/crates/api/src/site/purge/person.rs index 0d5c2d606..130d04552 100644 --- a/crates/api/src/site/purge/person.rs +++ b/crates/api/src/site/purge/person.rs @@ -1,3 +1,4 @@ +use crate::ban_nonlocal_user_from_local_communities; use activitypub_federation::config::Data; use actix_web::web::Json; use lemmy_api_common::{ @@ -28,7 +29,7 @@ pub async fn purge_person( // Only let admin purge an item is_admin(&local_user_view)?; - // Read the person to get their images + // Read the local user to get their images, and delete them if let Ok(local_user) = LocalUserView::read_person(&mut context.pool(), data.person_id).await { let pictrs_uploads = LocalImage::get_all_by_local_user_id(&mut context.pool(), &local_user.local_user.id).await?; @@ -40,6 +41,18 @@ pub async fn purge_person( } } + let person = Person::read(&mut context.pool(), data.person_id).await?; + ban_nonlocal_user_from_local_communities( + &local_user_view, + &person, + true, + &data.reason, + &Some(true), + &None, + &context, + ) + .await?; + // Clear profile data. Person::delete_account(&mut context.pool(), data.person_id).await?; // Keep person record, but mark as banned to prevent login or refetching from home instance. From 22c2e20fc5d7405894548b83491881c1d4b44079 Mon Sep 17 00:00:00 2001 From: Nutomic Date: Tue, 5 Mar 2024 19:07:20 +0100 Subject: [PATCH 3/4] Remove contributing.md (#4507) --- CONTRIBUTING.md | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 CONTRIBUTING.md diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md deleted file mode 100644 index 75015d8f5..000000000 --- a/CONTRIBUTING.md +++ /dev/null @@ -1,3 +0,0 @@ -# Contributing - -See [here](https://join-lemmy.org/docs/en/contributors/01-overview.html) for contributing Instructions. From 97e2dbdfd7af15b8d46842e961a4e4b913031c03 Mon Sep 17 00:00:00 2001 From: Nutomic Date: Tue, 5 Mar 2024 19:07:52 +0100 Subject: [PATCH 4/4] Update contact section in readme (#4508) * Update contact section in readme * Update README.md * Update README.md --- README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index b2864cec7..96c19bc03 100644 --- a/README.md +++ b/README.md @@ -149,9 +149,10 @@ When working on an issue or pull request, you can comment with any questions you - If you want to help with translating, take a look at [Weblate](https://weblate.join-lemmy.org/projects/lemmy/). You can also help by [translating the documentation](https://github.com/LemmyNet/lemmy-docs#adding-a-new-language). -## Contact +## Community -- [Mastodon](https://mastodon.social/@LemmyDev) +- [Matrix Space](https://matrix.to/#/#lemmy-space:matrix.org) +- [Lemmy Forum](https://lemmy.ml/c/lemmy) - [Lemmy Support Forum](https://lemmy.ml/c/lemmy_support) ## Code Mirrors