Skip to content

Commit 1ea89d9

Browse files
committed
fix: fix tests, fix token moderation
1 parent 1013992 commit 1ea89d9

File tree

4 files changed

+32
-15
lines changed

4 files changed

+32
-15
lines changed

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package io.getstream.client;
22

3+
import static io.getstream.core.utils.Auth.buildModerationToken;
34
import static io.getstream.core.utils.Auth.buildReactionsToken;
45
import static io.getstream.core.utils.Routes.*;
56
import static io.getstream.core.utils.Serialization.*;
@@ -33,19 +34,19 @@ public CompletableFuture<Response> flagActivity(
3334
}
3435

3536
public CompletableFuture<Response> flagReaction(
36-
String entityId, String entityCreatorId, String reason, Map<String, Object> options)
37+
String entityId, String reportingUser, String reason, Map<String, Object> options)
3738
throws StreamException {
38-
return flag("stream:feeds:v2:reaction", entityId, entityCreatorId, reason, options);
39+
return flag("stream:feeds:v2:reaction", entityId, reportingUser, reason, options);
3940
}
4041

4142
private CompletableFuture<Response> flag(
4243
String entityType,
4344
String entityId,
44-
String entityCreatorId,
45+
String reportingUser,
4546
String reason,
4647
Map<String, Object> options)
4748
throws StreamException {
48-
final Token token = buildReactionsToken(secret, Auth.TokenAction.WRITE);
49-
return mod.flag(token, entityType, entityId, entityCreatorId, reason, options);
49+
final Token token = buildModerationToken(secret, Auth.TokenAction.WRITE);
50+
return mod.flag(token, entityType, entityId, reportingUser, reason, options);
5051
}
5152
}

src/main/java/io/getstream/core/Moderation.java

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,24 +31,28 @@ public CompletableFuture<Response> flag(
3131
Token token,
3232
String entityType,
3333
String entityId,
34-
String entityCreatorId,
35-
String reason,
34+
String reportingUser,
35+
String Reason,
3636
Map<String, Object> options)
3737
throws StreamException {
3838
try {
3939
final byte[] payload =
4040
toJSON(
4141
new Object() {
42-
public final String UserId = entityCreatorId;
43-
public final String EntityType = entityType;
44-
public final String EntityId = entityId;
45-
public final String Reason = reason;
42+
public final String user_id = reportingUser;
43+
public final String entity_type = entityType;
44+
public final String entity_id = entityId;
45+
public final String reason = Reason;
4646
});
4747

48-
final URL url = buildModerationFlagURL(baseURL);
48+
String strsing = new String(payload);
49+
System.out.println(strsing);
50+
final URL url = buildModerationFlagURL(baseURL);
4951
return httpClient.execute(buildPost(url, key, token, payload));
5052
} catch (JsonProcessingException | MalformedURLException | URISyntaxException e) {
5153
throw new CompletionException(e);
54+
} catch (Exception e){
55+
throw e;
5256
}
5357
}
5458
}

src/main/java/io/getstream/core/utils/Auth.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@ public enum TokenResource {
4141
OPEN_GRAPH("url"),
4242
PERSONALIZATION("personalization"),
4343
REACTIONS("reactions"),
44-
USERS("users");
44+
USERS("users"),
45+
MODERATION("moderation");
4546

4647
private final String resource;
4748

@@ -98,6 +99,10 @@ public static Token buildReactionsToken(String secret, TokenAction action) {
9899
return buildBackendToken(secret, TokenResource.REACTIONS, action, "*");
99100
}
100101

102+
public static Token buildModerationToken(String secret, TokenAction action) {
103+
return buildBackendToken(secret, TokenResource.MODERATION, action, "*");
104+
}
105+
101106
public static Token buildAnalyticsToken(String secret, TokenAction action) {
102107
return buildBackendToken(secret, TokenResource.ANALYTICS, action, "*");
103108
}

src/test/java/io/getstream/client/ModerationClientTest.java

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@
55
import io.getstream.core.http.Response;
66
import io.getstream.core.models.*;
77
import io.getstream.core.models.Activity;
8+
9+
import java.io.BufferedReader;
10+
import java.io.InputStreamReader;
11+
import java.nio.Buffer;
812
import java.util.Date;
913
import java.util.UUID;
1014
import org.junit.*;
@@ -65,12 +69,15 @@ public void testFlagReaction() throws Exception {
6569
assertNotNull(activityResponse);
6670

6771
Reaction reactionResponse =
68-
client.reactions().add("user123", "like", activityResponse.getID()).join();
72+
client.reactions().add("test", "like", activityResponse.getID()).join();
6973
assertNotNull(reactionResponse);
7074

7175
Response flagResponse =
72-
moderationClient.flagReaction(reactionResponse.getId(), "bobby", "blood", null).join();
76+
moderationClient.flagReaction(reactionResponse.getId(), "vishal", "blood", null).join();
77+
assertNotNull(flagResponse);
78+
assertEquals(201, flagResponse.getCode());
7379
assertNotNull(flagResponse);
80+
7481
}
7582

7683
@Test

0 commit comments

Comments
 (0)