friendica
/
friendica-addons
mirror of https://git.friendi.ca/friendica/friendica-addons.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request 'Tumblr: Small fixes' (#1375) from heluecht/friendica-addons:tumblr-fixes into develop 

Reviewed-on: https://git.friendi.ca/friendica/friendica-addons/pulls/1375
remotes/1696060291408326892/develop
Tobias Diekershoff 2023-04-27 07:12:19 +02:00
parent dac297b942 5d8a53b8ec
commit a733e82c21
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tumblr/tumblr.php
View File

@ -942,6 +942,10 @@ function tumblr_get_npf_data(DOMNode $node): array
function tumblr_get_attributes($node): array function tumblr_get_attributes($node): array
{ {
if (empty($node->attributes)) {
return [];
}
$attributes = []; $attributes = [];
foreach ($node->attributes as $key => $attribute) { foreach ($node->attributes as $key => $attribute) {
$attributes[$key] = trim($attribute->value); $attributes[$key] = trim($attribute->value);
@ -1040,7 +1044,7 @@ function tumblr_insert_contact(stdClass $blog, int $uid)
'name' => $blog->title, 'name' => $blog->title,
'nick' => $blog->name, 'nick' => $blog->name,
'addr' => $blog->name . '@tumblr.com', 'addr' => $blog->name . '@tumblr.com',
'about' => $blog->description, 'about' => HTML::toBBCode($blog->description),
'updated' => date(DateTimeFormat::MYSQL, $blog->updated) 'updated' => date(DateTimeFormat::MYSQL, $blog->updated)
]; ];
return Contact::insert($fields); return Contact::insert($fields);
@ -1090,7 +1094,7 @@ function tumblr_update_contact(stdClass $blog, int $uid, int $cid, int $pcid)
'name' => $info->response->blog->title, 'name' => $info->response->blog->title,
'nick' => $info->response->blog->name, 'nick' => $info->response->blog->name,
'addr' => $info->response->blog->name . '@tumblr.com', 'addr' => $info->response->blog->name . '@tumblr.com',
'about' => BBCode::convertForUriId($uri_id, $info->response->blog->description, BBCode::CONNECTORS), 'about' => HTML::toBBCode($info->response->blog->description),
'updated' => date(DateTimeFormat::MYSQL, $info->response->blog->updated), 'updated' => date(DateTimeFormat::MYSQL, $info->response->blog->updated),
'header' => $info->response->blog->theme->header_image_focused, 'header' => $info->response->blog->theme->header_image_focused,
'rel' => $rel, 'rel' => $rel,
@ -1173,7 +1177,11 @@ function tumblr_get_contact_by_url(string $url): array
} }
if (!preg_match('#^https?://tumblr.com/(.+)#', $url, $matches) && !preg_match('#^https?://www\.tumblr.com/(.+)#', $url, $matches) && !preg_match('#^https?://(.+)\.tumblr.com#', $url, $matches)) { if (!preg_match('#^https?://tumblr.com/(.+)#', $url, $matches) && !preg_match('#^https?://www\.tumblr.com/(.+)#', $url, $matches) && !preg_match('#^https?://(.+)\.tumblr.com#', $url, $matches)) {
$curlResult = DI::httpClient()->get($url); try {
$curlResult = DI::httpClient()->get($url);
} catch (\Exception $e) {
return [];
}
$html = $curlResult->getBody(); $html = $curlResult->getBody();
if (empty($html)) { if (empty($html)) {
return []; return [];
@ -1219,7 +1227,7 @@ function tumblr_get_contact_by_url(string $url): array
'pubkey' => '', 'pubkey' => '',
'priority' => 0, 'priority' => 0,
'guid' => $data->response->blog->uuid, 'guid' => $data->response->blog->uuid,
'about' => $data->response->blog->description, 'about' => HTML::toBBCode($data->response->blog->description),
'photo' => $data->response->blog->avatar[0]->url, 'photo' => $data->response->blog->avatar[0]->url,
'header' => $data->response->blog->theme->header_image_focused, 'header' => $data->response->blog->theme->header_image_focused,
]; ];