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

Block mature content when access directly from URL #4560

Merged
merged 2 commits into from
Jul 24, 2020

Conversation

infinite-persistence
Copy link
Contributor

@infinite-persistence infinite-persistence commented Jul 21, 2020

Issue:

Fixes #4549 Mature content + navigating to URLs directly

If a user navigates to mature content directly, we currently show the page even if mature content setting is not enabled. With our recent mature content verification setting, we should hide the page until the user turns it on - we can prompt directly on the file page.

Changes:

  1. Show basic info of the claim like URL and Title, so that user knows which page is being blocked.
  2. Initially, I had 2 separate "boxes" -- one for the title and another for the message. It felt a bit messy, so FileTitle was augmented to house everything in one connected box.

image

Copy link

@neb-b neb-b left a comment

Choose a reason for hiding this comment

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

Minor comments. Tested this and it works great.

<FileActions uri={uri} />
isNsfwBlocked ? (
<div className="main--empty">
<h2 className="card__title card__title">
Copy link

Choose a reason for hiding this comment

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

Since they are in the same card, this shouldn't use card__title. I think the generic h2 will work.

settings: <Button button="link" label={__('Content Settings')} navigate={`/$/${PAGES.SETTINGS}`} />,
}}
>
Change %settings%
Copy link

Choose a reason for hiding this comment

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

"Change this in your content settings."

## Issue:
Fixes 4549 `Mature content + navigating to URLs directly`
_If a user navigates to mature content directly, we currently show the page even if mature content setting is not enabled. With our recent mature content verification setting, we should hide the page until the user turns it on - we can prompt directly on the file page._

## Changes:
1. Show basic info of the claim like URL and Title, so that user knows which page is being blocked.
2. Initially, I had 2 "boxes" -- one for the title and another for the message. It felt a bit messy, so `FileTitle` was augmented to house everything in one box.
@neb-b neb-b merged commit 58adba3 into master Jul 24, 2020
@neb-b neb-b deleted the ip-4549-block-mature-direct branch July 24, 2020 20:59
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.

Mature content + navigating to URLs directly
2 participants