Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

✨ allow x.com (and fix validation) #684

Merged
merged 4 commits into from
Jun 18, 2024
Merged

✨ allow x.com (and fix validation) #684

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2cb25c7
:sparkles: allow x.com (and fix validation)
ras0q Jun 18, 2024
9994cac
:art: follow gosimple
ras0q Jun 18, 2024
6998444
:bug: fix subdomain parse
ras0q Jun 18, 2024
a4a50f7
:bug: fix regexp
ras0q Jun 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 17 additions & 12 deletions domain/user.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"database/sql"
"database/sql/driver"
"fmt"
"net/url"
"regexp"
"time"

Expand Down Expand Up @@ -121,19 +122,23 @@
}

func IsValidAccountURL(accountType AccountType, URL string) bool {
if _, err := url.Parse(URL); err != nil {
return false

Check warning on line 126 in domain/user.go

View check run for this annotation

Codecov / codecov/patch

domain/user.go#L125-L126 

Added lines #L125 - L126 were not covered by tests
}

var urlRegexp = map[AccountType]*regexp.Regexp{
HOMEPAGE: regexp.MustCompile("^https?://.+$"),
BLOG: regexp.MustCompile("^https?://.+$"),
TWITTER: regexp.MustCompile("^https://twitter.com/[a-zA-Z0-9_]+$"),
FACEBOOK: regexp.MustCompile("^https://www.facebook.com/[a-zA-Z0-9.]+$"),
PIXIV: regexp.MustCompile("^https://www.pixiv.net/users/[0-9]+"),
GITHUB: regexp.MustCompile("^https://github.com/[a-zA-Z0-9-]+$"),
QIITA: regexp.MustCompile("^https://qiita.com/[a-zA-Z0-9-_]+$"),
ZENN: regexp.MustCompile("^https://zenn.dev/[a-zA-Z0-9.]+$"),
ATCODER: regexp.MustCompile("^https://atcoder.jp/users/[a-zA-Z0-9_]+$"),
SOUNDCLOUD: regexp.MustCompile("^https://soundcloud.com/[a-z0-9-_]+$"),
HACKTHEBOX: regexp.MustCompile("^https://app.hackthebox.com/users/[a-zA-Z0-9]+$"),
CTFTIME: regexp.MustCompile("^https://ctftime.org/user/[0-9]+$"),
HOMEPAGE: regexp.MustCompile(`^https?://.+$`),
BLOG: regexp.MustCompile(`^https?://.+$`),
TWITTER: regexp.MustCompile(`^https://(twitter|x)\.com/[a-zA-Z0-9_]+$`),
FACEBOOK: regexp.MustCompile(`^https://www\.facebook\.com/[a-zA-Z0-9.]+$`),
PIXIV: regexp.MustCompile(`^https://www\.pixiv\.net/users/[0-9]+`),
GITHUB: regexp.MustCompile(`^https://github\.com/[a-zA-Z0-9-]+$`),
QIITA: regexp.MustCompile(`^https://qiita\.com/[a-zA-Z0-9-_]+$`),
ZENN: regexp.MustCompile(`^https://zenn\.dev/[a-zA-Z0-9.]+$`),
ATCODER: regexp.MustCompile(`^https://atcoder\.jp/users/[a-zA-Z0-9_]+$`),
SOUNDCLOUD: regexp.MustCompile(`^https://soundcloud\.com/[a-z0-9-_]+$`),
HACKTHEBOX: regexp.MustCompile(`^https://app.hackthebox\.com/users/[a-zA-Z0-9]+$`),
github-advanced-security[bot] marked this conversation as resolved.
Fixed Show resolved Hide resolved
CTFTIME: regexp.MustCompile(`^https://ctftime\.org/user/[0-9]+$`),

Check warning on line 141 in domain/user.go

View check run for this annotation

Codecov / codecov/patch

domain/user.go#L130-L141 

Added lines #L130 - L141 were not covered by tests
}

if r, ok := urlRegexp[accountType]; ok {
Expand Down
Loading