kneesox/NAK_CVR_Mods
1
0
Fork 0
mirror of https://github.com/NotAKidoS/NAK_CVR_Mods.git synced 2025-09-03 14:59:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[ShareBubbles] Fixed Public/Private text on bubble not being correct, Fixed bubble displaying as locked or not claimed despite being shared the content if it was private and not owned by you

Browse source
This commit is contained in:
NotAKidoS 2025-04-03 04:15:11 -05:00
parent e540628db1
commit 72b690365b
4 changed files with 13 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

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

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

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

@ -1,10 +0,0 @@
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
}

6
ShareBubbles/ShareBubbles/Implementation/AvatarBubbleImpl.cs
View file

@ -39,10 +39,8 @@ namespace NAK.ShareBubbles.Impl
Name = infoResponse.Name,
ImageUrl = infoResponse.ImageUrl,
AuthorId = infoResponse.User.Id,
IsPublic = infoResponse.Published,
// Permit access if Public, Owned, or (CANNOT DO PRIVATE & SHARED CAUSE API DOESNT GIVE)
IsPermitted = infoResponse.Published || infoResponse.User.Id == MetaPort.Instance.ownerId,
IsPublic = infoResponse.IsPublished,
IsPermitted = infoResponse.Permitted,
};
downloadedTexture = await ImageCache.GetImageAsync(details.ImageUrl);

6
ShareBubbles/ShareBubbles/Implementation/SpawnableBubbleImpl.cs
View file

@ -39,10 +39,8 @@ namespace NAK.ShareBubbles.Impl
Name = infoResponse.Name,
ImageUrl = infoResponse.ImageUrl,
AuthorId = infoResponse.User.Id,
IsPublic = infoResponse.Published,
// Permit access if Public, Owned, or (CANNOT DO PRIVATE & SHARED CAUSE API DOESNT GIVE)
IsPermitted = infoResponse.Published || infoResponse.User.Id == MetaPort.Instance.ownerId,
IsPublic = infoResponse.IsPublished,
IsPermitted = infoResponse.Permitted,
};
downloadedTexture = await ImageCache.GetImageAsync(details.ImageUrl);