friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Avoid storing an icid value when iaid is stored/Fix item retraction

This commit is contained in:
Michael 2018-07-07 16:38:01 +00:00
parent 575662c2d7
commit d6af9515ba
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Model/Item.php
View File

@ -752,7 +752,9 @@ class Item extends BaseObject
if (!empty($item['plink'])) {
$content_fields['plink'] = $item['plink'];
}
if (self::updateActivity($content_fields, ['uri' => $item['uri']])) {
if ((self::activityToIndex($item['verb']) >= 0) || !empty($item['iaid'])) {
self::updateActivity($content_fields, ['uri' => $item['uri']]);
if (empty($item['iaid'])) {
$item_activity = dba::selectFirst('item-activity', ['id'], ['uri' => $item['uri']]);
if (DBM::is_result($item_activity)) {

5
src/Protocol/Diaspora.php
View File

@ -2709,10 +2709,11 @@ class Diaspora
// When we receive a public retraction, we delete every item that we find.
if ($importer['uid'] == 0) {
$condition = ["`guid` = ? AND NOT `file` LIKE '%%[%%' AND NOT `deleted`", $target_guid];
$condition = ['guid' => $target_guid, 'deleted' => false];
} else {
$condition = ["`guid` = ? AND `uid` = ? AND NOT `file` LIKE '%%[%%' AND NOT `deleted`", $target_guid, $importer['uid']];
$condition = ['guid' => $target_guid, 'deleted' => false, 'uid' => $importer['uid']];
}
$r = Item::select($fields, $condition);
if (!DBM::is_result($r)) {
logger("Target guid ".$target_guid." was not found on this system for user ".$importer['uid'].".");