matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-08 21:42:24 +03:00
Code Activity

getMyMembership() doesn't take id anymore

Browse Source
This commit is contained in:
Bruno Windels
2018-08-14 11:47:05 +02:00
parent c8b6ccba25
commit 440ebd187d
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Rooms.js
View File

@@ -45,7 +45,7 @@ export function getOnlyOtherMember(room, myUserId) {
function _isConfCallRoom(room, myUserId, conferenceHandler) { function _isConfCallRoom(room, myUserId, conferenceHandler) {
if (!conferenceHandler) return false; if (!conferenceHandler) return false;
const myMembership = room.getMyMembership(myUserId); const myMembership = room.getMyMembership();
if (myMembership != "join") { if (myMembership != "join") {
return false; return false;
} }
@@ -81,7 +81,7 @@ export function isConfCallRoom(room, myUserId, conferenceHandler) {
} }
export function looksLikeDirectMessageRoom(room, myUserId) { export function looksLikeDirectMessageRoom(room, myUserId) {
const myMembership = room.getMyMembership(myUserId); const myMembership = room.getMyMembership();
const me = room.getMember(myUserId); const me = room.getMember(myUserId);
if (myMembership == "join" || myMembership === "ban" || (me && me.isKicked())) { if (myMembership == "join" || myMembership === "ban" || (me && me.isKicked())) {

2
src/stores/RoomListStore.js
View File

@@ -174,7 +174,7 @@ class RoomListStore extends Store {
this._matrixClient.getRooms().forEach((room, index) => { this._matrixClient.getRooms().forEach((room, index) => {
const myUserId = this._matrixClient.getUserId(); const myUserId = this._matrixClient.getUserId();
const membership = room.getMyMembership(myUserId); const membership = room.getMyMembership();
const me = room.getMember(myUserId); const me = room.getMember(myUserId);
if (membership == "invite") { if (membership == "invite") {