Merge remote-tracking branch 'upstream/develop' into api

[friendica.git] / src / Module / Settings / UserExport.php

diff --git a/src/Module/Settings/UserExport.php b/src/Module/Settings/UserExport.php
index 74bb517c39637509b5b0b70bf358d59ac42f3554..1eecea3f99f5b171cdbcef38364604f1ce2f1bce 100644 (file)
--- a/src/Module/Settings/UserExport.php
+++ b/src/Module/Settings/UserExport.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2022, the Friendica project
+ * @copyright Copyright (C) 2010-2023, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -47,17 +47,13 @@ use Psr\Log\LoggerInterface;
  **/
 class UserExport extends BaseSettings
 {
-       /** @var IHandleUserSessions */
-       private $session;
-
        /** @var DbaDefinition */
        private $dbaDefinition;
 
-       public function __construct(DbaDefinition $dbaDefinition, IHandleUserSessions $session, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = [])
+       public function __construct(DbaDefinition $dbaDefinition, IHandleUserSessions $session, App\Page $page, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = [])
        {
-               parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
+               parent::__construct($session, $page, $l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
 
-               $this->session       = $session;
                $this->dbaDefinition = $dbaDefinition;
        }
 
@@ -222,7 +218,7 @@ class UserExport extends BaseSettings
                // write the table header (like Mastodon)
                echo "Account address, Show boosts\n";
                // get all the contacts
-               $contacts = DBA::select('contact', ['addr', 'url'], ['uid' => $user_id, 'self' => false, 'rel' => [1, 3], 'deleted' => false]);
+               $contacts = DBA::select('contact', ['addr', 'url'], ['uid' => $user_id, 'self' => false, 'rel' => [Contact::SHARING, Contact::FRIEND], 'deleted' => false, 'archive' => false]);
                while ($contact = DBA::fetch($contacts)) {
                        echo ($contact['addr'] ?: $contact['url']) . ", true\n";
                }