mirror of
https://github.com/woodpecker-ci/woodpecker.git
synced 2025-02-23 06:36:17 +00:00
get commit author email address from raw_author instead of author field for bitbucket
This commit is contained in:
parent
45f7dfff30
commit
25b887c059
1 changed files with 6 additions and 1 deletions
|
@ -4,6 +4,7 @@ import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"net/http"
|
"net/http"
|
||||||
"net/url"
|
"net/url"
|
||||||
|
"regexp"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/drone/drone/shared/httputil"
|
"github.com/drone/drone/shared/httputil"
|
||||||
|
@ -246,12 +247,16 @@ func (r *Bitbucket) ParseHook(req *http.Request) (*model.Hook, error) {
|
||||||
return nil, fmt.Errorf("Invalid Bitbucket post-commit Hook. Missing Repo or Commit data.")
|
return nil, fmt.Errorf("Invalid Bitbucket post-commit Hook. Missing Repo or Commit data.")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// bitbucket returns commit author email only in format "John Doe <john.doe@example.com>"
|
||||||
|
regexp, _ := regexp.Compile("<(.*)>")
|
||||||
|
email := regexp.FindStringSubmatch(hook.Commits[len(hook.Commits)-1].RawAuthor)[1]
|
||||||
|
|
||||||
return &model.Hook{
|
return &model.Hook{
|
||||||
Owner: hook.Repo.Owner,
|
Owner: hook.Repo.Owner,
|
||||||
Repo: hook.Repo.Name,
|
Repo: hook.Repo.Name,
|
||||||
Sha: hook.Commits[len(hook.Commits)-1].Hash,
|
Sha: hook.Commits[len(hook.Commits)-1].Hash,
|
||||||
Branch: hook.Commits[len(hook.Commits)-1].Branch,
|
Branch: hook.Commits[len(hook.Commits)-1].Branch,
|
||||||
Author: hook.Commits[len(hook.Commits)-1].Author,
|
Author: email,
|
||||||
Timestamp: time.Now().UTC().String(),
|
Timestamp: time.Now().UTC().String(),
|
||||||
Message: hook.Commits[len(hook.Commits)-1].Message,
|
Message: hook.Commits[len(hook.Commits)-1].Message,
|
||||||
}, nil
|
}, nil
|
||||||
|
|
Loading…
Reference in a new issue