diff options
| author | Mario Vavti <mario@mariovavti.com> | 2019-06-04 10:19:04 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2019-06-04 10:19:04 +0200 |
| commit | e4ca3609d90bb437061e4b8db95ed0424b25eb76 (patch) | |
| tree | aa070e40ab01cb1354cbf879a0fb8b2f570631d5 /Zotlabs/Module/Wall_attach.php | |
| parent | 071fba2f7121aeb9690a21398935a53deac09af8 (diff) | |
| parent | bc092d8d7815195d62299c0ea54caa4759e6f2e7 (diff) | |
| download | volse-hubzilla-e4ca3609d90bb437061e4b8db95ed0424b25eb76.tar.gz volse-hubzilla-e4ca3609d90bb437061e4b8db95ed0424b25eb76.tar.bz2 volse-hubzilla-e4ca3609d90bb437061e4b8db95ed0424b25eb76.zip | |
Merge branch '4.2RC'4.2
Diffstat (limited to 'Zotlabs/Module/Wall_attach.php')
| -rw-r--r-- | Zotlabs/Module/Wall_attach.php | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/Zotlabs/Module/Wall_attach.php b/Zotlabs/Module/Wall_attach.php index 2250e6e44..0ede3ad90 100644 --- a/Zotlabs/Module/Wall_attach.php +++ b/Zotlabs/Module/Wall_attach.php @@ -96,9 +96,26 @@ class Wall_attach extends \Zotlabs\Web\Controller { $s = "\n\n" . $r['body'] . "\n\n"; } else { - $s = "\n\n" . '[attachment]' . $r['data']['hash'] . ',' . $r['data']['revision'] . '[/attachment]' . "\n"; + if(strpos($r['data']['filetype'],'video') === 0) { + // give a wee bit of time for the background thumbnail processor to do its thing + // or else we'll never see a video poster + sleep(3); + $url = z_root() . '/cloud/' . $channel['channel_address'] . '/' . $r['data']['display_path']; + $thumb = Linkinfo::get_video_poster($url); + if($thumb) { + $s = "\n\n" . '[zvideo poster=\'' . $thumb . '\']' . $url . '[/zvideo]' . "\n\n"; + } + else { + $s = "\n\n" . '[zvideo]' . $url . '[/zvideo]' . "\n\n"; + } + } + if(strpos($r['data']['filetype'],'audio') === 0) { + $url = z_root() . '/cloud/' . $channel['channel_address'] . '/' . $r['data']['display_path']; + echo "\n\n" . '[zaudio]' . $url . '[/zaudio]' . "\n\n"; + } + + $s .= "\n\n" . '[attachment]' . $r['data']['hash'] . ',' . $r['data']['revision'] . '[/attachment]' . "\n"; } - $sync = attach_export_data($channel,$r['data']['hash']); if($sync) { |