From 8f967d6e23e6e5a4666caa922a06b300212ecfb5 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Wed, 16 Mar 2016 19:32:48 +0000
Subject: [PATCH 1/2] make MemberTiles actually update in realtime\n\nFixes
 https://github.com/vector-im/vector-web/issues/730 and all its dups

---
 src/components/views/rooms/MemberTile.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/views/rooms/MemberTile.js b/src/components/views/rooms/MemberTile.js
index d5c124ad21..01750b9676 100644
--- a/src/components/views/rooms/MemberTile.js
+++ b/src/components/views/rooms/MemberTile.js
@@ -93,7 +93,6 @@ module.exports = React.createClass({
         return (
             <EntityTile {...this.props} presenceActiveAgo={active} presenceState={presenceState}
                 avatarJsx={av} title={this.getPowerLabel()} onClick={this.onClick}
-                shouldComponentUpdate={this.shouldComponentUpdate.bind(this)}
                 name={name} powerLevel={this.props.member.powerLevel} />
         );
     }

From 4571c644130d281eb58129316c3b8fad146959af Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Wed, 16 Mar 2016 19:52:24 +0000
Subject: [PATCH 2/2] fix zero-length /me

---
 src/components/views/rooms/MessageComposer.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/rooms/MessageComposer.js b/src/components/views/rooms/MessageComposer.js
index d5aaaa1128..90bf14f5af 100644
--- a/src/components/views/rooms/MessageComposer.js
+++ b/src/components/views/rooms/MessageComposer.js
@@ -314,7 +314,7 @@ module.exports = React.createClass({
             return;
         }
 
-        var isEmote = /^\/me /i.test(contentText);
+        var isEmote = /^\/me( |$)/i.test(contentText);
         var sendMessagePromise;
 
         if (isEmote) {