From d37f64d2964228c310cbe0c884e74c1027a01581 Mon Sep 17 00:00:00 2001 From: Michael Date: Fri, 15 Jun 2018 22:31:16 +0000 Subject: [PATCH] advancedcontentfilter: Abstraction for the item call --- advancedcontentfilter/advancedcontentfilter.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/advancedcontentfilter/advancedcontentfilter.php b/advancedcontentfilter/advancedcontentfilter.php index 47ace1c2..dd04e769 100644 --- a/advancedcontentfilter/advancedcontentfilter.php +++ b/advancedcontentfilter/advancedcontentfilter.php @@ -42,6 +42,7 @@ use Friendica\Network\HTTPException; use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ServerRequestInterface; use Symfony\Component\ExpressionLanguage; +use Friendica\Model\Item; require_once 'boot.php'; require_once 'include/conversation.php'; @@ -402,7 +403,9 @@ function advancedcontentfilter_get_variables_guid(ServerRequestInterface $reques throw new HTTPException\BadRequestException(L10n::t('Missing argument: guid.')); } - $item = dba::fetch_first(item_query() . " AND `item`.`guid` = ? AND (`item`.`uid` = ? OR `item`.`uid` = 0) ORDER BY `item`.`uid` DESC", $args['guid'], local_user()); + $condition = ["`guid` = ? AND (`uid` = ? OR `uid` = 0)", $args['guid'], local_user()]; + $params = ['order' => ['uid' => true]]; + $item = Item::selectFirst(local_user(), [], $condition, $params); if (!\Friendica\Database\DBM::is_result($item)) { throw new HTTPException\NotFoundException(L10n::t('Unknown post with guid: %s', $args['guid'])); @@ -420,4 +423,4 @@ function advancedcontentfilter_get_variables_guid(ServerRequestInterface $reques } return json_encode(['variables' => str_replace('\\\'', '\'', var_export($return, true))]); -} \ No newline at end of file +}