From 348b549f9f7694a39be0c6f83200332b179788e5 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 29 Aug 2018 11:19:37 -0600
Subject: [PATCH 1/2] Add the other fields the server is expected to keep on
 events

Fixes https://github.com/matrix-org/matrix-doc/issues/839

Reference: https://github.com/matrix-org/synapse/blob/d69decd5c78c72abef50b597a689e2bc55a39702/synapse/events/utils.py#L44-L91
---
 specification/client_server_api.rst | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/specification/client_server_api.rst b/specification/client_server_api.rst
index b377cbb8d..cbe7d24ab 100644
--- a/specification/client_server_api.rst
+++ b/specification/client_server_api.rst
@@ -1328,16 +1328,30 @@ the following list:
 - ``state_key``
 - ``prev_content``
 - ``content``
+- ``hashes``
+- ``signatures``
+- ``depth``
+- ``prev_events``
+- ``prev_state``
+- ``auth_events``
+- ``origin``
+- ``origin_server_ts``
+- ``membership``
+
+.. Note:
+   Some of the keys, such as ``hashes``, will appear on the federation-formatted
+   event and therefore the client may not be aware of them.
 
 The content object should also be stripped of all keys, unless it is one of
 one of the following event types:
 
-- ``m.room.member`` allows key ``membership``
-- ``m.room.create`` allows key ``creator``
-- ``m.room.join_rules`` allows key ``join_rule``
+- ``m.room.member`` allows key ``membership``.
+- ``m.room.create`` allows key ``creator``.
+- ``m.room.join_rules`` allows key ``join_rule``.
 - ``m.room.power_levels`` allows keys ``ban``, ``events``, ``events_default``,
   ``kick``, ``redact``, ``state_default``, ``users``, ``users_default``.
-- ``m.room.aliases`` allows key ``aliases``
+- ``m.room.aliases`` allows key ``aliases``.
+- ``m.room.history_visibility`` allows key ``history_visibility``.
 
 The server should add the event causing the redaction to the ``unsigned``
 property of the redacted event, under the ``redacted_because`` key. When a

From 86f616bb31041a6b49f6239adc9193c60cb4b46f Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 29 Aug 2018 11:20:51 -0600
Subject: [PATCH 2/2] Changelog

---
 changelogs/client_server/newsfragments/1602.clarification | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelogs/client_server/newsfragments/1602.clarification

diff --git a/changelogs/client_server/newsfragments/1602.clarification b/changelogs/client_server/newsfragments/1602.clarification
new file mode 100644
index 000000000..def503cb7
--- /dev/null
+++ b/changelogs/client_server/newsfragments/1602.clarification
@@ -0,0 +1 @@
+Add the other keys that redactions are expected to preserve.