Skip to content

Commit 3cf488e

Browse files
itsmeadiitsmeadi
authored
Merge pull request #189 from GetStream/FEEDS-1259
[FEEDS-1259] Option to skip moderation for serverside requests
2 parents db01fee + 217db64 commit 3cf488e

File tree

11 files changed

+415
-50
lines changed

11 files changed

+415
-50
lines changed

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

Lines changed: 29 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,10 @@ public CompletableFuture<Activity> updateActivityByID(ActivityUpdate update)
4747
}
4848

4949
public CompletableFuture<Activity> updateActivityByID(
50-
String id, Map<String, Object> set, String[] unset) throws StreamException {
50+
String id, Map<String, Object> set, String[] unset, RequestOption... options)
51+
throws StreamException {
5152
final Token token = buildActivityToken(secret, TokenAction.WRITE);
52-
return stream.updateActivityByID(token, id, set, unset);
53+
return stream.updateActivityByID(token, id, set, unset, options);
5354
}
5455

5556
public CompletableFuture<Activity> updateActivityByForeignID(
@@ -82,10 +83,10 @@ public CompletableFuture<Activity> updateActivityByForeignID(ActivityUpdate upda
8283
}
8384

8485
public CompletableFuture<Activity> updateActivityByForeignID(
85-
String foreignID, Date timestamp, Map<String, Object> set, String[] unset)
86-
throws StreamException {
86+
String foreignID, Date timestamp, Map<String, Object> set, String[] unset,
87+
RequestOption... options) throws StreamException {
8788
final Token token = buildActivityToken(secret, TokenAction.WRITE);
88-
return stream.updateActivityByForeignID(token, foreignID, timestamp, set, unset);
89+
return stream.updateActivityByForeignID(token, foreignID, timestamp, set, unset, options);
8990
}
9091

9192
public CompletableFuture<OGData> openGraph(URL url) throws StreamException {
@@ -95,24 +96,34 @@ public CompletableFuture<OGData> openGraph(URL url) throws StreamException {
9596

9697
public CompletableFuture<List<Activity>> updateActivitiesByID(Iterable<ActivityUpdate> updates)
9798
throws StreamException {
98-
return updateActivitiesByID(Iterables.toArray(updates, ActivityUpdate.class));
99+
return updateActivitiesByID(Iterables.toArray(updates, ActivityUpdate.class), new RequestOption[0]);
99100
}
100101

101102
public CompletableFuture<List<Activity>> updateActivitiesByID(ActivityUpdate... updates)
102103
throws StreamException {
104+
return updateActivitiesByID(updates, new RequestOption[0]);
105+
}
106+
107+
public CompletableFuture<List<Activity>> updateActivitiesByID(
108+
ActivityUpdate[] updates, RequestOption... options) throws StreamException {
103109
final Token token = buildActivityToken(secret, TokenAction.WRITE);
104-
return stream.updateActivitiesByID(token, updates);
110+
return stream.updateActivitiesByID(token, updates, options);
105111
}
106112

107113
public CompletableFuture<List<Activity>> updateActivitiesByForeignID(
108114
Iterable<ActivityUpdate> updates) throws StreamException {
109-
return updateActivitiesByForeignID(Iterables.toArray(updates, ActivityUpdate.class));
115+
return updateActivitiesByForeignID(Iterables.toArray(updates, ActivityUpdate.class), new RequestOption[0]);
110116
}
111117

112118
public CompletableFuture<List<Activity>> updateActivitiesByForeignID(ActivityUpdate... updates)
113119
throws StreamException {
120+
return updateActivitiesByForeignID(updates, new RequestOption[0]);
121+
}
122+
123+
public CompletableFuture<List<Activity>> updateActivitiesByForeignID(
124+
ActivityUpdate[] updates, RequestOption... options) throws StreamException {
114125
final Token token = buildActivityToken(secret, TokenAction.WRITE);
115-
return stream.updateActivitiesByForeignID(token, updates);
126+
return stream.updateActivitiesByForeignID(token, updates, options);
116127
}
117128

118129
public static final class Builder {
@@ -280,15 +291,21 @@ CompletableFuture<Response> getEnrichedActivities(FeedID feed, RequestOption...
280291
return stream.getEnrichedActivities(token, feed, options);
281292
}
282293

283-
CompletableFuture<Response> addActivity(FeedID feed, Activity activity) throws StreamException {
294+
CompletableFuture<Response> addActivity(FeedID feed, Activity activity, RequestOption... options)
295+
throws StreamException {
284296
final Token token = buildFeedToken(secret, feed, TokenAction.WRITE);
285-
return stream.addActivity(token, feed, activity);
297+
return stream.addActivity(token, feed, activity, options);
286298
}
287299

288300
CompletableFuture<Response> addActivities(FeedID feed, Activity... activities)
289301
throws StreamException {
302+
return addActivities(feed, activities, new RequestOption[0]);
303+
}
304+
305+
CompletableFuture<Response> addActivities(
306+
FeedID feed, Activity[] activities, RequestOption... options) throws StreamException {
290307
final Token token = buildFeedToken(secret, feed, TokenAction.WRITE);
291-
return stream.addActivities(token, feed, activities);
308+
return stream.addActivities(token, feed, activities, options);
292309
}
293310

294311
CompletableFuture<Response> removeActivityByID(FeedID feed, String id) throws StreamException {

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

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,10 @@ public final String getUserID() {
5050
return id.getUserID();
5151
}
5252

53-
public final CompletableFuture<Activity> addActivity(Activity activity) throws StreamException {
53+
public final CompletableFuture<Activity> addActivity(Activity activity, RequestOption... options)
54+
throws StreamException {
5455
return getClient()
55-
.addActivity(id, activity)
56+
.addActivity(id, activity, options)
5657
.thenApply(
5758
response -> {
5859
try {
@@ -63,9 +64,10 @@ public final CompletableFuture<Activity> addActivity(Activity activity) throws S
6364
});
6465
}
6566

66-
public final <T> CompletableFuture<T> addCustomActivity(T activity) throws StreamException {
67+
public final <T> CompletableFuture<T> addCustomActivity(T activity, RequestOption... options)
68+
throws StreamException {
6769
return getClient()
68-
.addActivity(id, Activity.builder().fromCustomActivity(activity).build())
70+
.addActivity(id, Activity.builder().fromCustomActivity(activity).build(), options)
6971
.thenApply(
7072
response -> {
7173
try {
@@ -78,7 +80,7 @@ public final <T> CompletableFuture<T> addCustomActivity(T activity) throws Strea
7880

7981
public final CompletableFuture<List<Activity>> addActivities(Iterable<Activity> activities)
8082
throws StreamException {
81-
return addActivities(Iterables.toArray(activities, Activity.class));
83+
return addActivities(Iterables.toArray(activities, Activity.class), new RequestOption[0]);
8284
}
8385

8486
public final <T> CompletableFuture<List<T>> addCustomActivities(Iterable<T> activities)
@@ -88,7 +90,7 @@ public final <T> CompletableFuture<List<T>> addCustomActivities(Iterable<T> acti
8890
.map(activity -> Activity.builder().fromCustomActivity(activity).build())
8991
.toArray(Activity[]::new);
9092
return getClient()
91-
.addActivities(id, custom)
93+
.addActivities(id, custom, new RequestOption[0])
9294
.thenApply(
9395
response -> {
9496
try {
@@ -105,8 +107,13 @@ public final <T> CompletableFuture<List<T>> addCustomActivities(Iterable<T> acti
105107

106108
public final CompletableFuture<List<Activity>> addActivities(Activity... activities)
107109
throws StreamException {
110+
return addActivities(activities, new RequestOption[0]);
111+
}
112+
113+
public final CompletableFuture<List<Activity>> addActivities(
114+
Activity[] activities, RequestOption... options) throws StreamException {
108115
return getClient()
109-
.addActivities(id, activities)
116+
.addActivities(id, activities, options)
110117
.thenApply(
111118
response -> {
112119
try {
@@ -124,7 +131,7 @@ public final <T> CompletableFuture<List<T>> addCustomActivities(T... activities)
124131
.map(activity -> Activity.builder().fromCustomActivity(activity).build())
125132
.toArray(Activity[]::new);
126133
return getClient()
127-
.addActivities(id, custom)
134+
.addActivities(id, custom, new RequestOption[0])
128135
.thenApply(
129136
response -> {
130137
try {

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

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import io.getstream.core.models.ReactionBatch;
1616
import io.getstream.core.options.Filter;
1717
import io.getstream.core.options.Limit;
18+
import io.getstream.core.options.RequestOption;
1819
import io.getstream.core.utils.Auth.TokenAction;
1920
import io.getstream.core.utils.DefaultOptions;
2021
import java.util.List;
@@ -168,10 +169,18 @@ public CompletableFuture<Reaction> add(String userID, Reaction reaction, FeedID.
168169
return reactions.add(token, userID, reaction, targetFeeds);
169170
}
170171

171-
public CompletableFuture<Reaction> add(String userID, Reaction reaction, FeedID[] targetFeeds, Map<String, Object> targetFeedsExtraData)
172+
public CompletableFuture<Reaction> add(
173+
String userID, Reaction reaction, FeedID[] targetFeeds, RequestOption... options)
172174
throws StreamException {
173175
final Token token = buildReactionsToken(secret, TokenAction.WRITE);
174-
return reactions.add(token, userID, reaction, targetFeeds, targetFeedsExtraData);
176+
return reactions.add(token, userID, reaction, targetFeeds, null, options);
177+
}
178+
179+
public CompletableFuture<Reaction> add(
180+
String userID, Reaction reaction, FeedID[] targetFeeds,
181+
Map<String, Object> targetFeedsExtraData, RequestOption... options) throws StreamException {
182+
final Token token = buildReactionsToken(secret, TokenAction.WRITE);
183+
return reactions.add(token, userID, reaction, targetFeeds, targetFeedsExtraData, options);
175184
}
176185

177186
public CompletableFuture<Reaction> addChild(
@@ -237,6 +246,12 @@ public CompletableFuture<Void> update(Reaction reaction, FeedID... targetFeeds)
237246
return reactions.update(token, reaction, targetFeeds);
238247
}
239248

249+
public CompletableFuture<Void> update(
250+
Reaction reaction, FeedID[] targetFeeds, RequestOption... options) throws StreamException {
251+
final Token token = buildReactionsToken(secret, TokenAction.WRITE);
252+
return reactions.update(token, reaction, targetFeeds, options);
253+
}
254+
240255
public CompletableFuture<Void> delete(String id) throws StreamException {
241256
final Token token = buildReactionsToken(secret, TokenAction.DELETE);
242257
return reactions.delete(token, id, false);

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

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -337,13 +337,19 @@ CompletableFuture<Response> getEnrichedActivities(FeedID feed, RequestOption...
337337
return stream.getEnrichedActivities(token, feed, options);
338338
}
339339

340-
CompletableFuture<Response> addActivity(FeedID feed, Activity activity) throws StreamException {
341-
return stream.addActivity(token, feed, activity);
340+
CompletableFuture<Response> addActivity(FeedID feed, Activity activity, RequestOption... options)
341+
throws StreamException {
342+
return stream.addActivity(token, feed, activity, options);
342343
}
343344

344345
CompletableFuture<Response> addActivities(FeedID feed, Activity... activities)
345346
throws StreamException {
346-
return stream.addActivities(token, feed, activities);
347+
return addActivities(feed, activities, new RequestOption[0]);
348+
}
349+
350+
CompletableFuture<Response> addActivities(
351+
FeedID feed, Activity[] activities, RequestOption... options) throws StreamException {
352+
return stream.addActivities(token, feed, activities, options);
347353
}
348354

349355
CompletableFuture<Response> removeActivityByID(FeedID feed, String id) throws StreamException {

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

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,10 @@ public final String getUserID() {
6969
return id.getUserID();
7070
}
7171

72-
public final CompletableFuture<Activity> addActivity(Activity activity) throws StreamException {
72+
public final CompletableFuture<Activity> addActivity(Activity activity, RequestOption... options)
73+
throws StreamException {
7374
return getClient()
74-
.addActivity(id, activity)
75+
.addActivity(id, activity, options)
7576
.thenApply(
7677
response -> {
7778
try {
@@ -82,9 +83,10 @@ public final CompletableFuture<Activity> addActivity(Activity activity) throws S
8283
});
8384
}
8485

85-
public final <T> CompletableFuture<T> addCustomActivity(T activity) throws StreamException {
86+
public final <T> CompletableFuture<T> addCustomActivity(T activity, RequestOption... options)
87+
throws StreamException {
8688
return getClient()
87-
.addActivity(id, Activity.builder().fromCustomActivity(activity).build())
89+
.addActivity(id, Activity.builder().fromCustomActivity(activity).build(), options)
8890
.thenApply(
8991
response -> {
9092
try {
@@ -97,7 +99,7 @@ public final <T> CompletableFuture<T> addCustomActivity(T activity) throws Strea
9799

98100
public final CompletableFuture<List<Activity>> addActivities(Iterable<Activity> activities)
99101
throws StreamException {
100-
return addActivities(Iterables.toArray(activities, Activity.class));
102+
return addActivities(Iterables.toArray(activities, Activity.class), new RequestOption[0]);
101103
}
102104

103105
public final <T> CompletableFuture<List<T>> addCustomActivities(Iterable<T> activities)
@@ -107,7 +109,7 @@ public final <T> CompletableFuture<List<T>> addCustomActivities(Iterable<T> acti
107109
.map(activity -> Activity.builder().fromCustomActivity(activity).build())
108110
.toArray(Activity[]::new);
109111
return getClient()
110-
.addActivities(id, custom)
112+
.addActivities(id, custom, new RequestOption[0])
111113
.thenApply(
112114
(Response response) -> {
113115
try {
@@ -124,8 +126,13 @@ public final <T> CompletableFuture<List<T>> addCustomActivities(Iterable<T> acti
124126

125127
public final CompletableFuture<List<Activity>> addActivities(Activity... activities)
126128
throws StreamException {
129+
return addActivities(activities, new RequestOption[0]);
130+
}
131+
132+
public final CompletableFuture<List<Activity>> addActivities(
133+
Activity[] activities, RequestOption... options) throws StreamException {
127134
return getClient()
128-
.addActivities(id, activities)
135+
.addActivities(id, activities, options)
129136
.thenApply(
130137
(Response response) -> {
131138
try {
@@ -143,7 +150,7 @@ public final <T> CompletableFuture<List<T>> addCustomActivities(T... activities)
143150
.map(activity -> Activity.builder().fromCustomActivity(activity).build())
144151
.toArray(Activity[]::new);
145152
return getClient()
146-
.addActivities(id, custom)
153+
.addActivities(id, custom, new RequestOption[0])
147154
.thenApply(
148155
(Response response) -> {
149156
try {

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

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import io.getstream.core.models.Reaction;
1313
import io.getstream.core.options.Filter;
1414
import io.getstream.core.options.Limit;
15+
import io.getstream.core.options.RequestOption;
1516
import io.getstream.core.utils.DefaultOptions;
1617
import java.util.List;
1718
import java.util.Map;
@@ -151,9 +152,16 @@ public CompletableFuture<Reaction> add(String userID, Reaction reaction, FeedID.
151152
return reactions.add(token, userID, reaction, targetFeeds);
152153
}
153154

154-
public CompletableFuture<Reaction> add(String userID, Reaction reaction, FeedID[] targetFeeds, Map<String, Object> targetFeedsExtraData)
155+
public CompletableFuture<Reaction> add(
156+
String userID, Reaction reaction, FeedID[] targetFeeds, RequestOption... options)
155157
throws StreamException {
156-
return reactions.add(token, userID, reaction, targetFeeds, targetFeedsExtraData);
158+
return reactions.add(token, userID, reaction, targetFeeds, null, options);
159+
}
160+
161+
public CompletableFuture<Reaction> add(
162+
String userID, Reaction reaction, FeedID[] targetFeeds,
163+
Map<String, Object> targetFeedsExtraData, RequestOption... options) throws StreamException {
164+
return reactions.add(token, userID, reaction, targetFeeds, targetFeedsExtraData, options);
157165
}
158166

159167
public CompletableFuture<Reaction> addChild(
@@ -218,6 +226,11 @@ public CompletableFuture<Void> update(Reaction reaction, FeedID... targetFeeds)
218226
return reactions.update(token, reaction, targetFeeds);
219227
}
220228

229+
public CompletableFuture<Void> update(
230+
Reaction reaction, FeedID[] targetFeeds, RequestOption... options) throws StreamException {
231+
return reactions.update(token, reaction, targetFeeds, options);
232+
}
233+
221234
public CompletableFuture<Void> delete(String id) throws StreamException {
222235
return reactions.delete(token, id, false);
223236
}

0 commit comments

Comments
 (0)