Moonlight-Panel/Moonlight
2
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #305 from Moonlight-Panel/FixSharedDomain

Browse Source 
Fixed shared domain loading
This commit is contained in:
Marcel Baumgartner
2023-09-06 17:19:51 +02:00
committed by GitHub
parent 07d7df8188 b8d30f0380
commit 7a992d71fb
1 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Moonlight/App/Services/DomainService.cs
View File

@@ -5,6 +5,7 @@ using CloudFlare.Client.Api.Parameters.Data;
using CloudFlare.Client.Api.Result; using CloudFlare.Client.Api.Result;
using CloudFlare.Client.Api.Zones; using CloudFlare.Client.Api.Zones;
using CloudFlare.Client.Api.Zones.DnsRecord; using CloudFlare.Client.Api.Zones.DnsRecord;
using CloudFlare.Client.Client.Zones;
using CloudFlare.Client.Enumerators; using CloudFlare.Client.Enumerators;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using Moonlight.App.Database.Entities; using Moonlight.App.Database.Entities;
@@ -82,12 +83,27 @@ public class DomainService
if (!ConfigService.Get().Moonlight.Domains.Enable) if (!ConfigService.Get().Moonlight.Domains.Enable)
return Array.Empty<Zone>(); return Array.Empty<Zone>();
var domains = GetData( var domains = new List<Zone>();
await Client.Zones.GetAsync(new()
var initialResponse = await Client.Zones.GetAsync();
domains.AddRange(GetData(initialResponse));
// Check if there are more pages
while (initialResponse.ResultInfo.Page < initialResponse.ResultInfo.TotalPage)
{ {
AccountId = AccountId // Get the next page of data
}) var nextPageResponse = await Client.Zones.GetAsync(
displayOptions: new()
{
Page = initialResponse.ResultInfo.Page + 1
}
); );
var nextPageZones = GetData(nextPageResponse);
domains.AddRange(nextPageZones);
initialResponse = nextPageResponse;
}
var sharedDomains = SharedDomainRepository.Get().ToArray(); var sharedDomains = SharedDomainRepository.Get().ToArray();