From 18ba4d188e6f044379ec01ba2170fe57e9116c69 Mon Sep 17 00:00:00 2001 From: Vitaly Takmazov Date: Sun, 22 Aug 2021 07:42:32 +0300 Subject: ActivityPub: add "mention" class to mention links * This may make Mastodon happy and may stop adding an url preview --- src/main/java/com/juick/util/MessageUtils.java | 4 ++-- .../mitchellbosecke/pebble/extension/filters/FormatMessageFilter.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/juick/util/MessageUtils.java b/src/main/java/com/juick/util/MessageUtils.java index b0093b38..12823498 100644 --- a/src/main/java/com/juick/util/MessageUtils.java +++ b/src/main/java/com/juick/util/MessageUtils.java @@ -194,11 +194,11 @@ public class MessageUtils { // @username@jabber.org // @username@jabber.org - msg = msg.replaceAll(jidRegex, "$1@$2$3"); + msg = msg.replaceAll(jidRegex, "$1@$2$3"); // @username // @username - msg = msg.replaceAll(usernameRegex, "$1@$2$3"); + msg = msg.replaceAll(usernameRegex, "$1@$2$3"); // (http://juick.com/last?page=2) // (juick.com) diff --git a/src/main/java/com/mitchellbosecke/pebble/extension/filters/FormatMessageFilter.java b/src/main/java/com/mitchellbosecke/pebble/extension/filters/FormatMessageFilter.java index 90e0547f..aea76b2a 100644 --- a/src/main/java/com/mitchellbosecke/pebble/extension/filters/FormatMessageFilter.java +++ b/src/main/java/com/mitchellbosecke/pebble/extension/filters/FormatMessageFilter.java @@ -46,7 +46,7 @@ public class FormatMessageFilter implements Filter { return new SafeString(formattedMessage); } else { String toUserString = msg.getTo().getUid() == 0 ? String.format("@%s", - msg.getTo().getUri().toASCIIString(), msg.getTo().getName()) : String.format("@%s", msg.getTo().getName(), msg.getTo().getName()); + msg.getTo().getUri().toASCIIString(), msg.getTo().getName()) : String.format("@%s", msg.getTo().getName(), msg.getTo().getName()); String formatString = MessageUtils.replyStartsWithQuote(msg) ? "%s,\n%s" : "%s, %s"; String msgTxt = msg.getRid() > 0 ? String.format(formatString, toUserString, formattedMessage) : formattedMessage; -- cgit v1.2.3