MirrorHub/forgejo
0
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-11-10 20:01:24 +01:00
Code Issues Projects Releases Packages Wiki Activity

introduce FI Factory

Browse source
This commit is contained in:
Michael Jerger 2024-01-13 16:08:12 +01:00
parent dabd773f6b
commit ca5eaa8c6b
2 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
models/forgefed/federationinfo.go
View file

@ -21,6 +21,18 @@ type FederationInfo struct {
Updated timeutil.TimeStamp `xorm:"updated"`
}
// Factory function for PersonID. Created struct is asserted to be valid
func NewFederationInfo(nodeInfo NodeInfo, hostFqdn string) (FederationInfo, error) {
result := FederationInfo{
HostFqdn: hostFqdn,
NodeInfo: nodeInfo,
}
if valid, err := validation.IsValid(result); !valid {
return FederationInfo{}, err
}
return result, nil
}
// Validate collects error strings in a slice and returns this
func (info FederationInfo) Validate() []string {
var result []string

13
routers/api/v1/activitypub/repository.go
View file

@ -1,11 +1,8 @@
// Copyright 2023 The forgejo Authors. All rights reserved.
// Copyright 2023, 2024 The forgejo Authors. All rights reserved.
// SPDX-License-Identifier: MIT
package activitypub
// ToDo: Fix linting
// ToDo: Maybe do a request for the node info
// Then maybe save the node info in a DB table - this could be useful for validation
import (
"fmt"
"net/http"
@ -231,11 +228,9 @@ func createFederationInfo(ctx *context.APIContext, actorID forgefed.ActorID) (fo
if err != nil {
return forgefed.FederationInfo{}, err
}
// TODO: introduce a NewFederationInfo factory method here.
// it should convert host to lower-case.
result := forgefed.FederationInfo{
HostFqdn: actorID.Host,
NodeInfo: nodeInfo,
result, err := forgefed.NewFederationInfo(nodeInfo, actorID.Host)
if err != nil {
return forgefed.FederationInfo{}, err
}
err = forgefed.CreateFederationInfo(ctx, result)
if err != nil {