Skip to content

Commit 1e812e9

Browse files
icewind1991salmart-dev
authored andcommitted
fix: use shared_by user in share mail if initiator is not set
Signed-off-by: Robin Appelman <robin@icewind.nl>
1 parent e22802c commit 1e812e9

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

lib/Listeners/Files/ShareCreatedSendMail.php

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
use OCA\Circles\Tools\Traits\TStringTools;
3333
use OCP\EventDispatcher\Event;
3434
use OCP\EventDispatcher\IEventListener;
35+
use OCP\IUserManager;
3536

3637
/** @template-implements IEventListener<FileShareCreatedEvent|Event> */
3738
class ShareCreatedSendMail implements IEventListener {
@@ -56,6 +57,8 @@ class ShareCreatedSendMail implements IEventListener {
5657

5758
/** @var ContactService */
5859
private $contactService;
60+
/** @var IUserManager */
61+
private $userManager;
5962

6063
public function __construct(
6164
ShareWrapperService $shareWrapperService,
@@ -64,13 +67,15 @@ public function __construct(
6467
SendMailService $sendMailService,
6568
ContactService $contactService,
6669
ConfigService $configService,
70+
IUserManager $userManager,
6771
) {
6872
$this->shareWrapperService = $shareWrapperService;
6973
$this->shareTokenService = $shareTokenService;
7074
$this->remoteStreamService = $remoteStreamService;
7175
$this->sendMailService = $sendMailService;
7276
$this->contactService = $contactService;
7377
$this->configService = $configService;
78+
$this->userManager = $userManager;
7479

7580
$this->setup('app', Application::APP_ID);
7681
}
@@ -127,6 +132,8 @@ public function handle(Event $event): void {
127132
if (!is_null($share)) {
128133
if ($share->hasInitiator()) {
129134
$author = $share->getInitiator()->getDisplayName();
135+
} elseif ($user = $this->userManager->get($share->getSharedBy())) {
136+
$author = $user->getDisplayName();
130137
} else {
131138
$author = 'someone';
132139
}

0 commit comments

Comments
 (0)