summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-09-29 16:39:08 +0100
committerErik Johnston <erik@matrix.org>2014-09-29 16:39:08 +0100
commit3656eb4740afd245028f34b0b56cb684a00269b5 (patch)
tree1e6ff66b29b23f14a6c5af488c48f9611d4e6148
parentMerge branch 'whois' of github.com:matrix-org/synapse into develop (diff)
downloadsynapse-3656eb4740afd245028f34b0b56cb684a00269b5.tar.xz
Add m.room.redacted in events list
Diffstat (limited to '')
-rw-r--r--docs/specification.rst16
1 files changed, 16 insertions, 0 deletions
diff --git a/docs/specification.rst b/docs/specification.rst
index 370e238e00..a44c7c4882 100644
--- a/docs/specification.rst
+++ b/docs/specification.rst
@@ -968,6 +968,22 @@ prefixed with ``m.``
     ``read`` (sent when the event has been observed by the end-user). The ``target_event_id``
     should reference the ``m.room.message`` event being acknowledged. 
 
+``m.room.redaction``
+  Summary:
+    Indicates a previous event has been redacted.
+  Type:
+    Non-state event
+  JSON format:
+    ``{ "reason": "string" }``
+  Description:
+    Events can be redacted by either room or server admins. Redacting an event means that
+    all keys not required by the protocol are stripped off, allowing admins to remove
+    offensive or illegal content that may have been attached to any event. This cannot be
+    undone, allowing server owners to physically delete the offending data.
+    There is also a concept of a moderator hiding a non-state event, which can be undone,
+    but cannot be applied to state events.
+    The event that has been redacted is specified in the ``redacts`` event level key.
+
 m.room.message msgtypes
 -----------------------
 Each ``m.room.message`` MUST have a ``msgtype`` key which identifies the type of