thepaperpilot/forgejo
1
0
Fork 0
Code Issues Pull requests Releases Activity Actions

[BRANDING] Update nodeinfo branding

Browse source 
- Change the values for the nodeinfo API, to use branded values.
- Resolves https://codeberg.org/forgejo/forgejo/issues/257

(cherry picked from commit 4608c57688)
(cherry picked from commit e837e8a529)
(cherry picked from commit 6601328d3c)
(cherry picked from commit c6be21d487)
(cherry picked from commit 5adc6ffee2)
(cherry picked from commit 2ff8d166ac)
(cherry picked from commit b6a90e7e5a)
(cherry picked from commit d1089e706c)

Conflicts:
	tests/integration/api_nodeinfo_test.go
(cherry picked from commit 7a29df737d)
(cherry picked from commit 3655a30c60)
(cherry picked from commit c90d611410)
(cherry picked from commit 0274bd8860)
This commit is contained in:
Gusted 2023-02-04 11:20:21 +01:00 committed by Earl Warren
parent 9394e55fdf
commit fdb786b71d
No known key found for this signature in database
GPG key ID: 0579CB2928A78A00
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
routers/api/v1/misc/nodeinfo.go
View file

@ -65,10 +65,10 @@ func NodeInfo(ctx *context.APIContext) {
nodeInfo := &structs.NodeInfo{ nodeInfo := &structs.NodeInfo{
Version: "2.1", Version: "2.1",
Software: structs.NodeInfoSoftware{ Software: structs.NodeInfoSoftware{
Name: "gitea", Name: "forgejo",
Version: setting.AppVer, Version: setting.AppVer,
Repository: "https://github.com/go-gitea/gitea.git", Repository: "https://codeberg.org/forgejo/forgejo.git",
Homepage: "https://gitea.io/", Homepage: "https://forgejo.org/",
}, },
Protocols: []string{"activitypub"}, Protocols: []string{"activitypub"},
Services: structs.NodeInfoServices{ Services: structs.NodeInfoServices{

2
tests/integration/api_nodeinfo_test.go
View file

@ -32,7 +32,7 @@ func TestNodeinfo(t *testing.T) {
var nodeinfo api.NodeInfo var nodeinfo api.NodeInfo
DecodeJSON(t, resp, &nodeinfo) DecodeJSON(t, resp, &nodeinfo)
assert.True(t, nodeinfo.OpenRegistrations) assert.True(t, nodeinfo.OpenRegistrations)
assert.Equal(t, "gitea", nodeinfo.Software.Name) assert.Equal(t, "forgejo", nodeinfo.Software.Name)
assert.Equal(t, 25, nodeinfo.Usage.Users.Total) assert.Equal(t, 25, nodeinfo.Usage.Users.Total)
assert.Equal(t, 18, nodeinfo.Usage.LocalPosts) assert.Equal(t, 18, nodeinfo.Usage.LocalPosts)
assert.Equal(t, 2, nodeinfo.Usage.LocalComments) assert.Equal(t, 2, nodeinfo.Usage.LocalComments)