Delete the photo entries when a user or contact is removed

diff --git a/src/Worker/ExpireAndRemoveUsers.php b/src/Worker/ExpireAndRemoveUsers.php
index 1fda31a179f479280ce2c7e6cd8c954cf28f5272..c8344b6fd956cba4b5d3f11b8d7f71333112ce95 100644 (file)
--- a/src/Worker/ExpireAndRemoveUsers.php
+++ b/src/Worker/ExpireAndRemoveUsers.php
@@ -22,6 +22,7 @@
 namespace Friendica\Worker;
 
 use Friendica\Database\DBA;
+use Friendica\Model\Photo;
 use Friendica\Model\User;
 
 /**
@@ -51,6 +52,8 @@ class ExpireAndRemoveUsers
                                DBA::delete('contact', ['nurl' => $self['nurl'], 'self' => false]);
                        }
 
+                       Photo::delete(['uid' => $user['uid']]);
+
                        DBA::delete('user', ['uid' => $user['uid']]);
                }
                DBA::close($users);

diff --git a/src/Worker/RemoveContact.php b/src/Worker/RemoveContact.php
index 28a32160a014c7c830f5f5d5fb71952701792030..05771e2dc5c0ee5d1e494bcb5bfc552160df8711 100644 (file)
--- a/src/Worker/RemoveContact.php
+++ b/src/Worker/RemoveContact.php
@@ -23,8 +23,8 @@ namespace Friendica\Worker;
 
 use Friendica\Core\Logger;
 use Friendica\Database\DBA;
-use Friendica\Core\Protocol;
 use Friendica\Model\Item;
+use Friendica\Model\Photo;
 
 /**
  * Removes orphaned data from deleted contacts
@@ -33,7 +33,7 @@ class RemoveContact {
        public static function execute($id) {
 
                // Only delete if the contact is to be deleted
-               $contact = DBA::selectFirst('contact', ['uid'], ['deleted' => true]);
+               $contact = DBA::selectFirst('contact', ['uid'], ['deleted' => true, 'id' => $id]);
                if (!DBA::isResult($contact)) {
                        return;
                }
@@ -49,6 +49,7 @@ class RemoveContact {
                        DBA::close($items);
                } while (Item::exists($condition));
 
+               Photo::delete(['uid' => $contact['uid'], 'contact-id' => $id]);
                DBA::delete('contact', ['id' => $id]);
        }
 }