mirror of
https://github.com/friendica/friendica
synced 2025-05-01 10:24:24 +02:00
Add delivery queue number manipulation
- Add new ItemDeliveryData model class - Add queue_count initialization in Notifier - Add queue_done incrementation in various Delivery tasks
This commit is contained in:
Hypolite Petovan
parent
a3c1beb265
commit
1696ad962e
5 changed files with 179 additions and 68 deletions
|
|
@ -50,18 +50,21 @@ class Item extends BaseObject
|
|||
const PT_PERSONAL_NOTE = 128;
|
||||
|
||||
// Field list that is used to display the items
|
||||
const DISPLAY_FIELDLIST = ['uid', 'id', 'parent', 'uri', 'thr-parent', 'parent-uri', 'guid', 'network',
|
||||
'commented', 'created', 'edited', 'received', 'verb', 'object-type', 'postopts', 'plink',
|
||||
'wall', 'private', 'starred', 'origin', 'title', 'body', 'file', 'attach', 'language',
|
||||
'content-warning', 'location', 'coord', 'app', 'rendered-hash', 'rendered-html', 'object',
|
||||
'allow_cid', 'allow_gid', 'deny_cid', 'deny_gid', 'item_id',
|
||||
'author-id', 'author-link', 'author-name', 'author-avatar', 'author-network',
|
||||
'owner-id', 'owner-link', 'owner-name', 'owner-avatar', 'owner-network',
|
||||
'contact-id', 'contact-link', 'contact-name', 'contact-avatar',
|
||||
'writable', 'self', 'cid', 'alias',
|
||||
'event-id', 'event-created', 'event-edited', 'event-start', 'event-finish',
|
||||
'event-summary', 'event-desc', 'event-location', 'event-type',
|
||||
'event-nofinish', 'event-adjust', 'event-ignore', 'event-id'];
|
||||
const DISPLAY_FIELDLIST = [
|
||||
'uid', 'id', 'parent', 'uri', 'thr-parent', 'parent-uri', 'guid', 'network',
|
||||
'commented', 'created', 'edited', 'received', 'verb', 'object-type', 'postopts', 'plink',
|
||||
'wall', 'private', 'starred', 'origin', 'title', 'body', 'file', 'attach', 'language',
|
||||
'content-warning', 'location', 'coord', 'app', 'rendered-hash', 'rendered-html', 'object',
|
||||
'allow_cid', 'allow_gid', 'deny_cid', 'deny_gid', 'item_id',
|
||||
'author-id', 'author-link', 'author-name', 'author-avatar', 'author-network',
|
||||
'owner-id', 'owner-link', 'owner-name', 'owner-avatar', 'owner-network',
|
||||
'contact-id', 'contact-link', 'contact-name', 'contact-avatar',
|
||||
'writable', 'self', 'cid', 'alias',
|
||||
'event-id', 'event-created', 'event-edited', 'event-start', 'event-finish',
|
||||
'event-summary', 'event-desc', 'event-location', 'event-type',
|
||||
'event-nofinish', 'event-adjust', 'event-ignore', 'event-id',
|
||||
'delivery_queue_count', 'delivery_queue_done'
|
||||
];
|
||||
|
||||
// Field list that is used to deliver items via the protocols
|
||||
const DELIVER_FIELDLIST = ['uid', 'id', 'parent', 'uri', 'thr-parent', 'parent-uri', 'guid',
|
||||
|
|
@ -80,9 +83,6 @@ class Item extends BaseObject
|
|||
// Field list for "item-content" table that is not present in the "item" table
|
||||
const CONTENT_FIELDLIST = ['language'];
|
||||
|
||||
// Field list for additional delivery data
|
||||
const DELIVERY_DATA_FIELDLIST = ['postopts', 'inform'];
|
||||
|
||||
// All fields in the item table
|
||||
const ITEM_FIELDLIST = ['id', 'uid', 'parent', 'uri', 'parent-uri', 'thr-parent', 'guid',
|
||||
'contact-id', 'type', 'wall', 'gravity', 'extid', 'icid', 'iaid', 'psid',
|
||||
|
|
@ -190,7 +190,7 @@ class Item extends BaseObject
|
|||
|
||||
// Fetch data from the item-content table whenever there is content there
|
||||
if (self::isLegacyMode()) {
|
||||
$legacy_fields = array_merge(self::DELIVERY_DATA_FIELDLIST, self::MIXED_CONTENT_FIELDLIST);
|
||||
$legacy_fields = array_merge(ItemDeliveryData::FIELD_LIST, self::MIXED_CONTENT_FIELDLIST);
|
||||
foreach ($legacy_fields as $field) {
|
||||
if (empty($row[$field]) && !empty($row['internal-item-' . $field])) {
|
||||
$row[$field] = $row['internal-item-' . $field];
|
||||
|
|
@ -551,7 +551,7 @@ class Item extends BaseObject
|
|||
|
||||
$fields['item-content'] = array_merge(self::CONTENT_FIELDLIST, self::MIXED_CONTENT_FIELDLIST);
|
||||
|
||||
$fields['item-delivery-data'] = self::DELIVERY_DATA_FIELDLIST;
|
||||
$fields['item-delivery-data'] = ItemDeliveryData::FIELD_LIST;
|
||||
|
||||
$fields['permissionset'] = ['allow_cid', 'allow_gid', 'deny_cid', 'deny_gid'];
|
||||
|
||||
|
|
@ -730,7 +730,7 @@ class Item extends BaseObject
|
|||
foreach ($fields as $table => $table_fields) {
|
||||
foreach ($table_fields as $field => $select) {
|
||||
if (empty($selected) || in_array($select, $selected)) {
|
||||
$legacy_fields = array_merge(self::DELIVERY_DATA_FIELDLIST, self::MIXED_CONTENT_FIELDLIST);
|
||||
$legacy_fields = array_merge(ItemDeliveryData::FIELD_LIST, self::MIXED_CONTENT_FIELDLIST);
|
||||
if (self::isLegacyMode() && in_array($select, $legacy_fields)) {
|
||||
$selection[] = "`item`.`".$select."` AS `internal-item-" . $select . "`";
|
||||
}
|
||||
|
|
@ -810,7 +810,9 @@ class Item extends BaseObject
|
|||
}
|
||||
}
|
||||
|
||||
$clear_fields = ['bookmark', 'type', 'author-name', 'author-avatar', 'author-link', 'owner-name', 'owner-avatar', 'owner-link'];
|
||||
$delivery_data = ItemDeliveryData::extractFields($fields);
|
||||
|
||||
$clear_fields = ['bookmark', 'type', 'author-name', 'author-avatar', 'author-link', 'owner-name', 'owner-avatar', 'owner-link', 'postopts', 'inform'];
|
||||
foreach ($clear_fields as $field) {
|
||||
if (array_key_exists($field, $fields)) {
|
||||
$fields[$field] = null;
|
||||
|
|
@ -831,12 +833,6 @@ class Item extends BaseObject
|
|||
$files = null;
|
||||
}
|
||||
|
||||
$delivery_data = ['postopts' => defaults($fields, 'postopts', ''),
|
||||
'inform' => defaults($fields, 'inform', '')];
|
||||
|
||||
$fields['postopts'] = null;
|
||||
$fields['inform'] = null;
|
||||
|
||||
if (!empty($fields)) {
|
||||
$success = DBA::update('item', $fields, $condition);
|
||||
|
||||
|
|
@ -914,7 +910,7 @@ class Item extends BaseObject
|
|||
}
|
||||
}
|
||||
|
||||
self::updateDeliveryData($item['id'], $delivery_data);
|
||||
ItemDeliveryData::update($item['id'], $delivery_data);
|
||||
|
||||
self::updateThread($item['id']);
|
||||
|
||||
|
|
@ -1061,7 +1057,7 @@ class Item extends BaseObject
|
|||
self::delete(['uri' => $item['uri'], 'uid' => 0, 'deleted' => false], $priority);
|
||||
}
|
||||
|
||||
DBA::delete('item-delivery-data', ['iid' => $item['id']]);
|
||||
ItemDeliveryData::delete($item['id']);
|
||||
|
||||
// We don't delete the item-activity here, since we need some of the data for ActivityPub
|
||||
|
||||
|
|
@ -1238,6 +1234,8 @@ class Item extends BaseObject
|
|||
|
||||
public static function insert($item, $force_parent = false, $notify = false, $dontcache = false)
|
||||
{
|
||||
$orig_item = $item;
|
||||
|
||||
// If it is a posting where users should get notifications, then define it as wall posting
|
||||
if ($notify) {
|
||||
$item['wall'] = 1;
|
||||
|
|
@ -1661,8 +1659,7 @@ class Item extends BaseObject
|
|||
self::insertContent($item);
|
||||
}
|
||||
|
||||
$delivery_data = ['postopts' => defaults($item, 'postopts', ''),
|
||||
'inform' => defaults($item, 'inform', '')];
|
||||
$delivery_data = ItemDeliveryData::extractFields($item);
|
||||
|
||||
unset($item['postopts']);
|
||||
unset($item['inform']);
|
||||
|
|
@ -1701,10 +1698,7 @@ class Item extends BaseObject
|
|||
if ($spoolpath != "") {
|
||||
$spool = $spoolpath.'/'.$file;
|
||||
|
||||
// Ensure to have the removed data from above again in the item array
|
||||
$item = array_merge($item, $delivery_data);
|
||||
|
||||
file_put_contents($spool, json_encode($item));
|
||||
file_put_contents($spool, json_encode($orig_item));
|
||||
Logger::log("Item wasn't stored - Item was spooled into file ".$file, Logger::DEBUG);
|
||||
}
|
||||
return 0;
|
||||
|
|
@ -1805,9 +1799,7 @@ class Item extends BaseObject
|
|||
self::updateThread($parent_id);
|
||||
}
|
||||
|
||||
$delivery_data['iid'] = $current_post;
|
||||
|
||||
self::insertDeliveryData($delivery_data);
|
||||
ItemDeliveryData::insert($item['id'], $delivery_data);
|
||||
|
||||
DBA::commit();
|
||||
|
||||
|
|
@ -1848,35 +1840,6 @@ class Item extends BaseObject
|
|||
return $current_post;
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Insert a new item delivery data entry
|
||||
*
|
||||
* @param array $item The item fields that are to be inserted
|
||||
*/
|
||||
private static function insertDeliveryData($delivery_data)
|
||||
{
|
||||
if (empty($delivery_data['iid']) || (empty($delivery_data['postopts']) && empty($delivery_data['inform']))) {
|
||||
return;
|
||||
}
|
||||
|
||||
DBA::insert('item-delivery-data', $delivery_data);
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Update an existing item delivery data entry
|
||||
*
|
||||
* @param integer $id The item id that is to be updated
|
||||
* @param array $item The item fields that are to be inserted
|
||||
*/
|
||||
private static function updateDeliveryData($id, $delivery_data)
|
||||
{
|
||||
if (empty($id) || (empty($delivery_data['postopts']) && empty($delivery_data['inform']))) {
|
||||
return;
|
||||
}
|
||||
|
||||
DBA::update('item-delivery-data', $delivery_data, ['iid' => $id], true);
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Insert a new item content entry
|
||||
*
|
||||
|
|
|
|||
114
src/Model/ItemDeliveryData.php
Normal file
114
src/Model/ItemDeliveryData.php
Normal file
|
|
@ -0,0 +1,114 @@
|
|||
<?php
|
||||
|
||||
/**
|
||||
* @file src/Model/ItemDeliveryData.php
|
||||
*/
|
||||
|
||||
namespace Friendica\Model;
|
||||
|
||||
use Friendica\Database\DBA;
|
||||
|
||||
class ItemDeliveryData
|
||||
{
|
||||
const FIELD_LIST = [
|
||||
// Legacy fields moved from item table
|
||||
'postopts',
|
||||
'inform',
|
||||
// New delivery fields with virtual field name in item fields
|
||||
'queue_count' => 'delivery_queue_count',
|
||||
'queue_done' => 'delivery_queue_done',
|
||||
];
|
||||
|
||||
/**
|
||||
* Extract delivery data from the provided item fields
|
||||
*
|
||||
* @param array $fields
|
||||
* @return array
|
||||
*/
|
||||
public static function extractFields(array &$fields)
|
||||
{
|
||||
$delivery_data = [];
|
||||
foreach (ItemDeliveryData::FIELD_LIST as $key => $field) {
|
||||
if (is_int($key) && isset($fields[$field])) {
|
||||
// Legacy field moved from item table
|
||||
$delivery_data[$field] = $fields[$field];
|
||||
$fields[$field] = null;
|
||||
} elseif (isset($fields[$field])) {
|
||||
// New delivery field with virtual field name in item fields
|
||||
$delivery_data[$key] = $fields[$field];
|
||||
unset($fields[$field]);
|
||||
}
|
||||
}
|
||||
|
||||
return $delivery_data;
|
||||
}
|
||||
|
||||
/**
|
||||
* Increments the queue_done for the given item ID.
|
||||
*
|
||||
* Avoids racing condition between multiple delivery threads.
|
||||
*
|
||||
* @param integer $item_id
|
||||
* @return bool
|
||||
*/
|
||||
public static function incrementQueueDone($item_id)
|
||||
{
|
||||
return DBA::e('UPDATE `item-delivery-data` SET `queue_done` = `queue_done` + 1 WHERE `iid` = ?', $item_id);
|
||||
}
|
||||
|
||||
/**
|
||||
* Insert a new item delivery data entry
|
||||
*
|
||||
* @param integer $item_id
|
||||
* @param array $fields
|
||||
* @return bool
|
||||
*/
|
||||
public static function insert($item_id, array $fields)
|
||||
{
|
||||
if (empty($item_id)) {
|
||||
throw new \BadMethodCallException('Empty item_id');
|
||||
}
|
||||
|
||||
$fields['iid'] = $item_id;
|
||||
|
||||
return DBA::insert('item-delivery-data', $fields);
|
||||
}
|
||||
|
||||
/**
|
||||
* Update/Insert item delivery data
|
||||
*
|
||||
* If you want to update queue_done, please use incrementQueueDone instead.
|
||||
*
|
||||
* @param integer $item_id
|
||||
* @param array $fields
|
||||
* @return bool
|
||||
*/
|
||||
public static function update($item_id, array $fields)
|
||||
{
|
||||
if (empty($item_id)) {
|
||||
throw new \BadMethodCallException('Empty item_id');
|
||||
}
|
||||
|
||||
if (empty($fields)) {
|
||||
// Nothing to do, update successful
|
||||
return true;
|
||||
}
|
||||
|
||||
return DBA::update('item-delivery-data', $fields, ['iid' => $item_id], true);
|
||||
}
|
||||
|
||||
/**
|
||||
* Delete item delivery data
|
||||
*
|
||||
* @param integer $item_id
|
||||
* @return bool
|
||||
*/
|
||||
public static function delete($item_id)
|
||||
{
|
||||
if (empty($item_id)) {
|
||||
throw new \BadMethodCallException('Empty item_id');
|
||||
}
|
||||
|
||||
return DBA::delete('item-delivery-data', ['iid' => $item_id]);
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue