OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Avoid use of transitive deps 

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
pull/28387/head
Michael Telatynski 2024-11-05 18:35:53 +00:00
parent 01039137b5
commit 458b4a45e5
No known key found for this signature in database
GPG Key ID: A2B008A5F49F5D0D
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/sentry.ts
View File

@ -8,7 +8,6 @@ Please see LICENSE files in the repository root for full details.
import * as Sentry from "@sentry/browser"; import * as Sentry from "@sentry/browser";
import { MatrixClient } from "matrix-js-sdk/src/matrix"; import { MatrixClient } from "matrix-js-sdk/src/matrix";
import { type Integration } from "@sentry/types/build/types/integration";
import SdkConfig from "./SdkConfig"; import SdkConfig from "./SdkConfig";
import { MatrixClientPeg } from "./MatrixClientPeg"; import { MatrixClientPeg } from "./MatrixClientPeg";
@ -196,7 +195,7 @@ export function setSentryUser(mxid: string): void {
export async function initSentry(sentryConfig: IConfigOptions["sentry"]): Promise<void> { export async function initSentry(sentryConfig: IConfigOptions["sentry"]): Promise<void> {
if (!sentryConfig) return; if (!sentryConfig) return;
// Only enable Integrations.GlobalHandlers, which hooks uncaught exceptions, if automaticErrorReporting is true // Only enable Integrations.GlobalHandlers, which hooks uncaught exceptions, if automaticErrorReporting is true
const integrations: Integration[] = [ const integrations = [
Sentry.inboundFiltersIntegration(), Sentry.inboundFiltersIntegration(),
Sentry.functionToStringIntegration(), Sentry.functionToStringIntegration(),
Sentry.breadcrumbsIntegration(), Sentry.breadcrumbsIntegration(),

6
test/test-utils/poll.ts
View File

@ -18,7 +18,7 @@ import {
M_POLL_RESPONSE, M_POLL_RESPONSE,
M_TEXT, M_TEXT,
} from "matrix-js-sdk/src/matrix"; } from "matrix-js-sdk/src/matrix";
import { uuid4 } from "@sentry/utils"; import { randomString } from "matrix-js-sdk/src/randomstring";
import { flushPromises } from "./utilities"; import { flushPromises } from "./utilities";
@ -67,7 +67,7 @@ export const makePollEndEvent = (
id?: string, id?: string,
): MatrixEvent => { ): MatrixEvent => {
return new MatrixEvent({ return new MatrixEvent({
event_id: id || uuid4(), event_id: id || randomString(16),
room_id: roomId, room_id: roomId,
origin_server_ts: ts, origin_server_ts: ts,
type: M_POLL_END.name, type: M_POLL_END.name,
@ -91,7 +91,7 @@ export const makePollResponseEvent = (
ts = 0, ts = 0,
): MatrixEvent => ): MatrixEvent =>
new MatrixEvent({ new MatrixEvent({
event_id: uuid4(), event_id: randomString(16),
room_id: roomId, room_id: roomId,
origin_server_ts: ts, origin_server_ts: ts,
type: M_POLL_RESPONSE.name, type: M_POLL_RESPONSE.name,