},
{
"name": "friendica/json-ld",
- "version": "1.0.0",
+ "version": "1.1.1",
"source": {
"type": "git",
"url": "https://git.friendi.ca/friendica/php-json-ld",
- "reference": "a9ac64daf01cfd97e80c36a5104247d37c0ae5ef"
+ "reference": "ca3916d10d2ad9073b3b1eae383978dbe828e1e1"
},
"require": {
"ext-json": "*",
{
"name": "Digital Bazaar, Inc.",
"email": "support@digitalbazaar.com",
- "url": "http://digitalbazaar.com/"
+ "homepage": "http://digitalbazaar.com/"
},
{
"name": "Friendica Team",
- "url": "https://friendi.ca/"
+ "homepage": "https://friendi.ca/"
}
],
"description": "A JSON-LD Processor and API implementation in PHP.",
"Semantic Web",
"jsonld"
],
- "time": "2018-09-28T00:01:12+00:00"
+ "time": "2018-10-08T20:41:00+00:00"
},
{
"name": "fxp/composer-asset-plugin",
-- ------------------------------------------
-- Friendica 2018.12-dev (The Tazmans Flax-lily)
--- DB_UPDATE_VERSION 1283
+-- DB_UPDATE_VERSION 1284
-- ------------------------------------------
UNIQUE INDEX `name` (`name`)
) DEFAULT COLLATE utf8mb4_general_ci COMMENT='registered addons';
+--
+-- TABLE apcontact
+--
+CREATE TABLE IF NOT EXISTS `apcontact` (
+ `url` varbinary(255) NOT NULL COMMENT 'URL of the contact',
+ `uuid` varchar(255) COMMENT '',
+ `type` varchar(20) NOT NULL COMMENT '',
+ `following` varchar(255) COMMENT '',
+ `followers` varchar(255) COMMENT '',
+ `inbox` varchar(255) NOT NULL COMMENT '',
+ `outbox` varchar(255) COMMENT '',
+ `sharedinbox` varchar(255) COMMENT '',
+ `nick` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+ `name` varchar(255) COMMENT '',
+ `about` text COMMENT '',
+ `photo` varchar(255) COMMENT '',
+ `addr` varchar(255) COMMENT '',
+ `alias` varchar(255) COMMENT '',
+ `pubkey` text COMMENT '',
+ `baseurl` varchar(255) COMMENT 'baseurl of the ap contact',
+ `updated` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
+ PRIMARY KEY(`url`),
+ INDEX `addr` (`addr`(32)),
+ INDEX `url` (`followers`(190))
+) DEFAULT COLLATE utf8mb4_general_ci COMMENT='ActivityPub compatible contacts - used in the ActivityPub implementation';
+
--
-- TABLE attach
--
`reply-to-uri` varbinary(255) NOT NULL DEFAULT '' COMMENT 'URI to which this item is a reply',
`conversation-uri` varbinary(255) NOT NULL DEFAULT '' COMMENT 'GNU Social conversation URI',
`conversation-href` varbinary(255) NOT NULL DEFAULT '' COMMENT 'GNU Social conversation link',
- `protocol` tinyint unsigned NOT NULL DEFAULT 0 COMMENT 'The protocol of the item',
+ `protocol` tinyint unsigned NOT NULL DEFAULT 255 COMMENT 'The protocol of the item',
`source` mediumtext COMMENT 'Original source',
`received` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'Receiving date',
PRIMARY KEY(`item-uri`),
/**
* @brief Returns all the cache keys sorted alphabetically
*
- * @return array|null Null if the driver doesn't support this feature
+ * @param string $prefix Prefix of the keys (optional)
+ *
+ * @return array Empty if the driver doesn't support this feature
*/
- public static function getAllKeys()
+ public static function getAllKeys($prefix = null)
{
$time = microtime(true);
- $return = self::getDriver()->getAllKeys();
-
- // Keys are prefixed with the node hostname, let's remove it
- array_walk($return, function (&$value) {
- $value = preg_replace('/^' . self::getApp()->get_hostname() . ':/', '', $value);
- });
-
- sort($return);
+ $return = self::getDriver()->getAllKeys($prefix);
self::getApp()->save_timestamp($time, 'cache');
* @param string $key The original key
* @return string The cache key used for the cache
*/
- protected function getCacheKey($key) {
+ protected function getCacheKey($key)
+ {
// We fetch with the hostname as key to avoid problems with other applications
return self::getApp()->get_hostname() . ":" . $key;
}
+
+ /**
+ * @param array $keys A list of cached keys
+ * @return array A list of original keys
+ */
+ protected function getOriginalKeys($keys)
+ {
+ if (empty($keys)) {
+ return [];
+ } else {
+ // Keys are prefixed with the node hostname, let's remove it
+ array_walk($keys, function (&$value) {
+ $value = preg_replace('/^' . self::getApp()->get_hostname() . ':/', '', $value);
+ });
+
+ sort($keys);
+
+ return $keys;
+ }
+ }
+
+ /**
+ * Filters the keys of an array with a given prefix
+ * Returns the filtered keys as an new array
+ *
+ * @param array $array The array, which should get filtered
+ * @param string|null $prefix The prefix (if null, all keys will get returned)
+ *
+ * @return array The filtered array with just the keys
+ */
+ protected function filterArrayKeysByPrefix($array, $prefix = null)
+ {
+ if (empty($prefix)) {
+ return array_keys($array);
+ } else {
+ $result = [];
+
+ foreach (array_keys($array) as $key) {
+ if (strpos($key, $prefix) === 0) {
+ array_push($result, $key);
+ }
+ }
+
+ return $result;
+ }
+
+ }
}
/**
* (@inheritdoc)
*/
- public function getAllKeys()
+ public function getAllKeys($prefix = null)
{
- return array_keys($this->cachedData);
+ return $this->filterArrayKeysByPrefix($this->cachedData, $prefix);
}
/**
/**
* (@inheritdoc)
*/
- public function getAllKeys()
+ public function getAllKeys($prefix = null)
{
- $stmt = DBA::select('cache', ['k'], ['`expires` >= ?', DateTimeFormat::utcNow()]);
+ if (empty($prefix)) {
+ $where = ['`expires` >= ?', DateTimeFormat::utcNow()];
+ } else {
+ $where = ['`expires` >= ? AND `k` LIKE CONCAT(?, \'%\')', DateTimeFormat::utcNow(), $prefix];
+ }
+
+ $stmt = DBA::select('cache', ['k'], $where);
+
+ $keys = [];
+ while ($key = DBA::fetch($stmt)) {
+ array_push($keys, $key['k']);
+ }
+ DBA::close($stmt);
- return DBA::toArray($stmt);
+ return $keys;
}
/**
/**
* Lists all cache keys
*
- * @return array|null Null if it isn't supported by the cache driver
+ * @param string prefix optional a prefix to search
+ *
+ * @return array Empty if it isn't supported by the cache driver
*/
- public function getAllKeys();
+ public function getAllKeys($prefix = null);
/**
* Fetches cached data according to the key
/**
* (@inheritdoc)
*/
- public function getAllKeys()
+ public function getAllKeys($prefix = null)
{
- $list = [];
+ $keys = [];
$allSlabs = $this->memcache->getExtendedStats('slabs');
foreach ($allSlabs as $slabs) {
foreach (array_keys($slabs) as $slabId) {
$cachedump = $this->memcache->getExtendedStats('cachedump', (int)$slabId);
- foreach ($cachedump as $keys => $arrVal) {
+ foreach ($cachedump as $key => $arrVal) {
if (!is_array($arrVal)) {
continue;
}
- $list = array_merge($list, array_keys($arrVal));
+ $keys = array_merge($keys, array_keys($arrVal));
}
}
}
- return $list;
+ $keys = $this->getOriginalKeys($keys);
+
+ return $this->filterArrayKeysByPrefix($keys, $prefix);
}
/**
use Friendica\Core\Cache;
use Exception;
+use Friendica\Network\HTTPException\InternalServerErrorException;
use Memcached;
/**
/**
* (@inheritdoc)
*/
- public function getAllKeys()
+ public function getAllKeys($prefix = null)
{
- return $this->memcached->getAllKeys();
+ $keys = $this->getOriginalKeys($this->memcached->getAllKeys());
+
+ if ($this->memcached->getResultCode() == Memcached::RES_SUCCESS) {
+ return $this->filterArrayKeysByPrefix($keys, $prefix);
+ } else {
+ logger('Memcached \'getAllKeys\' failed with ' . $this->memcached->getResultMessage(), LOGGER_ALL);
+ return [];
+ }
}
/**
if ($this->memcached->getResultCode() === Memcached::RES_SUCCESS) {
$return = $value;
+ } else {
+ logger('Memcached \'get\' failed with ' . $this->memcached->getResultMessage(), LOGGER_ALL);
}
return $return;
$value
);
}
-
}
/**
/**
* (@inheritdoc)
*/
- public function getAllKeys()
+ public function getAllKeys($prefix = null)
{
- return null;
+ if (empty($prefix)) {
+ $search = '*';
+ } else {
+ $search = $prefix . '*';
+ }
+
+ $list = $this->redis->keys($this->getCacheKey($search));
+
+ return $this->getOriginalKeys($list);
}
/**
private function executeList()
{
$prefix = $this->getArgument(1);
- $keys = Core\Cache::getAllKeys();
+ $keys = Core\Cache::getAllKeys($prefix);
if (empty($prefix)) {
$this->out('Listing all cache keys:');
$count = 0;
foreach ($keys as $key) {
- if (empty($prefix) || strpos($key, $prefix) === 0) {
- $this->out($key);
- $count++;
- }
+ $this->out($key);
+ $count++;
}
$this->out($count . ' keys found');
'manuallyApprovesFollowers' => 'as:manuallyApprovesFollowers',
'sensitive' => 'as:sensitive', 'Hashtag' => 'as:Hashtag']];
const ACCOUNT_TYPES = ['Person', 'Organization', 'Service', 'Group', 'Application'];
- const CONTENT_TYPES = ['Note', 'Article', 'Video', 'Image'];
- const ACTIVITY_TYPES = ['Like', 'Dislike', 'Accept', 'Reject', 'TentativeAccept'];
/**
* Checks if the web request is done for the AP protocol
*
}
foreach ($items as $activity) {
- ActivityPub\Receiver::processActivity($activity, '', $uid, true);
+ $ldactivity = JsonLD::compact($activity);
+ ActivityPub\Receiver::processActivity($ldactivity, '', $uid, true);
}
}
}
/**
* ActivityPub Protocol class
+ *
+ * To-Do:
+ * - Store Diaspora signature
*/
class Processor
{
$tag_text = '';
foreach ($tags as $tag) {
- if (in_array($tag['type'], ['Mention', 'Hashtag'])) {
+ if (in_array(defaults($tag, 'type', ''), ['Mention', 'Hashtag'])) {
if (!empty($tag_text)) {
$tag_text .= ',';
}
}
/**
- *
+ * Add attachment data to the item array
*
- * @param $attachments
+ * @param array $attachments
* @param array $item
*
* @return item array
}
/**
- *
+ * Prepares data for a message
*
- * @param array $activity
- * @param $body
+ * @param array $activity Activity array
+ * @param string $body original source
*/
public static function createItem($activity, $body)
{
}
/**
- *
+ * Prepare the item array for a "like"
*
- * @param array $activity
- * @param $body
+ * @param array $activity Activity array
+ * @param string $body original source
*/
public static function likeItem($activity, $body)
{
$item = [];
$item['verb'] = ACTIVITY_LIKE;
- $item['parent-uri'] = $activity['object'];
+ $item['parent-uri'] = $activity['object_id'];
$item['gravity'] = GRAVITY_ACTIVITY;
$item['object-type'] = ACTIVITY_OBJ_NOTE;
* Delete items
*
* @param array $activity
- * @param $body
*/
public static function deleteItem($activity)
{
- $owner = Contact::getIdForURL($activity['owner']);
- $object = JsonLD::fetchElement($activity, 'object', 'id');
- logger('Deleting item ' . $object . ' from ' . $owner, LOGGER_DEBUG);
- Item::delete(['uri' => $object, 'owner-id' => $owner]);
+ $owner = Contact::getIdForURL($activity['actor']);
+
+ logger('Deleting item ' . $activity['object_id'] . ' from ' . $owner, LOGGER_DEBUG);
+ Item::delete(['uri' => $activity['object_id'], 'owner-id' => $owner]);
}
/**
- *
+ * Prepare the item array for a "dislike"
*
- * @param array $activity
- * @param $body
+ * @param array $activity Activity array
+ * @param string $body original source
*/
public static function dislikeItem($activity, $body)
{
$item = [];
$item['verb'] = ACTIVITY_DISLIKE;
- $item['parent-uri'] = $activity['object'];
+ $item['parent-uri'] = $activity['object_id'];
$item['gravity'] = GRAVITY_ACTIVITY;
$item['object-type'] = ACTIVITY_OBJ_NOTE;
}
/**
- *
+ * Creates an item post
*
- * @param array $activity
- * @param array $item
- * @param $body
+ * @param array $activity Activity data
+ * @param array $item item array
+ * @param string $body original source
*/
private static function postItem($activity, $item, $body)
{
$item['network'] = Protocol::ACTIVITYPUB;
$item['private'] = !in_array(0, $activity['receiver']);
$item['author-id'] = Contact::getIdForURL($activity['author'], 0, true);
- $item['owner-id'] = Contact::getIdForURL($activity['owner'], 0, true);
+
+ if (empty($activity['thread-completion'])) {
+ $item['owner-id'] = Contact::getIdForURL($activity['actor'], 0, true);
+ } else {
+ logger('Ignoring actor because of thread completion.', LOGGER_DEBUG);
+ $item['owner-id'] = $item['author-id'];
+ }
+
$item['uri'] = $activity['id'];
$item['created'] = $activity['published'];
$item['edited'] = $activity['updated'];
$item = self::constructAttachList($activity['attachments'], $item);
- $source = JsonLD::fetchElement($activity, 'source', 'content', 'mediaType', 'text/bbcode');
- if (!empty($source)) {
- $item['body'] = $source;
+ if (!empty($activity['source'])) {
+ $item['body'] = $activity['source'];
}
$item['protocol'] = Conversation::PARCEL_ACTIVITYPUB;
}
/**
- *
+ * Fetches missing posts
*
* @param $url
* @param $child
$activity['published'] = $object['published'];
$activity['type'] = 'Create';
- ActivityPub\Receiver::processActivity($activity);
+ $ldactivity = JsonLD::compact($activity);
+
+ $ldactivity['thread-completion'] = true;
+
+ ActivityPub\Receiver::processActivity($ldactivity);
logger('Activity ' . $url . ' had been fetched and processed.');
}
*/
public static function followUser($activity)
{
- $actor = JsonLD::fetchElement($activity, 'object', 'id');
- $uid = User::getIdForURL($actor);
+ $uid = User::getIdForURL($activity['object_id']);
if (empty($uid)) {
return;
}
$owner = User::getOwnerDataById($uid);
- $cid = Contact::getIdForURL($activity['owner'], $uid);
+ $cid = Contact::getIdForURL($activity['actor'], $uid);
if (!empty($cid)) {
$contact = DBA::selectFirst('contact', [], ['id' => $cid, 'network' => Protocol::NATIVE_SUPPORT]);
} else {
$contact = false;
}
- $item = ['author-id' => Contact::getIdForURL($activity['owner']),
- 'author-link' => $activity['owner']];
+ $item = ['author-id' => Contact::getIdForURL($activity['actor']),
+ 'author-link' => $activity['actor']];
Contact::addRelationship($owner, $contact, $item);
- $cid = Contact::getIdForURL($activity['owner'], $uid);
+ $cid = Contact::getIdForURL($activity['actor'], $uid);
if (empty($cid)) {
return;
}
*/
public static function updatePerson($activity)
{
- if (empty($activity['object']['id'])) {
+ if (empty($activity['object_id'])) {
return;
}
- logger('Updating profile for ' . $activity['object']['id'], LOGGER_DEBUG);
- APContact::getByURL($activity['object']['id'], true);
+ logger('Updating profile for ' . $activity['object_id'], LOGGER_DEBUG);
+ APContact::getByURL($activity['object_id'], true);
}
/**
*/
public static function deletePerson($activity)
{
- if (empty($activity['object']['id']) || empty($activity['object']['actor'])) {
+ if (empty($activity['object_id']) || empty($activity['actor'])) {
logger('Empty object id or actor.', LOGGER_DEBUG);
return;
}
- if ($activity['object']['id'] != $activity['object']['actor']) {
+ if ($activity['object_id'] != $activity['actor']) {
logger('Object id does not match actor.', LOGGER_DEBUG);
return;
}
- $contacts = DBA::select('contact', ['id'], ['nurl' => normalise_link($activity['object']['id'])]);
+ $contacts = DBA::select('contact', ['id'], ['nurl' => normalise_link($activity['object_id'])]);
while ($contact = DBA::fetch($contacts)) {
- Contact::remove($contact["id"]);
+ Contact::remove($contact['id']);
}
DBA::close($contacts);
- logger('Deleted contact ' . $activity['object']['id'], LOGGER_DEBUG);
+ logger('Deleted contact ' . $activity['object_id'], LOGGER_DEBUG);
}
/**
*/
public static function acceptFollowUser($activity)
{
- $actor = JsonLD::fetchElement($activity, 'object', 'actor');
- $uid = User::getIdForURL($actor);
+ $uid = User::getIdForURL($activity['object_actor']);
if (empty($uid)) {
return;
}
$owner = User::getOwnerDataById($uid);
- $cid = Contact::getIdForURL($activity['owner'], $uid);
+ $cid = Contact::getIdForURL($activity['actor'], $uid);
if (empty($cid)) {
- logger('No contact found for ' . $activity['owner'], LOGGER_DEBUG);
+ logger('No contact found for ' . $activity['actor'], LOGGER_DEBUG);
return;
}
*/
public static function rejectFollowUser($activity)
{
- $actor = JsonLD::fetchElement($activity, 'object', 'actor');
- $uid = User::getIdForURL($actor);
+ $uid = User::getIdForURL($activity['object_actor']);
if (empty($uid)) {
return;
}
$owner = User::getOwnerDataById($uid);
- $cid = Contact::getIdForURL($activity['owner'], $uid);
+ $cid = Contact::getIdForURL($activity['actor'], $uid);
if (empty($cid)) {
- logger('No contact found for ' . $activity['owner'], LOGGER_DEBUG);
+ logger('No contact found for ' . $activity['actor'], LOGGER_DEBUG);
return;
}
*/
public static function undoActivity($activity)
{
- $activity_url = JsonLD::fetchElement($activity, 'object', 'id');
- if (empty($activity_url)) {
+ if (empty($activity['object_id'])) {
return;
}
- $actor = JsonLD::fetchElement($activity, 'object', 'actor');
- if (empty($actor)) {
+ if (empty($activity['object_actor'])) {
return;
}
- $author_id = Contact::getIdForURL($actor);
+ $author_id = Contact::getIdForURL($activity['object_actor']);
if (empty($author_id)) {
return;
}
- Item::delete(['uri' => $activity_url, 'author-id' => $author_id, 'gravity' => GRAVITY_ACTIVITY]);
+ Item::delete(['uri' => $activity['object_id'], 'author-id' => $author_id, 'gravity' => GRAVITY_ACTIVITY]);
}
/**
*/
public static function undoFollowUser($activity)
{
- $object = JsonLD::fetchElement($activity, 'object', 'object');
- $uid = User::getIdForURL($object);
+ $uid = User::getIdForURL($activity['object_object']);
if (empty($uid)) {
return;
}
$owner = User::getOwnerDataById($uid);
- $cid = Contact::getIdForURL($activity['owner'], $uid);
+ $cid = Contact::getIdForURL($activity['actor'], $uid);
if (empty($cid)) {
- logger('No contact found for ' . $activity['owner'], LOGGER_DEBUG);
+ logger('No contact found for ' . $activity['actor'], LOGGER_DEBUG);
return;
}
* - Remove
* - Undo Block
* - Undo Accept (Problem: This could invert a contact accept or an event accept)
- *
- * General:
- * - Possibly using the LD-JSON parser
*/
class Receiver
{
+ const PUBLIC_COLLECTION = 'as:Public';
+ const ACCOUNT_TYPES = ['as:Person', 'as:Organization', 'as:Service', 'as:Group', 'as:Application'];
+ const CONTENT_TYPES = ['as:Note', 'as:Article', 'as:Video', 'as:Image'];
+ const ACTIVITY_TYPES = ['as:Like', 'as:Dislike', 'as:Accept', 'as:Reject', 'as:TentativeAccept'];
+
/**
* Checks if the web request is done for the AP protocol
*
}
/**
- *
+ * Checks incoming message from the inbox
*
* @param $body
* @param $header
$activity = json_decode($body, true);
- $actor = JsonLD::fetchElement($activity, 'actor', 'id');
- logger('Message for user ' . $uid . ' is from actor ' . $actor, LOGGER_DEBUG);
-
if (empty($activity)) {
logger('Invalid body.', LOGGER_DEBUG);
return;
}
+ $ldactivity = JsonLD::compact($activity);
+
+ $actor = JsonLD::fetchElement($ldactivity, 'as:actor');
+
+ logger('Message for user ' . $uid . ' is from actor ' . $actor, LOGGER_DEBUG);
+
if (LDSignature::isSigned($activity)) {
$ld_signer = LDSignature::getSigner($activity);
if (empty($ld_signer)) {
$trust_source = false;
}
- self::processActivity($activity, $body, $uid, $trust_source);
+ self::processActivity($ldactivity, $body, $uid, $trust_source);
}
/**
- *
+ * Fetches the object type for a given object id
+ *
+ * @param array $activity
+ * @param string $object_id Object ID of the the provided object
+ *
+ * @return string with object type
+ */
+ private static function fetchObjectType($activity, $object_id)
+ {
+
+ $object_type = JsonLD::fetchElement($activity['as:object'], '@type');
+ if (!empty($object_type)) {
+ return $object_type;
+ }
+
+ if (Item::exists(['uri' => $object_id, 'gravity' => [GRAVITY_PARENT, GRAVITY_COMMENT]])) {
+ // We just assume "note" since it doesn't make a difference for the further processing
+ return 'as:Note';
+ }
+
+ $profile = APContact::getByURL($object_id);
+ if (!empty($profile['type'])) {
+ return 'as:' . $profile['type'];
+ }
+
+ $data = ActivityPub::fetchContent($object_id);
+ if (!empty($data)) {
+ $object = JsonLD::compact($data);
+ $type = JsonLD::fetchElement($object, '@type');
+ if (!empty($type)) {
+ return $type;
+ }
+ }
+
+ return null;
+ }
+
+ /**
+ * Prepare the object array
*
* @param array $activity
* @param integer $uid User ID
* @param $trust_source
*
- * @return
+ * @return array with object data
*/
private static function prepareObjectData($activity, $uid, &$trust_source)
{
- $actor = JsonLD::fetchElement($activity, 'actor', 'id');
+ $actor = JsonLD::fetchElement($activity, 'as:actor');
if (empty($actor)) {
logger('Empty actor', LOGGER_DEBUG);
return [];
}
+ $type = JsonLD::fetchElement($activity, '@type');
+
// Fetch all receivers from to, cc, bto and bcc
$receivers = self::getReceivers($activity, $actor);
logger('Receivers: ' . json_encode($receivers), LOGGER_DEBUG);
- $object_id = JsonLD::fetchElement($activity, 'object', 'id');
+ $object_id = JsonLD::fetchElement($activity, 'as:object');
if (empty($object_id)) {
logger('No object found', LOGGER_DEBUG);
return [];
}
+ $object_type = self::fetchObjectType($activity, $object_id);
+
// Fetch the content only on activities where this matters
- if (in_array($activity['type'], ['Create', 'Announce'])) {
- $object_data = self::fetchObject($object_id, $activity['object'], $trust_source);
+ if (in_array($type, ['as:Create', 'as:Announce'])) {
+ if ($type == 'as:Announce') {
+ $trust_source = false;
+ }
+ $object_data = self::fetchObject($object_id, $activity['as:object'], $trust_source);
if (empty($object_data)) {
logger("Object data couldn't be processed", LOGGER_DEBUG);
return [];
}
// We had been able to retrieve the object data - so we can trust the source
$trust_source = true;
- } elseif (in_array($activity['type'], ['Like', 'Dislike'])) {
+ } elseif (in_array($type, ['as:Like', 'as:Dislike'])) {
// Create a mostly empty array out of the activity data (instead of the object).
// This way we later don't have to check for the existence of ech individual array element.
$object_data = self::processObject($activity);
- $object_data['name'] = $activity['type'];
- $object_data['author'] = $activity['actor'];
- $object_data['object'] = $object_id;
+ $object_data['name'] = $type;
+ $object_data['author'] = JsonLD::fetchElement($activity, 'as:actor');
+ $object_data['object_id'] = $object_id;
$object_data['object_type'] = ''; // Since we don't fetch the object, we don't know the type
} else {
$object_data = [];
- $object_data['id'] = $activity['id'];
- $object_data['object'] = $activity['object'];
- $object_data['object_type'] = JsonLD::fetchElement($activity, 'object', 'type');
+ $object_data['id'] = JsonLD::fetchElement($activity, '@id');
+ $object_data['object_id'] = JsonLD::fetchElement($activity, 'as:object');
+ $object_data['object_actor'] = JsonLD::fetchElement($activity['as:object'], 'as:actor');
+ $object_data['object_object'] = JsonLD::fetchElement($activity['as:object'], 'as:object');
+ $object_data['object_type'] = JsonLD::fetchElement($activity['as:object'], '@type');
}
$object_data = self::addActivityFields($object_data, $activity);
- $object_data['type'] = $activity['type'];
- $object_data['owner'] = $actor;
+ if (empty($object_data['object_type'])) {
+ $object_data['object_type'] = $object_type;
+ }
+
+ $object_data['type'] = $type;
+ $object_data['actor'] = $actor;
$object_data['receiver'] = array_merge(defaults($object_data, 'receiver', []), $receivers);
logger('Processing ' . $object_data['type'] . ' ' . $object_data['object_type'] . ' ' . $object_data['id'], LOGGER_DEBUG);
}
/**
- *
+ * Processes the activity object
*
- * @param array $activity
- * @param $body
- * @param integer $uid User ID
- * @param $trust_source
+ * @param array $activity Array with activity data
+ * @param string $body
+ * @param integer $uid User ID
+ * @param boolean $trust_source Do we trust the source?
*/
public static function processActivity($activity, $body = '', $uid = null, $trust_source = false)
{
- if (empty($activity['type'])) {
+ $type = JsonLD::fetchElement($activity, '@type');
+ if (!$type) {
logger('Empty type', LOGGER_DEBUG);
return;
}
- if (empty($activity['object'])) {
+ if (!JsonLD::fetchElement($activity, 'as:object')) {
logger('Empty object', LOGGER_DEBUG);
return;
}
- if (empty($activity['actor'])) {
+ if (!JsonLD::fetchElement($activity, 'as:actor')) {
logger('Empty actor', LOGGER_DEBUG);
return;
}
if (!$trust_source) {
- logger('No trust for activity type "' . $activity['type'] . '", so we quit now.', LOGGER_DEBUG);
+ logger('No trust for activity type "' . $type . '", so we quit now.', LOGGER_DEBUG);
return;
}
- switch ($activity['type']) {
- case 'Create':
- case 'Announce':
+ // Internal flag for thread completion. See Processor.php
+ if (!empty($activity['thread-completion'])) {
+ $object_data['thread-completion'] = $activity['thread-completion'];
+ }
+
+ switch ($type) {
+ case 'as:Create':
+ case 'as:Announce':
ActivityPub\Processor::createItem($object_data, $body);
break;
- case 'Like':
+ case 'as:Like':
ActivityPub\Processor::likeItem($object_data, $body);
break;
- case 'Dislike':
+ case 'as:Dislike':
ActivityPub\Processor::dislikeItem($object_data, $body);
break;
- case 'Update':
- if (in_array($object_data['object_type'], ActivityPub::CONTENT_TYPES)) {
+ case 'as:Update':
+ if (in_array($object_data['object_type'], self::CONTENT_TYPES)) {
/// @todo
- } elseif (in_array($object_data['object_type'], ActivityPub::ACCOUNT_TYPES)) {
+ } elseif (in_array($object_data['object_type'], self::ACCOUNT_TYPES)) {
ActivityPub\Processor::updatePerson($object_data, $body);
}
break;
- case 'Delete':
- if ($object_data['object_type'] == 'Tombstone') {
+ case 'as:Delete':
+ if ($object_data['object_type'] == 'as:Tombstone') {
ActivityPub\Processor::deleteItem($object_data, $body);
- } elseif (in_array($object_data['object_type'], ActivityPub::ACCOUNT_TYPES)) {
+ } elseif (in_array($object_data['object_type'], self::ACCOUNT_TYPES)) {
ActivityPub\Processor::deletePerson($object_data, $body);
}
break;
- case 'Follow':
+ case 'as:Follow':
ActivityPub\Processor::followUser($object_data);
break;
- case 'Accept':
- if ($object_data['object_type'] == 'Follow') {
+ case 'as:Accept':
+ if ($object_data['object_type'] == 'as:Follow') {
ActivityPub\Processor::acceptFollowUser($object_data);
}
break;
- case 'Reject':
- if ($object_data['object_type'] == 'Follow') {
+ case 'as:Reject':
+ if ($object_data['object_type'] == 'as:Follow') {
ActivityPub\Processor::rejectFollowUser($object_data);
}
break;
- case 'Undo':
- if ($object_data['object_type'] == 'Follow') {
+ case 'as:Undo':
+ if ($object_data['object_type'] == 'as:Follow') {
ActivityPub\Processor::undoFollowUser($object_data);
- } elseif (in_array($object_data['object_type'], ActivityPub::ACTIVITY_TYPES)) {
+ } elseif (in_array($object_data['object_type'], self::ACTIVITY_TYPES)) {
ActivityPub\Processor::undoActivity($object_data);
}
break;
default:
- logger('Unknown activity: ' . $activity['type'], LOGGER_DEBUG);
+ logger('Unknown activity: ' . $type, LOGGER_DEBUG);
break;
}
}
/**
- *
+ * Fetch the receiver list from an activity array
*
* @param array $activity
- * @param $actor
+ * @param string $actor
*
- * @return
+ * @return array with receivers (user id)
*/
private static function getReceivers($activity, $actor)
{
$receivers = [];
// When it is an answer, we inherite the receivers from the parent
- $replyto = JsonLD::fetchElement($activity, 'inReplyTo', 'id');
+ $replyto = JsonLD::fetchElement($activity, 'as:inReplyTo');
if (!empty($replyto)) {
$parents = Item::select(['uid'], ['uri' => $replyto]);
while ($parent = Item::fetch($parents)) {
$followers = '';
}
- foreach (['to', 'cc', 'bto', 'bcc'] as $element) {
- if (empty($activity[$element])) {
+ foreach (['as:to', 'as:cc', 'as:bto', 'as:bcc'] as $element) {
+ $receiver_list = JsonLD::fetchElementArray($activity, $element);
+ if (empty($receiver_list)) {
continue;
}
- // The receiver can be an array or a string
- if (is_string($activity[$element])) {
- $activity[$element] = [$activity[$element]];
- }
-
- foreach ($activity[$element] as $receiver) {
- if ($receiver == ActivityPub::PUBLIC_COLLECTION) {
+ foreach ($receiver_list as $receiver) {
+ if ($receiver == self::PUBLIC_COLLECTION) {
$receivers['uid:0'] = 0;
}
- if (($receiver == ActivityPub::PUBLIC_COLLECTION) && !empty($actor)) {
+ if (($receiver == self::PUBLIC_COLLECTION) && !empty($actor)) {
// This will most likely catch all OStatus connections to Mastodon
$condition = ['alias' => [$actor, normalise_link($actor)], 'rel' => [Contact::SHARING, Contact::FRIEND]
, 'archive' => false, 'pending' => false];
DBA::close($contacts);
}
- if (in_array($receiver, [$followers, ActivityPub::PUBLIC_COLLECTION]) && !empty($actor)) {
+ if (in_array($receiver, [$followers, self::PUBLIC_COLLECTION]) && !empty($actor)) {
$condition = ['nurl' => normalise_link($actor), 'rel' => [Contact::SHARING, Contact::FRIEND],
'network' => Protocol::ACTIVITYPUB, 'archive' => false, 'pending' => false];
$contacts = DBA::select('contact', ['uid'], $condition);
private static function addActivityFields($object_data, $activity)
{
if (!empty($activity['published']) && empty($object_data['published'])) {
- $object_data['published'] = $activity['published'];
+ $object_data['published'] = JsonLD::fetchElement($activity, 'published', '@value');
}
if (!empty($activity['updated']) && empty($object_data['updated'])) {
- $object_data['updated'] = $activity['updated'];
+ $object_data['updated'] = JsonLD::fetchElement($activity, 'updated', '@value');
}
if (!empty($activity['diaspora:guid']) && empty($object_data['diaspora:guid'])) {
- $object_data['diaspora:guid'] = $activity['diaspora:guid'];
+ $object_data['diaspora:guid'] = JsonLD::fetchElement($activity, 'diaspora:guid');
}
if (!empty($activity['inReplyTo']) && empty($object_data['parent-uri'])) {
- $object_data['parent-uri'] = JsonLD::fetchElement($activity, 'inReplyTo', 'id');
+ $object_data['parent-uri'] = JsonLD::fetchElement($activity, 'inReplyTo');
}
if (!empty($activity['instrument'])) {
}
/**
- *
+ * Fetches the object data from external ressources if needed
*
- * @param $object_id
- * @param $object
- * @param $trust_source
+ * @param string $object_id Object ID of the the provided object
+ * @param array $object The provided object array
+ * @param boolean $trust_source Do we trust the provided object?
*
- * @return
+ * @return array with trusted and valid object data
*/
private static function fetchObject($object_id, $object = [], $trust_source = false)
{
- if (!$trust_source || is_string($object)) {
+ // By fetching the type we check if the object is complete.
+ $type = JsonLD::fetchElement($object, '@type');
+
+ if (!$trust_source || empty($type)) {
$data = ActivityPub::fetchContent($object_id);
- if (empty($data)) {
- logger('Empty content for ' . $object_id . ', check if content is available locally.', LOGGER_DEBUG);
- $data = $object_id;
- } else {
+ if (!empty($data)) {
+ $object = JsonLD::compact($data);
logger('Fetched content for ' . $object_id, LOGGER_DEBUG);
+ } else {
+ logger('Empty content for ' . $object_id . ', check if content is available locally.', LOGGER_DEBUG);
+
+ $item = Item::selectFirst([], ['uri' => $object_id]);
+ if (!DBA::isResult($item)) {
+ logger('Object with url ' . $object_id . ' was not found locally.', LOGGER_DEBUG);
+ return false;
+ }
+ logger('Using already stored item for url ' . $object_id, LOGGER_DEBUG);
+ $data = ActivityPub\Transmitter::createNote($item);
+ $object = JsonLD::compact($data);
}
} else {
logger('Using original object for url ' . $object_id, LOGGER_DEBUG);
- $data = $object;
}
- if (is_string($data)) {
- $item = Item::selectFirst([], ['uri' => $data]);
- if (!DBA::isResult($item)) {
- logger('Object with url ' . $data . ' was not found locally.', LOGGER_DEBUG);
- return false;
- }
- logger('Using already stored item for url ' . $object_id, LOGGER_DEBUG);
- $data = ActivityPub\Transmitter::createNote($item);
- }
+ $type = JsonLD::fetchElement($object, '@type');
- if (empty($data['type'])) {
+ if (empty($type)) {
logger('Empty type', LOGGER_DEBUG);
return false;
}
- if (in_array($data['type'], ActivityPub::CONTENT_TYPES)) {
- return self::processObject($data);
+ if (in_array($type, self::CONTENT_TYPES)) {
+ return self::processObject($object);
}
- if ($data['type'] == 'Announce') {
- if (empty($data['object'])) {
+ if ($type == 'as:Announce') {
+ $object_id = JsonLD::fetchElement($object, 'object');
+ if (empty($object_id)) {
return false;
}
- return self::fetchObject($data['object']);
+ return self::fetchObject($object_id);
}
- logger('Unhandled object type: ' . $data['type'], LOGGER_DEBUG);
+ logger('Unhandled object type: ' . $type, LOGGER_DEBUG);
}
/**
- *
+ * Convert tags from JSON-LD format into a simplified format
*
- * @param $object
+ * @param array $tags Tags in JSON-LD format
*
- * @return
+ * @return array with tags in a simplified format
+ */
+ private static function processTags($tags)
+ {
+ $taglist = [];
+
+ if (empty($tags)) {
+ return [];
+ }
+
+ foreach ($tags as $tag) {
+ if (empty($tag)) {
+ continue;
+ }
+
+ $taglist[] = ['type' => str_replace('as:', '', JsonLD::fetchElement($tag, '@type')),
+ 'href' => JsonLD::fetchElement($tag, 'as:href'),
+ 'name' => JsonLD::fetchElement($tag, 'as:name')];
+ }
+ return $taglist;
+ }
+
+ /**
+ * Convert attachments from JSON-LD format into a simplified format
+ *
+ * @param array $attachments Attachments in JSON-LD format
+ *
+ * @return array with attachmants in a simplified format
+ */
+ private static function processAttachments($attachments)
+ {
+ $attachlist = [];
+
+ if (empty($attachments)) {
+ return [];
+ }
+
+ foreach ($attachments as $attachment) {
+ if (empty($attachment)) {
+ continue;
+ }
+
+ $attachlist[] = ['type' => str_replace('as:', '', JsonLD::fetchElement($attachment, '@type')),
+ 'mediaType' => JsonLD::fetchElement($attachment, 'as:mediaType'),
+ 'name' => JsonLD::fetchElement($attachment, 'as:name'),
+ 'url' => JsonLD::fetchElement($attachment, 'as:url')];
+ }
+ return $attachlist;
+ }
+
+ /**
+ * Fetches data from the object part of an activity
+ *
+ * @param array $object
+ *
+ * @return array
*/
private static function processObject($object)
{
- if (empty($object['id'])) {
+ if (!JsonLD::fetchElement($object, '@id')) {
return false;
}
$object_data = [];
- $object_data['object_type'] = $object['type'];
- $object_data['id'] = $object['id'];
+ $object_data['object_type'] = JsonLD::fetchElement($object, '@type');
+ $object_data['id'] = JsonLD::fetchElement($object, '@id');
- if (!empty($object['inReplyTo'])) {
- $object_data['reply-to-id'] = JsonLD::fetchElement($object, 'inReplyTo', 'id');
- } else {
+ $object_data['reply-to-id'] = JsonLD::fetchElement($object, 'as:inReplyTo');
+
+ if (empty($object_data['reply-to-id'])) {
$object_data['reply-to-id'] = $object_data['id'];
}
- $object_data['published'] = defaults($object, 'published', null);
- $object_data['updated'] = defaults($object, 'updated', $object_data['published']);
+ $object_data['published'] = JsonLD::fetchElement($object, 'as:published', '@value');
+ $object_data['updated'] = JsonLD::fetchElement($object, 'as:updated', '@value');
+
+ if (empty($object_data['updated'])) {
+ $object_data['updated'] = $object_data['published'];
+ }
if (empty($object_data['published']) && !empty($object_data['updated'])) {
$object_data['published'] = $object_data['updated'];
}
- $actor = JsonLD::fetchElement($object, 'attributedTo', 'id');
+ $actor = JsonLD::fetchElement($object, 'as:attributedTo');
if (empty($actor)) {
- $actor = defaults($object, 'actor', null);
- }
-
- $object_data['diaspora:guid'] = defaults($object, 'diaspora:guid', null);
- $object_data['owner'] = $object_data['author'] = $actor;
- $object_data['context'] = defaults($object, 'context', null);
- $object_data['conversation'] = defaults($object, 'conversation', null);
- $object_data['sensitive'] = defaults($object, 'sensitive', null);
- $object_data['name'] = defaults($object, 'title', null);
- $object_data['name'] = defaults($object, 'name', $object_data['name']);
- $object_data['summary'] = defaults($object, 'summary', null);
- $object_data['content'] = defaults($object, 'content', null);
- $object_data['source'] = defaults($object, 'source', null);
- $object_data['location'] = JsonLD::fetchElement($object, 'location', 'name', 'type', 'Place');
- $object_data['attachments'] = defaults($object, 'attachment', null);
- $object_data['tags'] = defaults($object, 'tag', null);
- $object_data['service'] = JsonLD::fetchElement($object, 'instrument', 'name', 'type', 'Service');
- $object_data['alternate-url'] = JsonLD::fetchElement($object, 'url', 'href');
- $object_data['receiver'] = self::getReceivers($object, $object_data['owner']);
+ $actor = JsonLD::fetchElement($object, 'as:actor');
+ }
+
+ $object_data['diaspora:guid'] = JsonLD::fetchElement($object, 'diaspora:guid');
+ $object_data['diaspora:comment'] = JsonLD::fetchElement($object, 'diaspora:comment');
+ $object_data['actor'] = $object_data['author'] = $actor;
+ $object_data['context'] = JsonLD::fetchElement($object, 'as:context');
+ $object_data['conversation'] = JsonLD::fetchElement($object, 'ostatus:conversation');
+ $object_data['sensitive'] = JsonLD::fetchElement($object, 'as:sensitive');
+ $object_data['name'] = JsonLD::fetchElement($object, 'as:name');
+ $object_data['summary'] = JsonLD::fetchElement($object, 'as:summary');
+ $object_data['content'] = JsonLD::fetchElement($object, 'as:content');
+ $object_data['source'] = JsonLD::fetchElement($object, 'as:source', 'as:content', 'as:mediaType', 'text/bbcode');
+ $object_data['location'] = JsonLD::fetchElement($object, 'as:location', 'as:name', '@type', 'as:Place');
+ $object_data['attachments'] = self::processAttachments(JsonLD::fetchElementArray($object, 'as:attachment'));
+ $object_data['tags'] = self::processTags(JsonLD::fetchElementArray($object, 'as:tag'));
+// $object_data['service'] = JsonLD::fetchElement($object, 'instrument', 'name', 'type', 'Service'); // todo
+ $object_data['service'] = null;
+ $object_data['alternate-url'] = JsonLD::fetchElement($object, 'as:url');
+
+ // Special treatment for Hubzilla links
+ if (is_array($object_data['alternate-url'])) {
+ if (!empty($object['as:url'])) {
+ $object_data['alternate-url'] = JsonLD::fetchElement($object['as:url'], 'as:href');
+ } else {
+ $object_data['alternate-url'] = null;
+ }
+ }
+
+ $object_data['receiver'] = self::getReceivers($object, $object_data['actor']);
// Common object data:
*
* To-Do:
*
+ * Missing object fields:
+ * - service (App)
+ * - location
+ *
* Missing object types:
* - Event
*
return [];
}
- $fields = ['name', 'url', 'location', 'about', 'avatar'];
+ $fields = ['name', 'url', 'location', 'about', 'avatar', 'photo'];
$contact = DBA::selectFirst('contact', $fields, ['uid' => $uid, 'self' => true]);
if (!DBA::isResult($contact)) {
return [];
}
+ // On old installations and never changed contacts this might not be filled
+ if (empty($contact['avatar'])) {
+ $contact['avatar'] = $contact['photo'];
+ }
+
$data = ['@context' => ActivityPub::CONTEXT];
$data['id'] = $contact['url'];
$data['diaspora:guid'] = $user['guid'];
{
jsonld_set_document_loader('Friendica\Util\JsonLD::documentLoader');
- $context = (object)['as' => 'https://www.w3.org/ns/activitystreams',
- 'w3sec' => 'https://w3id.org/security',
- 'ostatus' => (object)['@id' => 'http://ostatus.org#', '@type' => '@id'],
+ $context = (object)['as' => 'https://www.w3.org/ns/activitystreams#',
+ 'w3id' => 'https://w3id.org/security#',
'vcard' => (object)['@id' => 'http://www.w3.org/2006/vcard/ns#', '@type' => '@id'],
+ 'ostatus' => (object)['@id' => 'http://ostatus.org#', '@type' => '@id'],
+ 'diaspora' => (object)['@id' => 'https://diasporafoundation.org/ns/', '@type' => '@id'],
+ 'dc' => (object)['@id' => 'http://purl.org/dc/terms/', '@type' => '@id'],
'uuid' => (object)['@id' => 'http://schema.org/identifier', '@type' => '@id']];
$jsonobj = json_decode(json_encode($json, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE));
return json_decode(json_encode($compacted, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE), true);
}
+ /**
+ * @brief Fetches an element array from a JSON array
+ *
+ * @param $array
+ * @param $element
+ * @param $key
+ *
+ * @return fetched element array
+ */
+ public static function fetchElementArray($array, $element, $key = '@id')
+ {
+ if (empty($array)) {
+ return null;
+ }
+
+ if (!isset($array[$element])) {
+ return null;
+ }
+
+ // If it isn't an array yet, make it to one
+ if (!is_int(key($array[$element]))) {
+ $array[$element] = [$array[$element]];
+ }
+
+ $elements = [];
+
+ foreach ($array[$element] as $entry) {
+ if (!is_array($entry)) {
+ $elements[] = $entry;
+ } elseif (!empty($entry[$key])) {
+ $elements[] = $entry[$key];
+ } else {
+ $elements[] = $entry;
+ }
+ }
+
+ return $elements;
+ }
+
/**
* @brief Fetches an element from a JSON array
*
*
* @return fetched element
*/
- public static function fetchElement($array, $element, $key, $type = null, $type_value = null)
+ public static function fetchElement($array, $element, $key = '@id', $type = null, $type_value = null)
{
if (empty($array)) {
- return false;
+ return null;
}
- if (empty($array[$element])) {
- return false;
+ if (!isset($array[$element])) {
+ return null;
}
- if (is_string($array[$element])) {
+ if (!is_array($array[$element])) {
return $array[$element];
}
- if (is_null($type_value)) {
- if (!empty($array[$element][$key])) {
- return $array[$element][$key];
- }
-
- if (!empty($array[$element][0][$key])) {
- return $array[$element][0][$key];
+ if (is_null($type) || is_null($type_value)) {
+ $element_array = self::fetchElementArray($array, $element, $key);
+ if (is_null($element_array)) {
+ return null;
}
- return false;
+ return array_shift($element_array);
}
- if (!empty($array[$element][$key]) && !empty($array[$element][$type]) && ($array[$element][$type] == $type_value)) {
- return $array[$element][$key];
+ $element_array = self::fetchElementArray($array, $element);
+ if (is_null($element_array)) {
+ return null;
}
- /// @todo Add array search
+ foreach ($element_array as $entry) {
+ if (isset($entry[$key]) && isset($entry[$type]) && ($entry[$type] == $type_value)) {
+ return $entry[$key];
+ }
+ }
- return false;
+ return null;
}
}
$inboxes = ActivityPub\Transmitter::fetchTargetInboxesforUser(0);
foreach ($inboxes as $inbox) {
- logger('Account removal for user ' . $uid . ' to ' . $inbox .' via ActivityPub', LOGGER_DEBUG);
+ logger('Account removal for user ' . $item_id . ' to ' . $inbox .' via ActivityPub', LOGGER_DEBUG);
Worker::add(['priority' => $a->queue['priority'], 'created' => $a->queue['created'], 'dont_fork' => true],
- 'APDelivery', Delivery::REMOVAL, '', $inbox, $uid);
+ 'APDelivery', Delivery::REMOVAL, '', $inbox, $item_id);
}
return;
class ArrayCacheDriverTest extends MemoryCacheTest
{
- /**
- * @var \Friendica\Core\Cache\IMemoryCacheDriver
- */
- private $cache;
-
protected function getInstance()
{
$this->cache = new ArrayCache();
namespace Friendica\Test\src\Core\Cache;
+use Friendica\Core\Cache\MemcachedCacheDriver;
use Friendica\Core\Config;
use Friendica\Test\DatabaseTest;
use Friendica\Util\DateTimeFormat;
*/
protected $instance;
+ /**
+ * @var \Friendica\Core\Cache\IMemoryCacheDriver
+ */
+ protected $cache;
+
+
abstract protected function getInstance();
protected function setUp()
Config::set('system', 'throttle_limit_week', 100);
Config::set('system', 'throttle_limit_month', 100);
Config::set('system', 'theme', 'system_theme');
+
+ $this->instance->clear(false);
}
/**
$received = $this->instance->get('objVal');
$this->assertEquals($value, $received, 'Value type changed from ' . gettype($value) . ' to ' . gettype($received));
}
+
+ /**
+ * @small
+ */
+ public function testGetAllKeys() {
+ if ($this->cache instanceof MemcachedCacheDriver) {
+ $this->markTestSkipped('Memcached doesn\'t support getAllKeys anymore');
+ }
+
+ $this->assertTrue($this->instance->set('value1', 'test'));
+ $this->assertTrue($this->instance->set('value2', 'test'));
+ $this->assertTrue($this->instance->set('test_value3', 'test'));
+
+ $list = $this->instance->getAllKeys();
+
+ $this->assertContains('value1', $list);
+ $this->assertContains('value2', $list);
+ $this->assertContains('test_value3', $list);
+
+ $list = $this->instance->getAllKeys('test');
+
+ $this->assertContains('test_value3', $list);
+ }
}
class DatabaseCacheDriverTest extends CacheTest
{
- /**
- * @var \Friendica\Core\Cache\IMemoryCacheDriver
- */
- private $cache;
-
protected function getInstance()
{
$this->cache = CacheDriverFactory::create('database');
*/
class MemcacheCacheDriverTest extends MemoryCacheTest
{
- /**
- * @var \Friendica\Core\Cache\IMemoryCacheDriver
- */
- private $cache;
-
protected function getInstance()
{
$this->cache = CacheDriverFactory::create('memcache');
*/
class MemcachedCacheDriverTest extends MemoryCacheTest
{
- /**
- * @var \Friendica\Core\Cache\IMemoryCacheDriver
- */
- private $cache;
-
protected function getInstance()
{
$this->cache = CacheDriverFactory::create('memcached');
*/
class RedisCacheDriverTest extends MemoryCacheTest
{
- /**
- * @var \Friendica\Core\Cache\IMemoryCacheDriver
- */
- private $cache;
-
protected function getInstance()
{
$this->cache = CacheDriverFactory::create('redis');
projects / friendica.git / commitdiff