diff options
| author | ᴜɴᴋɴᴡᴏɴ <u@gogs.io> | 2020-03-08 19:09:31 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-08 19:09:31 +0800 |
| commit | 6437d0180b97a26319b50c2e22927dac7c94fcdd (patch) | |
| tree | 3d0d097e7f498e4b970065096e7500876d365a8b /internal/db/webhook_discord.go | |
| parent | c65b5b9f84dee21dc362311b299694e8e00f6ac6 (diff) | |
git: migrate to github.com/gogs/git-module@v1.0.0 (#5958)
* WIP
* Finish `internal/db/git_diff.go`
* FInish internal/db/mirror.go
* Finish internal/db/pull.go
* Finish internal/db/release.go
* Finish internal/db/repo.go
* Finish internal/db/repo_branch.go
* Finish internal/db/repo_editor.go
* Finish internal/db/update.go
* Save my work
* Add license header
* Compile!
* Merge master
* Finish internal/cmd/hook.go
* Finish internal/conf/static.go
* Finish internal/context/repo.go
* Finish internal/db/action.go
* Finish internal/db/git_diff.go
* Fix submodule URL inferring
* Finish internal/db/mirror.go
* Updat to beta.4
* css: update fonts
* Finish internal/db/pull.go
* Finish internal/db/release.go
* Finish internal/db/repo_branch.go
* Finish internal/db/wiki.go
* gitutil: enhance infer submodule UR
* Finish internal/route/api/v1/repo/commits.go
* mirror: only collect branch commits after sync
* mirror: fix tag support
* Finish internal/db/repo.go
* Finish internal/db/repo_editor.go
* Finish internal/db/update.go
* Finish internal/gitutil/pull_request.go
* Make it compile
* Finish internal/route/repo/setting.go
* Finish internal/route/repo/branch.go
* Finish internal/route/api/v1/repo/file.go
* Finish internal/route/repo/download.go
* Finish internal/route/repo/editor.go
* Use helper
* Finish internal/route/repo/issue.go
* Finish internal/route/repo/pull.go
* Finish internal/route/repo/release.go
* Finish internal/route/repo/repo.go
* Finish internal/route/repo/wiki.go
* Finish internal/route/repo/commit.go
* Finish internal/route/repo/view.go
* Finish internal/gitutil/tag.go
* go.sum
Diffstat (limited to 'internal/db/webhook_discord.go')
| -rw-r--r-- | internal/db/webhook_discord.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/internal/db/webhook_discord.go b/internal/db/webhook_discord.go index 7442a557..4725f867 100644 --- a/internal/db/webhook_discord.go +++ b/internal/db/webhook_discord.go @@ -71,7 +71,7 @@ func DiscordSHALinkFormatter(url string, text string) string { // getDiscordCreatePayload composes Discord payload for create new branch or tag. func getDiscordCreatePayload(p *api.CreatePayload) (*DiscordPayload, error) { - refName := git.RefEndName(p.Ref) + refName := git.RefShortName(p.Ref) repoLink := DiscordLinkFormatter(p.Repo.HTMLURL, p.Repo.Name) refLink := DiscordLinkFormatter(p.Repo.HTMLURL+"/src/"+refName, refName) content := fmt.Sprintf("Created new %s: %s/%s", p.RefType, repoLink, refLink) @@ -89,7 +89,7 @@ func getDiscordCreatePayload(p *api.CreatePayload) (*DiscordPayload, error) { // getDiscordDeletePayload composes Discord payload for delete a branch or tag. func getDiscordDeletePayload(p *api.DeletePayload) (*DiscordPayload, error) { - refName := git.RefEndName(p.Ref) + refName := git.RefShortName(p.Ref) repoLink := DiscordLinkFormatter(p.Repo.HTMLURL, p.Repo.Name) content := fmt.Sprintf("Deleted %s: %s/%s", p.RefType, repoLink, refName) return &DiscordPayload{ @@ -124,7 +124,7 @@ func getDiscordForkPayload(p *api.ForkPayload) (*DiscordPayload, error) { func getDiscordPushPayload(p *api.PushPayload, slack *SlackMeta) (*DiscordPayload, error) { // n new commits var ( - branchName = git.RefEndName(p.Ref) + branchName = git.RefShortName(p.Ref) commitDesc string commitString string ) |