Merge pull request #157 from TaloDev/develop

tudddorrr · web-flow · commit 8695fe297577 · 2025-09-24T21:36:51.000+01:00
Release 0.47.0
diff --git a/.github/workflows/claude-code-review.yml b/.github/workflows/claude-code-review.yml
@@ -54,5 +54,5 @@ jobs:
           
           # See https://github.com/anthropics/claude-code-action/blob/main/docs/usage.md
           # or https://docs.anthropic.com/en/docs/claude-code/sdk#command-line for available options
-          claude_args: '--allowed-tools "Bash(gh issue view:*),Bash(gh search:*),Bash(gh issue list:*),Bash(gh pr comment:*),Bash(gh pr diff:*),Bash(gh pr view:*),Bash(gh pr list:*)"'
+          claude_args: '--model sonnet --allowed-tools "Bash(gh issue view:*),Bash(gh search:*),Bash(gh issue list:*),Bash(gh pr comment:*),Bash(gh pr diff:*),Bash(gh pr view:*),Bash(gh pr list:*)"'
           use_sticky_comment: true
diff --git a/Assets/Talo Game Services/Talo/Runtime/APIs/BaseAPI.cs b/Assets/Talo Game Services/Talo/Runtime/APIs/BaseAPI.cs
@@ -9,7 +9,7 @@ namespace TaloGameServices
     public class BaseAPI
     {
         // automatically updated with a pre-commit hook
-        private const string ClientVersion = "0.46.0";
+        private const string ClientVersion = "0.47.0";
 
         protected string baseUrl;
 
diff --git a/Assets/Talo Game Services/Talo/Runtime/APIs/ChannelsAPI.cs b/Assets/Talo Game Services/Talo/Runtime/APIs/ChannelsAPI.cs
@@ -348,5 +348,34 @@ public async Task SetStorageProps(int channelId, params (string, string)[] propT
                 OnChannelStoragePropsFailedToSet?.Invoke(res.channel, res.failedProps);
             }
         }
+
+        public async Task<ChannelStorageProp[]> ListStorageProps(int channelId, string[] propKeys, bool bustCache = false)
+        {
+            Talo.IdentityCheck();
+
+            if (!bustCache)
+            {
+                return await _storageManager.ListProps(channelId, propKeys);
+            }
+
+            var queryParams = propKeys.Length > 0 
+                ? "?" + string.Join("&", propKeys.Select((key) => $"propKeys={key}"))
+                : "";
+            
+            var uri = new Uri($"{baseUrl}/{channelId}/storage/list{queryParams}");
+            var json = await Call(uri, "GET");
+
+            var res = JsonUtility.FromJson<ChannelStoragePropsListResponse>(json);
+            if (res.props != null)
+            {
+                foreach (var prop in res.props)
+                {
+                    _storageManager.UpsertProp(channelId, prop);
+                }
+                return res.props;
+            }
+
+            return Array.Empty<ChannelStorageProp>();
+        }
     }
 }
diff --git a/Assets/Talo Game Services/Talo/Runtime/APIs/LeaderboardsAPI.cs b/Assets/Talo Game Services/Talo/Runtime/APIs/LeaderboardsAPI.cs
@@ -13,6 +13,8 @@ public class GetEntriesOptions
         public bool includeArchived = false;
         public string propKey = "";
         public string propValue = "";
+        public string startDate = "";
+        public string endDate = "";
 
         public string ToQueryString()
         {
@@ -21,6 +23,8 @@ public string ToQueryString()
             if (includeArchived) query["withDeleted"] = "1";
             if (!string.IsNullOrEmpty(propKey)) query["propKey"] = propKey;
             if (!string.IsNullOrEmpty(propValue)) query["propValue"] = propValue;
+            if (!string.IsNullOrEmpty(startDate)) query["startDate"] = startDate;
+            if (!string.IsNullOrEmpty(endDate)) query["endDate"] = endDate;
 
             return string.Join("&", query.Select((param) => $"{param.Key}={param.Value}"));
         }
diff --git a/Assets/Talo Game Services/Talo/Runtime/Entities/LeaderboardEntry.cs b/Assets/Talo Game Services/Talo/Runtime/Entities/LeaderboardEntry.cs
@@ -1,16 +1,37 @@
 ﻿using System;
+using UnityEngine;
 
 namespace TaloGameServices
 {
+    public enum LeaderboardSortMode
+    {
+        DESC,
+        ASC
+    }
+
     [Serializable]
     public class LeaderboardEntry: EntityWithProps
     {
         public int id;
         public int position;
         public float score;
         public PlayerAlias playerAlias;
+        public string createdAt;
         public string updatedAt;
         public string deletedAt;
+        public string leaderboardName;
+        public string leaderboardInternalName;
+        [SerializeField] internal string leaderboardSortMode;
+        
+        public LeaderboardSortMode LeaderboardSortMode
+        {
+            get
+            {
+                return leaderboardSortMode.ToLower() == "asc"
+                    ? LeaderboardSortMode.ASC
+                    : LeaderboardSortMode.DESC;
+            }
+        }
 
         public override string ToString()
         {
diff --git a/Assets/Talo Game Services/Talo/Runtime/Responses/ChannelStoragePropsListResponse.cs b/Assets/Talo Game Services/Talo/Runtime/Responses/ChannelStoragePropsListResponse.cs
@@ -0,0 +1,10 @@
+using System;
+
+namespace TaloGameServices
+{
+    [Serializable]
+    public class ChannelStoragePropsListResponse
+    {
+        public ChannelStorageProp[] props;
+    }
+}
diff --git a/Assets/Talo Game Services/Talo/Runtime/Responses/ChannelStoragePropsListResponse.cs.meta b/Assets/Talo Game Services/Talo/Runtime/Responses/ChannelStoragePropsListResponse.cs.meta
diff --git a/Assets/Talo Game Services/Talo/Runtime/Utils/ChannelStorageManager.cs b/Assets/Talo Game Services/Talo/Runtime/Utils/ChannelStorageManager.cs
@@ -42,5 +42,32 @@ public void DeleteProp(int channelId, string propKey)
             var key = $"{channelId}:{propKey}";
             _currentProps.Remove(key);
         }
+
+        public async Task<ChannelStorageProp[]> ListProps(int channelId, string[] propKeys)
+        {
+            var results = new List<ChannelStorageProp>();
+            var keysToFetch = new List<string>();
+
+            foreach (var propKey in propKeys)
+            {
+                var cacheKey = $"{channelId}:{propKey}";
+                if (_currentProps.TryGetValue(cacheKey, out var cachedProp))
+                {
+                    results.Add(cachedProp);
+                }
+                else
+                {
+                    keysToFetch.Add(propKey);
+                }
+            }
+
+            if (keysToFetch.Count > 0)
+            {
+                var fetchedProps = await Talo.Channels.ListStorageProps(channelId, keysToFetch.ToArray(), true);
+                results.AddRange(fetchedProps);
+            }
+
+            return results.ToArray();
+        }
     }
 }
diff --git a/Assets/Talo Game Services/Talo/Runtime/Utils/LeaderboardEntriesManager.cs b/Assets/Talo Game Services/Talo/Runtime/Utils/LeaderboardEntriesManager.cs
@@ -1,4 +1,5 @@
-﻿using System.Collections.Generic;
+﻿using System;
+using System.Collections.Generic;
 
 namespace TaloGameServices
 {
@@ -21,24 +22,64 @@ public void UpsertEntry(string internalName, LeaderboardEntry entry)
             {
                 _currentEntries[internalName] = new List<LeaderboardEntry>();
             }
-            else
+
+            var entries = _currentEntries[internalName];
+            
+            // ensure there isn't an existing entry
+            entries.RemoveAll((e) => e.id == entry.id);
+            
+            int insertPosition = FindInsertPosition(entries, entry);
+            entries.Insert(insertPosition, entry);
+
+            for (int idx = 0; idx < entries.Count; idx++)
             {
-                _currentEntries[internalName].RemoveAll(e => e.id == entry.id);
+                entries[idx].position = idx;
             }
+        }
 
-            if (entry.position >= _currentEntries[internalName].Count)
+        private int FindInsertPosition(List<LeaderboardEntry> entries, LeaderboardEntry newEntry)
+        {
+            if (entries.Count == 0)
             {
-                _currentEntries[internalName].Add(entry);
+                return 0;
             }
-            else
+
+            int left = 0;
+            int right = entries.Count;
+
+            while (left < right)
             {
-                _currentEntries[internalName].Insert(entry.position, entry);
+                int mid = left + (right - left) / 2;
+                if (CompareEntries(newEntry, entries[mid]))
+                {
+                    right = mid;
+                }
+                else
+                {
+                    left = mid + 1;
+                }
             }
 
-            for (int idx = entry.position; idx < _currentEntries[internalName].Count; idx++)
+            return left;
+        }
+
+        private bool CompareEntries(LeaderboardEntry a, LeaderboardEntry b)
+        {
+            // first compare by score based on sort mode
+            if (a.score != b.score)
             {
-                _currentEntries[internalName][idx].position = idx;
+                if (a.LeaderboardSortMode == LeaderboardSortMode.ASC)
+                {
+                    return a.score < b.score;
+                }
+                else
+                {
+                    return a.score > b.score;
+                }
             }
+
+            // if scores are equal, earlier entries win
+            return DateTime.Parse(a.createdAt) < DateTime.Parse(b.createdAt);
         }
     }
 }
diff --git a/Assets/Talo Game Services/Talo/Tests/LeaderboardsAPI.meta b/Assets/Talo Game Services/Talo/Tests/LeaderboardsAPI.meta
diff --git a/Assets/Talo Game Services/Talo/Tests/LeaderboardsAPI/LeaderboardEntriesManagerTests.cs b/Assets/Talo Game Services/Talo/Tests/LeaderboardsAPI/LeaderboardEntriesManagerTests.cs
@@ -0,0 +1,133 @@
+using NUnit.Framework;
+
+namespace TaloGameServices.Test
+{
+    internal class LeaderboardEntriesManagerTests
+    {
+        private LeaderboardEntriesManager manager;
+
+        [SetUp]
+        public void SetUp()
+        {
+            manager = new LeaderboardEntriesManager();
+        }
+
+        [Test]
+        public void UpsertEntry_DescendingSort_InsertsInCorrectPosition()
+        {
+            var entry1 = new LeaderboardEntry { id = 1, score = 100f, leaderboardSortMode = "desc" };
+            var entry2 = new LeaderboardEntry { id = 2, score = 80f, leaderboardSortMode = "desc" };
+            var entry3 = new LeaderboardEntry { id = 3, score = 90f, leaderboardSortMode = "desc" };
+
+            manager.UpsertEntry("test", entry1);
+            manager.UpsertEntry("test", entry2);
+            manager.UpsertEntry("test", entry3);
+
+            var entries = manager.GetEntries("test");
+            
+            Assert.AreEqual(3, entries.Count);
+            Assert.AreEqual(100f, entries[0].score);
+            Assert.AreEqual(90f, entries[1].score);
+            Assert.AreEqual(80f, entries[2].score);
+            
+            Assert.AreEqual(0, entries[0].position);
+            Assert.AreEqual(1, entries[1].position);
+            Assert.AreEqual(2, entries[2].position);
+        }
+
+        [Test]
+        public void UpsertEntry_AscendingSort_InsertsInCorrectPosition()
+        {
+            var entry1 = new LeaderboardEntry { id = 1, score = 100f, leaderboardSortMode = "asc" };
+            var entry2 = new LeaderboardEntry { id = 2, score = 80f, leaderboardSortMode = "asc" };
+            var entry3 = new LeaderboardEntry { id = 3, score = 90f, leaderboardSortMode = "asc" };
+
+            manager.UpsertEntry("test", entry1);
+            manager.UpsertEntry("test", entry2);
+            manager.UpsertEntry("test", entry3);
+
+            var entries = manager.GetEntries("test");
+            
+            Assert.AreEqual(3, entries.Count);
+            Assert.AreEqual(80f, entries[0].score);
+            Assert.AreEqual(90f, entries[1].score);
+            Assert.AreEqual(100f, entries[2].score);
+            
+            Assert.AreEqual(0, entries[0].position);
+            Assert.AreEqual(1, entries[1].position);
+            Assert.AreEqual(2, entries[2].position);
+        }
+
+        [Test]
+        public void UpsertEntry_UpdateExistingEntry_MaintainsCorrectOrder()
+        {
+            // highest score
+            var entry1 = new LeaderboardEntry { id = 1, score = 100f, leaderboardSortMode = "desc" };
+            manager.UpsertEntry("test", entry1);
+            
+            // should go after entry1
+            var entry2 = new LeaderboardEntry { id = 2, score = 80f, leaderboardSortMode = "desc" };
+            manager.UpsertEntry("test", entry2);
+            
+            // update entry1 to have the lowest score - should move to end
+            var updatedEntry1 = new LeaderboardEntry { id = 1, score = 70f, leaderboardSortMode = "desc" };
+            manager.UpsertEntry("test", updatedEntry1);
+
+            var entries = manager.GetEntries("test");            
+            Assert.AreEqual(2, entries.Count);
+
+            Assert.AreEqual(2, entries[0].id); // entry2 should be first
+            Assert.AreEqual(80f, entries[0].score);
+
+            Assert.AreEqual(1, entries[1].id); // updated entry1 should be second  
+            Assert.AreEqual(70f, entries[1].score);
+            
+            Assert.AreEqual(0, entries[0].position);
+            Assert.AreEqual(1, entries[1].position);
+        }
+
+        [Test]
+        public void UpsertEntry_EmptyList_InsertsFirstEntry()
+        {
+            var entry = new LeaderboardEntry { id = 1, score = 100f, leaderboardSortMode = "desc" };
+
+            manager.UpsertEntry("test", entry);
+
+            var entries = manager.GetEntries("test");
+            
+            Assert.AreEqual(1, entries.Count);
+            Assert.AreEqual(100f, entries[0].score);
+            Assert.AreEqual(0, entries[0].position);
+        }
+
+        [Test]
+        public void UpsertEntry_EqualScores_OrdersByCreatedAt()
+        {
+            var earlierEntry = new LeaderboardEntry 
+            { 
+                id = 1, 
+                score = 100f, 
+                leaderboardSortMode = "desc",
+                createdAt = "2025-09-13T10:00:00Z"
+            };
+            var laterEntry = new LeaderboardEntry 
+            { 
+                id = 2, 
+                score = 100f, 
+                leaderboardSortMode = "desc",
+                createdAt = "2025-09-13T11:00:00Z"
+            };
+
+            manager.UpsertEntry("test", laterEntry);
+            manager.UpsertEntry("test", earlierEntry);
+
+            var entries = manager.GetEntries("test");
+            
+            Assert.AreEqual(2, entries.Count);
+            Assert.AreEqual(1, entries[0].id); // earlier entry should be first
+            Assert.AreEqual(2, entries[1].id); // later entry should be second
+            Assert.AreEqual(0, entries[0].position);
+            Assert.AreEqual(1, entries[1].position);
+        }
+    }
+}
diff --git a/Assets/Talo Game Services/Talo/Tests/LeaderboardsAPI/LeaderboardEntriesManagerTests.cs.meta b/Assets/Talo Game Services/Talo/Tests/LeaderboardsAPI/LeaderboardEntriesManagerTests.cs.meta
diff --git a/Assets/Talo Game Services/Talo/VERSION b/Assets/Talo Game Services/Talo/VERSION
@@ -1 +1 @@
-0.46.0
+0.47.0

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ namespace TaloGameServices`
`9`	`9`	`public class BaseAPI`
`10`	`10`	`{`
`11`	`11`	`// automatically updated with a pre-commit hook`
`12`		`- private const string ClientVersion = "0.46.0";`
	`12`	`+ private const string ClientVersion = "0.47.0";`
`13`	`13`
`14`	`14`	`protected string baseUrl;`
`15`	`15`