tobias/friendica
1
0
Fork 0
Code Pull requests Activity

Merge remote-tracking branch 'upstream/develop' into loop-prevention

Browse source
This commit is contained in:
Michael 2021-07-19 12:07:34 +00:00
parent 64026ed979 0dd94e8fd5
commit d2408c1f1b
5 changed files with 95 additions and 98 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
mod/events.php
View file

@ -206,9 +206,6 @@ function events_post(App $a)
$datarray['deny_gid'] = $str_group_deny; $datarray['deny_gid'] = $str_group_deny;
$datarray['private'] = $private_event; $datarray['private'] = $private_event;
$datarray['id'] = $event_id; $datarray['id'] = $event_id;
$datarray['network'] = Protocol::DFRN;
$datarray['protocol'] = Conversation::PARCEL_DIRECT;
$datarray['direction'] = Conversation::PUSH;
if (intval($_REQUEST['preview'])) { if (intval($_REQUEST['preview'])) {
$html = Event::getHTML($datarray); $html = Event::getHTML($datarray);
@ -216,9 +213,17 @@ function events_post(App $a)
exit(); exit();
} }
$uri_id = Event::store($datarray); $event_id = Event::store($datarray);
if (!$cid) { $item = ['network' => Protocol::DFRN, 'protocol' => Conversation::PARCEL_DIRECT, 'direction' => Conversation::PUSH];
$item = Event::getItemArrayForId($event_id, $item);
if (Item::insert($item)) {
$uri_id = $item['uri-id'];
} else {
$uri_id = 0;
}
if (!$cid && $uri_id) {
Worker::add(PRIORITY_HIGH, "Notifier", Delivery::POST, (int)$uri_id, (int)$uid); Worker::add(PRIORITY_HIGH, "Notifier", Delivery::POST, (int)$uri_id, (int)$uid);
} }

155
src/Model/Event.php
View file

@ -259,16 +259,6 @@ class Event
*/ */
public static function store($arr) public static function store($arr)
{ {
$network = $arr['network'] ?? Protocol::DFRN;
$protocol = $arr['protocol'] ?? Conversation::PARCEL_UNKNOWN;
$direction = $arr['direction'] ?? Conversation::UNKNOWN;
$source = $arr['source'] ?? '';
unset($arr['network']);
unset($arr['protocol']);
unset($arr['direction']);
unset($arr['source']);
$event = []; $event = [];
$event['id'] = intval($arr['id'] ?? 0); $event['id'] = intval($arr['id'] ?? 0);
$event['uid'] = intval($arr['uid'] ?? 0); $event['uid'] = intval($arr['uid'] ?? 0);
@ -294,28 +284,17 @@ class Event
if ($event['finish'] < DBA::NULL_DATETIME) { if ($event['finish'] < DBA::NULL_DATETIME) {
$event['finish'] = DBA::NULL_DATETIME; $event['finish'] = DBA::NULL_DATETIME;
} }
$private = intval($arr['private'] ?? 0);
if ($event['cid']) {
$conditions = ['id' => $event['cid']];
} else {
$conditions = ['uid' => $event['uid'], 'self' => true];
}
$contact = DBA::selectFirst('contact', [], $conditions);
if (!DBA::isResult($contact)) {
Logger::warning('Contact not found', ['condition' => $conditions, 'callstack' => System::callstack(20)]);
}
// Existing event being modified. // Existing event being modified.
if ($event['id']) { if ($event['id']) {
// has the event actually changed? // has the event actually changed?
$existing_event = DBA::selectFirst('event', ['edited'], ['id' => $event['id'], 'uid' => $event['uid']]); $existing_event = DBA::selectFirst('event', ['edited'], ['id' => $event['id'], 'uid' => $event['uid']]);
if (!DBA::isResult($existing_event) || ($existing_event['edited'] === $event['edited'])) { if (!DBA::isResult($existing_event)) {
return 0;
$item = Post::selectFirst(['id'], ['event-id' => $event['id'], 'uid' => $event['uid']]); }
return DBA::isResult($item) ? $item['id'] : 0; if ($existing_event['edited'] === $event['edited']) {
return $event['id'];
} }
$updated_fields = [ $updated_fields = [
@ -340,10 +319,6 @@ class Event
$fields = ['body' => self::getBBCode($event), 'object' => $object, 'edited' => $event['edited']]; $fields = ['body' => self::getBBCode($event), 'object' => $object, 'edited' => $event['edited']];
Item::update($fields, ['id' => $item['id']]); Item::update($fields, ['id' => $item['id']]);
$uriid = $item['uri-id'];
} else {
$uriid = 0;
} }
Hook::callAll('event_updated', $event['id']); Hook::callAll('event_updated', $event['id']);
@ -351,60 +326,69 @@ class Event
// New event. Store it. // New event. Store it.
DBA::insert('event', $event); DBA::insert('event', $event);
$uriid = 0; $event['id'] = DBA::lastInsertId();
// Don't create an item for birthday events
if ($event['type'] == 'event') {
$event['id'] = DBA::lastInsertId();
$item_arr = [];
$item_arr['uid'] = $event['uid'];
$item_arr['contact-id'] = $event['cid'];
$item_arr['uri'] = $event['uri'];
$item_arr['uri-id'] = ItemURI::getIdByURI($event['uri']);
$item_arr['guid'] = $event['guid'];
$item_arr['plink'] = $arr['plink'] ?? '';
$item_arr['post-type'] = Item::PT_EVENT;
$item_arr['wall'] = $event['cid'] ? 0 : 1;
$item_arr['contact-id'] = $contact['id'];
$item_arr['owner-name'] = $contact['name'];
$item_arr['owner-link'] = $contact['url'];
$item_arr['owner-avatar'] = $contact['thumb'];
$item_arr['author-name'] = $contact['name'];
$item_arr['author-link'] = $contact['url'];
$item_arr['author-avatar'] = $contact['thumb'];
$item_arr['title'] = '';
$item_arr['allow_cid'] = $event['allow_cid'];
$item_arr['allow_gid'] = $event['allow_gid'];
$item_arr['deny_cid'] = $event['deny_cid'];
$item_arr['deny_gid'] = $event['deny_gid'];
$item_arr['private'] = $private;
$item_arr['visible'] = 1;
$item_arr['verb'] = Activity::POST;
$item_arr['object-type'] = Activity\ObjectType::EVENT;
$item_arr['post-type'] = Item::PT_EVENT;
$item_arr['origin'] = $event['cid'] === 0 ? 1 : 0;
$item_arr['body'] = self::getBBCode($event);
$item_arr['event-id'] = $event['id'];
$item_arr['network'] = $network;
$item_arr['protocol'] = $protocol;
$item_arr['direction'] = $direction;
$item_arr['source'] = $source;
$item_arr['object'] = '<object><type>' . XML::escape(Activity\ObjectType::EVENT) . '</type><title></title><id>' . XML::escape($event['uri']) . '</id>';
$item_arr['object'] .= '<content>' . XML::escape(self::getBBCode($event)) . '</content>';
$item_arr['object'] .= '</object>' . "\n";
if (Item::insert($item_arr)) {
$uriid = $item_arr['uri-id'];
}
}
Hook::callAll("event_created", $event['id']); Hook::callAll("event_created", $event['id']);
} }
return $uriid; return $event['id'];
}
public static function getItemArrayForId(int $event_id, array $item = []):array
{
if (empty($event_id)) {
return [];
}
$event = DBA::selectFirst('event', [], ['id' => $event_id]);
if ($event['type'] != 'event') {
return [];
}
if ($event['cid']) {
$conditions = ['id' => $event['cid']];
} else {
$conditions = ['uid' => $event['uid'], 'self' => true];
}
$contact = DBA::selectFirst('contact', [], $conditions);
$event['id'] = $event_id;
$item['uid'] = $event['uid'];
$item['contact-id'] = $event['cid'];
$item['uri'] = $event['uri'];
$item['uri-id'] = ItemURI::getIdByURI($event['uri']);
$item['guid'] = $event['guid'];
$item['plink'] = $arr['plink'] ?? '';
$item['post-type'] = Item::PT_EVENT;
$item['wall'] = $event['cid'] ? 0 : 1;
$item['contact-id'] = $contact['id'];
$item['owner-name'] = $contact['name'];
$item['owner-link'] = $contact['url'];
$item['owner-avatar'] = $contact['thumb'];
$item['author-name'] = $contact['name'];
$item['author-link'] = $contact['url'];
$item['author-avatar'] = $contact['thumb'];
$item['title'] = '';
$item['allow_cid'] = $event['allow_cid'];
$item['allow_gid'] = $event['allow_gid'];
$item['deny_cid'] = $event['deny_cid'];
$item['deny_gid'] = $event['deny_gid'];
$item['private'] = intval($event['private'] ?? 0);;
$item['visible'] = 1;
$item['verb'] = Activity::POST;
$item['object-type'] = Activity\ObjectType::EVENT;
$item['post-type'] = Item::PT_EVENT;
$item['origin'] = $event['cid'] === 0 ? 1 : 0;
$item['body'] = self::getBBCode($event);
$item['event-id'] = $event['id'];
$item['object'] = '<object><type>' . XML::escape(Activity\ObjectType::EVENT) . '</type><title></title><id>' . XML::escape($event['uri']) . '</id>';
$item['object'] .= '<content>' . XML::escape(self::getBBCode($event)) . '</content>';
$item['object'] .= '</object>' . "\n";
return $item;
} }
/** /**
@ -519,8 +503,8 @@ class Event
} }
// Query for the event by event id // Query for the event by event id
$events = DBA::toArray(DBA::p("SELECT `event`.*, `post-user-view`.`id` AS `itemid` FROM `event` $events = DBA::toArray(DBA::p("SELECT `event`.*, `post-user`.`id` AS `itemid` FROM `event`
LEFT JOIN `post-user-view` ON `post-user-view`.`event-id` = `event`.`id` AND `post-user-view`.`uid` = `event`.`uid` LEFT JOIN `post-user` ON `post-user`.`event-id` = `event`.`id` AND `post-user`.`uid` = `event`.`uid`
WHERE `event`.`uid` = ? AND `event`.`id` = ? $sql_extra", WHERE `event`.`uid` = ? AND `event`.`id` = ? $sql_extra",
$owner_uid, $event_id)); $owner_uid, $event_id));
@ -557,9 +541,8 @@ class Event
} }
// Query for the event by date. // Query for the event by date.
// @todo Slow query (518 seconds to run), to be optimzed $events = DBA::toArray(DBA::p("SELECT `event`.*, `post-user`.`id` AS `itemid` FROM `event`
$events = DBA::toArray(DBA::p("SELECT `event`.*, `post-user-view`.`id` AS `itemid` FROM `event` LEFT JOIN `post-user` ON `post-user`.`event-id` = `event`.`id` AND `post-user`.`uid` = `event`.`uid`
LEFT JOIN `post-user-view` ON `post-user-view`.`event-id` = `event`.`id` AND `post-user-view`.`uid` = `event`.`uid`
WHERE `event`.`uid` = ? AND `event`.`ignore` = ? WHERE `event`.`uid` = ? AND `event`.`ignore` = ?
AND ((NOT `adjust` AND (`finish` >= ? OR (`nofinish` AND `start` >= ?)) AND `start` <= ?) AND ((NOT `adjust` AND (`finish` >= ? OR (`nofinish` AND `start` >= ?)) AND `start` <= ?)
OR (`adjust` AND (`finish` >= ? OR (`nofinish` AND `start` >= ?)) AND `start` <= ?))" . $sql_extra, OR (`adjust` AND (`finish` >= ? OR (`nofinish` AND `start` >= ?)) AND `start` <= ?))" . $sql_extra,

6
src/Model/Item.php
View file

@ -1042,8 +1042,10 @@ class Item
$ev['id'] = $event['id']; $ev['id'] = $event['id'];
} }
$item['event-id'] = Event::store($ev); $event_id = Event::store($ev);
Logger::info('Event was stored', ['id' => $item['event-id']]); $item = Event::getItemArrayForId($event_id, $item);
Logger::info('Event was stored', ['id' => $event_id]);
} }
} }

12
src/Protocol/ActivityPub/Processor.php
View file

@ -396,6 +396,8 @@ class Processor
* *
* @param array $activity Activity array * @param array $activity Activity array
* @param array $item * @param array $item
*
* @return int event id
* @throws \Exception * @throws \Exception
*/ */
public static function createEvent($activity, $item) public static function createEvent($activity, $item)
@ -419,14 +421,16 @@ class Processor
$event['direction'] = $item['direction']; $event['direction'] = $item['direction'];
$event['source'] = $item['source']; $event['source'] = $item['source'];
$condition = ['uri' => $item['uri'], 'uid' => $item['uid']]; $ev = DBA::selectFirst('event', ['id'], ['uri' => $item['uri'], 'uid' => $item['uid']]);
$ev = DBA::selectFirst('event', ['id'], $condition);
if (DBA::isResult($ev)) { if (DBA::isResult($ev)) {
$event['id'] = $ev['id']; $event['id'] = $ev['id'];
} }
$event_id = Event::store($event); $event_id = Event::store($event);
Logger::info('Event was stored', ['id' => $event_id]); Logger::info('Event was stored', ['id' => $event_id]);
return $event_id;
} }
/** /**
@ -625,7 +629,9 @@ class Processor
} }
if (($item['gravity'] != GRAVITY_ACTIVITY) && ($activity['object_type'] == 'as:Event')) { if (($item['gravity'] != GRAVITY_ACTIVITY) && ($activity['object_type'] == 'as:Event')) {
self::createEvent($activity, $item); $event_id = self::createEvent($activity, $item);
$item = Event::getItemArrayForId($event_id, $item);
} }
$item_id = Item::insert($item); $item_id = Item::insert($item);

5
src/Protocol/DFRN.php
View file

@ -1976,8 +1976,9 @@ class DFRN
} }
$event_id = Event::store($ev); $event_id = Event::store($ev);
Logger::log("Event ".$event_id." was stored", Logger::DEBUG); Logger::info('Event was stored', ['id' => $event_id]);
return;
$item = Event::getItemArrayForId($event_id, $item);
} }
} }
} }