mirrors/gotosocial
1
0
Fork 0
mirror of https://github.com/superseriousbusiness/gotosocial.git synced 2025-12-29 22:26:15 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

use bufio scanner

Browse source
This commit is contained in:
tobi 2025-01-07 18:48:01 +01:00
commit 6ea156cc7d
1 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

17
internal/subscriptions/domainperms.go
View file

@ -18,6 +18,7 @@
package subscriptions package subscriptions
import ( import (
"bufio"
"context" "context"
"encoding/csv" "encoding/csv"
"encoding/json" "encoding/json"
@ -687,21 +688,25 @@ func permsFromPlain(
permType gtsmodel.DomainPermissionType, permType gtsmodel.DomainPermissionType,
body io.ReadCloser, body io.ReadCloser,
) ([]gtsmodel.DomainPermission, error) { ) ([]gtsmodel.DomainPermission, error) {
// Read body into memory as bytes. // Scan + split by line.
b, err := io.ReadAll(body) sc := bufio.NewScanner(body)
// Read into domains
// line by line.
var domains []string
for sc.Scan() {
domains = append(domains, sc.Text())
}
// Whatever happened, we're // Whatever happened, we're
// done with the body now. // done with the body now.
body.Close() body.Close()
// Check if error reading body. // Check if error reading body.
if err != nil { if err := sc.Err(); err != nil {
return nil, gtserror.NewfAt(3, "error decoding into plain: %w", err) return nil, gtserror.NewfAt(3, "error decoding into plain: %w", err)
} }
// Coerce to newline-separated list of domains.
domains := strings.Split(string(b), "\n")
// Convert raw domains to permissions. // Convert raw domains to permissions.
perms := make([]gtsmodel.DomainPermission, 0, len(domains)) perms := make([]gtsmodel.DomainPermission, 0, len(domains))
for _, domainRaw := range domains { for _, domainRaw := range domains {