Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Misspelling: to setup -> to set up #572

Merged
merged 3 commits into from
Nov 21, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/docs-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
1 change: 1 addition & 0 deletions changelog.d/572.misc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Change "setup" to "set up" where it's used as a verb.
2 changes: 1 addition & 1 deletion docs/setup/github.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
8 changes: 4 additions & 4 deletions src/Bridge.ts
Original file line number Diff line number Diff line change
Expand Up @@ -797,22 +797,22 @@ 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;
}

try {
// 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);
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/Connections/GitlabRepo.ts
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ export class GitLabRepoConnection extends CommandConnection<GitLabRepoConnection
});
}

// Try to setup a webhook
// Try to set up a webhook
// Requires at least a "Maintainer" role: https://docs.gitlab.com/ee/user/permissions.html
let warning: ConnectionWarning | undefined;
if (gitlabConfig.webhook.publicUrl && permissionLevel >= AccessLevel.Maintainer) {
Expand Down
2 changes: 1 addition & 1 deletion src/Widgets/SetupWidget.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ export class SetupWidget {

static async SetupRoomConfigWidget(roomId: string, botIntent: Intent, config: BridgeWidgetConfig): Promise<boolean> {
if (await SetupWidget.createWidgetInRoom(roomId, botIntent, config, HookshotWidgetKind.RoomConfiguration, "hookshot_room_config")) {
await botIntent.sendText(roomId, `Please open the ${config.branding.widgetTitle} widget to setup integrations.`);
await botIntent.sendText(roomId, `Please open the ${config.branding.widgetTitle} widget to set up integrations.`);
return true;
}
return false;
Expand Down
2 changes: 1 addition & 1 deletion web/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ export default class App extends Component<void, IState> {
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") {
Expand Down