mirror of
https://github.com/friendica/friendica
synced 2025-04-29 09:44:23 +02:00
Merge remote-tracking branch 'upstream/develop' into issue-3229
This commit is contained in:
Michael
commit
bfbce16d0b
72 changed files with 2620 additions and 1764 deletions
|
|
@ -12,17 +12,17 @@ use Friendica\Core\Hook;
|
|||
use Friendica\Core\L10n;
|
||||
use Friendica\Core\Logger;
|
||||
use Friendica\Core\Protocol;
|
||||
use Friendica\Core\System;
|
||||
use Friendica\Core\Session;
|
||||
use Friendica\Core\System;
|
||||
use Friendica\Core\Worker;
|
||||
use Friendica\Database\DBA;
|
||||
use Friendica\Network\Probe;
|
||||
use Friendica\Object\Image;
|
||||
use Friendica\Protocol\Activity;
|
||||
use Friendica\Protocol\ActivityPub;
|
||||
use Friendica\Protocol\DFRN;
|
||||
use Friendica\Protocol\Diaspora;
|
||||
use Friendica\Protocol\OStatus;
|
||||
use Friendica\Protocol\PortableContact;
|
||||
use Friendica\Protocol\Salmon;
|
||||
use Friendica\Util\DateTimeFormat;
|
||||
use Friendica\Util\Network;
|
||||
|
|
@ -828,7 +828,7 @@ class Contact extends BaseObject
|
|||
} elseif (in_array($protocol, [Protocol::OSTATUS, Protocol::DFRN])) {
|
||||
// create an unfollow slap
|
||||
$item = [];
|
||||
$item['verb'] = NAMESPACE_OSTATUS . "/unfollow";
|
||||
$item['verb'] = Activity::O_UNFOLLOW;
|
||||
$item['follow'] = $contact["url"];
|
||||
$item['body'] = '';
|
||||
$item['title'] = '';
|
||||
|
|
@ -2366,7 +2366,7 @@ class Contact extends BaseObject
|
|||
if (in_array($protocol, [Protocol::OSTATUS, Protocol::DFRN])) {
|
||||
// create a follow slap
|
||||
$item = [];
|
||||
$item['verb'] = ACTIVITY_FOLLOW;
|
||||
$item['verb'] = Activity::FOLLOW;
|
||||
$item['follow'] = $contact["url"];
|
||||
$item['body'] = '';
|
||||
$item['title'] = '';
|
||||
|
|
@ -2568,7 +2568,7 @@ class Contact extends BaseObject
|
|||
'source_name' => ((strlen(stripslashes($contact_record['name']))) ? stripslashes($contact_record['name']) : L10n::t('[Name Withheld]')),
|
||||
'source_link' => $contact_record['url'],
|
||||
'source_photo' => $contact_record['photo'],
|
||||
'verb' => ($sharing ? ACTIVITY_FRIEND : ACTIVITY_FOLLOW),
|
||||
'verb' => ($sharing ? Activity::FRIEND : Activity::FOLLOW),
|
||||
'otype' => 'intro'
|
||||
]);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -14,6 +14,7 @@ use Friendica\Core\PConfig;
|
|||
use Friendica\Core\Renderer;
|
||||
use Friendica\Core\System;
|
||||
use Friendica\Database\DBA;
|
||||
use Friendica\Protocol\Activity;
|
||||
use Friendica\Util\DateTimeFormat;
|
||||
use Friendica\Util\Map;
|
||||
use Friendica\Util\Strings;
|
||||
|
|
@ -303,7 +304,7 @@ class Event extends BaseObject
|
|||
|
||||
$item = Item::selectFirst(['id'], ['event-id' => $event['id'], 'uid' => $event['uid']]);
|
||||
if (DBA::isResult($item)) {
|
||||
$object = '<object><type>' . XML::escape(ACTIVITY_OBJ_EVENT) . '</type><title></title><id>' . XML::escape($event['uri']) . '</id>';
|
||||
$object = '<object><type>' . XML::escape(Activity\ObjectType::EVENT) . '</type><title></title><id>' . XML::escape($event['uri']) . '</id>';
|
||||
$object .= '<content>' . XML::escape(self::getBBCode($event)) . '</content>';
|
||||
$object .= '</object>' . "\n";
|
||||
|
||||
|
|
@ -350,13 +351,13 @@ class Event extends BaseObject
|
|||
$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_OBJ_EVENT;
|
||||
$item_arr['verb'] = Activity::POST;
|
||||
$item_arr['object-type'] = Activity\ObjectType::EVENT;
|
||||
$item_arr['origin'] = $event['cid'] === 0 ? 1 : 0;
|
||||
$item_arr['body'] = self::getBBCode($event);
|
||||
$item_arr['event-id'] = $event['id'];
|
||||
|
||||
$item_arr['object'] = '<object><type>' . XML::escape(ACTIVITY_OBJ_EVENT) . '</type><title></title><id>' . XML::escape($event['uri']) . '</id>';
|
||||
$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";
|
||||
|
||||
|
|
@ -911,7 +912,7 @@ class Event extends BaseObject
|
|||
$tpl = Renderer::getMarkupTemplate('event_stream_item.tpl');
|
||||
$return = Renderer::replaceMacros($tpl, [
|
||||
'$id' => $item['event-id'],
|
||||
'$title' => prepare_text($item['event-summary']),
|
||||
'$title' => BBCode::convert($item['event-summary']),
|
||||
'$dtstart_label' => L10n::t('Starts:'),
|
||||
'$dtstart_title' => $dtstart_title,
|
||||
'$dtstart_dt' => $dtstart_dt,
|
||||
|
|
@ -929,7 +930,7 @@ class Event extends BaseObject
|
|||
'$author_name' => $item['author-name'],
|
||||
'$author_link' => $profile_link,
|
||||
'$author_avatar' => $item['author-avatar'],
|
||||
'$description' => prepare_text($item['event-desc']),
|
||||
'$description' => BBCode::convert($item['event-desc']),
|
||||
'$location_label' => L10n::t('Location:'),
|
||||
'$show_map_label' => L10n::t('Show map'),
|
||||
'$hide_map_label' => L10n::t('Hide map'),
|
||||
|
|
@ -979,7 +980,7 @@ class Event extends BaseObject
|
|||
}
|
||||
}
|
||||
|
||||
$location['name'] = prepare_text($location['name']);
|
||||
$location['name'] = BBCode::convert($location['name']);
|
||||
|
||||
// Construct the map HTML.
|
||||
if (isset($location['address'])) {
|
||||
|
|
|
|||
|
|
@ -859,7 +859,9 @@ class GContact
|
|||
/**
|
||||
* Update a global contact via an ActivityPub Outbox
|
||||
*
|
||||
* @param string $data Probing result
|
||||
* @param string $feed
|
||||
* @param array $data Probing result
|
||||
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
|
||||
*/
|
||||
private static function updateFromOutbox(string $feed, array $data)
|
||||
{
|
||||
|
|
@ -872,6 +874,9 @@ class GContact
|
|||
$items = $outbox['orderedItems'];
|
||||
} elseif (!empty($outbox['first']['orderedItems'])) {
|
||||
$items = $outbox['first']['orderedItems'];
|
||||
} elseif (!empty($outbox['first']['href'])) {
|
||||
self::updateFromOutbox($outbox['first']['href'], $data);
|
||||
return;
|
||||
} elseif (!empty($outbox['first'])) {
|
||||
self::updateFromOutbox($outbox['first'], $data);
|
||||
return;
|
||||
|
|
|
|||
|
|
@ -17,13 +17,15 @@ use Friendica\Core\Logger;
|
|||
use Friendica\Core\PConfig;
|
||||
use Friendica\Core\Protocol;
|
||||
use Friendica\Core\Renderer;
|
||||
use Friendica\Core\System;
|
||||
use Friendica\Core\Session;
|
||||
use Friendica\Core\System;
|
||||
use Friendica\Core\Worker;
|
||||
use Friendica\Database\DBA;
|
||||
use Friendica\Protocol\Activity;
|
||||
use Friendica\Protocol\ActivityPub;
|
||||
use Friendica\Protocol\Diaspora;
|
||||
use Friendica\Protocol\OStatus;
|
||||
use Friendica\Util\ACLFormatter;
|
||||
use Friendica\Util\DateTimeFormat;
|
||||
use Friendica\Util\Map;
|
||||
use Friendica\Util\Network;
|
||||
|
|
@ -95,7 +97,11 @@ class Item extends BaseObject
|
|||
|
||||
// Never reorder or remove entries from this list. Just add new ones at the end, if needed.
|
||||
// The item-activity table only stores the index and needs this array to know the matching activity.
|
||||
const ACTIVITIES = [ACTIVITY_LIKE, ACTIVITY_DISLIKE, ACTIVITY_ATTEND, ACTIVITY_ATTENDNO, ACTIVITY_ATTENDMAYBE, ACTIVITY_FOLLOW, ACTIVITY2_ANNOUNCE];
|
||||
const ACTIVITIES = [
|
||||
Activity::LIKE, Activity::DISLIKE,
|
||||
Activity::ATTEND, Activity::ATTENDNO, Activity::ATTENDMAYBE,
|
||||
Activity::FOLLOW,
|
||||
Activity::ANNOUNCE];
|
||||
|
||||
private static $legacy_mode = null;
|
||||
|
||||
|
|
@ -208,9 +214,9 @@ class Item extends BaseObject
|
|||
$row['object'] = '';
|
||||
}
|
||||
if (array_key_exists('object-type', $row)) {
|
||||
$row['object-type'] = ACTIVITY_OBJ_NOTE;
|
||||
$row['object-type'] = Activity\ObjectType::NOTE;
|
||||
}
|
||||
} elseif (array_key_exists('verb', $row) && in_array($row['verb'], ['', ACTIVITY_POST, ACTIVITY_SHARE])) {
|
||||
} elseif (array_key_exists('verb', $row) && in_array($row['verb'], ['', Activity::POST, Activity::SHARE])) {
|
||||
// Posts don't have an object or target - but having tags or files.
|
||||
// We safe some performance by building tag and file strings only here.
|
||||
// We remove object and target since they aren't used for this type.
|
||||
|
|
@ -222,7 +228,7 @@ class Item extends BaseObject
|
|||
}
|
||||
}
|
||||
|
||||
if (!array_key_exists('verb', $row) || in_array($row['verb'], ['', ACTIVITY_POST, ACTIVITY_SHARE])) {
|
||||
if (!array_key_exists('verb', $row) || in_array($row['verb'], ['', Activity::POST, Activity::SHARE])) {
|
||||
// Build the tag string out of the term entries
|
||||
if (array_key_exists('tag', $row) && empty($row['tag'])) {
|
||||
$row['tag'] = Term::tagTextFromItemId($row['internal-iid']);
|
||||
|
|
@ -1151,14 +1157,14 @@ class Item extends BaseObject
|
|||
|
||||
private static function deleteTagsFromItem($item)
|
||||
{
|
||||
if (($item["verb"] != ACTIVITY_TAG) || ($item["object-type"] != ACTIVITY_OBJ_TAGTERM)) {
|
||||
if (($item["verb"] != Activity::TAG) || ($item["object-type"] != Activity\ObjectType::TAGTERM)) {
|
||||
return;
|
||||
}
|
||||
|
||||
$xo = XML::parseString($item["object"], false);
|
||||
$xt = XML::parseString($item["target"], false);
|
||||
|
||||
if ($xt->type != ACTIVITY_OBJ_NOTE) {
|
||||
if ($xt->type != Activity\ObjectType::NOTE) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -1357,13 +1363,16 @@ class Item extends BaseObject
|
|||
$item['parent-uri'] = $item['thr-parent'];
|
||||
}
|
||||
|
||||
/** @var Activity $activity */
|
||||
$activity = self::getClass(Activity::class);
|
||||
|
||||
if (isset($item['gravity'])) {
|
||||
$item['gravity'] = intval($item['gravity']);
|
||||
} elseif ($item['parent-uri'] === $item['uri']) {
|
||||
$item['gravity'] = GRAVITY_PARENT;
|
||||
} elseif (activity_match($item['verb'], ACTIVITY_POST)) {
|
||||
} elseif ($activity->match($item['verb'], Activity::POST)) {
|
||||
$item['gravity'] = GRAVITY_COMMENT;
|
||||
} elseif (activity_match($item['verb'], ACTIVITY_FOLLOW)) {
|
||||
} elseif ($activity->match($item['verb'], Activity::FOLLOW)) {
|
||||
$item['gravity'] = GRAVITY_ACTIVITY;
|
||||
} else {
|
||||
$item['gravity'] = GRAVITY_UNKNOWN; // Should not happen
|
||||
|
|
@ -1559,14 +1568,14 @@ class Item extends BaseObject
|
|||
return 0;
|
||||
}
|
||||
|
||||
if ($item['verb'] == ACTIVITY_FOLLOW) {
|
||||
if ($item['verb'] == Activity::FOLLOW) {
|
||||
if (!$item['origin'] && ($item['author-id'] == Contact::getPublicIdByUserId($uid))) {
|
||||
// Our own follow request can be relayed to us. We don't store it to avoid notification chaos.
|
||||
Logger::log("Follow: Don't store not origin follow request from us for " . $item['parent-uri'], Logger::DEBUG);
|
||||
return 0;
|
||||
}
|
||||
|
||||
$condition = ['verb' => ACTIVITY_FOLLOW, 'uid' => $item['uid'],
|
||||
$condition = ['verb' => Activity::FOLLOW, 'uid' => $item['uid'],
|
||||
'parent-uri' => $item['parent-uri'], 'author-id' => $item['author-id']];
|
||||
if (self::exists($condition)) {
|
||||
// It happens that we receive multiple follow requests by the same author - we only store one.
|
||||
|
|
@ -1673,7 +1682,7 @@ class Item extends BaseObject
|
|||
}
|
||||
}
|
||||
|
||||
if (stristr($item['verb'], ACTIVITY_POKE)) {
|
||||
if (stristr($item['verb'], Activity::POKE)) {
|
||||
$notify_type = Delivery::POKE;
|
||||
}
|
||||
|
||||
|
|
@ -2686,7 +2695,7 @@ class Item extends BaseObject
|
|||
}
|
||||
|
||||
// Only forward posts
|
||||
if ($datarray["verb"] != ACTIVITY_POST) {
|
||||
if ($datarray["verb"] != Activity::POST) {
|
||||
Logger::log('No post', Logger::DEBUG);
|
||||
return false;
|
||||
}
|
||||
|
|
@ -2892,10 +2901,13 @@ class Item extends BaseObject
|
|||
*/
|
||||
public static function enumeratePermissions(array $obj, bool $check_dead = false)
|
||||
{
|
||||
$allow_people = expand_acl($obj['allow_cid']);
|
||||
$allow_groups = Group::expand($obj['uid'], expand_acl($obj['allow_gid']), $check_dead);
|
||||
$deny_people = expand_acl($obj['deny_cid']);
|
||||
$deny_groups = Group::expand($obj['uid'], expand_acl($obj['deny_gid']), $check_dead);
|
||||
/** @var ACLFormatter $aclFormater */
|
||||
$aclFormater = self::getClass(ACLFormatter::class);
|
||||
|
||||
$allow_people = $aclFormater->expand($obj['allow_cid']);
|
||||
$allow_groups = Group::expand($obj['uid'], $aclFormater->expand($obj['allow_gid']), $check_dead);
|
||||
$deny_people = $aclFormater->expand($obj['deny_cid']);
|
||||
$deny_groups = Group::expand($obj['uid'], $aclFormater->expand($obj['deny_gid']), $check_dead);
|
||||
$recipients = array_unique(array_merge($allow_people, $allow_groups));
|
||||
$deny = array_unique(array_merge($deny_people, $deny_groups));
|
||||
$recipients = array_diff($recipients, $deny);
|
||||
|
|
@ -3036,23 +3048,23 @@ class Item extends BaseObject
|
|||
switch ($verb) {
|
||||
case 'like':
|
||||
case 'unlike':
|
||||
$activity = ACTIVITY_LIKE;
|
||||
$activity = Activity::LIKE;
|
||||
break;
|
||||
case 'dislike':
|
||||
case 'undislike':
|
||||
$activity = ACTIVITY_DISLIKE;
|
||||
$activity = Activity::DISLIKE;
|
||||
break;
|
||||
case 'attendyes':
|
||||
case 'unattendyes':
|
||||
$activity = ACTIVITY_ATTEND;
|
||||
$activity = Activity::ATTEND;
|
||||
break;
|
||||
case 'attendno':
|
||||
case 'unattendno':
|
||||
$activity = ACTIVITY_ATTENDNO;
|
||||
$activity = Activity::ATTENDNO;
|
||||
break;
|
||||
case 'attendmaybe':
|
||||
case 'unattendmaybe':
|
||||
$activity = ACTIVITY_ATTENDMAYBE;
|
||||
$activity = Activity::ATTENDMAYBE;
|
||||
break;
|
||||
default:
|
||||
Logger::log('like: unknown verb ' . $verb . ' for item ' . $item_id);
|
||||
|
|
@ -3060,7 +3072,7 @@ class Item extends BaseObject
|
|||
}
|
||||
|
||||
// Enable activity toggling instead of on/off
|
||||
$event_verb_flag = $activity === ACTIVITY_ATTEND || $activity === ACTIVITY_ATTENDNO || $activity === ACTIVITY_ATTENDMAYBE;
|
||||
$event_verb_flag = $activity === Activity::ATTEND || $activity === Activity::ATTENDNO || $activity === Activity::ATTENDMAYBE;
|
||||
|
||||
Logger::log('like: verb ' . $verb . ' item ' . $item_id);
|
||||
|
||||
|
|
@ -3114,7 +3126,7 @@ class Item extends BaseObject
|
|||
// event participation are essentially radio toggles. If you make a subsequent choice,
|
||||
// we need to eradicate your first choice.
|
||||
if ($event_verb_flag) {
|
||||
$verbs = [ACTIVITY_ATTEND, ACTIVITY_ATTENDNO, ACTIVITY_ATTENDMAYBE];
|
||||
$verbs = [Activity::ATTEND, Activity::ATTENDNO, Activity::ATTENDMAYBE];
|
||||
|
||||
// Translate to the index based activity index
|
||||
$activities = [];
|
||||
|
|
@ -3144,7 +3156,7 @@ class Item extends BaseObject
|
|||
return true;
|
||||
}
|
||||
|
||||
$objtype = $item['resource-id'] ? ACTIVITY_OBJ_IMAGE : ACTIVITY_OBJ_NOTE;
|
||||
$objtype = $item['resource-id'] ? Activity\ObjectType::IMAGE : Activity\ObjectType::NOTE;
|
||||
|
||||
$new_item = [
|
||||
'guid' => System::createUUID(),
|
||||
|
|
@ -3310,7 +3322,7 @@ class Item extends BaseObject
|
|||
return L10n::t('event');
|
||||
} elseif (!empty($item['resource-id'])) {
|
||||
return L10n::t('photo');
|
||||
} elseif (!empty($item['verb']) && $item['verb'] !== ACTIVITY_POST) {
|
||||
} elseif (!empty($item['verb']) && $item['verb'] !== Activity::POST) {
|
||||
return L10n::t('activity');
|
||||
} elseif ($item['id'] != $item['parent']) {
|
||||
return L10n::t('comment');
|
||||
|
|
@ -3342,10 +3354,9 @@ class Item extends BaseObject
|
|||
|| $rendered_hash != hash("md5", $item["body"])
|
||||
|| Config::get("system", "ignore_cache")
|
||||
) {
|
||||
$a = self::getApp();
|
||||
redir_private_images($a, $item);
|
||||
self::addRedirToImageTags($item);
|
||||
|
||||
$item["rendered-html"] = prepare_text($item["body"]);
|
||||
$item["rendered-html"] = BBCode::convert($item["body"]);
|
||||
$item["rendered-hash"] = hash("md5", $item["body"]);
|
||||
|
||||
$hook_data = ['item' => $item, 'rendered-html' => $item['rendered-html'], 'rendered-hash' => $item['rendered-hash']];
|
||||
|
|
@ -3378,6 +3389,31 @@ class Item extends BaseObject
|
|||
$item["body"] = $body;
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Find any non-embedded images in private items and add redir links to them
|
||||
*
|
||||
* @param array &$item The field array of an item row
|
||||
*/
|
||||
private static function addRedirToImageTags(array &$item)
|
||||
{
|
||||
$app = self::getApp();
|
||||
|
||||
$matches = [];
|
||||
$cnt = preg_match_all('|\[img\](http[^\[]*?/photo/[a-fA-F0-9]+?(-[0-9]\.[\w]+?)?)\[\/img\]|', $item['body'], $matches, PREG_SET_ORDER);
|
||||
if ($cnt) {
|
||||
foreach ($matches as $mtch) {
|
||||
if (strpos($mtch[1], '/redir') !== false) {
|
||||
continue;
|
||||
}
|
||||
|
||||
if ((local_user() == $item['uid']) && ($item['private'] == 1) && ($item['contact-id'] != $app->contact['id']) && ($item['network'] == Protocol::DFRN)) {
|
||||
$img_url = 'redir/' . $item['contact-id'] . '?url=' . urlencode($mtch[1]);
|
||||
$item['body'] = str_replace($mtch[0], '[img]' . $img_url . '[/img]', $item['body']);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Given an item array, convert the body element from bbcode to html and add smilie icons.
|
||||
* If attach is true, also add icons for item attachments.
|
||||
|
|
@ -3400,7 +3436,7 @@ class Item extends BaseObject
|
|||
|
||||
// In order to provide theme developers more possibilities, event items
|
||||
// are treated differently.
|
||||
if ($item['object-type'] === ACTIVITY_OBJ_EVENT && isset($item['event-id'])) {
|
||||
if ($item['object-type'] === Activity\ObjectType::EVENT && isset($item['event-id'])) {
|
||||
$ev = Event::getItemHTML($item);
|
||||
return $ev;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,6 +13,7 @@ use Friendica\Model\Item;
|
|||
use Friendica\Model\Photo;
|
||||
use Friendica\Database\DBA;
|
||||
use Friendica\Network\Probe;
|
||||
use Friendica\Protocol\Activity;
|
||||
use Friendica\Util\DateTimeFormat;
|
||||
use Friendica\Worker\Delivery;
|
||||
|
||||
|
|
@ -80,7 +81,7 @@ class Mail
|
|||
'source_name' => $msg['from-name'],
|
||||
'source_link' => $msg['from-url'],
|
||||
'source_photo' => $msg['from-photo'],
|
||||
'verb' => ACTIVITY_POST,
|
||||
'verb' => Activity::POST,
|
||||
'otype' => 'mail'
|
||||
];
|
||||
|
||||
|
|
|
|||
775
src/Model/Notify.php
Normal file
775
src/Model/Notify.php
Normal file
|
|
@ -0,0 +1,775 @@
|
|||
<?php
|
||||
|
||||
namespace Friendica\Model;
|
||||
|
||||
use Exception;
|
||||
use Friendica\App;
|
||||
use Friendica\BaseObject;
|
||||
use Friendica\Content\Text\BBCode;
|
||||
use Friendica\Content\Text\HTML;
|
||||
use Friendica\Core\Config\PConfiguration;
|
||||
use Friendica\Core\L10n\L10n;
|
||||
use Friendica\Core\Protocol;
|
||||
use Friendica\Core\System;
|
||||
use Friendica\Database\Database;
|
||||
use Friendica\Protocol\Activity;
|
||||
use Friendica\Util\DateTimeFormat;
|
||||
use Friendica\Util\Proxy as ProxyUtils;
|
||||
use Friendica\Util\Temporal;
|
||||
use Friendica\Util\XML;
|
||||
use ImagickException;
|
||||
use Psr\Log\LoggerInterface;
|
||||
use Friendica\Network\HTTPException;
|
||||
|
||||
/**
|
||||
* @brief Methods for read and write notifications from/to database
|
||||
* or for formatting notifications
|
||||
*/
|
||||
final class Notify extends BaseObject
|
||||
{
|
||||
/** @var int The default limit of notifies per page */
|
||||
const DEFAULT_PAGE_LIMIT = 80;
|
||||
|
||||
const NETWORK = 'network';
|
||||
const SYSTEM = 'system';
|
||||
const PERSONAL = 'personal';
|
||||
const HOME = 'home';
|
||||
const INTRO = 'intro';
|
||||
|
||||
/** @var array Array of URL parameters */
|
||||
const URL_TYPES = [
|
||||
self::NETWORK => 'network',
|
||||
self::SYSTEM => 'system',
|
||||
self::HOME => 'home',
|
||||
self::PERSONAL => 'personal',
|
||||
self::INTRO => 'intros',
|
||||
];
|
||||
|
||||
/** @var array Array of the allowed notifies and their printable name */
|
||||
const PRINT_TYPES = [
|
||||
self::NETWORK => 'Network',
|
||||
self::SYSTEM => 'System',
|
||||
self::HOME => 'Home',
|
||||
self::PERSONAL => 'Personal',
|
||||
self::INTRO => 'Introductions',
|
||||
];
|
||||
|
||||
/** @var array The array of access keys for notify pages */
|
||||
const ACCESS_KEYS = [
|
||||
self::NETWORK => 'w',
|
||||
self::SYSTEM => 'y',
|
||||
self::HOME => 'h',
|
||||
self::PERSONAL => 'r',
|
||||
self::INTRO => 'i',
|
||||
];
|
||||
|
||||
/** @var Database */
|
||||
private $dba;
|
||||
/** @var L10n */
|
||||
private $l10n;
|
||||
/** @var App\Arguments */
|
||||
private $args;
|
||||
/** @var App\BaseURL */
|
||||
private $baseUrl;
|
||||
/** @var PConfiguration */
|
||||
private $pConfig;
|
||||
/** @var LoggerInterface */
|
||||
private $logger;
|
||||
|
||||
public function __construct(Database $dba, L10n $l10n, App\Arguments $args, App\BaseURL $baseUrl,
|
||||
PConfiguration $pConfig, LoggerInterface $logger)
|
||||
{
|
||||
$this->dba = $dba;
|
||||
$this->l10n = $l10n;
|
||||
$this->args = $args;
|
||||
$this->baseUrl = $baseUrl;
|
||||
$this->pConfig = $pConfig;
|
||||
$this->logger = $logger;
|
||||
}
|
||||
|
||||
/**
|
||||
* Set some extra properties to note array from db:
|
||||
* - timestamp as int in default TZ
|
||||
* - date_rel : relative date string
|
||||
* - msg_html: message as html string
|
||||
* - msg_plain: message as plain text string
|
||||
*
|
||||
* @param array $notes array of note arrays from db
|
||||
*
|
||||
* @return array Copy of input array with added properties
|
||||
*
|
||||
* @throws Exception
|
||||
*/
|
||||
private function setExtra(array $notes)
|
||||
{
|
||||
$retNotes = [];
|
||||
foreach ($notes as $note) {
|
||||
$local_time = DateTimeFormat::local($note['date']);
|
||||
$note['timestamp'] = strtotime($local_time);
|
||||
$note['date_rel'] = Temporal::getRelativeDate($note['date']);
|
||||
$note['msg_html'] = BBCode::convert($note['msg'], false);
|
||||
$note['msg_plain'] = explode("\n", trim(HTML::toPlaintext($note['msg_html'], 0)))[0];
|
||||
|
||||
$retNotes[] = $note;
|
||||
}
|
||||
return $retNotes;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get all notifications for local_user()
|
||||
*
|
||||
* @param array $filter optional Array "column name"=>value: filter query by columns values
|
||||
* @param array $order optional Array to order by
|
||||
* @param string $limit optional Query limits
|
||||
*
|
||||
* @return array|bool of results or false on errors
|
||||
* @throws Exception
|
||||
*/
|
||||
public function getAll(array $filter = [], array $order = ['date' => 'DESC'], string $limit = "")
|
||||
{
|
||||
$params = [];
|
||||
|
||||
$params['order'] = $order;
|
||||
|
||||
if (!empty($limit)) {
|
||||
$params['limit'] = $limit;
|
||||
}
|
||||
|
||||
$dbFilter = array_merge($filter, ['uid' => local_user()]);
|
||||
|
||||
$stmtNotifies = $this->dba->select('notify', [], $dbFilter, $params);
|
||||
|
||||
if ($this->dba->isResult($stmtNotifies)) {
|
||||
return $this->setExtra($this->dba->toArray($stmtNotifies));
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get one note for local_user() by $id value
|
||||
*
|
||||
* @param int $id identity
|
||||
*
|
||||
* @return array note values or null if not found
|
||||
* @throws Exception
|
||||
*/
|
||||
public function getByID(int $id)
|
||||
{
|
||||
$stmtNotify = $this->dba->selectFirst('notify', [], ['id' => $id, 'uid' => local_user()]);
|
||||
if ($this->dba->isResult($stmtNotify)) {
|
||||
return $this->setExtra([$stmtNotify])[0];
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief set seen state of $note of local_user()
|
||||
*
|
||||
* @param array $note note array
|
||||
* @param bool $seen optional true or false, default true
|
||||
*
|
||||
* @return bool true on success, false on errors
|
||||
* @throws Exception
|
||||
*/
|
||||
public function setSeen(array $note, bool $seen = true)
|
||||
{
|
||||
return $this->dba->update('notify', ['seen' => $seen], [
|
||||
'(`link` = ? OR (`parent` != 0 AND `parent` = ? AND `otype` = ?)) AND `uid` = ?',
|
||||
$note['link'],
|
||||
$note['parent'],
|
||||
$note['otype'],
|
||||
local_user()
|
||||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Set seen state of all notifications of local_user()
|
||||
*
|
||||
* @param bool $seen optional true or false. default true
|
||||
*
|
||||
* @return bool true on success, false on error
|
||||
* @throws Exception
|
||||
*/
|
||||
public function setAllSeen(bool $seen = true)
|
||||
{
|
||||
return $this->dba->update('notify', ['seen' => $seen], ['uid' => local_user()]);
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief List of pages for the Notifications TabBar
|
||||
*
|
||||
* @return array with with notifications TabBar data
|
||||
* @throws Exception
|
||||
*/
|
||||
public function getTabs()
|
||||
{
|
||||
$selected = $this->args->get(1, '');
|
||||
|
||||
$tabs = [];
|
||||
|
||||
foreach (self::URL_TYPES as $type => $url) {
|
||||
$tabs[] = [
|
||||
'label' => $this->l10n->t(self::PRINT_TYPES[$type]),
|
||||
'url' => 'notifications/' . $url,
|
||||
'sel' => (($selected == $url) ? 'active' : ''),
|
||||
'id' => $type . '-tab',
|
||||
'accesskey' => self::ACCESS_KEYS[$type],
|
||||
];
|
||||
}
|
||||
|
||||
return $tabs;
|
||||
}
|
||||
|
||||
/**
|
||||
* Format the notification query in an usable array
|
||||
*
|
||||
* @param array $notifies The array from the db query
|
||||
* @param string $ident The notifications identifier (e.g. network)
|
||||
*
|
||||
* @return array
|
||||
* string 'label' => The type of the notification
|
||||
* string 'link' => URL to the source
|
||||
* string 'image' => The avatar image
|
||||
* string 'url' => The profile url of the contact
|
||||
* string 'text' => The notification text
|
||||
* string 'when' => The date of the notification
|
||||
* string 'ago' => T relative date of the notification
|
||||
* bool 'seen' => Is the notification marked as "seen"
|
||||
* @throws Exception
|
||||
*/
|
||||
private function formatList(array $notifies, string $ident = "")
|
||||
{
|
||||
$formattedNotifies = [];
|
||||
|
||||
foreach ($notifies as $notify) {
|
||||
// Because we use different db tables for the notification query
|
||||
// we have sometimes $notify['unseen'] and sometimes $notify['seen].
|
||||
// So we will have to transform $notify['unseen']
|
||||
if (array_key_exists('unseen', $notify)) {
|
||||
$notify['seen'] = ($notify['unseen'] > 0 ? false : true);
|
||||
}
|
||||
|
||||
// For feed items we use the user's contact, since the avatar is mostly self choosen.
|
||||
if (!empty($notify['network']) && $notify['network'] == Protocol::FEED) {
|
||||
$notify['author-avatar'] = $notify['contact-avatar'];
|
||||
}
|
||||
|
||||
// Depending on the identifier of the notification we need to use different defaults
|
||||
switch ($ident) {
|
||||
case self::SYSTEM:
|
||||
$default_item_label = 'notify';
|
||||
$default_item_link = $this->baseUrl->get(true) . '/notify/view/' . $notify['id'];
|
||||
$default_item_image = ProxyUtils::proxifyUrl($notify['photo'], false, ProxyUtils::SIZE_MICRO);
|
||||
$default_item_url = $notify['url'];
|
||||
$default_item_text = strip_tags(BBCode::convert($notify['msg']));
|
||||
$default_item_when = DateTimeFormat::local($notify['date'], 'r');
|
||||
$default_item_ago = Temporal::getRelativeDate($notify['date']);
|
||||
break;
|
||||
|
||||
case self::HOME:
|
||||
$default_item_label = 'comment';
|
||||
$default_item_link = $this->baseUrl->get(true) . '/display/' . $notify['parent-guid'];
|
||||
$default_item_image = ProxyUtils::proxifyUrl($notify['author-avatar'], false, ProxyUtils::SIZE_MICRO);
|
||||
$default_item_url = $notify['author-link'];
|
||||
$default_item_text = $this->l10n->t("%s commented on %s's post", $notify['author-name'], $notify['parent-author-name']);
|
||||
$default_item_when = DateTimeFormat::local($notify['created'], 'r');
|
||||
$default_item_ago = Temporal::getRelativeDate($notify['created']);
|
||||
break;
|
||||
|
||||
default:
|
||||
$default_item_label = (($notify['id'] == $notify['parent']) ? 'post' : 'comment');
|
||||
$default_item_link = $this->baseUrl->get(true) . '/display/' . $notify['parent-guid'];
|
||||
$default_item_image = ProxyUtils::proxifyUrl($notify['author-avatar'], false, ProxyUtils::SIZE_MICRO);
|
||||
$default_item_url = $notify['author-link'];
|
||||
$default_item_text = (($notify['id'] == $notify['parent'])
|
||||
? $this->l10n->t("%s created a new post", $notify['author-name'])
|
||||
: $this->l10n->t("%s commented on %s's post", $notify['author-name'], $notify['parent-author-name']));
|
||||
$default_item_when = DateTimeFormat::local($notify['created'], 'r');
|
||||
$default_item_ago = Temporal::getRelativeDate($notify['created']);
|
||||
}
|
||||
|
||||
// Transform the different types of notification in an usable array
|
||||
switch ($notify['verb']) {
|
||||
case Activity::LIKE:
|
||||
$formattedNotify = [
|
||||
'label' => 'like',
|
||||
'link' => $this->baseUrl->get(true) . '/display/' . $notify['parent-guid'],
|
||||
'image' => ProxyUtils::proxifyUrl($notify['author-avatar'], false, ProxyUtils::SIZE_MICRO),
|
||||
'url' => $notify['author-link'],
|
||||
'text' => $this->l10n->t("%s liked %s's post", $notify['author-name'], $notify['parent-author-name']),
|
||||
'when' => $default_item_when,
|
||||
'ago' => $default_item_ago,
|
||||
'seen' => $notify['seen']
|
||||
];
|
||||
break;
|
||||
|
||||
case Activity::DISLIKE:
|
||||
$formattedNotify = [
|
||||
'label' => 'dislike',
|
||||
'link' => $this->baseUrl->get(true) . '/display/' . $notify['parent-guid'],
|
||||
'image' => ProxyUtils::proxifyUrl($notify['author-avatar'], false, ProxyUtils::SIZE_MICRO),
|
||||
'url' => $notify['author-link'],
|
||||
'text' => $this->l10n->t("%s disliked %s's post", $notify['author-name'], $notify['parent-author-name']),
|
||||
'when' => $default_item_when,
|
||||
'ago' => $default_item_ago,
|
||||
'seen' => $notify['seen']
|
||||
];
|
||||
break;
|
||||
|
||||
case Activity::ATTEND:
|
||||
$formattedNotify = [
|
||||
'label' => 'attend',
|
||||
'link' => $this->baseUrl->get(true) . '/display/' . $notify['parent-guid'],
|
||||
'image' => ProxyUtils::proxifyUrl($notify['author-avatar'], false, ProxyUtils::SIZE_MICRO),
|
||||
'url' => $notify['author-link'],
|
||||
'text' => $this->l10n->t("%s is attending %s's event", $notify['author-name'], $notify['parent-author-name']),
|
||||
'when' => $default_item_when,
|
||||
'ago' => $default_item_ago,
|
||||
'seen' => $notify['seen']
|
||||
];
|
||||
break;
|
||||
|
||||
case Activity::ATTENDNO:
|
||||
$formattedNotify = [
|
||||
'label' => 'attendno',
|
||||
'link' => $this->baseUrl->get(true) . '/display/' . $notify['parent-guid'],
|
||||
'image' => ProxyUtils::proxifyUrl($notify['author-avatar'], false, ProxyUtils::SIZE_MICRO),
|
||||
'url' => $notify['author-link'],
|
||||
'text' => $this->l10n->t("%s is not attending %s's event", $notify['author-name'], $notify['parent-author-name']),
|
||||
'when' => $default_item_when,
|
||||
'ago' => $default_item_ago,
|
||||
'seen' => $notify['seen']
|
||||
];
|
||||
break;
|
||||
|
||||
case Activity::ATTENDMAYBE:
|
||||
$formattedNotify = [
|
||||
'label' => 'attendmaybe',
|
||||
'link' => $this->baseUrl->get(true) . '/display/' . $notify['parent-guid'],
|
||||
'image' => ProxyUtils::proxifyUrl($notify['author-avatar'], false, ProxyUtils::SIZE_MICRO),
|
||||
'url' => $notify['author-link'],
|
||||
'text' => $this->l10n->t("%s may attend %s's event", $notify['author-name'], $notify['parent-author-name']),
|
||||
'when' => $default_item_when,
|
||||
'ago' => $default_item_ago,
|
||||
'seen' => $notify['seen']
|
||||
];
|
||||
break;
|
||||
|
||||
case Activity::FRIEND:
|
||||
if (!isset($notify['object'])) {
|
||||
$formattedNotify = [
|
||||
'label' => 'friend',
|
||||
'link' => $default_item_link,
|
||||
'image' => $default_item_image,
|
||||
'url' => $default_item_url,
|
||||
'text' => $default_item_text,
|
||||
'when' => $default_item_when,
|
||||
'ago' => $default_item_ago,
|
||||
'seen' => $notify['seen']
|
||||
];
|
||||
break;
|
||||
}
|
||||
/// @todo Check if this part here is used at all
|
||||
$this->logger->info('Complete data.', ['notify' => $notify, 'callStack' => System::callstack(20)]);
|
||||
|
||||
$xmlHead = "<" . "?xml version='1.0' encoding='UTF-8' ?" . ">";
|
||||
$obj = XML::parseString($xmlHead . $notify['object']);
|
||||
$notify['fname'] = $obj->title;
|
||||
|
||||
$formattedNotify = [
|
||||
'label' => 'friend',
|
||||
'link' => $this->baseUrl->get(true) . '/display/' . $notify['parent-guid'],
|
||||
'image' => ProxyUtils::proxifyUrl($notify['author-avatar'], false, ProxyUtils::SIZE_MICRO),
|
||||
'url' => $notify['author-link'],
|
||||
'text' => $this->l10n->t("%s is now friends with %s", $notify['author-name'], $notify['fname']),
|
||||
'when' => $default_item_when,
|
||||
'ago' => $default_item_ago,
|
||||
'seen' => $notify['seen']
|
||||
];
|
||||
break;
|
||||
|
||||
default:
|
||||
$formattedNotify = [
|
||||
'label' => $default_item_label,
|
||||
'link' => $default_item_link,
|
||||
'image' => $default_item_image,
|
||||
'url' => $default_item_url,
|
||||
'text' => $default_item_text,
|
||||
'when' => $default_item_when,
|
||||
'ago' => $default_item_ago,
|
||||
'seen' => $notify['seen']
|
||||
];
|
||||
}
|
||||
|
||||
$formattedNotifies[] = $formattedNotify;
|
||||
}
|
||||
|
||||
return $formattedNotifies;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get network notifications
|
||||
*
|
||||
* @param bool $seen False => only include notifications into the query
|
||||
* which aren't marked as "seen"
|
||||
* @param int $start Start the query at this point
|
||||
* @param int $limit Maximum number of query results
|
||||
*
|
||||
* @return array [string, array]
|
||||
* string 'ident' => Notification identifier
|
||||
* array 'notifications' => Network notifications
|
||||
*
|
||||
* @throws Exception
|
||||
*/
|
||||
public function getNetworkList(bool $seen = false, int $start = 0, int $limit = self::DEFAULT_PAGE_LIMIT)
|
||||
{
|
||||
$ident = self::NETWORK;
|
||||
$notifies = [];
|
||||
|
||||
$condition = ['wall' => false, 'uid' => local_user()];
|
||||
|
||||
if (!$seen) {
|
||||
$condition['unseen'] = true;
|
||||
}
|
||||
|
||||
$fields = ['id', 'parent', 'verb', 'author-name', 'unseen', 'author-link', 'author-avatar', 'contact-avatar',
|
||||
'network', 'created', 'object', 'parent-author-name', 'parent-author-link', 'parent-guid'];
|
||||
$params = ['order' => ['received' => true], 'limit' => [$start, $limit]];
|
||||
|
||||
$items = Item::selectForUser(local_user(), $fields, $condition, $params);
|
||||
|
||||
if ($this->dba->isResult($items)) {
|
||||
$notifies = $this->formatList(Item::inArray($items), $ident);
|
||||
}
|
||||
|
||||
$arr = [
|
||||
'notifications' => $notifies,
|
||||
'ident' => $ident,
|
||||
];
|
||||
|
||||
return $arr;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get system notifications
|
||||
*
|
||||
* @param bool $seen False => only include notifications into the query
|
||||
* which aren't marked as "seen"
|
||||
* @param int $start Start the query at this point
|
||||
* @param int $limit Maximum number of query results
|
||||
*
|
||||
* @return array [string, array]
|
||||
* string 'ident' => Notification identifier
|
||||
* array 'notifications' => System notifications
|
||||
*
|
||||
* @throws Exception
|
||||
*/
|
||||
public function getSystemList(bool $seen = false, int $start = 0, int $limit = self::DEFAULT_PAGE_LIMIT)
|
||||
{
|
||||
$ident = self::SYSTEM;
|
||||
$notifies = [];
|
||||
|
||||
$filter = ['uid' => local_user()];
|
||||
if (!$seen) {
|
||||
$filter['seen'] = false;
|
||||
}
|
||||
|
||||
$params = [];
|
||||
$params['order'] = ['date' => 'DESC'];
|
||||
$params['limit'] = [$start, $limit];
|
||||
|
||||
$stmtNotifies = $this->dba->select('notify',
|
||||
['id', 'url', 'photo', 'msg', 'date', 'seen', 'verb'],
|
||||
$filter,
|
||||
$params);
|
||||
|
||||
if ($this->dba->isResult($stmtNotifies)) {
|
||||
$notifies = $this->formatList($this->dba->toArray($stmtNotifies), $ident);
|
||||
}
|
||||
|
||||
$arr = [
|
||||
'notifications' => $notifies,
|
||||
'ident' => $ident,
|
||||
];
|
||||
|
||||
return $arr;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get personal notifications
|
||||
*
|
||||
* @param bool $seen False => only include notifications into the query
|
||||
* which aren't marked as "seen"
|
||||
* @param int $start Start the query at this point
|
||||
* @param int $limit Maximum number of query results
|
||||
*
|
||||
* @return array [string, array]
|
||||
* string 'ident' => Notification identifier
|
||||
* array 'notifications' => Personal notifications
|
||||
*
|
||||
* @throws Exception
|
||||
*/
|
||||
public function getPersonalList(bool $seen = false, int $start = 0, int $limit = self::DEFAULT_PAGE_LIMIT)
|
||||
{
|
||||
$ident = self::PERSONAL;
|
||||
$notifies = [];
|
||||
|
||||
$myurl = str_replace('http://', '', self::getApp()->contact['nurl']);
|
||||
$diasp_url = str_replace('/profile/', '/u/', $myurl);
|
||||
|
||||
$condition = ["NOT `wall` AND `uid` = ? AND (`item`.`author-id` = ? OR `item`.`tag` REGEXP ? OR `item`.`tag` REGEXP ?)",
|
||||
local_user(), public_contact(), $myurl . '\\]', $diasp_url . '\\]'];
|
||||
|
||||
if (!$seen) {
|
||||
$condition[0] .= " AND `unseen`";
|
||||
}
|
||||
|
||||
$fields = ['id', 'parent', 'verb', 'author-name', 'unseen', 'author-link', 'author-avatar', 'contact-avatar',
|
||||
'network', 'created', 'object', 'parent-author-name', 'parent-author-link', 'parent-guid'];
|
||||
$params = ['order' => ['received' => true], 'limit' => [$start, $limit]];
|
||||
|
||||
$items = Item::selectForUser(local_user(), $fields, $condition, $params);
|
||||
|
||||
if ($this->dba->isResult($items)) {
|
||||
$notifies = $this->formatList(Item::inArray($items), $ident);
|
||||
}
|
||||
|
||||
$arr = [
|
||||
'notifications' => $notifies,
|
||||
'ident' => $ident,
|
||||
];
|
||||
|
||||
return $arr;
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Get home notifications
|
||||
*
|
||||
* @param bool $seen False => only include notifications into the query
|
||||
* which aren't marked as "seen"
|
||||
* @param int $start Start the query at this point
|
||||
* @param int $limit Maximum number of query results
|
||||
*
|
||||
* @return array [string, array]
|
||||
* string 'ident' => Notification identifier
|
||||
* array 'notifications' => Home notifications
|
||||
*
|
||||
* @throws Exception
|
||||
*/
|
||||
public function getHomeList(bool $seen = false, int $start = 0, int $limit = self::DEFAULT_PAGE_LIMIT)
|
||||
{
|
||||
$ident = self::HOME;
|
||||
$notifies = [];
|
||||
|
||||
$condition = ['wall' => true, 'uid' => local_user()];
|
||||
|
||||
if (!$seen) {
|
||||
$condition['unseen'] = true;
|
||||
}
|
||||
|
||||
$fields = ['id', 'parent', 'verb', 'author-name', 'unseen', 'author-link', 'author-avatar', 'contact-avatar',
|
||||
'network', 'created', 'object', 'parent-author-name', 'parent-author-link', 'parent-guid'];
|
||||
$params = ['order' => ['received' => true], 'limit' => [$start, $limit]];
|
||||
|
||||
$items = Item::selectForUser(local_user(), $fields, $condition, $params);
|
||||
|
||||
if ($this->dba->isResult($items)) {
|
||||
$notifies = $this->formatList(Item::inArray($items), $ident);
|
||||
}
|
||||
|
||||
$arr = [
|
||||
'notifications' => $notifies,
|
||||
'ident' => $ident,
|
||||
];
|
||||
|
||||
return $arr;
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Get introductions
|
||||
*
|
||||
* @param bool $all If false only include introductions into the query
|
||||
* which aren't marked as ignored
|
||||
* @param int $start Start the query at this point
|
||||
* @param int $limit Maximum number of query results
|
||||
* @param int $id When set, only the introduction with this id is displayed
|
||||
*
|
||||
* @return array [string, array]
|
||||
* string 'ident' => Notification identifier
|
||||
* array 'notifications' => Introductions
|
||||
*
|
||||
* @throws ImagickException
|
||||
* @throws Exception
|
||||
*/
|
||||
public function getIntroList(bool $all = false, int $start = 0, int $limit = self::DEFAULT_PAGE_LIMIT, int $id = 0)
|
||||
{
|
||||
/// @todo sanitize wording according to SELF::INTRO
|
||||
$ident = 'introductions';
|
||||
$notifies = [];
|
||||
$sql_extra = "";
|
||||
|
||||
if (empty($id)) {
|
||||
if (!$all) {
|
||||
$sql_extra = " AND NOT `ignore` ";
|
||||
}
|
||||
|
||||
$sql_extra .= " AND NOT `intro`.`blocked` ";
|
||||
} else {
|
||||
$sql_extra = sprintf(" AND `intro`.`id` = %d ", intval($id));
|
||||
}
|
||||
|
||||
/// @todo Fetch contact details by "Contact::getDetailsByUrl" instead of queries to contact, fcontact and gcontact
|
||||
$stmtNotifies = $this->dba->p(
|
||||
"SELECT `intro`.`id` AS `intro_id`, `intro`.*, `contact`.*,
|
||||
`fcontact`.`name` AS `fname`, `fcontact`.`url` AS `furl`, `fcontact`.`addr` AS `faddr`,
|
||||
`fcontact`.`photo` AS `fphoto`, `fcontact`.`request` AS `frequest`,
|
||||
`gcontact`.`location` AS `glocation`, `gcontact`.`about` AS `gabout`,
|
||||
`gcontact`.`keywords` AS `gkeywords`, `gcontact`.`gender` AS `ggender`,
|
||||
`gcontact`.`network` AS `gnetwork`, `gcontact`.`addr` AS `gaddr`
|
||||
FROM `intro`
|
||||
LEFT JOIN `contact` ON `contact`.`id` = `intro`.`contact-id`
|
||||
LEFT JOIN `gcontact` ON `gcontact`.`nurl` = `contact`.`nurl`
|
||||
LEFT JOIN `fcontact` ON `intro`.`fid` = `fcontact`.`id`
|
||||
WHERE `intro`.`uid` = ? $sql_extra
|
||||
LIMIT ?, ?",
|
||||
$_SESSION['uid'],
|
||||
$start,
|
||||
$limit
|
||||
);
|
||||
if ($this->dba->isResult($stmtNotifies)) {
|
||||
$notifies = $this->formatIntroList($this->dba->toArray($stmtNotifies));
|
||||
}
|
||||
|
||||
$arr = [
|
||||
'ident' => $ident,
|
||||
'notifications' => $notifies,
|
||||
];
|
||||
|
||||
return $arr;
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Format the notification query in an usable array
|
||||
*
|
||||
* @param array $intros The array from the db query
|
||||
*
|
||||
* @return array with the introductions
|
||||
* @throws HTTPException\InternalServerErrorException
|
||||
* @throws ImagickException
|
||||
*/
|
||||
private function formatIntroList(array $intros)
|
||||
{
|
||||
$knowyou = '';
|
||||
|
||||
$formattedIntros = [];
|
||||
|
||||
foreach ($intros as $intro) {
|
||||
// There are two kind of introduction. Contacts suggested by other contacts and normal connection requests.
|
||||
// We have to distinguish between these two because they use different data.
|
||||
// Contact suggestions
|
||||
if ($intro['fid']) {
|
||||
$return_addr = bin2hex(self::getApp()->user['nickname'] . '@' .
|
||||
$this->baseUrl->getHostName() .
|
||||
(($this->baseUrl->getURLPath()) ? '/' . $this->baseUrl->getURLPath() : ''));
|
||||
|
||||
$intro = [
|
||||
'label' => 'friend_suggestion',
|
||||
'notify_type' => $this->l10n->t('Friend Suggestion'),
|
||||
'intro_id' => $intro['intro_id'],
|
||||
'madeby' => $intro['name'],
|
||||
'madeby_url' => $intro['url'],
|
||||
'madeby_zrl' => Contact::magicLink($intro['url']),
|
||||
'madeby_addr' => $intro['addr'],
|
||||
'contact_id' => $intro['contact-id'],
|
||||
'photo' => (!empty($intro['fphoto']) ? ProxyUtils::proxifyUrl($intro['fphoto'], false, ProxyUtils::SIZE_SMALL) : "images/person-300.jpg"),
|
||||
'name' => $intro['fname'],
|
||||
'url' => $intro['furl'],
|
||||
'zrl' => Contact::magicLink($intro['furl']),
|
||||
'hidden' => $intro['hidden'] == 1,
|
||||
'post_newfriend' => (intval($this->pConfig->get(local_user(), 'system', 'post_newfriend')) ? '1' : 0),
|
||||
'knowyou' => $knowyou,
|
||||
'note' => $intro['note'],
|
||||
'request' => $intro['frequest'] . '?addr=' . $return_addr,
|
||||
];
|
||||
|
||||
// Normal connection requests
|
||||
} else {
|
||||
$intro = $this->getMissingIntroData($intro);
|
||||
|
||||
if (empty($intro['url'])) {
|
||||
continue;
|
||||
}
|
||||
|
||||
// Don't show these data until you are connected. Diaspora is doing the same.
|
||||
if ($intro['gnetwork'] === Protocol::DIASPORA) {
|
||||
$intro['glocation'] = "";
|
||||
$intro['gabout'] = "";
|
||||
$intro['ggender'] = "";
|
||||
}
|
||||
$intro = [
|
||||
'label' => (($intro['network'] !== Protocol::OSTATUS) ? 'friend_request' : 'follower'),
|
||||
'notify_type' => (($intro['network'] !== Protocol::OSTATUS) ? $this->l10n->t('Friend/Connect Request') : $this->l10n->t('New Follower')),
|
||||
'dfrn_id' => $intro['issued-id'],
|
||||
'uid' => $_SESSION['uid'],
|
||||
'intro_id' => $intro['intro_id'],
|
||||
'contact_id' => $intro['contact-id'],
|
||||
'photo' => (!empty($intro['photo']) ? ProxyUtils::proxifyUrl($intro['photo'], false, ProxyUtils::SIZE_SMALL) : "images/person-300.jpg"),
|
||||
'name' => $intro['name'],
|
||||
'location' => BBCode::convert($intro['glocation'], false),
|
||||
'about' => BBCode::convert($intro['gabout'], false),
|
||||
'keywords' => $intro['gkeywords'],
|
||||
'gender' => $intro['ggender'],
|
||||
'hidden' => $intro['hidden'] == 1,
|
||||
'post_newfriend' => (intval($this->pConfig->get(local_user(), 'system', 'post_newfriend')) ? '1' : 0),
|
||||
'url' => $intro['url'],
|
||||
'zrl' => Contact::magicLink($intro['url']),
|
||||
'addr' => $intro['gaddr'],
|
||||
'network' => $intro['gnetwork'],
|
||||
'knowyou' => $intro['knowyou'],
|
||||
'note' => $intro['note'],
|
||||
];
|
||||
}
|
||||
|
||||
$formattedIntros[] = $intro;
|
||||
}
|
||||
|
||||
return $formattedIntros;
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Check for missing contact data and try to fetch the data from
|
||||
* from other sources
|
||||
*
|
||||
* @param array $intro The input array with the intro data
|
||||
*
|
||||
* @return array The array with the intro data
|
||||
* @throws HTTPException\InternalServerErrorException
|
||||
*/
|
||||
private function getMissingIntroData(array $intro)
|
||||
{
|
||||
// If the network and the addr isn't available from the gcontact
|
||||
// table entry, take the one of the contact table entry
|
||||
if (empty($intro['gnetwork']) && !empty($intro['network'])) {
|
||||
$intro['gnetwork'] = $intro['network'];
|
||||
}
|
||||
if (empty($intro['gaddr']) && !empty($intro['addr'])) {
|
||||
$intro['gaddr'] = $intro['addr'];
|
||||
}
|
||||
|
||||
// If the network and addr is still not available
|
||||
// get the missing data data from other sources
|
||||
if (empty($intro['gnetwork']) || empty($intro['gaddr'])) {
|
||||
$ret = Contact::getDetailsByURL($intro['url']);
|
||||
|
||||
if (empty($intro['gnetwork']) && !empty($ret['network'])) {
|
||||
$intro['gnetwork'] = $ret['network'];
|
||||
}
|
||||
if (empty($intro['gaddr']) && !empty($ret['addr'])) {
|
||||
$intro['gaddr'] = $ret['addr'];
|
||||
}
|
||||
}
|
||||
|
||||
return $intro;
|
||||
}
|
||||
}
|
||||
|
|
@ -23,6 +23,7 @@ use Friendica\Core\System;
|
|||
use Friendica\Core\Theme;
|
||||
use Friendica\Core\Worker;
|
||||
use Friendica\Database\DBA;
|
||||
use Friendica\Protocol\Activity;
|
||||
use Friendica\Protocol\Diaspora;
|
||||
use Friendica\Util\DateTimeFormat;
|
||||
use Friendica\Util\Network;
|
||||
|
|
@ -692,7 +693,7 @@ class Profile
|
|||
|
||||
while ($rr = DBA::fetch($s)) {
|
||||
$condition = ['parent-uri' => $rr['uri'], 'uid' => $rr['uid'], 'author-id' => public_contact(),
|
||||
'activity' => [Item::activityToIndex(ACTIVITY_ATTEND), Item::activityToIndex(ACTIVITY_ATTENDMAYBE)],
|
||||
'activity' => [Item::activityToIndex( Activity::ATTEND), Item::activityToIndex(Activity::ATTENDMAYBE)],
|
||||
'visible' => true, 'deleted' => false];
|
||||
if (!Item::exists($condition)) {
|
||||
continue;
|
||||
|
|
@ -823,51 +824,51 @@ class Profile
|
|||
$profile['religion'] = [L10n::t('Religion:'), $a->profile['religion']];
|
||||
}
|
||||
|
||||
if ($txt = prepare_text($a->profile['about'])) {
|
||||
if ($txt = BBCode::convert($a->profile['about'])) {
|
||||
$profile['about'] = [L10n::t('About:'), $txt];
|
||||
}
|
||||
|
||||
if ($txt = prepare_text($a->profile['interest'])) {
|
||||
if ($txt = BBCode::convert($a->profile['interest'])) {
|
||||
$profile['interest'] = [L10n::t('Hobbies/Interests:'), $txt];
|
||||
}
|
||||
|
||||
if ($txt = prepare_text($a->profile['likes'])) {
|
||||
if ($txt = BBCode::convert($a->profile['likes'])) {
|
||||
$profile['likes'] = [L10n::t('Likes:'), $txt];
|
||||
}
|
||||
|
||||
if ($txt = prepare_text($a->profile['dislikes'])) {
|
||||
if ($txt = BBCode::convert($a->profile['dislikes'])) {
|
||||
$profile['dislikes'] = [L10n::t('Dislikes:'), $txt];
|
||||
}
|
||||
|
||||
if ($txt = prepare_text($a->profile['contact'])) {
|
||||
if ($txt = BBCode::convert($a->profile['contact'])) {
|
||||
$profile['contact'] = [L10n::t('Contact information and Social Networks:'), $txt];
|
||||
}
|
||||
|
||||
if ($txt = prepare_text($a->profile['music'])) {
|
||||
if ($txt = BBCode::convert($a->profile['music'])) {
|
||||
$profile['music'] = [L10n::t('Musical interests:'), $txt];
|
||||
}
|
||||
|
||||
if ($txt = prepare_text($a->profile['book'])) {
|
||||
if ($txt = BBCode::convert($a->profile['book'])) {
|
||||
$profile['book'] = [L10n::t('Books, literature:'), $txt];
|
||||
}
|
||||
|
||||
if ($txt = prepare_text($a->profile['tv'])) {
|
||||
if ($txt = BBCode::convert($a->profile['tv'])) {
|
||||
$profile['tv'] = [L10n::t('Television:'), $txt];
|
||||
}
|
||||
|
||||
if ($txt = prepare_text($a->profile['film'])) {
|
||||
if ($txt = BBCode::convert($a->profile['film'])) {
|
||||
$profile['film'] = [L10n::t('Film/dance/culture/entertainment:'), $txt];
|
||||
}
|
||||
|
||||
if ($txt = prepare_text($a->profile['romance'])) {
|
||||
if ($txt = BBCode::convert($a->profile['romance'])) {
|
||||
$profile['romance'] = [L10n::t('Love/Romance:'), $txt];
|
||||
}
|
||||
|
||||
if ($txt = prepare_text($a->profile['work'])) {
|
||||
if ($txt = BBCode::convert($a->profile['work'])) {
|
||||
$profile['work'] = [L10n::t('Work/employment:'), $txt];
|
||||
}
|
||||
|
||||
if ($txt = prepare_text($a->profile['education'])) {
|
||||
if ($txt = BBCode::convert($a->profile['education'])) {
|
||||
$profile['education'] = [L10n::t('School/education:'), $txt];
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue