aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2020-03-24 18:26:20 -0700
committerzotlabs <mike@macgirvin.com>2020-03-24 18:26:20 -0700
commita3acec96745f90443de84d8503334b3a204436fb (patch)
tree29010c6623162d04708102b0cb3c9458a07bf436
parent8f5cb0c45a4aa2011933087f86333c60a77c3e0f (diff)
downloadvolse-hubzilla-a3acec96745f90443de84d8503334b3a204436fb.tar.gz
volse-hubzilla-a3acec96745f90443de84d8503334b3a204436fb.tar.bz2
volse-hubzilla-a3acec96745f90443de84d8503334b3a204436fb.zip
issue 1454 - some photo item ActivityStreams links not returning json-ld; requires related fixes in addons/pubcrawl
-rw-r--r--Zotlabs/Lib/Activity.php5
-rw-r--r--include/photos.php8
2 files changed, 9 insertions, 4 deletions
diff --git a/Zotlabs/Lib/Activity.php b/Zotlabs/Lib/Activity.php
index 02ec7614e..c50606d4f 100644
--- a/Zotlabs/Lib/Activity.php
+++ b/Zotlabs/Lib/Activity.php
@@ -323,6 +323,11 @@ class Activity {
return $ret;
}
+
+ if ($i['obj']) {
+ $ret = Activity::encode_object($i['obj']);
+ }
+
$ret['type'] = $objtype;
if ($objtype === 'Question') {
diff --git a/include/photos.php b/include/photos.php
index ee662f707..631660d7a 100644
--- a/include/photos.php
+++ b/include/photos.php
@@ -388,7 +388,7 @@ function photo_upload($channel, $observer, $args) {
'title' => $title,
'created' => $p['created'],
'edited' => $p['edited'],
- 'id' => z_root() . '/photos/' . $channel['channel_address'] . '/image/' . $photo_hash,
+ 'id' => z_root() . '/item/' . $photo_hash,
'link' => $link,
'body' => $summary
);
@@ -438,13 +438,13 @@ function photo_upload($channel, $observer, $args) {
}
}
else {
- $uuid = item_message_id();
- $mid = z_root() . '/item/' . $uuid;
+ // $uuid = item_message_id();
+ $mid = z_root() . '/item/' . $photo_hash;
$arr = [
'aid' => $account_id,
'uid' => $channel_id,
- 'uuid' => $uuid,
+ 'uuid' => $photo_hash,
'mid' => $mid,
'parent_mid' => $mid,
'item_hidden' => $item_hidden,