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

Jump to bottom

Add account sensitized #14361

Merged
merged 5 commits into from
Nov 4, 2020
Merged

Add account sensitized #14361

merged 5 commits into from
Nov 4, 2020

Conversation

noellabo
Copy link
Contributor

This is a moderation function.

If your target account does not properly flag sensitive when attaching sensitive media attachments or posting with URLs, you can flag your account as sensitive instead of silence or suspend.

  • Add a sensitive flag to the activities that local users deliver to remote. It cannot be updated and cannot be canceled.
  • The remote and local user status retains the original sensitive flags, but this moderation overwrites them dynamically. When you remove the sensitive flag from your account, it follows the original status sensitive flag.

@brawaru
Copy link
Contributor

brawaru commented Jul 19, 2020 •
edited
Loading

Are you sure that “sensitized” is a good word choice? It's probably okay in the code, but as for the user it is certainly confusing. Maybe just say that “account is marked as sensitive” or something like this?

@noellabo
Copy link
Contributor Author

Thanks Sasha-Sorokin.
I fixed it, but I'm not sure if it's a proper expression.

Gargron
Gargron reviewed Jul 22, 2020
View reviewed changes
config/locales/en.yml Outdated
silence: Your account %{acct} has been limited
suspend: Your account %{acct} has been suspended
title:
disable: Account frozen
none: Warning
sensitive: Account is marked as sensive
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Typo: sensive -> sensitive

I am a little concerned about the choice of words. This is consistent with "Mark media as sensitive" but "sensitive" has a different meaning when talking about people: "easily hurt or damaged"

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oops!

How about this notation?

Mark the media and URLs that your account posts as sensitive

@noellabo noellabo force-pushed the add-account-sensitized branch from e9d5657 to 771e8c5 Compare August 3, 2020 12:50
@noellabo
Copy link
Contributor Author

noellabo commented Aug 3, 2020

Fixed conflicts and changed wording.

@noellabo noellabo force-pushed the add-account-sensitized branch from 771e8c5 to bb45891 Compare October 7, 2020 03:19
@Gargron Gargron merged commit d6fe0c9 into mastodon:master Nov 4, 2020
@noellabo noellabo deleted the add-account-sensitized branch November 5, 2020 00:03
umonaca pushed a commit to umonaca/mastodon that referenced this pull request Nov 8, 2020
@noellabo @umonaca
Merge upstream account sensitized (mastodon#14361)
1d529b3 
* Add account sensitized

* Fix i18n normalize

* Fix description and spec

* Fix spec

* Fix wording
@tribela
Copy link
Contributor

tribela commented Dec 23, 2020

Please add this type of moderation on domain range too

@trwnh trwnh mentioned this pull request Sep 8, 2022
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Gargron Gargron Gargron approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@noellabo @brawaru @tribela @Gargron