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

Fixes and clarifications around m.reaction #1531

Merged
merged 5 commits into from
May 23, 2023
Merged

Fixes and clarifications around m.reaction #1531

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ff02fc6
Fix typo for .m.rule.reaction push rule
zecakeh May 22, 2023
481ed85
Remove outdated info box about unspecced m.reaction
zecakeh May 22, 2023
fca95a3
Clarify that reactions might not be emojis
zecakeh May 22, 2023
9b7549c
Add an info box about long reactions
zecakeh May 22, 2023
b99500b
Add changelog
zecakeh May 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions changelogs/client_server/newsfragments/1531.feature
View file
Open in desktop
@@ -0,0 +1 @@
Add `m.annotation` relations (reactions), as per [MSC2677](https://github.com/matrix-org/matrix-spec-proposals/pull/2677).
6 changes: 6 additions & 0 deletions content/client-server-api/modules/event_annotations.md
View file
Open in desktop
Expand Up @@ -71,6 +71,12 @@ change their reaction, the original reaction should be redacted and a new one
sent in its place.
{{% /boxes/note %}}

{{% boxes/note %}}
The `key` field in `m.reaction` can be any string so clients must take care to
render long reactions in a sensible manner. For example, clients can elide
overly-long reactions.
{{% /boxes/note %}}

#### Server behaviour

##### Avoiding duplicate annotations
Expand Down
2 changes: 1 addition & 1 deletion content/client-server-api/modules/push.md
View file
Open in desktop
Expand Up @@ -700,7 +700,7 @@ Definition:

{{% added-in v="1.7" %}}

Matches any event whose type is `m.room.reaction`. This suppresses notifications for [`m.reaction`](#mreaction) events.
Matches any event whose type is `m.reaction`. This suppresses notifications for [`m.reaction`](#mreaction) events.

Definition:

Expand Down
6 changes: 0 additions & 6 deletions content/client-server-api/modules/receipts.md
View file
Open in desktop
Expand Up @@ -153,12 +153,6 @@ relationships and solid lines showing topological ordering.

![threaded-dag](/diagrams/threaded-dag.png)

{{% boxes/note %}}
`m.reaction` relationships are not currently specified, but are shown here for
their conceptual place in a threaded DAG. They are currently proposed as
[MSC2677](https://github.com/matrix-org/matrix-spec-proposals/pull/2677).
{{% /boxes/note %}}

This DAG can be represented as 3 threaded timelines, with `A` and `B` being thread
roots:

Expand Down
8 changes: 5 additions & 3 deletions data/event-schemas/schema/m.reaction.yaml
View file
Open in desktop
Expand Up @@ -30,8 +30,10 @@ properties:
key:
type: string
description: |-
An emoji representing the reaction being made. Should include the
unicode emoji presentation selector (`\uFE0F`) for codepoints
which allow it (see the [emoji variation sequences
The reaction being made, usually an emoji.

If this is an emoji, it should include the unicode emoji
presentation selector (`\uFE0F`) for codepoints which allow it
(see the [emoji variation sequences
list](https://www.unicode.org/Public/UCD/latest/ucd/emoji/emoji-variation-sequences.txt)).
example: "👍"