notfire/Iceshrimp.NET
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[backend] only use MetaService once and include admin contact email as well

Browse source
This commit is contained in:
blueb 2025-01-05 21:15:02 -05:00 • committed by Iceshrimp development
parent b64a8898aa
commit 48717745de
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Iceshrimp.Backend/Controllers/Federation/NodeInfoController.cs
View file

@ -4,6 +4,7 @@ using Iceshrimp.Backend.Controllers.Federation.Attributes;
using Iceshrimp.Backend.Controllers.Shared.Attributes; using Iceshrimp.Backend.Controllers.Shared.Attributes;
using Iceshrimp.Backend.Core.Configuration; using Iceshrimp.Backend.Core.Configuration;
using Iceshrimp.Backend.Core.Database; using Iceshrimp.Backend.Core.Database;
using Iceshrimp.Backend.Core.Extensions;
using Iceshrimp.Backend.Core.Federation.WebFinger; using Iceshrimp.Backend.Core.Federation.WebFinger;
using Iceshrimp.Backend.Core.Services; using Iceshrimp.Backend.Core.Services;
using Microsoft.AspNetCore.Cors; using Microsoft.AspNetCore.Cors;
@ -45,6 +46,10 @@ public class NodeInfoController(
var localPosts = await db.Notes.LongCountAsync(p => p.UserHost == null); var localPosts = await db.Notes.LongCountAsync(p => p.UserHost == null);
var maxUploadSize = storageConfig.Value.MaxUploadSizeBytes; var maxUploadSize = storageConfig.Value.MaxUploadSizeBytes;
var (instanceName, instanceDescription, adminContact) =
await meta.GetManyAsync(MetaEntity.InstanceName, MetaEntity.InstanceDescription,
MetaEntity.AdminContactEmail);
return new NodeInfoResponse return new NodeInfoResponse
{ {
Version = Request.Path.Value?.EndsWith("2.1") ?? false ? "2.1" : "2.0", Version = Request.Path.Value?.EndsWith("2.1") ?? false ? "2.1" : "2.0",
@ -76,9 +81,9 @@ public class NodeInfoController(
Metadata = new NodeInfoResponse.NodeInfoMetadata Metadata = new NodeInfoResponse.NodeInfoMetadata
{ {
//FIXME Implement members //FIXME Implement members
NodeName = await meta.GetAsync(MetaEntity.InstanceName), NodeName = instanceName,
NodeDescription = await meta.GetAsync(MetaEntity.InstanceDescription), NodeDescription = instanceDescription,
Maintainer = new NodeInfoResponse.Maintainer { Name = "todo", Email = "todo" }, Maintainer = new NodeInfoResponse.Maintainer { Name = "todo", Email = adminContact },
Languages = [], Languages = [],
TosUrl = "todo", TosUrl = "todo",
RepositoryUrl = new Uri(Constants.RepositoryUrl), RepositoryUrl = new Uri(Constants.RepositoryUrl),