tobias/friendica
1
0
Fork 0
Code Pull requests Activity

White spaces

Browse source
This commit is contained in:
Michael 2022-01-16 20:17:31 +00:00
parent 0e15715088
commit dc48f9b8f0
6 changed files with 19 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/Factory/Api/Friendica/Photo.php
View file

@ -91,9 +91,9 @@ class Photo extends BaseFactory
$link = $this->baseUrl->get() . '/photo/' . $data['resource-id'] . '-' . $photo['scale'] . Images::getExtensionByMimeType($data['type']); $link = $this->baseUrl->get() . '/photo/' . $data['resource-id'] . '-' . $photo['scale'] . Images::getExtensionByMimeType($data['type']);
if ($type == 'xml') { if ($type == 'xml') {
$data['links'][$photo['scale'] . ':link']['@attributes'] = [ $data['links'][$photo['scale'] . ':link']['@attributes'] = [
'type' => $data['type'], 'type' => $data['type'],
'scale' => $photo['scale'], 'scale' => $photo['scale'],
'href' => $link 'href' => $link
]; ];
} else { } else {
$data['link'][$id] = $link; $data['link'][$id] = $link;
@ -108,6 +108,7 @@ class Photo extends BaseFactory
if ($with_posts) { if ($with_posts) {
// retrieve item element for getting activities (like, dislike etc.) related to photo // retrieve item element for getting activities (like, dislike etc.) related to photo
$condition = ['uid' => $uid, 'resource-id' => $photo_id]; $condition = ['uid' => $uid, 'resource-id' => $photo_id];
$item = Post::selectFirst(['id', 'uid', 'uri', 'uri-id', 'parent', 'allow_cid', 'deny_cid', 'allow_gid', 'deny_gid'], $condition); $item = Post::selectFirst(['id', 'uid', 'uri', 'uri-id', 'parent', 'allow_cid', 'deny_cid', 'allow_gid', 'deny_gid'], $condition);
} }
if (!empty($item)) { if (!empty($item)) {
@ -147,7 +148,7 @@ class Photo extends BaseFactory
} elseif ($with_posts) { } elseif ($with_posts) {
$data['friendica_activities'] = []; $data['friendica_activities'] = [];
$data['friendica_comments'] = []; $data['friendica_comments'] = [];
$data['rights_mismatch'] = false; $data['rights_mismatch'] = false;
} }
return $data; return $data;

8
src/Module/Api/Friendica/Photo/Update.php
View file

@ -96,22 +96,22 @@ class Update extends BaseApi
} }
if (!is_null($allow_cid)) { if (!is_null($allow_cid)) {
$allow_cid = trim($allow_cid); $allow_cid = trim($allow_cid);
$updated_fields['allow_cid'] = $allow_cid; $updated_fields['allow_cid'] = $allow_cid;
} }
if (!is_null($deny_cid)) { if (!is_null($deny_cid)) {
$deny_cid = trim($deny_cid); $deny_cid = trim($deny_cid);
$updated_fields['deny_cid'] = $deny_cid; $updated_fields['deny_cid'] = $deny_cid;
} }
if (!is_null($allow_gid)) { if (!is_null($allow_gid)) {
$allow_gid = trim($allow_gid); $allow_gid = trim($allow_gid);
$updated_fields['allow_gid'] = $allow_gid; $updated_fields['allow_gid'] = $allow_gid;
} }
if (!is_null($deny_gid)) { if (!is_null($deny_gid)) {
$deny_gid = trim($deny_gid); $deny_gid = trim($deny_gid);
$updated_fields['deny_gid'] = $deny_gid; $updated_fields['deny_gid'] = $deny_gid;
} }

2
src/Module/Api/Twitter/Search/Tweets.php
View file

@ -49,7 +49,7 @@ class Tweets extends BaseApi
$data['status'] = []; $data['status'] = [];
$count = $this->getRequestValue($request, 'count', 15); $count = $this->getRequestValue($request, 'count', 20, 1, 100);
$count = $this->getRequestValue($request, 'rpp', $count); $count = $this->getRequestValue($request, 'rpp', $count);
$since_id = $this->getRequestValue($request, 'since_id', 0, 0); $since_id = $this->getRequestValue($request, 'since_id', 0, 0);
$max_id = $this->getRequestValue($request, 'max_id', 0, 0); $max_id = $this->getRequestValue($request, 'max_id', 0, 0);