diff options
Diffstat (limited to 'juick-server/src/main/java/com/juick')
| -rw-r--r-- | juick-server/src/main/java/com/juick/server/ActivityPubManager.java | 32 |
1 files changed, 28 insertions, 4 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 14ff7419..bd837eb8 100644 --- a/juick-server/src/main/java/com/juick/server/ActivityPubManager.java +++ b/juick-server/src/main/java/com/juick/server/ActivityPubManager.java @@ -15,6 +15,8 @@ import com.juick.service.UserService; import com.juick.service.activities.*; import com.juick.service.component.*; import com.juick.util.MessageUtils; +import com.mitchellbosecke.pebble.PebbleEngine; +import com.mitchellbosecke.pebble.template.PebbleTemplate; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -26,8 +28,12 @@ import javax.annotation.Nonnull; import javax.annotation.PostConstruct; import javax.inject.Inject; import java.io.IOException; +import java.io.StringWriter; +import java.io.Writer; import java.net.URI; import java.util.Collections; +import java.util.HashMap; +import java.util.Map; import java.util.Optional; import java.util.stream.Collectors; @@ -40,6 +46,8 @@ public class ActivityPubManager implements ActivityListener, NotificationListene private SocialService socialService; @Inject private UserService userService; + @Inject + private PebbleEngine pebbleEngine; @Value("${ap_base_uri:http://localhost:8080/}") private String baseUri; @Value("${service_user:juick}") @@ -207,8 +215,22 @@ public class ActivityPubManager implements ActivityListener, NotificationListene note.setCc(Collections.singletonList(followersUri(msg.getUser()))); } note.setPublished(msg.getTimestamp()); - note.setContent(msg.isHtml() ? msg.getText() - : MessageUtils.formatMessage(StringUtils.defaultString(msg.getText()))); + if (msg.isHtml()) { + note.setContent(msg.getText()); + } else { + PebbleTemplate noteTemplate = pebbleEngine.getTemplate("layouts/note"); + Map<String, Object> context = new HashMap<>(); + context.put("msg", msg); + context.put("baseUri", baseUri); + try { + Writer writer = new StringWriter(); + noteTemplate.evaluate(writer, context); + note.setContent(writer.toString()); + } catch (IOException e) { + logger.warn("template not rendered, falling back"); + note.setContent(MessageUtils.formatMessage(StringUtils.defaultString(msg.getText()))); + } + } if (StringUtils.isNotBlank(msg.getAttachmentType())) { Image attachment = new Image(); attachment.setId(msg.getAttachment().getMedium().getUrl()); @@ -219,7 +241,7 @@ public class ActivityPubManager implements ActivityListener, NotificationListene note.setTags(msg.getTags().stream().map(t -> { Hashtag hashtag = new Hashtag(); hashtag.setId(tagUri(t)); - hashtag.setName("#" + t.getName()); + hashtag.setName(t.getName()); return hashtag; }).collect(Collectors.toList())); if (msg.getReplyToUri() != null && msg.getReplyToUri().toASCIIString().length() > 0) { @@ -229,9 +251,11 @@ public class ActivityPubManager implements ActivityListener, NotificationListene Optional<Context> personContext = signatureManager.getContext(URI.create(activity.getAttributedTo())); if (personContext.isPresent()) { Person person = (Person) personContext.get(); - note.getTags().add(new Mention(person.getUrl(), "@" + person.getPreferredUsername())); + note.getTags().add(new Mention(person.getUrl(), person.getPreferredUsername())); } } + } else if (MessageUtils.isReply(msg)) { + note.getTags().add(new Mention(personWebUri(msg.getTo()), msg.getTo().getName())); } return note; } |