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

Use summary as summary for converted ActivityPub objects #9823

Merged
merged 1 commit into from Jan 16, 2019

Conversation

Projects
None yet
3 participants
@Gargron
Copy link
Member

Gargron commented Jan 16, 2019

For non-Note objects, summary has a slightly different semantic meaning, and it doesn't make sense to use it as a content warning hiding the title and link to the article. So, for converted object types, display the title, then summary, then the link to the article.

Fix #8609

@ThibG

ThibG approved these changes Jan 16, 2019

@ThibG

This comment has been minimized.

Copy link
Collaborator

ThibG commented Jan 16, 2019

LGTM. This means such objects can't have a Content Warning though. Maybe use the title as a CW?

@Gargron

This comment has been minimized.

Copy link
Member Author

Gargron commented Jan 16, 2019

I see no good reason to make people click show more, since both the title and the summary of a blog post are typically oriented towards being displayed in public view, while what would be actually hidden by the CW is the main text which is not displayed anyway (link).

@Gargron Gargron merged commit 4ab4228 into master Jan 16, 2019

11 checks passed

ci/circleci: build Your tests passed on CircleCI!
Details
ci/circleci: check-i18n Your tests passed on CircleCI!
Details
ci/circleci: install Your tests passed on CircleCI!
Details
ci/circleci: install-ruby2.4 Your tests passed on CircleCI!
Details
ci/circleci: install-ruby2.5 Your tests passed on CircleCI!
Details
ci/circleci: install-ruby2.6 Your tests passed on CircleCI!
Details
ci/circleci: test-ruby2.4 Your tests passed on CircleCI!
Details
ci/circleci: test-ruby2.5 Your tests passed on CircleCI!
Details
ci/circleci: test-ruby2.6 Your tests passed on CircleCI!
Details
ci/circleci: test-webui Your tests passed on CircleCI!
Details
codeclimate All good!
Details

@Gargron Gargron deleted the fix-article-summary branch Jan 16, 2019

@@ -61,7 +61,7 @@ def process_status_params
account: @account,
text: text_from_content || '',
language: detected_language,
spoiler_text: text_from_summary || '',
spoiler_text: converted_object_type? ? '' : (text_from_summary || ''),

This comment has been minimized.

@nightpool

nightpool Jan 16, 2019

Collaborator

this should be object[:sensitive] or something equivalent, so converted object types can still opt in to CWs

@nightpool

This comment has been minimized.

Copy link
Collaborator

nightpool commented Jan 16, 2019

aren't there other converted object types besides articles though?

@Gargron

This comment has been minimized.

Copy link
Member Author

Gargron commented Jan 16, 2019

If a video or image is marked sensitive, it will be hidden. Since they don't have other text, it doesn't make sense to to make people click "show more" for nothing.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment