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

Add types to Permalinks

Browse source
This commit is contained in:
J. Ryan Stinnett 2021-04-27 12:11:23 +01:00
parent bca45a1ad4
commit b8203043be
1 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/utils/permalinks/Permalinks.ts
View file

@ -17,6 +17,9 @@ limitations under the License.
import isIp from "is-ip"; import isIp from "is-ip";
import * as utils from "matrix-js-sdk/src/utils"; import * as utils from "matrix-js-sdk/src/utils";
import {Room} from "matrix-js-sdk/src/models/room"; import {Room} from "matrix-js-sdk/src/models/room";
import {EventType} from "matrix-js-sdk/src/@types/event";
import { MatrixEvent } from "matrix-js-sdk/src/models/event";
import { RoomMember } from "matrix-js-sdk/src/models/room-member";
import {MatrixClientPeg} from "../../MatrixClientPeg"; import {MatrixClientPeg} from "../../MatrixClientPeg";
import SpecPermalinkConstructor, {baseUrl as matrixtoBaseUrl} from "./SpecPermalinkConstructor"; import SpecPermalinkConstructor, {baseUrl as matrixtoBaseUrl} from "./SpecPermalinkConstructor";
@ -99,9 +102,6 @@ export class RoomPermalinkCreator {
if (!this.roomId) { if (!this.roomId) {
throw new Error("Failed to resolve a roomId for the permalink creator to use"); throw new Error("Failed to resolve a roomId for the permalink creator to use");
} }
this.onMembership = this.onMembership.bind(this);
this.onRoomState = this.onRoomState.bind(this);
} }
load() { load() {
@ -140,11 +140,11 @@ export class RoomPermalinkCreator {
return this.started; return this.started;
} }
forEvent(eventId) { forEvent(eventId: string): string {
return getPermalinkConstructor().forEvent(this.roomId, eventId, this._serverCandidates); return getPermalinkConstructor().forEvent(this.roomId, eventId, this._serverCandidates);
} }
forShareableRoom() { forShareableRoom(): string {
if (this.room) { if (this.room) {
// Prefer to use canonical alias for permalink if possible // Prefer to use canonical alias for permalink if possible
const alias = this.room.getCanonicalAlias(); const alias = this.room.getCanonicalAlias();
@ -155,26 +155,26 @@ export class RoomPermalinkCreator {
return getPermalinkConstructor().forRoom(this.roomId, this._serverCandidates); return getPermalinkConstructor().forRoom(this.roomId, this._serverCandidates);
} }
forRoom() { forRoom(): string {
return getPermalinkConstructor().forRoom(this.roomId, this._serverCandidates); return getPermalinkConstructor().forRoom(this.roomId, this._serverCandidates);
} }
private onRoomState(event) { private onRoomState = (event: MatrixEvent) => {
switch (event.getType()) { switch (event.getType()) {
case "m.room.server_acl": case EventType.RoomServerAcl:
this.updateAllowedServers(); this.updateAllowedServers();
this.updateHighestPlUser(); this.updateHighestPlUser();
this.updatePopulationMap(); this.updatePopulationMap();
this.updateServerCandidates(); this.updateServerCandidates();
return; return;
case "m.room.power_levels": case EventType.RoomPowerLevels:
this.updateHighestPlUser(); this.updateHighestPlUser();
this.updateServerCandidates(); this.updateServerCandidates();
return; return;
} }
} }
private onMembership(evt, member, oldMembership) { private onMembership = (evt: MatrixEvent, member: RoomMember, oldMembership: string) => {
const userId = member.userId; const userId = member.userId;
const membership = member.membership; const membership = member.membership;
const serverName = getServerName(userId); const serverName = getServerName(userId);
@ -282,11 +282,11 @@ export function makeGenericPermalink(entityId: string): string {
return getPermalinkConstructor().forEntity(entityId); return getPermalinkConstructor().forEntity(entityId);
} }
export function makeUserPermalink(userId) { export function makeUserPermalink(userId: string): string {
return getPermalinkConstructor().forUser(userId); return getPermalinkConstructor().forUser(userId);
} }
export function makeRoomPermalink(roomId) { export function makeRoomPermalink(roomId: string): string {
if (!roomId) { if (!roomId) {
throw new Error("can't permalink a falsey roomId"); throw new Error("can't permalink a falsey roomId");
} }
@ -305,7 +305,7 @@ export function makeRoomPermalink(roomId) {
return permalinkCreator.forRoom(); return permalinkCreator.forRoom();
} }
export function makeGroupPermalink(groupId) { export function makeGroupPermalink(groupId: string): string {
return getPermalinkConstructor().forGroup(groupId); return getPermalinkConstructor().forGroup(groupId);
} }
@ -437,24 +437,24 @@ export function parseAppLocalLink(localLink: string): PermalinkParts {
return null; return null;
} }
function getServerName(userId) { function getServerName(userId: string): string {
return userId.split(":").splice(1).join(":"); return userId.split(":").splice(1).join(":");
} }
function getHostnameFromMatrixDomain(domain) { function getHostnameFromMatrixDomain(domain: string): string {
if (!domain) return null; if (!domain) return null;
return new URL(`https://${domain}`).hostname; return new URL(`https://${domain}`).hostname;
} }
function isHostInRegex(hostname, regexps) { function isHostInRegex(hostname: string, regexps: RegExp[]) {
hostname = getHostnameFromMatrixDomain(hostname); hostname = getHostnameFromMatrixDomain(hostname);
if (!hostname) return true; // assumed if (!hostname) return true; // assumed
if (regexps.length > 0 && !regexps[0].test) throw new Error(regexps[0]); if (regexps.length > 0 && !regexps[0].test) throw new Error(regexps[0].toString());
return regexps.filter(h => h.test(hostname)).length > 0; return regexps.filter(h => h.test(hostname)).length > 0;
} }
function isHostnameIpAddress(hostname) { function isHostnameIpAddress(hostname: string): boolean {
hostname = getHostnameFromMatrixDomain(hostname); hostname = getHostnameFromMatrixDomain(hostname);
if (!hostname) return false; if (!hostname) return false;