Enhance pipeline message and pr title

server/forge/bitbucket/convert.go

@@ -178,6 +178,7 @@ func convertPullHook(from *internal.PullRequestHook) *model.Pipeline {
 		),
 		ForgeURL:  from.PullRequest.Links.HTML.Href,
 		Branch:    from.PullRequest.Dest.Branch.Name,
+		Title:     from.PullRequest.Title,
 		Message:   from.PullRequest.Desc,
 		Avatar:    from.Actor.Links.Avatar.Href,
 		Author:    from.Actor.Login,
@@ -199,6 +200,7 @@ func convertPushHook(hook *internal.PushHook, change *internal.Change) *model.Pi
 		Sender:    hook.Actor.Login,
 		Timestamp: change.New.Target.Date.UTC().Unix(),
 	}
+	pipeline.Title, _, _ = strings.Cut(pipeline.Message, "\n")
 	switch change.New.Type {
 	case "tag", "annotated_tag", "bookmark":
 		pipeline.Event = model.EventTag

server/forge/bitbucketdatacenter/convert.go

@@ -89,10 +89,19 @@ func convertRepositoryPushEvent(ev *bb.RepositoryPushEvent, baseURL string) *mod
 		return nil
 	}
 
+	message := ""
+	if ev.ToCommit != nil {
+		message = ev.ToCommit.Message
+	} else if len(ev.Commits) > 0 {
+		message = ev.Commits[0].Message
+	}
+	title, _, _ := strings.Cut(message, "\n")
+
 	pipeline := &model.Pipeline{
 		Commit:    change.ToHash,
 		Branch:    change.Ref.DisplayID,
-		Message:   "",
+		Title:     title,
+		Message:   message,
 		Avatar:    bitbucketAvatarURL(baseURL, ev.Actor.Slug),
 		Author:    authorLabel(ev.Actor.Name),
 		Email:     ev.Actor.Email,
@@ -115,7 +124,6 @@ func convertPullRequestEvent(ev *bb.PullRequestEvent, baseURL string) *model.Pip
 		Commit:    ev.PullRequest.Source.Latest,
 		Branch:    ev.PullRequest.Source.DisplayID,
 		Title:     ev.PullRequest.Title,
-		Message:   "",
 		Avatar:    bitbucketAvatarURL(baseURL, ev.Actor.Slug),
 		Author:    authorLabel(ev.Actor.Name),
 		Email:     ev.Actor.Email,

server/forge/gitea/fixtures/hooks.go

@@ -1414,7 +1414,7 @@ const HookRelease = `
     "tag_name": "0.0.5",
     "target_commitish": "main",
     "name": "Version 0.0.5",
-    "body": "",
+    "body": "release notes",
     "url": "https://git.xxx/api/v1/repos/anbraten/demo/releases/48",
     "html_url": "https://git.xxx/anbraten/demo/releases/tag/0.0.5",
     "tarball_url": "https://git.xxx/anbraten/demo/archive/0.0.5.tar.gz",

server/forge/gitea/gitea.go

@@ -507,15 +507,24 @@ func (c *Gitea) Hook(ctx context.Context, r *http.Request) (*model.Repo, *model.
 		return nil, nil, err
 	}
 
+	var tag *gitea.Tag
+	loadTag := func() error {
+		if tag == nil {
+			tagName := strings.Split(pipeline.Ref, "/")[2]
+			tag, err = c.getTag(ctx, repo, tagName)
+			return err
+		}
+		return nil
+	}
+
 	if pipeline != nil && pipeline.Event == model.EventRelease && pipeline.Commit == "" {
-		tagName := strings.Split(pipeline.Ref, "/")[2]
-		sha, err := c.getTagCommitSHA(ctx, repo, tagName)
-		if err != nil {
+		if err := loadTag(); err != nil {
 			return nil, nil, err
 		}
-		pipeline.Commit = sha
+		pipeline.Commit = tag.Commit.SHA
 	}
 
+	// get changed files via api (and not from parsed webhook)
 	if pipeline != nil && (pipeline.Event == model.EventPull || pipeline.Event == model.EventPullClosed) && len(pipeline.ChangedFiles) == 0 {
 		index, err := strconv.ParseInt(strings.Split(pipeline.Ref, "/")[2], 10, 64)
 		if err != nil {
@@ -527,6 +536,14 @@ func (c *Gitea) Hook(ctx context.Context, r *http.Request) (*model.Repo, *model.
 		}
 	}
 
+	// get tag message via api if empty
+	if pipeline != nil && pipeline.Event == model.EventTag && pipeline.Message == "" {
+		if err := loadTag(); err != nil {
+			return nil, nil, err
+		}
+		pipeline.Message = tag.Message
+	}
+
 	return repo, pipeline, nil
 }
 
@@ -625,25 +642,9 @@ func getStatus(status model.StatusValue) gitea.StatusState {
 }
 
 func (c *Gitea) getChangedFilesForPR(ctx context.Context, repo *model.Repo, index int64) ([]string, error) {
-	_store, ok := store.TryFromContext(ctx)
-	if !ok {
-		log.Error().Msg("could not get store from context")
-		return []string{}, nil
-	}
-
-	repo, err := _store.GetRepoNameFallback(repo.ForgeRemoteID, repo.FullName)
-	if err != nil {
-		return nil, err
-	}
-
-	user, err := _store.GetUser(repo.UserID)
-	if err != nil {
-		return nil, err
-	}
-
-	client, err := c.newClientToken(ctx, user.Token)
-	if err != nil {
-		return nil, err
+	client, repo, err := c.prepareHookAPIClient(ctx, repo)
+	if err != nil || client == nil {
+		return []string{}, err
 	}
 
 	return shared_utils.Paginate(func(page int) ([]string, error) {
@@ -661,34 +662,39 @@ func (c *Gitea) getChangedFilesForPR(ctx context.Context, repo *model.Repo, inde
 	})
 }
 
-func (c *Gitea) getTagCommitSHA(ctx context.Context, repo *model.Repo, tagName string) (string, error) {
-	_store, ok := store.TryFromContext(ctx)
-	if !ok {
-		log.Error().Msg("could not get store from context")
-		return "", nil
+func (c *Gitea) getTag(ctx context.Context, repo *model.Repo, tagName string) (*gitea.Tag, error) {
+	client, repo, err := c.prepareHookAPIClient(ctx, repo)
+	if err != nil || client == nil {
+		return nil, err
 	}
 
-	repo, err := _store.GetRepoNameFallback(repo.ForgeRemoteID, repo.FullName)
+	tag, _, err := client.GetTag(repo.Owner, repo.Name, tagName)
 	if err != nil {
-		return "", err
+		return nil, err
 	}
 
-	user, err := _store.GetUser(repo.UserID)
-	if err != nil {
-		return "", err
+	return tag, nil
+}
+
+func (c *Gitea) prepareHookAPIClient(ctx context.Context, repo *model.Repo) (*gitea.Client, *model.Repo, error) {
+	_store, ok := store.TryFromContext(ctx)
+	if !ok {
+		log.Error().Msg("could not get store from context")
+		return nil, nil, nil
 	}
 
-	client, err := c.newClientToken(ctx, user.Token)
+	repo, err := _store.GetRepoNameFallback(repo.ForgeRemoteID, repo.FullName)
 	if err != nil {
-		return "", err
+		return nil, nil, err
 	}
 
-	tag, _, err := client.GetTag(repo.Owner, repo.Name, tagName)
+	repoOwner, err := _store.GetUser(repo.UserID)
 	if err != nil {
-		return "", err
+		return nil, nil, err
 	}
 
-	return tag.Commit.SHA, nil
+	client, err := c.newClientToken(ctx, repoOwner.Token)
+	return client, repo, err
 }
 
 func (c *Gitea) perPage(ctx context.Context) int {

server/forge/gitea/helper.go

@@ -89,12 +89,15 @@ func pipelineFromPush(hook *pushHook) *model.Pipeline {
 		link = hook.HeadCommit.URL
 	}
 
+	title, _, _ := strings.Cut(message, "\n")
+
 	return &model.Pipeline{
 		Event:        model.EventPush,
 		Commit:       hook.After,
 		Ref:          hook.Ref,
 		ForgeURL:     link,
 		Branch:       strings.TrimPrefix(hook.Ref, "refs/heads/"),
+		Title:        title,
 		Message:      message,
 		Avatar:       avatar,
 		Author:       hook.Sender.UserName,
@@ -130,11 +133,13 @@ func pipelineFromTag(hook *pushHook) *model.Pipeline {
 	ref := strings.TrimPrefix(hook.Ref, "refs/tags/")
 
 	return &model.Pipeline{
-		Event:     model.EventTag,
-		Commit:    hook.Sha,
-		Ref:       fmt.Sprintf("refs/tags/%s", ref),
-		ForgeURL:  fmt.Sprintf("%s/src/tag/%s", hook.Repo.HTMLURL, ref),
-		Message:   fmt.Sprintf("created tag %s", ref),
+		Event:    model.EventTag,
+		Commit:   hook.Sha,
+		Ref:      fmt.Sprintf("refs/tags/%s", ref),
+		ForgeURL: fmt.Sprintf("%s/src/tag/%s", hook.Repo.HTMLURL, ref),
+		Title:    fmt.Sprintf("created tag %s", ref),
+		// TODO: get tag message and title via webhook (gitea change needed)
+		Message:   "", // if empty api will be asked
 		Avatar:    avatar,
 		Author:    hook.Sender.UserName,
 		Sender:    hook.Sender.UserName,
@@ -161,12 +166,12 @@ func pipelineFromPullRequest(hook *pullRequestHook) *model.Pipeline {
 		ForgeURL: hook.PullRequest.HTMLURL,
 		Ref:      fmt.Sprintf("refs/pull/%d/head", hook.Number),
 		Branch:   hook.PullRequest.Base.Ref,
-		Message:  hook.PullRequest.Title,
+		Title:    hook.PullRequest.Title,
+		Message:  hook.PullRequest.Body,
 		Author:   hook.PullRequest.Poster.UserName,
 		Avatar:   avatar,
 		Sender:   hook.Sender.UserName,
 		Email:    hook.Sender.Email,
-		Title:    hook.PullRequest.Title,
 		Refspec: fmt.Sprintf("%s:%s",
 			hook.PullRequest.Head.Ref,
 			hook.PullRequest.Base.Ref,
@@ -188,7 +193,8 @@ func pipelineFromRelease(hook *releaseHook) *model.Pipeline {
 		Ref:          fmt.Sprintf("refs/tags/%s", hook.Release.TagName),
 		ForgeURL:     hook.Release.HTMLURL,
 		Branch:       hook.Release.Target,
-		Message:      fmt.Sprintf("created release %s", hook.Release.Title),
+		Title:        fmt.Sprintf("created release %s", hook.Release.Title),
+		Message:      hook.Release.Note,
 		Avatar:       avatar,
 		Author:       hook.Sender.UserName,
 		Sender:       hook.Sender.UserName,

server/forge/gitea/helper_test.go

@@ -27,7 +27,7 @@ import (
 	"go.woodpecker-ci.org/woodpecker/v2/shared/utils"
 )
 
-func Test_parse(t *testing.T) {
+func TestGiteaHelper(t *testing.T) {
 	g := goblin.Goblin(t)
 	g.Describe("Gitea", func() {
 		g.It("Should parse push hook payload", func() {
@@ -126,7 +126,7 @@ func Test_parse(t *testing.T) {
 			g.Assert(pipeline.Ref).Equal("refs/tags/v1.0.0")
 			g.Assert(pipeline.Branch).Equal("")
 			g.Assert(pipeline.ForgeURL).Equal("http://gitea.golang.org/gordon/hello-world/src/tag/v1.0.0")
-			g.Assert(pipeline.Message).Equal("created tag v1.0.0")
+			g.Assert(pipeline.Title).Equal("created tag v1.0.0")
 		})
 
 		g.It("Should return a Pipeline struct from a pull_request hook", func() {
@@ -139,7 +139,8 @@ func Test_parse(t *testing.T) {
 			g.Assert(pipeline.ForgeURL).Equal("http://gitea.golang.org/gordon/hello-world/pull/1")
 			g.Assert(pipeline.Branch).Equal("main")
 			g.Assert(pipeline.Refspec).Equal("feature/changes:main")
-			g.Assert(pipeline.Message).Equal(hook.PullRequest.Title)
+			g.Assert(pipeline.Title).Equal("Update the README with new information")
+			g.Assert(pipeline.Message).Equal("please merge")
 			g.Assert(pipeline.Avatar).Equal("http://1.gravatar.com/avatar/8c58a0be77ee441bb8f8595b7f1b4e87")
 			g.Assert(pipeline.Author).Equal(hook.PullRequest.Poster.UserName)
 		})

server/forge/gitea/parse_test.go

@@ -70,6 +70,7 @@ func TestGiteaParser(t *testing.T) {
 				Commit:       "28c3613ae62640216bea5e7dc71aa65356e4298b",
 				Branch:       "fdsafdsa",
 				Ref:          "refs/heads/fdsafdsa",
+				Title:        "Delete '.woodpecker/.check.yml'",
 				Message:      "Delete '.woodpecker/.check.yml'\n",
 				Sender:       "6543",
 				Avatar:       "https://codeberg.org/avatars/09a234c768cb9bca78f6b2f82d6af173",
@@ -105,6 +106,7 @@ func TestGiteaParser(t *testing.T) {
 				Commit:       "ef98532add3b2feb7a137426bba1248724367df5",
 				Branch:       "main",
 				Ref:          "refs/heads/main",
+				Title:        "bump",
 				Message:      "bump\n",
 				Sender:       "gordon",
 				Avatar:       "http://1.gravatar.com/avatar/8c58a0be77ee441bb8f8595b7f1b4e87",
@@ -140,6 +142,7 @@ func TestGiteaParser(t *testing.T) {
 				Commit:       "29be01c073851cf0db0c6a466e396b725a670453",
 				Branch:       "main",
 				Ref:          "refs/heads/main",
+				Title:        "add some text",
 				Message:      "add some text\n",
 				Sender:       "test-user",
 				Avatar:       "http://127.0.0.1:3000/avatars/dd46a756faad4727fb679320751f6dea",
@@ -175,7 +178,8 @@ func TestGiteaParser(t *testing.T) {
 				Event:    "tag",
 				Commit:   "ef98532add3b2feb7a137426bba1248724367df5",
 				Ref:      "refs/tags/v1.0.0",
-				Message:  "created tag v1.0.0",
+				Title:    "created tag v1.0.0",
+				Message:  "",
 				Sender:   "gordon",
 				Avatar:   "https://secure.gravatar.com/avatar/8c58a0be77ee441bb8f8595b7f1b4e87",
 				Email:    "[email protected]",
@@ -212,7 +216,7 @@ func TestGiteaParser(t *testing.T) {
 				Ref:               "refs/pull/1/head",
 				Refspec:           "feature/changes:main",
 				Title:             "Update the README with new information",
-				Message:           "Update the README with new information",
+				Message:           "please merge",
 				Sender:            "gordon",
 				Avatar:            "http://1.gravatar.com/avatar/8c58a0be77ee441bb8f8595b7f1b4e87",
 				Email:             "[email protected]",
@@ -251,7 +255,7 @@ func TestGiteaParser(t *testing.T) {
 				Ref:      "refs/pull/2/head",
 				Refspec:  "test-patch-1:main",
 				Title:    "New Pull",
-				Message:  "New Pull",
+				Message:  "create an awesome pull",
 				Sender:   "test",
 				Avatar:   "http://127.0.0.1:3000/avatars/dd46a756faad4727fb679320751f6dea",
 				Email:    "[email protected]",
@@ -292,7 +296,7 @@ func TestGiteaParser(t *testing.T) {
 				Ref:               "refs/pull/1/head",
 				Refspec:           "anbraten-patch-1:main",
 				Title:             "Adjust file",
-				Message:           "Adjust file",
+				Message:           "",
 				Sender:            "anbraten",
 				Avatar:            "https://seccdn.libravatar.org/avatar/fc9b6fe77c6b732a02925a62a81f05a0?d=identicon",
 				Email:             "[email protected]",
@@ -330,7 +334,7 @@ func TestGiteaParser(t *testing.T) {
 				Ref:               "refs/pull/1/head",
 				Refspec:           "anbraten-patch-1:main",
 				Title:             "Adjust file",
-				Message:           "Adjust file",
+				Message:           "",
 				Sender:            "anbraten",
 				Avatar:            "https://seccdn.libravatar.org/avatar/fc9b6fe77c6b732a02925a62a81f05a0?d=identicon",
 				Email:             "[email protected]",
@@ -366,7 +370,8 @@ func TestGiteaParser(t *testing.T) {
 				Event:    "release",
 				Branch:   "main",
 				Ref:      "refs/tags/0.0.5",
-				Message:  "created release Version 0.0.5",
+				Title:    "created release Version 0.0.5",
+				Message:  "release notes",
 				Sender:   "anbraten",
 				Avatar:   "https://git.xxx/user/avatar/anbraten/-1",
 				Email:    "[email protected]",