From 2d8404bb116851fbf9e6d1d636fb356f558987fe Mon Sep 17 00:00:00 2001
From: Christian Paul <christianp@matrix.org>
Date: Thu, 31 Dec 2020 17:17:25 +0100
Subject: [PATCH] .substr() -> .substring()
---
src/db/postgres.ts | 4 ++--
src/matrixeventprocessor.ts | 2 +-
src/matrixroomhandler.ts | 4 ++--
src/usersyncroniser.ts | 2 +-
src/util.ts | 2 +-
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/db/postgres.ts b/src/db/postgres.ts
index 0b41112..a3fc00c 100644
--- a/src/db/postgres.ts
+++ b/src/db/postgres.ts
@@ -26,7 +26,7 @@ const pgp: pgPromise.IMain = pgPromise({
export class Postgres implements IDatabaseConnector {
public static ParameterizeSql(sql: string): string {
return sql.replace(/\$((\w|\d|_)+)+/g, (k) => {
- return `\${${k.substr("$".length)}}`;
+ return `\${${k.substring("$".length)}}`;
});
}
@@ -37,7 +37,7 @@ export class Postgres implements IDatabaseConnector {
}
public Open() {
// Hide username:password
- const logConnString = this.connectionString.substr(
+ const logConnString = this.connectionString.substring(
this.connectionString.indexOf("@") || 0,
);
log.info(`Opening ${logConnString}`);
diff --git a/src/matrixeventprocessor.ts b/src/matrixeventprocessor.ts
index 3a0af95..af4eb56 100644
--- a/src/matrixeventprocessor.ts
+++ b/src/matrixeventprocessor.ts
@@ -530,7 +530,7 @@ export class MatrixEventProcessor {
}
}
embed.setAuthor(
- displayName.substr(0, MAX_NAME_LENGTH),
+ displayName.substring(0, MAX_NAME_LENGTH),
avatarUrl,
`https://matrix.to/#/${sender}`,
);
diff --git a/src/matrixroomhandler.ts b/src/matrixroomhandler.ts
index 5a7c4b8..1ebc8b4 100644
--- a/src/matrixroomhandler.ts
+++ b/src/matrixroomhandler.ts
@@ -146,9 +146,9 @@ export class MatrixRoomHandler {
// tslint:disable-next-line no-any
public async OnAliasQuery(alias: string): Promise<any> {
- const aliasLocalpart = alias.substr("#".length, alias.indexOf(":") - 1);
+ const aliasLocalpart = alias.substring("#".length, alias.indexOf(":") - 1);
log.info("Got request for #", aliasLocalpart);
- const srvChanPair = aliasLocalpart.substr("_discord_".length).split("_", ROOM_NAME_PARTS);
+ const srvChanPair = aliasLocalpart.substring("_discord_".length).split("_", ROOM_NAME_PARTS);
if (srvChanPair.length < ROOM_NAME_PARTS || srvChanPair[0] === "" || srvChanPair[1] === "") {
log.warn(`Alias '${aliasLocalpart}' was missing a server and/or a channel`);
return;
diff --git a/src/usersyncroniser.ts b/src/usersyncroniser.ts
index 6400ecb..5180520 100644
--- a/src/usersyncroniser.ts
+++ b/src/usersyncroniser.ts
@@ -114,7 +114,7 @@ export class UserSyncroniser {
log.info(`Creating new user ${userState.mxUserId}`);
remoteUser = new RemoteUser(userState.id);
await this.userStore.linkUsers(
- userState.mxUserId.substr("@".length),
+ userState.mxUserId.substring("@".length),
userState.id,
);
diff --git a/src/util.ts b/src/util.ts
index 2bbf412..2f68f1d 100644
--- a/src/util.ts
+++ b/src/util.ts
@@ -358,7 +358,7 @@ export class Util {
public static ParseMxid(unescapedMxid: string, escape: boolean = true) {
const RADIX = 16;
- const parts = unescapedMxid.substr(1).split(":");
+ const parts = unescapedMxid.substring(1).split(":");
const domain = parts[1];
let localpart = parts[0];
if (escape) {
--
GitLab