mirror
/
friendica
kopia lustrzana https://github.com/friendica/friendica
1
0
Forkuj 1
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Merge pull request #8937 from annando/personal-copy 

New function "Item::storeForUserByUriId"
pull/8942/head
Hypolite Petovan 2020-07-28 10:08:02 -04:00 zatwierdzone przez GitHub
rodzic 74bc3de472 d72d59bf9e
commit 4fc04de2c2
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4AEE18F83AFDEB23
2 zmienionych plików z 33 dodań i 14 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
mod/item.php
Wyświetl plik

@ -139,7 +139,7 @@ function item_post(App $a) {
// When commenting on a public post then store the post for the current user
// This enables interaction like starring and saving into folders
if ($toplevel_item['uid'] == 0) {
$stored = Item::storeForUser($toplevel_item, local_user());
$stored = Item::storeForUserByUriId($toplevel_item['uri-id'], local_user());
Logger::info('Public item stored for user', ['uri-id' => $toplevel_item['uri-id'], 'uid' => $uid, 'stored' => $stored]);
if ($stored) {
$toplevel_item = Item::selectFirst([], ['id' => $stored]);

45
src/Model/Item.php
Wyświetl plik

@ -1967,7 +1967,7 @@ class Item
check_user_notification($current_post);
// Distribute items to users who subscribed to their tags
self::distributeByTags($item, $orig_item);
self::distributeByTags($item);
$transmit = $notify || ($item['visible'] && ($parent_origin || $item['origin']));
@ -1992,9 +1992,8 @@ class Item
* Distribute the given item to users who subscribed to their tags
*
* @param array $item Processed item
* @param array $original Original item
*/
private static function distributeByTags(array $item, array $original)
private static function distributeByTags(array $item)
{
if (($item['uid'] != 0) || ($item['gravity'] != GRAVITY_PARENT) || !in_array($item['network'], Protocol::FEDERATED)) {
return;
@ -2002,9 +2001,7 @@ class Item
$uids = Tag::getUIDListByURIId($item['uri-id']);
foreach ($uids as $uid) {
$original['uri-id'] = $item['uri-id'];
$original['gravity'] = $item['gravity'];
$stored = self::storeForUser($original, $uid);
$stored = self::storeForUserByUriId($item['uri-id'], $uid);
Logger::info('Stored item for users', ['uri-id' => $item['uri-id'], 'uid' => $uid, 'stored' => $stored]);
}
}
@ -2169,14 +2166,38 @@ class Item
}
/**
* Store public items for the receivers
* Store a public item defined by their URI-ID for the given users
*
* @param integer $uri_id URI-ID of the given item
* @param integer $uid The user that will receive the item entry
* @return integer stored item id
*/
public static function storeForUserByUriId(int $uri_id, int $uid)
{
$item = self::selectFirst(self::ITEM_FIELDLIST, ['uri-id' => $uri_id, 'uid' => 0]);
if (!DBA::isResult($item)) {
return 0;
}
if (($item['private'] == self::PRIVATE) || !in_array($item['network'], Protocol::FEDERATED)) {
Logger::notice('Item is private or not from a federated network. It will not be stored for the user.', ['uri-id' => $uri_id, 'uid' => $uid, 'private' => $item['private'], 'network' => $item['network']]);
return 0;
}
$stored = self::storeForUser($item, $uid);
Logger::info('Public item stored for user', ['uri-id' => $item['uri-id'], 'uid' => $uid, 'stored' => $stored]);
return $stored;
}
/**
* Store a public item array for the given users
*
* @param array $item The item entry that will be stored
* @param integer $uid The user that will receive the item entry
* @return integer stored item id
* @throws \Exception
*/
public static function storeForUser(array $item, int $uid)
private static function storeForUser(array $item, int $uid)
{
if (self::exists(['uri-id' => $item['uri-id'], 'uid' => $uid])) {
Logger::info('Item already exists', ['uri-id' => $item['uri-id'], 'uid' => $uid]);
@ -2187,6 +2208,8 @@ class Item
unset($item['parent']);
unset($item['mention']);
unset($item['starred']);
unset($item['unseen']);
unset($item['psid']);
$item['uid'] = $uid;
$item['origin'] = 0;
@ -3018,11 +3041,7 @@ class Item
}
if (!Item::exists(['uri-id' => $item['parent-uri-id'], 'uid' => $uid])) {
$parent_item = self::selectFirst(self::ITEM_FIELDLIST, ['uri-id' => $item['parent-uri-id'], 'uid' => 0]);
if (!empty($parent_item) && ($parent_item['private'] != self::PRIVATE)) {
$stored = self::storeForUser($parent_item, $uid);
Logger::info('Public item stored for user', ['uri-id' => $parent_item['uri-id'], 'uid' => $uid, 'stored' => $stored]);
}
$stored = self::storeForUserByUriId($item['parent-uri-id'], $uid);
}
// Retrieves the local post owner