Filip/matrix-spec
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-spec synced 2026-04-28 13:24:10 +02:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/travis/spec/aggregations' into travis/spec/aggregations

Browse source
This commit is contained in:
Travis Ralston 2022-06-08 14:59:42 -06:00
parent a00e70ed04 b509444738
commit 50b4811a42
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
content/client-server-api/_index.md
View file

@ -1878,10 +1878,10 @@ capability to handle relationships.
{{% /boxes/warning %}} {{% /boxes/warning %}}
Relationships which don't match the schema, or which break the rules of a relationship, Relationships which don't match the schema, or which break the rules of a relationship,
are simply ignored. Such an example might be the parent and child being in different are simply ignored. An example might be the parent and child being in different
rooms or the relationship missing properties required by the schema below. The events rooms, or the relationship missing properties required by the schema below. Clients
would appear independent of each other or optionally with an error message (if handling such invalid relationships should show the events independently of each
rendered/handled by the client exclusively). other, optionally with an error message.
{{% boxes/note %}} {{% boxes/note %}}
While this specification describes an `m.relates_to` object containing a `rel_type`, there While this specification describes an `m.relates_to` object containing a `rel_type`, there
@ -1918,12 +1918,12 @@ of times that `key` was used by child events.
The actual aggregation format depends on the `rel_type`. The actual aggregation format depends on the `rel_type`.
{{% boxes/note %}} {{% boxes/note %}}
This specification does not currently describe any `rel_type` which require This specification does not currently describe any `rel_type`s which require
aggregation. This functionality forms a framework for future extensions. aggregation. This functionality forms a framework for future extensions.
{{% /boxes/note %}} {{% /boxes/note %}}
Aggregations are sometimes automatically included by a server alongside the parent Aggregations are sometimes automatically included by a server alongside the parent
event. This This is known as a "bundled aggregation" or "bundle" for simplicity. The event. This is known as a "bundled aggregation" or "bundle" for simplicity. The
act of doing this is "bundling". act of doing this is "bundling".
When an event is served to the client through the APIs listed below, a `m.relations` property When an event is served to the client through the APIs listed below, a `m.relations` property
@ -2037,6 +2037,8 @@ able to accurately aggregate the events.
#### Relationships API #### Relationships API
{{% added-in v="1.3" %}}
To retrieve the child events for a parent from the server, the client can call the To retrieve the child events for a parent from the server, the client can call the
following endpoint. following endpoint.

2
content/client-server-api/modules/rich_replies.md
View file

@ -62,7 +62,7 @@ replies, and MUST strip the fallback before rendering the reply. The
specific fallback text is different for each `msgtype`, however the specific fallback text is different for each `msgtype`, however the
general format for the `body` is: general format for the `body` is:
``` ```text
> <@alice:example.org> This is the original body > <@alice:example.org> This is the original body
This is where the reply goes This is where the reply goes