GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

[Favorite] Fix "Properly trigger DisfavorNotice on profile deletion"

Browse Source 
Calling find() inside delete() is probably not a good idea.
This commit is contained in:
Alexei Sorokin 2020-08-04 13:23:31 +03:00
parent a9c365a5eb
commit ab4120721f
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
modules/Favorite/FavoriteModule.php
View File

@ -342,7 +342,14 @@ class FavoriteModule extends ActivityVerbHandlerModule
{ {
$fave = new Fave(); $fave = new Fave();
$fave->user_id = $profile->id; $fave->user_id = $profile->id;
$fave->delete(); // Will perform a DELETE matching "user_id = {$user->id}"
// Will perform a DELETE matching "user_id = {$user->id}"
if ($fave->find()) {
while ($fave->fetch()) {
$fave->delete();
}
}
$fave->free(); $fave->free();
Fave::blowCacheForProfileId($profile->id); Fave::blowCacheForProfileId($profile->id);

4
modules/Favorite/classes/Fave.php
View File

@ -137,8 +137,6 @@ class Fave extends Managed_DataObject
$result = null; $result = null;
try { try {
if ($this->find()) {
while ($this->fetch()) {
$profile = $this->getActor(); $profile = $this->getActor();
$notice = $this->getTarget(); $notice = $this->getTarget();
@ -149,8 +147,6 @@ class Fave extends Managed_DataObject
Event::handle('EndDisfavorNotice', [$profile, $notice]); Event::handle('EndDisfavorNotice', [$profile, $notice]);
} }
} }
}
}
} catch (NoResultException $e) { } catch (NoResultException $e) {
// In case there's some inconsistency where the profile or notice was deleted without losing the fave db entry // In case there's some inconsistency where the profile or notice was deleted without losing the fave db entry
common_log(LOG_INFO, '"'.get_class($e->obj).'" with id=='.var_export($e->obj->id, true).' object not found when deleting favorite, ignoring...'); common_log(LOG_INFO, '"'.get_class($e->obj).'" with id=='.var_export($e->obj->id, true).' object not found when deleting favorite, ignoring...');