Trim all spaces.

Author: KN4CK3R

services/webhook/telegram.go

@@ -68,9 +68,7 @@ func (t *TelegramPayload) Create(p *api.CreatePayload) (api.Payloader, error) {
 	title := fmt.Sprintf(`[<a href="%s">%s</a>] %s <a href="%s">%s</a> created`, p.Repo.HTMLURL, p.Repo.FullName, p.RefType,
 		p.Repo.HTMLURL+"/src/"+refName, refName)
 
-	return &TelegramPayload{
-		Message: title,
-	}, nil
+	return createPayload(title), nil
 }
 
 // Delete implements PayloadConvertor Delete method
@@ -80,18 +78,14 @@ func (t *TelegramPayload) Delete(p *api.DeletePayload) (api.Payloader, error) {
 	title := fmt.Sprintf(`[<a href="%s">%s</a>] %s <a href="%s">%s</a> deleted`, p.Repo.HTMLURL, p.Repo.FullName, p.RefType,
 		p.Repo.HTMLURL+"/src/"+refName, refName)
 
-	return &TelegramPayload{
-		Message: title,
-	}, nil
+	return createPayload(title), nil
 }
 
 // Fork implements PayloadConvertor Fork method
 func (t *TelegramPayload) Fork(p *api.ForkPayload) (api.Payloader, error) {
 	title := fmt.Sprintf(`%s is forked to <a href="%s">%s</a>`, p.Forkee.FullName, p.Repo.HTMLURL, p.Repo.FullName)
 
-	return &TelegramPayload{
-		Message: title,
-	}, nil
+	return createPayload(title), nil
 }
 
 // Push implements PayloadConvertor Push method
@@ -129,36 +123,28 @@ func (t *TelegramPayload) Push(p *api.PushPayload) (api.Payloader, error) {
 		}
 	}
 
-	return &TelegramPayload{
-		Message: title + "\n" + text,
-	}, nil
+	return createPayload(title + "\n" + text), nil
 }
 
 // Issue implements PayloadConvertor Issue method
 func (t *TelegramPayload) Issue(p *api.IssuePayload) (api.Payloader, error) {
 	text, _, attachmentText, _ := getIssuesPayloadInfo(p, htmlLinkFormatter, true)
 
-	return &TelegramPayload{
-		Message: strings.TrimSpace(text + "\n\n" + attachmentText),
-	}, nil
+	return createPayload(text + "\n\n" + attachmentText), nil
 }
 
 // IssueComment implements PayloadConvertor IssueComment method
 func (t *TelegramPayload) IssueComment(p *api.IssueCommentPayload) (api.Payloader, error) {
 	text, _, _ := getIssueCommentPayloadInfo(p, htmlLinkFormatter, true)
 
-	return &TelegramPayload{
-		Message: text + "\n" + p.Comment.Body,
-	}, nil
+	return createPayload(text + "\n" + p.Comment.Body), nil
 }
 
 // PullRequest implements PayloadConvertor PullRequest method
 func (t *TelegramPayload) PullRequest(p *api.PullRequestPayload) (api.Payloader, error) {
 	text, _, attachmentText, _ := getPullRequestPayloadInfo(p, htmlLinkFormatter, true)
 
-	return &TelegramPayload{
-		Message: text + "\n" + attachmentText,
-	}, nil
+	return createPayload(text + "\n" + attachmentText), nil
 }
 
 // Review implements PayloadConvertor Review method
@@ -173,12 +159,9 @@ func (t *TelegramPayload) Review(p *api.PullRequestPayload, event models.HookEve
 
 		text = fmt.Sprintf("[%s] Pull request review %s: #%d %s", p.Repository.FullName, action, p.Index, p.PullRequest.Title)
 		attachmentText = p.Review.Content
-
 	}
 
-	return &TelegramPayload{
-		Message: text + "\n" + attachmentText,
-	}, nil
+	return createPayload(text + "\n" + attachmentText), nil
 }
 
 // Repository implements PayloadConvertor Repository method
@@ -187,14 +170,10 @@ func (t *TelegramPayload) Repository(p *api.RepositoryPayload) (api.Payloader, e
 	switch p.Action {
 	case api.HookRepoCreated:
 		title = fmt.Sprintf(`[<a href="%s">%s</a>] Repository created`, p.Repository.HTMLURL, p.Repository.FullName)
-		return &TelegramPayload{
-			Message: title,
-		}, nil
+		return createPayload(title), nil
 	case api.HookRepoDeleted:
 		title = fmt.Sprintf("[%s] Repository deleted", p.Repository.FullName)
-		return &TelegramPayload{
-			Message: title,
-		}, nil
+		return createPayload(title), nil
 	}
 	return nil, nil
 }
@@ -203,12 +182,16 @@ func (t *TelegramPayload) Repository(p *api.RepositoryPayload) (api.Payloader, e
 func (t *TelegramPayload) Release(p *api.ReleasePayload) (api.Payloader, error) {
 	text, _ := getReleasePayloadInfo(p, htmlLinkFormatter, true)
 
-	return &TelegramPayload{
-		Message: text,
-	}, nil
+	return createPayload(text), nil
 }
 
 // GetTelegramPayload converts a telegram webhook into a TelegramPayload
 func GetTelegramPayload(p api.Payloader, event models.HookEventType, meta string) (api.Payloader, error) {
 	return convertPayloader(new(TelegramPayload), p, event)
 }
+
+func createPayload(message string) *TelegramPayload {
+	return &TelegramPayload{
+		Message: strings.TrimSpace(message),
+	}
+}