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

Remove unused uid parameter in Item::newURI

Browse source
This commit is contained in:
Hypolite Petovan 2022-07-09 07:32:32 -04:00
parent b31c2f4ec1
commit eb8237dd89
10 changed files with 17 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Model/Event.php
View file

@ -248,7 +248,7 @@ class Event
$event['uid'] = intval($arr['uid'] ?? 0);
$event['cid'] = intval($arr['cid'] ?? 0);
$event['guid'] = ($arr['guid'] ?? '') ?: System::createUUID();
$event['uri'] = ($arr['uri'] ?? '') ?: Item::newURI($event['uid'], $event['guid']);
$event['uri'] = ($arr['uri'] ?? '') ?: Item::newURI($event['guid']);
$event['uri-id'] = ItemURI::insert(['uri' => $event['uri'], 'guid' => $event['guid']]);
$event['type'] = ($arr['type'] ?? '') ?: 'event';
$event['summary'] = $arr['summary'] ?? '';

11
src/Model/Item.php
View file

@ -780,7 +780,7 @@ class Item
$uid = intval($item['uid']);
$item['guid'] = self::guid($item, $notify);
$item['uri'] = substr(trim($item['uri'] ?? '') ?: self::newURI($item['uid'], $item['guid']), 0, 255);
$item['uri'] = substr(trim($item['uri'] ?? '') ?: self::newURI($item['guid']), 0, 255);
// Store URI data
$item['uri-id'] = ItemURI::insert(['uri' => $item['uri'], 'guid' => $item['guid']]);
@ -1853,13 +1853,12 @@ class Item
/**
* generate an unique URI
*
* @param integer $uid User id
* @param string $guid An existing GUID (Otherwise it will be generated)
* @param string $guid An existing GUID (Otherwise it will be generated)
*
* @return string
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
public static function newURI(int $uid, string $guid = ''): string
public static function newURI(string $guid = ''): string
{
if ($guid == '') {
$guid = System::createUUID();
@ -2150,7 +2149,7 @@ class Item
$old_uri_id = $datarray["uri-id"] ?? 0;
$datarray["guid"] = System::createUUID();
unset($datarray["plink"]);
$datarray["uri"] = self::newURI($contact['uid'], $datarray["guid"]);
$datarray["uri"] = self::newURI($datarray["guid"]);
$datarray["uri-id"] = ItemURI::getIdByURI($datarray["uri"]);
$datarray["extid"] = Protocol::DFRN;
$urlpart = parse_url($datarray2['author-link']);
@ -2591,7 +2590,7 @@ class Item
$new_item = [
'guid' => System::createUUID(),
'uri' => self::newURI($item['uid']),
'uri' => self::newURI(),
'uid' => $item['uid'],
'contact-id' => $owner['id'],
'wall' => $item['wall'],

4
src/Model/Mail.php
View file

@ -154,7 +154,7 @@ class Mail
Photo::setPermissionFromBody($body, local_user(), $me['id'], '<' . $contact['id'] . '>', '', '', '');
$guid = System::createUUID();
$uri = Item::newURI(local_user(), $guid);
$uri = Item::newURI($guid);
$convid = 0;
$reply = false;
@ -266,7 +266,7 @@ class Mail
}
$guid = System::createUUID();
$uri = Item::newURI(local_user(), $guid);
$uri = Item::newURI($guid);
$me = Contact::getByURL($replyto);
if (!$me['name']) {