From 58b1fbbdd610de31a5883813206f9086e241207e Mon Sep 17 00:00:00 2001 From: Vitaly Takmazov Date: Sun, 22 Aug 2021 07:30:20 +0300 Subject: ActivityPub: Mention includes domain in the name property --- src/main/java/com/juick/util/UserUtils.java | 26 ++++++++++++++++++++++ .../www/api/activity/model/objects/Mention.java | 5 ++++- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 src/main/java/com/juick/util/UserUtils.java (limited to 'src/main/java') diff --git a/src/main/java/com/juick/util/UserUtils.java b/src/main/java/com/juick/util/UserUtils.java new file mode 100644 index 00000000..d43ad868 --- /dev/null +++ b/src/main/java/com/juick/util/UserUtils.java @@ -0,0 +1,26 @@ +/* + * Copyright (C) 2008-2021, Juick + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +package com.juick.util; + +import java.net.URI; + +public class UserUtils { + public static String getPersonIdentifier(String name, URI uri) { + return String.format("@%s@%s", name, uri.getHost()); + } +} diff --git a/src/main/java/com/juick/www/api/activity/model/objects/Mention.java b/src/main/java/com/juick/www/api/activity/model/objects/Mention.java index 3e5ff284..30ba4d10 100644 --- a/src/main/java/com/juick/www/api/activity/model/objects/Mention.java +++ b/src/main/java/com/juick/www/api/activity/model/objects/Mention.java @@ -17,13 +17,16 @@ package com.juick.www.api.activity.model.objects; +import java.net.URI; + import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; +import com.juick.util.UserUtils; public class Mention extends Link { @JsonCreator public Mention(@JsonProperty("href") String href, @JsonProperty("name") String name) { this.setHref(href); - this.setName(name); + this.setName(UserUtils.getPersonIdentifier(name, URI.create(href))); } } -- cgit v1.2.3