Fix user.Active issue

jakub-grzesiowski · jakub-grzesiowski · commit 4f30dac49bfa · 2025-11-06T14:20:56.000+01:00
diff --git a/c-sharp-chat/PubnubChatApi/PubNubChatApi.Tests/PubnubTestsParameters.cs b/c-sharp-chat/PubnubChatApi/PubNubChatApi.Tests/PubnubTestsParameters.cs
@@ -6,7 +6,7 @@ public static class PubnubTestsParameters
     private static readonly string EnvSubscribeKey = Environment.GetEnvironmentVariable("PN_SUB_KEY");
     private static readonly string EnvSecretKey = Environment.GetEnvironmentVariable("PN_SEC_KEY");
 
-    public static readonly string PublishKey = string.IsNullOrEmpty(EnvPublishKey) ? "demo-36" : EnvPublishKey;
-    public static readonly string SubscribeKey = string.IsNullOrEmpty(EnvSubscribeKey) ? "demo-36" : EnvSubscribeKey;
+    public static readonly string PublishKey = "pub-c-79c582a2-d7a4-4ee7-9f28-7a6f1b7fa11c";//string.IsNullOrEmpty(EnvPublishKey) ? "demo-36" : EnvPublishKey;
+    public static readonly string SubscribeKey = "sub-c-ca0af928-f4f9-474c-b56e-d6be81bf8ed0";//string.IsNullOrEmpty(EnvSubscribeKey) ? "demo-36" : EnvSubscribeKey;
     public static readonly string SecretKey = string.IsNullOrEmpty(EnvSecretKey) ? "demo-36" : EnvSecretKey;
 }
diff --git a/c-sharp-chat/PubnubChatApi/PubnubChatApi/Entities/Chat.cs b/c-sharp-chat/PubnubChatApi/PubnubChatApi/Entities/Chat.cs
@@ -52,16 +52,16 @@ public class Chat
         public static async Task<ChatOperationResult<Chat>> CreateInstance(PubnubChatConfig chatConfig, PNConfiguration pubnubConfig, ChatListenerFactory? listenerFactory = null)
         {
             var chat = new Chat(chatConfig, pubnubConfig, listenerFactory);
-            if (chatConfig.StoreUserActivityTimestamp)
-            {
-                chat.StoreActivityTimeStamp();
-            }
             var result = new ChatOperationResult<Chat>("Chat.CreateInstance()", chat){Result = chat};
             var getUser = await chat.GetCurrentUser().ConfigureAwait(false);
             if (getUser.Error)
             {
                 result.RegisterOperation(await chat.CreateUser(chat.PubnubInstance.GetCurrentUserId()).ConfigureAwait(false));
             }
+            if (chatConfig.StoreUserActivityTimestamp)
+            {
+                chat.StoreActivityTimeStamp();
+            }
             return result;
         }
         
@@ -81,16 +81,16 @@ public static async Task<ChatOperationResult<Chat>> CreateInstance(PubnubChatCon
         public static async Task<ChatOperationResult<Chat>> CreateInstance(PubnubChatConfig chatConfig, Pubnub pubnub, ChatListenerFactory? listenerFactory = null)
         {
             var chat = new Chat(chatConfig, pubnub, listenerFactory);
-            if (chatConfig.StoreUserActivityTimestamp)
-            {
-                chat.StoreActivityTimeStamp();
-            }
             var result = new ChatOperationResult<Chat>("Chat.CreateInstance()", chat){Result = chat};
             var getUser = await chat.GetCurrentUser().ConfigureAwait(false);
             if (getUser.Error)
             {
                 result.RegisterOperation(await chat.CreateUser(chat.PubnubInstance.GetCurrentUserId()).ConfigureAwait(false));
             }
+            if (chatConfig.StoreUserActivityTimestamp)
+            {
+                chat.StoreActivityTimeStamp();
+            }
             return result;
         }
         
diff --git a/c-sharp-chat/PubnubChatApi/PubnubChatApi/Entities/User.cs b/c-sharp-chat/PubnubChatApi/PubnubChatApi/Entities/User.cs
@@ -81,7 +81,7 @@ public bool Active
                     return false;
                 }
                 var currentTimeStamp = ChatUtils.TimeTokenNowLong();
-                var interval = chat.Config.StoreUserActivityInterval;
+                var interval = (long)chat.Config.StoreUserActivityInterval;
                 var lastActive = Convert.ToInt64(lastActiveTimestamp);
                 return currentTimeStamp - lastActive <= interval * 1000000;
             }
diff --git a/unity-chat/PubnubChatUnity/Assets/PubnubChat/Runtime/PubnubChatApi/Entities/Chat.cs b/unity-chat/PubnubChatUnity/Assets/PubnubChat/Runtime/PubnubChatApi/Entities/Chat.cs
@@ -52,16 +52,16 @@ public class Chat
         public static async Task<ChatOperationResult<Chat>> CreateInstance(PubnubChatConfig chatConfig, PNConfiguration pubnubConfig, ChatListenerFactory? listenerFactory = null)
         {
             var chat = new Chat(chatConfig, pubnubConfig, listenerFactory);
-            if (chatConfig.StoreUserActivityTimestamp)
-            {
-                chat.StoreActivityTimeStamp();
-            }
             var result = new ChatOperationResult<Chat>("Chat.CreateInstance()", chat){Result = chat};
             var getUser = await chat.GetCurrentUser().ConfigureAwait(false);
             if (getUser.Error)
             {
                 result.RegisterOperation(await chat.CreateUser(chat.PubnubInstance.GetCurrentUserId()).ConfigureAwait(false));
             }
+            if (chatConfig.StoreUserActivityTimestamp)
+            {
+                chat.StoreActivityTimeStamp();
+            }
             return result;
         }
         
@@ -81,16 +81,16 @@ public static async Task<ChatOperationResult<Chat>> CreateInstance(PubnubChatCon
         public static async Task<ChatOperationResult<Chat>> CreateInstance(PubnubChatConfig chatConfig, Pubnub pubnub, ChatListenerFactory? listenerFactory = null)
         {
             var chat = new Chat(chatConfig, pubnub, listenerFactory);
-            if (chatConfig.StoreUserActivityTimestamp)
-            {
-                chat.StoreActivityTimeStamp();
-            }
             var result = new ChatOperationResult<Chat>("Chat.CreateInstance()", chat){Result = chat};
             var getUser = await chat.GetCurrentUser().ConfigureAwait(false);
             if (getUser.Error)
             {
                 result.RegisterOperation(await chat.CreateUser(chat.PubnubInstance.GetCurrentUserId()).ConfigureAwait(false));
             }
+            if (chatConfig.StoreUserActivityTimestamp)
+            {
+                chat.StoreActivityTimeStamp();
+            }
             return result;
         }
         
@@ -586,6 +586,7 @@ public async Task<ChatOperationResult> DeleteChannel(string channelId, bool soft
         internal async void StoreActivityTimeStamp()
         {
             var currentUserId = PubnubInstance.GetCurrentUserId();
+            storeActivity = true;
             while (storeActivity)
             {
                 var getResult = await User.GetUserData(this, currentUserId).ConfigureAwait(false);
diff --git a/unity-chat/PubnubChatUnity/Assets/PubnubChat/Runtime/PubnubChatApi/Entities/User.cs b/unity-chat/PubnubChatUnity/Assets/PubnubChat/Runtime/PubnubChatApi/Entities/User.cs
@@ -81,7 +81,7 @@ public bool Active
                     return false;
                 }
                 var currentTimeStamp = ChatUtils.TimeTokenNowLong();
-                var interval = chat.Config.StoreUserActivityInterval;
+                var interval = (long)chat.Config.StoreUserActivityInterval;
                 var lastActive = Convert.ToInt64(lastActiveTimestamp);
                 return currentTimeStamp - lastActive <= interval * 1000000;
             }

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ public static class PubnubTestsParameters`
`6`	`6`	`private static readonly string EnvSubscribeKey = Environment.GetEnvironmentVariable("PN_SUB_KEY");`
`7`	`7`	`private static readonly string EnvSecretKey = Environment.GetEnvironmentVariable("PN_SEC_KEY");`
`8`	`8`
`9`		`- public static readonly string PublishKey = string.IsNullOrEmpty(EnvPublishKey) ? "demo-36" : EnvPublishKey;`
`10`		`- public static readonly string SubscribeKey = string.IsNullOrEmpty(EnvSubscribeKey) ? "demo-36" : EnvSubscribeKey;`
	`9`	`+ public static readonly string PublishKey = "pub-c-79c582a2-d7a4-4ee7-9f28-7a6f1b7fa11c";//string.IsNullOrEmpty(EnvPublishKey) ? "demo-36" : EnvPublishKey;`
	`10`	`+ public static readonly string SubscribeKey = "sub-c-ca0af928-f4f9-474c-b56e-d6be81bf8ed0";//string.IsNullOrEmpty(EnvSubscribeKey) ? "demo-36" : EnvSubscribeKey;`
`11`	`11`	`public static readonly string SecretKey = string.IsNullOrEmpty(EnvSecretKey) ? "demo-36" : EnvSecretKey;`
`12`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -52,16 +52,16 @@ public class Chat`
`52`	`52`	`public static async Task<ChatOperationResult<Chat>> CreateInstance(PubnubChatConfig chatConfig, PNConfiguration pubnubConfig, ChatListenerFactory? listenerFactory = null)`
`53`	`53`	`{`
`54`	`54`	`var chat = new Chat(chatConfig, pubnubConfig, listenerFactory);`
`55`		`- if (chatConfig.StoreUserActivityTimestamp)`
`56`		`- {`
`57`		`- chat.StoreActivityTimeStamp();`
`58`		`- }`
`59`	`55`	`var result = new ChatOperationResult<Chat>("Chat.CreateInstance()", chat){Result = chat};`
`60`	`56`	`var getUser = await chat.GetCurrentUser().ConfigureAwait(false);`
`61`	`57`	`if (getUser.Error)`
`62`	`58`	`{`
`63`	`59`	`result.RegisterOperation(await chat.CreateUser(chat.PubnubInstance.GetCurrentUserId()).ConfigureAwait(false));`
`64`	`60`	`}`
	`61`	`+ if (chatConfig.StoreUserActivityTimestamp)`
	`62`	`+ {`
	`63`	`+ chat.StoreActivityTimeStamp();`
	`64`	`+ }`
`65`	`65`	`return result;`
`66`	`66`	`}`
`67`	`67`
`@@ -81,16 +81,16 @@ public static async Task<ChatOperationResult<Chat>> CreateInstance(PubnubChatCon`
`81`	`81`	`public static async Task<ChatOperationResult<Chat>> CreateInstance(PubnubChatConfig chatConfig, Pubnub pubnub, ChatListenerFactory? listenerFactory = null)`
`82`	`82`	`{`
`83`	`83`	`var chat = new Chat(chatConfig, pubnub, listenerFactory);`
`84`		`- if (chatConfig.StoreUserActivityTimestamp)`
`85`		`- {`
`86`		`- chat.StoreActivityTimeStamp();`
`87`		`- }`
`88`	`84`	`var result = new ChatOperationResult<Chat>("Chat.CreateInstance()", chat){Result = chat};`
`89`	`85`	`var getUser = await chat.GetCurrentUser().ConfigureAwait(false);`
`90`	`86`	`if (getUser.Error)`
`91`	`87`	`{`
`92`	`88`	`result.RegisterOperation(await chat.CreateUser(chat.PubnubInstance.GetCurrentUserId()).ConfigureAwait(false));`
`93`	`89`	`}`
	`90`	`+ if (chatConfig.StoreUserActivityTimestamp)`
	`91`	`+ {`
	`92`	`+ chat.StoreActivityTimeStamp();`
	`93`	`+ }`
`94`	`94`	`return result;`
`95`	`95`	`}`
`96`	`96`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ public bool Active`
`81`	`81`	`return false;`
`82`	`82`	`}`
`83`	`83`	`var currentTimeStamp = ChatUtils.TimeTokenNowLong();`
`84`		`- var interval = chat.Config.StoreUserActivityInterval;`
	`84`	`+ var interval = (long)chat.Config.StoreUserActivityInterval;`
`85`	`85`	`var lastActive = Convert.ToInt64(lastActiveTimestamp);`
`86`	`86`	`return currentTimeStamp - lastActive <= interval * 1000000;`
`87`	`87`	`}`