Skip to content

Add public blocks to /about/blocks - #11298

Merged
Gargron merged 11 commits into
mastodon:masterfrom
ClearlyClaire:fixes/advertise-blocks
Aug 19, 2019
Merged

Gargron merged 11 commits into
mastodon:masterfrom
ClearlyClaire:fixes/advertise-blocks

Conversation

@ClearlyClaire

@ClearlyClaire ClearlyClaire commented Jul 14, 2019 •

Copy link
Copy Markdown
Contributor

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

@ClearlyClaire
ClearlyClaire force-pushed the fixes/advertise-blocks branch 5 times, most recently from b5c07d3 to 829e2f4 Compare July 14, 2019 15:57
@ClearlyClaire
ClearlyClaire marked this pull request as ready for review July 14, 2019 15:58
@ClearlyClaire

Copy link
Copy Markdown
Contributor Author

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

@koyuawsmbrtn

Copy link
Copy Markdown
Contributor

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

@ClearlyClaire
ClearlyClaire requested a review from Gargron July 16, 2019 10:56
@tribela

tribela commented Jul 17, 2019

Copy link
Copy Markdown
Contributor

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

@Gargron

Gargron commented Jul 17, 2019

Copy link
Copy Markdown
Member

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".

@tribela

tribela commented Jul 17, 2019 •

Copy link
Copy Markdown
Contributor

@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.

@ClearlyClaire
ClearlyClaire force-pushed the fixes/advertise-blocks branch from 04ca1c1 to 657ee33 Compare July 17, 2019 19:42
@ClearlyClaire

Copy link
Copy Markdown
Contributor Author

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

@BenLubar

Copy link
Copy Markdown
Contributor

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

@clarfonthey

Copy link
Copy Markdown

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.

@ClearlyClaire
ClearlyClaire force-pushed the fixes/advertise-blocks branch 2 times, most recently from 152ec2e to 50a6962 Compare July 23, 2019 15:23
@ClearlyClaire
ClearlyClaire force-pushed the fixes/advertise-blocks branch from 50a6962 to 6a6afcf Compare August 7, 2019 13:46
@ClearlyClaire
ClearlyClaire force-pushed the fixes/advertise-blocks branch 3 times, most recently from ab5a281 to 8075864 Compare August 8, 2019 13:05
@ClearlyClaire

Copy link
Copy Markdown
Contributor Author

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.

@ClearlyClaire
ClearlyClaire force-pushed the fixes/advertise-blocks branch from 8075864 to 8998bae Compare August 8, 2019 13:07
@ClearlyClaire
ClearlyClaire force-pushed the fixes/advertise-blocks branch 2 times, most recently from f892945 to 01dd49f Compare August 13, 2019 15:52
@ClearlyClaire

Copy link
Copy Markdown
Contributor Author

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

@ClearlyClaire
ClearlyClaire force-pushed the fixes/advertise-blocks branch from 01dd49f to 51ff4ad Compare August 13, 2019 16:06
@ClearlyClaire

Copy link
Copy Markdown
Contributor Author

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

@ClearlyClaire
ClearlyClaire force-pushed the fixes/advertise-blocks branch from b508c52 to 49e46d0 Compare August 16, 2019 08:30
@ClearlyClaire

Copy link
Copy Markdown
Contributor Author

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

@Gargron
Gargron merged commit 9b6a5ed into mastodon:master Aug 19, 2019
hiyuki2578 pushed a commit to ProjectMyosotis/mastodon that referenced this pull request Oct 2, 2019
* Add automatic blocklist display in /about/blocks

Inspired by https://github.com/Gargron/mastodon.social-misc

* Add admin option to set who can see instance blocks

* Normalize locales files

* Rename “Sandbox” to “Silence” for consistency

* Disable /about/blocks when in whitelist mode

* Optionally display rationale for domain blocks

* Only display domain blocks that have user-facing limitations, and order them

* Redesign table of blocked domains to better handle long domain names and rationales

* Change domain blocks ordering now that rationales aren't displayed right away

* Only show explanation for block severities actually in use

* Reword instance block explanations and add disclaimer for public fetch mode
rtucker referenced this pull request in vulpineclub/mastodon Jan 7, 2021
…bout/blocks

* Add automatic blocklist display in /about/blocks

Inspired by https://github.com/Gargron/mastodon.social-misc

* Add admin option to set who can see instance blocks

* Normalize locales files

* Rename “Sandbox” to “Silence” for consistency

* Disable /about/blocks when in whitelist mode

* Optionally display rationale for domain blocks

* Only display domain blocks that have user-facing limitations, and order them

* Redesign table of blocked domains to better handle long domain names and rationales

* Change domain blocks ordering now that rationales aren't displayed right away

* Only show explanation for block severities actually in use

* Reword instance block explanations and add disclaimer for public fetch mode
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants