Streams/streams
Streams/streams
1
0
Fork 0
mirror of https://codeberg.org/streams/streams.git synced 2024-09-20 00:35:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'dev' of codeberg.org:streams/streams into dev

Browse source
This commit is contained in:
Mike Macgirvin 2023-04-18 07:32:10 +10:00
commit bf55ca5195
4 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Code/Lib/Activity.php
View file

@ -4301,7 +4301,7 @@ class Activity
return false;
}
// check for the existence of existing media link in body
// check for the existence of existing share in body
public static function share_not_in_body($body)
{

3
Code/Module/Embedphotos.php
View file

@ -139,6 +139,9 @@ class Embedphotos extends Controller
}
$r = attach_by_hash($resource,get_observer_hash());
$url = z_root() . '/cloud/' . $channel['channel_address'] . '/' . $r['data']['display_path'];
if (str_starts_with($r['data']['filetype'], 'video')) {
for ($n = 0; $n < 15; $n++) {
$thumb = Linkinfo::get_video_poster($url);

3
Code/Module/Item.php
View file

@ -1144,7 +1144,8 @@ class Item extends Controller
else {
$r = attach_by_hash_nodata($hash, $observer['xchan_hash'], $rev);
if ($r['success']) {
$href = z_root() . '/attach/' . $r['data']['hash'];
$ch = Channel::from_id($r['data']['uid']);
$href = z_root() . (($ch) ? '/cloud/' . $ch['channel_address'] . '/' . $r['data']['display_path'] : '/attach/' . $r['data']['hash']);
if ($r['data']['is_photo']) {
$href = z_root() . '/photo/' . $r['data']['hash'] . '-1.' . photoExtensionFromType($r['data']['filetype']);
if ($token) {

2
version.php
View file

@ -1,2 +1,2 @@
<?php
define ('STD_VERSION', '23.04.14');
define ('STD_VERSION', '23.04.18');