aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2020-04-24 14:25:49 +0000
committerMario <mario@mariovavti.com>2020-04-24 14:25:49 +0000
commite2b10f52e02c4cee77af089a544ec55e62048aba (patch)
tree34e8be162dc5e57ce94cdd65820de0dfd33dec63 /include
parent2b8afd55800754aeb158d77940777ecc2c119d37 (diff)
downloadvolse-hubzilla-e2b10f52e02c4cee77af089a544ec55e62048aba.tar.gz
volse-hubzilla-e2b10f52e02c4cee77af089a544ec55e62048aba.tar.bz2
volse-hubzilla-e2b10f52e02c4cee77af089a544ec55e62048aba.zip
more work on deprecating ACTIVITY_OBJ_FILE and adapt mod sharedwithme
Diffstat (limited to 'include')
-rw-r--r--include/attach.php19
1 files changed, 16 insertions, 3 deletions
diff --git a/include/attach.php b/include/attach.php
index 7149be735..fbf131fb3 100644
--- a/include/attach.php
+++ b/include/attach.php
@@ -12,6 +12,7 @@
*/
use Zotlabs\Lib\Libsync;
+use Zotlabs\Lib\Activity;
use Zotlabs\Access\PermissionLimits;
use Zotlabs\Daemon\Master;
@@ -1940,6 +1941,7 @@ function attach_store_item($channel, $observer, $file) {
$uuid = new_uuid();
$mid = z_root() . '/item/' . $uuid;
+ $path = z_root() . '/cloud/' . $channel['channel_address'] . '/' . $file['display_path'];
$arr = []; // Initialize the array of parameters for the post
$arr['aid'] = $channel['channel_account_id'];
@@ -1951,8 +1953,6 @@ function attach_store_item($channel, $observer, $file) {
$arr['resource_id'] = $resource_id;
$arr['owner_xchan'] = $channel['channel_hash'];
$arr['author_xchan'] = $observer['xchan_hash'];
- $arr['plink'] = z_root() . '/cloud/' . $channel['channel_address'] . '/' . $file['display_path'];
- $arr['llink'] = $arr['plink'];
$arr['title'] = $file['filename'];
$arr['allow_cid'] = $file['allow_cid'];
$arr['allow_gid'] = $file['allow_gid'];
@@ -1965,9 +1965,22 @@ function attach_store_item($channel, $observer, $file) {
$arr['verb'] = ACTIVITY_CREATE;
$arr['obj_type'] = $type;
$arr['title'] = $file['filename'];
- $body_str = sprintf(t('%s shared a %s with you'), '[zrl=' . $observer['xchan_url'] . ']' . $observer['xchan_name'] . '[/zrl]', '[zrl=' . $arr['plink'] . ']' . t('file') . '[/zrl]');
+ $body_str = sprintf(t('%s shared a %s with you'), '[zrl=' . $observer['xchan_url'] . ']' . $observer['xchan_name'] . '[/zrl]', '[zrl=' . $path . ']' . t('file') . '[/zrl]');
$arr['body'] = $body_str;
+ $meta = [
+ 'name' => $file['filename'],
+ 'type' => $file['filetype'],
+ 'size' => $file['filesize'],
+ 'revision' => $file['revision'],
+ 'size' => $file['filesize'],
+ 'created' => $file['created'],
+ 'edited' => $file['edited'],
+ 'path' => $path
+ ];
+
+ set_iconfig($arr, 'attach', 'meta' , $meta, true);
+
post_activity_item($arr);
}