Skip to content

Commit cb80491

Browse files
authored
Merge pull request #185 from GetStream/feature/cleanup-before-release
Feature/cleanup before release
2 parents 881ab34 + 5589505 commit cb80491

18 files changed

+35
-58
lines changed

Assets/Plugins/StreamChat/Core/LowLevelClient/API/DeviceApi.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
using StreamChat.Core.LowLevelClient.API.Internal;
66
using StreamChat.Core.LowLevelClient.Requests;
77
using StreamChat.Core.LowLevelClient.Responses;
8-
using StreamChat.Core.Responses;
98

109
namespace StreamChat.Core.LowLevelClient.API
1110
{

Assets/Plugins/StreamChat/Core/LowLevelClient/IStreamChatLowLevelClient.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,10 @@ namespace StreamChat.Core.LowLevelClient
1414
public delegate void ConnectionStateChangeHandler(ConnectionState previous, ConnectionState current);
1515

1616
/// <summary>
17-
/// Stream Chat Client
17+
/// Stream Low-Level Chat Client - maintains WebSockets connection, executes API calls and exposes Stream events to which you can subscribe.
18+
/// There should be only one instance of this client in your application. This client does NOT maintain state.
19+
///
20+
/// Unless you have a good reason to use the low-level client, you should be using the stateful <see cref="IStreamChatClient"/> which maintain client state
1821
/// </summary>
1922
public interface IStreamChatLowLevelClient : IAuthProvider, IConnectionProvider, IStreamRealtimeEventsProvider, IDisposable
2023
{

Assets/Plugins/StreamChat/Core/LowLevelClient/Models/ImageSize.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
using System;
2-
using StreamChat.Core.Helpers;
1+
using StreamChat.Core.Helpers;
32
using StreamChat.Core.InternalDTO.Models;
43

54
namespace StreamChat.Core.LowLevelClient.Models

Assets/Plugins/StreamChat/Core/LowLevelClient/Models/MessageType.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
namespace StreamChat.Core.LowLevelClient.Models
44
{
5-
public struct MessageType : System.IEquatable<MessageType>,
5+
public readonly struct MessageType : System.IEquatable<MessageType>,
66
ILoadableFrom<MessageTypeInternalDTO, MessageType>,
77
ISavableTo<MessageTypeInternalDTO>
88
{

Assets/Plugins/StreamChat/Core/LowLevelClient/StreamChatLowLevelClient.cs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,7 @@
3939

4040
namespace StreamChat.Core.LowLevelClient
4141
{
42-
/// <summary>
43-
/// Stream Chat Client - maintains WebSockets connection, executes API calls and exposes Stream events to which you can subscribe.
44-
/// There should be only one instance of this client in your application.
45-
/// </summary>
42+
/// <inheritdoc cref="IStreamChatLowLevelClient"/>
4643
public class StreamChatLowLevelClient : IStreamChatLowLevelClient
4744
{
4845
public const string MenuPrefix = "Stream/";

Assets/Plugins/StreamChat/Core/WSEventType.cs renamed to Assets/Plugins/StreamChat/Core/LowLevelClient/WSEventType.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
namespace StreamChat.Core
1+
namespace StreamChat.Core.LowLevelClient
22
{
33
/// <summary>
44
/// Event types that can be received from WebSocket connection

Assets/Plugins/StreamChat/Core/LowLevelClient/WSEventType.cs.meta

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/Plugins/StreamChat/Core/Models/OperationType.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
namespace StreamChat.Core.Models
22
{
3+
/// <summary>
4+
/// Type of operation for the members changed event
5+
/// </summary>
36
public enum OperationType
47
{
58
Added,

Assets/Plugins/StreamChat/Core/StreamChatClient.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ namespace StreamChat.Core
6666
/// </summary>
6767
public delegate void ChannelMemberRemovedHandler(IStreamChannel channel, IStreamChannelMember member);
6868

69+
/// <inheritdoc cref="IStreamChatClient"/>
6970
public sealed class StreamChatClient : IStreamChatClient
7071
{
7172
public event ConnectionMadeHandler Connected;

Assets/Plugins/StreamChat/Core/WSEventType.cs.meta

Lines changed: 0 additions & 3 deletions
This file was deleted.

Assets/Plugins/StreamChat/Readme.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ Documentation:
1111
https://getstream.io/chat/docs/unity/?language=unity
1212

1313
Plugin directory structure:
14-
- *Config - sample config
1514
- Core - the main logic of the Stream Chat SDK
16-
- Libs - dependencies of Stream Chat SDK, SDK depends on interfaces so you can provide you're own implementation
15+
- *Editor Tools - Editor helpers tools (e.g. top menu option to enable debug mode)
16+
- Libs - libraries that the Stream Chat SDK is using, Core module depends on interfaces, so you can provide you're own implementation for Websocket, logging, http client, etc. if you'd need to
1717
- *SampleProject - example project
1818
- *Samples - code sample for example scenarios
1919
- *Tests - unit & integration tests

Assets/Plugins/StreamChat/Samples/ClientAndUsersCodeSamples.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
using StreamChat.Core.QueryBuilders.Filters.Users;
77
using StreamChat.Core.QueryBuilders.Sort;
88
using StreamChat.Core.Requests;
9-
using StreamChat.Core.StatefulModels;
109
using StreamChat.Libs.Auth;
1110
using UnityEngine;
1211

Assets/Plugins/StreamChat/Samples/LowLevelClient/ClientDocs/ModerationApiCodeSamples.cs

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,7 @@ await _lowLevelClient.ChannelApi.GetOrCreateChannelAsync("channel-type", "channe
3838
var banRequest = new BanRequest
3939
{
4040
TargetUserId = "user-to-ban-id",
41-
Id = channel.Id,
42-
Type = channel.Type,
41+
ChannelCid = channel.Cid,
4342
Timeout = 60,
4443
Reason = "Toxic behaviour towards other users"
4544
};
@@ -58,8 +57,7 @@ await _lowLevelClient.ChannelApi.GetOrCreateChannelAsync("channel-type", "channe
5857
var banRequest = new BanRequest
5958
{
6059
TargetUserId = "user-to-ban-id",
61-
Id = channel.Id,
62-
Type = channel.Type,
60+
ChannelCid = channel.Cid,
6361
Reason = "Toxic behaviour towards other users",
6462
};
6563

@@ -77,8 +75,7 @@ await _lowLevelClient.ChannelApi.GetOrCreateChannelAsync("channel-type", "channe
7775
var banRequest = new BanRequest
7876
{
7977
TargetUserId = "user-to-ban-id",
80-
Id = channel.Id,
81-
Type = channel.Type,
78+
ChannelCid = channel.Cid,
8279
Timeout = 24 * 60,
8380
Reason = "Toxic behaviour towards other users",
8481
IpBan = true,
@@ -115,8 +112,7 @@ await _lowLevelClient.ChannelApi.GetOrCreateChannelAsync("channel-type", "channe
115112
var banRequest = new ShadowBanRequest
116113
{
117114
TargetUserId = "user-to-ban-id",
118-
Id = channel.Id,
119-
Type = channel.Type,
115+
ChannelCid = channel.Cid,
120116
Timeout = 60 * 24,
121117
Reason = "Toxic behaviour towards other users"
122118
};
@@ -152,8 +148,7 @@ await _lowLevelClient.ChannelApi.GetOrCreateChannelAsync("channel-type", "channe
152148
var shadowBanRequest = new ShadowBanRequest
153149
{
154150
TargetUserId = "user-to-ban-id",
155-
Id = channel.Id,
156-
Type = channel.Type,
151+
ChannelCid = channel.Cid,
157152
Timeout = 24 * 60,
158153
Reason = "Toxic behaviour towards other users",
159154
};
@@ -189,7 +184,8 @@ await _lowLevelClient.ChannelApi.GetOrCreateChannelAsync("channel-type", "channe
189184
}
190185
};
191186

192-
var queryBannedUsersResponse = await _lowLevelClient.ModerationApi.QueryBannedUsersAsync(queryBannedUsersRequest);
187+
var queryBannedUsersResponse
188+
= await _lowLevelClient.ModerationApi.QueryBannedUsersAsync(queryBannedUsersRequest);
193189
}
194190

195191
public async Task FlagMessage()
@@ -222,7 +218,8 @@ await _lowLevelClient.ChannelApi.GetOrCreateChannelAsync("channel-type", "channe
222218
}
223219
};
224220

225-
var queryMessageFlagsResponse = await _lowLevelClient.ModerationApi.QueryMessageFlagsAsync(queryMessageFlagsRequest);
221+
var queryMessageFlagsResponse
222+
= await _lowLevelClient.ModerationApi.QueryMessageFlagsAsync(queryMessageFlagsRequest);
226223
}
227224

228225
private IStreamChatLowLevelClient _lowLevelClient;

Assets/Plugins/StreamChat/StreamChatClientExample.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
using StreamChat.Core;
21
using StreamChat.Core.StatefulModels;
32
using StreamChat.Libs.Utils;
43
using UnityEngine;
54

6-
namespace StreamChat
5+
namespace StreamChat.Core
76
{
87
/// <summary>
98
/// Example showing how to create instance of <see cref="IStreamChatClient"/>

Assets/Plugins/StreamChat/Tests/LowLevelClient/Integration/MessagesApiIntegrationTests.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,6 @@ public IEnumerator UploadFile()
174174
{
175175
yield return LowLevelClient.WaitForClientToConnect();
176176

177-
//var filename = "pexels-rulo-davila-5380467.mp4"; //32MB
178177
var filename = "SampleVideo_1280x720_1mb.mp4"; //1MB
179178

180179
// LoadAssetAtPath expects forward slashes
@@ -292,7 +291,6 @@ public IEnumerator DeleteFile()
292291
{
293292
yield return LowLevelClient.WaitForClientToConnect();
294293

295-
//var filename = "pexels-rulo-davila-5380467.mp4"; //32MB
296294
var filename = "SampleVideo_1280x720_1mb.mp4"; //1MB
297295
// LoadAssetAtPath expects forward slashes
298296
var videoFilePath = "Assets/Plugins/StreamChat/Tests/SampleFiles/" + filename;

Assets/Plugins/StreamChat/Tests/LowLevelClient/Integration/ModerationApiIntegrationTests.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,7 @@ public IEnumerator Ban_user()
8080
var banRequest = new BanRequest
8181
{
8282
TargetUserId = SecondUserId,
83-
Id = channelState.Channel.Id,
84-
Type = channelType,
83+
ChannelCid = channelState.Channel.Cid,
8584
Timeout = BanTimeout
8685
};
8786

@@ -131,8 +130,7 @@ public IEnumerator Unban_user()
131130
var banRequest = new BanRequest
132131
{
133132
TargetUserId = SecondUserId,
134-
Id = channelState.Channel.Id,
135-
Type = channelType,
133+
ChannelCid = channelState.Channel.Cid,
136134
Timeout = BanTimeout
137135
};
138136

@@ -263,7 +261,8 @@ private async Task When_messages_flagged_expect_query_flagged_messages_return_th
263261
};
264262

265263
var messageResponse2 = await
266-
LowLevelClient.MessageApi.SendNewMessageAsync(channelType, channelState.Channel.Id, sendMessageRequest2);
264+
LowLevelClient.MessageApi.SendNewMessageAsync(channelType, channelState.Channel.Id,
265+
sendMessageRequest2);
267266

268267
//Flag messages
269268

@@ -289,7 +288,8 @@ private async Task When_messages_flagged_expect_query_flagged_messages_return_th
289288
}
290289
};
291290

292-
var flagsQueryResponse = await LowLevelClient.ModerationApi.QueryMessageFlagsAsync(queryMessageFlagsRequest);
291+
var flagsQueryResponse
292+
= await LowLevelClient.ModerationApi.QueryMessageFlagsAsync(queryMessageFlagsRequest);
293293

294294
var message1 = flagsQueryResponse.Flags.FirstOrDefault(_ => _.Message.Id == messageResponse.Message.Id);
295295
var message2 = flagsQueryResponse.Flags.FirstOrDefault(_ => _.Message.Id == messageResponse2.Message.Id);
@@ -310,10 +310,10 @@ private async Task When_user_flagged_expect_response_target_user_id_match_Async(
310310
{
311311
const string channelType = "messaging";
312312
var channelState = await CreateTempUniqueChannelAsync(channelType, new ChannelGetOrCreateRequest());
313-
313+
314314
var response = await LowLevelClient.ModerationApi.FlagUserAsync(SecondUserId);
315315
Assert.AreEqual(SecondUserId, response.Flag.TargetUser.Id);
316-
}
316+
}
317317
}
318318
}
319319
#endif
Binary file not shown.

Assets/Plugins/StreamChat/Tests/SampleFiles/pexels-rulo-davila-5380467.mp4.meta

Lines changed: 0 additions & 18 deletions
This file was deleted.

0 commit comments

Comments
 (0)