Merge remote-tracking branch 'upstream/2021.12-rc' into api-fixes

diff --cc include/api.php
Simple merge

diff --cc src/Module/Api/Friendica/Activity.php
Simple merge

diff --cc src/Module/Api/Friendica/DirectMessages/Setseen.php
Simple merge

diff --cc src/Module/Api/Friendica/Group/Delete.php
Simple merge

diff --cc src/Module/Api/Friendica/Group/Update.php
Simple merge

diff --cc src/Module/Api/Friendica/Notification/Seen.php
index f9a375f,ffd178b..5e4b132
--- 1/src/Module/Api/Friendica/Notification/Seen.php
--- 2/src/Module/Api/Friendica/Notification/Seen.php
+++ b/src/Module/Api/Friendica/Notification/Seen.php
@@@ -70,8 -70,7 +70,8 @@@ class Seen extends BaseAp
                                        // we found the item, return it to the user
                                        $ret  = [DI::twitterStatus()->createFromUriId($item['uri-id'], $item['uid'], $include_entities)->toArray()];
                                        $data = ['status' => $ret];
-                                       DI::apiResponse()->exit('statuses', $data, $this->parameters['extension'] ?? null);
+                                       $this->response->exit('statuses', $data, $this->parameters['extension'] ?? null);
 +                                      return;
                                }
                                // the item can't be found, but we set the notification as seen, so we count this as a success
                        }

diff --cc src/Module/Api/Friendica/Photo/Delete.php
Simple merge

diff --cc src/Module/Api/Friendica/Photoalbum/Delete.php
Simple merge

diff --cc src/Module/Api/Friendica/Photoalbum/Update.php
Simple merge

diff --cc src/Module/Api/Twitter/Account/UpdateProfile.php
Simple merge

diff --cc src/Module/Api/Twitter/Favorites/Create.php
Simple merge

diff --cc src/Module/Api/Twitter/Favorites/Destroy.php
Simple merge

diff --cc src/Module/Api/Twitter/Friendships/Destroy.php
Simple merge

diff --cc src/Module/Api/Twitter/Media/Upload.php
Simple merge

diff --cc src/Module/Api/Twitter/Statuses/Destroy.php
Simple merge

diff --cc tests/src/Module/Api/Friendica/Photo/DeleteTest.php
index 849d17c,6dd8eff..8c49456
--- 1/tests/src/Module/Api/Friendica/Photo/DeleteTest.php
--- 2/tests/src/Module/Api/Friendica/Photo/DeleteTest.php
+++ b/tests/src/Module/Api/Friendica/Photo/DeleteTest.php
@@@ -67,8 -67,8 +67,8 @@@ class DeleteTest extends ApiTes
        {
                $this->loadFixture(__DIR__ . '/../../../../../datasets/photo/photo.fixture.php', DI::dba());
  
 -              $delete   = new Delete(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), ['REQUEST_METHOD' => Router::DELETE]);
 +              $delete   = new Delete(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), ['REQUEST_METHOD' => Router::POST]);
-               $response = $delete->run([], ['photo_id' => '709057080661a283a6aa598501504178']);
+               $response = $delete->run(['photo_id' => '709057080661a283a6aa598501504178']);
  
                $responseText = (string)$response->getBody();
  

diff --cc tests/src/Module/Api/Friendica/Photoalbum/DeleteTest.php
index d576715,df8b720..8835548
--- 1/tests/src/Module/Api/Friendica/Photoalbum/DeleteTest.php
--- 2/tests/src/Module/Api/Friendica/Photoalbum/DeleteTest.php
+++ b/tests/src/Module/Api/Friendica/Photoalbum/DeleteTest.php
@@@ -46,8 -46,8 +46,8 @@@ class DeleteTest extends ApiTes
        {
                $this->loadFixture(__DIR__ . '/../../../../../datasets/photo/photo.fixture.php', DI::dba());
  
 -              $delete   = new Delete(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), ['REQUEST_METHOD' => Router::DELETE]);
 +              $delete   = new Delete(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), ['REQUEST_METHOD' => Router::POST]);
-               $response = $delete->run([], ['album' => 'test_album']);
+               $response = $delete->run(['album' => 'test_album']);
  
                $responseText = (string)$response->getBody();