PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Appease the linter

Browse source
This commit is contained in:
Travis Ralston 2018-10-26 10:22:18 -06:00
parent ef8c9246aa
commit c389540522
2 changed files with 31 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/matrix-to.js
View file

@ -39,7 +39,7 @@ export function makeGroupPermalink(groupId) {
export function encodeServerCandidates(candidates) { export function encodeServerCandidates(candidates) {
if (!candidates) return ''; if (!candidates) return '';
return `via=${candidates.map(c => encodeURIComponent(c)).join("&via=")}` return `via=${candidates.map(c => encodeURIComponent(c)).join("&via=")}`;
} }
export function pickServerCandidates(roomId) { export function pickServerCandidates(roomId) {
@ -85,7 +85,7 @@ export function pickServerCandidates(roomId) {
// the list and magically have the link work. // the list and magically have the link work.
const populationMap: {[server:string]:number} = {}; const populationMap: {[server:string]:number} = {};
const highestPlUser = {userId:null, powerLevel: 0, serverName: null}; const highestPlUser = {userId: null, powerLevel: 0, serverName: null};
for (const member of room.getJoinedMembers()) { for (const member of room.getJoinedMembers()) {
const serverName = member.userId.split(":").splice(1).join(":"); const serverName = member.userId.split(":").splice(1).join(":");
@ -114,4 +114,4 @@ export function pickServerCandidates(roomId) {
} }
return candidates; return candidates;
} }

56
test/matrix-to-test.js
View file

@ -17,7 +17,7 @@ import {pickServerCandidates} from "../src/matrix-to";
import * as testUtils from "./test-utils"; import * as testUtils from "./test-utils";
describe('matrix-to', function () { describe('matrix-to', function() {
let sandbox; let sandbox;
beforeEach(function() { beforeEach(function() {
@ -30,25 +30,25 @@ describe('matrix-to', function () {
sandbox.restore(); sandbox.restore();
}); });
it('should pick no candidate servers when the room is not found', function () { it('should pick no candidate servers when the room is not found', function() {
peg.get().getRoom = () => null; peg.get().getRoom = () => null;
const pickedServers = pickServerCandidates("!somewhere:example.org"); const pickedServers = pickServerCandidates("!somewhere:example.org");
expect(pickedServers).toExist(); expect(pickedServers).toExist();
expect(pickedServers.length).toBe(0); expect(pickedServers.length).toBe(0);
}); });
it('should pick no candidate servers when the room has no members', function () { it('should pick no candidate servers when the room has no members', function() {
peg.get().getRoom = () => { peg.get().getRoom = () => {
return { return {
getJoinedMembers: () => [], getJoinedMembers: () => [],
} };
}; };
const pickedServers = pickServerCandidates("!somewhere:example.org"); const pickedServers = pickServerCandidates("!somewhere:example.org");
expect(pickedServers).toExist(); expect(pickedServers).toExist();
expect(pickedServers.length).toBe(0); expect(pickedServers.length).toBe(0);
}); });
it('should pick a candidate server for the highest power level user in the room', function () { it('should pick a candidate server for the highest power level user in the room', function() {
peg.get().getRoom = () => { peg.get().getRoom = () => {
return { return {
getJoinedMembers: () => [ getJoinedMembers: () => [
@ -63,9 +63,9 @@ describe('matrix-to', function () {
{ {
userId: "@alice:pl_95", userId: "@alice:pl_95",
powerLevel: 95, powerLevel: 95,
} },
], ],
} };
}; };
const pickedServers = pickServerCandidates("!somewhere:example.org"); const pickedServers = pickServerCandidates("!somewhere:example.org");
expect(pickedServers).toExist(); expect(pickedServers).toExist();
@ -74,7 +74,7 @@ describe('matrix-to', function () {
// we don't check the 2nd and 3rd servers because that is done by the next test // 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 () { it('should pick candidate servers based on user population', function() {
peg.get().getRoom = () => { peg.get().getRoom = () => {
return { return {
getJoinedMembers: () => [ getJoinedMembers: () => [
@ -101,9 +101,9 @@ describe('matrix-to', function () {
{ {
userId: "@charlie:third", userId: "@charlie:third",
powerLevel: 0, powerLevel: 0,
} },
], ],
} };
}; };
const pickedServers = pickServerCandidates("!somewhere:example.org"); const pickedServers = pickServerCandidates("!somewhere:example.org");
expect(pickedServers).toExist(); expect(pickedServers).toExist();
@ -113,7 +113,7 @@ describe('matrix-to', function () {
expect(pickedServers[2]).toBe("third"); expect(pickedServers[2]).toBe("third");
}); });
it('should pick prefer candidate servers with higher power levels', function () { it('should pick prefer candidate servers with higher power levels', function() {
peg.get().getRoom = () => { peg.get().getRoom = () => {
return { return {
getJoinedMembers: () => [ getJoinedMembers: () => [
@ -132,9 +132,9 @@ describe('matrix-to', function () {
{ {
userId: "@charlie:third", userId: "@charlie:third",
powerLevel: 0, powerLevel: 0,
} },
], ],
} };
}; };
const pickedServers = pickServerCandidates("!somewhere:example.org"); const pickedServers = pickServerCandidates("!somewhere:example.org");
expect(pickedServers).toExist(); expect(pickedServers).toExist();
@ -144,16 +144,16 @@ describe('matrix-to', function () {
expect(pickedServers[2]).toBe("third"); expect(pickedServers[2]).toBe("third");
}); });
it('should work with IPv4 hostnames', function () { it('should work with IPv4 hostnames', function() {
peg.get().getRoom = () => { peg.get().getRoom = () => {
return { return {
getJoinedMembers: () => [ getJoinedMembers: () => [
{ {
userId: "@alice:127.0.0.1", userId: "@alice:127.0.0.1",
powerLevel: 100, powerLevel: 100,
} },
], ],
} };
}; };
const pickedServers = pickServerCandidates("!somewhere:example.org"); const pickedServers = pickServerCandidates("!somewhere:example.org");
expect(pickedServers).toExist(); expect(pickedServers).toExist();
@ -161,16 +161,16 @@ describe('matrix-to', function () {
expect(pickedServers[0]).toBe("127.0.0.1"); expect(pickedServers[0]).toBe("127.0.0.1");
}); });
it('should work with IPv6 hostnames', function () { it('should work with IPv6 hostnames', function() {
peg.get().getRoom = () => { peg.get().getRoom = () => {
return { return {
getJoinedMembers: () => [ getJoinedMembers: () => [
{ {
userId: "@alice:[::1]", userId: "@alice:[::1]",
powerLevel: 100, powerLevel: 100,
} },
], ],
} };
}; };
const pickedServers = pickServerCandidates("!somewhere:example.org"); const pickedServers = pickServerCandidates("!somewhere:example.org");
expect(pickedServers).toExist(); expect(pickedServers).toExist();
@ -178,16 +178,16 @@ describe('matrix-to', function () {
expect(pickedServers[0]).toBe("[::1]"); expect(pickedServers[0]).toBe("[::1]");
}); });
it('should work with IPv4 hostnames with ports', function () { it('should work with IPv4 hostnames with ports', function() {
peg.get().getRoom = () => { peg.get().getRoom = () => {
return { return {
getJoinedMembers: () => [ getJoinedMembers: () => [
{ {
userId: "@alice:127.0.0.1:8448", userId: "@alice:127.0.0.1:8448",
powerLevel: 100, powerLevel: 100,
} },
], ],
} };
}; };
const pickedServers = pickServerCandidates("!somewhere:example.org"); const pickedServers = pickServerCandidates("!somewhere:example.org");
expect(pickedServers).toExist(); expect(pickedServers).toExist();
@ -195,16 +195,16 @@ describe('matrix-to', function () {
expect(pickedServers[0]).toBe("127.0.0.1:8448"); expect(pickedServers[0]).toBe("127.0.0.1:8448");
}); });
it('should work with IPv6 hostnames with ports', function () { it('should work with IPv6 hostnames with ports', function() {
peg.get().getRoom = () => { peg.get().getRoom = () => {
return { return {
getJoinedMembers: () => [ getJoinedMembers: () => [
{ {
userId: "@alice:[::1]:8448", userId: "@alice:[::1]:8448",
powerLevel: 100, powerLevel: 100,
} },
], ],
} };
}; };
const pickedServers = pickServerCandidates("!somewhere:example.org"); const pickedServers = pickServerCandidates("!somewhere:example.org");
expect(pickedServers).toExist(); expect(pickedServers).toExist();
@ -212,16 +212,16 @@ describe('matrix-to', function () {
expect(pickedServers[0]).toBe("[::1]:8448"); expect(pickedServers[0]).toBe("[::1]:8448");
}); });
it('should work with hostnames with ports', function () { it('should work with hostnames with ports', function() {
peg.get().getRoom = () => { peg.get().getRoom = () => {
return { return {
getJoinedMembers: () => [ getJoinedMembers: () => [
{ {
userId: "@alice:example.org:8448", userId: "@alice:example.org:8448",
powerLevel: 100, powerLevel: 100,
} },
], ],
} };
}; };
const pickedServers = pickServerCandidates("!somewhere:example.org"); const pickedServers = pickServerCandidates("!somewhere:example.org");
expect(pickedServers).toExist(); expect(pickedServers).toExist();