mirrors/gotosocial
1
0
Fork 0
mirror of https://github.com/superseriousbusiness/gotosocial.git synced 2025-10-29 13:32:25 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

[chore] update viper version (#2539)

Browse source 
* update viper version

* removes our last uses of the slice package

* fix tests
This commit is contained in:
kim 2024-01-17 14:54:30 +00:00 • committed by GitHub
commit 906639ad7e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
166 changed files with 11771 additions and 2782 deletions
Download patch file Download diff file Expand all files Collapse all files

14
internal/api/client/accounts/accountupdate.go
View file

@ -21,6 +21,7 @@ import (
"errors"
"fmt"
"net/http"
"slices"
"strconv"
"github.com/gin-gonic/gin"
@ -30,7 +31,6 @@ import (
apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util"
"github.com/superseriousbusiness/gotosocial/internal/gtserror"
"github.com/superseriousbusiness/gotosocial/internal/oauth"
"golang.org/x/exp/slices"
)
// AccountUpdateCredentialsPATCHHandler swagger:operation PATCH /api/v1/accounts/update_credentials accountUpdate
@ -283,8 +283,16 @@ func parseFieldsAttributesFromJSON(jsonFieldsAttributes *map[string]apimodel.Upd
}
// Sort slice by the key each field was submitted with.
slices.SortFunc(fieldsAttributes, func(a, b apimodel.UpdateField) bool {
return a.Key < b.Key
slices.SortFunc(fieldsAttributes, func(a, b apimodel.UpdateField) int {
const k = +1
switch {
case a.Key > b.Key:
return +k
case a.Key < b.Key:
return -k
default:
return 0
}
})
return &fieldsAttributes, nil

2
internal/api/client/streaming/stream.go
View file

@ -19,6 +19,7 @@ package streaming
import (
"context"
"slices"
"time"
"codeberg.org/gruf/go-kv"
@ -28,7 +29,6 @@ import (
"github.com/superseriousbusiness/gotosocial/internal/log"
"github.com/superseriousbusiness/gotosocial/internal/oauth"
streampkg "github.com/superseriousbusiness/gotosocial/internal/stream"
"golang.org/x/exp/slices"
"github.com/gin-gonic/gin"
"github.com/gorilla/websocket"