diff options
| author | Max Kostikov <max@kostikov.co> | 2019-11-08 23:39:04 +0100 |
|---|---|---|
| committer | Max Kostikov <max@kostikov.co> | 2019-11-08 23:39:04 +0100 |
| commit | ec68ede79faffd5733c3eaa24df2e4fb3b54eeb9 (patch) | |
| tree | c26098c1c0ebff705dc4ef4f324b8b1656c61b9a /Zotlabs/Lib/Activity.php | |
| parent | 3706afbd01164c9f322c605d6ec242e6ca4770fa (diff) | |
| parent | 478014f02a9241ec6d5b5e9672968897176302d2 (diff) | |
| download | volse-hubzilla-ec68ede79faffd5733c3eaa24df2e4fb3b54eeb9.tar.gz volse-hubzilla-ec68ede79faffd5733c3eaa24df2e4fb3b54eeb9.tar.bz2 volse-hubzilla-ec68ede79faffd5733c3eaa24df2e4fb3b54eeb9.zip | |
Merge branch 'dev' into 'dev'
Dev sync
See merge request kostikov/core!4
Diffstat (limited to 'Zotlabs/Lib/Activity.php')
| -rw-r--r-- | Zotlabs/Lib/Activity.php | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/Zotlabs/Lib/Activity.php b/Zotlabs/Lib/Activity.php index 844127ee3..e41e165b1 100644 --- a/Zotlabs/Lib/Activity.php +++ b/Zotlabs/Lib/Activity.php @@ -87,8 +87,8 @@ class Activity { $headers = [ 'Accept' => 'application/activity+json, application/ld+json; profile="https://www.w3.org/ns/activitystreams"', 'Host' => $m['host'], - '(request-target)' => 'get ' . get_request_string($url), - 'Date' => datetime_convert('UTC','UTC','now','D, d M Y H:i:s') . ' UTC' + 'Date' => datetime_convert('UTC','UTC', 'now', 'D, d M Y H:i:s \\G\\M\\T'), + '(request-target)' => 'get ' . get_request_string($url) ]; if (isset($token)) { $headers['Authorization'] = 'Bearer ' . $token; @@ -401,26 +401,30 @@ class Activity { $ret = []; - if($item['tag']) { - foreach($item['tag'] as $t) { - if(! array_key_exists('type',$t)) + if ($item['tag'] && is_array($item['tag'])) { + $ptr = $item['tag']; + if (! array_key_exists(0,$ptr)) { + $ptr = [ $ptr ]; + } + foreach ($ptr as $t) { + if (! array_key_exists('type',$t)) $t['type'] = 'Hashtag'; switch($t['type']) { case 'Hashtag': - $ret[] = [ 'ttype' => TERM_HASHTAG, 'url' => ((isset($t['href'])) ? $t['href'] : $t['id']), 'term' => escape_tags((substr($t['name'],0,1) === '#') ? substr($t['name'],1) : $t['name']) ]; + $ret[] = [ 'ttype' => TERM_HASHTAG, 'url' => $t['href'], 'term' => escape_tags((substr($t['name'],0,1) === '#') ? substr($t['name'],1) : $t['name']) ]; break; case 'Mention': $mention_type = substr($t['name'],0,1); - if($mention_type === '!') { + if ($mention_type === '!') { $ret[] = [ 'ttype' => TERM_FORUM, 'url' => $t['href'], 'term' => escape_tags(substr($t['name'],1)) ]; } else { $ret[] = [ 'ttype' => TERM_MENTION, 'url' => $t['href'], 'term' => escape_tags((substr($t['name'],0,1) === '@') ? substr($t['name'],1) : $t['name']) ]; } break; - + default: break; } @@ -431,6 +435,7 @@ class Activity { } + static function encode_taxonomy($item) { $ret = []; |