deactivate social avatars from twitter

Signed-off-by: call-me-matt <nextcloud@matthiasheinisch.de>
nextcloud · Jul 7, 2023 · 82fde0e · 82fde0e
1 parent cecab50
commit 82fde0e
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 324 deletions.
diff --git a/img/twitter.svg b/img/twitter.svg
diff --git a/lib/Service/Social/CompositeSocialProvider.php b/lib/Service/Social/CompositeSocialProvider.php
@@ -32,7 +32,6 @@ class CompositeSocialProvider {
 
 	public function __construct(InstagramProvider $instagramProvider,
 								MastodonProvider $mastodonProvider,
-								TwitterProvider $twitterProvider,
 								// FacebookProvider $facebookProvider,
 								TumblrProvider $tumblrProvider,
 								DiasporaProvider $diasporaProvider,
@@ -43,8 +42,7 @@ public function __construct(InstagramProvider $instagramProvider,
 		$this->providers = [
 			$instagramProvider->name => $instagramProvider,
 			$mastodonProvider->name => $mastodonProvider,
-			$twitterProvider->name => $twitterProvider,
-			// $facebookProvider->name   => $facebookProvider,
+			// $facebookProvider->name => $facebookProvider,
 			$tumblrProvider->name => $tumblrProvider,
 			$diasporaProvider->name => $diasporaProvider,
 			$xingProvider->name => $xingProvider,

diff --git a/lib/Service/Social/TelegramProvider.php b/lib/Service/Social/TelegramProvider.php
@@ -25,7 +25,6 @@
 
 use GuzzleHttp\Exception\RequestException;
 use GuzzleHttp\RequestOptions;
-use OC\AppFramework\Http\Request;
 use OCA\Contacts\AppInfo\Application;
 use OCP\Http\Client\IClientService;
 use Psr\Log\LoggerInterface;
@@ -127,7 +126,6 @@ protected function getFromHtml(string $url, string $desired) : ?string {
 		try {
 			$result = $this->httpClient->get($url, [
 				RequestOptions::HEADERS => [
-					// Make the request as google bot so twitter display the full static html page
 					'User-Agent' => 'Googlebot/2.1'
 				]
 			]);

diff --git a/lib/Service/Social/TwitterProvider.php b/lib/Service/Social/TwitterProvider.php
diff --git a/tests/unit/Service/Social/TelegramProviderTest.php b/tests/unit/Service/Social/TelegramProviderTest.php
@@ -139,13 +139,13 @@ public function dataProviderGetImageUrls() {
 		$contactWithoutSocialImgs = [];
 
 		return [
-			'contact with twitter fields' => [
+			'contact with social fields' => [
 				$contactWithSocial,
 				$contactWithSocialHtml,
 				$contactWithSocialUrls,
 				$contactWithSocialImgs
 			],
-			'contact without twitter fields' => [
+			'contact without social fields' => [
 				$contactWithoutSocial,
 				$contactWithoutSocialHtml,
 				$contactWithoutSocialUrls,

diff --git a/tests/unit/Service/Social/TwitterProviderTest.php b/tests/unit/Service/Social/TwitterProviderTest.php