Left trim at sign from nicks in ACL

diff --git a/include/acl_selectors.php b/include/acl_selectors.php
index f4b644d68fb0201a322db05d497f324fe31f74df..8404c8f4b6cd87336741175dff3bf0be2b25fc10 100644 (file)
--- a/include/acl_selectors.php
+++ b/include/acl_selectors.php
@@ -627,14 +627,14 @@ function acl_lookup(App $a, $out_type = 'json') {
                                dbesc($search),
                                implode("','", $known_contacts)
                );
-               if (dbm::is_result($r)){
+               if (dbm::is_result($r)) {
                        foreach ($r as $row) {
-                               // nickname..
                                $up = parse_url($row['author-link']);
-                               $nick = explode("/",$up['path']);
-                               $nick = $nick[count($nick)-1];
-                               $nick .= "@".$up['host'];
-                               // /nickname
+                               $nick = explode('/', $up['path']);
+                               // Fix for Mastodon URLs with format https://domain.tld/@nick
+                               $nick = ltrim($nick[count($nick) - 1], '@');
+                               $nick .= '@' . $up['host'];
+
                                $unknow_contacts[] = array(
                                        'type'    => 'c',
                                        'photo'   => proxy_url($row['author-avatar'], false, PROXY_SIZE_MICRO),

diff --git a/mod/acl.php b/mod/acl.php
index 04aa9f50a6ff3b6ce4c847cc41717ded31a57314..9220bc77a9097198aed0bc2c5b7e3800eaf245a7 100644 (file)
--- a/mod/acl.php
+++ b/mod/acl.php
@@ -1,7 +1,7 @@
 <?php
 /* ACL selector json backend */
 
-require_once("include/acl_selectors.php");
+require_once 'include/acl_selectors.php';
 
 function acl_init(App $a) {
        acl_lookup($a);