cleanup + rename

sierpinskid · sierpinskid · commit 52259bcd3af1 · 2024-09-12T16:45:58.000+02:00
diff --git a/Assets/Plugins/StreamChat/Core/LowLevelClient/API/DeviceApi.cs b/Assets/Plugins/StreamChat/Core/LowLevelClient/API/DeviceApi.cs
@@ -5,7 +5,6 @@
 using StreamChat.Core.LowLevelClient.API.Internal;
 using StreamChat.Core.LowLevelClient.Requests;
 using StreamChat.Core.LowLevelClient.Responses;
-using StreamChat.Core.Responses;
 
 namespace StreamChat.Core.LowLevelClient.API
 {
diff --git a/Assets/Plugins/StreamChat/Core/LowLevelClient/Models/ImageSize.cs b/Assets/Plugins/StreamChat/Core/LowLevelClient/Models/ImageSize.cs
@@ -1,5 +1,4 @@
-﻿using System;
-using StreamChat.Core.Helpers;
+﻿using StreamChat.Core.Helpers;
 using StreamChat.Core.InternalDTO.Models;
 
 namespace StreamChat.Core.LowLevelClient.Models
diff --git a/Assets/Plugins/StreamChat/Core/LowLevelClient/Models/MessageType.cs b/Assets/Plugins/StreamChat/Core/LowLevelClient/Models/MessageType.cs
@@ -2,7 +2,7 @@
 
 namespace StreamChat.Core.LowLevelClient.Models
 {
-    public struct MessageType : System.IEquatable<MessageType>,
+    public readonly struct MessageType : System.IEquatable<MessageType>,
         ILoadableFrom<MessageTypeInternalDTO, MessageType>,
         ISavableTo<MessageTypeInternalDTO>
     {
diff --git a/Assets/Plugins/StreamChat/Core/LowLevelClient/WSEventType.cs b/Assets/Plugins/StreamChat/Core/LowLevelClient/WSEventType.cs
@@ -1,4 +1,4 @@
-﻿namespace StreamChat.Core
+﻿namespace StreamChat.Core.LowLevelClient
 {
     /// <summary>
     /// Event types that can be received from WebSocket connection
diff --git a/Assets/Plugins/StreamChat/Core/LowLevelClient/WSEventType.cs.meta b/Assets/Plugins/StreamChat/Core/LowLevelClient/WSEventType.cs.meta
diff --git a/Assets/Plugins/StreamChat/Core/Models/OperationType.cs b/Assets/Plugins/StreamChat/Core/Models/OperationType.cs
diff --git a/Assets/Plugins/StreamChat/Core/Models/StreamMemberChangeType.cs b/Assets/Plugins/StreamChat/Core/Models/StreamMemberChangeType.cs
@@ -0,0 +1,12 @@
+﻿namespace StreamChat.Core.Models
+{
+    /// <summary>
+    /// Type of operation for the members changed event
+    /// </summary>
+    public enum StreamMemberChangeType
+    {
+        Added,
+        Updated,
+        Removed
+    }
+}
diff --git a/Assets/Plugins/StreamChat/Core/Models/StreamMemberChangeType.cs.meta b/Assets/Plugins/StreamChat/Core/Models/StreamMemberChangeType.cs.meta
diff --git a/Assets/Plugins/StreamChat/Core/StatefulModels/StreamChannel.cs b/Assets/Plugins/StreamChat/Core/StatefulModels/StreamChannel.cs
@@ -30,7 +30,7 @@ namespace StreamChat.Core.StatefulModels
     public delegate void StreamChannelMemberChangeHandler(IStreamChannel channel, IStreamChannelMember member);
 
     public delegate void StreamChannelMemberAnyChangeHandler(IStreamChannel channel, IStreamChannelMember member,
-        OperationType operationType);
+        StreamMemberChangeType streamMemberChangeType);
 
     public delegate void StreamMessageReactionHandler(IStreamChannel channel, IStreamMessage message,
         StreamReaction reaction);
@@ -771,7 +771,7 @@ internal void InternalAddMember(StreamChannelMember member)
 
             _members.Add(member);
             MemberAdded?.Invoke(this, member);
-            MembersChanged?.Invoke(this, member, OperationType.Added);
+            MembersChanged?.Invoke(this, member, StreamMemberChangeType.Added);
         }
 
         internal void InternalRemoveMember(StreamChannelMember member)
@@ -783,7 +783,7 @@ internal void InternalRemoveMember(StreamChannelMember member)
 
             _members.Remove(member);
             MemberRemoved?.Invoke(this, member);
-            MembersChanged?.Invoke(this, member, OperationType.Removed);
+            MembersChanged?.Invoke(this, member, StreamMemberChangeType.Removed);
         }
 
         internal void InternalUpdateMember(StreamChannelMember member)
@@ -794,7 +794,7 @@ internal void InternalUpdateMember(StreamChannelMember member)
             }
 
             MemberUpdated?.Invoke(this, member);
-            MembersChanged?.Invoke(this, member, OperationType.Updated);
+            MembersChanged?.Invoke(this, member, StreamMemberChangeType.Updated);
         }
 
         protected override StreamChannel Self => this;
diff --git a/Assets/Plugins/StreamChat/Core/WSEventType.cs.meta b/Assets/Plugins/StreamChat/Core/WSEventType.cs.meta
diff --git a/Assets/Plugins/StreamChat/Samples/EventsSamples.cs b/Assets/Plugins/StreamChat/Samples/EventsSamples.cs
@@ -82,7 +82,7 @@ private void OnMemberUpdated(IStreamChannel channel, IStreamChannelMember member
         {
         }
 
-        private void OnMembersChanged(IStreamChannel channel, IStreamChannelMember member, OperationType operationType)
+        private void OnMembersChanged(IStreamChannel channel, IStreamChannelMember member, StreamMemberChangeType streamMemberChangeType)
         {
         }
 
diff --git a/Assets/Plugins/StreamChat/Tests/StatefulClient/ChannelMembersTests.cs b/Assets/Plugins/StreamChat/Tests/StatefulClient/ChannelMembersTests.cs
@@ -250,9 +250,9 @@ void OnMemberAdded(IStreamChannel channel2, IStreamChannelMember member)
             var receivedEvent2 = false;
             IStreamChannelMember eventMember2 = null;
             IStreamChannel eventChannel2 = null;
-            OperationType? opType = default;
+            StreamMemberChangeType? opType = default;
 
-            void OnMembersChanged(IStreamChannel channel2, IStreamChannelMember member, OperationType op)
+            void OnMembersChanged(IStreamChannel channel2, IStreamChannelMember member, StreamMemberChangeType op)
             {
                 if (channel2.Cid != channel.Cid)
                 {
@@ -283,7 +283,7 @@ void OnMembersChanged(IStreamChannel channel2, IStreamChannelMember member, Oper
             Assert.IsNotNull(eventChannel2);
             Assert.IsNotNull(eventMember2);
             Assert.AreEqual(user, eventMember2.User);
-            Assert.AreEqual(OperationType.Added, opType.Value);
+            Assert.AreEqual(StreamMemberChangeType.Added, opType.Value);
         }
 
         //[UnityTest] //StreamTodo: debug, works when triggered manually but fails in GitHub Actions
@@ -316,9 +316,9 @@ void OnMemberRemoved(IStreamChannel channel2, IStreamChannelMember member)
             var receivedEvent2 = false;
             IStreamChannelMember eventMember2 = null;
             IStreamChannel eventChannel2 = null;
-            OperationType? opType = default;
+            StreamMemberChangeType? opType = default;
 
-            void OnMembersChanged(IStreamChannel channel3, IStreamChannelMember member, OperationType op)
+            void OnMembersChanged(IStreamChannel channel3, IStreamChannelMember member, StreamMemberChangeType op)
             {
                 if (channel3.Cid != channel.Cid)
                 {
@@ -350,7 +350,7 @@ void OnMembersChanged(IStreamChannel channel3, IStreamChannelMember member, Oper
             Assert.IsNotNull(eventChannel2);
             Assert.IsNotNull(eventMember2);
             Assert.AreEqual(user, eventMember2.User);
-            Assert.AreEqual(OperationType.Removed, opType.Value);
+            Assert.AreEqual(StreamMemberChangeType.Removed, opType.Value);
         }
 
         [UnityTest]

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,6 @@`
`5`	`5`	`using StreamChat.Core.LowLevelClient.API.Internal;`
`6`	`6`	`using StreamChat.Core.LowLevelClient.Requests;`
`7`	`7`	`using StreamChat.Core.LowLevelClient.Responses;`
`8`		`-using StreamChat.Core.Responses;`
`9`	`8`
`10`	`9`	`namespace StreamChat.Core.LowLevelClient.API`
`11`	`10`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`namespace StreamChat.Core.LowLevelClient.Models`
`4`	`4`	`{`
`5`		`- public struct MessageType : System.IEquatable<MessageType>,`
	`5`	`+ public readonly struct MessageType : System.IEquatable<MessageType>,`
`6`	`6`	`ILoadableFrom<MessageTypeInternalDTO, MessageType>,`
`7`	`7`	`ISavableTo<MessageTypeInternalDTO>`
`8`	`8`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-namespace StreamChat.Core`
	`1`	`+namespace StreamChat.Core.LowLevelClient`
`2`	`2`	`{`
`3`	`3`	`/// <summary>`
`4`	`4`	`/// Event types that can be received from WebSocket connection`