From 6f2dac8b0b4668910218c2fc72e39f42db0b9e25 Mon Sep 17 00:00:00 2001 From: sualko Date: Sun, 26 Apr 2020 13:35:35 +0200 Subject: [PATCH] shorten join url --- appinfo/routes.php | 2 +- ts/Manager/RoomRow.tsx | 4 ++-- ts/filelist.ts | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/appinfo/routes.php b/appinfo/routes.php index f22716d..6df140a 100644 --- a/appinfo/routes.php +++ b/appinfo/routes.php @@ -5,7 +5,7 @@ return [ 'room_api' => ['url' => '/api/0.1/rooms'] ], 'routes' => [ - ['name' => 'join#index', 'url' => '/b/{token}', 'verb' => 'GET'], + ['name' => 'join#index', 'url' => '/{token}', 'verb' => 'GET', 'requirements' => array('token' => '\w[16,]')], ['name' => 'room_api#preflighted_cors', 'url' => '/api/0.1/{path}', 'verb' => 'OPTIONS', 'requirements' => ['path' => '.+']] ] diff --git a/ts/Manager/RoomRow.tsx b/ts/Manager/RoomRow.tsx index 03acd9b..a122371 100644 --- a/ts/Manager/RoomRow.tsx +++ b/ts/Manager/RoomRow.tsx @@ -73,12 +73,12 @@ const RoomRow: React.FC = (props) => { return ( - + - + {edit('name')} diff --git a/ts/filelist.ts b/ts/filelist.ts index de76a08..283d2d4 100644 --- a/ts/filelist.ts +++ b/ts/filelist.ts @@ -51,7 +51,7 @@ $(() => { async function share(path: string, filename: string, roomUid) { const id = await createShare(path); const shareUrl = await configureShare(id); - const joinUrl = generateUrl('/apps/bbb/b/{uid}?u={url}&filename={filename}', { + const joinUrl = generateUrl('/apps/bbb/{uid}?u={url}&filename={filename}', { uid: roomUid, url: shareUrl + '/download', filename