@@ -298,6 +301,11 @@ module.exports = React.createClass({
{ incomingCallBox }
{ tooltip }
- ));
+ );
+
+ if (connectDropTarget) ret = connectDropTarget(ret);
+ if (connectDragSource) ret = connectDragSource(ret);
+
+ return ret;
}
});
diff --git a/src/utils/DMRoomMap.js b/src/utils/DMRoomMap.js
index 95b4edb546..3bcc492a9f 100644
--- a/src/utils/DMRoomMap.js
+++ b/src/utils/DMRoomMap.js
@@ -21,18 +21,13 @@ limitations under the License.
*/
export default class DMRoomMap {
constructor(matrixClient) {
+ this.roomToUser = null;
+
const mDirectEvent = matrixClient.getAccountData('m.direct');
if (!mDirectEvent) {
this.userToRooms = {};
- this.roomToUser = {};
} else {
this.userToRooms = mDirectEvent.getContent();
- this.roomToUser = {};
- for (const user of Object.keys(this.userToRooms)) {
- for (const roomId of this.userToRooms[user]) {
- this.roomToUser[roomId] = user;
- }
- }
}
}
@@ -43,8 +38,26 @@ export default class DMRoomMap {
}
getUserIdForRoomId(roomId) {
+ if (this.roomToUser == null) {
+ // we lazily populate roomToUser so you can use
+ // this class just to call getDMRoomsForUserId
+ // which doesn't do very much, but is a fairly
+ // convenient wrapper and there's no point
+ // iterating through the map if getUserIdForRoomId()
+ // is never called.
+ this._populateRoomToUser();
+ }
// Here, we return undefined if the room is not in the map:
// the room ID you gave is not a DM room for any user.
return this.roomToUser[roomId];
}
+
+ _populateRoomToUser() {
+ this.roomToUser = {};
+ for (const user of Object.keys(this.userToRooms)) {
+ for (const roomId of this.userToRooms[user]) {
+ this.roomToUser[roomId] = user;
+ }
+ }
+ }
}
diff --git a/src/utils/Receipt.js b/src/utils/Receipt.js
new file mode 100644
index 0000000000..549a0fd8b3
--- /dev/null
+++ b/src/utils/Receipt.js
@@ -0,0 +1,32 @@
+/*
+Copyright 2016 OpenMarket Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+/**
+ * Given MatrixEvent containing receipts, return the first
+ * read receipt from the given user ID, or null if no such
+ * receipt exists.
+ */
+export function findReadReceiptFromUserId(receiptEvent, userId) {
+ var receiptKeys = Object.keys(receiptEvent.getContent());
+ for (var i = 0; i < receiptKeys.length; ++i) {
+ var rcpt = receiptEvent.getContent()[receiptKeys[i]];
+ if (rcpt['m.read'] && rcpt['m.read'][userId]) {
+ return rcpt;
+ }
+ }
+
+ return null;
+}
+