Skip to content

Commit

Permalink
Remove usages of Buffer
Browse files Browse the repository at this point in the history
Signed-off-by: Michael Telatynski <[email protected]>
  • Loading branch information
t3chguy committed Dec 4, 2024
1 parent 974d3c1 commit 619e41e
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 7 deletions.
7 changes: 7 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,10 @@ module.exports = {
name: "setImmediate",
message: "Use setTimeout instead.",
},
{
name: "Buffer",
message: "Buffer is not available in the web.",
},
],

"import/no-duplicates": ["error"],
Expand Down Expand Up @@ -255,6 +259,9 @@ module.exports = {
additionalTestBlockFunctions: ["beforeAll", "beforeEach", "oldBackendOnly"],
},
],

// These are fine in tests
"no-restricted-globals": "off",
},
},
{
Expand Down
2 changes: 1 addition & 1 deletion src/@types/png-chunks-extract.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ declare module "png-chunks-extract" {
data: Uint8Array;
}

function extractPngChunks(data: Uint8Array | Buffer): IChunk[];
function extractPngChunks(data: Uint8Array): IChunk[];

export default extractPngChunks;
}
4 changes: 1 addition & 3 deletions src/components/views/auth/LoginWithQR.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ interface IState {
userCode?: string;
checkCode?: string;
failureReason?: FailureReason;
lastScannedCode?: Buffer;
}

export enum LoginWithQRFailureReason {
Expand Down Expand Up @@ -154,7 +153,7 @@ export default class LoginWithQR extends React.Component<IProps, IState> {
throw new Error("Rendezvous not found");
}

if (!this.state.lastScannedCode && this.state.rendezvous?.checkCode !== checkCode) {
if (this.state.rendezvous?.checkCode !== checkCode) {
this.setState({ failureReason: LoginWithQRFailureReason.CheckCodeMismatch });
return;
}
Expand Down Expand Up @@ -201,7 +200,6 @@ export default class LoginWithQR extends React.Component<IProps, IState> {
failureReason: undefined,
userCode: undefined,
checkCode: undefined,
lastScannedCode: undefined,
mediaPermissionError: false,
});
}
Expand Down
2 changes: 1 addition & 1 deletion src/stores/ThreepidInviteStore.ts
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ export default class ThreepidInviteStore extends EventEmitter {

private generateIdOf(persisted: IPersistedThreepidInvite): string {
// Use a consistent "hash" to form an ID.
return base32.stringify(Buffer.from(JSON.stringify(persisted)));
return base32.stringify(new TextEncoder().encode(JSON.stringify(persisted)));
}

private translateInvite(persisted: IPersistedThreepidInvite): IThreepidInvite {
Expand Down
2 changes: 1 addition & 1 deletion src/utils/WidgetUtils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -445,7 +445,7 @@ export default class WidgetUtils {
// For compatibility with Jitsi, use base32 without padding.
// More details here:
// https://github.com/matrix-org/prosody-mod-auth-matrix-user-verification
confId = base32.stringify(Buffer.from(roomId), { pad: false });
confId = base32.stringify(new TextEncoder().encode(roomId), { pad: false });
} else {
// Create a random conference ID
confId = `Jitsi${randomUppercaseString(1)}${randomLowercaseString(23)}`;
Expand Down
2 changes: 1 addition & 1 deletion src/utils/exportUtils/HtmlExport.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -431,7 +431,7 @@ export default class HTMLExporter extends Exporter {
!this.needsDateSeparator(event, prevEvent) &&
shouldFormContinuation(prevEvent, event, this.room.client, false);
const body = await this.createMessageBody(event, shouldBeJoined);
this.totalSize += Buffer.byteLength(body);
this.totalSize += new TextEncoder().encode(body).byteLength;
content += body;
prevEvent = event;
}
Expand Down

0 comments on commit 619e41e

Please sign in to comment.