clones/friendica-addons
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request 'Tumblr: Use the UUID to address the blog' (#1367) from heluecht/friendica-addons:tumblr-blog into 2023.03-rc 

Reviewed-on: https://git.friendi.ca/friendica/friendica-addons/pulls/1367
This commit is contained in:
Hypolite Petovan 2023-04-09 06:56:18 +02:00
parent 9732ad543b 852ddb8acc
commit 91bb323a16
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tumblr/tumblr.php
View File

@ -25,7 +25,6 @@ use Friendica\Util\Network;
use GuzzleHttp\Client; use GuzzleHttp\Client;
use GuzzleHttp\Exception\RequestException; use GuzzleHttp\Exception\RequestException;
use GuzzleHttp\HandlerStack; use GuzzleHttp\HandlerStack;
use GuzzleHttp\Psr7\Uri as Uri;
use GuzzleHttp\Subscriber\Oauth\Oauth1; use GuzzleHttp\Subscriber\Oauth\Oauth1;
function tumblr_install() function tumblr_install()
@ -229,9 +228,7 @@ function tumblr_settings(array &$data)
$userinfo = tumblr_get($connection, 'user/info'); $userinfo = tumblr_get($connection, 'user/info');
if (!empty($userinfo['success'])) { if (!empty($userinfo['success'])) {
foreach ($userinfo['data']->response->user->blogs as $blog) { foreach ($userinfo['data']->response->user->blogs as $blog) {
$uri = new Uri($blog->url); $blogs[$blog->uuid] = $blog->name;
$url = trim($uri->getHost() . $uri->getPath(), '/');
$blogs[$url] = $url;
} }
} }