[various] Remove /display/{nick}/{id} URL structure publishing

diff --git a/mailstream/mailstream.php b/mailstream/mailstream.php
index 4f86e7045bbc84c4d8c741d8b743333df981711a..99574f6d0c4f0f6145a9a2b7d30e1b040b6ebb26 100644 (file)
--- a/mailstream/mailstream.php
+++ b/mailstream/mailstream.php
@@ -254,7 +254,7 @@ function mailstream_subject($item) {
        return L10n::t("Friendica Item");
 }
 
-function mailstream_send($a, $message_id, $item, $user) {
+function mailstream_send(\Friendica\App $a, $message_id, $item, $user) {
        if (!$item['visible']) {
                return;
        }
@@ -293,7 +293,7 @@ function mailstream_send($a, $message_id, $item, $user) {
                $mail->CharSet = 'utf-8';
                $template = Renderer::getMarkupTemplate('mail.tpl', 'addon/mailstream/');
                $item['body'] = BBCode::convert($item['body']);
-               $item['url'] = $a->getBaseURL() . '/display/' . $user['nickname'] . '/' . $item['id'];
+               $item['url'] = $a->getBaseURL() . '/display/' . $item['guid'];
                $mail->Body = Renderer::replaceMacros($template, [
                                                 '$upstream' => L10n::t('Upstream'),
                                                 '$local' => L10n::t('Local'),

diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php
index ab4cceb74f39cd1b2173993482e8754b24b5c383..5638a7991673f5536d3db83e6bd56e28c74ead63 100644 (file)
--- a/statusnet/statusnet.php
+++ b/statusnet/statusnet.php
@@ -735,7 +735,7 @@ function statusnet_prepare_body(App $a, &$b)
                }
 
                $item = $b["item"];
-               $item["plink"] = $a->getBaseURL() . "/display/" . $a->user["nickname"] . "/" . $item["parent"];
+               $item["plink"] = $a->getBaseURL() . "/display/" . $item["guid"];
 
                $condition = ['uri' => $item["thr-parent"], 'uid' => local_user()];
                $orig_post = Item::selectFirst(['author-link', 'uri'], $condition);

diff --git a/twitter/twitter.php b/twitter/twitter.php
index f6d5912dd6098ad9d3101816eb99463b636e7203..166c99ef907fc560968a2181f276eccf7085a719 100644 (file)
--- a/twitter/twitter.php
+++ b/twitter/twitter.php
@@ -814,7 +814,7 @@ function twitter_prepare_body(App $a, array &$b)
        if ($b["preview"]) {
                $max_char = 280;
                $item = $b["item"];
-               $item["plink"] = $a->getBaseURL() . "/display/" . $a->user["nickname"] . "/" . $item["parent"];
+               $item["plink"] = $a->getBaseURL() . "/display/" . $item["guid"];
 
                $condition = ['uri' => $item["thr-parent"], 'uid' => local_user()];
                $orig_post = Item::selectFirst(['author-link'], $condition);