Merge pull request #24 from appleboy/match

Support MATCH_EMAIL flag
This commit is contained in:
Bo-Yi Wu 2016-11-09 14:36:56 +08:00 committed by GitHub
commit 9f288d99d9
4 changed files with 76 additions and 62 deletions

View File

@ -66,6 +66,7 @@ docker run --rm \
-e PLUGIN_VENUE=24.9163213,121.1424972,title,address \ -e PLUGIN_VENUE=24.9163213,121.1424972,title,address \
-e PLUGIN_VIDEO=tests/video.mp4 \ -e PLUGIN_VIDEO=tests/video.mp4 \
-e PLUGIN_DEBUG=true \ -e PLUGIN_DEBUG=true \
-e PLUGIN_ONLY_MATCH_EMAIL=false \
-e PLUGIN_FORMAT=markdown \ -e PLUGIN_FORMAT=markdown \
-e DRONE_REPO_OWNER=appleboy \ -e DRONE_REPO_OWNER=appleboy \
-e DRONE_REPO_NAME=go-hello \ -e DRONE_REPO_NAME=go-hello \

View File

@ -77,6 +77,11 @@ func main() {
Usage: "enable debug message", Usage: "enable debug message",
EnvVar: "PLUGIN_DEBUG", EnvVar: "PLUGIN_DEBUG",
}, },
cli.BoolFlag{
Name: "match.email",
Usage: "send message when only match email",
EnvVar: "PLUGIN_ONLY_MATCH_EMAIL",
},
cli.StringFlag{ cli.StringFlag{
Name: "format", Name: "format",
Value: "markdown", Value: "markdown",
@ -177,6 +182,7 @@ func run(c *cli.Context) error {
Config: Config{ Config: Config{
Token: c.String("token"), Token: c.String("token"),
Debug: c.Bool("debug"), Debug: c.Bool("debug"),
MatchEmail: c.Bool("match.email"),
To: c.StringSlice("to"), To: c.StringSlice("to"),
Message: c.StringSlice("message"), Message: c.StringSlice("message"),
Photo: c.StringSlice("photo"), Photo: c.StringSlice("photo"),

View File

@ -38,6 +38,7 @@ type (
Config struct { Config struct {
Token string Token string
Debug bool Debug bool
MatchEmail bool
To []string To []string
Message []string Message []string
Photo []string Photo []string
@ -135,22 +136,43 @@ func convertLocation(value string) (Location, bool) {
}, false }, false
} }
func parseTo(value, authorEmail string) (int64, bool) { func parseTo(to []string, authorEmail string, matchEmail bool) []int64 {
ids := trimElement(strings.Split(value, ":")) var emails []int64
var ids []int64
attachEmail := true
if len(ids) > 1 { for _, value := range to {
if email := ids[1]; email != authorEmail { idArray := trimElement(strings.Split(value, ":"))
log.Println("email not match")
return int64(0), false
}
}
id, err := strconv.ParseInt(ids[0], 10, 64) // check id
id, err := strconv.ParseInt(idArray[0], 10, 64)
if err != nil { if err != nil {
return int64(0), false continue
} }
return id, true // check match author email
if len(idArray) > 1 {
if email := idArray[1]; email != authorEmail {
continue
}
emails = append(emails, id)
attachEmail = false
continue
}
ids = append(ids, id)
}
if matchEmail == true && attachEmail == false {
return emails
}
for _, value := range emails {
ids = append(ids, value)
}
return ids
} }
// Exec executes the plugin. // Exec executes the plugin.
@ -179,6 +201,7 @@ func (p Plugin) Exec() error {
bot.Debug = p.Config.Debug bot.Debug = p.Config.Debug
ids := parseTo(p.Config.To, p.Build.Email, p.Config.MatchEmail)
photos := fileExist(trimElement(p.Config.Photo)) photos := fileExist(trimElement(p.Config.Photo))
documents := fileExist(trimElement(p.Config.Document)) documents := fileExist(trimElement(p.Config.Document))
stickers := fileExist(trimElement(p.Config.Sticker)) stickers := fileExist(trimElement(p.Config.Sticker))
@ -189,12 +212,7 @@ func (p Plugin) Exec() error {
venues := trimElement(p.Config.Venue) venues := trimElement(p.Config.Venue)
// send message. // send message.
for _, to := range p.Config.To { for _, user := range ids {
user, enable := parseTo(to, p.Build.Email)
if !enable {
continue
}
for _, value := range trimElement(message) { for _, value := range trimElement(message) {
txt, err := template.RenderTrim(value, p) txt, err := template.RenderTrim(value, p)
if err != nil { if err != nil {

View File

@ -133,30 +133,19 @@ func TestTrimElement(t *testing.T) {
} }
func TestParseTo(t *testing.T) { func TestParseTo(t *testing.T) {
id, enable := parseTo("1234567890", "test@gmail.com") input := []string{"0", "1:1@gmail.com", "2:2@gmail.com", "3:3@gmail.com", "4", "5"}
assert.Equal(t, true, enable) ids := parseTo(input, "1@gmail.com", false)
assert.Equal(t, int64(1234567890), id) assert.Equal(t, []int64{0, 4, 5, 1}, ids)
id, enable = parseTo("1234567890:test2@gmail.com", "test@gmail.com") ids = parseTo(input, "1@gmail.com", true)
assert.Equal(t, []int64{1}, ids)
assert.Equal(t, false, enable) ids = parseTo(input, "a@gmail.com", false)
assert.Equal(t, int64(0), id) assert.Equal(t, []int64{0, 4, 5}, ids)
id, enable = parseTo("1234567890:test@gmail.com", "test@gmail.com") ids = parseTo(input, "a@gmail.com", true)
assert.Equal(t, []int64{0, 4, 5}, ids)
assert.Equal(t, true, enable)
assert.Equal(t, int64(1234567890), id)
id, enable = parseTo("測試:test@gmail.com", "test@gmail.com")
assert.Equal(t, false, enable)
assert.Equal(t, int64(0), id)
id, enable = parseTo("測試", "test@gmail.com")
assert.Equal(t, false, enable)
assert.Equal(t, int64(0), id)
} }
func TestCheckFileExist(t *testing.T) { func TestCheckFileExist(t *testing.T) {