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 public blocks to /about/blocks #11298

Merged
merged 11 commits into from Aug 19, 2019

Conversation

@ThibG
Copy link
Collaborator

commented Jul 14, 2019

Add an option to display domain blocks on /about/blocks.

image

This setting has three options:

  • Show to no one (disabled, the default)
  • Show to logged-in users only
  • To everyone

It comes with a similar setting to show the rationale.

Without rationale

image

With rationale

image

@ThibG ThibG force-pushed the ThibG:fixes/advertise-blocks branch 5 times, most recently from b5c07d3 to 829e2f4 Jul 14, 2019

@ThibG ThibG marked this pull request as ready for review Jul 14, 2019

@ThibG

This comment has been minimized.

Copy link
Collaborator Author

commented Jul 14, 2019

Note that it lacks the rationale (as there is currently none included in the database), and it doesn't support censoring domain names.

@koyuawsmbrtn

This comment has been minimized.

Copy link
Contributor

commented Jul 14, 2019

I need such a feature! It's a real pain in the ass to manually maintain a public blocklist.

@ThibG ThibG requested a review from Gargron Jul 16, 2019

@Kjwon15

This comment has been minimized.

Copy link
Contributor

commented Jul 17, 2019

I am more interested on that "Sandbox" severity. (But it's more like soft-block)

@Gargron

This comment has been minimized.

Copy link
Member

commented Jul 17, 2019

I am more interested on that "Sandbox" severity. (But it's more like soft-block)

That's just a more commonly understandable phrasing. Sandbox means "silenced". The text and format of the page is taken from mastodon.social's published blocklist on GitHub. Since that was a standalone thing I felt comfortable using different terminology with explanations, but within Mastodon, it might be worthwhile to either a) use "silence" consistently or b) consistently rename all mod actions from "silence" to "sandbox".

@Kjwon15

This comment has been minimized.

Copy link
Contributor

commented Jul 17, 2019

@Gargron is "silence" also prevent notification from stranger too? if so, Current hint message from admin UI below should be changed.

Silence will make the account's posts invisible to anyone who isn't following them.

@ThibG ThibG force-pushed the ThibG:fixes/advertise-blocks branch from 04ca1c1 to 657ee33 Jul 17, 2019

@ThibG

This comment has been minimized.

Copy link
Collaborator Author

commented Jul 17, 2019

Changed “Sandbox” to “Silence” and rebased on latest master.

@BenLubar

This comment has been minimized.

Copy link
Contributor

commented Jul 20, 2019

Grouping domains by string-equal rationale would be good when adding rationale is supported.

@clarfon

This comment has been minimized.

Copy link
Contributor

commented Jul 21, 2019

I feel like rationales should be discussed in another PR. What makes sense is to just have a set list of tags admins can control and allow filtering by tag.

@ThibG ThibG force-pushed the ThibG:fixes/advertise-blocks branch 2 times, most recently from 152ec2e to 50a6962 Jul 23, 2019

@ThibG ThibG force-pushed the ThibG:fixes/advertise-blocks branch from 50a6962 to 6a6afcf Aug 7, 2019

@ThibG ThibG referenced this pull request Aug 7, 2019

@ThibG ThibG force-pushed the ThibG:fixes/advertise-blocks branch 3 times, most recently from ab5a281 to 8075864 Aug 8, 2019

@ThibG

This comment has been minimized.

Copy link
Collaborator Author

commented Aug 8, 2019

Edited to add support for optionally showing the public comment (rationale).

As for showing the blocklist at all, it can be set to show the rationale to anyone, logged in users, or nobody.

@ThibG ThibG force-pushed the ThibG:fixes/advertise-blocks branch from 8075864 to 8998bae Aug 8, 2019

@ykzts
ykzts approved these changes Aug 9, 2019

@ThibG ThibG force-pushed the ThibG:fixes/advertise-blocks branch 2 times, most recently from f892945 to 01dd49f Aug 12, 2019

@ThibG

This comment has been minimized.

Copy link
Collaborator Author

commented Aug 13, 2019

Rebased, and redesigned it so it better handles long domain names and rationales:
image

@ThibG ThibG force-pushed the ThibG:fixes/advertise-blocks branch from 01dd49f to 51ff4ad Aug 13, 2019

@ThibG

This comment has been minimized.

Copy link
Collaborator Author

commented Aug 16, 2019

Reworded the text a bit and added a disclaimer about suspended servers still being able to retrieve public content, whenever the instance is in public_fetch_mode?.

image

@ThibG ThibG force-pushed the ThibG:fixes/advertise-blocks branch from b508c52 to 49e46d0 Aug 16, 2019

@ThibG

This comment has been minimized.

Copy link
Collaborator Author

commented Aug 19, 2019

@Gargron I think the text is fine, can this be merged?

@Gargron Gargron merged commit 9b6a5ed into tootsuite:master Aug 19, 2019

2 checks passed

build-and-test Workflow: build-and-test
Details
codeclimate All good!
Details
@ThibG ThibG referenced this pull request Aug 26, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
7 participants
You can’t perform that action at this time.