chore: release 6.9.0-beta.0 (#139)

github-actions[bot] · itsmeadi · vishalnarkhede · web-flow · commit d7ffef84d15f · 2024-07-24T12:10:54.000+02:00
* add moderation support * fix syntax * fix syntax * fix tests * lint * remove ignore * fix tests * fix tests * moderation reaction * moderation reaction * lint * remove used line * lint * [PBE-4786] moderation flag endpoint (#138) * flag endpoint * lint fix * ignore ci tests for moderation * ignore reaction test on ci * chore(release): 6.9.0-beta.0 --------- Co-authored-by: Aditya Agarwal <itsmeadityaagarwal@gmail.com> Co-authored-by: Vishal Narkhede <vishalnarkhede.iitd@gmail.com> Co-authored-by: github-actions <release@getstream.io>
diff --git a/.DS_Store b/.DS_Store
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [6.9.0-beta.0](https://github.com/GetStream/stream-net/compare/6.8.3...6.9.0-beta.0) (2024-07-24)
+
 ### [6.8.3](https://github.com/GetStream/stream-net/compare/6.8.2...6.8.3) (2024-04-23)
 
 ### [6.8.2-prerelease](https://github.com/GetStream/stream-net/compare/6.8.1...6.8.2-prerelease) (2024-04-12)
diff --git a/src/IModeration.cs b/src/IModeration.cs
@@ -0,0 +1,18 @@
+using Stream.Models;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+namespace Stream
+{
+    public interface IModeration
+    {
+        Task<ResponseBase> FlagUserAsync(string flaggedUserId, string reason, IDictionary<string, object> options = null);
+
+        Task<ResponseBase> FlagActivityAsync(string entityId, string entityCreatorId, string reason,
+            IDictionary<string, object> options = null);
+
+        Task<ResponseBase> FlagReactionAsync(string entityId, string entityCreatorId, string reason,
+            IDictionary<string, object> options = null);
+        Task<ResponseBase> FlagAsync(string entityType, string entityId, string entityCreatorId, string reason, IDictionary<string, object> options = null);
+    }
+}
diff --git a/src/IReactions.cs b/src/IReactions.cs
@@ -15,11 +15,11 @@ public interface IReactions
     {
         /// <summary>Posts a new reaciton.</summary>
         /// <remarks>https://getstream.io/activity-feeds/docs/dotnet-csharp/reactions_introduction/?language=csharp</remarks>
-        Task<Reaction> AddAsync(string reactionId, string kind, string activityId, string userId, IDictionary<string, object> data = null, IEnumerable<string> targetFeeds = null);
+        Task<Reaction> AddAsync(string reactionId, string kind, string activityId, string userId, IDictionary<string, object> data = null, IEnumerable<string> targetFeeds = null, string moderationTemplate = null);
 
         /// <summary>Posts a new reaciton.</summary>
         /// <remarks>https://getstream.io/activity-feeds/docs/dotnet-csharp/reactions_introduction/?language=csharp</remarks>
-        Task<Reaction> AddAsync(string kind, string activityId, string userId, IDictionary<string, object> data = null, IEnumerable<string> targetFeeds = null);
+        Task<Reaction> AddAsync(string kind, string activityId, string userId, IDictionary<string, object> data = null, IEnumerable<string> targetFeeds = null, string moderationTemplate = null);
 
         /// <summary>Adds a new child reaction.</summary>
         /// <remarks>https://getstream.io/activity-feeds/docs/dotnet-csharp/reactions_introduction/?language=csharp</remarks>
@@ -61,4 +61,4 @@ public interface IReactions
         /// <remarks>https://getstream.io/activity-feeds/docs/dotnet-csharp/reactions_introduction/?language=csharp</remarks>
         Task<Reaction> UpdateAsync(string reactionId, IDictionary<string, object> data = null, IEnumerable<string> targetFeeds = null);
     }
-}
+}
diff --git a/src/IStreamClient.cs b/src/IStreamClient.cs
@@ -26,6 +26,8 @@ public interface IStreamClient
         /// </summary>
         IReactions Reactions { get; }
 
+        IModeration Moderation { get; }
+
         /// <summary>
         /// Returns an <see cref="IUsers"/> instance that let's you interact with users.
         /// You can used the returned instance as a singleton in your application.
diff --git a/src/Models/Activity.cs b/src/Models/Activity.cs
@@ -23,6 +23,8 @@ public class Activity : ActivityBase
         public string Origin { get; set; }
         public Dictionary<string, object> ScoreVars { get; set; }
 
+        public string ModerationTemplate { get; set; }
+
         public Activity(string actor, string verb, string @object)
         {
             Actor = actor;
@@ -41,6 +43,19 @@ public class AddActivitiesResponse : ResponseBase
         public List<Activity> Activities { get; set; }
     }
 
+    public class ModerationResponse
+    {
+        public string Status { get; set; }
+        public string RecommendedAction { get; set; }
+        public APIError APIError { get; set; }
+    }
+
+    public class APIError
+    {
+        public string Code { get; set; }
+        public string Message { get; set; }
+    }
+
     public class ActivityPartialUpdateRequestObject
     {
         public string Id { get; set; }
@@ -49,4 +64,4 @@ public class ActivityPartialUpdateRequestObject
         public IEnumerable<string> Unset { get; set; }
         public DateTime? Time { get; set; }
     }
-}
+}
diff --git a/src/Models/GetOptions.cs b/src/Models/GetOptions.cs
@@ -22,6 +22,7 @@ public class GetOptions
         private bool _score_vars = false;
         private string _discard_actors = null;
         private string _discard_actors_sep = null;
+        private string _moderation_template = null;
 
         private IDictionary<string, string> _custom = null;
 
@@ -142,6 +143,9 @@ internal void Apply(RestRequest request)
             if (!string.IsNullOrWhiteSpace(_ranking_vars))
                 request.AddQueryParameter("ranking_vars", _ranking_vars);
 
+            if (!string.IsNullOrWhiteSpace(_moderation_template))
+                request.AddQueryParameter("moderation_template", _moderation_template);
+
             if (_score_vars)
                 request.AddQueryParameter("withScoreVars", "true");
 
diff --git a/src/Models/Reaction.cs b/src/Models/Reaction.cs
@@ -1,4 +1,5 @@
 using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 using Stream.Rest;
 using System;
 using System.Collections.Generic;
@@ -14,6 +15,7 @@ public class Reaction
         public DateTime? UpdatedAt { get; set; }
         public string ActivityId { get; set; }
         public string UserId { get; set; }
+        public string ModerationTemplate { get; set; }
         public GenericData User { get; set; }
 
         public IDictionary<string, object> Data { get; set; }
@@ -30,6 +32,20 @@ public class Reaction
         public DateTime? DeletedAt { get; set; }
 
         public string Ref() => $"SR:{Id}";
+
+        public Dictionary<string, object> Moderation { get; set; }
+        public ModerationResponse GetModerationResponse()
+        {
+            var key = "response";
+            if (Moderation != null && Moderation.ContainsKey(key))
+            {
+                return ((JObject)Moderation[key]).ToObject<ModerationResponse>();
+            }
+            else
+            {
+                throw new KeyNotFoundException($"Key '{key}' not found in moderation dictionary.");
+            }
+        }
     }
 
     public class ReactionsWithActivity : GenericGetResponse<Reaction>
@@ -114,4 +130,4 @@ public ReactionPagination Kind(string kind)
         public string GetPath()
             => _kind == null ? $"{_lookupAttr}/{_lookupValue}/" : $"{_lookupAttr}/{_lookupValue}/{_kind}/";
     }
-}
+}
diff --git a/src/Moderation.cs b/src/Moderation.cs
@@ -0,0 +1,51 @@
+using Stream.Models;
+using Stream.Rest;
+using Stream.Utils;
+using System;
+using System.Collections.Generic;
+using System.Net;
+using System.Net.Http;
+using System.Reflection;
+using System.Threading.Tasks;
+
+namespace Stream
+{
+    public class Moderation : IModeration
+    {
+        private readonly StreamClient _client;
+
+        public Moderation(StreamClient client)
+        {
+            _client = client;
+        }
+
+        public async Task<ResponseBase> FlagUserAsync(string flaggedUserID, string reason, IDictionary<string, object> options = null)
+        {
+            return await FlagAsync("stream:user", flaggedUserID, string.Empty, reason, options);
+        }
+
+        public async Task<ResponseBase> FlagActivityAsync(string entityId, string entityCreatorID, string reason, IDictionary<string, object> options = null)
+        {
+            return await FlagAsync("stream:feeds:v2:activity", entityId, entityCreatorID, reason, options);
+        }
+
+        public async Task<ResponseBase> FlagReactionAsync(string entityId, string entityCreatorID, string reason, IDictionary<string, object> options = null)
+        {
+            return await FlagAsync("stream:feeds:v2:reaction", entityId, entityCreatorID, reason, options);
+        }
+
+        public async Task<ResponseBase> FlagAsync(string entityType, string entityId, string entityCreatorID,
+            string reason, IDictionary<string, object> options = null)
+        {
+            var request = _client.BuildAppRequest("/moderation/flag", HttpMethod.Post);
+            request.SetJsonBody(StreamJsonConverter.SerializeObject(new
+            {
+                user_id = entityCreatorID, entity_type = entityType, entity_id = entityId, reason,
+            }));
+
+            var response = await _client.MakeRequestAsync(request);
+
+            return StreamJsonConverter.DeserializeObject<ResponseBase>(response.Content);
+        }
+    }
+}
diff --git a/src/Reactions.cs b/src/Reactions.cs
@@ -19,13 +19,13 @@ internal Reactions(StreamClient client)
         }
 
         public async Task<Reaction> AddAsync(string kind, string activityId, string userId,
-            IDictionary<string, object> data = null, IEnumerable<string> targetFeeds = null)
+            IDictionary<string, object> data = null, IEnumerable<string> targetFeeds = null, string moderationTemplate = null)
         {
-            return await AddAsync(null, kind, activityId, userId, data, targetFeeds);
+            return await AddAsync(null, kind, activityId, userId, data, targetFeeds, moderationTemplate);
         }
 
         public async Task<Reaction> AddAsync(string reactionId, string kind, string activityId, string userId,
-            IDictionary<string, object> data = null, IEnumerable<string> targetFeeds = null)
+            IDictionary<string, object> data = null, IEnumerable<string> targetFeeds = null, string moderationTemplate = null)
         {
             var r = new Reaction
             {
@@ -35,6 +35,7 @@ public async Task<Reaction> AddAsync(string reactionId, string kind, string acti
                 UserId = userId,
                 Data = data,
                 TargetFeeds = targetFeeds,
+                ModerationTemplate = moderationTemplate,
             };
 
             return await AddAsync(r);
@@ -186,4 +187,4 @@ private async Task<Reaction> AddAsync(Reaction r)
             throw StreamException.FromResponse(response);
         }
     }
-}
+}
diff --git a/src/StreamClient.cs b/src/StreamClient.cs
@@ -65,13 +65,15 @@ public StreamClient(string apiKey, string apiSecretOrToken, StreamClientOptions
                 stream_url, UriKind.Absolute);
 
             _client = new RestClient(url, TimeSpan.FromMilliseconds(_options.Timeout));
+
             var assemblyVersion = typeof(StreamClient).GetTypeInfo().Assembly.GetName().Version;
             Version = assemblyVersion.ToString(3);
 
             Batch = new BatchOperations(this);
             Collections = new Collections(this);
             Reactions = new Reactions(this);
             Users = new Users(this);
+            Moderation = new Moderation(this);
             var personalization = new RestClient(GetBasePersonalizationUrl(), TimeSpan.FromMilliseconds(_options.PersonalizationTimeout));
             Personalization = new Personalization(new StreamClient(_apiKey, _streamClientToken, personalization, _options));
             Files = new Files(this);
@@ -93,6 +95,7 @@ private StreamClient(string apiKey, IToken streamClientToken, RestClient client,
         public IPersonalization Personalization { get; }
         public IFiles Files { get; }
         public IImages Images { get; }
+        public IModeration Moderation { get; }
 
         public IStreamFeed Feed(string feedSlug, string userId)
         {
diff --git a/tests/ModerationTests.cs b/tests/ModerationTests.cs
@@ -0,0 +1,129 @@
+using NUnit.Framework;
+using Stream;
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+namespace StreamNetTests
+{
+    using Stream.Models;
+
+    [TestFixture]
+    public class ModerationTests : TestBase
+    {
+        [Test]
+        [Ignore("The api is not deployed yet")]
+        public async Task TestModerationTemplate()
+        {
+            var newActivity2 = new Activity("1", "test", "2")
+            {
+                ForeignId = "r-test-2",
+                Time = DateTime.Parse("2000-08-17T16:32:32"),
+            };
+            newActivity2.SetData("moderation_template", "moderation_template_test_images");
+
+            newActivity2.SetData("a", "pissoar");
+
+            var attachments = new Dictionary<string, object>();
+            string[] images = new string[] { "image1", "image2" };
+            attachments["images"] = images;
+
+            newActivity2.SetData("attachment", attachments);
+
+            var response = await this.UserFeed.AddActivityAsync(newActivity2);
+
+            var modResponse = response.GetData<ModerationResponse>("moderation");
+
+            Assert.AreEqual(modResponse.Status, "complete");
+            Assert.AreEqual(modResponse.RecommendedAction, "remove");
+        }
+
+        [Test]
+        [Ignore("The api is not deployed yet")]
+        public async Task TestReactionModeration()
+        {
+            var a = new Activity("user:1", "like", "cake")
+            {
+                ForeignId = "cake:1",
+                Time = DateTime.UtcNow,
+                Target = "johnny",
+            };
+
+            var activity = await this.UserFeed.AddActivityAsync(a);
+
+            var data = new Dictionary<string, object>() { { "field", "value" }, { "number", 2 }, { "text", "pissoar" }, };
+
+            var r = await Client.Reactions.AddAsync("like", activity.Id, "bobby", data, null, "moderation_config_1_reaction");
+
+            Assert.NotNull(r);
+            Assert.AreEqual(r.ActivityId, activity.Id);
+            Assert.AreEqual(r.Kind, "like");
+            Assert.AreEqual(r.UserId, "bobby");
+            Assert.AreEqual(r.Data, data);
+
+            var response = r.GetModerationResponse();
+
+            Assert.AreEqual("complete", response.Status);
+            Assert.AreEqual("remove", response.RecommendedAction);
+
+            Assert.ThrowsAsync<StreamException>(async () => await Client.Reactions.GetAsync(r.Id));
+        }
+
+        [Test]
+        [Ignore("The api is not deployed yet")]
+        public async Task TestFlagUser()
+        {
+            var userId = Guid.NewGuid().ToString();
+            var userData = new Dictionary<string, object>
+            {
+                { "field", "value" },
+                { "is_admin", true },
+            };
+
+            var u = await Client.Users.AddAsync(userId, userData);
+
+            Assert.NotNull(u);
+            Assert.NotNull(u.CreatedAt);
+            Assert.NotNull(u.UpdatedAt);
+
+            var response = await Client.Moderation.FlagUserAsync(userId, "blood");
+            Assert.NotNull(response);
+        }
+
+        [Test]
+        [Ignore("The api is not deployed yet")]
+        public async Task TestFlagActivity()
+        {
+            var newActivity = new Activity("vishal", "test", "1");
+            newActivity.SetData<string>("stringint", "42");
+            newActivity.SetData<string>("stringdouble", "42.2");
+            newActivity.SetData<string>("stringcomplex", "{ \"test1\": 1, \"test2\": \"testing\" }");
+
+            var response = await this.UserFeed.AddActivityAsync(newActivity);
+            Assert.IsNotNull(response);
+
+            var response1 = await Client.Moderation.FlagActivityAsync(response.Id, response.Actor, "blood");
+
+            Assert.NotNull(response1);
+        }
+
+        [Test]
+        [Ignore("The api is not deployed yet")]
+        public async Task TestFlagReaction()
+        {
+            var a = new Activity("user:1", "like", "cake")
+            {
+                ForeignId = "cake:1",
+                Time = DateTime.UtcNow,
+                Target = "johnny",
+            };
+            var activity = await this.UserFeed.AddActivityAsync(a);
+            var data = new Dictionary<string, object>() { { "field", "value" }, { "number", 2 }, };
+            var r = await Client.Reactions.AddAsync("like", activity.Id, "bobby", data);
+            Assert.NotNull(r);
+
+            var response = await Client.Moderation.FlagReactionAsync(r.Id, r.UserId, "blood");
+            Assert.NotNull(response);
+        }
+    }
+}
diff --git a/tests/ReactionTests.cs b/tests/ReactionTests.cs

Original file line number	Diff line number	Diff line change
`@@ -19,13 +19,13 @@ internal Reactions(StreamClient client)`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`public async Task<Reaction> AddAsync(string kind, string activityId, string userId,`
`22`		`- IDictionary<string, object> data = null, IEnumerable<string> targetFeeds = null)`
	`22`	`+ IDictionary<string, object> data = null, IEnumerable<string> targetFeeds = null, string moderationTemplate = null)`
`23`	`23`	`{`
`24`		`- return await AddAsync(null, kind, activityId, userId, data, targetFeeds);`
	`24`	`+ return await AddAsync(null, kind, activityId, userId, data, targetFeeds, moderationTemplate);`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`public async Task<Reaction> AddAsync(string reactionId, string kind, string activityId, string userId,`
`28`		`- IDictionary<string, object> data = null, IEnumerable<string> targetFeeds = null)`
	`28`	`+ IDictionary<string, object> data = null, IEnumerable<string> targetFeeds = null, string moderationTemplate = null)`
`29`	`29`	`{`
`30`	`30`	`var r = new Reaction`
`31`	`31`	`{`
`@@ -35,6 +35,7 @@ public async Task<Reaction> AddAsync(string reactionId, string kind, string acti`
`35`	`35`	`UserId = userId,`
`36`	`36`	`Data = data,`
`37`	`37`	`TargetFeeds = targetFeeds,`
	`38`	`+ ModerationTemplate = moderationTemplate,`
`38`	`39`	`};`
`39`	`40`
`40`	`41`	`return await AddAsync(r);`
`@@ -186,4 +187,4 @@ private async Task<Reaction> AddAsync(Reaction r)`
`186`	`187`	`throw StreamException.FromResponse(response);`
`187`	`188`	`}`
`188`	`189`	`}`
`189`		`-}`
	`190`	`+}`