From eb237ed297778fbeaa6278e0f6fe3c151fda26aa Mon Sep 17 00:00:00 2001
From: Kegan Dougal <kegan@matrix.org>
Date: Mon, 12 Jan 2015 11:49:20 +0000
Subject: [PATCH] Blob v2 features into 2.0/2.1

---
 drafts/general_api.rst | 42 +++++++++++++++++++++++++++++-------------
 1 file changed, 29 insertions(+), 13 deletions(-)

diff --git a/drafts/general_api.rst b/drafts/general_api.rst
index 14240186..370287e2 100644
--- a/drafts/general_api.rst
+++ b/drafts/general_api.rst
@@ -6,27 +6,43 @@ Table of Contents
 
 Summary of changes from v1
 ==========================
-Included:
+
+Version 2.0
+-----------
  - Event filtering (type/room/users, federation-style events)
- - Incremental syncing
- - Rejecting invites
+ - Incremental initial syncing
  - Deleting state
- - Contextual messages (view messages around an arbitrary message)
  - Race conditions on event stream / actions
  - Out-of-order events
+ 
+TODO (In scope but needs a bit more work):
+ - Published room API: support searching remote HSes.
+ - Device management (see Account management; s/access token/device ID/g?
+ - Multiple devices
+    - Presence status unioning: is partially specced (needs more eyes).
+    - Syncing data between multiple devices: is specced.  
+    - TODO: Push for offline devices.
+ - Handling "duplicate" events in state/messages key on initial sync.
+    - Have a compact=true flag.
+    - Have an events = { "event_id": <Event>, ... } per room
+    - messages/state keys just have an array of event IDs.
+ - PATCHing power levels - not over federation; just local HS. Spec that.
+
+Lower priority
+~~~~~~~~~~~~~~
  - Capabilities
- - Comments (relates_to key)
  - Editing/updating messages (updates key)
+ - Room alias API
+
+Version 2.1
+-----------
+ - Comments (relates_to key)
+ - Contextual messages (view messages around an arbitrary message)
+ - Rejecting invites
  
-Excluded:
+Out of scope
+------------
  - Searching messages
- - State event pagination (see Global /initialSync API)
- - Initial sync pagination (see Global /initialSync API)
- - PATCHing power levels
- - Handling "duplicate" events in state/messages key on initial sync.
- - Multiple devices (other than VoIP)
- - Room directory lists (aka public room list, paginating, permissions on 
-   editing the list, etc)
 
 Version 2 API
 =============