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

Handling of unlisted posts, better uid detection

Browse source
This commit is contained in:
Michael 2018-09-16 09:06:09 +00:00
parent 1f98414bdd
commit 6f3b2b6586
4 changed files with 73 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

37
src/Model/Item.php
View file

@ -2071,6 +2071,7 @@ class Item extends BaseObject
$users = [];
/// @todo add a field "pcid" in the contact table that referrs to the public contact id.
$owner = DBA::selectFirst('contact', ['url', 'nurl', 'alias'], ['id' => $parent['owner-id']]);
if (!DBA::isResult($owner)) {
return;
@ -2110,43 +2111,7 @@ class Item extends BaseObject
}
DBA::close($contacts);
}
/*
$condition = ["`nurl` IN (SELECT `nurl` FROM `contact` WHERE `id` = ?) AND `uid` != 0 AND NOT `blocked` AND `rel` IN (?, ?)",
$parent['owner-id'], Contact::SHARING, Contact::FRIEND];
$contacts = DBA::select('contact', ['uid'], $condition);
while ($contact = DBA::fetch($contacts)) {
$users[$contact['uid']] = $contact['uid'];
}
DBA::close($contacts);
// And the same with the alias in the user contacts
$condition = ["`alias` IN (SELECT `url` FROM `contact` WHERE `id` = ?) AND `uid` != 0 AND NOT `blocked` AND `rel` IN (?, ?)",
$parent['owner-id'], Contact::SHARING, Contact::FRIEND];
$contacts = DBA::select('contact', ['uid'], $condition);
while ($contact = DBA::fetch($contacts)) {
$users[$contact['uid']] = $contact['uid'];
}
DBA::close($contacts);
// And vice versa
$condition = ["`url` IN (SELECT `alias` FROM `contact` WHERE `id` = ?) AND `uid` != 0 AND NOT `blocked` AND `rel` IN (?, ?)",
$parent['owner-id'], Contact::SHARING, Contact::FRIEND];
$contacts = DBA::select('contact', ['uid'], $condition);
while ($contact = DBA::fetch($contacts)) {
$users[$contact['uid']] = $contact['uid'];
}
DBA::close($contacts);
*/
$origin_uid = 0;
if ($item['uri'] != $item['parent-uri']) {