Mirrors/mailfull-go
1
0
Fork 0
mirror of https://github.com/directorz/mailfull-go.git synced 2025-12-17 17:47:04 +00:00
Code Issues Releases Wiki Activity

Merge pull request #41 from directorz/feature/fix_removed_user

Browse Source 
Feature/fix removed user
This commit is contained in:
teru
2018-03-16 12:17:15 +09:00
committed by GitHub
parent 067c8f6903 ac6a8526b1
commit ad18a41b64
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
user.go
View File

@@ -100,6 +100,9 @@ func (r *Repository) Users(domainName string) ([]*User, error) {
forwards, err := r.userForwards(domainName, name) forwards, err := r.userForwards(domainName, name)
if err != nil { if err != nil {
if err == ErrInvalidUserName {
continue
}
return nil, err return nil, err
} }

8
valid.go
View File

@@ -33,20 +33,20 @@ func validAliasDomainTarget(target string) bool {
// validUserName returns true if the input is correct format. // validUserName returns true if the input is correct format.
func validUserName(name string) bool { func validUserName(name string) bool {
return regexp.MustCompile(`^[^\s@]+$`).MatchString(name) return regexp.MustCompile(`^[^\.\s@][^\s@]+$`).MatchString(name)
} }
// validAliasUserName returns true if the input is correct format. // validAliasUserName returns true if the input is correct format.
func validAliasUserName(name string) bool { func validAliasUserName(name string) bool {
return regexp.MustCompile(`^[^\s@]+$`).MatchString(name) return regexp.MustCompile(`^[^\.\s@][^\s@]+$`).MatchString(name)
} }
// validAliasUserTarget returns true if the input is correct format. // validAliasUserTarget returns true if the input is correct format.
func validAliasUserTarget(target string) bool { func validAliasUserTarget(target string) bool {
return regexp.MustCompile(`^[^\s@]+@([A-Za-z0-9\-]+\.)*[A-Za-z]+$`).MatchString(target) return regexp.MustCompile(`^[^\.\s@][^\s@]+@([A-Za-z0-9\-]+\.)*[A-Za-z]+$`).MatchString(target)
} }
// validCatchAllUserName returns true if the input is correct format. // validCatchAllUserName returns true if the input is correct format.
func validCatchAllUserName(name string) bool { func validCatchAllUserName(name string) bool {
return regexp.MustCompile(`^[^\s@]+$`).MatchString(name) return regexp.MustCompile(`^[^\.\s@][^\s@]+$`).MatchString(name)
} }