use Friendica\Model\ItemURI;
use Friendica\Model\Profile;
use Friendica\Model\Photo;
+use Friendica\Model\Post;
use Friendica\Model\Tag;
use Friendica\Model\User;
use Friendica\Protocol\Activity;
use Friendica\Protocol\ActivityPub;
use Friendica\Util\DateTimeFormat;
use Friendica\Util\HTTPSignature;
-use Friendica\Util\Images;
use Friendica\Util\JsonLD;
use Friendica\Util\LDSignature;
use Friendica\Util\Map;
* @param array $inboxes
* @return array inboxes with added relay servers
*/
- public static function addRelayServerInboxes(array $inboxes)
+ public static function addRelayServerInboxes(array $inboxes = [])
{
$contacts = DBA::select('apcontact', ['inbox'],
["`type` = ? AND `url` IN (SELECT `url` FROM `contact` WHERE `uid` = ? AND `rel` IN (?, ?))",
*/
public static function sendRelayFollow(string $url)
{
- $contact_id = Contact::getIdForURL($url);
- if (!$contact_id) {
+ $contact = Contact::getByURL($url);
+ if (empty($contact)) {
return false;
}
- $activity_id = ActivityPub\Transmitter::activityIDFromContact($contact_id);
+ $activity_id = ActivityPub\Transmitter::activityIDFromContact($contact['id']);
$success = ActivityPub\Transmitter::sendActivity('Follow', $url, 0, $activity_id);
if ($success) {
- DBA::update('contact', ['rel' => Contact::FRIEND], ['id' => $contact_id]);
+ $rel = $contact['rel'] == Contact::SHARING ? Contact::FRIEND : Contact::FOLLOWER;
+ DBA::update('contact', ['rel' => $rel], ['id' => $contact['id']]);
}
return $success;
/**
* Unsubscribe from a relay
*
- * @param string $url Subscribe actor url
+ * @param string $url Subscribe actor url
+ * @param bool $force Set the relay status as non follower even if unsubscribe hadn't worked
* @return bool success
*/
- public static function sendRelayUndoFollow(string $url)
+ public static function sendRelayUndoFollow(string $url, bool $force = false)
{
- $contact_id = Contact::getIdForURL($url);
- if (!$contact_id) {
+ $contact = Contact::getByURL($url);
+ if (empty($contact)) {
return false;
}
- $success = self::sendContactUndo($url, $contact_id, 0);
- if ($success) {
- DBA::update('contact', ['rel' => Contact::SHARING], ['id' => $contact_id]);
+ $success = self::sendContactUndo($url, $contact['id'], 0);
+ if ($success || $force) {
+ $rel = $contact['rel'] == Contact::FRIEND ? Contact::SHARING : Contact::NOTHING;
+ DBA::update('contact', ['rel' => $rel], ['id' => $contact['id']]);
}
return $success;
'deleted' => false,
'hidden' => false,
'archive' => false,
- 'pending' => false
+ 'pending' => false,
+ 'blocked' => false,
];
$condition = DBA::buildCondition($parameters);
}
$always_bcc = false;
- $isforum = false;
// Check if we should always deliver our stuff via BCC
if (!empty($item['uid'])) {
$profile = User::getOwnerDataById($item['uid']);
if (!empty($profile)) {
$always_bcc = $profile['hide-friends'];
- $isforum = $profile['account-type'] == User::ACCOUNT_TYPE_COMMUNITY;
}
}
$always_bcc = true;
}
- if ((self::isAnnounce($item) && !$isforum) || DI::config()->get('debug', 'total_ap_delivery')) {
+ if (self::isAnnounce($item) || DI::config()->get('debug', 'total_ap_delivery')) {
// Will be activated in a later step
$networks = Protocol::FEDERATED;
} else {
continue;
}
- if ($isforum && DBA::isResult($contact) && ($contact['dfrn'] == Protocol::DFRN)) {
- continue;
- }
-
if (!empty($profile = APContact::getByURL($contact['url'], false))) {
$data['to'][] = $profile['url'];
}
continue;
}
- if ($isforum && DBA::isResult($contact) && ($contact['dfrn'] == Protocol::DFRN)) {
- continue;
- }
-
if (!empty($profile = APContact::getByURL($contact['url'], false))) {
if ($contact['hidden'] || $always_bcc) {
$data['bcc'][] = $profile['url'];
$networks = [Protocol::ACTIVITYPUB, Protocol::OSTATUS];
}
- $condition = ['uid' => $uid, 'archive' => false, 'pending' => false];
+ $condition = ['uid' => $uid, 'archive' => false, 'pending' => false, 'blocked' => false];
if (!empty($uid)) {
$condition['rel'] = [Contact::FOLLOWER, Contact::FRIEND];
$mail['gravity'] = ($mail['reply'] ? GRAVITY_COMMENT: GRAVITY_PARENT);
$mail['event-type'] = '';
- $mail['attach'] = '';
$mail['parent'] = 0;
$attachments[] = $attachment;
}
*/
- $arr = explode('[/attach],', $item['attach']);
- if (count($arr)) {
- foreach ($arr as $r) {
- $matches = false;
- $cnt = preg_match('|\[attach\]href=\"(.*?)\" length=\"(.*?)\" type=\"(.*?)\" title=\"(.*?)\"|', $r, $matches);
- if ($cnt) {
- $attributes = ['type' => 'Document',
- 'mediaType' => $matches[3],
- 'url' => $matches[1],
- 'name' => null];
-
- if (trim($matches[4]) != '') {
- $attributes['name'] = trim($matches[4]);
- }
-
- $attachments[] = $attributes;
- }
- }
+ foreach (Post\Media::getByURIId($item['uri-id'], [Post\Media::DOCUMENT, Post\Media::TORRENT, Post\Media::UNKNOWN]) as $attachment) {
+ $attachments[] = ['type' => 'Document',
+ 'mediaType' => $attachment['mimetype'],
+ 'url' => $attachment['url'],
+ 'name' => $attachment['description']];
}
if ($type != 'Note') {
return $attachments;
}
- // Simplify image codes
- $body = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/ism", '[img]$3[/img]', $item['body']);
-
- // Grab all pictures without alternative descriptions and create attachments out of them
- if (preg_match_all("/\[img\]([^\[\]]*)\[\/img\]/Usi", $body, $pictures)) {
- foreach ($pictures[1] as $picture) {
- $imgdata = Images::getInfoFromURLCached($picture);
- if ($imgdata) {
- $attachments[] = ['type' => 'Document',
- 'mediaType' => $imgdata['mime'],
- 'url' => $picture,
- 'name' => null];
- }
- }
- }
-
- // Grab all pictures with alternative description and create attachments out of them
- if (preg_match_all("/\[img=([^\[\]]*)\]([^\[\]]*)\[\/img\]/Usi", $body, $pictures, PREG_SET_ORDER)) {
- foreach ($pictures as $picture) {
- $imgdata = Images::getInfoFromURLCached($picture[1]);
- if ($imgdata) {
- $attachments[] = ['type' => 'Document',
- 'mediaType' => $imgdata['mime'],
- 'url' => $picture[1],
- 'name' => $picture[2]];
- }
- }
+ foreach (Post\Media::getByURIId($item['uri-id'], [Post\Media::AUDIO, Post\Media::IMAGE, Post\Media::VIDEO]) as $attachment) {
+ $attachments[] = ['type' => 'Document',
+ 'mediaType' => $attachment['mimetype'],
+ 'url' => $attachment['url'],
+ 'name' => $attachment['description']];
}
return $attachments;
return '';
}
- $data = Contact::getByURL($match[1], false, ['url', 'nick']);
+ $data = Contact::getByURL($match[1], false, ['url', 'alias', 'nick']);
if (empty($data['nick'])) {
return $match[0];
}
- return '@[url=' . $data['url'] . ']' . $data['nick'] . '[/url]';
+ return '[url=' . ($data['alias'] ?: $data['url']) . ']@' . $data['nick'] . '[/url]';
}
/**
$body = $item['body'];
- if (empty($item['uid']) || !Feature::isEnabled($item['uid'], 'explicit_mentions')) {
- $body = self::prependMentions($body, $item['uri-id']);
- }
-
if ($type == 'Note') {
- $body = self::removePictures($body);
+ $body = $item['raw-body'] ?? self::removePictures($body);
} elseif (($type == 'Article') && empty($data['summary'])) {
$data['summary'] = BBCode::toPlaintext(Plaintext::shorten(self::removePictures($body), 1000));
}
+ if (empty($item['uid']) || !Feature::isEnabled($item['uid'], 'explicit_mentions')) {
+ $body = self::prependMentions($body, $item['uri-id'], $item['author-link']);
+ }
+
if ($type == 'Event') {
$data = array_merge($data, self::createEvent($item));
} else {
return HTTPSignature::transmit($signed, $profile['inbox'], $uid);
}
- private static function prependMentions($body, int $uriid)
+ private static function prependMentions($body, int $uriid, string $authorLink)
{
$mentions = [];
&& $profile['contact-type'] != Contact::TYPE_COMMUNITY
&& !strstr($body, $profile['addr'])
&& !strstr($body, $tag['url'])
+ && $tag['url'] !== $authorLink
) {
$mentions[] = '@[url=' . $tag['url'] . ']' . $profile['nick'] . '[/url]';
}
projects / friendica.git / blobdiff