feat(reaction): add overload for reactionId (#74)

peterdeme · web-flow · commit 0696f98423f0 · 2022-05-24T12:16:07.000+02:00
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -1 +1 @@
-* @ferhatelmas @peterdeme
+* @ferhatelmas
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -16,7 +16,7 @@ jobs:
     env:
       DOTNET_CLI_TELEMETRY_OPTOUT: "true"
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
@@ -28,7 +28,7 @@ jobs:
           dotnet-version: 6.0.x
 
       - name: Dependency cache
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         id: cache
         with:
           path: ~/.nuget/packages
diff --git a/.github/workflows/initiate_release.yaml b/.github/workflows/initiate_release.yaml
@@ -11,15 +11,15 @@ jobs:
   init_release:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 0 # gives the changelog generator access to all previous commits
 
       - name: Create release branch
         run: scripts/create_release_branch.sh "${{ github.event.inputs.version }}"
 
       - name: Get changelog diff
-        uses: actions/github-script@v5
+        uses: actions/github-script@v6
         with:
           script: |
             const get_change_log_diff = require('./scripts/get_changelog_diff.js')
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -13,11 +13,11 @@ jobs:
     env:
       DOTNET_CLI_TELEMETRY_OPTOUT: "true"
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 0
   
-      - uses: actions/github-script@v5
+      - uses: actions/github-script@v6
         with:
           script: |
             const get_change_log_diff = require('./scripts/get_changelog_diff.js')
diff --git a/.github/workflows/reviewdog.yml b/.github/workflows/reviewdog.yml
@@ -10,14 +10,14 @@ jobs:
   reviewdog:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - uses: reviewdog/action-setup@v1
         with:
           reviewdog_version: latest
 
       - name: Setup dotnet
-        uses: actions/setup-dotnet@v1
+        uses: actions/setup-dotnet@v2
         with:
           dotnet-version: 6.0.x
 
diff --git a/src/IReactions.cs b/src/IReactions.cs
@@ -13,10 +13,18 @@ namespace Stream
     /// <remarks>https://getstream.io/activity-feeds/docs/dotnet-csharp/reactions_introduction/?language=csharp</remarks>
     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);
+
         /// <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);
 
+        /// <summary>Adds a new child reaction.</summary>
+        /// <remarks>https://getstream.io/activity-feeds/docs/dotnet-csharp/reactions_introduction/?language=csharp</remarks>
+        Task<Reaction> AddChildAsync(Reaction parent, string reactionId, string kind, string userId, IDictionary<string, object> data = null, IEnumerable<string> targetFeeds = null);
+
         /// <summary>Adds a new child reaction.</summary>
         /// <remarks>https://getstream.io/activity-feeds/docs/dotnet-csharp/reactions_introduction/?language=csharp</remarks>
         Task<Reaction> AddChildAsync(Reaction parent, string kind, string userId, IDictionary<string, object> data = null, IEnumerable<string> targetFeeds = null);
diff --git a/src/Reactions.cs b/src/Reactions.cs
@@ -20,9 +20,16 @@ internal Reactions(StreamClient client)
 
         public async Task<Reaction> AddAsync(string kind, string activityId, string userId,
             IDictionary<string, object> data = null, IEnumerable<string> targetFeeds = null)
+        {
+            return await AddAsync(null, kind, activityId, userId, data, targetFeeds);
+        }
+
+        public async Task<Reaction> AddAsync(string reactionId, string kind, string activityId, string userId,
+            IDictionary<string, object> data = null, IEnumerable<string> targetFeeds = null)
         {
             var r = new Reaction
             {
+                Id = reactionId,
                 Kind = kind,
                 ActivityId = activityId,
                 UserId = userId,
@@ -35,9 +42,16 @@ public async Task<Reaction> AddAsync(string kind, string activityId, string user
 
         public async Task<Reaction> AddChildAsync(Reaction parent, string kind, string userId,
             IDictionary<string, object> data = null, IEnumerable<string> targetFeeds = null)
+        {
+            return await AddChildAsync(parent, null, kind, userId, data, targetFeeds);
+        }
+
+        public async Task<Reaction> AddChildAsync(Reaction parent, string reactionId, string kind, string userId,
+            IDictionary<string, object> data = null, IEnumerable<string> targetFeeds = null)
         {
             var r = new Reaction()
             {
+                Id = reactionId,
                 Kind = kind,
                 UserId = userId,
                 Data = data,
diff --git a/src/Rest/RestClient.cs b/src/Rest/RestClient.cs
@@ -66,16 +66,16 @@ private HttpContent CreateFileStream(RestRequest request)
         private Uri BuildUri(RestRequest request)
         {
             var queryStringBuilder = new StringBuilder();
-            request.QueryParameters.ForEach((p) =>
+            request.QueryParameters.ForEach(p =>
             {
                 queryStringBuilder.Append(queryStringBuilder.Length == 0 ? "?" : "&");
-                queryStringBuilder.Append($"{p.Key}={Uri.EscapeDataString(p.Value.ToString())}");
+                queryStringBuilder.Append($"{p.Key}={Uri.EscapeDataString(p.Value)}");
             });
 
             return new Uri(_baseUrl, request.Resource + queryStringBuilder.ToString());
         }
 
-        public async Task<RestResponse> ExecuteHttpRequestAsync(RestRequest request)
+        internal async Task<RestResponse> ExecuteHttpRequestAsync(RestRequest request)
         {
             var uri = BuildUri(request);
 
diff --git a/src/Rest/RestRequest.cs b/src/Rest/RestRequest.cs
@@ -11,22 +11,22 @@ internal RestRequest(string resource, HttpMethod method)
             Resource = resource;
         }
 
-        public Dictionary<string, string> QueryParameters { get; private set; } = new Dictionary<string, string>();
-        public Dictionary<string, string> Headers { get; private set; } = new Dictionary<string, string>();
-        public HttpMethod Method { get; private set; }
-        public string Resource { get; private set; }
-        public string JsonBody { get; private set; }
-        public System.IO.Stream FileStream { get; private set; }
-        public string FileStreamContentType { get; private set; }
-        public string FileStreamName { get; private set; }
+        internal Dictionary<string, string> QueryParameters { get; private set; } = new Dictionary<string, string>();
+        internal Dictionary<string, string> Headers { get; private set; } = new Dictionary<string, string>();
+        internal HttpMethod Method { get; private set; }
+        internal string Resource { get; private set; }
+        internal string JsonBody { get; private set; }
+        internal System.IO.Stream FileStream { get; private set; }
+        internal string FileStreamContentType { get; private set; }
+        internal string FileStreamName { get; private set; }
 
-        public void AddHeader(string name, string value) => Headers[name] = value;
+        internal void AddHeader(string name, string value) => Headers[name] = value;
 
-        public void AddQueryParameter(string name, string value) => QueryParameters[name] = value;
+        internal void AddQueryParameter(string name, string value) => QueryParameters[name] = value;
 
-        public void SetJsonBody(string json) => JsonBody = json;
+        internal void SetJsonBody(string json) => JsonBody = json;
 
-        public void SetFileStream(System.IO.Stream stream, string name, string contentType)
+        internal void SetFileStream(System.IO.Stream stream, string name, string contentType)
         {
             FileStream = stream;
             FileStreamName = name;
diff --git a/src/Rest/RestResponse.cs b/src/Rest/RestResponse.cs
@@ -1,15 +1,14 @@
-﻿using System;
-using System.Net;
+﻿using System.Net;
 using System.Net.Http;
 using System.Threading.Tasks;
 
 namespace Stream.Rest
 {
     internal class RestResponse
     {
-        public HttpStatusCode StatusCode { get; set; }
+        internal HttpStatusCode StatusCode { get; set; }
 
-        public string Content { get; set; }
+        internal string Content { get; set; }
 
         internal static async Task<RestResponse> FromResponseMessage(HttpResponseMessage message)
         {
diff --git a/src/Utils/ActivityIdGenerator.cs b/src/Utils/ActivityIdGenerator.cs
@@ -0,0 +1,130 @@
+using System;
+using System.IO;
+using System.Text;
+
+namespace Stream.Utils
+{
+    /// <summary>Utility class to generate a unique activity id.</summary>
+    public static class ActivityIdGenerator
+    {
+        private static DateTime Epoch = new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc);
+        private static long EpochTicks = Epoch.Ticks;
+
+        // Difference in 100-nanosecond intervals between
+        // UUID epoch (October 15, 1582) and Unix epoch (January 1, 1970)
+        private static long UuidEpochDifference = 122192928000000000;
+
+        /// <summary>Generates an Activity ID for the given epoch timestamp and foreign ID.</summary>
+        public static Guid GenerateId(int epoch, string foreignId)
+        {
+            return GenerateId(Epoch.AddSeconds(epoch), foreignId);
+        }
+
+        /// <summary>Generates an Activity ID for the given timestamp and foreign ID.</summary>
+        public static Guid GenerateId(DateTime timestamp, string foreignId)
+        {
+            var unixNano = timestamp.Ticks - EpochTicks;
+            var t = (ulong)(UuidEpochDifference + unixNano);
+
+            long signedDigest;
+            using (var stream = new MemoryStream(Encoding.UTF8.GetBytes(foreignId)))
+            {
+                var hashAsInt = Murmur3.Hash(stream);
+
+                if (hashAsInt > int.MaxValue)
+                    signedDigest = (long)hashAsInt - 4294967296;
+                else
+                    signedDigest = hashAsInt;
+            }
+
+            long signMask;
+            if (signedDigest > 0)
+            {
+                signMask = 0x100000000;
+            }
+            else
+            {
+                signedDigest *= -1;
+                signMask = 0x000000000;
+            }
+
+            signedDigest = (signedDigest | signMask) | 0x800000000000;
+
+            var nodeBytes = PutUint64((ulong)signedDigest);
+
+            var finalBytes = new byte[16];
+            Array.Copy(PutUint32(TrimUlongToUint(t)), 0, finalBytes, 0, 4);
+            Array.Copy(PutUint16(TrimUlongToUshort(t >> 32)), 0, finalBytes, 4, 2);
+            Array.Copy(PutUint16((ushort)(0x1000 | TrimUlongToUshort(t >> 48))), 0, finalBytes, 6, 2);
+            Array.Copy(PutUint16(TrimUlongToUshort(0x8080)), 0, finalBytes, 8, 2);
+
+            // Now to the final
+            Array.Copy(nodeBytes, 2, finalBytes, 10, 6);
+
+            return new Guid(BytesToGuidString(finalBytes));
+        }
+
+        private static byte[] PutUint64(ulong v)
+        {
+            var b = new byte[8];
+            b[0] = (byte)((v >> 56) & 0xFF);
+            b[1] = (byte)((v >> 48) & 0xFF);
+            b[2] = (byte)((v >> 40) & 0xFF);
+            b[3] = (byte)((v >> 32) & 0xFF);
+            b[4] = (byte)((v >> 24) & 0xFF);
+            b[5] = (byte)((v >> 16) & 0xFF);
+            b[6] = (byte)((v >> 8) & 0xFF);
+            b[7] = (byte)(v & 0xFF);
+
+            return b;
+        }
+
+        private static byte[] PutUint32(uint v)
+        {
+            var b = new byte[4];
+            b[0] = (byte)((v >> 24) & 0xFF);
+            b[1] = (byte)((v >> 16) & 0xFF);
+            b[2] = (byte)((v >> 8) & 0xFF);
+            b[3] = (byte)(v & 0xFF);
+
+            return b;
+        }
+
+        private static byte[] PutUint16(ushort v)
+        {
+            var b = new byte[2];
+            b[0] = (byte)((v >> 8) & 0xFF);
+            b[1] = (byte)(v & 0xFF);
+
+            return b;
+        }
+
+        private static uint TrimUlongToUint(ulong l)
+        {
+            return (uint)(l & 0xFFFFFFFF);
+        }
+
+        private static ushort TrimUlongToUshort(ulong l)
+        {
+            return (ushort)(l & 0xFFFF);
+        }
+
+        private static string BytesToGuidString(byte[] b)
+        {
+            var offsets = new int[16] { 0, 2, 4, 6, 9, 11, 14, 16, 19, 21, 24, 26, 28, 30, 32, 34 };
+            var hexString = "0123456789abcdef";
+            var retVal = new byte[36];
+            for (var i = 0; i < b.Length; i++)
+            {
+                var value = b[i];
+                retVal[offsets[i]] = (byte)hexString[value >> 4];
+                retVal[offsets[i] + 1] = (byte)hexString[value & 0xF];
+            }
+
+            const int dash = 45; // The dash character '-'
+            retVal[8] = retVal[13] = retVal[18] = retVal[23] = dash;
+
+            return Encoding.UTF8.GetString(retVal);
+        }
+    }
+}
diff --git a/src/Utils/Extensions.cs b/src/Utils/Extensions.cs
@@ -8,7 +8,7 @@ internal static class Extensions
     {
         internal static void ForEach<T>(this IEnumerable<T> items, Action<T> action)
         {
-            if ((items == null) || (action == null))
+            if (items == null || action == null)
                 return;
 
             foreach (var item in items)
diff --git a/src/Utils/Murmur3.cs b/src/Utils/Murmur3.cs
diff --git a/tests/Credentials.cs b/tests/Credentials.cs
diff --git a/tests/ReactionTests.cs b/tests/ReactionTests.cs
diff --git a/tests/UtilsTests.cs b/tests/UtilsTests.cs

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-* @ferhatelmas @peterdeme`
	`1`	`+* @ferhatelmas`
Original file line number	Diff line number	Diff line change
`@@ -66,16 +66,16 @@ private HttpContent CreateFileStream(RestRequest request)`
`66`	`66`	`private Uri BuildUri(RestRequest request)`
`67`	`67`	`{`
`68`	`68`	`var queryStringBuilder = new StringBuilder();`
`69`		`- request.QueryParameters.ForEach((p) =>`
	`69`	`+ request.QueryParameters.ForEach(p =>`
`70`	`70`	`{`
`71`	`71`	`queryStringBuilder.Append(queryStringBuilder.Length == 0 ? "?" : "&");`
`72`		`- queryStringBuilder.Append($"{p.Key}={Uri.EscapeDataString(p.Value.ToString())}");`
	`72`	`+ queryStringBuilder.Append($"{p.Key}={Uri.EscapeDataString(p.Value)}");`
`73`	`73`	`});`
`74`	`74`
`75`	`75`	`return new Uri(_baseUrl, request.Resource + queryStringBuilder.ToString());`
`76`	`76`	`}`
`77`	`77`
`78`		`- public async Task<RestResponse> ExecuteHttpRequestAsync(RestRequest request)`
	`78`	`+ internal async Task<RestResponse> ExecuteHttpRequestAsync(RestRequest request)`
`79`	`79`	`{`
`80`	`80`	`var uri = BuildUri(request);`
`81`	`81`
Original file line number	Diff line number	Diff line change
`@@ -1,15 +1,14 @@`
`1`		`-using System;`
`2`		`-using System.Net;`
	`1`	`+using System.Net;`
`3`	`2`	`using System.Net.Http;`
`4`	`3`	`using System.Threading.Tasks;`
`5`	`4`
`6`	`5`	`namespace Stream.Rest`
`7`	`6`	`{`
`8`	`7`	`internal class RestResponse`
`9`	`8`	`{`
`10`		`- public HttpStatusCode StatusCode { get; set; }`
	`9`	`+ internal HttpStatusCode StatusCode { get; set; }`
`11`	`10`
`12`		`- public string Content { get; set; }`
	`11`	`+ internal string Content { get; set; }`
`13`	`12`
`14`	`13`	`internal static async Task<RestResponse> FromResponseMessage(HttpResponseMessage message)`
`15`	`14`	`{`