keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Changed:

Browse source 
- used `$this->getRequestValue($request, 'foo', <bar>)` instead of `$request['foo'] ?? <bar>`
- fixed wrong variable naming
- changed double-quotes to single
- see https://github.com/friendica/friendica/issues/11631#issuecomment-1196410497
This commit is contained in:
Roland Häder 2022-07-29 00:36:07 +02:00
parent 5ec407699b
commit eaed3945d1
No known key found for this signature in database
GPG key ID: C82EDE5DDFA0BA77
21 changed files with 28 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Model/Contact.php
View file

@ -2969,7 +2969,7 @@ class Contact
$cdata = self::getPublicAndUserContactID($contact['id'], $contact['uid']);
DI::notification()->deleteForUserByVerb($contact['uid'], Activity::FOLLOW, ['actor-id' => $cdata['public']]);
DI::notification()->deleteForUserByVerb($contact['uid'], Activity::FOLLOW, ['actor-id' => $contact['public']]);
}
/**

2
src/Module/Api/Friendica/DirectMessages/Search.php
View file

@ -77,7 +77,7 @@ class Search extends BaseApi
} else {
$ret = [];
foreach ($mails as $mail) {
$ret[] = $this->directMessage->createFromMailId($mail['id'], $uid, $request['getText'] ?? '');
$ret[] = $this->directMessage->createFromMailId($mail['id'], $uid, $this->getRequestValue($request, 'getText', ''));
}
$success = ['success' => true, 'search_results' => $ret];
}

2
src/Module/Api/Friendica/Group/Delete.php
View file

@ -44,7 +44,7 @@ class Delete extends BaseApi
// params
// error if no gid specified
if ($request['gid'] == 0 || $request['name'] == "") {
if ($request['gid'] == 0 || $request['name'] == '') {
throw new BadRequestException('gid or name not specified');
}

2
src/Module/Api/Friendica/Notification/Seen.php
View file

@ -47,7 +47,7 @@ class Seen extends BaseApi
throw new BadRequestException('Invalid argument count');
}
$id = intval($request['id'] ?? 0);
$id = intval($this->getRequestValue($request, 'id', 0));
$include_entities = $this->getRequestValue($request, 'include_entities', false);

2
src/Module/Api/GNUSocial/Statusnet/Conversation.php
View file

@ -50,7 +50,7 @@ class Conversation extends BaseApi
$start = max(0, ($page - 1) * $count);
if ($id == 0) {
$id = $request['id'] ?? 0;
$id = $this->getRequestValue($request, 'id', 0);
}
Logger::info(BaseApi::LOG_PREFIX . '{subaction}', ['module' => 'api', 'action' => 'conversation', 'subaction' => 'show', 'id' => $id]);

8
src/Module/Api/Twitter/Account/RateLimitStatus.php
View file

@ -34,13 +34,13 @@ class RateLimitStatus extends BaseApi
if (($this->parameters['extension'] ?? '') == 'xml') {
$hash = [
'remaining-hits' => '150',
'@attributes' => ["type" => "integer"],
'@attributes' => ['type' => 'integer'],
'hourly-limit' => '150',
'@attributes2' => ["type" => "integer"],
'@attributes2' => ['type' => 'integer'],
'reset-time' => DateTimeFormat::utc('now + 1 hour', DateTimeFormat::ATOM),
'@attributes3' => ["type" => "datetime"],
'@attributes3' => ['type' => 'datetime'],
'reset_time_in_seconds' => strtotime('now + 1 hour'),
'@attributes4' => ["type" => "integer"],
'@attributes4' => ['type' => 'integer'],
];
} else {
$hash = [

2
src/Module/Api/Twitter/DirectMessages/Conversation.php
View file

@ -34,6 +34,6 @@ class Conversation extends DirectMessagesEndpoint
BaseApi::checkAllowedScope(BaseApi::SCOPE_READ);
$uid = BaseApi::getCurrentUserID();
$this->getMessages($request, $uid, ["`parent-uri` = ?", $request['uri'] ?? '']);
$this->getMessages($request, $uid, ["`parent-uri` = ?", $this->getRequestValue($request, 'uri', '')]);
}
}

3
src/Module/Api/Twitter/DirectMessages/Destroy.php
View file

@ -56,8 +56,7 @@ class Destroy extends BaseApi
$id = $this->getRequestValue($this->parameters, 'id', $id);
$verbose = $this->getRequestValue($request, 'friendica_verbose', false);
$parenturi = $request['friendica_parenturi'] ?? '';
$parenturi = $this->getRequestValue($request, 'friendica_parenturi', '');
// error if no id or parenturi specified (for clients posting parent-uri as well)
if ($verbose && $id == 0 && $parenturi == "") {

4
src/Module/Api/Twitter/DirectMessages/NewDM.php
View file

@ -63,7 +63,7 @@ class NewDM extends BaseApi
return;
}
$cid = BaseApi::getContactIDForSearchterm($request['screen_name'] ?? '', $request['profileurl'] ?? '', $request['user_id'] ?? 0, 0);
$cid = BaseApi::getContactIDForSearchterm($this->getRequestValue($request, 'screen_name', ''), $this->getRequestValue($request, 'profileurl', ''), $this->getRequestValue($request, 'user_id', 0), 0);
if (empty($cid)) {
throw new NotFoundException('Recipient not found');
}
@ -86,7 +86,7 @@ class NewDM extends BaseApi
$id = Mail::send($cdata['user'], $request['text'], $sub, $replyto);
if ($id > -1) {
$ret = $this->directMessage->createFromMailId($id, $uid, $request['getText'] ?? '');
$ret = $this->directMessage->createFromMailId($id, $uid, $this->getRequestValue($request, 'getText', ''));
} else {
$ret = ['error' => $id];
}

4
src/Module/Api/Twitter/DirectMessagesEndpoint.php
View file

@ -84,7 +84,7 @@ abstract class DirectMessagesEndpoint extends BaseApi
$params['order'] = ['id'];
}
$cid = BaseApi::getContactIDForSearchterm($request['screen_name'] ?? '', $request['profileurl'] ?? '', $request['user_id'] ?? 0, 0);
$cid = BaseApi::getContactIDForSearchterm($this->getRequestValue($request, 'screen_name', ''), $this->getRequestValue($request, 'profileurl', ''), $this->getRequestValue($request, 'user_id', 0), 0);
if (!empty($cid)) {
$cdata = Contact::getPublicAndUserContactID($cid, $uid);
if (!empty($cdata['user'])) {
@ -109,7 +109,7 @@ abstract class DirectMessagesEndpoint extends BaseApi
$ret = [];
foreach ($ids as $id) {
$ret[] = $this->directMessage->createFromMailId($id, $uid, $request['getText'] ?? '');
$ret[] = $this->directMessage->createFromMailId($id, $uid, $this->getRequestValue($request, 'getText', ''));
}
self::setLinkHeader();

2
src/Module/Api/Twitter/Favorites/Create.php
View file

@ -37,7 +37,7 @@ class Create extends BaseApi
self::checkAllowedScope(self::SCOPE_WRITE);
$uid = self::getCurrentUserID();
$id = $request['id'] ?? 0;
$id = $this->getRequestValue($request, 'id', 0);
if (empty($id)) {
throw new BadRequestException('Item id not specified');

2
src/Module/Api/Twitter/Favorites/Destroy.php
View file

@ -37,7 +37,7 @@ class Destroy extends BaseApi
self::checkAllowedScope(self::SCOPE_WRITE);
$uid = self::getCurrentUserID();
$id = $request['id'] ?? 0;
$id = $this->getRequestValue($request, 'id', 0);
if (empty($id)) {
throw new BadRequestException('Item id not specified');

2
src/Module/Api/Twitter/Followers/Ids.php
View file

@ -37,7 +37,7 @@ class Ids extends ContactEndpoint
$uid = BaseApi::getCurrentUserID();
// Expected value for user_id parameter: public/user contact id
$cid = BaseApi::getContactIDForSearchterm($request['screen_name'] ?? '', $request['profileurl'] ?? '', $request['user_id'] ?? 0, $uid);
$cid = BaseApi::getContactIDForSearchterm($this->getRequestValue($request, 'screen_name', ''), $this->getRequestValue($request, 'profileurl', ''), $this->getRequestValue($request, 'user_id', 0), $uid);
$cursor = $this->getRequestValue($request, 'cursor', -1);
$stringify_ids = $this->getRequestValue($request, 'stringify_ids', false);
$count = $this->getRequestValue($request, 'count', self::DEFAULT_COUNT, 1, self::MAX_COUNT);

2
src/Module/Api/Twitter/Followers/Lists.php
View file

@ -37,7 +37,7 @@ class Lists extends ContactEndpoint
$uid = BaseApi::getCurrentUserID();
// Expected value for user_id parameter: public/user contact id
$cid = BaseApi::getContactIDForSearchterm($request['screen_name'] ?? '', $request['profileurl'] ?? '', $request['user_id'] ?? 0, $uid);
$cid = BaseApi::getContactIDForSearchterm($this->getRequestValue($request, 'screen_name', ''), $this->getRequestValue($request, 'profileurl', ''), $this->getRequestValue($request, 'user_id', 0), $uid);
$cursor = $this->getRequestValue($request, 'cursor', -1);
$skip_status = $this->getRequestValue($request, 'skip_status', false);
$include_user_entities = $this->getRequestValue($request, 'include_user_entities', false);

2
src/Module/Api/Twitter/Friends/Ids.php
View file

@ -37,7 +37,7 @@ class Ids extends ContactEndpoint
$uid = BaseApi::getCurrentUserID();
// Expected value for user_id parameter: public/user contact id
$cid = BaseApi::getContactIDForSearchterm($request['screen_name'] ?? '', $request['profileurl'] ?? '', $request['user_id'] ?? 0, $uid);
$cid = BaseApi::getContactIDForSearchterm($this->getRequestValue($request, 'screen_name', ''), $this->getRequestValue($request, 'profileurl', ''), $this->getRequestValue($request, 'user_id', 0), $uid);
$cursor = $this->getRequestValue($request, 'cursor', -1);
$stringify_ids = $this->getRequestValue($request, 'stringify_ids', false);
$count = $this->getRequestValue($request, 'count', self::DEFAULT_COUNT, 1, self::MAX_COUNT);

2
src/Module/Api/Twitter/Friends/Lists.php
View file

@ -37,7 +37,7 @@ class Lists extends ContactEndpoint
$uid = BaseApi::getCurrentUserID();
// Expected value for user_id parameter: public/user contact id
$cid = BaseApi::getContactIDForSearchterm($request['screen_name'] ?? '', $request['profileurl'] ?? '', $request['user_id'] ?? 0, $uid);
$cid = BaseApi::getContactIDForSearchterm($this->getRequestValue($request, 'screen_name', ''), $this->getRequestValue($request, 'profileurl', ''), $this->getRequestValue($request, 'user_id', 0), $uid);
$cursor = $this->getRequestValue($request, 'cursor', -1);
$skip_status = $this->getRequestValue($request, 'skip_status', false);
$include_user_entities = $this->getRequestValue($request, 'include_user_entities', false);

2
src/Module/Api/Twitter/Friendships/Destroy.php
View file

@ -63,7 +63,7 @@ class Destroy extends ContactEndpoint
throw new HTTPException\NotFoundException('Error Processing Request');
}
$contact_id = BaseApi::getContactIDForSearchterm($request['screen_name'] ?? '', $request['profileurl'] ?? '', $request['user_id'] ?? 0, 0);
$contact_id = BaseApi::getContactIDForSearchterm($this->getRequestValue($request, 'screen_name', ''), $this->getRequestValue($request, 'profileurl', ''), $this->getRequestValue($request, 'user_id', 0), 0);
if (empty($contact_id)) {
Logger::notice(BaseApi::LOG_PREFIX . 'No user_id specified', ['module' => 'api', 'action' => 'friendships_destroy']);

5
src/Module/Api/Twitter/Friendships/Show.php
View file

@ -38,9 +38,8 @@ class Show extends ContactEndpoint
self::checkAllowedScope(self::SCOPE_READ);
$uid = BaseApi::getCurrentUserID();
$source_cid = BaseApi::getContactIDForSearchterm($request['source_screen_name'] ?? '', '', $request['source_id'] ?? 0, $uid);
$target_cid = BaseApi::getContactIDForSearchterm($request['target_screen_name'] ?? '', '', $request['target_id'] ?? 0, $uid);
$source_cid = BaseApi::getContactIDForSearchterm($this->getRequestValue($request, 'source_screen_name', ''), '', $this->getRequestValue($request, 'source_id', 0), $uid);
$target_cid = BaseApi::getContactIDForSearchterm($this->getRequestValue($request, 'target_screen_name', ''), '', $this->getRequestValue($request, 'target_id', 0), $uid);
$source = Contact::getById($source_cid);
if (empty($source)) {

2
src/Module/Api/Twitter/Statuses/UserTimeline.php
View file

@ -42,7 +42,7 @@ class UserTimeline extends BaseApi
Logger::info('api_statuses_user_timeline', ['api_user' => $uid, '_REQUEST' => $request]);
$cid = BaseApi::getContactIDForSearchterm($request['screen_name'] ?? '', $request['profileurl'] ?? '', $request['user_id'] ?? 0, $uid);
$cid = BaseApi::getContactIDForSearchterm($this->getRequestValue($request, 'screen_name', ''), $this->getRequestValue($request, 'profileurl', ''), $this->getRequestValue($request, 'user_id', 0), $uid);
$count = $this->getRequestValue($request, 'count', 20, 1, 100);
$page = $this->getRequestValue($request, 'page', 1, 1);
$since_id = $this->getRequestValue($request, 'since_id', 0, 0);

2
src/Module/Api/Twitter/Users/Show.php
View file

@ -38,7 +38,7 @@ class Show extends BaseApi
$uid = BaseApi::getCurrentUserID();
if (empty($this->parameters['id'])) {
$cid = BaseApi::getContactIDForSearchterm($request['screen_name'] ?? '', $request['profileurl'] ?? '', $request['user_id'] ?? 0, $uid);
$cid = BaseApi::getContactIDForSearchterm($this->getRequestValue($request, 'screen_name', ''), $this->getRequestValue($request, 'profileurl', ''), $this->getRequestValue($request, 'user_id', 0), $uid);
} else {
$cid = (int)$this->parameters['id'];
}

2
src/Module/Feed.php
View file

@ -45,7 +45,7 @@ class Feed extends BaseModule
{
protected function rawContent(array $request = [])
{
$last_update = $request['last_update'] ?? '';
$last_update = $this->getRequestValue($request, 'last_update', '');
$nocache = !empty($request['nocache']) && local_user();
$type = null;