From 8489bb91612b04c7bed8055b017c72a238b5081f Mon Sep 17 00:00:00 2001 From: Gusted Date: Sat, 4 Feb 2023 11:20:21 +0100 Subject: [PATCH] [BRANDING] Update nodeinfo branding - Change the values for the nodeinfo API, to use branded values. - Resolves https://codeberg.org/forgejo/forgejo/issues/257 (cherry picked from commit 4608c57688d8b12dbc265dd21bfe7cd269efb116) (cherry picked from commit e837e8a52943f803a40cd0151e24f7fe8edb11ec) (cherry picked from commit 6601328d3ce9b57dbaa768dd2d41295293ff94f9) (cherry picked from commit c6be21d4870e6b748a85f0da19bd4b717875b224) (cherry picked from commit 5adc6ffee2e6f1af72039747df809aa6ebd2198f) (cherry picked from commit 2ff8d166ac1e56ab7a349d70f875bd2ae9763418) (cherry picked from commit b6a90e7e5af0e998cbbf1fc1edb901ae31090999) (cherry picked from commit d1089e706cda009a6a23462adf498fd24a609b0a) Conflicts: tests/integration/api_nodeinfo_test.go (cherry picked from commit 7a29df737d979abed4d37f084e3a92ee788d2c6e) (cherry picked from commit 3655a30c60229167bc007e139d0461a5648741d5) (cherry picked from commit c90d61141016ffbbaaa6b4f4657dacf5446f30c0) (cherry picked from commit 0274bd8860bd00de628fba990e42bf7385ddf5b9) (cherry picked from commit fdb786b71decd1c968f7c473c94463140f192fc3) (cherry picked from commit 4f08f100a19886210b89d1cacfd09e6db0e48fb7) (cherry picked from commit 56a27118227521fae93e052bb77265fb10c6dcf8) (cherry picked from commit 3b2cfa452df0d2651a75c5e3fcd442c38acff109) (cherry picked from commit 773ddcf956a897bbaa75aff3087f8a64b254239c) (cherry picked from commit fe8321ed4e9dcf0df2dffb64b0245ec1ae8f075d) (cherry picked from commit a94833643b6796000a69c7ff4dfbc0b5df98b0f4) (cherry picked from commit 3fdbda7639f0690b1dc8b046a9b1979571714d41) (cherry picked from commit 7bc63d2cd3144d00cbc9429297b994382140bd5d) (cherry picked from commit a36400d9cf4392573d8bd13ded54a4c5689dd541) (cherry picked from commit 2535ab42016132c2ee7882d3eb5eb42c00ed7e63) (cherry picked from commit 692e72f4f64b4a0251ac7ac99a268b531d73c6fc) (cherry picked from commit 265021f3e9f327da96df695f90d6e9d0a23dd824) (cherry picked from commit bc833125d6b0a3c7b0fc117e3bb081cb9ec6f02c) (cherry picked from commit f1f9f881559c4117a547afaa379bcd0c26afb1aa) (cherry picked from commit 6076461ad7a77e77ecbd9963689435496d1852e6) (cherry picked from commit cd1da0aa2bac7270b3da2c5b76da2ea197a2f32d) (cherry picked from commit f4e9a251d80363360bbcd9280c68421e87ec1630) (cherry picked from commit fed4a421acf90bbce18c120ed08995f8f212bcf6) (cherry picked from commit cb3ef3211768a1725198aeb547937329a5f98b8e) (cherry picked from commit 232eec1945c0adcc61b6a4e855fcff0d346c3ab0) (cherry picked from commit 1390cd433a51f99c0fa5508a78f3160e5af8da69) (cherry picked from commit e1fed5dd7ffda2bbd1898ecb112146af16b94e37) (cherry picked from commit 5797dcbeb71406cf288354dea0efc40567743bfd) (cherry picked from commit 7591d86b439a437976b378d946ff73961bd3bd98) (cherry picked from commit 96eea095f672a36b88889c8825b753615ef62fd6) (cherry picked from commit 0a29bba0fb7feb982d2f27212404c6adba04a535) (cherry picked from commit 075da8a23764d2ad3939e20357a00cf20c3f62e2) (cherry picked from commit d2a3085458415d39cee9fd5060427c0783e7d13e) (cherry picked from commit dd39faa96c4367b91cec014404eca88ab370d00f) (cherry picked from commit 9f15e5cc4926b5a1f036a592a48ec940be0a8561) (cherry picked from commit 9a7e041380992d556e1dafd9eb3faa6f528b9f8a) (cherry picked from commit 798aaadeac23ce2d334544b4757e37c774a74c7e) --- routers/api/v1/misc/nodeinfo.go | 6 +++--- tests/integration/api_nodeinfo_test.go | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/routers/api/v1/misc/nodeinfo.go b/routers/api/v1/misc/nodeinfo.go index cc754f64a2..6045208f24 100644 --- a/routers/api/v1/misc/nodeinfo.go +++ b/routers/api/v1/misc/nodeinfo.go @@ -63,10 +63,10 @@ func NodeInfo(ctx *context.APIContext) { nodeInfo := &structs.NodeInfo{ Version: "2.1", Software: structs.NodeInfoSoftware{ - Name: "gitea", + Name: "forgejo", Version: setting.AppVer, - Repository: "https://github.com/go-gitea/gitea.git", - Homepage: "https://gitea.io/", + Repository: "https://codeberg.org/forgejo/forgejo.git", + Homepage: "https://forgejo.org/", }, Protocols: []string{"activitypub"}, Services: structs.NodeInfoServices{ diff --git a/tests/integration/api_nodeinfo_test.go b/tests/integration/api_nodeinfo_test.go index a727aea3ce..2b3972a726 100644 --- a/tests/integration/api_nodeinfo_test.go +++ b/tests/integration/api_nodeinfo_test.go @@ -31,7 +31,7 @@ func TestNodeinfo(t *testing.T) { var nodeinfo api.NodeInfo DecodeJSON(t, resp, &nodeinfo) 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, 20, nodeinfo.Usage.LocalPosts) assert.Equal(t, 3, nodeinfo.Usage.LocalComments)