lint fixes
This commit is contained in:
@@ -5,21 +5,24 @@ import (
|
||||
"strings"
|
||||
)
|
||||
|
||||
// MinSendCommandParts is minimal count of space-separated parts for !pm send command
|
||||
const MinSendCommandParts = 3
|
||||
|
||||
// ErrInvalidArgs returned when a command's arguments are invalid
|
||||
var ErrInvalidArgs = fmt.Errorf("invalid arguments")
|
||||
|
||||
// ParseSend parses "!pm send" command, returns to, subject, body, err
|
||||
func ParseSend(commandSlice []string) (string, string, string, error) {
|
||||
func ParseSend(commandSlice []string) (to, subject, body string, err error) {
|
||||
message := strings.Join(commandSlice, " ")
|
||||
lines := strings.Split(message, "\n")
|
||||
if len(lines) < 3 {
|
||||
if len(lines) < MinSendCommandParts {
|
||||
return "", "", "", ErrInvalidArgs
|
||||
}
|
||||
|
||||
commandSlice = strings.Split(lines[0], " ")
|
||||
to := commandSlice[1]
|
||||
subject := lines[1]
|
||||
body := strings.Join(lines[2:], "\n")
|
||||
to = commandSlice[1]
|
||||
subject = lines[1]
|
||||
body = strings.Join(lines[2:], "\n")
|
||||
|
||||
return to, subject, body, nil
|
||||
}
|
||||
|
||||
@@ -25,8 +25,7 @@ func Hostname(email string) string {
|
||||
}
|
||||
|
||||
// EmailParts parses email address into mailbox, subaddress, and hostname
|
||||
func EmailParts(email string) (string, string, string) {
|
||||
var mailbox, hostname string
|
||||
func EmailParts(email string) (mailbox, sub, hostname string) {
|
||||
address, err := emailaddress.Parse(email)
|
||||
if err == nil {
|
||||
mailbox = address.LocalPart
|
||||
@@ -44,7 +43,6 @@ func EmailParts(email string) (string, string, string) {
|
||||
}
|
||||
}
|
||||
|
||||
var sub string
|
||||
idx := strings.Index(mailbox, "+")
|
||||
if idx != -1 {
|
||||
sub = strings.ReplaceAll(mailbox[idx:], "+", "")
|
||||
@@ -54,7 +52,7 @@ func EmailParts(email string) (string, string, string) {
|
||||
}
|
||||
|
||||
// EmailsList returns human-readable list of mailbox's emails for all available domains
|
||||
func EmailsList(mailbox string, domain string) string {
|
||||
func EmailsList(mailbox, domain string) string {
|
||||
var msg strings.Builder
|
||||
domain = SanitizeDomain(domain)
|
||||
msg.WriteString(mailbox)
|
||||
|
||||
Reference in New Issue
Block a user