aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/main/java/com/juick/ActivityPubManager.java23
-rw-r--r--src/main/java/com/juick/SignatureManager.java3
-rw-r--r--src/test/java/com/juick/server/tests/ServerTests.java8
3 files changed, 17 insertions, 17 deletions
diff --git a/src/main/java/com/juick/ActivityPubManager.java b/src/main/java/com/juick/ActivityPubManager.java
index 1e97a54e..5b0e8d59 100644
--- a/src/main/java/com/juick/ActivityPubManager.java
+++ b/src/main/java/com/juick/ActivityPubManager.java
@@ -25,6 +25,7 @@ import com.juick.model.Tag;
import com.juick.www.api.SystemActivity.ActivityType;
import com.juick.www.api.activity.model.Context;
import com.juick.www.api.activity.model.activities.*;
+import com.juick.www.api.activity.model.objects.Actor;
import com.juick.www.api.activity.model.objects.Hashtag;
import com.juick.www.api.activity.model.objects.Image;
import com.juick.www.api.activity.model.objects.Mention;
@@ -97,8 +98,8 @@ public class ActivityPubManager implements ActivityListener, NotificationListene
User followedUser = socialService.getUserByAccountUri(acct);
if (!followedUser.isAnonymous()) {
// automatically accept follower requests
- Person me = (Person) signatureManager.getContext(URI.create(acct)).get();
- Person follower = (Person) signatureManager.getContext(URI.create(followEvent.getRequest().getActor())).get();
+ Actor me = (Actor) signatureManager.getContext(URI.create(acct)).get();
+ Actor follower = (Actor) signatureManager.getContext(URI.create(followEvent.getRequest().getActor())).get();
Accept accept = new Accept();
accept.setActor(me.getId());
accept.setObject(followEvent.getRequest());
@@ -136,10 +137,10 @@ public class ActivityPubManager implements ActivityListener, NotificationListene
User user = msg.getUser();
String userUri = personUri(user);
Note note = makeNote(msg);
- Person me = (Person) signatureManager.getContext(URI.create(userUri)).get();
+ Actor me = (Actor) signatureManager.getContext(URI.create(userUri)).get();
socialService.getFollowers(user).forEach(acct -> {
try {
- Person follower = (Person) signatureManager.getContext(URI.create(acct)).orElseThrow();
+ Actor follower = (Actor) signatureManager.getContext(URI.create(acct)).orElseThrow();
Delete delete = new Delete();
delete.setId(note.getId());
delete.setActor(me.getId());
@@ -188,10 +189,10 @@ public class ActivityPubManager implements ActivityListener, NotificationListene
String objectUri = event.getMessageUri();
User user = event.getUser();
String userUri = personUri(user);
- Person me = (Person) signatureManager.getContext(URI.create(userUri)).get();
+ Actor me = (Actor) signatureManager.getContext(URI.create(userUri)).get();
socialService.getFollowers(user).forEach(acct -> {
try {
- Person follower = (Person) signatureManager.getContext(URI.create(acct)).orElseThrow();
+ Actor follower = (Actor) signatureManager.getContext(URI.create(acct)).orElseThrow();
Update update = new Update();
update.setId(objectUri + "#update");
update.setActor(me.getId());
@@ -222,10 +223,10 @@ public class ActivityPubManager implements ActivityListener, NotificationListene
public void processUpdateUserEvent(UpdateUserEvent event) {
User user = event.getUser();
String userUri = personUri(user);
- Person me = (Person) signatureManager.getContext(URI.create(userUri)).get();
+ Actor me = (Actor) signatureManager.getContext(URI.create(userUri)).get();
socialService.getFollowers(user).forEach(acct -> {
try {
- Person follower = (Person) signatureManager.getContext(URI.create(acct)).orElseThrow();
+ Actor follower = (Actor) signatureManager.getContext(URI.create(acct)).orElseThrow();
Update update = new Update();
update.setId(userUri + "#update");
update.setActor(me.getId());
@@ -260,7 +261,7 @@ public class ActivityPubManager implements ActivityListener, NotificationListene
subscribers.forEach(acct -> {
Optional<Context> context = signatureManager.getContext(URI.create(acct));
if (context.isPresent() && context.get() instanceof Person) {
- Person follower = (Person)context.get();
+ Actor follower = (Actor)context.get();
Create create = new Create();
create.setId(note.getId());
create.setActor(me.getId());
@@ -409,13 +410,13 @@ public class ActivityPubManager implements ActivityListener, NotificationListene
announce.setActor(personUri(serviceUser));
announce.setTo(Collections.singletonList(Context.ACTIVITYSTREAMS_PUBLIC));
announce.setObject(note);
- Person me = (Person) signatureManager.getContext(URI.create(announce.getActor())).get();
+ Actor me = (Actor) signatureManager.getContext(URI.create(announce.getActor())).get();
socialService.getFollowers(serviceUser).forEach(acct -> {
var follower = signatureManager.getContext(URI.create(acct));
follower.ifPresentOrElse((person) -> {
try {
logger.info("Announcing top: {}", message.getMid());
- signatureManager.post(me, (Person)person, announce);
+ signatureManager.post(me, (Actor)person, announce);
} catch (IOException | NoSuchAlgorithmException e) {
logger.warn("activitypub exception", e);
}
diff --git a/src/main/java/com/juick/SignatureManager.java b/src/main/java/com/juick/SignatureManager.java
index e9cb4f6a..bccc46be 100644
--- a/src/main/java/com/juick/SignatureManager.java
+++ b/src/main/java/com/juick/SignatureManager.java
@@ -24,7 +24,6 @@ import com.juick.service.UserService;
import com.juick.service.activities.DeleteUserEvent;
import com.juick.util.DateFormattersHolder;
import com.juick.www.api.activity.model.Context;
-import com.juick.www.api.activity.model.objects.Person;
import com.juick.www.api.activity.model.objects.Actor;
import com.juick.www.api.webfinger.model.Account;
import com.juick.www.api.webfinger.model.Link;
@@ -74,7 +73,7 @@ public class SignatureManager {
@Inject
private ApplicationEventPublisher applicationEventPublisher;
- public void post(Person from, Person to, Context data) throws IOException, NoSuchAlgorithmException {
+ public void post(Actor from, Actor to, Context data) throws IOException, NoSuchAlgorithmException {
UriComponentsBuilder uriComponentsBuilder = UriComponentsBuilder.fromUriString(to.getInbox());
URI inbox = uriComponentsBuilder.build().toUri();
Instant now = Instant.now();
diff --git a/src/test/java/com/juick/server/tests/ServerTests.java b/src/test/java/com/juick/server/tests/ServerTests.java
index 8583642f..d19c76cb 100644
--- a/src/test/java/com/juick/server/tests/ServerTests.java
+++ b/src/test/java/com/juick/server/tests/ServerTests.java
@@ -1842,8 +1842,8 @@ public class ServerTests {
create.setId(replyNote.getId());
create.setActor("http://localhost:8080/u/freefd");
create.setObject(replyNote);
- signatureManager.post((Person) signatureManager.getContext(URI.create("http://localhost:8080/u/freefd")).get(),
- (Person) signatureManager.getContext(URI.create("http://localhost:8080/u/ugnich")).get(), create);
+ signatureManager.post((Actor) signatureManager.getContext(URI.create("http://localhost:8080/u/freefd")).get(),
+ (Actor) signatureManager.getContext(URI.create("http://localhost:8080/u/ugnich")).get(), create);
Message replyToExt = commandsManager
.processCommand(ugnich, String.format("#%d/1 PSSH YOBA ETO TI", msg.getMid()), emptyUri).getNewMessage()
.get();
@@ -1856,8 +1856,8 @@ public class ServerTests {
@Test
public void signingSpec() throws IOException, NoSuchAlgorithmException {
- Person from = (Person) signatureManager.getContext(URI.create("http://localhost:8080/u/freefd")).get();
- Person to = (Person) signatureManager.getContext(URI.create("http://localhost:8080/u/ugnich")).get();
+ Actor from = (Actor) signatureManager.getContext(URI.create("http://localhost:8080/u/freefd")).get();
+ Actor to = (Actor) signatureManager.getContext(URI.create("http://localhost:8080/u/ugnich")).get();
Follow follow = new Follow();
follow.setActor("http://localhost:8080/u/freefd");
follow.setObject(new Context("http://localhost:8080/u/ugnich"));
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-01 11:06:35 +0000