Make sure twitter returns the raw static html page so we can get the profile picture properly

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>

1 files changed, 11 insertions, 10 deletions

diff --git a/lib/Service/SocialApiService.php b/lib/Service/SocialApiService.php
index b1657734..2ea2f45b 100644
--- a/lib/Service/SocialApiService.php
+++ b/lib/Service/SocialApiService.php
@@ -23,22 +23,22 @@
 
 namespace OCA\Contacts\Service;
 
-use OCA\Contacts\Service\Social\CompositeSocialProvider;
 use OCA\Contacts\AppInfo\Application;
+use OCA\Contacts\Service\Social\CompositeSocialProvider;
 
-use OCP\Contacts\IManager;
-use OCP\IAddressBook;
+use OCA\DAV\CardDAV\CardDavBackend;
+use OCA\DAV\CardDAV\ContactsManager;
 
-use OCP\Util;
-use OCP\IConfig;
 use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\JSONResponse;
+use OCP\AppFramework\Utility\ITimeFactory;
+use OCP\Contacts\IManager;
 use OCP\Http\Client\IClientService;
-use OCA\DAV\CardDAV\CardDavBackend;
-use OCA\DAV\CardDAV\ContactsManager;
-use OCP\IURLGenerator;
+use OCP\IAddressBook;
+use OCP\IConfig;
 use OCP\IL10N;
-use OCP\AppFramework\Utility\ITimeFactory;
+use OCP\IURLGenerator;
+use OCP\Util;
 
 class SocialApiService {
 	private $appName;
@@ -175,7 +175,7 @@ class SocialApiService {
 
 		try {
 			// get corresponding addressbook
-			$addressBook = $this->getAddressBook($addressbookId);
+			$addressBook = $this->getAddressBook(urldecode($addressbookId));
 			if (is_null($addressBook)) {
 				return new JSONResponse([], Http::STATUS_BAD_REQUEST);
 			}
@@ -216,6 +216,7 @@ class SocialApiService {
 						break;
 					}
 				} catch (\Exception $e) {
+					return $e;
 				}
 			}