Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-21 11:50:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #9870 from annando/uri-id

Browse source 
"uri-id" instead of "uri" or "id"
This commit is contained in:
Hypolite Petovan 2021-01-27 11:45:19 -05:00 • committed by GitHub
commit a7791bebc2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 130 additions and 147 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Module/Conversation/Community.php
View file

@ -356,7 +356,7 @@ class Community extends BaseModule
}
}
$r = Post::selectThreadForUser(0, ['uri', 'commented', 'author-link'], $condition, $params);
$r = Post::selectThreadForUser(0, ['uri-id', 'commented', 'author-link'], $condition, $params);
$items = Post::toArray($r);

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

@ -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 = Post::select(['uri', 'thr-parent-id', 'gravity', 'author-id', 'received'], $condition, $params);
$items_stmt = Post::select(['uri-id', '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)
@ -228,7 +228,7 @@ class Status extends BaseProfile
$condition = [];
}
$pinned_items = Post::selectPinned($a->profile['uid'], ['uri', 'pinned'], $condition);
$pinned_items = Post::selectPinned($a->profile['uid'], ['uri-id', 'pinned'], $condition);
$pinned = Post::toArray($pinned_items);
$items = array_merge($items, $pinned);
}

1
src/Module/Update/Network.php
View file

@ -4,7 +4,6 @@ namespace Friendica\Module\Update;
use Friendica\Core\System;
use Friendica\DI;
use Friendica\Model\Item;
use Friendica\Model\Post;
use Friendica\Module\Conversation\Network as NetworkModule;

2
src/Module/Update/Profile.php
View file

@ -78,7 +78,7 @@ class Profile extends BaseModule
}
$items_stmt = DBA::p(
"SELECT DISTINCT(`parent-uri`) AS `uri`, `created` FROM `post-view`
"SELECT DISTINCT(`parent-uri-id`) AS `uri-id`, `created` FROM `post-view`
WHERE `uid` = ? AND NOT `contact-blocked` AND NOT `contact-pending`
AND `visible` AND (NOT `deleted` OR `gravity` = ?)
AND NOT `moderated` AND `wall` $sql_extra4 $sql_extra