Friendica/friendica-addons
1
1
Fork 1
mirror of https://git.friendi.ca/friendica/friendica-addons.git synced 2025-03-03 20:48:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request '[tumblr] Skip empty tags when saving user-defined tags' (#1602) from MrPetovan/friendica-addons:bug/fatal-errors into develop

Browse source 
Reviewed-on: https://git.friendi.ca/friendica/friendica-addons/pulls/1602
This commit is contained in:
Tobias Diekershoff 2025-02-24 19:23:47 +01:00
commit 81b4d3cab4
1 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
tumblr/tumblr.php
View file

@ -391,12 +391,17 @@ function tumblr_settings_post(array &$b)
DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'tumblr', 'import', intval($_POST['tumblr_import'])); DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'tumblr', 'import', intval($_POST['tumblr_import']));
$max_tags = DI::config()->get('tumblr', 'max_tags') ?? TUMBLR_DEFAULT_MAXIMUM_TAGS; $max_tags = DI::config()->get('tumblr', 'max_tags') ?? TUMBLR_DEFAULT_MAXIMUM_TAGS;
$tags = [];
foreach (explode(',', $_POST['tags']) as $tag) { $tags = array_slice(
if (count($tags) < $max_tags) { array_filter(
$tags[] = trim($tag, ' #'); array_map(
} function($tag) { return trim($tag, ' #');},
} explode(',', $_POST['tags']) ?: []
)
),
0,
$max_tags,
);
DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'tumblr', 'tags', $tags); DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'tumblr', 'tags', $tags);
} }
@ -742,6 +747,11 @@ function tumblr_fetch_tags(int $uid, int $last_poll)
} }
foreach (DI::pConfig()->get($uid, 'tumblr', 'tags') ?? [] as $tag) { foreach (DI::pConfig()->get($uid, 'tumblr', 'tags') ?? [] as $tag) {
// Tumblr will return an error for queries on empty tag
if (!$tag) {
continue;
}
$data = tumblr_get($uid, 'tagged', ['tag' => $tag]); $data = tumblr_get($uid, 'tagged', ['tag' => $tag]);
if (!is_array($data->response)) { if (!is_array($data->response)) {