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

Revert #6479, hide sensitive text/images from OpenGraph previews #6818

Merged
merged 1 commit into from Mar 18, 2018

Conversation

Projects
None yet
5 participants
@Gargron
Member

Gargron commented Mar 18, 2018

See: #6479

Display summary of attachments in description, and mark up content warning if present, e.g.:

Attached: 3 images · Content warning: Dota 2

When text is not supposed to be hidden, it looks more like:

Attached: 3 images

Here is the text of the toot

With #6817, multilinguagility should be assured...

Other changes:

Instead of "Alice on Mastodon", use "Alice (@alice@example.com)" in OpenGraph titles, since "Mastodon" would be value of the OpenGraph site_name

@Gargron Gargron force-pushed the fix-hide-opengraph-details-again branch from a4fe700 to 48b9a06 Mar 18, 2018

@Cassolotl

This comment has been minimized.

Cassolotl commented Mar 18, 2018

This sounds good. :) Could we see some screenshots? Also, thank you!

Revert #6479, hide sensitive text/images from OpenGraph previews
Display summary of attachments in description, and mark up content
warning if present, e.g.:

    Attached: 3 images · Content warning: Dota 2

When text is not supposed to be hidden, it looks more like:

    Attached: 3 images

    Here is the text of the toot

With #6817, multilinguagility should be assured...

@Gargron Gargron force-pushed the fix-hide-opengraph-details-again branch from 48b9a06 to fa4509e Mar 18, 2018

@Gargron

This comment has been minimized.

Member

Gargron commented Mar 18, 2018

Could we see some screenshots?

Of what, Discord? It's difficult to get those until this patch is deployed on a live instance.

@Cassolotl

This comment has been minimized.

Cassolotl commented Mar 18, 2018

Well, I would love to see some screenshots when it gets tested on a live instance, if that happens before this is merged.

@Gargron

This comment has been minimized.

Member

Gargron commented Mar 18, 2018

@Cassolotl The examples are right there in the OP. That's how it's gonna look.

@Gargron Gargron added the ui label Mar 18, 2018

@Cassolotl

This comment has been minimized.

Cassolotl commented Mar 18, 2018

I just struggle to imagine it, so it would help me to see how it's going to look, to know if I will find this easy to understand, etc.

@Gargron

This comment has been minimized.

Member

Gargron commented Mar 18, 2018

image

@nightpool

This comment has been minimized.

Collaborator

nightpool commented Mar 18, 2018

these changes look great!

do you think we want to update the page title as well or just leave it as is?

image

@Gargron

This comment has been minimized.

Member

Gargron commented Mar 18, 2018

How do you want to update the page title?

@nightpool

This comment has been minimized.

Collaborator

nightpool commented Mar 18, 2018

@Gargron I was just thinking about how you changed the account page title and was wondering if there was a similar change the status page title that made sense ("summary" - Admin (@admin@localhost:3000), or something)

After thinking about possible options for a while I don't think it makes much sense though, so withdrawn.

@Cassolotl

This comment has been minimized.

Cassolotl commented Mar 18, 2018

@Gargron Thank you, this is really good. :) (Is the image an avatar or the CWed image? Sorry this is probably a silly question that is obvious to everyone else, but yeah.)

@nightpool

This comment has been minimized.

Collaborator

nightpool commented Mar 18, 2018

@Cassolotl avatar

@Gargron Gargron merged commit a568e3c into master Mar 18, 2018

2 checks passed

codeclimate All good!
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

@Gargron Gargron deleted the fix-hide-opengraph-details-again branch Mar 18, 2018

@KScl

This comment has been minimized.

Contributor

KScl commented Mar 18, 2018

👍 Thank you. <3

rtucker added a commit to vulpineclub/mastodon that referenced this pull request Mar 18, 2018

Revert tootsuite#6479, hide sensitive text/images from OpenGraph prev…
…iews (tootsuite#6818)

Display summary of attachments in description, and mark up content
warning if present, e.g.:

    Attached: 3 images · Content warning: Dota 2

When text is not supposed to be hidden, it looks more like:

    Attached: 3 images

    Here is the text of the toot

With tootsuite#6817, multilinguagility should be assured...
@rtucker

This comment has been minimized.

Contributor

rtucker commented Mar 18, 2018

Now running in production on vulpine.club. Here's how it looks in Slack:

screenshot 2018-03-18 16 28 11

Source toot: https://vulpine.club/@rey/99706788560684438

Looks good to me ^^

@sammy8806 sammy8806 referenced this pull request Mar 25, 2018

Open

Option to turn on image links again in toots #6899

1 of 2 tasks complete

imbsky pushed a commit to kibousoft/mastodon that referenced this pull request Apr 26, 2018

Revert tootsuite#6479, hide sensitive text/images from OpenGraph prev…
…iews (tootsuite#6818)

Display summary of attachments in description, and mark up content
warning if present, e.g.:

    Attached: 3 images · Content warning: Dota 2

When text is not supposed to be hidden, it looks more like:

    Attached: 3 images

    Here is the text of the toot

With tootsuite#6817, multilinguagility should be assured...

SerCom-KC added a commit to SerCom-KC/mastodon that referenced this pull request May 21, 2018

Gargron added a commit that referenced this pull request May 21, 2018

i18n: Update Simplified Chinese translations (#7565)
* i18n: (zh-CN) #7532

* i18n: (zh-CN) #6984

* i18n: (zh-CN) #7391, #7507

* i18n: (zh-CN) #6998

* i18n: (zh-CN) #7074

* i18n: (zh-CN) #7000, #7032, #7131 (#7032, #7040)

* i18n: (zh-CN) #7130, #7188

* i18n: (zh-CN) #6486

* i18n: (zh-CN) #6292

* i18n: (zh-CN) #7347

* i18n: (zh-CN) #6661

* i18n: (zh-CN) #6425

* i18n: (zh-CN) #6597

* i18n: (zh-CN) #6695

* i18n: (zh-CN) #6325

* i18n: (zh-CN) #6460, #7375

* i18n: (zh-CN) #6872

* i18n: (zh-CN) #6818

* i18n: (zh-CN) #7452

* i18n: (zh-CN) #7176

* i18n: (zh-CN) #6460

* i18n: (zh-CN) #7213

* i18n: (zh-CN) #7376

* i18n: (zh-CN) #6556

* i18n: (zh-CN) #6645

* i18n: (zh-CN) #6448

* i18n: (zh-CN) #5303

* i18n: (zh-CN) #7445

* i18n: (zh-CN) Normalization and improvements

* i18n: (zh-CN) #7391

* i18n: (zh-CN) #6627

* i18n: (zh-CN) #6956, #7546

* i18n: (zh-CN) #6636

* i18n: (zh-CN) #6610, #6875

* i18n: (zh-CN) #6887

* i18n: (zh-CN) #4514

* i18n: (zh-CN) #6628

* i18n: (zh-CN) #6771

* i18n: (zh-CN) #6772

* i18n: (zh-CN) #7178

* i18n: (zh-CN) #7521

* i18n: (zh-CN) #6570

* i18n: (zh-CN) #6593

* i18n: (zh-CN) #6423

* i18n: (zh-CN) #6157

* i18n: (zh-CN) #7089

* i18n: (zh-CN) #6733

* i18n: (zh-CN) #7072

* i18n: (zh-CN) #6520

* i18n: (zh-CN) Improvment

* i18n: (zh-CN) #6631

byronhulcher added a commit to byronhulcher/mastodon that referenced this pull request Aug 18, 2018

i18n: Update Simplified Chinese translations (tootsuite#7565)
* i18n: (zh-CN) tootsuite#7532

* i18n: (zh-CN) tootsuite#6984

* i18n: (zh-CN) tootsuite#7391, tootsuite#7507

* i18n: (zh-CN) tootsuite#6998

* i18n: (zh-CN) tootsuite#7074

* i18n: (zh-CN) tootsuite#7000, tootsuite#7032, tootsuite#7131 (tootsuite#7032, tootsuite#7040)

* i18n: (zh-CN) tootsuite#7130, tootsuite#7188

* i18n: (zh-CN) tootsuite#6486

* i18n: (zh-CN) tootsuite#6292

* i18n: (zh-CN) tootsuite#7347

* i18n: (zh-CN) tootsuite#6661

* i18n: (zh-CN) tootsuite#6425

* i18n: (zh-CN) tootsuite#6597

* i18n: (zh-CN) tootsuite#6695

* i18n: (zh-CN) tootsuite#6325

* i18n: (zh-CN) tootsuite#6460, tootsuite#7375

* i18n: (zh-CN) tootsuite#6872

* i18n: (zh-CN) tootsuite#6818

* i18n: (zh-CN) tootsuite#7452

* i18n: (zh-CN) tootsuite#7176

* i18n: (zh-CN) tootsuite#6460

* i18n: (zh-CN) tootsuite#7213

* i18n: (zh-CN) tootsuite#7376

* i18n: (zh-CN) tootsuite#6556

* i18n: (zh-CN) tootsuite#6645

* i18n: (zh-CN) tootsuite#6448

* i18n: (zh-CN) tootsuite#5303

* i18n: (zh-CN) tootsuite#7445

* i18n: (zh-CN) Normalization and improvements

* i18n: (zh-CN) tootsuite#7391

* i18n: (zh-CN) tootsuite#6627

* i18n: (zh-CN) tootsuite#6956, tootsuite#7546

* i18n: (zh-CN) tootsuite#6636

* i18n: (zh-CN) tootsuite#6610, tootsuite#6875

* i18n: (zh-CN) tootsuite#6887

* i18n: (zh-CN) tootsuite#4514

* i18n: (zh-CN) tootsuite#6628

* i18n: (zh-CN) tootsuite#6771

* i18n: (zh-CN) tootsuite#6772

* i18n: (zh-CN) tootsuite#7178

* i18n: (zh-CN) tootsuite#7521

* i18n: (zh-CN) tootsuite#6570

* i18n: (zh-CN) tootsuite#6593

* i18n: (zh-CN) tootsuite#6423

* i18n: (zh-CN) tootsuite#6157

* i18n: (zh-CN) tootsuite#7089

* i18n: (zh-CN) tootsuite#6733

* i18n: (zh-CN) tootsuite#7072

* i18n: (zh-CN) tootsuite#6520

* i18n: (zh-CN) Improvment

* i18n: (zh-CN) tootsuite#6631
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment