X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FProtocol%2FActivityPub%2FProcessor.php;h=d9dd7ee5b321993c99ad2249bb31375f1a8d04f2;hb=0ddb315b23882f3ba9e709f9a4e499cc237d1e96;hp=311806f8c07bcb71917abbd15467ff7a082195ed;hpb=624e4c192c7f837ac0587a50da6e1409081eb519;p=friendica.git

diff --git a/src/Protocol/ActivityPub/Processor.php b/src/Protocol/ActivityPub/Processor.php
index 311806f8c0..d9dd7ee5b3 100644
--- a/src/Protocol/ActivityPub/Processor.php
+++ b/src/Protocol/ActivityPub/Processor.php
@@ -94,7 +94,7 @@ class Processor
 	 *
 	 * @return string with replaced emojis
 	 */
-	private static function replaceEmojis(int $uri_id, string $body, array $emojis)
+	private static function replaceEmojis(int $uri_id, string $body, array $emojis): string
 	{
 		$body = strtr($body,
 			array_combine(
@@ -616,8 +616,8 @@ class Processor
 			$content = $activity['content'];
 		} else {
 			// By default assume "text/html"
-			$item['title'] = HTML::toBBCode($activity['name'] ??: '');
-			$content = HTML::toBBCode($activity['content'] ?? : '');
+			$item['title'] = HTML::toBBCode($activity['name'] ?? '');
+			$content = HTML::toBBCode($activity['content'] ?? '');
 		}
 
 		$item['title'] = trim(BBCode::toPlaintext($item['title']));
@@ -690,7 +690,7 @@ class Processor
 	 * @param string $url message URL
 	 * @return string with GUID
 	 */
-	private static function getGUIDByURL(string $url)
+	private static function getGUIDByURL(string $url): string
 	{
 		$parsed = parse_url($url);
 
@@ -711,7 +711,7 @@ class Processor
 	 * @param array $item
 	 * @return boolean Is the message wanted?
 	 */
-	private static function isSolicitedMessage(array $activity, array $item)
+	private static function isSolicitedMessage(array $activity, array $item): bool
 	{
 		// The checks are split to improve the support when searching why a message was accepted.
 		if (count($activity['receiver']) != 1) {
@@ -972,7 +972,7 @@ class Processor
 	 * @return int|bool New mail table row id or false on error
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	private static function postMail($activity, $item)
+	private static function postMail(array $activity, array $item)
 	{
 		if (($item['gravity'] != GRAVITY_PARENT) && !DBA::exists('mail', ['uri' => $item['thr-parent'], 'uid' => $item['uid']])) {
 			Logger::info('Parent not found, mail will be discarded.', ['uid' => $item['uid'], 'uri' => $item['thr-parent']]);
@@ -1113,7 +1113,7 @@ class Processor
 	 * @return string fetched message URL
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public static function fetchMissingActivity(string $url, array $child = [], string $relay_actor = '', int $completion = Receiver::COMPLETION_MANUAL)
+	public static function fetchMissingActivity(string $url, array $child = [], string $relay_actor = '', int $completion = Receiver::COMPLETION_MANUAL): string
 	{
 		if (!empty($child['receiver'])) {
 			$uid = ActivityPub\Receiver::getFirstUserFromReceivers($child['receiver']);
@@ -1208,7 +1208,7 @@ class Processor
 	 * @param string $id      object ID
 	 * @return boolean true if message is accepted
 	 */
-	private static function acceptIncomingMessage(array $activity, string $id)
+	private static function acceptIncomingMessage(array $activity, string $id): bool
 	{
 		if (empty($activity['as:object'])) {
 			Logger::info('No object field in activity - accepted', ['id' => $id]);
@@ -1216,7 +1216,7 @@ class Processor
 		}
 
 		$replyto = JsonLD::fetchElement($activity['as:object'], 'as:inReplyTo', '@id');
-		$uriid = ItemURI::getIdByURI($replyto);
+		$uriid = ItemURI::getIdByURI($replyto ?? '');
 		if (Post::exists(['uri-id' => $uriid])) {
 			Logger::info('Post is a reply to an existing post - accepted', ['id' => $id, 'uri-id' => $uriid, 'replyto' => $replyto]);
 			return true;
@@ -1225,8 +1225,7 @@ class Processor
 		$attributed_to = JsonLD::fetchElement($activity['as:object'], 'as:attributedTo', '@id');
 		$authorid = Contact::getIdForURL($attributed_to);
 
-		$value = JsonLD::fetchElement($activity['as:object'], 'as:content', '@value');
-		$body = (!empty($value) ? HTML::toBBCode($value) : '');
+		$body = HTML::toBBCode(JsonLD::fetchElement($activity['as:object'], 'as:content', '@value') ?? '');
 
 		$messageTags = [];
 		$tags = Receiver::processTags(JsonLD::fetchElementArray($activity['as:object'], 'as:tag') ?? []);
@@ -1246,10 +1245,11 @@ class Processor
 	 * perform a "follow" request
 	 *
 	 * @param array $activity
+	 * @return void
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 * @throws \ImagickException
 	 */
-	public static function followUser($activity)
+	public static function followUser(array $activity)
 	{
 		$uid = User::getIdForURL($activity['object_id']);
 		if (empty($uid)) {
@@ -1267,8 +1267,10 @@ class Processor
 			Contact::update(['hub-verify' => $activity['id'], 'protocol' => Protocol::ACTIVITYPUB], ['id' => $cid]);
 		}
 
-		$item = ['author-id' => Contact::getIdForURL($activity['actor']),
-			'author-link' => $activity['actor']];
+		$item = [
+			'author-id' => Contact::getIdForURL($activity['actor']),
+			'author-link' => $activity['actor'],
+		];
 
 		// Ensure that the contact has got the right network type
 		self::switchContact($item['author-id']);
@@ -1297,8 +1299,8 @@ class Processor
 	/**
 	 * Transmit pending events to the new follower
 	 *
-	 * @param integer $cid
-	 * @param integer $uid
+	 * @param integer $cid Contact id
+	 * @param integer $uid User id
 	 * @return void
 	 */
 	private static function transmitPendingEvents(int $cid, int $uid)
@@ -1327,7 +1329,7 @@ class Processor
 	 * @param array $activity
 	 * @throws \Exception
 	 */
-	public static function updatePerson($activity)
+	public static function updatePerson(array $activity)
 	{
 		if (empty($activity['object_id'])) {
 			return;
@@ -1341,9 +1343,10 @@ class Processor
 	 * Delete the given profile
 	 *
 	 * @param array $activity
+	 * @return void
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public static function deletePerson($activity)
+	public static function deletePerson(array $activity)
 	{
 		if (empty($activity['object_id']) || empty($activity['actor'])) {
 			Logger::info('Empty object id or actor.');
@@ -1368,9 +1371,10 @@ class Processor
 	 * Blocks the user by the contact
 	 *
 	 * @param array $activity
+	 * @return void
 	 * @throws \Exception
 	 */
-	public static function blockAccount($activity)
+	public static function blockAccount(array $activity)
 	{
 		$cid = Contact::getIdForURL($activity['actor']);
 		if (empty($cid)) {
@@ -1391,9 +1395,10 @@ class Processor
 	 * Unblocks the user by the contact
 	 *
 	 * @param array $activity
+	 * @return void
 	 * @throws \Exception
 	 */
-	public static function unblockAccount($activity)
+	public static function unblockAccount(array $activity)
 	{
 		$cid = Contact::getIdForURL($activity['actor']);
 		if (empty($cid)) {
@@ -1417,7 +1422,7 @@ class Processor
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 * @throws \ImagickException
 	 */
-	public static function acceptFollowUser($activity)
+	public static function acceptFollowUser(array $activity)
 	{
 		$uid = User::getIdForURL($activity['object_actor']);
 		if (empty($uid)) {
@@ -1451,7 +1456,7 @@ class Processor
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 * @throws \ImagickException
 	 */
-	public static function rejectFollowUser($activity)
+	public static function rejectFollowUser(array $activity)
 	{
 		$uid = User::getIdForURL($activity['object_actor']);
 		if (empty($uid)) {
@@ -1484,7 +1489,7 @@ class Processor
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 * @throws \ImagickException
 	 */
-	public static function undoActivity($activity)
+	public static function undoActivity(array $activity)
 	{
 		if (empty($activity['object_id'])) {
 			return;
@@ -1509,7 +1514,7 @@ class Processor
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 * @throws \ImagickException
 	 */
-	public static function undoFollowUser($activity)
+	public static function undoFollowUser(array $activity)
 	{
 		$uid = User::getIdForURL($activity['object_object']);
 		if (empty($uid)) {
@@ -1544,7 +1549,7 @@ class Processor
 	 * @param integer $cid Contact ID
 	 * @throws \Exception
 	 */
-	private static function switchContact($cid)
+	private static function switchContact(int $cid)
 	{
 		$contact = DBA::selectFirst('contact', ['network', 'url'], ['id' => $cid]);
 		if (!DBA::isResult($contact) || in_array($contact['network'], [Protocol::ACTIVITYPUB, Protocol::DFRN]) || Contact::isLocal($contact['url'])) {
@@ -1564,7 +1569,7 @@ class Processor
 	 * @return array
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	private static function getImplicitMentionList(array $parent)
+	private static function getImplicitMentionList(array $parent): array
 	{
 		$parent_terms = Tag::getByURIId($parent['uri-id'], [Tag::MENTION, Tag::IMPLICIT_MENTION, Tag::EXCLUSIVE_MENTION]);
 
@@ -1602,7 +1607,7 @@ class Processor
 	 * @param array $parent
 	 * @return string
 	 */
-	private static function removeImplicitMentionsFromBody(string $body, array $parent)
+	private static function removeImplicitMentionsFromBody(string $body, array $parent): string
 	{
 		if (DI::config()->get('system', 'disable_implicit_mentions')) {
 			return $body;