{guestRead}{guestJoin}
;
}
- var topic = rooms[i].topic || '';
+ let topic = rooms[i].topic || '';
topic = linkifyString(sanitizeHtml(topic));
rows.push(
@@ -432,14 +430,14 @@ module.exports = React.createClass({
{ name }
{ perms }
+ onClick={ function(e) { e.stopPropagation(); } }
+ dangerouslySetInnerHTML={{ __html: topic }} />
{ get_display_alias_for_room(rooms[i]) }
{ searchControls }
{ toggleCollapse }
);
- }
+ },
});
diff --git a/src/components/structures/TimelinePanel.js b/src/components/structures/TimelinePanel.js
index e06c652924..44d14cd7cf 100644
--- a/src/components/structures/TimelinePanel.js
+++ b/src/components/structures/TimelinePanel.js
@@ -829,7 +829,7 @@ var TimelinePanel = React.createClass({
// 4. Also, if pos === null, the event might not be paginated - show the unread bar
const pos = this.getReadMarkerPosition();
return this.state.readMarkerEventId !== null && // 1.
- this.state.readMarkerEventId !== this._getCurrentReadReceipt() && // 2.
+ this.state.readMarkerEventId !== this._getCurrentReadReceipt() && // 2.
(pos < 0 || pos === null); // 3., 4.
},
diff --git a/src/components/structures/UserSettings.js b/src/components/structures/UserSettings.js
index eb8f512cbb..385ce41f71 100644
--- a/src/components/structures/UserSettings.js
+++ b/src/components/structures/UserSettings.js
@@ -856,7 +856,7 @@ module.exports = React.createClass({
SettingsStore.getLabsFeatures().forEach((featureId) => {
// TODO: this ought to be a separate component so that we don't need
// to rebind the onChange each time we render
- const onChange = async (e) => {
+ const onChange = async(e) => {
const checked = e.target.checked;
if (featureId === "feature_lazyloading") {
const confirmed = await this._onLazyLoadChanging(checked);
@@ -1309,7 +1309,7 @@ module.exports = React.createClass({
// If the olmVersion is not defined then either crypto is disabled, or
// we are using a version old version of olm. We assume the former.
let olmVersionString = "
+ body =
- 
+
);
- }
+ },
});
diff --git a/src/components/views/login/InteractiveAuthEntryComponents.js b/src/components/views/login/InteractiveAuthEntryComponents.js
index 6e0e5d538a..481cdc60b2 100644
--- a/src/components/views/login/InteractiveAuthEntryComponents.js
+++ b/src/components/views/login/InteractiveAuthEntryComponents.js
@@ -296,7 +296,7 @@ export const TermsAuthEntry = React.createClass({
return
-
+ ;
}
return (
diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index 570cb8a59b..14d394ab41 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -67,7 +67,7 @@ const EMOJI_UNICODE_TO_SHORTNAME = mapUnicodeToShort();
const REGEX_EMOJI_WHITESPACE = new RegExp('(?:^|\\s)(' + asciiRegexp + ')\\s$');
const EMOJI_REGEX = new RegExp(unicodeRegexp, 'g');
-const TYPING_USER_TIMEOUT = 10000, TYPING_SERVER_TIMEOUT = 30000;
+const TYPING_USER_TIMEOUT = 10000; const TYPING_SERVER_TIMEOUT = 30000;
const ENTITY_TYPES = {
AT_ROOM_PILL: 'ATROOMPILL',
@@ -175,8 +175,8 @@ export default class MessageComposerInput extends React.Component {
// see https://github.com/ianstormtaylor/slate/issues/762#issuecomment-304855095
this.direction = '';
- this.plainWithMdPills = new PlainWithPillsSerializer({ pillFormat: 'md' });
- this.plainWithIdPills = new PlainWithPillsSerializer({ pillFormat: 'id' });
+ this.plainWithMdPills = new PlainWithPillsSerializer({ pillFormat: 'md' });
+ this.plainWithIdPills = new PlainWithPillsSerializer({ pillFormat: 'id' });
this.plainWithPlainPills = new PlainWithPillsSerializer({ pillFormat: 'plain' });
this.md = new Md({
@@ -544,7 +544,7 @@ export default class MessageComposerInput extends React.Component {
if (editorState.startText !== null) {
const text = editorState.startText.text;
- const currentStartOffset = editorState.startOffset;
+ const currentStartOffset = editorState.selection.start.offset;
// Automatic replacement of plaintext emoji to Unicode emoji
if (SettingsStore.getValue('MessageComposerInput.autoReplaceEmoji')) {
@@ -558,11 +558,11 @@ export default class MessageComposerInput extends React.Component {
const range = Range.create({
anchor: {
- key: editorState.selection.startKey,
+ key: editorState.startText.key,
offset: currentStartOffset - emojiMatch[1].length - 1,
},
focus: {
- key: editorState.selection.startKey,
+ key: editorState.startText.key,
offset: currentStartOffset - 1,
},
});
@@ -1078,7 +1078,7 @@ export default class MessageComposerInput extends React.Component {
// only look for commands if the first block contains simple unformatted text
// i.e. no pills or rich-text formatting and begins with a /.
- let cmd, commandText;
+ let cmd; let commandText;
const firstChild = editorState.document.nodes.get(0);
const firstGrandChild = firstChild && firstChild.nodes.get(0);
if (firstChild && firstGrandChild &&
@@ -1260,7 +1260,7 @@ export default class MessageComposerInput extends React.Component {
}
};
- selectHistory = async (up) => {
+ selectHistory = async(up) => {
const delta = up ? -1 : 1;
// True if we are not currently selecting history, but composing a message
@@ -1308,7 +1308,7 @@ export default class MessageComposerInput extends React.Component {
return true;
};
- onTab = async (e) => {
+ onTab = async(e) => {
this.setState({
someCompletions: null,
});
@@ -1330,7 +1330,7 @@ export default class MessageComposerInput extends React.Component {
up ? this.autocomplete.onUpArrow() : this.autocomplete.onDownArrow();
};
- onEscape = async (e) => {
+ onEscape = async(e) => {
e.preventDefault();
if (this.autocomplete) {
this.autocomplete.onEscape(e);
@@ -1349,7 +1349,7 @@ export default class MessageComposerInput extends React.Component {
/* If passed null, restores the original editor content from state.originalEditorState.
* If passed a non-null displayedCompletion, modifies state.originalEditorState to compute new state.editorState.
*/
- setDisplayedCompletion = async (displayedCompletion: ?Completion): boolean => {
+ setDisplayedCompletion = async(displayedCompletion: ?Completion): boolean => {
const activeEditorState = this.state.originalEditorState || this.state.editorState;
if (displayedCompletion == null) {
diff --git a/src/components/views/rooms/RoomPreviewBar.js b/src/components/views/rooms/RoomPreviewBar.js
index 9d3dbe5217..3c767b726a 100644
--- a/src/components/views/rooms/RoomPreviewBar.js
+++ b/src/components/views/rooms/RoomPreviewBar.js
@@ -93,7 +93,7 @@ module.exports = React.createClass({
},
render: function() {
- let joinBlock, previewBlock;
+ let joinBlock; let previewBlock;
if (this.props.spinner || this.state.busy) {
const Spinner = sdk.getComponent("elements.Spinner");
diff --git a/src/components/views/rooms/RoomSettings.js b/src/components/views/rooms/RoomSettings.js
index b69938a117..8cd559f2ea 100644
--- a/src/components/views/rooms/RoomSettings.js
+++ b/src/components/views/rooms/RoomSettings.js
@@ -657,31 +657,31 @@ module.exports = React.createClass({
const userLevels = powerLevels.users || {};
const powerLevelDescriptors = {
- users_default: {
+ "users_default": {
desc: _t('The default role for new room members is'),
defaultValue: 0,
},
- events_default: {
+ "events_default": {
desc: _t('To send messages, you must be a'),
defaultValue: 0,
},
- invite: {
+ "invite": {
desc: _t('To invite users into the room, you must be a'),
defaultValue: 50,
},
- state_default: {
+ "state_default": {
desc: _t('To configure the room, you must be a'),
defaultValue: 50,
},
- kick: {
+ "kick": {
desc: _t('To kick users, you must be a'),
defaultValue: 50,
},
- ban: {
+ "ban": {
desc: _t('To ban users, you must be a'),
defaultValue: 50,
},
- redact: {
+ "redact": {
desc: _t('To remove other users\' messages, you must be a'),
defaultValue: 50,
},
diff --git a/src/components/views/settings/Notifications.js b/src/components/views/settings/Notifications.js
index ea727a03b5..72ad2943aa 100644
--- a/src/components/views/settings/Notifications.js
+++ b/src/components/views/settings/Notifications.js
@@ -67,7 +67,7 @@ module.exports = React.createClass({
phases: {
LOADING: "LOADING", // The component is loading or sending data to the hs
DISPLAY: "DISPLAY", // The component is ready and display data
- ERROR: "ERROR", // There was an error
+ ERROR: "ERROR", // There was an error
},
propTypes: {
@@ -86,14 +86,14 @@ module.exports = React.createClass({
getInitialState: function() {
return {
phase: this.phases.LOADING,
- masterPushRule: undefined, // The master rule ('.m.rule.master')
- vectorPushRules: [], // HS default push rules displayed in Vector UI
- vectorContentRules: { // Keyword push rules displayed in Vector UI
+ masterPushRule: undefined, // The master rule ('.m.rule.master')
+ vectorPushRules: [], // HS default push rules displayed in Vector UI
+ vectorContentRules: { // Keyword push rules displayed in Vector UI
vectorState: PushRuleVectorState.ON,
rules: [],
},
- externalPushRules: [], // Push rules (except content rule) that have been defined outside Vector UI
- externalContentRules: [], // Keyword push rules that have been defined outside Vector UI
+ externalPushRules: [], // Push rules (except content rule) that have been defined outside Vector UI
+ externalContentRules: [], // Keyword push rules that have been defined outside Vector UI
};
},
@@ -290,7 +290,7 @@ module.exports = React.createClass({
for (const i in this.state.vectorContentRules.rules) {
const rule = this.state.vectorContentRules.rules[i];
- let enabled, actions;
+ let enabled; let actions;
switch (newPushRuleVectorState) {
case PushRuleVectorState.ON:
if (rule.actions.length !== 1) {
diff --git a/src/matrix-to.js b/src/matrix-to.js
index 90b0a66090..b5827f671a 100644
--- a/src/matrix-to.js
+++ b/src/matrix-to.js
@@ -14,11 +14,24 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
+import MatrixClientPeg from "./MatrixClientPeg";
+
export const host = "matrix.to";
export const baseUrl = `https://${host}`;
+// The maximum number of servers to pick when working out which servers
+// to add to permalinks. The servers are appended as ?via=example.org
+const MAX_SERVER_CANDIDATES = 3;
+
export function makeEventPermalink(roomId, eventId) {
- return `${baseUrl}/#/${roomId}/${eventId}`;
+ const permalinkBase = `${baseUrl}/#/${roomId}/${eventId}`;
+
+ // If the roomId isn't actually a room ID, don't try to list the servers.
+ // Aliases are already routable, and don't need extra information.
+ if (roomId[0] !== '!') return permalinkBase;
+
+ const serverCandidates = pickServerCandidates(roomId);
+ return `${permalinkBase}${encodeServerCandidates(serverCandidates)}`;
}
export function makeUserPermalink(userId) {
@@ -26,9 +39,98 @@ export function makeUserPermalink(userId) {
}
export function makeRoomPermalink(roomId) {
- return `${baseUrl}/#/${roomId}`;
+ const permalinkBase = `${baseUrl}/#/${roomId}`;
+
+ // If the roomId isn't actually a room ID, don't try to list the servers.
+ // Aliases are already routable, and don't need extra information.
+ if (roomId[0] !== '!') return permalinkBase;
+
+ const serverCandidates = pickServerCandidates(roomId);
+ return `${permalinkBase}${encodeServerCandidates(serverCandidates)}`;
}
export function makeGroupPermalink(groupId) {
return `${baseUrl}/#/${groupId}`;
}
+
+export function encodeServerCandidates(candidates) {
+ if (!candidates || candidates.length === 0) return '';
+ return `?via=${candidates.map(c => encodeURIComponent(c)).join("&via=")}`;
+}
+
+export function pickServerCandidates(roomId) {
+ const client = MatrixClientPeg.get();
+ const room = client.getRoom(roomId);
+ if (!room) return [];
+
+ // Permalinks can have servers appended to them so that the user
+ // receiving them can have a fighting chance at joining the room.
+ // These servers are called "candidates" at this point because
+ // it is unclear whether they are going to be useful to actually
+ // join in the future.
+ //
+ // We pick 3 servers based on the following criteria:
+ //
+ // Server 1: The highest power level user in the room, provided
+ // they are at least PL 50. We don't calculate "what is a moderator"
+ // here because it is less relevant for the vast majority of rooms.
+ // We also want to ensure that we get an admin or high-ranking mod
+ // as they are less likely to leave the room. If no user happens
+ // to meet this criteria, we'll pick the most popular server in the
+ // room.
+ //
+ // Server 2: The next most popular server in the room (in user
+ // distribution). This cannot be the same as Server 1. If no other
+ // servers are available then we'll only return Server 1.
+ //
+ // Server 3: The next most popular server by user distribution. This
+ // has the same rules as Server 2, with the added exception that it
+ // must be unique from Server 1 and 2.
+
+ // Rationale for popular servers: It's hard to get rid of people when
+ // they keep flocking in from a particular server. Sure, the server could
+ // be ACL'd in the future or for some reason be evicted from the room
+ // however an event like that is unlikely the larger the room gets.
+
+ // Note: we don't pick the server the room was created on because the
+ // homeserver should already be using that server as a last ditch attempt
+ // and there's less of a guarantee that the server is a resident server.
+ // Instead, we actively figure out which servers are likely to be residents
+ // in the future and try to use those.
+
+ // Note: Users receiving permalinks that happen to have all 3 potential
+ // servers fail them (in terms of joining) are somewhat expected to hunt
+ // down the person who gave them the link to ask for a participating server.
+ // The receiving user can then manually append the known-good server to
+ // the list and magically have the link work.
+
+ const populationMap: {[server:string]:number} = {};
+ const highestPlUser = {userId: null, powerLevel: 0, serverName: null};
+
+ for (const member of room.getJoinedMembers()) {
+ const serverName = member.userId.split(":").splice(1).join(":");
+ if (member.powerLevel > highestPlUser.powerLevel) {
+ highestPlUser.userId = member.userId;
+ highestPlUser.powerLevel = member.powerLevel;
+ highestPlUser.serverName = serverName;
+ }
+
+ if (!populationMap[serverName]) populationMap[serverName] = 0;
+ populationMap[serverName]++;
+ }
+
+ const candidates = [];
+ if (highestPlUser.powerLevel >= 50) candidates.push(highestPlUser.serverName);
+
+ const beforePopulation = candidates.length;
+ const serversByPopulation = Object.keys(populationMap)
+ .sort((a, b) => populationMap[b] - populationMap[a])
+ .filter(a => !candidates.includes(a));
+ for (let i = beforePopulation; i <= MAX_SERVER_CANDIDATES; i++) {
+ const idx = i - beforePopulation;
+ if (idx >= serversByPopulation.length) break;
+ candidates.push(serversByPopulation[idx]);
+ }
+
+ return candidates;
+}
diff --git a/src/notifications/StandardActions.js b/src/notifications/StandardActions.js
index 22a8f1db40..30d6ea5975 100644
--- a/src/notifications/StandardActions.js
+++ b/src/notifications/StandardActions.js
@@ -16,9 +16,9 @@ limitations under the License.
'use strict';
-var NotificationUtils = require('./NotificationUtils');
+const NotificationUtils = require('./NotificationUtils');
-var encodeActions = NotificationUtils.encodeActions;
+const encodeActions = NotificationUtils.encodeActions;
module.exports = {
ACTION_NOTIFY: encodeActions({notify: true}),
diff --git a/src/phonenumber.js b/src/phonenumber.js
index aaf018ba26..3b7e4ba4f1 100644
--- a/src/phonenumber.js
+++ b/src/phonenumber.js
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
-const PHONE_NUMBER_REGEXP = /^[0-9 -\.]+$/;
+const PHONE_NUMBER_REGEXP = /^[0-9 -.]+$/;
/*
* Do basic validation to determine if the given input could be
diff --git a/src/settings/SettingsStore.js b/src/settings/SettingsStore.js
index cb6d83e884..bb3f412a9b 100644
--- a/src/settings/SettingsStore.js
+++ b/src/settings/SettingsStore.js
@@ -248,7 +248,7 @@ export default class SettingsStore {
if (actualValue !== undefined && actualValue !== null) return actualValue;
return calculatedValue;
}
- /* eslint-disable valid-jsdoc */ //https://github.com/eslint/eslint/issues/7307
+ /* eslint-disable valid-jsdoc */ //https://github.com/eslint/eslint/issues/7307
/**
* Sets the value for a setting. The room ID is optional if the setting is not being
* set for a particular room, otherwise it should be supplied. The value may be null
diff --git a/src/settings/controllers/SettingController.js b/src/settings/controllers/SettingController.js
index 0ebe0042e6..a7d0ccf21a 100644
--- a/src/settings/controllers/SettingController.js
+++ b/src/settings/controllers/SettingController.js
@@ -23,7 +23,6 @@ limitations under the License.
* intended to handle environmental factors for specific settings.
*/
export default class SettingController {
-
/**
* Gets the overridden value for the setting, if any. This must return null if the
* value is not to be overridden, otherwise it must return the new value.
diff --git a/src/stores/RoomListStore.js b/src/stores/RoomListStore.js
index 67c0c13be7..c670161dbc 100644
--- a/src/stores/RoomListStore.js
+++ b/src/stores/RoomListStore.js
@@ -23,7 +23,6 @@ import Unread from '../Unread';
* the RoomList.
*/
class RoomListStore extends Store {
-
static _listOrders = {
"m.favourite": "manual",
"im.vector.fake.invite": "recent",
diff --git a/src/utils/DMRoomMap.js b/src/utils/DMRoomMap.js
index bb5e4d706b..af65b6f001 100644
--- a/src/utils/DMRoomMap.js
+++ b/src/utils/DMRoomMap.js
@@ -93,7 +93,7 @@ export default class DMRoomMap {
return {userId, roomId};
}
}
- }).filter((ids) => !!ids); //filter out
+ }).filter((ids) => !!ids); //filter out
// these are actually all legit self-chats
// bail out
if (!guessedUserIdsThatChanged.length) {
diff --git a/src/utils/DecryptFile.js b/src/utils/DecryptFile.js
index 92c2e3644d..ea0e4c3fb0 100644
--- a/src/utils/DecryptFile.js
+++ b/src/utils/DecryptFile.js
@@ -77,7 +77,7 @@ const ALLOWED_BLOB_MIMETYPES = {
'audio/x-pn-wav': true,
'audio/flac': true,
'audio/x-flac': true,
-}
+};
/**
* Decrypt a file attached to a matrix event.
diff --git a/test/matrix-to-test.js b/test/matrix-to-test.js
new file mode 100644
index 0000000000..70533575c4
--- /dev/null
+++ b/test/matrix-to-test.js
@@ -0,0 +1,349 @@
+/*
+Copyright 2018 New Vector 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.
+*/
+
+import expect from 'expect';
+import peg from '../src/MatrixClientPeg';
+import {
+ makeEventPermalink,
+ makeGroupPermalink,
+ makeRoomPermalink,
+ makeUserPermalink,
+ pickServerCandidates,
+} from "../src/matrix-to";
+import * as testUtils from "./test-utils";
+
+
+describe('matrix-to', function() {
+ let sandbox;
+
+ beforeEach(function() {
+ testUtils.beforeEach(this);
+ sandbox = testUtils.stubClient();
+ peg.get().credentials = { userId: "@test:example.com" };
+ });
+
+ afterEach(function() {
+ sandbox.restore();
+ });
+
+ it('should pick no candidate servers when the room is not found', function() {
+ peg.get().getRoom = () => null;
+ const pickedServers = pickServerCandidates("!somewhere:example.org");
+ expect(pickedServers).toExist();
+ expect(pickedServers.length).toBe(0);
+ });
+
+ it('should pick no candidate servers when the room has no members', function() {
+ peg.get().getRoom = () => {
+ return {
+ getJoinedMembers: () => [],
+ };
+ };
+ const pickedServers = pickServerCandidates("!somewhere:example.org");
+ expect(pickedServers).toExist();
+ expect(pickedServers.length).toBe(0);
+ });
+
+ it('should pick a candidate server for the highest power level user in the room', function() {
+ peg.get().getRoom = () => {
+ return {
+ getJoinedMembers: () => [
+ {
+ userId: "@alice:pl_50",
+ powerLevel: 50,
+ },
+ {
+ userId: "@alice:pl_75",
+ powerLevel: 75,
+ },
+ {
+ userId: "@alice:pl_95",
+ powerLevel: 95,
+ },
+ ],
+ };
+ };
+ const pickedServers = pickServerCandidates("!somewhere:example.org");
+ expect(pickedServers).toExist();
+ expect(pickedServers.length).toBe(3);
+ expect(pickedServers[0]).toBe("pl_95");
+ // we don't check the 2nd and 3rd servers because that is done by the next test
+ });
+
+ it('should pick candidate servers based on user population', function() {
+ peg.get().getRoom = () => {
+ return {
+ getJoinedMembers: () => [
+ {
+ userId: "@alice:first",
+ powerLevel: 0,
+ },
+ {
+ userId: "@bob:first",
+ powerLevel: 0,
+ },
+ {
+ userId: "@charlie:first",
+ powerLevel: 0,
+ },
+ {
+ userId: "@alice:second",
+ powerLevel: 0,
+ },
+ {
+ userId: "@bob:second",
+ powerLevel: 0,
+ },
+ {
+ userId: "@charlie:third",
+ powerLevel: 0,
+ },
+ ],
+ };
+ };
+ const pickedServers = pickServerCandidates("!somewhere:example.org");
+ expect(pickedServers).toExist();
+ expect(pickedServers.length).toBe(3);
+ expect(pickedServers[0]).toBe("first");
+ expect(pickedServers[1]).toBe("second");
+ expect(pickedServers[2]).toBe("third");
+ });
+
+ it('should pick prefer candidate servers with higher power levels', function() {
+ peg.get().getRoom = () => {
+ return {
+ getJoinedMembers: () => [
+ {
+ userId: "@alice:first",
+ powerLevel: 100,
+ },
+ {
+ userId: "@alice:second",
+ powerLevel: 0,
+ },
+ {
+ userId: "@bob:second",
+ powerLevel: 0,
+ },
+ {
+ userId: "@charlie:third",
+ powerLevel: 0,
+ },
+ ],
+ };
+ };
+ const pickedServers = pickServerCandidates("!somewhere:example.org");
+ expect(pickedServers).toExist();
+ expect(pickedServers.length).toBe(3);
+ expect(pickedServers[0]).toBe("first");
+ expect(pickedServers[1]).toBe("second");
+ expect(pickedServers[2]).toBe("third");
+ });
+
+ it('should work with IPv4 hostnames', function() {
+ peg.get().getRoom = () => {
+ return {
+ getJoinedMembers: () => [
+ {
+ userId: "@alice:127.0.0.1",
+ powerLevel: 100,
+ },
+ ],
+ };
+ };
+ const pickedServers = pickServerCandidates("!somewhere:example.org");
+ expect(pickedServers).toExist();
+ expect(pickedServers.length).toBe(1);
+ expect(pickedServers[0]).toBe("127.0.0.1");
+ });
+
+ it('should work with IPv6 hostnames', function() {
+ peg.get().getRoom = () => {
+ return {
+ getJoinedMembers: () => [
+ {
+ userId: "@alice:[::1]",
+ powerLevel: 100,
+ },
+ ],
+ };
+ };
+ const pickedServers = pickServerCandidates("!somewhere:example.org");
+ expect(pickedServers).toExist();
+ expect(pickedServers.length).toBe(1);
+ expect(pickedServers[0]).toBe("[::1]");
+ });
+
+ it('should work with IPv4 hostnames with ports', function() {
+ peg.get().getRoom = () => {
+ return {
+ getJoinedMembers: () => [
+ {
+ userId: "@alice:127.0.0.1:8448",
+ powerLevel: 100,
+ },
+ ],
+ };
+ };
+ const pickedServers = pickServerCandidates("!somewhere:example.org");
+ expect(pickedServers).toExist();
+ expect(pickedServers.length).toBe(1);
+ expect(pickedServers[0]).toBe("127.0.0.1:8448");
+ });
+
+ it('should work with IPv6 hostnames with ports', function() {
+ peg.get().getRoom = () => {
+ return {
+ getJoinedMembers: () => [
+ {
+ userId: "@alice:[::1]:8448",
+ powerLevel: 100,
+ },
+ ],
+ };
+ };
+ const pickedServers = pickServerCandidates("!somewhere:example.org");
+ expect(pickedServers).toExist();
+ expect(pickedServers.length).toBe(1);
+ expect(pickedServers[0]).toBe("[::1]:8448");
+ });
+
+ it('should work with hostnames with ports', function() {
+ peg.get().getRoom = () => {
+ return {
+ getJoinedMembers: () => [
+ {
+ userId: "@alice:example.org:8448",
+ powerLevel: 100,
+ },
+ ],
+ };
+ };
+ const pickedServers = pickServerCandidates("!somewhere:example.org");
+ expect(pickedServers).toExist();
+ expect(pickedServers.length).toBe(1);
+ expect(pickedServers[0]).toBe("example.org:8448");
+ });
+
+ it('should generate an event permalink for room IDs with no candidate servers', function() {
+ peg.get().getRoom = () => null;
+ const result = makeEventPermalink("!somewhere:example.org", "$something:example.com");
+ expect(result).toBe("https://matrix.to/#/!somewhere:example.org/$something:example.com");
+ });
+
+ it('should generate an event permalink for room IDs with some candidate servers', function() {
+ peg.get().getRoom = () => {
+ return {
+ getJoinedMembers: () => [
+ {
+ userId: "@alice:first",
+ powerLevel: 100,
+ },
+ {
+ userId: "@bob:second",
+ powerLevel: 0,
+ },
+ ],
+ };
+ };
+ const result = makeEventPermalink("!somewhere:example.org", "$something:example.com");
+ expect(result).toBe("https://matrix.to/#/!somewhere:example.org/$something:example.com?via=first&via=second");
+ });
+
+ it('should generate a room permalink for room IDs with no candidate servers', function() {
+ peg.get().getRoom = () => null;
+ const result = makeRoomPermalink("!somewhere:example.org");
+ expect(result).toBe("https://matrix.to/#/!somewhere:example.org");
+ });
+
+ it('should generate a room permalink for room IDs with some candidate servers', function() {
+ peg.get().getRoom = () => {
+ return {
+ getJoinedMembers: () => [
+ {
+ userId: "@alice:first",
+ powerLevel: 100,
+ },
+ {
+ userId: "@bob:second",
+ powerLevel: 0,
+ },
+ ],
+ };
+ };
+ const result = makeRoomPermalink("!somewhere:example.org");
+ expect(result).toBe("https://matrix.to/#/!somewhere:example.org?via=first&via=second");
+ });
+
+ // Technically disallowed but we'll test it anyways
+ it('should generate an event permalink for room aliases with no candidate servers', function() {
+ peg.get().getRoom = () => null;
+ const result = makeEventPermalink("#somewhere:example.org", "$something:example.com");
+ expect(result).toBe("https://matrix.to/#/#somewhere:example.org/$something:example.com");
+ });
+
+ // Technically disallowed but we'll test it anyways
+ it('should generate an event permalink for room aliases without candidate servers', function() {
+ peg.get().getRoom = () => {
+ return {
+ getJoinedMembers: () => [
+ {
+ userId: "@alice:first",
+ powerLevel: 100,
+ },
+ {
+ userId: "@bob:second",
+ powerLevel: 0,
+ },
+ ],
+ };
+ };
+ const result = makeEventPermalink("#somewhere:example.org", "$something:example.com");
+ expect(result).toBe("https://matrix.to/#/#somewhere:example.org/$something:example.com");
+ });
+
+ it('should generate a room permalink for room aliases with no candidate servers', function() {
+ peg.get().getRoom = () => null;
+ const result = makeRoomPermalink("#somewhere:example.org");
+ expect(result).toBe("https://matrix.to/#/#somewhere:example.org");
+ });
+
+ it('should generate a room permalink for room aliases without candidate servers', function() {
+ peg.get().getRoom = () => {
+ return {
+ getJoinedMembers: () => [
+ {
+ userId: "@alice:first",
+ powerLevel: 100,
+ },
+ {
+ userId: "@bob:second",
+ powerLevel: 0,
+ },
+ ],
+ };
+ };
+ const result = makeRoomPermalink("#somewhere:example.org");
+ expect(result).toBe("https://matrix.to/#/#somewhere:example.org");
+ });
+
+ it('should generate a user permalink', function() {
+ const result = makeUserPermalink("@someone:example.org");
+ expect(result).toBe("https://matrix.to/#/@someone:example.org");
+ });
+
+ it('should generate a group permalink', function() {
+ const result = makeGroupPermalink("+community:example.org");
+ expect(result).toBe("https://matrix.to/#/+community:example.org");
+ });
+});
{ this.state.mode.getLabel() }
Room ID: { this.props.roomId }
@@ -634,7 +634,7 @@ export default class DevtoolsDialog extends React.Component {
} else {
const classes = "mx_DevTools_RoomStateExplorer_button";
body =
-
+
;
}
render() {
@@ -223,11 +223,11 @@ export default class NetworkDropdown extends React.Component {
current_value =
+ />;
} else {
const instance = instanceForInstanceId(this.props.protocols, this.state.selectedInstanceId);
current_value = this._makeMenuOption(
- this.state.selectedServer, instance, this.state.includeAll, false
+ this.state.selectedServer, instance, this.state.includeAll, false,
);
}
diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js
index 7be0bab33c..23b24adbb4 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -318,6 +318,19 @@ export default class AppTile extends React.Component {
}
this.setState({deleting: true});
+ // HACK: This is a really dirty way to ensure that Jitsi cleans up
+ // its hold on the webcam. Without this, the widget holds a media
+ // stream open, even after death. See https://github.com/vector-im/riot-web/issues/7351
+ if (this.refs.appFrame) {
+ // In practice we could just do `+= ''` to trick the browser
+ // into thinking the URL changed, however I can foresee this
+ // being optimized out by a browser. Instead, we'll just point
+ // the iframe at a page that is reasonably safe to use in the
+ // event the iframe doesn't wink away.
+ // This is relative to where the Riot instance is located.
+ this.refs.appFrame.src = 'about:blank';
+ }
+
WidgetUtils.setRoomWidget(
this.props.room.roomId,
this.props.id,
diff --git a/src/components/views/elements/DeviceVerifyButtons.js b/src/components/views/elements/DeviceVerifyButtons.js
index c775cba610..b88fbdfc06 100644
--- a/src/components/views/elements/DeviceVerifyButtons.js
+++ b/src/components/views/elements/DeviceVerifyButtons.js
@@ -78,7 +78,7 @@ export default React.createClass({
},
render: function() {
- let blacklistButton = null, verifyButton = null;
+ let blacklistButton = null; let verifyButton = null;
if (this.state.device.isBlocked()) {
blacklistButton = (
diff --git a/src/components/views/elements/EditableTextContainer.js b/src/components/views/elements/EditableTextContainer.js
index 064d2f1c39..3bf37df951 100644
--- a/src/components/views/elements/EditableTextContainer.js
+++ b/src/components/views/elements/EditableTextContainer.js
@@ -122,7 +122,6 @@ export default class EditableTextContainer extends React.Component {
);
}
}
-
}
EditableTextContainer.propTypes = {
diff --git a/src/components/views/elements/ImageView.js b/src/components/views/elements/ImageView.js
index f3ad5a9696..4ac5eda170 100644
--- a/src/components/views/elements/ImageView.js
+++ b/src/components/views/elements/ImageView.js
@@ -16,13 +16,13 @@ limitations under the License.
'use strict';
-var React = require('react');
+const React = require('react');
-var MatrixClientPeg = require('../../../MatrixClientPeg');
+const MatrixClientPeg = require('../../../MatrixClientPeg');
import {formatDate} from '../../../DateUtils';
-var filesize = require('filesize');
-var AccessibleButton = require('../../../components/views/elements/AccessibleButton');
+const filesize = require('filesize');
+const AccessibleButton = require('../../../components/views/elements/AccessibleButton');
const Modal = require('../../../Modal');
const sdk = require('../../../index');
import { _t } from '../../../languageHandler';
@@ -69,24 +69,24 @@ module.exports = React.createClass({
Modal.createTrackedDialog('Confirm Redact Dialog', 'Image View', ConfirmRedactDialog, {
onFinished: (proceed) => {
if (!proceed) return;
- var self = this;
+ const self = this;
MatrixClientPeg.get().redactEvent(
- this.props.mxEvent.getRoomId(), this.props.mxEvent.getId()
+ this.props.mxEvent.getRoomId(), this.props.mxEvent.getId(),
).catch(function(e) {
- var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
+ const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
// display error message stating you couldn't delete this.
- var code = e.errcode || e.statusCode;
+ const code = e.errcode || e.statusCode;
Modal.createTrackedDialog('You cannot delete this image.', '', ErrorDialog, {
title: _t('Error'),
- description: _t('You cannot delete this image. (%(code)s)', {code: code})
+ description: _t('You cannot delete this image. (%(code)s)', {code: code}),
});
}).done();
- }
+ },
});
},
- getName: function () {
- var name = this.props.name;
+ getName: function() {
+ let name = this.props.name;
if (name && this.props.link) {
name = { name };
}
@@ -94,7 +94,6 @@ module.exports = React.createClass({
},
render: function() {
-
/*
// In theory max-width: 80%, max-height: 80% on the CSS should work
// but in practice, it doesn't, so do it manually:
@@ -123,7 +122,7 @@ module.exports = React.createClass({
height: displayHeight
};
*/
- var style, res;
+ let style; let res;
if (this.props.width && this.props.height) {
style = {
@@ -133,23 +132,22 @@ module.exports = React.createClass({
res = style.width + "x" + style.height + "px";
}
- var size;
+ let size;
if (this.props.fileSize) {
size = filesize(this.props.fileSize);
}
- var size_res;
+ let size_res;
if (size && res) {
size_res = size + ", " + res;
- }
- else {
+ } else {
size_res = size || res;
}
- var showEventMeta = !!this.props.mxEvent;
+ const showEventMeta = !!this.props.mxEvent;
- var eventMeta;
- if(showEventMeta) {
+ let eventMeta;
+ if (showEventMeta) {
// Figure out the sender, defaulting to mxid
let sender = this.props.mxEvent.getSender();
const room = MatrixClientPeg.get().getRoom(this.props.mxEvent.getRoomId());
@@ -163,8 +161,8 @@ module.exports = React.createClass({
);
}
- var eventRedact;
- if(showEventMeta) {
+ let eventRedact;
+ if (showEventMeta) {
eventRedact = ({ _t('Toolbox') }
Room ID: { this.props.roomId }
diff --git a/src/components/views/directory/NetworkDropdown.js b/src/components/views/directory/NetworkDropdown.js
index b45bd286f2..ad51f501fb 100644
--- a/src/components/views/directory/NetworkDropdown.js
+++ b/src/components/views/directory/NetworkDropdown.js
@@ -153,8 +153,8 @@ export default class NetworkDropdown extends React.Component {
const sortedInstances = this.props.protocols[proto].instances;
sortedInstances.sort(function(x, y) {
- const a = x.desc
- const b = y.desc
+ const a = x.desc;
+ const b = y.desc;
if (a < b) {
return -1;
} else if (a > b) {
@@ -208,7 +208,7 @@ export default class NetworkDropdown extends React.Component {
return
{icon}
{name}
-
+
{ _t('Remove') }
);
@@ -175,10 +173,10 @@ module.exports = React.createClass({
- 
+
);
- }
+ },
});
diff --git a/src/components/views/globals/UpdateCheckBar.js b/src/components/views/globals/UpdateCheckBar.js
index e499ddab31..4610dbdb12 100644
--- a/src/components/views/globals/UpdateCheckBar.js
+++ b/src/components/views/globals/UpdateCheckBar.js
@@ -32,14 +32,14 @@ export default React.createClass({
getDefaultProps: function() {
return {
detail: '',
- }
+ };
},
getStatusText: function() {
// we can't import the enum from riot-web as we don't want matrix-react-sdk
// to depend on riot-web. so we grab it as a normal object via API instead.
const updateCheckStatusEnum = PlatformPeg.get().getUpdateCheckStatusEnum();
- switch(this.props.status) {
+ switch (this.props.status) {
case updateCheckStatusEnum.ERROR:
return _t('Error encountered (%(errorDetail)s).', { errorDetail: this.props.detail });
case updateCheckStatusEnum.CHECKING:
@@ -59,7 +59,7 @@ export default React.createClass({
const message = this.getStatusText();
const warning = _t('Warning');
- if (!'getUpdateCheckStatusEnum' in PlatformPeg.get()) {
+ if (!('getUpdateCheckStatusEnum' in PlatformPeg.get())) {
return ;
}
@@ -83,9 +83,9 @@ export default React.createClass({
{message}
- 
);
- }
+ },
});
diff --git a/src/components/views/elements/InlineSpinner.js b/src/components/views/elements/InlineSpinner.js
index adb916fcf0..cce4705512 100644
--- a/src/components/views/elements/InlineSpinner.js
+++ b/src/components/views/elements/InlineSpinner.js
@@ -20,14 +20,14 @@ module.exports = React.createClass({
displayName: 'InlineSpinner',
render: function() {
- var w = this.props.w || 16;
- var h = this.props.h || 16;
- var imgClass = this.props.imgClassName || "";
+ const w = this.props.w || 16;
+ const h = this.props.h || 16;
+ const imgClass = this.props.imgClassName || "";
return (
@@ -187,7 +185,7 @@ module.exports = React.createClass({
{ eventMeta }
- { _t('Download this file') }
+ { _t('Download this file') }
{ size_res }
@@ -201,5 +199,5 @@ module.exports = React.createClass({
+ { _t('Download this file') }
{ size_res }
- 
+
);
- }
+ },
});
diff --git a/src/components/views/elements/PersistedElement.js b/src/components/views/elements/PersistedElement.js
index ff839de2a9..d23d6488b6 100644
--- a/src/components/views/elements/PersistedElement.js
+++ b/src/components/views/elements/PersistedElement.js
@@ -54,7 +54,6 @@ function getOrCreateContainer(containerId) {
* bounding rect as the parent of PE.
*/
export default class PersistedElement extends React.Component {
-
static propTypes = {
// Unique identifier for this PersistedElement instance
// Any PersistedElements with the same persistKey will use
diff --git a/src/components/views/elements/Pill.js b/src/components/views/elements/Pill.js
index af7e8c4ae3..0d0949f07c 100644
--- a/src/components/views/elements/Pill.js
+++ b/src/components/views/elements/Pill.js
@@ -29,7 +29,7 @@ const REGEX_MATRIXTO = new RegExp(MATRIXTO_URL_PATTERN);
// For URLs of matrix.to links in the timeline which have been reformatted by
// HttpUtils transformTags to relative links. This excludes event URLs (with `[^\/]*`)
-const REGEX_LOCAL_MATRIXTO = /^#\/(?:user|room|group)\/(([#!@+])[^\/]*)$/;
+const REGEX_LOCAL_MATRIXTO = /^#\/(?:user|room|group)\/(([#!@+])[^/]*)$/;
const Pill = React.createClass({
statics: {
diff --git a/src/components/views/elements/Spinner.js b/src/components/views/elements/Spinner.js
index 2b620f12c5..67fde4bf66 100644
--- a/src/components/views/elements/Spinner.js
+++ b/src/components/views/elements/Spinner.js
@@ -16,19 +16,19 @@ limitations under the License.
'use strict';
-var React = require('react');
+const React = require('react');
module.exports = React.createClass({
displayName: 'Spinner',
render: function() {
- var w = this.props.w || 32;
- var h = this.props.h || 32;
- var imgClass = this.props.imgClassName || "";
+ const w = this.props.w || 32;
+ const h = this.props.h || 32;
+ const imgClass = this.props.imgClassName || "";
return (
+
-
+
);
- }
+ },
});
diff --git a/src/components/views/elements/TintableSvgButton.js b/src/components/views/elements/TintableSvgButton.js
index 4bfe46d43f..a3f5b7db5d 100644
--- a/src/components/views/elements/TintableSvgButton.js
+++ b/src/components/views/elements/TintableSvgButton.js
@@ -20,7 +20,6 @@ import TintableSvg from './TintableSvg';
import AccessibleButton from './AccessibleButton';
export default class TintableSvgButton extends React.Component {
-
constructor(props) {
super(props);
}
diff --git a/src/components/views/globals/MatrixToolbar.js b/src/components/views/globals/MatrixToolbar.js
index 45feede5a0..400d9e0c83 100644
--- a/src/components/views/globals/MatrixToolbar.js
+++ b/src/components/views/globals/MatrixToolbar.js
@@ -39,7 +39,7 @@ module.exports = React.createClass({
+
{ _t('You are not receiving desktop notifications') } { _t('Enable them now') }
- {releaseNotes}
,
button: _t("Update"),
onFinished: (update) => {
- if(update && PlatformPeg.get()) {
+ if (update && PlatformPeg.get()) {
PlatformPeg.get().installUpdate();
}
- }
+ },
});
},
@@ -58,10 +58,10 @@ export default React.createClass({
version: this.props.version,
newVersion: this.props.newVersion,
onFinished: (update) => {
- if(update && PlatformPeg.get()) {
+ if (update && PlatformPeg.get()) {
PlatformPeg.get().installUpdate();
}
- }
+ },
});
},
@@ -103,5 +103,5 @@ export default React.createClass({
{action_button}
+