mirrors/gotosocial
1
0
Fork 0
mirror of https://github.com/superseriousbusiness/gotosocial.git synced 2025-12-23 11:16:14 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix the stuff

Browse source
This commit is contained in:
tobi 2025-04-04 18:04:21 +02:00
commit 30edcb5099
2 changed files with 40 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

28
internal/api/client/admin/domainpermissionsubscriptiontest_test.go
View file

@ -97,14 +97,21 @@ func (suite *DomainPermissionSubscriptionTestTestSuite) TestDomainPermissionSubs
suite.Equal(`[ suite.Equal(`[
{ {
"domain": "bumfaces.net", "domain": "bumfaces.net",
"public_comment": "big jerks" "public_comment": "big jerks",
"obfuscate": false,
"private_comment": ""
}, },
{ {
"domain": "peepee.poopoo", "domain": "peepee.poopoo",
"public_comment": "harassment" "public_comment": "harassment",
"obfuscate": false,
"private_comment": ""
}, },
{ {
"domain": "nothanks.com" "domain": "nothanks.com",
"public_comment": "",
"obfuscate": false,
"private_comment": ""
} }
]`, dst.String()) ]`, dst.String())
@ -177,13 +184,22 @@ func (suite *DomainPermissionSubscriptionTestTestSuite) TestDomainPermissionSubs
// Ensure expected. // Ensure expected.
suite.Equal(`[ suite.Equal(`[
{ {
"domain": "bumfaces.net" "domain": "bumfaces.net",
"public_comment": "",
"obfuscate": false,
"private_comment": ""
}, },
{ {
"domain": "peepee.poopoo" "domain": "peepee.poopoo",
"public_comment": "",
"obfuscate": false,
"private_comment": ""
}, },
{ {
"domain": "nothanks.com" "domain": "nothanks.com",
"public_comment": "",
"obfuscate": false,
"private_comment": ""
} }
]`, dst.String()) ]`, dst.String())

30
internal/subscriptions/domainperms.go
View file

@ -564,13 +564,13 @@ func permsFromCSV(
for i, columnHeader := range columnHeaders { for i, columnHeader := range columnHeaders {
// Remove leading # if present. // Remove leading # if present.
normal := strings.TrimLeft(columnHeader, "#") columnHeader = strings.TrimLeft(columnHeader, "#")
// Find index of each column header we // Find index of each column header we
// care about, ensuring no duplicates. // care about, ensuring no duplicates.
switch normal { switch {
case "domain": case columnHeader == "domain":
if domainI != nil { if domainI != nil {
body.Close() body.Close()
err := gtserror.NewfAt(3, "duplicate domain column header in csv: %+v", columnHeaders) err := gtserror.NewfAt(3, "duplicate domain column header in csv: %+v", columnHeaders)
@ -578,7 +578,7 @@ func permsFromCSV(
} }
domainI = &i domainI = &i
case "severity": case columnHeader == "severity":
if severityI != nil { if severityI != nil {
body.Close() body.Close()
err := gtserror.NewfAt(3, "duplicate severity column header in csv: %+v", columnHeaders) err := gtserror.NewfAt(3, "duplicate severity column header in csv: %+v", columnHeaders)
@ -586,15 +586,15 @@ func permsFromCSV(
} }
severityI = &i severityI = &i
case "public_comment": case columnHeader == "public_comment" || columnHeader == "comment":
if publicCommentI != nil { if publicCommentI != nil {
body.Close() body.Close()
err := gtserror.NewfAt(3, "duplicate public_comment column header in csv: %+v", columnHeaders) err := gtserror.NewfAt(3, "duplicate public_comment or comment column header in csv: %+v", columnHeaders)
return nil, err return nil, err
} }
publicCommentI = &i publicCommentI = &i
case "obfuscate": case columnHeader == "obfuscate":
if obfuscateI != nil { if obfuscateI != nil {
body.Close() body.Close()
err := gtserror.NewfAt(3, "duplicate obfuscate column header in csv: %+v", columnHeaders) err := gtserror.NewfAt(3, "duplicate obfuscate column header in csv: %+v", columnHeaders)
@ -674,15 +674,15 @@ func permsFromCSV(
perm.SetPublicComment(record[*publicCommentI]) perm.SetPublicComment(record[*publicCommentI])
} }
var obfuscate bool
if obfuscateI != nil { if obfuscateI != nil {
obfuscate, err := strconv.ParseBool(record[*obfuscateI]) obfuscate, err = strconv.ParseBool(record[*obfuscateI])
if err != nil { if err != nil {
l.Warnf("couldn't parse obfuscate field of record: %+v", record) l.Warnf("couldn't parse obfuscate field of record: %+v", record)
continue continue
} }
perm.SetObfuscate(&obfuscate)
} }
perm.SetObfuscate(&obfuscate)
// We're done. // We're done.
perms = append(perms, perm) perms = append(perms, perm)
@ -793,9 +793,15 @@ func permsFromPlain(
var perm gtsmodel.DomainPermission var perm gtsmodel.DomainPermission
switch permType { switch permType {
case gtsmodel.DomainPermissionBlock: case gtsmodel.DomainPermissionBlock:
perm = &gtsmodel.DomainBlock{Domain: domain} perm = &gtsmodel.DomainBlock{
Domain: domain,
Obfuscate: util.Ptr(false),
}
case gtsmodel.DomainPermissionAllow: case gtsmodel.DomainPermissionAllow:
perm = &gtsmodel.DomainAllow{Domain: domain} perm = &gtsmodel.DomainAllow{
Domain: domain,
Obfuscate: util.Ptr(false),
}
} }
// We're done. // We're done.