kneesox/NAK_CVR_Mods
1
0
Fork 0
mirror of https://github.com/NotAKidoS/NAK_CVR_Mods.git synced 2026-02-08 18:06:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make work on Stable, Add response on claim fail

Browse source
This commit is contained in:
NotAKidoS 2024-12-08 16:54:19 -06:00
parent e7b2ad4c31
commit ef2be62605
15 changed files with 268 additions and 108 deletions
Download patch file Download diff file Expand all files Collapse all files

16
ShareBubbles/ShareBubbles/API/PedestalInfoBatchProcessor.cs
View file

@ -19,11 +19,11 @@ public enum PedestalType
/// </summary>
public static class PedestalInfoBatchProcessor
{
private static readonly Dictionary<PedestalType, Dictionary<string, TaskCompletionSource<PedestalInfoResponseButWithPublicationState>>> _pendingRequests
private static readonly Dictionary<PedestalType, Dictionary<string, TaskCompletionSource<PedestalInfoResponse_ButCorrect>>> _pendingRequests
= new()
{
{ PedestalType.Avatar, new Dictionary<string, TaskCompletionSource<PedestalInfoResponseButWithPublicationState>>() },
{ PedestalType.Prop, new Dictionary<string, TaskCompletionSource<PedestalInfoResponseButWithPublicationState>>() }
{ PedestalType.Avatar, new Dictionary<string, TaskCompletionSource<PedestalInfoResponse_ButCorrect>>() },
{ PedestalType.Prop, new Dictionary<string, TaskCompletionSource<PedestalInfoResponse_ButCorrect>>() }
};
private static readonly Dictionary<PedestalType, bool> _isBatchProcessing
@ -36,9 +36,9 @@ public static class PedestalInfoBatchProcessor
private static readonly object _lock = new();
private const float BATCH_DELAY = 2f;
public static Task<PedestalInfoResponseButWithPublicationState> QueuePedestalInfoRequest(PedestalType type, string contentId)
public static Task<PedestalInfoResponse_ButCorrect> QueuePedestalInfoRequest(PedestalType type, string contentId)
{
var tcs = new TaskCompletionSource<PedestalInfoResponseButWithPublicationState>();
var tcs = new TaskCompletionSource<PedestalInfoResponse_ButCorrect>();
lock (_lock)
{
@ -62,12 +62,12 @@ public static class PedestalInfoBatchProcessor
await Task.Delay(TimeSpan.FromSeconds(BATCH_DELAY));
List<string> contentIds;
Dictionary<string, TaskCompletionSource<PedestalInfoResponseButWithPublicationState>> requestBatch;
Dictionary<string, TaskCompletionSource<PedestalInfoResponse_ButCorrect>> requestBatch;
lock (_lock)
{
contentIds = _pendingRequests[type].Keys.ToList();
requestBatch = new Dictionary<string, TaskCompletionSource<PedestalInfoResponseButWithPublicationState>>(_pendingRequests[type]);
requestBatch = new Dictionary<string, TaskCompletionSource<PedestalInfoResponse_ButCorrect>>(_pendingRequests[type]);
_pendingRequests[type].Clear();
_isBatchProcessing[type] = false;
//ShareBubblesMod.Logger.Msg($"Processing {type} pedestal info batch with {contentIds.Count} items");
@ -82,7 +82,7 @@ public static class PedestalInfoBatchProcessor
_ => throw new ArgumentException($"Unsupported pedestal type: {type}")
};
var response = await ApiConnection.MakeRequest<IEnumerable<PedestalInfoResponseButWithPublicationState>>(operation, contentIds);
var response = await ApiConnection.MakeRequest<IEnumerable<PedestalInfoResponse_ButCorrect>>(operation, contentIds);
if (response?.Data != null)
{

13
ShareBubbles/ShareBubbles/API/Responses/PedestalInfoResponseButWithPublicationState.cs
View file

@ -1,13 +0,0 @@
using ABI_RC.Core.Networking.API.Responses;
namespace NAK.ShareBubbles.API.Responses;
/// Same as PedestalInfoResponse, but with an additional field for publication state, if you could not tell by the name.
/// TODO: actually waiting on luc to add Published to PedestalInfoResponse
[Serializable]
public class PedestalInfoResponseButWithPublicationState : UgcResponse
{
public UserDetails User { get; set; }
public bool Permitted { get; set; }
public bool Published { get; set; }
}

10
ShareBubbles/ShareBubbles/API/Responses/PedestalInfoResponse_ButCorrect.cs Normal file
View file

@ -0,0 +1,10 @@
using ABI_RC.Core.Networking.API.Responses;
namespace NAK.ShareBubbles.API.Responses;
[Serializable]
public class PedestalInfoResponse_ButCorrect : UgcResponse
{
public UserDetails User { get; set; }
public bool Published { get; set; } // Client mislabelled this as Permitted, but it's actually Published
}