mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #23379 from nextcloud/fix/recent-contacts-federated

This commit is contained in:
John Molakvoæ 2020-10-12 18:40:22 +02:00 committed by GitHub
parent 6fde154eec 5a6a5a1639
commit ff84fc400a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/contactsinteraction/lib/Listeners/ContactInteractionListener.php
View File

@ -156,9 +156,6 @@ class ContactInteractionListener implements IEventListener {
'CATEGORIES' => $this->l10n->t('Recently contacted'), 'CATEGORIES' => $this->l10n->t('Recently contacted'),
]; ];
if ($contact->getUid() !== null) {
$props['X-NEXTCLOUD-UID'] = $contact->getUid();
}
if ($contact->getEmail() !== null) { if ($contact->getEmail() !== null) {
$props['EMAIL'] = $contact->getEmail(); $props['EMAIL'] = $contact->getEmail();
} }

1
apps/contactsinteraction/tests/Db/RecentContactMapperTest.php
View File

@ -110,7 +110,6 @@ class RecentContactMapperTest extends TestCase {
'URI' => UUIDUtil::getUUID(), 'URI' => UUIDUtil::getUUID(),
'FN' => 'Foo Bar', 'FN' => 'Foo Bar',
'CATEGORIES' => 'Recently contacted', 'CATEGORIES' => 'Recently contacted',
'X-NEXTCLOUD-UID' => 'foobar',
]; ];
$time = $this->time->getDateTime(); $time = $this->time->getDateTime();

4
apps/files_sharing/lib/Listener/ShareInteractionListener.php
View File

@ -72,6 +72,7 @@ class ShareInteractionListener implements IEventListener {
return; return;
} }
$actor = $this->userManager->get($share->getSharedBy()); $actor = $this->userManager->get($share->getSharedBy());
$sharedWith = $this->userManager->get($share->getSharedWith());
if ($actor === null) { if ($actor === null) {
$this->logger->warning('Share was not created by a user, can\'t emit interaction event'); $this->logger->warning('Share was not created by a user, can\'t emit interaction event');
return; return;
@ -80,6 +81,9 @@ class ShareInteractionListener implements IEventListener {
switch ($share->getShareType()) { switch ($share->getShareType()) {
case IShare::TYPE_USER: case IShare::TYPE_USER:
$interactionEvent->setUid($share->getSharedWith()); $interactionEvent->setUid($share->getSharedWith());
if ($sharedWith !== null) {
$interactionEvent->setFederatedCloudId($sharedWith->getCloudId());
}
break; break;
case IShare::TYPE_EMAIL: case IShare::TYPE_EMAIL:
$interactionEvent->setEmail($share->getSharedWith()); $interactionEvent->setEmail($share->getSharedWith());