plugins-nextcloud-mirror/spreed
1
0
Fork 0
mirror of https://github.com/nextcloud/spreed.git synced 2025-12-18 05:20:50 +01:00
Code Projects Releases Activity

Use the language of the owner for the room name

Browse source 
Signed-off-by: Joas Schilling <coding@schilljs.com>
This commit is contained in:
Joas Schilling 2018-07-25 15:15:26 +02:00 • committed by Daniel Calviño Sánchez
parent 041f5248e6
commit 55a983fd9f
2 changed files with 7 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

12
lib/Controller/PublicShareAuthController.php
View file

@ -29,7 +29,6 @@ use OCA\Spreed\Participant;
use OCP\AppFramework\Http;
use OCP\AppFramework\Http\DataResponse;
use OCP\AppFramework\OCSController;
use OCP\IL10N;
use OCP\IRequest;
use OCP\IUser;
use OCP\IUserManager;
@ -47,8 +46,6 @@ class PublicShareAuthController extends OCSController {
private $shareManager;
/** @var Manager */
private $manager;
/** @var IL10N */
private $l10n;
/**
* @param string $appName
@ -57,7 +54,6 @@ class PublicShareAuthController extends OCSController {
* @param NotificationManager $notificationManager
* @param ShareManager $shareManager
* @param Manager $manager
* @param IL10N $l10n
*/
public function __construct(
string $appName,
@ -65,15 +61,13 @@ class PublicShareAuthController extends OCSController {
IUserManager $userManager,
NotificationManager $notificationManager,
ShareManager $shareManager,
Manager $manager,
IL10N $l10n
Manager $manager
) {
parent::__construct($appName, $request);
$this->userManager = $userManager;
$this->notificationManager = $notificationManager;
$this->shareManager = $shareManager;
$this->manager = $manager;
$this->l10n = $l10n;
}
/**
@ -127,10 +121,8 @@ class PublicShareAuthController extends OCSController {
}
}
$roomName = $this->l10n->t("Password request by %s", [$share->getSharedWith()]);
// Create the room
$room = $this->manager->createPublicRoom($roomName, 'share:password', $shareToken);
$room = $this->manager->createPublicRoom($share->getSharedWith(), 'share:password', $shareToken);
$room->addUsers([
'userId' => $sharerUser->getUID(),
'participantType' => Participant::OWNER,

5
lib/Controller/RoomController.php
View file

@ -214,6 +214,11 @@ class RoomController extends OCSController {
return $roomData;
}
if ($room->getObjectType() === 'share:password') {
// FIXME use an event
$roomData['displayName'] = $this->l10n->t('Password request by %s', [$room->getName()]);
}
$currentUser = $this->userManager->get($this->userId);
if ($currentUser instanceof IUser) {
$unreadSince = $this->chatManager->getUnreadMarker($room, $currentUser);