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.

Sign up for GitHub

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

Jump to bottom

MSC2010: Add client-side spoilers #2010

Merged
merged 11 commits into from
Aug 21, 2019
Merged

MSC2010: Add client-side spoilers #2010

merged 11 commits into from
Aug 21, 2019

Conversation

Sorunome
Copy link
Contributor

Half-Shot
Half-Shot reviewed May 22, 2019
View reviewed changes
Copy link
Contributor

@Half-Shot Half-Shot left a comment

Choose a reason for hiding this comment

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

Cool stuff, added a few things I'd like to see explained.

proposals/2010-spoilers.md Outdated Show resolved Hide resolved
proposals/2010-spoilers.md Outdated Show resolved Hide resolved
proposals/2010-spoilers.md Outdated Show resolved Hide resolved
proposals/2010-spoilers.md Outdated Show resolved Hide resolved
@Sorunome Sorunome changed the title MSC 2010: Add client-side spoilers MSC2010: Add client-side spoilers May 22, 2019
@turt2live turt2live added proposal A matrix spec change proposal proposal-in-review labels May 22, 2019
@turt2live
Copy link
Member

@Sorunome please wrap lines at around 100 characters to make line-by-line review a bit easier, and resolve the threads which no longer apply

@Sorunome Sorunome mentioned this pull request May 22, 2019
Merged
@Sorunome Sorunome mentioned this pull request Jun 17, 2019
Merged
@anoadragon453
Copy link
Member

Looks pretty straight-forward to me, and essential for bridging other networks which include spoiler functionality, such as Discord. Thanks!

@mscbot fcp merge

@mscbot
Copy link
Collaborator

mscbot commented Jun 21, 2019 •
edited by erikjohnston
Loading

Team member @anoadragon453 has proposed to merge this. The next step is review by the rest of the tagged people:

No concerns currently listed.

Once a majority of reviewers approve (and none object), this will enter its final comment period. If you spot a major issue that hasn't been raised at any point in this process, please speak up!

See this document for info about what commands tagged team members can give me.

@mscbot mscbot added proposed-final-comment-period Currently awaiting signoff of a majority of team members in order to enter the final comment period. disposition-merge labels Jun 21, 2019
turt2live
turt2live approved these changes Jun 21, 2019
View reviewed changes
Copy link
Member

@turt2live turt2live left a comment

Choose a reason for hiding this comment

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

lgtm! It sucks that we can't use extensible events for this yet :(

@uhoreg
Copy link
Member

uhoreg commented Jun 24, 2019

related to https://github.com/matrix-org/matrix-doc/issues/604 and element-hq/element-web#5550

uhoreg
uhoreg reviewed Jun 24, 2019
View reviewed changes
Copy link
Member

@uhoreg uhoreg left a comment

Choose a reason for hiding this comment

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

Mostly looks good.

proposals/2010-spoilers.md Outdated Show resolved Hide resolved
proposals/2010-spoilers.md Outdated Show resolved Hide resolved
uhoreg
uhoreg approved these changes Jul 15, 2019
View reviewed changes
proposals/2010-spoilers.md Outdated Show resolved Hide resolved
proposals/2010-spoilers.md Outdated Show resolved Hide resolved
dbkr
dbkr reviewed Jul 16, 2019
View reviewed changes
Copy link
Member

@dbkr dbkr left a comment •
edited
Loading

Choose a reason for hiding this comment

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

I think this seems like the best way of doing this - looks like there's a whole collection of different ways that people have done this for various forums etc (eg. pretending the <spoiler> tag is a thing or a blockquote with a custom class) but afaics there's no obvious prevailing one, so I think this is as good as any.

A comment on why the 'details' HTML element was rejected would be nice though (presumably we wanted something inline?)

proposals/2010-spoilers.md Outdated Show resolved Hide resolved
@mscbot mscbot added finished-final-comment-period and removed proposed-final-comment-period Currently awaiting signoff of a majority of team members in order to enter the final comment period. labels Aug 16, 2019
@mscbot
Copy link
Collaborator

mscbot commented Aug 21, 2019

The final comment period, with a disposition to merge, as per the review above, is now complete.

@mscbot mscbot removed the final-comment-period This MSC has entered a final comment period in interest to approval, postpone, or delete in 5 days. label Aug 21, 2019
@turt2live turt2live merged commit 8ca50ea into matrix-org:master Aug 21, 2019
@turt2live turt2live added spec-pr-missing Proposal has been implemented and is being used in the wild but hasn't yet been added to the spec and removed finished-final-comment-period labels Aug 29, 2019
@turt2live
Copy link
Member

implementation: matrix-org/matrix-react-sdk#3018

@BillCarsonFr BillCarsonFr mentioned this pull request Nov 1, 2019
Merged
5 tasks
@Sorunome
Copy link
Contributor Author

Sorunome commented Dec 8, 2019

This got merged without a sign-off, so here we go:

Signed-off-by: Sorunome mail@sorunome.de

@turt2live turt2live added the kind:feature MSC for not-core and not-maintenance stuff label Apr 20, 2020
@turt2live turt2live self-assigned this May 15, 2020
turt2live added a commit that referenced this pull request May 15, 2020
@turt2live
Spec spoilers and color attribute allowance
27db337 
Spoilers MSC: #2010
`color` attribute MSC: #2422
@turt2live turt2live mentioned this pull request May 15, 2020
Closed
@turt2live
Copy link
Member

turt2live commented May 15, 2020 •
edited
Loading

Spec PR: #2549

@turt2live turt2live added spec-pr-in-review A proposal which has been PR'd against the spec and is in review and removed spec-pr-missing Proposal has been implemented and is being used in the wild but hasn't yet been added to the spec labels May 15, 2020
@turt2live turt2live mentioned this pull request May 15, 2020
Closed
turt2live added a commit that referenced this pull request May 19, 2020
@turt2live
Proposal to clarify spoilers
6eecee7 
Original MSC: #2010

*Per the proposal process, MSC2010 has been modified to match this MSC.*
@turt2live turt2live mentioned this pull request May 19, 2020
Merged
@uhoreg uhoreg mentioned this pull request Oct 20, 2020
Merged
turt2live added a commit that referenced this pull request Apr 6, 2021
@turt2live
Incorporate spoilers and color tag allowance
38ea7fd 
Specs [MSC2010](#2010)
Specs [MSC2557](#2557)
Specs [MSC2422](#2422)
Obsoletes #2549
Built upon #3094
@turt2live turt2live mentioned this pull request Apr 6, 2021
Merged
@turt2live turt2live added merged A proposal whose PR has merged into the spec! and removed spec-pr-in-review A proposal which has been PR'd against the spec and is in review labels Apr 6, 2021
@turt2live
Copy link
Member

Merged 🎉

This was referenced May 15, 2023
Open
Draft
richvdh pushed a commit that referenced this pull request Aug 23, 2021
@turt2live @richvdh
Incorporate spoilers and color tag allowance
bb5d351 
Specs [MSC2010](#2010)
Specs [MSC2557](#2557)
Specs [MSC2422](#2422)
Obsoletes #2549
Built upon #3094
richvdh pushed a commit that referenced this pull request Aug 27, 2021
@turt2live @richvdh
Incorporate spoilers and color tag allowance
a0345ea 
Specs [MSC2010](#2010)
Specs [MSC2557](#2557)
Specs [MSC2422](#2422)
Obsoletes #2549
Built upon #3094
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@KitsuneRal KitsuneRal KitsuneRal left review comments

@Half-Shot Half-Shot Half-Shot left review comments

@richvdh richvdh richvdh left review comments

@anoadragon453 anoadragon453 anoadragon453 left review comments

@turt2live turt2live turt2live approved these changes

@uhoreg uhoreg uhoreg approved these changes

@dbkr dbkr dbkr approved these changes

Assignees

@turt2live turt2live

Labels
disposition-merge kind:feature MSC for not-core and not-maintenance stuff merged A proposal whose PR has merged into the spec! proposal A matrix spec change proposal
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
9 participants
@Sorunome @turt2live @anoadragon453 @mscbot @uhoreg @dbkr @richvdh @Half-Shot @KitsuneRal