mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2025-09-15 18:56:59 +00:00
chore(dependency): upgrade gof3 v3.10.6 (#7258)
cherry-pick from the forgefriends fork, except for the F3 API for mirroring which is a functional change that is not safe enough to introduce in Forgejo.
Refs: 3aad1f4e64
---
The motivation is to keep up-to-date with the rather large refactor of gof3. The changes are syntactic only and test is provided by the compliance suite.
Co-authored-by: limiting-factor <limiting-factor@posteo.com>
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/7258
Reviewed-by: Michael Kriese <michael.kriese@gmx.de>
This commit is contained in:
parent
30b438ff84
commit
316682f17b
26 changed files with 84 additions and 60 deletions
|
@ -11,6 +11,8 @@ import (
|
|||
user_model "code.gitea.io/gitea/models/user"
|
||||
|
||||
"code.forgejo.org/f3/gof3/v3/f3"
|
||||
f3_id "code.forgejo.org/f3/gof3/v3/id"
|
||||
f3_kind "code.forgejo.org/f3/gof3/v3/kind"
|
||||
f3_tree "code.forgejo.org/f3/gof3/v3/tree/f3"
|
||||
"code.forgejo.org/f3/gof3/v3/tree/generic"
|
||||
"code.forgejo.org/f3/gof3/v3/util"
|
||||
|
@ -19,16 +21,16 @@ import (
|
|||
type forge struct {
|
||||
generic.NullDriver
|
||||
|
||||
ownersKind map[string]generic.Kind
|
||||
ownersKind map[string]f3_kind.Kind
|
||||
}
|
||||
|
||||
func newForge() generic.NodeDriverInterface {
|
||||
return &forge{
|
||||
ownersKind: make(map[string]generic.Kind),
|
||||
ownersKind: make(map[string]f3_kind.Kind),
|
||||
}
|
||||
}
|
||||
|
||||
func (o *forge) getOwnersKind(ctx context.Context, id string) generic.Kind {
|
||||
func (o *forge) getOwnersKind(ctx context.Context, id string) f3_kind.Kind {
|
||||
kind, ok := o.ownersKind[id]
|
||||
if !ok {
|
||||
user, err := user_model.GetUserByID(ctx, util.ParseInt(id))
|
||||
|
@ -50,7 +52,7 @@ func (o *forge) getOwnersPath(ctx context.Context, id string) f3_tree.Path {
|
|||
|
||||
func (o *forge) Equals(context.Context, generic.NodeInterface) bool { return true }
|
||||
func (o *forge) Get(context.Context) bool { return true }
|
||||
func (o *forge) Put(context.Context) generic.NodeID { return generic.NewNodeID("forge") }
|
||||
func (o *forge) Put(context.Context) f3_id.NodeID { return f3_id.NewNodeID("forge") }
|
||||
func (o *forge) Patch(context.Context) {}
|
||||
func (o *forge) Delete(context.Context) {}
|
||||
func (o *forge) NewFormat() f3.Interface { return &f3.Forge{} }
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue