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

Replace misuses of 'plaintext' with 'cleartext' and clarify spoiler docs #1306

Merged
merged 5 commits into from
Oct 27, 2022

Conversation

anoadragon453
Copy link
Member

@anoadragon453 anoadragon453 commented Oct 26, 2022

Closes #1223.

Also replaces the term in the documentation of spoilers, where 'spoilered text' makes more sense in my opinion.

Preview: https://pr1306--matrix-spec-previews.netlify.app

Also replaces the term in the documentation of spoilers, where 'spoilered text' makes
more sense, in my opinion.
@anoadragon453 anoadragon453 marked this pull request as ready for review October 26, 2022 10:33
@anoadragon453 anoadragon453 requested a review from a team as a code owner October 26, 2022 10:33
Comment on lines 330 to 334
When sending a spoiler, clients SHOULD provide the fallback in the `body` as shown above
(including the reason). The fallback SHOULD omit the spoiler text verbatim since `body`
might show up in text-only clients or in notifications. To prevent spoilers showing up in
such situations, clients are strongly encouraged to first upload the text containing spoilers
to the media repository, then reference the MXC URI in a markdown-style link, as shown above.
Copy link
Member Author

Choose a reason for hiding this comment

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

Apologies for the poor diff due to formatting. The real diff is:

When sending a spoiler, clients SHOULD provide the fallback in the body as shown above
(including the reason). The fallback SHOULD omit the spoiler text verbatim since body
might show up in text-only clients or in notifications. To prevent spoilers showing up in
such situations, clients are strongly encouraged to first upload the text containing spoilers
to the media repository, then reference the MXC URI in a markdown-style link, as shown above.

Copy link
Member

Choose a reason for hiding this comment

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

I don't know what "omit the spoiler text verbatim" means, but that's not new.

This looks like a net clarification to me.

Copy link
Member Author

@anoadragon453 anoadragon453 Oct 27, 2022

Choose a reason for hiding this comment

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

Perhaps we can drop the "verbatim". In any case, it just means: don't include the text containing spoilers in body.

Copy link
Member Author

Choose a reason for hiding this comment

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

I've tried to clean this sentence up a bit in c24fb1d.

Comment on lines 330 to 334
When sending a spoiler, clients SHOULD provide the fallback in the `body` as shown above
(including the reason). The fallback SHOULD omit the spoiler text verbatim since `body`
might show up in text-only clients or in notifications. To prevent spoilers showing up in
such situations, clients are strongly encouraged to first upload the text containing spoilers
to the media repository, then reference the MXC URI in a markdown-style link, as shown above.
Copy link
Member

Choose a reason for hiding this comment

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

I don't know what "omit the spoiler text verbatim" means, but that's not new.

This looks like a net clarification to me.

changelogs/client_server/newsfragments/1306.clarification Outdated Show resolved Hide resolved
anoadragon453 and others added 2 commits October 27, 2022 10:16
Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
@anoadragon453 anoadragon453 changed the title Replace misuses of 'plaintext' with 'cleartext' Replace misuses of 'plaintext' with 'cleartext' and clarify spoiler docs Oct 27, 2022
@anoadragon453 anoadragon453 enabled auto-merge (squash) October 27, 2022 09:22
@anoadragon453 anoadragon453 merged commit c8242ee into main Oct 27, 2022
@anoadragon453 anoadragon453 deleted the anoa/plaintext_clearly branch October 27, 2022 09:23
clokep pushed a commit to clokep/matrix-spec that referenced this pull request May 3, 2023
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.

Spec refers to "plaintext" when it means "cleartext"
2 participants