use Friendica\Core\Worker;
use Friendica\Database\DBA;
use Friendica\DI;
-use Friendica\Model\Post;
use Friendica\Protocol\Activity;
use Friendica\Protocol\ActivityPub;
use Friendica\Protocol\Diaspora;
if ($item['uid'] == $uid) {
self::markForDeletionById($item['id'], PRIORITY_HIGH);
} elseif ($item['uid'] != 0) {
- Logger::notice('Wrong ownership. Not deleting item', ['id' => $item['id']]);
+ Logger::warning('Wrong ownership. Not deleting item', ['id' => $item['id']]);
}
}
DBA::close($items);
*/
private static function contactId(array $item): int
{
- if (!empty($item['contact-id']) && DBA::exists('contact', ['self' => true, 'id' => $item['contact-id']])) {
- return $item['contact-id'];
- } elseif (($item['gravity'] == GRAVITY_PARENT) && !empty($item['uid']) && !empty($item['contact-id']) && Contact::isSharing($item['contact-id'], $item['uid'])) {
- return $item['contact-id'];
- } elseif (!empty($item['uid']) && !Contact::isSharing($item['author-id'], $item['uid'])) {
+ if ($item['uid'] == 0) {
return $item['author-id'];
- } elseif (!empty($item['contact-id'])) {
- return $item['contact-id'];
- } else {
- $contact_id = Contact::getIdForURL($item['author-link'], $item['uid']);
+ }
+
+ if ($item['origin']) {
+ $owner = User::getOwnerDataById($item['uid']);
+ return $owner['id'];
+ }
+
+ if (!empty($item['causer-id']) && Contact::isSharing($item['causer-id'], $item['uid'], true)) {
+ $cdata = Contact::getPublicAndUserContactID($item['causer-id'], $item['uid']);
+ if (!empty($cdata['user'])) {
+ return $cdata['user'];
+ }
+ }
+
+ if ($item['gravity'] == GRAVITY_PARENT) {
+ if (Contact::isSharingByURL($item['owner-link'], $item['uid'], true)) {
+ $contact_id = Contact::getIdForURL($item['owner-link'], $item['uid']);
+ } else {
+ $contact_id = Contact::getIdForURL($item['owner-link']);
+ }
if (!empty($contact_id)) {
return $contact_id;
}
}
- return $item['author-id'];
+
+ if (Contact::isSharingByURL($item['author-link'], $item['uid'], true)) {
+ $contact_id = Contact::getIdForURL($item['author-link'], $item['uid']);
+ } else {
+ $contact_id = Contact::getIdForURL($item['author-link']);
+ }
+
+ if (!empty($contact_id)) {
+ return $contact_id;
+ }
+
+ Logger::warning('contact-id could not be fetched, using self contact instead.', ['uid' => $item['uid'], 'item' => $item]);
+ $self = Contact::selectFirst(['id'], ['self' => true, 'uid' => $item['uid']]);
+ return $self['id'];
}
/**
if (!empty($item['uid'])) {
$owner = User::getOwnerDataById($item['uid'], false);
if (!$owner) {
- Logger::notice('Missing item user owner data', ['uid' => $item['uid']]);
+ Logger::warning('Missing item user owner data', ['uid' => $item['uid']]);
return false;
}
Contact::checkAvatarCache($item['author-id']);
Contact::checkAvatarCache($item['owner-id']);
- // The contact-id should be set before "self::insert" was called - but there seems to be issues sometimes
$item['contact-id'] = self::contactId($item);
if (!empty($item['direction']) && in_array($item['direction'], [Conversation::PUSH, Conversation::RELAY]) &&
// Check for hashtags in the body and repair or add hashtag links
$item['body'] = self::setHashtags($item['body']);
- if (stristr($item['verb'], Activity::POKE)) {
- $notify_type = Delivery::POKE;
- } else {
- $notify_type = Delivery::POST;
- }
+ $notify_type = Delivery::POST;
// Filling item related side tables
if (!empty($item['attach'])) {
self::updateDisplayCache($posted_item['uri-id']);
}
- if ($posted_item['origin'] && ($posted_item['uid'] != 0) && in_array($posted_item['gravity'], [GRAVITY_PARENT, GRAVITY_COMMENT])) {
- DI::cache()->delete(ActivityPub\Transmitter::CACHEKEY_OUTBOX . $posted_item['uid']);
- }
-
return $post_user_id;
}
return 0;
}
+ if (($uid != 0) && ($item['gravity'] == GRAVITY_PARENT)) {
+ $owner = User::getOwnerDataById($uid);
+ if (($owner['contact-type'] == User::ACCOUNT_TYPE_COMMUNITY) && !Tag::isMentioned($uri_id, $owner['url'])) {
+ Logger::info('Target user is a forum but is not mentioned here, thread will not be stored', ['uid' => $uid, 'uri-id' => $uri_id]);
+ return 0;
+ }
+ }
+
if (($source_uid == 0) && (($item['private'] == self::PRIVATE) || !in_array($item['network'], Protocol::FEDERATED))) {
Logger::notice('Item is private or not from a federated network. It will not be stored for the user.', ['uri-id' => $uri_id, 'uid' => $uid, 'private' => $item['private'], 'network' => $item['network']]);
return 0;
if (($uid != 0) && (($item['gravity'] == GRAVITY_PARENT) || $is_reshare) &&
DI::pConfig()->get($uid, 'system', 'accept_only_sharer') == self::COMPLETION_NONE &&
!in_array($item['post-reason'], [self::PR_FOLLOWER, self::PR_TAG, self::PR_TO, self::PR_CC])) {
- Logger::info('Contact is not a follower, thread will not be stored', ['author' => $item['author-link'], 'uid' => $uid]);
+ Logger::info('Contact is not a follower, thread will not be stored', ['author' => $item['author-link'], 'uid' => $uid, 'uri-id' => $uri_id]);
return 0;
}
- if (($uri_id != $item['thr-parent-id']) && (($item['gravity'] == GRAVITY_COMMENT) || $is_reshare) && !Post::exists(['uri-id' => $item['thr-parent-id'], 'uid' => $uid])) {
- // Fetch the origin user for the post
- $origin_uid = self::GetOriginUidForUriId($item['thr-parent-id'], $uid);
- if (is_null($origin_uid)) {
- Logger::info('Origin item was not found', ['uid' => $uid, 'uri-id' => $item['thr-parent-id']]);
+ $causer = $item['causer-id'] ?: $item['author-id'];
+
+ if (($uri_id != $item['parent-uri-id']) && ($item['gravity'] == GRAVITY_COMMENT) && !Post::exists(['uri-id' => $item['parent-uri-id'], 'uid' => $uid])) {
+ if (!self::fetchParent($item['parent-uri-id'], $uid, $causer)) {
+ Logger::info('Parent post had not been added', ['uri-id' => $item['parent-uri-id'], 'uid' => $uid, 'causer' => $causer]);
return 0;
}
-
- $causer = $item['causer-id'] ?: $item['author-id'];
- $result = self::storeForUserByUriId($item['thr-parent-id'], $uid, ['causer-id' => $causer, 'post-reason' => self::PR_FETCHED], $origin_uid);
- Logger::info('Fetched thread parent', ['uri-id' => $item['thr-parent-id'], 'uid' => $uid, 'causer' => $causer, 'result' => $result]);
+ Logger::info('Fetched parent post', ['uri-id' => $item['parent-uri-id'], 'uid' => $uid, 'causer' => $causer]);
+ } elseif (($uri_id != $item['thr-parent-id']) && $is_reshare && !Post::exists(['uri-id' => $item['thr-parent-id'], 'uid' => $uid])) {
+ if (!self::fetchParent($item['thr-parent-id'], $uid, $causer)) {
+ Logger::info('Thread parent had not been added', ['uri-id' => $item['thr-parent-id'], 'uid' => $uid, 'causer' => $causer]);
+ return 0;
+ }
+ Logger::info('Fetched thread parent', ['uri-id' => $item['thr-parent-id'], 'uid' => $uid, 'causer' => $causer]);
}
$stored = self::storeForUser($item, $uid);
- Logger::info('Item stored for user', ['uri-id' => $item['uri-id'], 'uid' => $uid, 'source-uid' => $source_uid, 'stored' => $stored]);
+ Logger::info('Item stored for user', ['uri-id' => $item['uri-id'], 'uid' => $uid, 'causer' => $causer, 'source-uid' => $source_uid, 'stored' => $stored]);
return $stored;
}
+ /**
+ * Fetch the parent with the given uri-id
+ *
+ * @param integer $uri_id
+ * @param integer $uid
+ * @param integer $causer
+ *
+ * @return integer
+ */
+ private static function fetchParent(int $uri_id, int $uid, int $causer): int
+ {
+ // Fetch the origin user for the post
+ $origin_uid = self::GetOriginUidForUriId($uri_id, $uid);
+ if (is_null($origin_uid)) {
+ Logger::info('Origin item was not found', ['uid' => $uid, 'uri-id' => $uri_id]);
+ return 0;
+ }
+
+ return self::storeForUserByUriId($uri_id, $uid, ['causer-id' => $causer, 'post-reason' => self::PR_FETCHED], $origin_uid);
+ }
+
/**
* Returns the origin uid of a post if the given user is allowed to see it.
*
*/
private static function storeForUser(array $item, int $uid): int
{
- if (Post::exists(['uri-id' => $item['uri-id'], 'uid' => $uid])) {
+ $post = Post::selectFirst(['id'], ['uri-id' => $item['uri-id'], 'uid' => $uid]);
+ if (!empty($post['id'])) {
if (!empty($item['event-id'])) {
- $post = Post::selectFirst(['event-id'], ['uri-id' => $item['uri-id'], 'uid' => $uid]);
- if (!empty($post['event-id'])) {
+ $event_post = Post::selectFirst(['event-id'], ['uri-id' => $item['uri-id'], 'uid' => $uid]);
+ if (!empty($event_post['event-id'])) {
$event = DBA::selectFirst('event', ['edited', 'start', 'finish', 'summary', 'desc', 'location', 'nofinish', 'adjust'], ['id' => $item['event-id']]);
if (!empty($event)) {
// We aren't using "Event::store" here, since we don't want to trigger any further action
- $ret = DBA::update('event', $event, ['id' => $post['event-id']]);
- Logger::info('Event updated', ['uid' => $uid, 'source-event' => $item['event-id'], 'target-event' => $post['event-id'], 'ret' => $ret]);
+ $ret = DBA::update('event', $event, ['id' => $event_post['event-id']]);
+ Logger::info('Event updated', ['uid' => $uid, 'source-event' => $item['event-id'], 'target-event' => $event_post['event-id'], 'ret' => $ret]);
}
}
}
- Logger::info('Item already exists', ['uri-id' => $item['uri-id'], 'uid' => $uid]);
- return 0;
+ Logger::info('Item already exists', ['uri-id' => $item['uri-id'], 'uid' => $uid, 'id' => $post['id']]);
+ return $post['id'];
}
// Data from the "post-user" table
$item['origin'] = 0;
$item['wall'] = 0;
- if ($item['gravity'] == GRAVITY_PARENT) {
- $contact = Contact::getByURLForUser($item['owner-link'], $uid, false, ['id']);
- } else {
- $contact = Contact::getByURLForUser($item['author-link'], $uid, false, ['id']);
- }
-
- if (!empty($contact['id'])) {
- $item['contact-id'] = $contact['id'];
- } else {
- // Shouldn't happen at all
- Logger::warning('contact-id could not be fetched', ['uid' => $uid, 'item' => $item]);
- $self = DBA::selectFirst('contact', ['id'], ['self' => true, 'uid' => $uid]);
- if (!DBA::isResult($self)) {
- // Shouldn't happen even less
- Logger::warning('self contact could not be fetched', ['uid' => $uid, 'item' => $item]);
- return 0;
- }
- $item['contact-id'] = $self['id'];
- }
+ $item['contact-id'] = self::contactId($item);
$notify = false;
if ($item['gravity'] == GRAVITY_PARENT) {
} else {
$condition = ['id' => $arr['contact-id'], 'self' => false];
}
- Contact::update(['failed' => false, 'success_update' => $arr['received'], 'last-item' => $arr['received']], $condition);
+ Contact::update(['failed' => false, 'local-data' => true, 'success_update' => $arr['received'], 'last-item' => $arr['received']], $condition);
}
// Now do the same for the system wide contacts with uid=0
if ($arr['private'] != self::PRIVATE) {
- Contact::update(['failed' => false, 'success_update' => $arr['received'], 'last-item' => $arr['received']],
+ Contact::update(['failed' => false, 'local-data' => true, 'success_update' => $arr['received'], 'last-item' => $arr['received']],
['id' => $arr['owner-id']]);
if ($arr['owner-id'] != $arr['author-id']) {
- Contact::update(['failed' => false, 'success_update' => $arr['received'], 'last-item' => $arr['received']],
+ Contact::update(['failed' => false, 'local-data' => true, 'success_update' => $arr['received'], 'last-item' => $arr['received']],
['id' => $arr['author-id']]);
}
}
}
if ($item['gravity'] == GRAVITY_PARENT) {
- $tags = Tag::getByURIId($item['uri-id'], [Tag::MENTION, Tag::EXCLUSIVE_MENTION]);
- foreach ($tags as $tag) {
- if (Strings::compareLink($owner['url'], $tag['url'])) {
- $mention = true;
- Logger::info('Mention found in tag.', ['url' => $tag['url'], 'uri' => $item['uri'], 'uid' => $uid, 'id' => $item_id, 'uri-id' => $item['uri-id'], 'guid' => $item['guid']]);
- }
- }
-
- if (!$mention) {
+ if (Tag::isMentioned($item['uri-id'], $owner['url'])) {
+ Logger::info('Mention found in tag.', ['uri' => $item['uri'], 'uid' => $uid, 'id' => $item_id, 'uri-id' => $item['uri-id'], 'guid' => $item['guid']]);
+ } else {
Logger::info('Top-level post without mention is deleted.', ['uri' => $item['uri'], $uid, 'id' => $item_id, 'uri-id' => $item['uri-id'], 'guid' => $item['guid']]);
Post\User::delete(['uri-id' => $item['uri-id'], 'uid' => $item['uid']]);
return true;
Hook::callAll('tagged', $arr);
} else {
- $tags = Tag::getByURIId($item['parent-uri-id'], [Tag::MENTION, Tag::EXCLUSIVE_MENTION]);
- foreach ($tags as $tag) {
- if (Strings::compareLink($owner['url'], $tag['url'])) {
- $mention = true;
- Logger::info('Mention found in parent tag.', ['url' => $tag['url'], 'uri' => $item['uri'], 'uid' => $uid, 'id' => $item_id, 'uri-id' => $item['uri-id'], 'guid' => $item['guid']]);
- }
- }
-
- if (!$mention) {
+ if (Tag::isMentioned($item['parent-uri-id'], $owner['url'])) {
+ Logger::info('Mention found in parent tag.', ['uri' => $item['uri'], 'uid' => $uid, 'id' => $item_id, 'uri-id' => $item['uri-id'], 'guid' => $item['guid']]);
+ } else {
Logger::debug('No mentions found in parent, quitting here.', ['id' => $item_id, 'uri-id' => $item['uri-id'], 'guid' => $item['guid']]);
return false;
}
$item = Post::selectFirst(self::ITEM_FIELDLIST, ['id' => $item_id]);
if (!DBA::isResult($item)) {
- Logger::notice('like: unknown item', ['id' => $item_id]);
+ Logger::warning('Post had not been fetched', ['id' => $item_id]);
return false;
}
}
// Retrieve the current logged in user's public contact
- $author_id = Contact::getIdForURL($owner['url']);
+ $author_id = Contact::getPublicIdByUserId($uid);
if (empty($author_id)) {
Logger::info('Empty public contact');
return false;
$activity = Activity::ANNOUNCE;
break;
default:
- Logger::notice('unknown verb', ['verb' => $verb, 'item' => $item_id]);
+ Logger::warning('unknown verb', ['verb' => $verb, 'item' => $item_id]);
return false;
}
$new_item = [
'guid' => System::createUUID(),
'uri' => self::newURI(),
- 'uid' => $item['uid'],
+ 'uid' => $uid,
'contact-id' => $owner['id'],
'wall' => $item['wall'],
'origin' => 1,
'unseen' => 1,
];
- $signed = Diaspora::createLikeSignature($uid, $new_item);
- if (!empty($signed)) {
- $new_item['diaspora_signed_text'] = json_encode($signed);
+ if (in_array($activity, [Activity::LIKE, Activity::DISLIKE])) {
+ $signed = Diaspora::createLikeSignature($uid, $new_item);
+ if (!empty($signed)) {
+ $new_item['diaspora_signed_text'] = json_encode($signed);
+ }
}
- $new_item_id = self::insert($new_item);
+ self::insert($new_item, true);
// If the parent item isn't visible then set it to visible
+ // @todo Check if this is still needed
if (!$item['visible']) {
self::update(['visible' => true], ['id' => $item['id']]);
}
-
- $new_item['id'] = $new_item_id;
-
- Hook::callAll('post_local_end', $new_item);
-
return true;
}
$options = Post\QuestionOption::getByURIId($item['uri-id']);
foreach ($options as $key => $option) {
- $percent = $question['voters'] ? ($option['replies'] / $question['voters'] * 100) : 0;
-
- $options[$key]['percent'] = $percent;
-
if ($question['voters'] > 0) {
- $options[$key]['vote'] = DI::l10n()->t('%s (%d%s, %d votes)', $option['name'], round($percent, 1), '%', $option['replies']);
+ $percent = $option['replies'] / $question['voters'] * 100;
+ $options[$key]['vote'] = DI::l10n()->tt('%2$s (%3$d%%, %1$d vote)', '%2$s (%3$d%%, %1$d votes)', $option['replies'], $option['name'], round($percent, 1));
} else {
- $options[$key]['vote'] = DI::l10n()->t('%s (%d votes)', $option['name'], $option['replies']);
+ $options[$key]['vote'] = DI::l10n()->tt('%2$s (%1$d vote)', '%2$s (%1$d votes)', $option['replies'], $option['name'], );
}
}
if (!empty($question['voters']) && !empty($question['endtime'])) {
- $summary = DI::l10n()->t('%d voters. Poll end: %s', $question['voters'], Temporal::getRelativeDate($question['endtime']));
+ $summary = DI::l10n()->tt('%d voter. Poll end: %s', '%d voters. Poll end: %s', $question['voters'], Temporal::getRelativeDate($question['endtime']));
} elseif (!empty($question['voters'])) {
- $summary = DI::l10n()->t('%d voters.', $question['voters']);
+ $summary = DI::l10n()->tt('%d voter.', '%d voters.', $question['voters']);
} elseif (!empty($question['endtime'])) {
$summary = DI::l10n()->t('Poll end: %s', Temporal::getRelativeDate($question['endtime']));
} else {
projects / friendica.git / blobdiff