forked from friendica/friendica-addons
Merge pull request #967 from MrPetovan/bug/7134-local-post-deleted
[pumpio] Rename Item::delete to Item::markForDeletion
This commit is contained in:
commit
93f8bbfe56
|
@ -914,7 +914,7 @@ function pumpio_dounlike(App $a, $uid, $self, $post, $own_id)
|
|||
}
|
||||
}
|
||||
|
||||
Item::delete(['verb' => Activity::LIKE, 'uid' => $uid, 'contact-id' => $contactid, 'thr-parent' => $orig_post['uri']]);
|
||||
Item::markForDeletion(['verb' => Activity::LIKE, 'uid' => $uid, 'contact-id' => $contactid, 'thr-parent' => $orig_post['uri']]);
|
||||
|
||||
if (DBA::isResult($r)) {
|
||||
Logger::log("pumpio_dounlike: unliked existing like. User ".$own_id." ".$uid." Contact: ".$contactid." Url ".$orig_post['uri']);
|
||||
|
@ -1082,13 +1082,13 @@ function pumpio_dodelete(App $a, $uid, $self, $post, $own_id)
|
|||
// Two queries for speed issues
|
||||
$condition = ['uri' => $post->object->id, 'uid' => $uid];
|
||||
if (Item::exists($condition)) {
|
||||
Item::delete($condition);
|
||||
Item::markForDeletion($condition);
|
||||
return true;
|
||||
}
|
||||
|
||||
$condition = ['extid' => $post->object->id, 'uid' => $uid];
|
||||
if (Item::exists($condition)) {
|
||||
Item::delete($condition);
|
||||
Item::markForDeletion($condition);
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
|
|
|
@ -808,8 +808,9 @@ function twitter_expire(App $a)
|
|||
return;
|
||||
}
|
||||
|
||||
$r = Item::select(['id'], ['deleted' => true, 'network' => Protocol::TWITTER]);
|
||||
$r = Item::select(['id', 'guid'], ['deleted' => true, 'network' => Protocol::TWITTER]);
|
||||
while ($row = DBA::fetch($r)) {
|
||||
Logger::info('[twitter] Delete expired item', ['id' => $row['id'], 'guid' => $row['guid'], 'callstack' => \Friendica\Core\System::callstack()]);
|
||||
DBA::delete('item', ['id' => $row['id']]);
|
||||
}
|
||||
DBA::close($r);
|
||||
|
|
Loading…
Reference in a new issue