Add User.Active + related functionality (#5)

Author: jakub-grzesiowski

c-sharp-chat/PubnubChatApi/PubNubChatApi.Tests/UserTests.cs

@@ -16,7 +16,8 @@ public void Setup()
  chat = new Chat(new PubnubChatConfig(
  PubnubTestsParameters.PublishKey,
  PubnubTestsParameters.SubscribeKey,
- "user_tests_user")
+ "user_tests_user", 
+ storeUserActivityTimestamp: true)
  );
  channel = chat.CreatePublicConversation("user_tests_channel");
  if (!chat.TryGetCurrentUser(out user))
@@ -26,6 +27,13 @@ public void Setup()
  channel.Join();
  }
 
+ [Test]
+ public async Task TestUserActive()
+ {
+ await Task.Delay(500);
+ Assert.True(user.Active);
+ }
+
  [Test]
  public async Task TestUserUpdate()
  {

c-sharp-chat/PubnubChatApi/PubnubChatApi/Entities/Channel.cs

@@ -417,8 +417,7 @@ internal bool TryParseAndBroadcastTypingEvent(ChatEvent chatEvent)
  }
 
  //Create and start new timer
- //TODO: Get this from config
- var newTimer = new Timer(5000);
+ var newTimer = new Timer(chat.Config.TypingTimeout);
  newTimer.Elapsed += (_, _) =>
  {
  typingIndicators.Remove(chatEvent.UserId);

c-sharp-chat/PubnubChatApi/PubnubChatApi/Entities/Chat.cs

@@ -34,7 +34,9 @@ private static extern IntPtr pn_chat_new(
  string user_id,
  string auth_key,
  int typing_timeout,
- int typing_timeout_difference);
+ int typing_timeout_difference,
+ int store_user_activity_interval,
+ bool store_user_activity_timestamps);
 
  [DllImport("pubnub-chat")]
  private static extern void pn_chat_delete(IntPtr chat);
@@ -315,6 +317,7 @@ private static extern int pn_chat_get_current_user_mentions(IntPtr chat, string
  public event Action<ChatEvent> OnAnyEvent;
 
  public ChatAccessManager ChatAccessManager { get; }
+ public PubnubChatConfig Config { get; }
 
  /// <summary>
  /// Initializes a new instance of the <see cref="Chat"/> class.
@@ -329,9 +332,11 @@ private static extern int pn_chat_get_current_user_mentions(IntPtr chat, string
  public Chat(PubnubChatConfig config)
  {
  chatPointer = pn_chat_new(config.PublishKey, config.SubscribeKey, config.UserId, config.AuthKey,
- config.TypingTimeout, config.TypingTimeoutDifference);
+ config.TypingTimeout, config.TypingTimeoutDifference, config.StoreUserActivityInterval, 
+ config.StoreUserActivityTimestamp);
  CUtilities.CheckCFunctionResult(chatPointer);
 
+ Config = config;
  ChatAccessManager = new ChatAccessManager(chatPointer);
 
  fetchUpdatesThread = new Thread(FetchUpdatesLoop) { IsBackground = true };
@@ -392,7 +397,6 @@ internal void ParseJsonUpdatePointers(string jsonPointers)
  {
  failedToInvoke = true;
  }
-
  break;
  case PubnubChatEventType.Report:
  OnReportEvent?.Invoke(chatEvent);
@@ -403,7 +407,6 @@ internal void ParseJsonUpdatePointers(string jsonPointers)
  {
  readReceiptChannel.BroadcastReadReceipt(chatEvent);
  }
-
  break;
  case PubnubChatEventType.Mention:
  OnMentionEvent?.Invoke(chatEvent);
@@ -445,10 +448,6 @@ internal void ParseJsonUpdatePointers(string jsonPointers)
  messageWrappers[timeToken] = message;
  channel.BroadcastMessageReceived(message);
  }
- else
- {
- Debug.WriteLine("BBBBBBBBBBB");
- }
 
  pn_dispose_message(pointer);
  continue;
@@ -481,10 +480,8 @@ internal void ParseJsonUpdatePointers(string jsonPointers)
  var id = Message.GetMessageIdFromPtr(updatedThreadMessagePointer);
  if (messageWrappers.TryGetValue(id, out var existingMessageWrapper))
  {
- Debug.WriteLine("KURWA");
  if (existingMessageWrapper is ThreadMessage existingThreadMessageWrapper)
  {
- Debug.WriteLine("MAĆ");
  existingThreadMessageWrapper.UpdateWithPartialPtr(updatedThreadMessagePointer);
  existingThreadMessageWrapper.BroadcastMessageUpdate();
  }
@@ -494,10 +491,6 @@ internal void ParseJsonUpdatePointers(string jsonPointers)
  "Thread message was stored as a regular message - SHOULD NEVER HAPPEN!");
  }
  }
- else
- {
- Debug.WriteLine("CHUJ");
- }
 
  pn_dispose_message(pointer);
  continue;
@@ -844,6 +837,16 @@ internal bool TryGetChannel(string channelId, IntPtr channelPointer, out Channel
  () => new Channel(this, channelId, channelPointer), out channel);
  }
 
+ //The TryGetChannel updates the pointer, these methods are for internal logic explicity sake
+ internal void UpdateChannelPointer(IntPtr newPointer)
+ {
+ TryGetChannel(newPointer, out _);
+ }
+ internal void UpdateChannelPointer(string id, IntPtr newPointer)
+ {
+ TryGetChannel(id, newPointer, out _);
+ }
+
  public ChannelsResponseWrapper GetChannels(string filter = "", string sort = "", int limit = 0,
  Page page = null)
  {

c-sharp-chat/PubnubChatApi/PubnubChatApi/Entities/ThreadChannel.cs

@@ -129,16 +129,14 @@ public void PinMessageToParentChannel(Message message)
  {
  var newChannelPointer = pn_thread_channel_pin_message_to_parent_channel(pointer, message.Pointer);
  CUtilities.CheckCFunctionResult(newChannelPointer);
- //TODO: this is to update the pointer of the existing wrapper, but isn't very explicit about the fact it does that
- chat.TryGetChannel(ParentChannelId, newChannelPointer, out _);
+ chat.UpdateChannelPointer(ParentChannelId, newChannelPointer);
  }
 
  public void UnPinMessageFromParentChannel()
  {
  var newChannelPointer = pn_thread_channel_unpin_message_from_parent_channel(pointer);
  CUtilities.CheckCFunctionResult(newChannelPointer);
- //TODO: this is to update the pointer of the existing wrapper, but isn't very explicit about the fact it does that
- chat.TryGetChannel(ParentChannelId, newChannelPointer, out _);
+ chat.UpdateChannelPointer(ParentChannelId, newChannelPointer);
  }
 
  protected override void DisposePointer()

c-sharp-chat/PubnubChatApi/PubnubChatApi/Entities/ThreadMessage.cs

@@ -74,16 +74,14 @@ public void PinMessageToParentChannel()
  {
  var newChannelPointer = pn_thread_message_pin_to_parent_channel(pointer);
  CUtilities.CheckCFunctionResult(newChannelPointer);
- //TODO: this is to update the pointer of the existing wrapper, but isn't very explicit about the fact it does that
- chat.TryGetChannel(newChannelPointer, out _);
+ chat.UpdateChannelPointer(newChannelPointer);
  }
 
  public void UnPinMessageFromParentChannel()
  {
  var newChannelPointer = pn_thread_message_unpin_from_parent_channel(pointer);
  CUtilities.CheckCFunctionResult(newChannelPointer);
- //TODO: this is to update the pointer of the existing wrapper, but isn't very explicit about the fact it does that
- chat.TryGetChannel(newChannelPointer, out _);
+ chat.UpdateChannelPointer(newChannelPointer);
  }
 
  protected override void DisposePointer()

c-sharp-chat/PubnubChatApi/PubnubChatApi/Entities/User.cs

@@ -64,6 +64,11 @@ private static extern int pn_user_get_channel_restrictions(
  [DllImport("pubnub-chat")]
  private static extern int pn_user_get_channels_restrictions(IntPtr user, string sort, int limit, string next,
  string prev, StringBuilder result);
+ 
+ [DllImport("pubnub-chat")]
+ private static extern int pn_user_active(IntPtr user);
+ [DllImport("pubnub-chat")]
+ private static extern int pn_user_last_active_timestamp(IntPtr user, StringBuilder result);
 
  #endregion
 
@@ -179,11 +184,13 @@ public string DataType
  }
  }
 
- /*public bool Active
+ public bool Active
  {
  get
  {
- throw new NotImplementedException();
+ var result = pn_user_active(pointer);
+ CUtilities.CheckCFunctionResult(result);
+ return result == 1;
  }
  }
 
@@ -192,9 +199,10 @@ public string LastActiveTimeStamp
  get
  {
  var buffer = new StringBuilder(64);
- throw new NotImplementedException();
+ CUtilities.CheckCFunctionResult(pn_user_last_active_timestamp(pointer, buffer));
+ return buffer.ToString();
  }
- }*/
+ }
 
  private Chat chat;