GameUser: Split Vita icon hash from PS3 icon hash

Refresh.GameServer/Database/GameDatabaseContext.Users.cs

@@ -100,12 +100,38 @@ public void UpdateUserData(GameUser user, SerializedUpdateData data, TokenGame g
 
             // ReSharper disable once InvertIf
             if (data.IconHash != null)
-                //PSP icons are special and use a GUID system separate from the mainline games,
-                //so we separate PSP icons to another field
-                if (game == TokenGame.LittleBigPlanetPSP)
-                    user.PspIconHash = data.IconHash;
-                else
-                    user.IconHash = data.IconHash;
+                switch (game)
+                {
+
+                    case TokenGame.LittleBigPlanet1:
+                    case TokenGame.LittleBigPlanet2:
+                    case TokenGame.LittleBigPlanet3:
+#if false // TODO: Enable this code once https://github.com/LittleBigRefresh/Refresh/issues/309 is resolved
+                        //If the icon is a remote asset, then it will work on Vita as well, so set the Vita hash 
+                        if (!data.IconHash.StartsWith('g'))
+                        {
+                            user.VitaIconHash = data.IconHash;
+                        }
+#endif
+                        user.IconHash = data.IconHash;
+                        break;
+                    case TokenGame.LittleBigPlanetVita:
+#if false // TODO: Enable this code once https://github.com/LittleBigRefresh/Refresh/issues/309 is resolved
+                        //If the icon is a remote asset, then it will work on PS3 as well, so set the PS3 hash to it as well
+                        if (!data.IconHash.StartsWith('g'))
+                        {
+                            user.IconHash = data.IconHash;
+                        }
+#endif
+                        user.VitaIconHash = data.IconHash;
+
+                        break;
+                    case TokenGame.LittleBigPlanetPSP:
+                        //PSP icons are special and use a GUID system separate from the mainline games,
+                        //so we separate PSP icons to another field
+                        user.PspIconHash = data.IconHash;
+                        break;
+                }
         });
     }
 

Refresh.GameServer/Database/GameDatabaseProvider.cs

@@ -32,7 +32,7 @@ protected GameDatabaseProvider(IDateTimeProvider time)
         this._time = time;
     }
 
-    protected override ulong SchemaVersion => 101;
+    protected override ulong SchemaVersion => 102;
 
     protected override string Filename => "refreshGameServer.realm";
 
@@ -168,6 +168,9 @@ protected override void Migrate(Migration migration, ulong oldVersion)
 
             // Version was bumped here to delete invalid favourite level relations
             if (oldVersion < 101) migration.NewRealm.RemoveRange(newUser.FavouriteLevelRelations.Where(r => r.Level == null));
+
+            // In version 102 we split the Vita icon hash from the PS3 icon hash
+            if (oldVersion < 102) newUser.VitaIconHash = "0";
         }
 
         IQueryable<dynamic>? oldLevels = migration.OldRealm.DynamicApi.All("GameLevel");

Refresh.GameServer/Endpoints/Game/DataTypes/Response/GameUserResponse.cs

@@ -20,7 +20,7 @@
     [XmlElement("location")] public required GameLocation Location { get; set; }
     [XmlElement("planets")] public required string PlanetsHash { get; set; }
 
     [XmlElement("npHandle")] public SerializedUserHandle Handle { get; set; }
     [XmlElement("commentCount")] public int CommentCount { get; set; }
     [XmlElement("commentsEnabled")] public bool CommentsEnabled { get; set; }
     [XmlElement("favouriteSlotCount")] public int FavouriteLevelCount { get; set; }
@@ -142,6 +142,9 @@
                 //Match all LBP Vita levels
                 this.UsedSlotsLBP2 = old.PublishedLevels.Count(x => x._GameVersion == (int)TokenGame.LittleBigPlanetVita);
                 this.FreeSlotsLBP2 = MaximumLevels - this.UsedSlotsLBP2;
+
+                //Apply Vita-specific icon hash
+                this.IconHash = old.VitaIconHash;
                 break;
             }
             case TokenGame.LittleBigPlanet1: {
@@ -154,28 +157,25 @@
                 //Match all LBP PSP levels
                 this.UsedSlots = old.PublishedLevels.Count(x => x._GameVersion == (int)TokenGame.LittleBigPlanetPSP);
                 this.FreeSlots = MaximumLevels - this.UsedSlots;
+
+                // Apply PSP-specific icon hash
+                this.IconHash = old.PspIconHash;
+
+                //Fill out PSP favourite users
+                List<GameUser> users = database.GetUsersFavouritedByUser(old, 20, 0).ToList();
+                this.FavouriteUsers = new SerializedMinimalFavouriteUserList(users.Select(SerializedUserHandle.FromUser).ToList(), users.Count);
+
+                //Fill out PSP favourite levels
+                List<GameMinimalLevelResponse> favouriteLevels = old.FavouriteLevelRelations
+                    .AsEnumerable()
+                    .Where(l => l.Level._GameVersion == (int)TokenGame.LittleBigPlanetPSP)
+                    .Select(f => GameMinimalLevelResponse.FromOld(f.Level)).ToList()!;
+                this.FavouriteLevels = new SerializedMinimalFavouriteLevelList(new SerializedMinimalLevelList(favouriteLevels, favouriteLevels.Count));
                 break;
             }
             case TokenGame.Website: break;
             default:
                 throw new ArgumentOutOfRangeException(nameof(gameVersion), gameVersion, null);
         }
-
-        if (gameVersion == TokenGame.LittleBigPlanetPSP)
-        {
-            // Apply PSP-specific icon hashes
-            this.IconHash = old.PspIconHash;
-
-            //Fill out PSP favourite users
-            List<GameUser> users = database.GetUsersFavouritedByUser(old, 20, 0).ToList();
-            this.FavouriteUsers = new SerializedMinimalFavouriteUserList(users.Select(SerializedUserHandle.FromUser).ToList(), users.Count);
-
-            //Fill out PSP favourite levels
-            List<GameMinimalLevelResponse> favouriteLevels = old.FavouriteLevelRelations
-                .AsEnumerable()
-                .Where(l => l.Level._GameVersion == (int)TokenGame.LittleBigPlanetPSP)
-                .Select(f => GameMinimalLevelResponse.FromOld(f.Level)).ToList()!;
-            this.FavouriteLevels = new SerializedMinimalFavouriteLevelList(new SerializedMinimalLevelList(favouriteLevels, favouriteLevels.Count));
-        }
     }
 }

Refresh.GameServer/Types/UserData/GameUser.cs

@@ -31,6 +31,13 @@ public partial class GameUser : IRealmObject, IRateLimitUser
     /// Hopefully this explains why this distinction is necessary.
     /// </remarks>
     public string PspIconHash { get; set; } = "0";
+    /// <summary>
+    /// The <see cref="IconHash"/>, except only for Vita clients.
+    /// </summary>
+    /// <remarks>
+    /// Vita GUIDs do not map to mainline GUIDs, so we dont want someone to set their Vita icon, and it map to an invalid GUID on PS3.
+    /// </remarks>
+    public string VitaIconHash { get; set; } = "0";
 
     public string Description { get; set; } = "";
     public GameLocation Location { get; set; } = GameLocation.Zero;