Merge remote-tracking branch 'origin/master'

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>

8 files changed, 45 insertions, 39 deletions

diff --git a/appinfo/routes.php b/appinfo/routes.php
index 0b323cc3..620d46c0 100644
--- a/appinfo/routes.php
+++ b/appinfo/routes.php
@@ -37,65 +37,65 @@ use OCA\Social\Service\CurlService;
 return [
 	'routes' => [
 		['name' => 'Navigation#navigate', 'url' => '/', 'verb' => 'GET'],
-		['name' => 'Navigation#test', 'url' => '/test/', 'verb' => 'GET'],
+		['name' => 'Navigation#test', 'url' => '/test', 'verb' => 'GET'],
 		[
-			'name'         => 'Navigation#timeline', 'url' => '/timeline/{path}/', 'verb' => 'GET',
+			'name'         => 'Navigation#timeline', 'url' => '/timeline/{path}', 'verb' => 'GET',
 			'requirements' => ['path' => '.+'],
 			'defaults' => ['path' => '']
 		],
-		['name' => 'Navigation#documentGet', 'url' => '/document/get/', 'verb' => 'GET'],
-		['name' => 'Navigation#documentGetPublic', 'url' => '/document/public/', 'verb' => 'GET'],
+		['name' => 'Navigation#documentGet', 'url' => '/document/get', 'verb' => 'GET'],
+		['name' => 'Navigation#documentGetPublic', 'url' => '/document/public', 'verb' => 'GET'],
 
-		['name' => 'ActivityPub#actor', 'url' => '/users/{username}/', 'verb' => 'GET'],
+		['name' => 'ActivityPub#actor', 'url' => '/users/{username}', 'verb' => 'GET'],
 		['name' => 'ActivityPub#actorAlias', 'url' => '/@{username}/', 'verb' => 'GET'],
-		['name' => 'ActivityPub#inbox', 'url' => '/@{username}/inbox/', 'verb' => 'POST'],
-		['name' => 'ActivityPub#sharedInbox', 'url' => '/inbox/', 'verb' => 'POST'],
-		['name' => 'ActivityPub#outbox', 'url' => '/@{username}/outbox/', 'verb' => 'POST'],
-		['name' => 'ActivityPub#followers', 'url' => '/@{username}/followers/', 'verb' => 'GET'],
-		['name' => 'ActivityPub#following', 'url' => '/@{username}/following/', 'verb' => 'GET'],
+		['name' => 'ActivityPub#inbox', 'url' => '/@{username}/inbox', 'verb' => 'POST'],
+		['name' => 'ActivityPub#sharedInbox', 'url' => '/inbox', 'verb' => 'POST'],
+		['name' => 'ActivityPub#outbox', 'url' => '/@{username}/outbox', 'verb' => 'POST'],
+		['name' => 'ActivityPub#followers', 'url' => '/@{username}/followers', 'verb' => 'GET'],
+		['name' => 'ActivityPub#following', 'url' => '/@{username}/following', 'verb' => 'GET'],
 
-		['name' => 'OStatus#subscribe', 'url' => '/ostatus/follow/{uri}/', 'verb' => 'GET'],
-		['name' => 'OStatus#followRemote', 'url' => '/api/v1/ostatus/followRemote/{local}/', 'verb' => 'GET'],
-		['name' => 'OStatus#getLink', 'url' => '/api/v1/ostatus/link/{local}/{account}/', 'verb' => 'GET'],
+		['name' => 'OStatus#subscribe', 'url' => '/ostatus/follow/{uri}', 'verb' => 'GET'],
+		['name' => 'OStatus#followRemote', 'url' => '/api/v1/ostatus/followRemote/{local}', 'verb' => 'GET'],
+		['name' => 'OStatus#getLink', 'url' => '/api/v1/ostatus/link/{local}/{account}', 'verb' => 'GET'],
 
-		['name' => 'SocialPub#displayPost', 'url' => '/@{username}/{postId}/', 'verb' => 'GET'],
+		['name' => 'SocialPub#displayPost', 'url' => '/@{username}/{postId}', 'verb' => 'GET'],
 
-		['name' => 'Local#streamHome', 'url' => '/api/v1/stream/home/', 'verb' => 'GET'],
-		['name' => 'Local#streamNotifications', 'url' => '/api/v1/stream/notifications/', 'verb' => 'GET'],
-		['name' => 'Local#streamTimeline', 'url' => '/api/v1/stream/timeline/', 'verb' => 'GET'],
+		['name' => 'Local#streamHome', 'url' => '/api/v1/stream/home', 'verb' => 'GET'],
+		['name' => 'Local#streamNotifications', 'url' => '/api/v1/stream/notifications', 'verb' => 'GET'],
+		['name' => 'Local#streamTimeline', 'url' => '/api/v1/stream/timeline', 'verb' => 'GET'],
 		['name' => 'Local#streamTag', 'url' => '/api/v1/stream/tag/{hashtag}/', 'verb' => 'GET'],
-		['name' => 'Local#streamFederated', 'url' => '/api/v1/stream/federated/', 'verb' => 'GET'],
-		['name' => 'Local#streamDirect', 'url' => '/api/v1/stream/direct/', 'verb' => 'GET'],
-		['name' => 'Local#streamAccount', 'url' => '/api/v1/account/{username}/stream/', 'verb' => 'GET'],
+		['name' => 'Local#streamFederated', 'url' => '/api/v1/stream/federated', 'verb' => 'GET'],
+		['name' => 'Local#streamDirect', 'url' => '/api/v1/stream/direct', 'verb' => 'GET'],
+		['name' => 'Local#streamAccount', 'url' => '/api/v1/account/{username}/stream', 'verb' => 'GET'],
 
-		['name' => 'Local#postCreate', 'url' => '/api/v1/post/', 'verb' => 'POST'],
-		['name' => 'Local#postDelete', 'url' => '/api/v1/post/', 'verb' => 'DELETE'],
+		['name' => 'Local#postCreate', 'url' => '/api/v1/post', 'verb' => 'POST'],
+		['name' => 'Local#postDelete', 'url' => '/api/v1/post', 'verb' => 'DELETE'],
 
-		['name' => 'Local#postBoost', 'url' => '/api/v1/post/boost/', 'verb' => 'POST'],
-		['name' => 'Local#postUnboost', 'url' => '/api/v1/post/boost/', 'verb' => 'DELETE'],
+		['name' => 'Local#postBoost', 'url' => '/api/v1/post/boost', 'verb' => 'POST'],
+		['name' => 'Local#postUnboost', 'url' => '/api/v1/post/boost', 'verb' => 'DELETE'],
 
-		['name' => 'Local#actionFollow', 'url' => '/api/v1/current/follow/', 'verb' => 'PUT'],
-		['name' => 'Local#actionUnfollow', 'url' => '/api/v1/current/follow/', 'verb' => 'DELETE'],
+		['name' => 'Local#actionFollow', 'url' => '/api/v1/current/follow', 'verb' => 'PUT'],
+		['name' => 'Local#actionUnfollow', 'url' => '/api/v1/current/follow', 'verb' => 'DELETE'],
 
-		['name' => 'Local#currentInfo', 'url' => '/api/v1/current/info/', 'verb' => 'GET'],
-		['name' => 'Local#currentFollowers', 'url' => '/api/v1/current/followers/', 'verb' => 'GET'],
-		['name' => 'Local#currentFollowing', 'url' => '/api/v1/current/following/', 'verb' => 'GET'],
+		['name' => 'Local#currentInfo', 'url' => '/api/v1/current/info', 'verb' => 'GET'],
+		['name' => 'Local#currentFollowers', 'url' => '/api/v1/current/followers', 'verb' => 'GET'],
+		['name' => 'Local#currentFollowing', 'url' => '/api/v1/current/following', 'verb' => 'GET'],
 
-		['name' => 'Local#accountInfo', 'url' => '/api/v1/account/{username}/info/', 'verb' => 'GET'],
-		['name' => 'Local#accountFollowers', 'url' => '/api/v1/account/{username}/followers/', 'verb' => 'GET'],
-		['name' => 'Local#accountFollowing', 'url' => '/api/v1/account/{username}/following/', 'verb' => 'GET'],
+		['name' => 'Local#accountInfo', 'url' => '/api/v1/account/{username}/info', 'verb' => 'GET'],
+		['name' => 'Local#accountFollowers', 'url' => '/api/v1/account/{username}/followers', 'verb' => 'GET'],
+		['name' => 'Local#accountFollowing', 'url' => '/api/v1/account/{username}/following', 'verb' => 'GET'],
 
-		['name' => 'Local#globalAccountInfo', 'url' => '/api/v1/global/account/info/', 'verb' => 'GET'],
-		['name' => 'Local#globalActorInfo', 'url' => '/api/v1/global/actor/info/', 'verb' => 'GET'],
-		['name' => 'Local#globalActorAvatar', 'url' => '/api/v1/global/actor/avatar/', 'verb' => 'GET'],
-		['name' => 'Local#globalAccountsSearch', 'url' => '/api/v1/global/accounts/search/', 'verb' => 'GET'],
+		['name' => 'Local#globalAccountInfo', 'url' => '/api/v1/global/account/info', 'verb' => 'GET'],
+		['name' => 'Local#globalActorInfo', 'url' => '/api/v1/global/actor/info', 'verb' => 'GET'],
+		['name' => 'Local#globalActorAvatar', 'url' => '/api/v1/global/actor/avatar', 'verb' => 'GET'],
+		['name' => 'Local#globalAccountsSearch', 'url' => '/api/v1/global/accounts/search', 'verb' => 'GET'],
 
 //		['name' => 'Local#documentsCache', 'url' => '/api/v1/documents/cache', 'verb' => 'POST'],
 
-    ['name' => 'Local#search', 'url' => '/api/v1/search/', 'verb' => 'GET'],
+    ['name' => 'Local#search', 'url' => '/api/v1/search', 'verb' => 'GET'],
 
 		['name' => 'Queue#asyncForRequest', 'url' => CurlService::ASYNC_REQUEST_TOKEN, 'verb' => 'POST'],
 
-		['name' => 'Config#setCloudAddress', 'url' => '/api/v1/config/cloudAddress/', 'verb' => 'POST']
+		['name' => 'Config#setCloudAddress', 'url' => '/api/v1/config/cloudAddress', 'verb' => 'POST']
 	]
 ];
diff --git a/l10n/de.js b/l10n/de.js
index 64bf643c..76ffe06c 100644
--- a/l10n/de.js
+++ b/l10n/de.js
@@ -42,6 +42,7 @@ OC.L10N.register(
     "Boost" : "Verstärken",
     "More actions" : "Weitere Aktionen",
     "Delete post" : "Post löschen",
+    "boosted" : "Verstärken",
     "No posts found" : "Keine Posts gefunden",
     "Posts from people you follow will show up here" : "Posts von Personen denen Du folgst werden hier angezeigt",
     "No direct messages found" : "Keine Direktnachrichten gefunden",
diff --git a/l10n/de.json b/l10n/de.json
index 0a3ee40e..9e1969bb 100644
--- a/l10n/de.json
+++ b/l10n/de.json
@@ -40,6 +40,7 @@
     "Boost" : "Verstärken",
     "More actions" : "Weitere Aktionen",
     "Delete post" : "Post löschen",
+    "boosted" : "Verstärken",
     "No posts found" : "Keine Posts gefunden",
     "Posts from people you follow will show up here" : "Posts von Personen denen Du folgst werden hier angezeigt",
     "No direct messages found" : "Keine Direktnachrichten gefunden",
diff --git a/l10n/de_DE.js b/l10n/de_DE.js
index 24ffebec..af318d31 100644
--- a/l10n/de_DE.js
+++ b/l10n/de_DE.js
@@ -42,6 +42,7 @@ OC.L10N.register(
     "Boost" : "Verstärken",
     "More actions" : "Weitere Aktionen",
     "Delete post" : "Post löschen",
+    "boosted" : "Verstärken",
     "No posts found" : "Keine Posts gefunden",
     "Posts from people you follow will show up here" : "Posts von Personen denen Sie folgen werden hier angezeigt",
     "No direct messages found" : "Keine Direktnachrichten gefunden",
diff --git a/l10n/de_DE.json b/l10n/de_DE.json
index 87872e98..19fcb327 100644
--- a/l10n/de_DE.json
+++ b/l10n/de_DE.json
@@ -40,6 +40,7 @@
     "Boost" : "Verstärken",
     "More actions" : "Weitere Aktionen",
     "Delete post" : "Post löschen",
+    "boosted" : "Verstärken",
     "No posts found" : "Keine Posts gefunden",
     "Posts from people you follow will show up here" : "Posts von Personen denen Sie folgen werden hier angezeigt",
     "No direct messages found" : "Keine Direktnachrichten gefunden",
diff --git a/l10n/es.js b/l10n/es.js
index 3c1cdf3b..410c7933 100644
--- a/l10n/es.js
+++ b/l10n/es.js
@@ -42,6 +42,7 @@ OC.L10N.register(
     "Boost" : "Refuerzo",
     "More actions" : "Más acciones",
     "Delete post" : "Eliminar post",
+    "boosted" : "Arrancado",
     "No posts found" : "No se han encontrado entradas",
     "Posts from people you follow will show up here" : "Las entradas de gente a la que sigues aparecerán aquí",
     "No direct messages found" : "No se han encontrado mensajes directos",
diff --git a/l10n/es.json b/l10n/es.json
index a2acb51f..9ca8a865 100644
--- a/l10n/es.json
+++ b/l10n/es.json
@@ -40,6 +40,7 @@
     "Boost" : "Refuerzo",
     "More actions" : "Más acciones",
     "Delete post" : "Eliminar post",
+    "boosted" : "Arrancado",
     "No posts found" : "No se han encontrado entradas",
     "Posts from people you follow will show up here" : "Las entradas de gente a la que sigues aparecerán aquí",
     "No direct messages found" : "No se han encontrado mensajes directos",
diff --git a/lib/Service/CurlService.php b/lib/Service/CurlService.php
index 5be2ed40..01eabb30 100644
--- a/lib/Service/CurlService.php
+++ b/lib/Service/CurlService.php
@@ -58,7 +58,7 @@ class CurlService {
 	use TPathTools;
 
 
-	const ASYNC_REQUEST_TOKEN = '/async/request/{token}/';
+	const ASYNC_REQUEST_TOKEN = '/async/request/{token}';
 	const USER_AGENT = 'Nextcloud Social';