FC: change avatar database building to be less aggressive, fix for bu…

…ild 1078 of VRChat
knah · Apr 19, 2021 · 333a140 · 333a140
1 parent d39d75f
commit 333a140
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 6 deletions.
diff --git a/FavCat/FavCat.csproj b/FavCat/FavCat.csproj
@@ -6,7 +6,7 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <Nullable>enable</Nullable>
     <ClearOutputDirectory>False</ClearOutputDirectory>
-    <AssemblyVersion>1.0.12.0</AssemblyVersion>
+    <AssemblyVersion>1.0.13.0</AssemblyVersion>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="LiteDB" Version="5.0.9" />

diff --git a/FavCat/FavCatMod.cs b/FavCat/FavCatMod.cs
@@ -10,6 +10,7 @@
 using FavCat.CustomLists;
 using FavCat.Database;
 using FavCat.Modules;
+using Harmony;
 using MelonLoader;
 using UIExpansionKit.API;
 using UnhollowerBaseLib;
@@ -20,7 +21,7 @@
 using Object = UnityEngine.Object;
 using ImageDownloaderClosure = ImageDownloader.__c__DisplayClass11_1;
 
-[assembly:MelonInfo(typeof(FavCatMod), "FavCat", "1.0.12", "knah", "https://github.com/knah/VRCMods")]
+[assembly:MelonInfo(typeof(FavCatMod), "FavCat", "1.0.13", "knah", "https://github.com/knah/VRCMods")]
 [assembly:MelonGame("VRChat", "VRChat")]
 
 namespace FavCat
@@ -57,6 +58,20 @@ public override void OnApplicationStart()
             Database.ImageHandler.TrimCache(FavCatSettings.MaxCacheSizeBytes).NoAwait();
 
             ExpansionKitApi.RegisterWaitConditionBeforeDecorating(WaitForInitDone());
+
+            foreach (var methodInfo in typeof(AvatarPedestal).GetMethods(BindingFlags.DeclaredOnly | BindingFlags.Instance | BindingFlags.Public).Where(it => it.Name.StartsWith("Method_Private_Void_ApiContainer_") && it.GetParameters().Length == 1))
+            {
+                Harmony.Patch(methodInfo, new HarmonyMethod(typeof(FavCatMod), nameof(AvatarPedestalPatch)));
+            }
+        }
+
+        private static void AvatarPedestalPatch(ApiContainer __0)
+        {
+            if (__0.Error != null || __0.Code != 200) return;
+            var model = __0.Model?.TryCast<ApiAvatar>();
+            if (model == null) return;
+
+            Database?.UpdateStoredAvatar(model);
         }
 
         internal CustomPickerList CreateCustomList(Transform parent)
@@ -238,8 +253,6 @@ public static bool ApiSnifferStatic(IntPtr @this, IntPtr dictionary, IntPtr some
 
                 var maybeUser = apiModel.TryCast<APIUser>();
                 if (maybeUser != null) FavCatMod.Database?.UpdateStoredPlayer(maybeUser);
-                var maybeAvatar = apiModel.TryCast<ApiAvatar>();
-                if (maybeAvatar != null) FavCatMod.Database?.UpdateStoredAvatar(maybeAvatar);
                 var maybeWorld = apiModel.TryCast<ApiWorld>();
                 if (maybeWorld != null) FavCatMod.Database?.UpdateStoredWorld(maybeWorld);
             }

diff --git a/FavCat/Modules/AvatarModule.cs b/FavCat/Modules/AvatarModule.cs
@@ -78,8 +78,9 @@ private void OnFavButtonClicked(StoredCategory storedCategory, string avatarId,
                     return;
 
                 // something showed an unknown avatar, request it before favoriting
-                new ApiAvatar { id = avatarId }.Fetch(new Action<ApiContainer>(_ =>
+                new ApiAvatar { id = avatarId }.Fetch(new Action<ApiContainer>(model =>
                 {
+                    FavCatMod.Database?.UpdateStoredAvatar(model.Model.Cast<ApiAvatar>());
                     MelonCoroutines.Start(ReFavAfterDelay(storedCategory, avatarId));
                 }));
                 return;
@@ -126,6 +127,8 @@ protected override void OnPickerSelected(IPickerElement model)
                 if (Imports.IsDebugMode())
                     MelonLogger.Log($"Done an API request for {model.Id}");
 
+                FavCatMod.Database?.UpdateStoredAvatar(avatar);
+
                 var canUse = avatar.releaseStatus == "public" || avatar.authorId == APIUser.CurrentUser.id;
                 if (!canUse)
                 {

diff --git a/FavCat/ScanningReflectionCache.cs b/FavCat/ScanningReflectionCache.cs
@@ -75,7 +75,7 @@ public static void Refresh(this SimpleAvatarPedestal pedestal, ApiAvatar avatar)
                             var strings = XrefScanner.XrefScan(it)
                                 .Select(jt => jt.Type == XrefType.Global ? jt.ReadAsObject()?.ToString() : null)
                                 .Where(jt => jt != null).ToHashSet(); 
-                            return strings.Contains("Refreshing with : ") && strings.Contains("local");
+                            return strings.Contains("Refreshing with : ");
                         });
 
                 ourPedestalRefreshDelegate =