Skip to content

Minor cleanup #145

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.

Sign up for GitHub

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

Merged
wiggin77 merged 2 commits into from
Apr 22, 2025
Merged

Minor cleanup #145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dc665bf
refactor: Escape URL components in key generation functions
enzowritescode Apr 10, 2025
da7bbe1
fix typo in account
enzowritescode Apr 18, 2025
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 server/flow.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ func (fm *FlowManager) stepCSversionGreaterthan9() flow.Step {
func (fm *FlowManager) stepWebhookInstructions() flow.Step {
return flow.NewStep(stepWebhookInstructions).
WithText(
"You have successfully connected your Mattermost acoount to Confluence server. To finish the configuration, add a Webhook in your Confluence server following these steps:\n" +
"You have successfully connected your Mattermost account to Confluence server. To finish the configuration, add a Webhook in your Confluence server following these steps:\n" +
"1. Go to [**Settings > Plugins > Servlet > Webhooks**]({{ .ConfluenceURL }}/plugins/servlet/webhooks/)\n" +
"2. Select **Create Webhook**.\n" +
"4. On the **Create Webhook** screen, set the following values:\n" +
Expand Down
12 changes: 9 additions & 3 deletions server/store/store.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,18 +28,24 @@ const (
var ErrNotFound = errors.New("not found")

// lint is suggesting to rename the function names from `storeConnection` to `Connection` so that when the function is accessed from any other package
// it looks like `store.Connnection, but this reduces the readibility within the function`
// it looks like `store.Connection, but this reduces the readability within the function`

// revive:disable:exported

func GetURLSpaceKeyCombinationKey(url, spaceKey string) string {
u, _ := url2.Parse(url)
return fmt.Sprintf("%s/%s/%s", ConfluenceSubscriptionKeyPrefix, u.Hostname(), spaceKey)
return fmt.Sprintf("%s/%s/%s",
url2.PathEscape(ConfluenceSubscriptionKeyPrefix),
url2.PathEscape(u.Hostname()),
url2.PathEscape(spaceKey))
}

func GetURLPageIDCombinationKey(url, pageID string) string {
u, _ := url2.Parse(url)
return fmt.Sprintf("%s/%s/%s", ConfluenceSubscriptionKeyPrefix, u.Hostname(), pageID)
return fmt.Sprintf("%s/%s/%s",
url2.PathEscape(ConfluenceSubscriptionKeyPrefix),
url2.PathEscape(u.Hostname()),
url2.PathEscape(pageID))
}

func GetSubscriptionKey() string {
Expand Down