@@ -899,49 +972,9 @@ module.exports = React.createClass({
{ _t('Permissions') }
-
-
{ _t('The default role for new room members is') }
-
-
-
-
{ _t('To send messages, you must be a') }
-
-
-
-
{ _t('To invite users into the room, you must be a') }
-
-
-
-
{ _t('To configure the room, you must be a') }
-
-
-
-
{ _t('To kick users, you must be a') }
-
-
-
-
{ _t('To ban users, you must be a') }
-
-
-
-
{ _t('To remove other users\' messages, you must be a') }
-
-
-
- { Object.keys(events_levels).map(function(event_type, i) {
- let label = plEventsToLabels[event_type];
- if (label) label = _t(label);
- else label = _t("To send events of type
, you must be a", {}, { 'eventType':
{ event_type } });
- return (
-
- );
- }) }
-
- { unfederatableSection }
+ { powerSelectors }
+ { eventPowerSelectors }
+ { unfederatableSection }
{ userLevelsSection }
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index f144ba0554..a1539cc665 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -203,6 +203,7 @@
"Don't send typing notifications": "Don't send typing notifications",
"Automatically replace plain text Emoji": "Automatically replace plain text Emoji",
"Mirror local video feed": "Mirror local video feed",
+ "Disable Community Filter Panel": "Disable Community Filter Panel",
"Disable Peer-to-Peer for 1:1 calls": "Disable Peer-to-Peer for 1:1 calls",
"Opt out of analytics": "Opt out of analytics",
"Never send encrypted messages to unverified devices from this device": "Never send encrypted messages to unverified devices from this device",
@@ -438,6 +439,13 @@
"(warning: cannot be disabled again!)": "(warning: cannot be disabled again!)",
"Encryption is enabled in this room": "Encryption is enabled in this room",
"Encryption is not enabled in this room": "Encryption is not enabled in this room",
+ "The default role for new room members is": "The default role for new room members is",
+ "To send messages, you must be a": "To send messages, you must be a",
+ "To invite users into the room, you must be a": "To invite users into the room, you must be a",
+ "To configure the room, you must be a": "To configure the room, you must be a",
+ "To kick users, you must be a": "To kick users, you must be a",
+ "To ban users, you must be a": "To ban users, you must be a",
+ "To remove other users' messages, you must be a": "To remove other users' messages, you must be a",
"Privileged Users": "Privileged Users",
"%(user)s is a": "%(user)s is a",
"No users have specific privileges in this room": "No users have specific privileges in this room",
@@ -449,6 +457,7 @@
"To link to a room it must have
an address.": "To link to a room it must have
an address.",
"Guests cannot join this room even if explicitly invited.": "Guests cannot join this room even if explicitly invited.",
"Click here to fix": "Click here to fix",
+ "To send events of type
, you must be a": "To send events of type
, you must be a",
"Who can access this room?": "Who can access this room?",
"Only people who have been invited": "Only people who have been invited",
"Anyone who knows the room's link, apart from guests": "Anyone who knows the room's link, apart from guests",
@@ -460,14 +469,6 @@
"Members only (since they were invited)": "Members only (since they were invited)",
"Members only (since they joined)": "Members only (since they joined)",
"Permissions": "Permissions",
- "The default role for new room members is": "The default role for new room members is",
- "To send messages, you must be a": "To send messages, you must be a",
- "To invite users into the room, you must be a": "To invite users into the room, you must be a",
- "To configure the room, you must be a": "To configure the room, you must be a",
- "To kick users, you must be a": "To kick users, you must be a",
- "To ban users, you must be a": "To ban users, you must be a",
- "To remove other users' messages, you must be a": "To remove other users' messages, you must be a",
- "To send events of type
, you must be a": "To send events of type
, you must be a",
"Advanced": "Advanced",
"This room's internal ID is": "This room's internal ID is",
"Add a topic": "Add a topic",
@@ -795,6 +796,8 @@
"Data from an older version of Riot has been detected. This will have caused end-to-end cryptography to malfunction in the older version. End-to-end encrypted messages exchanged recently whilst using the older version may not be decryptable in this version. This may also cause messages exchanged with this version to fail. If you experience problems, log out and back in again. To retain message history, export and re-import your keys.": "Data from an older version of Riot has been detected. This will have caused end-to-end cryptography to malfunction in the older version. End-to-end encrypted messages exchanged recently whilst using the older version may not be decryptable in this version. This may also cause messages exchanged with this version to fail. If you experience problems, log out and back in again. To retain message history, export and re-import your keys.",
"Logout": "Logout",
"Your Communities": "Your Communities",
+ "Did you know: you can use communities to filter your Riot.im experience!": "Did you know: you can use communities to filter your Riot.im experience!",
+ "To set up a filter, drag a community avatar over to the filter panel on the far left hand side of the screen. You can click on an avatar in the filter panel at any time to see only the rooms and people associated with that community.": "To set up a filter, drag a community avatar over to the filter panel on the far left hand side of the screen. You can click on an avatar in the filter panel at any time to see only the rooms and people associated with that community.",
"Error whilst fetching joined communities": "Error whilst fetching joined communities",
"Create a new community": "Create a new community",
"Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.",
diff --git a/src/settings/Settings.js b/src/settings/Settings.js
index 519d2dd39a..cd37c00fa8 100644
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@@ -188,6 +188,11 @@ export const SETTINGS = {
displayName: _td('Mirror local video feed'),
default: false,
},
+ "TagPanel.disableTagPanel": {
+ supportedLevels: LEVELS_ACCOUNT_SETTINGS,
+ displayName: _td('Disable Community Filter Panel'),
+ default: false,
+ },
"theme": {
supportedLevels: LEVELS_ACCOUNT_SETTINGS,
default: "light",
diff --git a/src/shouldHideEvent.js b/src/shouldHideEvent.js
index 1ecd1ac051..3aad05a976 100644
--- a/src/shouldHideEvent.js
+++ b/src/shouldHideEvent.js
@@ -27,10 +27,11 @@ function memberEventDiff(ev) {
const content = ev.getContent();
const prevContent = ev.getPrevContent();
- diff.isJoin = content.membership === 'join' && prevContent.membership !== 'ban';
- diff.isPart = content.membership === 'leave' && ev.getStateKey() === ev.getSender();
+ const isMembershipChanged = content.membership !== prevContent.membership;
+ diff.isJoin = isMembershipChanged && content.membership === 'join';
+ diff.isPart = isMembershipChanged && content.membership === 'leave' && ev.getStateKey() === ev.getSender();
- const isJoinToJoin = content.membership === prevContent.membership && content.membership === 'join';
+ const isJoinToJoin = !isMembershipChanged && content.membership === 'join';
diff.isDisplaynameChange = isJoinToJoin && content.displayname !== prevContent.displayname;
diff.isAvatarChange = isJoinToJoin && content.avatar_url !== prevContent.avatar_url;
return diff;
diff --git a/src/stores/FlairStore.js b/src/stores/FlairStore.js
index 7a3aa31e4e..4ef29ae4e1 100644
--- a/src/stores/FlairStore.js
+++ b/src/stores/FlairStore.js
@@ -14,6 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
+import EventEmitter from 'events';
import Promise from 'bluebird';
const BULK_REQUEST_DEBOUNCE_MS = 200;
@@ -28,8 +29,9 @@ const GROUP_PROFILES_CACHE_BUST_MS = 1800000; // 30 mins
/**
* Stores data used by
*/
-class FlairStore {
+class FlairStore extends EventEmitter {
constructor(matrixClient) {
+ super();
this._matrixClient = matrixClient;
this._userGroups = {
// $userId: ['+group1:domain', '+group2:domain', ...]
@@ -175,12 +177,23 @@ class FlairStore {
};
delete this._groupProfilesPromise[groupId];
+ /// XXX: This is verging on recreating a third "Flux"-looking Store. We really
+ /// should replace FlairStore with a Flux store and some async actions.
+ this.emit('updateGroupProfile');
+
setTimeout(() => {
- delete this._groupProfiles[groupId];
+ this.refreshGroupProfile(matrixClient, groupId);
}, GROUP_PROFILES_CACHE_BUST_MS);
return this._groupProfiles[groupId];
}
+
+ refreshGroupProfile(matrixClient, groupId) {
+ // Invalidate the cache
+ delete this._groupProfiles[groupId];
+ // Fetch new profile data, and cache it
+ return this.getGroupProfileCached(matrixClient, groupId);
+ }
}
if (global.singletonFlairStore === undefined) {
diff --git a/test/components/views/rooms/RoomSettings-test.js b/test/components/views/rooms/RoomSettings-test.js
new file mode 100644
index 0000000000..ffcecf1725
--- /dev/null
+++ b/test/components/views/rooms/RoomSettings-test.js
@@ -0,0 +1,190 @@
+import React from 'react';
+import ReactDOM from 'react-dom';
+import expect, {createSpy} from 'expect';
+import Promise from 'bluebird';
+import * as testUtils from '../../../test-utils';
+import sdk from 'matrix-react-sdk';
+const WrappedRoomSettings = testUtils.wrapInMatrixClientContext(sdk.getComponent('views.rooms.RoomSettings'));
+import MatrixClientPeg from '../../../../src/MatrixClientPeg';
+import SettingsStore from '../../../../src/settings/SettingsStore';
+
+
+describe('RoomSettings', () => {
+ let parentDiv = null;
+ let sandbox = null;
+ let client = null;
+ let roomSettings = null;
+ const room = testUtils.mkStubRoom('!DdJkzRliezrwpNebLk:matrix.org');
+
+ function expectSentStateEvent(roomId, eventType, expectedEventContent) {
+ let found = false;
+ for (const call of client.sendStateEvent.calls) {
+ const [
+ actualRoomId,
+ actualEventType,
+ actualEventContent,
+ ] = call.arguments.slice(0, 3);
+
+ if (roomId === actualRoomId && actualEventType === eventType) {
+ expect(actualEventContent).toEqual(expectedEventContent);
+ found = true;
+ break;
+ }
+ }
+ expect(found).toBe(true);
+ }
+
+ beforeEach(function(done) {
+ testUtils.beforeEach(this);
+ sandbox = testUtils.stubClient();
+ client = MatrixClientPeg.get();
+ client.credentials = {userId: '@me:domain.com'};
+
+ client.setRoomName = createSpy().andReturn(Promise.resolve());
+ client.setRoomTopic = createSpy().andReturn(Promise.resolve());
+ client.setRoomDirectoryVisibility = createSpy().andReturn(Promise.resolve());
+
+ // Covers any room state event (e.g. name, avatar, topic)
+ client.sendStateEvent = createSpy().andReturn(Promise.resolve());
+
+ // Covers room tagging
+ client.setRoomTag = createSpy().andReturn(Promise.resolve());
+ client.deleteRoomTag = createSpy().andReturn(Promise.resolve());
+
+ // Covers any setting in the SettingsStore
+ // (including local client settings not stored via matrix)
+ SettingsStore.setValue = createSpy().andReturn(Promise.resolve());
+
+ parentDiv = document.createElement('div');
+ document.body.appendChild(parentDiv);
+
+ const gatherWrappedRef = (r) => {roomSettings = r;};
+
+ // get use wrappedRef because we're using wrapInMatrixClientContext
+ ReactDOM.render(
+
,
+ parentDiv,
+ done,
+ );
+ });
+
+ afterEach((done) => {
+ if (parentDiv) {
+ ReactDOM.unmountComponentAtNode(parentDiv);
+ parentDiv.remove();
+ parentDiv = null;
+ }
+ sandbox.restore();
+ done();
+ });
+
+ it('should not set when no setting is changed', (done) => {
+ roomSettings.save().then(() => {
+ expect(client.sendStateEvent).toNotHaveBeenCalled();
+ expect(client.setRoomTag).toNotHaveBeenCalled();
+ expect(client.deleteRoomTag).toNotHaveBeenCalled();
+ done();
+ });
+ });
+
+ // XXX: Apparently we do call SettingsStore.setValue
+ xit('should not settings via the SettingsStore when no setting is changed', (done) => {
+ roomSettings.save().then(() => {
+ expect(SettingsStore.setValue).toNotHaveBeenCalled();
+ done();
+ });
+ });
+
+ it('should set room name when it has changed', (done) => {
+ const name = "My Room Name";
+ roomSettings.setName(name);
+
+ roomSettings.save().then(() => {
+ expect(client.setRoomName.calls[0].arguments.slice(0, 2))
+ .toEqual(['!DdJkzRliezrwpNebLk:matrix.org', name]);
+
+ done();
+ });
+ });
+
+ it('should set room topic when it has changed', (done) => {
+ const topic = "this is a topic";
+ roomSettings.setTopic(topic);
+
+ roomSettings.save().then(() => {
+ expect(client.setRoomTopic.calls[0].arguments.slice(0, 2))
+ .toEqual(['!DdJkzRliezrwpNebLk:matrix.org', topic]);
+
+ done();
+ });
+ });
+
+ it('should set history visibility when it has changed', (done) => {
+ const historyVisibility = "translucent";
+ roomSettings.setState({
+ history_visibility: historyVisibility,
+ });
+
+ roomSettings.save().then(() => {
+ expectSentStateEvent(
+ "!DdJkzRliezrwpNebLk:matrix.org",
+ "m.room.history_visibility", {history_visibility: historyVisibility},
+ );
+ done();
+ });
+ });
+
+ // XXX: Can't test this because we `getRoomDirectoryVisibility` in `componentWillMount`
+ xit('should set room directory publicity when set to true', (done) => {
+ const isRoomPublished = true;
+ roomSettings.setState({
+ isRoomPublished,
+ }, () => {
+ roomSettings.save().then(() => {
+ expect(client.setRoomDirectoryVisibility.calls[0].arguments.slice(0, 2))
+ .toEqual("!DdJkzRliezrwpNebLk:matrix.org", isRoomPublished ? "public" : "private");
+ done();
+ });
+ });
+ });
+
+ it('should set power levels when changed', (done) => {
+ roomSettings.onPowerLevelsChanged(42, "invite");
+
+ roomSettings.save().then(() => {
+ expectSentStateEvent(
+ "!DdJkzRliezrwpNebLk:matrix.org",
+ "m.room.power_levels", { invite: 42 },
+ );
+ done();
+ });
+ });
+
+ it('should set event power levels when changed', (done) => {
+ roomSettings.onPowerLevelsChanged(42, "event_levels_m.room.message");
+
+ roomSettings.save().then(() => {
+ // We expect all state events to be set to the state_default (50)
+ // See powerLevelDescriptors in RoomSettings
+ expectSentStateEvent(
+ "!DdJkzRliezrwpNebLk:matrix.org",
+ "m.room.power_levels", {
+ events: {
+ 'm.room.message': 42,
+ 'm.room.avatar': 50,
+ 'm.room.name': 50,
+ 'm.room.canonical_alias': 50,
+ 'm.room.history_visibility': 50,
+ 'm.room.power_levels': 50,
+ 'm.room.topic': 50,
+ 'im.vector.modular.widgets': 50,
+ },
+ },
+ );
+ done();
+ });
+ });
+});
diff --git a/test/test-utils.js b/test/test-utils.js
index 5753c02665..b593761bd4 100644
--- a/test/test-utils.js
+++ b/test/test-utils.js
@@ -68,6 +68,8 @@ export function createTestClient() {
return {
getHomeserverUrl: sinon.stub(),
getIdentityServerUrl: sinon.stub(),
+ getDomain: sinon.stub().returns("matrix.rog"),
+ getUserId: sinon.stub().returns("@userId:matrix.rog"),
getPushActionsForEvent: sinon.stub(),
getRoom: sinon.stub().returns(mkStubRoom()),
@@ -81,6 +83,7 @@ export function createTestClient() {
paginateEventTimeline: sinon.stub().returns(Promise.resolve()),
sendReadReceipt: sinon.stub().returns(Promise.resolve()),
getRoomIdForAlias: sinon.stub().returns(Promise.resolve()),
+ getRoomDirectoryVisibility: sinon.stub().returns(Promise.resolve()),
getProfileInfo: sinon.stub().returns(Promise.resolve({})),
getAccountData: (type) => {
return mkEvent({
@@ -244,6 +247,7 @@ export function mkStubRoom(roomId = null) {
roomId: roomId,
getAvatarUrl: () => 'mxc://avatar.url/image.png',
}),
+ getMembersWithMembership: sinon.stub().returns([]),
getJoinedMembers: sinon.stub().returns([]),
getPendingEvents: () => [],
getLiveTimeline: () => stubTimeline,
@@ -252,8 +256,16 @@ export function mkStubRoom(roomId = null) {
hasMembershipState: () => null,
currentState: {
getStateEvents: sinon.stub(),
+ mayClientSendStateEvent: sinon.stub().returns(true),
+ maySendStateEvent: sinon.stub().returns(true),
members: [],
},
+ tags: {
+ "m.favourite": {
+ order: 0.5,
+ },
+ },
+ setBlacklistUnverifiedDevices: sinon.stub(),
};
}
@@ -284,7 +296,7 @@ export function wrapInMatrixClientContext(WrappedComponent) {
}
render() {
- return
;
+ return
;
}
}
return Wrapper;