Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-24 02:30:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

"selectForUser" and "" selectFirstForUser" is now moved to Post

Browse source
This commit is contained in:
Michael 2021-01-16 22:37:27 +00:00
parent c1226bff07
commit 2b1d0b9db8
29 changed files with 179 additions and 121 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/Module/Api/Mastodon/Accounts/Statuses.php
View file

@ -26,6 +26,7 @@ use Friendica\Core\System;
use Friendica\Database\DBA;
use Friendica\DI;
use Friendica\Model\Item;
use Friendica\Model\Post;
use Friendica\Model\Verb;
use Friendica\Module\BaseApi;
use Friendica\Protocol\Activity;
@ -82,10 +83,10 @@ class Statuses extends BaseApi
$params['order'] = ['uri-id'];
}
$items = Item::selectForUser(0, ['uri-id', 'uid'], $condition, $params);
$items = Post::selectForUser(0, ['uri-id', 'uid'], $condition, $params);
$statuses = [];
while ($item = Item::fetch($items)) {
while ($item = Post::fetch($items)) {
$statuses[] = DI::mstdnStatus()->createFromUriId($item['uri-id'], $item['uid']);
}
DBA::close($items);

3
src/Module/Api/Mastodon/Timelines/PublicTimeline.php
View file

@ -26,6 +26,7 @@ use Friendica\Core\System;
use Friendica\Database\DBA;
use Friendica\DI;
use Friendica\Model\Item;
use Friendica\Model\Post;
use Friendica\Module\BaseApi;
use Friendica\Network\HTTPException;
@ -81,7 +82,7 @@ class PublicTimeline extends BaseApi
$params['order'] = ['uri-id'];
}
$items = Item::selectForUser(0, ['uri-id', 'uid'], $condition, $params);
$items = Post::selectForUser(0, ['uri-id', 'uid'], $condition, $params);
$statuses = [];
while ($item = Item::fetch($items)) {

8
src/Module/Profile/Status.php
View file

@ -183,7 +183,7 @@ class Status extends BaseProfile
(`gravity` = ? AND `vid` = ? AND `origin` AND `thr-parent-id` IN
(SELECT `uri-id` FROM `item` AS `i`
WHERE `gravity` = ? AND `network` IN (?, ?, ?, ?) AND `uid` IN (?, ?)
AND `i`.`uri-id` = `item`.`thr-parent-id`)))",
AND `i`.`uri-id` = `thr-parent-id`)))",
GRAVITY_PARENT, GRAVITY_ACTIVITY, Verb::getID(Activity::ANNOUNCE), GRAVITY_PARENT,
Protocol::DFRN, Protocol::ACTIVITYPUB, Protocol::DIASPORA, Protocol::OSTATUS,
0, $a->profile['uid']]);
@ -194,7 +194,7 @@ class Status extends BaseProfile
$pager = new Pager(DI::l10n(), $args->getQueryString(), $itemspage_network);
$params = ['limit' => [$pager->getStart(), $pager->getItemsPerPage()], 'order' => ['received' => true]];
$items_stmt = DBA::select('item', ['uri', 'thr-parent-id', 'gravity', 'author-id', 'received'], $condition, $params);
$items_stmt = Post::select(['uri', 'thr-parent-id', 'gravity', 'author-id', 'received'], $condition, $params);
// Set a time stamp for this page. We will make use of it when we
// search for new items (update routine)
@ -213,7 +213,7 @@ class Status extends BaseProfile
}
}
$items = DBA::toArray($items_stmt);
$items = Post::toArray($items_stmt);
if ($pager->getStart() == 0 && !empty($a->profile['uid'])) {
$condition = ['private' => [Item::PUBLIC, Item::UNLISTED]];
@ -229,7 +229,7 @@ class Status extends BaseProfile
}
$pinned_items = Item::selectPinned($a->profile['uid'], ['uri', 'pinned'], $condition);
$pinned = Item::inArray($pinned_items);
$pinned = Item::toArray($pinned_items);
$items = array_merge($items, $pinned);
}

4
src/Module/Search/Acl.php
View file

@ -332,9 +332,9 @@ class Acl extends BaseModule
$condition = ["`parent` = ?", $conv_id];
$params = ['order' => ['author-name' => true]];
$authors = Item::selectForUser(local_user(), ['author-link'], $condition, $params);
$authors = Post::selectForUser(local_user(), ['author-link'], $condition, $params);
$item_authors = [];
while ($author = Item::fetch($authors)) {
while ($author = Post::fetch($authors)) {
$item_authors[$author['author-link']] = $author['author-link'];
}
DBA::close($authors);

5
src/Module/Search/Filed.php
View file

@ -9,7 +9,7 @@ use Friendica\Content\Widget;
use Friendica\Core\Renderer;
use Friendica\Database\DBA;
use Friendica\DI;
use Friendica\Model\Item;
use Friendica\Model\Post;
use Friendica\Model\Post\Category;
use Friendica\Module\BaseSearch;
use Friendica\Module\Security\Login;
@ -69,8 +69,7 @@ class Filed extends BaseSearch
$item_condition = ['uid' => local_user(), 'uri-id' => $posts];
$item_params = ['order' => ['uri-id' => true]];
$result = Item::selectForUser(local_user(), [], $item_condition, $item_params);
$items = Item::inArray($result);
$items = Post::toArray(Post::selectForUser(local_user(), [], $item_condition, $item_params));
$o .= conversation(DI::app(), $items, 'filed', false, false, '', local_user());

2
src/Module/Search/Index.php
View file

@ -172,7 +172,7 @@ class Index extends BaseSearch
if (!empty($uriids)) {
$params = ['order' => ['id' => true], 'group_by' => ['uri-id']];
$items = Item::inArray(Item::selectForUser(local_user(), [], ['uri-id' => $uriids], $params));
$items = Post::toArray(Post::selectForUser(local_user(), [], ['uri-id' => $uriids], $params));
}
if (empty($items)) {

3
src/Module/Starred.php
View file

@ -24,6 +24,7 @@ namespace Friendica\Module;
use Friendica\BaseModule;
use Friendica\DI;
use Friendica\Model\Item;
use Friendica\Model\Post;
/**
* Toggle starred items
@ -42,7 +43,7 @@ class Starred extends BaseModule
$itemId = intval($parameters['item']);
$item = Item::selectFirstForUser(local_user(), ['starred'], ['uid' => local_user(), 'id' => $itemId]);
$item = Post::selectFirstForUser(local_user(), ['starred'], ['uid' => local_user(), 'id' => $itemId]);
if (empty($item)) {
throw new \Friendica\Network\HTTPException\NotFoundException();
}