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

Merge branch 'dev' into nomadic

Browse source
This commit is contained in:
Mike Macgirvin 2024-04-25 10:44:19 +10:00
commit 44bb300882
5 changed files with 1582 additions and 1606 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/items.php
View file

@ -3592,7 +3592,6 @@ function drop_items($items, $stage = DROPITEM_NORMAL, $force = false, $expire =
function drop_item($id, $stage = DROPITEM_NORMAL, $force = false, $uid = 0, $observer_hash = '', $expire = false, $recurse = false) {
// locate item to be deleted
$r = q("SELECT * FROM item WHERE id = %d",
intval($id)
);
@ -3723,7 +3722,7 @@ function drop_related($item, $stage = DROPITEM_NORMAL, $force = false, $uid = 0,
foreach ($allRelated as $related) {
if ($related['verb'] === 'Add' && str_contains($related['tgt_type'], 'Collection')) {
$thisItem = json_decode($related['obj'], true);
if (isset($thisItem['object']['id']) && $thisItem['object']['id'] === $item['mid']) {
if (isset($thisItem['id']) && $thisItem['id'] === str_replace('/item/', '/activity/', $item['mid'])) {
drop_item($related['id'], $stage, $force, $uid, $observer_hash, $expire, recurse: true);
break;
}

2
src/Module/Stream.php
View file

@ -569,7 +569,7 @@ class Stream extends Controller
$items = q("SELECT item.*, item.id AS item_id, created FROM item
left join abook on ( item.owner_xchan = abook.abook_xchan $abook_uids )
$net_query
WHERE true $uids $item_normal
WHERE verb != 'Add' $uids $item_normal
and (abook.abook_blocked = 0 or abook.abook_flags is null)
$simple_update
$sql_extra $sql_options $sql_nets

3161
util/messages.po
View file

File diff suppressed because it is too large Load diff

2
version.php
View file

@ -1,2 +1,2 @@
<?php
define ('STD_VERSION', '24.04.17');
define ('STD_VERSION', '24.04.22');

20
view/js/main.js
View file

@ -1232,26 +1232,6 @@ function dopin(id) {
})
}
function dropItem(url, object) {
let confirm = confirmDelete();
if(confirm) {
let id = url.split('/')[2];
$('body').css('cursor', 'wait');
$(object + ', #pinned-wrapper-' + id).fadeTo('fast', 0.33, function () {
$.post('pin', { 'id' : id });
$.get(url).done(function() {
$(object + ', #pinned-wrapper-' + id).remove();
$('body').css('cursor', 'auto');
});
});
return true;
}
else {
return false;
}
}
function dropItem(url, object) {
let confirm = confirmDelete();