From 2c66403b3c7ec64b79c653347d0abf0d9ed9a414 Mon Sep 17 00:00:00 2001 From: Dariusz Niemczyk Date: Fri, 15 Oct 2021 16:32:15 +0200 Subject: [PATCH] Replace console.info with logger.info Related https://github.com/vector-im/element-web/issues/18425 --- src/CallHandler.tsx | 8 ++++---- src/Presence.ts | 2 +- src/components/structures/MatrixChat.tsx | 4 ++-- src/components/structures/RoomView.tsx | 2 +- src/components/views/auth/CaptchaForm.tsx | 2 +- .../views/context_menus/WidgetContextMenu.tsx | 2 +- src/components/views/elements/AppTile.tsx | 2 +- src/components/views/right_panel/UserInfo.tsx | 4 ++-- src/utils/exportUtils/HtmlExport.tsx | 2 +- src/utils/exportUtils/JSONExport.ts | 10 +++++----- src/utils/exportUtils/PlainTextExport.ts | 4 ++-- 11 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/CallHandler.tsx b/src/CallHandler.tsx index 30171aca89..69b00927a9 100644 --- a/src/CallHandler.tsx +++ b/src/CallHandler.tsx @@ -825,7 +825,7 @@ export default class CallHandler extends EventEmitter { }); return; } else if (members.length === 2) { - console.info(`Place ${payload.type} call in ${payload.room_id}`); + logger.info(`Place ${payload.type} call in ${payload.room_id}`); this.placeCall(payload.room_id, payload.type, payload.transferee); } else { // > 2 @@ -838,17 +838,17 @@ export default class CallHandler extends EventEmitter { } break; case 'place_conference_call': - console.info("Place conference call in " + payload.room_id); + logger.info("Place conference call in " + payload.room_id); Analytics.trackEvent('voip', 'placeConferenceCall'); CountlyAnalytics.instance.trackStartCall(payload.room_id, payload.type === PlaceCallType.Video, true); this.startCallApp(payload.room_id, payload.type); break; case 'end_conference': - console.info("Terminating conference call in " + payload.room_id); + logger.info("Terminating conference call in " + payload.room_id); this.terminateCallApp(payload.room_id); break; case 'hangup_conference': - console.info("Leaving conference call in "+ payload.room_id); + logger.info("Leaving conference call in "+ payload.room_id); this.hangupCallApp(payload.room_id); break; case 'incoming_call': diff --git a/src/Presence.ts b/src/Presence.ts index d2dc72222e..e58ed61901 100644 --- a/src/Presence.ts +++ b/src/Presence.ts @@ -101,7 +101,7 @@ class Presence { try { await MatrixClientPeg.get().setPresence({ presence: this.state }); - console.info("Presence:", newState); + logger.info("Presence:", newState); } catch (err) { logger.error("Failed to set presence:", err); this.state = oldState; diff --git a/src/components/structures/MatrixChat.tsx b/src/components/structures/MatrixChat.tsx index 61a8c5205c..a9e7876d90 100644 --- a/src/components/structures/MatrixChat.tsx +++ b/src/components/structures/MatrixChat.tsx @@ -1452,7 +1452,7 @@ export default class MatrixChat extends React.PureComponent { if (state === "SYNCING" && prevState === "SYNCING") { return; } - console.info("MatrixClient sync state => %s", state); + logger.info("MatrixClient sync state => %s", state); if (state !== "PREPARED") { return; } this.firstSyncComplete = true; @@ -1818,7 +1818,7 @@ export default class MatrixChat extends React.PureComponent { group_id: groupId, }); } else { - console.info("Ignoring showScreen for '%s'", screen); + logger.info("Ignoring showScreen for '%s'", screen); } } diff --git a/src/components/structures/RoomView.tsx b/src/components/structures/RoomView.tsx index 51404a17d9..240509e5f3 100644 --- a/src/components/structures/RoomView.tsx +++ b/src/components/structures/RoomView.tsx @@ -498,7 +498,7 @@ export class RoomView extends React.Component { // making it impossible to indicate a newly joined room. if (!joining && roomId) { if (!room && shouldPeek) { - console.info("Attempting to peek into room %s", roomId); + logger.info("Attempting to peek into room %s", roomId); this.setState({ peekLoading: true, isPeeking: true, // this will change to false if peeking fails diff --git a/src/components/views/auth/CaptchaForm.tsx b/src/components/views/auth/CaptchaForm.tsx index 5820b9335b..846efcc9ca 100644 --- a/src/components/views/auth/CaptchaForm.tsx +++ b/src/components/views/auth/CaptchaForm.tsx @@ -97,7 +97,7 @@ export default class CaptchaForm extends React.Component = ({ let revokeButton; if (!userWidget && !isLocalWidget && isAllowedWidget) { const onRevokeClick = () => { - console.info("Revoking permission for widget to load: " + app.eventId); + logger.info("Revoking permission for widget to load: " + app.eventId); const current = SettingsStore.getValue("allowedWidgets", roomId); current[app.eventId] = false; const level = SettingsStore.firstSupportedLevel("allowedWidgets"); diff --git a/src/components/views/elements/AppTile.tsx b/src/components/views/elements/AppTile.tsx index 6d3c75fbb2..5f7c0543c4 100644 --- a/src/components/views/elements/AppTile.tsx +++ b/src/components/views/elements/AppTile.tsx @@ -314,7 +314,7 @@ export default class AppTile extends React.Component { private grantWidgetPermission = (): void => { const roomId = this.props.room.roomId; - console.info("Granting permission for widget to load: " + this.props.app.eventId); + logger.info("Granting permission for widget to load: " + this.props.app.eventId); const current = SettingsStore.getValue("allowedWidgets", roomId); current[this.props.app.eventId] = true; const level = SettingsStore.firstSupportedLevel("allowedWidgets"); diff --git a/src/components/views/right_panel/UserInfo.tsx b/src/components/views/right_panel/UserInfo.tsx index 7d76da71a3..195cf03af4 100644 --- a/src/components/views/right_panel/UserInfo.tsx +++ b/src/components/views/right_panel/UserInfo.tsx @@ -658,7 +658,7 @@ const RedactMessagesButton: React.FC = ({ member }) => { // so first yield to allow to rerender after closing the dialog. await Promise.resolve(); - console.info(`Started redacting recent ${count} messages for ${user} in ${roomId}`); + logger.info(`Started redacting recent ${count} messages for ${user} in ${roomId}`); await Promise.all(eventsToRedact.map(async event => { try { await cli.redactEvent(roomId, event.getId()); @@ -668,7 +668,7 @@ const RedactMessagesButton: React.FC = ({ member }) => { logger.error(err); } })); - console.info(`Finished redacting recent ${count} messages for ${user} in ${roomId}`); + logger.info(`Finished redacting recent ${count} messages for ${user} in ${roomId}`); } }; diff --git a/src/utils/exportUtils/HtmlExport.tsx b/src/utils/exportUtils/HtmlExport.tsx index a7486e06cf..f7d3bb5e09 100644 --- a/src/utils/exportUtils/HtmlExport.tsx +++ b/src/utils/exportUtils/HtmlExport.tsx @@ -432,7 +432,7 @@ export default class HTMLExporter extends Exporter { const exportEnd = performance.now(); if (this.cancelled) { - console.info("Export cancelled successfully"); + logger.info("Export cancelled successfully"); } else { this.updateProgress("Export successful!"); this.updateProgress(`Exported ${res.length} events in ${(exportEnd - fetchStart)/1000} seconds`); diff --git a/src/utils/exportUtils/JSONExport.ts b/src/utils/exportUtils/JSONExport.ts index 41d9142a45..6061f33cf6 100644 --- a/src/utils/exportUtils/JSONExport.ts +++ b/src/utils/exportUtils/JSONExport.ts @@ -89,8 +89,8 @@ export default class JSONExporter extends Exporter { } public async export() { - console.info("Starting export process..."); - console.info("Fetching events..."); + logger.info("Starting export process..."); + logger.info("Fetching events..."); const fetchStart = performance.now(); const res = await this.getRequiredEvents(); @@ -98,7 +98,7 @@ export default class JSONExporter extends Exporter { logger.log(`Fetched ${res.length} events in ${(fetchEnd - fetchStart)/1000}s`); - console.info("Creating output..."); + logger.info("Creating output..."); const text = await this.createOutput(res); if (this.files.length) { @@ -112,9 +112,9 @@ export default class JSONExporter extends Exporter { const exportEnd = performance.now(); if (this.cancelled) { - console.info("Export cancelled successfully"); + logger.info("Export cancelled successfully"); } else { - console.info("Export successful!"); + logger.info("Export successful!"); logger.log(`Exported ${res.length} events in ${(exportEnd - fetchStart)/1000} seconds`); } diff --git a/src/utils/exportUtils/PlainTextExport.ts b/src/utils/exportUtils/PlainTextExport.ts index fc122bca6e..e3201314f9 100644 --- a/src/utils/exportUtils/PlainTextExport.ts +++ b/src/utils/exportUtils/PlainTextExport.ts @@ -141,9 +141,9 @@ export default class PlainTextExporter extends Exporter { const exportEnd = performance.now(); if (this.cancelled) { - console.info("Export cancelled successfully"); + logger.info("Export cancelled successfully"); } else { - console.info("Export successful!"); + logger.info("Export successful!"); logger.log(`Exported ${res.length} events in ${(exportEnd - fetchStart)/1000} seconds`); }