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.

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 notifications of severed relationships #27511

Merged
merged 11 commits into from Mar 20, 2024
Merged

Conversation

ClearlyClaire
Copy link
Contributor

@ClearlyClaire ClearlyClaire commented Oct 23, 2023

When a moderation action severs relationship, record those relationships so they can be examined by the affected local users, offering them to export the lost follows, as well as re-issue them if the domain block gets reverted.

Lost followers cannot be recovered this way, but the information should be made available nonetheless.

image

image

TODO:

  • add database model for severed relationships
  • record severed relationships on server-wide domain suspension
  • record severed relationships on user domain block
  • record severed relationships on server-wide account suspension
  • allow reviewing and downloading severed relationships
  • add notification of severed relationships
  • tell when a domain is purged
  • allow one-click re-issuing of severed follows

Documentation PR: mastodon/documentation#1385

@ClearlyClaire ClearlyClaire force-pushed the features/severed-relationships branch 10 times, most recently from 0d5c6c1 to 8622abe Compare October 27, 2023 15:37
@ClearlyClaire ClearlyClaire force-pushed the features/severed-relationships branch 13 times, most recently from 8241ca5 to 0453fd5 Compare November 7, 2023 13:56
@renchap renchap added this to the 4.3.0 milestone Nov 7, 2023
@ClearlyClaire ClearlyClaire force-pushed the features/severed-relationships branch 3 times, most recently from 8245688 to c37fdf2 Compare November 10, 2023 16:11
Copy link
Contributor

This pull request has merge conflicts that must be resolved before it can be merged.

Copy link
Contributor

This pull request has resolved merge conflicts and is ready for review.

Copy link
Contributor

This pull request has merge conflicts that must be resolved before it can be merged.

@Gargron Gargron enabled auto-merge March 20, 2024 15:36
@Gargron Gargron added this pull request to the merge queue Mar 20, 2024
Merged via the queue into main with commit 44bf7b8 Mar 20, 2024
55 checks passed
@Gargron Gargron deleted the features/severed-relationships branch March 20, 2024 15:42
@vmstan
Copy link
Contributor

vmstan commented Mar 20, 2024

Great to see this get merged!

@nanopone
Copy link

this is incredible! great job everyone

@gunchleoc
Copy link
Contributor

@ClearlyClaire There are 2 similar keys in Crowdin now with the same text, is the second one a typo? notification.severed_relationships and notification.severedRelationships

Lines 41 and 378 in 44bf7b8

@ClearlyClaire
Copy link
Contributor Author

Oops. Thanks for pointing this out, #29689 should address it

cheeaun added a commit to cheeaun/phanpy that referenced this pull request Mar 24, 2024
Reference: mastodon/mastodon#27511

This is done purely based on the above codebase without real testing.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants