From 886ffbf158d2a843fc26a11213317b220a34c2da Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Fri, 6 Nov 2015 21:00:34 +0100
Subject: [PATCH] switch to m.* prefixes for tags before it's too late

---
 src/controllers/organisms/RoomList.js        |  8 ++++----
 src/skins/vector/views/molecules/RoomTile.js |  2 +-
 src/skins/vector/views/organisms/RoomList.js | 16 ++++++++--------
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/controllers/organisms/RoomList.js b/src/controllers/organisms/RoomList.js
index 38a0c652c4..3a03fb0439 100644
--- a/src/controllers/organisms/RoomList.js
+++ b/src/controllers/organisms/RoomList.js
@@ -139,8 +139,8 @@ module.exports = {
             var me = room.getMember(MatrixClientPeg.get().credentials.userId);
 
             if (me && me.membership == "invite") {
-                s.lists["invites"] = s.lists["invites"] || [];
-                s.lists["invites"].push(room);
+                s.lists["m.invite"] = s.lists["m.invite"] || [];
+                s.lists["m.invite"].push(room);
             }
             else {
                 var shouldShowRoom =  (
@@ -172,8 +172,8 @@ module.exports = {
                         }
                     }
                     else {
-                        s.lists["recents"] = s.lists["recents"] || [];
-                        s.lists["recents"].push(room); 
+                        s.lists["m.recent"] = s.lists["m.recent"] || [];
+                        s.lists["m.recent"].push(room); 
                     }
                 }
             }
diff --git a/src/skins/vector/views/molecules/RoomTile.js b/src/skins/vector/views/molecules/RoomTile.js
index 5be7ac4c57..27c6bc124e 100644
--- a/src/skins/vector/views/molecules/RoomTile.js
+++ b/src/skins/vector/views/molecules/RoomTile.js
@@ -77,7 +77,7 @@ var roomTileSource = {
 
             var newOrder= {};
             if (item.targetList.props.order === 'manual') {
-                newOrder['order' = item.targetList.calcManualOrderTagData(item.room);
+                newOrder['order'] = item.targetList.calcManualOrderTagData(item.room);
             }
 
             // if we moved lists or the ordering changed, add the new tag
diff --git a/src/skins/vector/views/organisms/RoomList.js b/src/skins/vector/views/organisms/RoomList.js
index 98b1da5419..9c67d905f1 100644
--- a/src/skins/vector/views/organisms/RoomList.js
+++ b/src/skins/vector/views/organisms/RoomList.js
@@ -44,7 +44,7 @@ module.exports = React.createClass({
             <div className="mx_RoomList" onScroll={self._repositionTooltip}>
                 { expandButton }
 
-                <RoomSubList list={ self.state.lists['invites'] }
+                <RoomSubList list={ self.state.lists['m.invite'] }
                              label="Invites"
                              editable={ false }
                              order="recent"
@@ -52,9 +52,9 @@ module.exports = React.createClass({
                              selectedRoom={ self.props.selectedRoom }
                              collapsed={ self.props.collapsed } />
 
-                <RoomSubList list={ self.state.lists['favourite'] }
+                <RoomSubList list={ self.state.lists['m.favourite'] }
                              label="Favourites"
-                             tagName="favourite"
+                             tagName="m.favourite"
                              verb="favourite"
                              editable={ true }
                              order="manual"
@@ -62,7 +62,7 @@ module.exports = React.createClass({
                              selectedRoom={ self.props.selectedRoom }
                              collapsed={ self.props.collapsed } />
 
-                <RoomSubList list={ self.state.lists['recents'] }
+                <RoomSubList list={ self.state.lists['m.recent'] }
                              label="Conversations"
                              editable={ true }
                              order="recent"
@@ -70,9 +70,9 @@ module.exports = React.createClass({
                              selectedRoom={ self.props.selectedRoom }
                              collapsed={ self.props.collapsed } />
 
-                <RoomSubList list={ self.state.lists['lowpriority'] }
+                <RoomSubList list={ self.state.lists['m.lowpriority'] }
                              label="Low priority"
-                             tagName="lowpriority"
+                             tagName="m.lowpriority"
                              verb="deprioritize"
                              editable={ true }
                              order="recent"
@@ -81,7 +81,7 @@ module.exports = React.createClass({
                              collapsed={ self.props.collapsed } />
 
                 { Object.keys(self.state.lists).map(function(tagName) {
-                    if (!tagName.match(/^(invites|favourite|recents|lowpriority|archived)$/)) {
+                    if (!tagName.match(/^m\.(invite|favourite|recent|lowpriority|archived)$/)) {
                         return <RoomSubList list={ self.state.lists[tagName] }
                              key={ tagName }
                              label={ tagName }
@@ -96,7 +96,7 @@ module.exports = React.createClass({
                     }
                 }) }
 
-                <RoomSubList list={ self.state.lists['archived'] }
+                <RoomSubList list={ self.state.lists['m.archived'] }
                              label="Historical"
                              editable={ false }
                              order="recent"