Skip to content

Commit

Permalink
Refactor OC\Server::getCommentsManager
Browse files Browse the repository at this point in the history
Signed-off-by: Andrew Summers <18727110+summersab@users.noreply.github.com>
  • Loading branch information
summersab authored and skjnldsv committed Mar 15, 2024
1 parent df1cd1b commit 6910832
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
5 changes: 3 additions & 2 deletions lib/private/User/User.php
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
use OC\Hooks\Emitter;
use OC_Helper;
use OCP\Accounts\IAccountManager;
use OCP\Comments\ICommentsManager;
use OCP\EventDispatcher\IEventDispatcher;
use OCP\Group\Events\BeforeUserRemovedEvent;
use OCP\Group\Events\UserRemovedEvent;
Expand Down Expand Up @@ -290,8 +291,8 @@ public function delete() {
// Delete the user's keys in preferences
\OC::$server->getConfig()->deleteAllUserValues($this->uid);

\OC::$server->getCommentsManager()->deleteReferencesOfActor('users', $this->uid);
\OC::$server->getCommentsManager()->deleteReadMarksFromUser($this);
\OC::$server->get(ICommentsManager::class)->deleteReferencesOfActor('users', $this->uid);
\OC::$server->get(ICommentsManager::class)->deleteReadMarksFromUser($this);

/** @var AvatarManager $avatarManager */
$avatarManager = \OCP\Server::get(AvatarManager::class);
Expand Down
2 changes: 1 addition & 1 deletion tests/lib/Comments/ManagerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -668,7 +668,7 @@ public function testDeleteReferencesOfActorWithUserManagement() {
$user = \OC::$server->getUserManager()->createUser('xenia', '123456');
$this->assertTrue($user instanceof IUser);

$manager = \OC::$server->getCommentsManager();
$manager = \OC::$server->get(ICommentsManager::class);
$comment = $manager->create('users', $user->getUID(), 'files', 'file64');
$comment
->setMessage('Most important comment I ever left on the Internet.')
Expand Down
3 changes: 2 additions & 1 deletion tests/lib/ServerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@

use OC\App\AppStore\Fetcher\AppFetcher;
use OC\App\AppStore\Fetcher\CategoryFetcher;
use OCP\Comments\ICommentsManager;

/**
* Class Server
Expand Down Expand Up @@ -185,7 +186,7 @@ public function testOverwriteDefaultCommentsManager() {

$config->setSystemValue('comments.managerFactory', '\Test\Comments\FakeFactory');

$manager = $this->server->getCommentsManager();
$manager = $this->server->get(ICommentsManager::class);
$this->assertInstanceOf('\OCP\Comments\ICommentsManager', $manager);

$config->setSystemValue('comments.managerFactory', $defaultManagerFactory);
Expand Down

0 comments on commit 6910832

Please sign in to comment.