[FEEDS-1259] Option to skip moderation for serverside requests

src/main/java/io/getstream/client/Client.java

@@ -47,9 +47,10 @@ public CompletableFuture<Activity> updateActivityByID(ActivityUpdate update)
   }
 
   public CompletableFuture<Activity> updateActivityByID(
-      String id, Map<String, Object> set, String[] unset) throws StreamException {
+      String id, Map<String, Object> set, String[] unset, RequestOption... options)
+      throws StreamException {
     final Token token = buildActivityToken(secret, TokenAction.WRITE);
-    return stream.updateActivityByID(token, id, set, unset);
+    return stream.updateActivityByID(token, id, set, unset, options);
   }
 
   public CompletableFuture<Activity> updateActivityByForeignID(
@@ -82,10 +83,10 @@ public CompletableFuture<Activity> updateActivityByForeignID(ActivityUpdate upda
   }
 
   public CompletableFuture<Activity> updateActivityByForeignID(
-      String foreignID, Date timestamp, Map<String, Object> set, String[] unset)
-      throws StreamException {
+      String foreignID, Date timestamp, Map<String, Object> set, String[] unset,
+      RequestOption... options) throws StreamException {
     final Token token = buildActivityToken(secret, TokenAction.WRITE);
-    return stream.updateActivityByForeignID(token, foreignID, timestamp, set, unset);
+    return stream.updateActivityByForeignID(token, foreignID, timestamp, set, unset, options);
   }
 
   public CompletableFuture<OGData> openGraph(URL url) throws StreamException {
@@ -95,24 +96,34 @@ public CompletableFuture<OGData> openGraph(URL url) throws StreamException {
 
   public CompletableFuture<List<Activity>> updateActivitiesByID(Iterable<ActivityUpdate> updates)
       throws StreamException {
-    return updateActivitiesByID(Iterables.toArray(updates, ActivityUpdate.class));
+    return updateActivitiesByID(Iterables.toArray(updates, ActivityUpdate.class), new RequestOption[0]);
   }
 
   public CompletableFuture<List<Activity>> updateActivitiesByID(ActivityUpdate... updates)
       throws StreamException {
+    return updateActivitiesByID(updates, new RequestOption[0]);
+  }
+
+  public CompletableFuture<List<Activity>> updateActivitiesByID(
+      ActivityUpdate[] updates, RequestOption... options) throws StreamException {
     final Token token = buildActivityToken(secret, TokenAction.WRITE);
-    return stream.updateActivitiesByID(token, updates);
+    return stream.updateActivitiesByID(token, updates, options);
   }
 
   public CompletableFuture<List<Activity>> updateActivitiesByForeignID(
       Iterable<ActivityUpdate> updates) throws StreamException {
-    return updateActivitiesByForeignID(Iterables.toArray(updates, ActivityUpdate.class));
+    return updateActivitiesByForeignID(Iterables.toArray(updates, ActivityUpdate.class), new RequestOption[0]);
   }
 
   public CompletableFuture<List<Activity>> updateActivitiesByForeignID(ActivityUpdate... updates)
       throws StreamException {
+    return updateActivitiesByForeignID(updates, new RequestOption[0]);
+  }
+
+  public CompletableFuture<List<Activity>> updateActivitiesByForeignID(
+      ActivityUpdate[] updates, RequestOption... options) throws StreamException {
     final Token token = buildActivityToken(secret, TokenAction.WRITE);
-    return stream.updateActivitiesByForeignID(token, updates);
+    return stream.updateActivitiesByForeignID(token, updates, options);
   }
 
   public static final class Builder {
@@ -280,15 +291,21 @@ CompletableFuture<Response> getEnrichedActivities(FeedID feed, RequestOption...
     return stream.getEnrichedActivities(token, feed, options);
   }
 
-  CompletableFuture<Response> addActivity(FeedID feed, Activity activity) throws StreamException {
+  CompletableFuture<Response> addActivity(FeedID feed, Activity activity, RequestOption... options)
+      throws StreamException {
     final Token token = buildFeedToken(secret, feed, TokenAction.WRITE);
-    return stream.addActivity(token, feed, activity);
+    return stream.addActivity(token, feed, activity, options);
   }
 
   CompletableFuture<Response> addActivities(FeedID feed, Activity... activities)
       throws StreamException {
+    return addActivities(feed, activities, new RequestOption[0]);
+  }
+
+  CompletableFuture<Response> addActivities(
+      FeedID feed, Activity[] activities, RequestOption... options) throws StreamException {
     final Token token = buildFeedToken(secret, feed, TokenAction.WRITE);
-    return stream.addActivities(token, feed, activities);
+    return stream.addActivities(token, feed, activities, options);
   }
 
   CompletableFuture<Response> removeActivityByID(FeedID feed, String id) throws StreamException {

src/main/java/io/getstream/client/Feed.java

@@ -50,9 +50,10 @@ public final String getUserID() {
     return id.getUserID();
   }
 
-  public final CompletableFuture<Activity> addActivity(Activity activity) throws StreamException {
+  public final CompletableFuture<Activity> addActivity(Activity activity, RequestOption... options)
+      throws StreamException {
     return getClient()
-        .addActivity(id, activity)
+        .addActivity(id, activity, options)
         .thenApply(
             response -> {
               try {
@@ -63,9 +64,10 @@ public final CompletableFuture<Activity> addActivity(Activity activity) throws S
             });
   }
 
-  public final <T> CompletableFuture<T> addCustomActivity(T activity) throws StreamException {
+  public final <T> CompletableFuture<T> addCustomActivity(T activity, RequestOption... options)
+      throws StreamException {
     return getClient()
-        .addActivity(id, Activity.builder().fromCustomActivity(activity).build())
+        .addActivity(id, Activity.builder().fromCustomActivity(activity).build(), options)
         .thenApply(
             response -> {
               try {
@@ -78,7 +80,7 @@ public final <T> CompletableFuture<T> addCustomActivity(T activity) throws Strea
 
   public final CompletableFuture<List<Activity>> addActivities(Iterable<Activity> activities)
       throws StreamException {
-    return addActivities(Iterables.toArray(activities, Activity.class));
+    return addActivities(Iterables.toArray(activities, Activity.class), new RequestOption[0]);
   }
 
   public final <T> CompletableFuture<List<T>> addCustomActivities(Iterable<T> activities)
@@ -88,7 +90,7 @@ public final <T> CompletableFuture<List<T>> addCustomActivities(Iterable<T> acti
             .map(activity -> Activity.builder().fromCustomActivity(activity).build())
             .toArray(Activity[]::new);
     return getClient()
-        .addActivities(id, custom)
+        .addActivities(id, custom, new RequestOption[0])
         .thenApply(
             response -> {
               try {
@@ -105,8 +107,13 @@ public final <T> CompletableFuture<List<T>> addCustomActivities(Iterable<T> acti
 
   public final CompletableFuture<List<Activity>> addActivities(Activity... activities)
       throws StreamException {
+    return addActivities(activities, new RequestOption[0]);
+  }
+
+  public final CompletableFuture<List<Activity>> addActivities(
+      Activity[] activities, RequestOption... options) throws StreamException {
     return getClient()
-        .addActivities(id, activities)
+        .addActivities(id, activities, options)
         .thenApply(
             response -> {
               try {
@@ -124,7 +131,7 @@ public final <T> CompletableFuture<List<T>> addCustomActivities(T... activities)
             .map(activity -> Activity.builder().fromCustomActivity(activity).build())
             .toArray(Activity[]::new);
     return getClient()
-        .addActivities(id, custom)
+        .addActivities(id, custom, new RequestOption[0])
         .thenApply(
             response -> {
               try {

src/main/java/io/getstream/client/ReactionsClient.java

@@ -15,6 +15,7 @@
 import io.getstream.core.models.ReactionBatch;
 import io.getstream.core.options.Filter;
 import io.getstream.core.options.Limit;
+import io.getstream.core.options.RequestOption;
 import io.getstream.core.utils.Auth.TokenAction;
 import io.getstream.core.utils.DefaultOptions;
 import java.util.List;
@@ -168,10 +169,18 @@ public CompletableFuture<Reaction> add(String userID, Reaction reaction, FeedID.
     return reactions.add(token, userID, reaction, targetFeeds);
   }
 
-  public CompletableFuture<Reaction> add(String userID, Reaction reaction, FeedID[] targetFeeds, Map<String, Object> targetFeedsExtraData)
+  public CompletableFuture<Reaction> add(
+      String userID, Reaction reaction, FeedID[] targetFeeds, RequestOption... options)
       throws StreamException {
     final Token token = buildReactionsToken(secret, TokenAction.WRITE);
-    return reactions.add(token, userID, reaction, targetFeeds, targetFeedsExtraData);
+    return reactions.add(token, userID, reaction, targetFeeds, null, options);
+  }
+
+  public CompletableFuture<Reaction> add(
+      String userID, Reaction reaction, FeedID[] targetFeeds,
+      Map<String, Object> targetFeedsExtraData, RequestOption... options) throws StreamException {
+    final Token token = buildReactionsToken(secret, TokenAction.WRITE);
+    return reactions.add(token, userID, reaction, targetFeeds, targetFeedsExtraData, options);
   }
 
   public CompletableFuture<Reaction> addChild(
@@ -237,6 +246,12 @@ public CompletableFuture<Void> update(Reaction reaction, FeedID... targetFeeds)
     return reactions.update(token, reaction, targetFeeds);
   }
 
+  public CompletableFuture<Void> update(
+      Reaction reaction, FeedID[] targetFeeds, RequestOption... options) throws StreamException {
+    final Token token = buildReactionsToken(secret, TokenAction.WRITE);
+    return reactions.update(token, reaction, targetFeeds, options);
+  }
+
   public CompletableFuture<Void> delete(String id) throws StreamException {
     final Token token = buildReactionsToken(secret, TokenAction.DELETE);
     return reactions.delete(token, id, false);

src/main/java/io/getstream/cloud/CloudClient.java

@@ -337,13 +337,19 @@ CompletableFuture<Response> getEnrichedActivities(FeedID feed, RequestOption...
     return stream.getEnrichedActivities(token, feed, options);
   }
 
-  CompletableFuture<Response> addActivity(FeedID feed, Activity activity) throws StreamException {
-    return stream.addActivity(token, feed, activity);
+  CompletableFuture<Response> addActivity(FeedID feed, Activity activity, RequestOption... options)
+      throws StreamException {
+    return stream.addActivity(token, feed, activity, options);
   }
 
   CompletableFuture<Response> addActivities(FeedID feed, Activity... activities)
       throws StreamException {
-    return stream.addActivities(token, feed, activities);
+    return addActivities(feed, activities, new RequestOption[0]);
+  }
+
+  CompletableFuture<Response> addActivities(
+      FeedID feed, Activity[] activities, RequestOption... options) throws StreamException {
+    return stream.addActivities(token, feed, activities, options);
   }
 
   CompletableFuture<Response> removeActivityByID(FeedID feed, String id) throws StreamException {

src/main/java/io/getstream/cloud/CloudFeed.java

@@ -69,9 +69,10 @@ public final String getUserID() {
     return id.getUserID();
   }
 
-  public final CompletableFuture<Activity> addActivity(Activity activity) throws StreamException {
+  public final CompletableFuture<Activity> addActivity(Activity activity, RequestOption... options)
+      throws StreamException {
     return getClient()
-        .addActivity(id, activity)
+        .addActivity(id, activity, options)
         .thenApply(
             response -> {
               try {
@@ -82,9 +83,10 @@ public final CompletableFuture<Activity> addActivity(Activity activity) throws S
             });
   }
 
-  public final <T> CompletableFuture<T> addCustomActivity(T activity) throws StreamException {
+  public final <T> CompletableFuture<T> addCustomActivity(T activity, RequestOption... options)
+      throws StreamException {
     return getClient()
-        .addActivity(id, Activity.builder().fromCustomActivity(activity).build())
+        .addActivity(id, Activity.builder().fromCustomActivity(activity).build(), options)
         .thenApply(
             response -> {
               try {
@@ -97,7 +99,7 @@ public final <T> CompletableFuture<T> addCustomActivity(T activity) throws Strea
 
   public final CompletableFuture<List<Activity>> addActivities(Iterable<Activity> activities)
       throws StreamException {
-    return addActivities(Iterables.toArray(activities, Activity.class));
+    return addActivities(Iterables.toArray(activities, Activity.class), new RequestOption[0]);
   }
 
   public final <T> CompletableFuture<List<T>> addCustomActivities(Iterable<T> activities)
@@ -107,7 +109,7 @@ public final <T> CompletableFuture<List<T>> addCustomActivities(Iterable<T> acti
             .map(activity -> Activity.builder().fromCustomActivity(activity).build())
             .toArray(Activity[]::new);
     return getClient()
-        .addActivities(id, custom)
+        .addActivities(id, custom, new RequestOption[0])
         .thenApply(
             (Response response) -> {
               try {
@@ -124,8 +126,13 @@ public final <T> CompletableFuture<List<T>> addCustomActivities(Iterable<T> acti
 
   public final CompletableFuture<List<Activity>> addActivities(Activity... activities)
       throws StreamException {
+    return addActivities(activities, new RequestOption[0]);
+  }
+
+  public final CompletableFuture<List<Activity>> addActivities(
+      Activity[] activities, RequestOption... options) throws StreamException {
     return getClient()
-        .addActivities(id, activities)
+        .addActivities(id, activities, options)
         .thenApply(
             (Response response) -> {
               try {
@@ -143,7 +150,7 @@ public final <T> CompletableFuture<List<T>> addCustomActivities(T... activities)
             .map(activity -> Activity.builder().fromCustomActivity(activity).build())
             .toArray(Activity[]::new);
     return getClient()
-        .addActivities(id, custom)
+        .addActivities(id, custom, new RequestOption[0])
         .thenApply(
             (Response response) -> {
               try {

src/main/java/io/getstream/cloud/CloudReactionsClient.java

@@ -12,6 +12,7 @@
 import io.getstream.core.models.Reaction;
 import io.getstream.core.options.Filter;
 import io.getstream.core.options.Limit;
+import io.getstream.core.options.RequestOption;
 import io.getstream.core.utils.DefaultOptions;
 import java.util.List;
 import java.util.Map;
@@ -151,9 +152,16 @@ public CompletableFuture<Reaction> add(String userID, Reaction reaction, FeedID.
     return reactions.add(token, userID, reaction, targetFeeds);
   }
 
-  public CompletableFuture<Reaction> add(String userID, Reaction reaction, FeedID[] targetFeeds, Map<String, Object> targetFeedsExtraData)
+  public CompletableFuture<Reaction> add(
+      String userID, Reaction reaction, FeedID[] targetFeeds, RequestOption... options)
       throws StreamException {
-    return reactions.add(token, userID, reaction, targetFeeds, targetFeedsExtraData);
+    return reactions.add(token, userID, reaction, targetFeeds, null, options);
+  }
+
+  public CompletableFuture<Reaction> add(
+      String userID, Reaction reaction, FeedID[] targetFeeds,
+      Map<String, Object> targetFeedsExtraData, RequestOption... options) throws StreamException {
+    return reactions.add(token, userID, reaction, targetFeeds, targetFeedsExtraData, options);
   }
 
   public CompletableFuture<Reaction> addChild(
@@ -218,6 +226,11 @@ public CompletableFuture<Void> update(Reaction reaction, FeedID... targetFeeds)
     return reactions.update(token, reaction, targetFeeds);
   }
 
+  public CompletableFuture<Void> update(
+      Reaction reaction, FeedID[] targetFeeds, RequestOption... options) throws StreamException {
+    return reactions.update(token, reaction, targetFeeds, options);
+  }
+
   public CompletableFuture<Void> delete(String id) throws StreamException {
     return reactions.delete(token, id, false);
   }