friendica
/
friendica
mirror of https://git.friendi.ca/friendica/friendica.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #13307 from MrPetovan/bug/13240-event-private 

Fix item.private value in Model\Event::getItemArrayForId
pull/13308/head
Michael Vogel 2023-07-26 07:38:21 +02:00 committed by GitHub
parent e73a94e7d6 e468870e87
commit f1da323b07
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Model/Event.php
View File

@ -344,7 +344,6 @@ class Event
$event['id'] = $event_id; $event['id'] = $event_id;
$item['uid'] = $event['uid']; $item['uid'] = $event['uid'];
$item['contact-id'] = $event['cid'];
$item['uri'] = $event['uri']; $item['uri'] = $event['uri'];
$item['uri-id'] = ItemURI::getIdByURI($event['uri']); $item['uri-id'] = ItemURI::getIdByURI($event['uri']);
$item['guid'] = $event['guid']; $item['guid'] = $event['guid'];
@ -363,11 +362,10 @@ class Event
$item['allow_gid'] = $event['allow_gid']; $item['allow_gid'] = $event['allow_gid'];
$item['deny_cid'] = $event['deny_cid']; $item['deny_cid'] = $event['deny_cid'];
$item['deny_gid'] = $event['deny_gid']; $item['deny_gid'] = $event['deny_gid'];
$item['private'] = intval($event['private'] ?? 0); $item['private'] = $event['allow_cid'] && $event['allow_gid'] && $event['deny_cid'] && $event['deny_gid'] ? 0 : 1;
$item['visible'] = 1; $item['visible'] = 1;
$item['verb'] = Activity::POST; $item['verb'] = Activity::POST;
$item['object-type'] = Activity\ObjectType::EVENT; $item['object-type'] = Activity\ObjectType::EVENT;
$item['post-type'] = Item::PT_EVENT;
$item['origin'] = $event['cid'] === 0 ? 1 : 0; $item['origin'] = $event['cid'] === 0 ? 1 : 0;
$item['body'] = self::getBBCode($event); $item['body'] = self::getBBCode($event);
$item['event-id'] = $event['id']; $item['event-id'] = $event['id'];
@ -547,8 +545,8 @@ class Event
// Query for the event by event id // Query for the event by event id
$events = DBA::toArray(DBA::p( $events = DBA::toArray(DBA::p(
"SELECT `event`.*, `post-user`.`id` AS `itemid` FROM `event` "SELECT `event`.*, `post-user`.`id` AS `itemid` FROM `event`
LEFT JOIN `post-user` LEFT JOIN `post-user`
ON `post-user`.`event-id` = `event`.`id` ON `post-user`.`event-id` = `event`.`id`
AND `post-user`.`uid` = `event`.`uid` AND `post-user`.`uid` = `event`.`uid`
WHERE `event`.`id` = ? WHERE `event`.`id` = ?
AND `event`.`uid` = ? AND `event`.`uid` = ?
@ -932,9 +930,9 @@ class Event
// Construct the profile link (magic-auth). // Construct the profile link (magic-auth).
$author = [ $author = [
'uid' => 0, 'uid' => 0,
'id' => $item['author-id'], 'id' => $item['author-id'],
'network' => $item['author-network'], 'network' => $item['author-network'],
'url' => $item['author-link'], 'url' => $item['author-link'],
'alias' => $item['author-alias'] 'alias' => $item['author-alias']
]; ];

2
src/Model/Mail.php
View File

@ -233,7 +233,7 @@ class Mail
foreach ($images as $image) { foreach ($images as $image) {
$image_rid = Photo::ridFromURI($image); $image_rid = Photo::ridFromURI($image);
if (!empty($image_rid)) { if (!empty($image_rid)) {
Photo::update(['allow-cid' => '<' . $recipient . '>'], ['resource-id' => $image_rid, 'album' => 'Wall Photos', 'uid' => $sender_uid]); Photo::update(['allow_cid' => '<' . $recipient . '>'], ['resource-id' => $image_rid, 'album' => 'Wall Photos', 'uid' => $sender_uid]);
} }
} }
} }