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.

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

Jump to bottom

改行文字の結合 #772

Merged
merged 2 commits into from
Jun 28, 2024
Merged

改行文字の結合 #772

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fbf875a
改行文字の結合
Hueter57 Jun 28, 2024
bcf07e9
Merge branch 'traPtitech:v2' into edit_webhook
Hueter57 Jun 28, 2024
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
13 changes: 6 additions & 7 deletions service/webhook.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,7 @@ func WebhookEventHandler(c echo.Context, reqBody, resBody []byte) {
message += fmt.Sprintf("## :comment:[申請](%s/requests/%s)", "https://jomon.trap.jp", splitedPath[3])
message += "に対する"
message += fmt.Sprintf("[コメント](%s/requests/%s/comments/%s)", "https://jomon.trap.jp", splitedPath[3], resApp.ID)
message += "が作成されました" + "\n"
message += "\n"
message += "が作成されました\n\n"
message += resApp.Comment + "\n"
} else {
resApp := new(RequestApplication)
Expand All @@ -100,9 +99,9 @@ func WebhookEventHandler(c echo.Context, reqBody, resBody []byte) {
return
}
if c.Request().Method == http.MethodPost {
message += "## :receipt:申請が作成されました" + "\n"
message += "## :receipt:申請が作成されました\n"
} else if c.Request().Method == http.MethodPut {
message += "## :receipt:申請が更新されました" + "\n"
message += "## :receipt:申請が更新されました\n"
}

message += fmt.Sprintf("### [%s](%s/applications/%s)", resApp.Title, "https://jomon.trap.jp", resApp.ID) + "\n"
Expand All @@ -111,10 +110,10 @@ func WebhookEventHandler(c echo.Context, reqBody, resBody []byte) {
for _, target := range resApp.Targets {
amount += target.Amount
}
message += fmt.Sprintf("- 支払金額: %d円", amount) + "\n"
message += fmt.Sprintf("- 支払金額: %d円\n", amount)

if resApp.Group != nil {
message += fmt.Sprintf("- 請求先グループ: %s", resApp.Group.Name) + "\n"
message += fmt.Sprintf("- 請求先グループ: %s\n", resApp.Group.Name)
}

if resApp.Tags != nil && len(resApp.Tags) != 0 {
Expand All @@ -124,7 +123,7 @@ func WebhookEventHandler(c echo.Context, reqBody, resBody []byte) {
})
message += fmt.Sprintf("- タグ: %s", strings.Join(tags, ", "))
}
message += "\n" + "\n"
message += "\n\n"
message += resApp.Content + "\n"
}
} else if strings.Contains(c.Request().URL.Path, "/api/transactions") {
Expand Down