mirror of
https://github.com/superseriousbusiness/gotosocial.git
synced 2025-12-30 07:56:14 -06:00
rename function, strip port from domain validation
This commit is contained in:
parent
6c9a3e4a56
commit
8db867b6df
10 changed files with 57 additions and 40 deletions
|
|
@ -627,7 +627,7 @@ func permsFromCSV(
|
|||
|
||||
// Normalize + validate domain.
|
||||
domainRaw := record[*domainI]
|
||||
domain, err := util.PunifyValidate(domainRaw)
|
||||
domain, err := util.PunifySafely(domainRaw)
|
||||
if err != nil {
|
||||
l.Warnf("skipping invalid domain %s: %+v", domainRaw, err)
|
||||
continue
|
||||
|
|
@ -700,7 +700,7 @@ func permsFromJSON(
|
|||
|
||||
// Normalize + validate domain.
|
||||
domainRaw := apiPerm.Domain.Domain
|
||||
domain, err := util.PunifyValidate(domainRaw)
|
||||
domain, err := util.PunifySafely(domainRaw)
|
||||
if err != nil {
|
||||
l.Warnf("skipping invalid domain %s: %+v", domainRaw, err)
|
||||
continue
|
||||
|
|
@ -756,7 +756,7 @@ func permsFromPlain(
|
|||
for _, domainRaw := range domains {
|
||||
|
||||
// Normalize + validate domain as ASCII.
|
||||
domain, err := util.PunifyValidate(domainRaw)
|
||||
domain, err := util.PunifySafely(domainRaw)
|
||||
if err != nil {
|
||||
l.Warnf("skipping invalid domain %s: %+v", domainRaw, err)
|
||||
continue
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue