Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add modlog entries for bulk removals. #5050

Merged
merged 12 commits into from
Oct 1, 2024
Merged

Add modlog entries for bulk removals. #5050

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
c1785d4
Add modlog entries for bulk removals.
dessalines Sep 24, 2024
40aecfb
Merge remote-tracking branch 'origin/main' into bulk_removed_items
dessalines Sep 24, 2024
86b52e4
Merge remote-tracking branch 'origin/main' into bulk_removed_items
dessalines Sep 27, 2024
3a4f67f
Address PR comments.
dessalines Sep 27, 2024
527a119
Merge remote-tracking branch 'origin/main' into bulk_removed_items
dessalines Sep 27, 2024
b363992
Merge remote-tracking branch 'origin/main' into bulk_removed_items
dessalines Sep 30, 2024
7c43f4e
Combining remove and restore functions.
dessalines Sep 30, 2024
0b5259b
Trigger build.
dessalines Sep 30, 2024
846a6c5
Trigger build 2.
dessalines Sep 30, 2024
cf7bdcd
Merge remote-tracking branch 'origin/main' into bulk_removed_items
dessalines Oct 1, 2024
55de1b6
Changing allow to expect.
dessalines Oct 1, 2024
0b9de6f
Fixing clippy.
dessalines Oct 1, 2024
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
2 changes: 2 additions & 0 deletions crates/api/src/community/ban.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,10 @@ pub async fn ban_from_community(
let remove_data = data.ban;
remove_or_restore_user_data_in_community(
data.community_id,
local_user_view.person.id,
banned_person_id,
remove_data,
&data.reason,
&mut context.pool(),
)
.await?;
Expand Down
4 changes: 2 additions & 2 deletions crates/api/src/local_user/ban_person.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,9 @@ pub async fn ban_from_site(
// Remove their data if that's desired
if data.remove_or_restore_data.unwrap_or(false) {
if data.ban {
remove_user_data(person.id, &context).await?;
remove_user_data(local_user_view.person.id, person.id, &data.reason, &context).await?;
} else {
restore_user_data(person.id, &context).await?;
restore_user_data(local_user_view.person.id, person.id, &data.reason, &context).await?;
}
};

Expand Down
Loading