From c35ac2324d06dd5aeda446c46929b8ff331b36b2 Mon Sep 17 00:00:00 2001 From: Christian Paul Date: Tue, 15 Nov 2022 13:27:19 +0100 Subject: [PATCH 1/2] Typo: to setup -> to set up --- .github/workflows/docs-release.yml | 2 +- docs/setup/github.md | 2 +- src/Bridge.ts | 8 ++++---- src/Connections/GitlabRepo.ts | 2 +- web/App.tsx | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/docs-release.yml b/.github/workflows/docs-release.yml index c8356fb7d..9c118c55b 100644 --- a/.github/workflows/docs-release.yml +++ b/.github/workflows/docs-release.yml @@ -21,7 +21,7 @@ jobs: - name: Get release tag run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV - - name: Setup mdBook + - name: Set up mdBook uses: peaceiris/actions-mdbook@v1 with: mdbook-version: '0.4.11' diff --git a/docs/setup/github.md b/docs/setup/github.md index 6d924d9bd..f00867ef2 100644 --- a/docs/setup/github.md +++ b/docs/setup/github.md @@ -46,7 +46,7 @@ Hookshot handles the following webhook event types: You can disable any of these to disable the events being handled in Hookshot. -Once you have setup your app, you can move onto configuring the bridge: +Once you have set up your app, you can move onto configuring the bridge: ## Bridge Configuration diff --git a/src/Bridge.ts b/src/Bridge.ts index e97327d7c..5ae4773cc 100644 --- a/src/Bridge.ts +++ b/src/Bridge.ts @@ -758,7 +758,7 @@ export class Bridge { } if (this.connectionManager?.isRoomConnected(roomId)) { - // Room has connections, don't setup a wizard. + // Room has connections, don't set up a wizard. return; } @@ -766,14 +766,14 @@ export class Bridge { // Otherwise it's a new room if (this.config.widgets?.roomSetupWidget?.addOnInvite) { if (await this.as.botClient.userHasPowerLevelFor(this.as.botUserId, roomId, "im.vector.modular.widgets", true) === false) { - await this.as.botIntent.sendText(roomId, "Hello! To setup new integrations in this room, please promote me to a Moderator/Admin"); + await this.as.botIntent.sendText(roomId, "Hello! To set up new integrations in this room, please promote me to a Moderator/Admin."); } else { - // Setup the widget + // Set up the widget await SetupWidget.SetupRoomConfigWidget(roomId, this.as.botIntent, this.config.widgets); } } } catch (ex) { - log.error(`Failed to setup new widget for room`, ex); + log.error(`Failed to set up new widget for room`, ex); } } diff --git a/src/Connections/GitlabRepo.ts b/src/Connections/GitlabRepo.ts index 9ee4a5773..a51fa7df7 100644 --- a/src/Connections/GitlabRepo.ts +++ b/src/Connections/GitlabRepo.ts @@ -205,7 +205,7 @@ export class GitLabRepoConnection extends CommandConnection { }); } - // Try to setup a webhook + // Try to set up a webhook if (gitlabConfig.webhook.publicUrl) { const hooks = await client.projects.hooks.list(project.id); const hasHook = hooks.find(h => h.url === gitlabConfig.webhook.publicUrl); diff --git a/web/App.tsx b/web/App.tsx index 6b06d4cc8..753c32b0b 100644 --- a/web/App.tsx +++ b/web/App.tsx @@ -85,7 +85,7 @@ export default class App extends Component { busy: false, }); } catch (ex) { - console.error(`Failed to setup widget:`, ex); + console.error(`Failed to set up widget:`, ex); let error: string = ex.message; if (ex instanceof BridgeAPIError) { if (ex.errcode === "M_AS_BAD_OPENID") { From 7edc15a1258b767f38efc70821a56fc0ce9f4caf Mon Sep 17 00:00:00 2001 From: Christian Paul Date: Tue, 15 Nov 2022 13:30:59 +0100 Subject: [PATCH 2/2] Add newsfile --- changelog.d/572.misc | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/572.misc diff --git a/changelog.d/572.misc b/changelog.d/572.misc new file mode 100644 index 000000000..6b0ca660c --- /dev/null +++ b/changelog.d/572.misc @@ -0,0 +1 @@ +Change "setup" to "set up" where it's used as a verb. \ No newline at end of file