aboutsummaryrefslogtreecommitdiff
path: root/juick-server/src/main/java/com/juick
diff options
context:
space:
mode:
authorGravatar Vitaly Takmazov2018-10-04 14:18:53 +0300
committerGravatar Vitaly Takmazov2018-10-04 14:18:53 +0300
commit051fd4608ebd30e94eb847906571f5f221d3e952 (patch)
tree23b4e51a768dfb4ae2dd1b767fece49f1817cabf /juick-server/src/main/java/com/juick
parent873fbbc8b7f59c68c6bf37ff9af79c8fb2aef8ed (diff)
Undo object deserialized as Map
Diffstat (limited to 'juick-server/src/main/java/com/juick')
-rw-r--r--juick-server/src/main/java/com/juick/server/ActivityPubManager.java3
-rw-r--r--juick-server/src/main/java/com/juick/server/api/activity/Profile.java4
-rw-r--r--juick-server/src/main/java/com/juick/service/activities/UndoFollowEvent.java11
3 files changed, 8 insertions, 10 deletions
diff --git a/juick-server/src/main/java/com/juick/server/ActivityPubManager.java b/juick-server/src/main/java/com/juick/server/ActivityPubManager.java
index 17522423..e0bbdb85 100644
--- a/juick-server/src/main/java/com/juick/server/ActivityPubManager.java
+++ b/juick-server/src/main/java/com/juick/server/ActivityPubManager.java
@@ -17,7 +17,6 @@ import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.ApplicationListener;
import org.springframework.stereotype.Component;
import org.springframework.web.util.UriComponentsBuilder;
@@ -72,7 +71,7 @@ public class ActivityPubManager implements ActivityListener, NotificationListene
@Override
public void undoFollowEvent(UndoFollowEvent event) {
String actor = event.getActor();
- String me = (String)event.getFollowRequest().getObject();
+ String me = event.getObject();
logger.info("{} stopping to follow {}", actor, me);
User followedUser = socialService.getUserByAccountUri(me);
if (!followedUser.isAnonymous()) {
diff --git a/juick-server/src/main/java/com/juick/server/api/activity/Profile.java b/juick-server/src/main/java/com/juick/server/api/activity/Profile.java
index 2e089330..23cd74ce 100644
--- a/juick-server/src/main/java/com/juick/server/api/activity/Profile.java
+++ b/juick-server/src/main/java/com/juick/server/api/activity/Profile.java
@@ -240,8 +240,8 @@ public class Profile {
return new ResponseEntity<>(HttpStatus.UNAUTHORIZED);
}
if (activity instanceof Undo) {
- Follow undoFollow = (Follow) ((Undo) activity).getObject();
- applicationEventPublisher.publishEvent(new UndoFollowEvent(this, ((Undo) activity).getActor(), undoFollow));
+ String follower = (String)((Map) ((Undo) activity).getObject()).get("object");
+ applicationEventPublisher.publishEvent(new UndoFollowEvent(this, ((Undo) activity).getActor(), follower));
return new ResponseEntity<>(HttpStatus.OK);
}
return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
diff --git a/juick-server/src/main/java/com/juick/service/activities/UndoFollowEvent.java b/juick-server/src/main/java/com/juick/service/activities/UndoFollowEvent.java
index fa162b2e..2b48e6f6 100644
--- a/juick-server/src/main/java/com/juick/service/activities/UndoFollowEvent.java
+++ b/juick-server/src/main/java/com/juick/service/activities/UndoFollowEvent.java
@@ -1,27 +1,26 @@
package com.juick.service.activities;
-import com.juick.server.api.activity.model.activities.Follow;
import org.springframework.context.ApplicationEvent;
public class UndoFollowEvent extends ApplicationEvent {
private String actor;
- private Follow followRequest;
+ private String object;
/**
* Create a new ApplicationEvent.
*
* @param source the object on which the event initially occurred (never {@code null})
*/
- public UndoFollowEvent(Object source, String actor, Follow object) {
+ public UndoFollowEvent(Object source, String actor, String object) {
super(source);
this.actor = actor;
- this.followRequest = object;
+ this.object = object;
}
public String getActor() {
return actor;
}
- public Follow getFollowRequest() {
- return followRequest;
+ public String getObject() {
+ return object;
}
}