diff --git a/content/client-server-api/_index.md b/content/client-server-api/_index.md index 91a6a11f..ba83c2f4 100644 --- a/content/client-server-api/_index.md +++ b/content/client-server-api/_index.md @@ -1878,10 +1878,10 @@ capability to handle relationships. {{% /boxes/warning %}} 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 -rooms or the relationship missing properties required by the schema below. The events -would appear independent of each other or optionally with an error message (if -rendered/handled by the client exclusively). +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. Clients +handling such invalid relationships should show the events independently of each +other, optionally with an error message. {{% boxes/note %}} 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`. {{% 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. {{% /boxes/note %}} 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". When an event is served to the client through the APIs listed below, a `m.relations` property @@ -2035,6 +2035,8 @@ able to accurately aggregate the events. #### Relationships API +{{% added-in v="1.3" %}} + To retrieve the child events for a parent from the server, the client can call the following endpoint. The events returned might require local aggregation by the client, however if those same events have bundles of their own then they should be present. A diff --git a/content/client-server-api/modules/rich_replies.md b/content/client-server-api/modules/rich_replies.md index 42cf6fda..60c02363 100644 --- a/content/client-server-api/modules/rich_replies.md +++ b/content/client-server-api/modules/rich_replies.md @@ -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 general format for the `body` is: -``` +```text > <@alice:example.org> This is the original body This is where the reply goes