This commit is contained in:
Diogo Cordeiro 2018-07-31 23:11:44 +01:00
parent 3c021db5f0
commit 80265024a7
2 changed files with 36 additions and 29 deletions

View File

@ -91,32 +91,35 @@ class apSharedInboxAction extends ManagedAction
// Process request // Process request
switch ($data->type) { switch ($data->type) {
case "Create": // Data available:
require_once __DIR__ . DIRECTORY_SEPARATOR . "inbox" . DIRECTORY_SEPARATOR . "Create.php"; // Profile $actor_profile
break; // string|object $data->object
case "Follow": case "Create":
require_once __DIR__ . DIRECTORY_SEPARATOR . "inbox" . DIRECTORY_SEPARATOR . "Follow.php"; require_once __DIR__ . DIRECTORY_SEPARATOR . "inbox" . DIRECTORY_SEPARATOR . "Create.php";
break; break;
case "Like": case "Follow":
require_once __DIR__ . DIRECTORY_SEPARATOR . "inbox" . DIRECTORY_SEPARATOR . "Like.php"; require_once __DIR__ . DIRECTORY_SEPARATOR . "inbox" . DIRECTORY_SEPARATOR . "Follow.php";
break; break;
case "Announce": case "Like":
require_once __DIR__ . DIRECTORY_SEPARATOR . "inbox" . DIRECTORY_SEPARATOR . "Announce.php"; require_once __DIR__ . DIRECTORY_SEPARATOR . "inbox" . DIRECTORY_SEPARATOR . "Like.php";
break; break;
case "Undo": case "Announce":
require_once __DIR__ . DIRECTORY_SEPARATOR . "inbox" . DIRECTORY_SEPARATOR . "Undo.php"; require_once __DIR__ . DIRECTORY_SEPARATOR . "inbox" . DIRECTORY_SEPARATOR . "Announce.php";
break; break;
case "Delete": case "Undo":
require_once __DIR__ . DIRECTORY_SEPARATOR . "inbox" . DIRECTORY_SEPARATOR . "Delete.php"; require_once __DIR__ . DIRECTORY_SEPARATOR . "inbox" . DIRECTORY_SEPARATOR . "Undo.php";
break; break;
case "Accept": case "Delete":
require_once __DIR__ . DIRECTORY_SEPARATOR . "inbox" . DIRECTORY_SEPARATOR . "Accept.php"; require_once __DIR__ . DIRECTORY_SEPARATOR . "inbox" . DIRECTORY_SEPARATOR . "Delete.php";
break; break;
case "Reject": case "Accept":
require_once __DIR__ . DIRECTORY_SEPARATOR . "inbox" . DIRECTORY_SEPARATOR . "Reject.php"; require_once __DIR__ . DIRECTORY_SEPARATOR . "inbox" . DIRECTORY_SEPARATOR . "Accept.php";
break; break;
default: case "Reject":
ActivityPubReturn::error("Invalid type value."); require_once __DIR__ . DIRECTORY_SEPARATOR . "inbox" . DIRECTORY_SEPARATOR . "Reject.php";
} break;
default:
ActivityPubReturn::error("Invalid type value.");
}
} }
} }

View File

@ -30,8 +30,12 @@ if (!defined('GNUSOCIAL')) {
} }
try { try {
ActivityPubPlugin::get_local_notice_from_url($data->object->id)->repeat($actor_profile, "ActivityPub"); if (isset($data->object->id)) {
ActivityPubReturn::answer("Notice repeated successfully."); ActivityPubPlugin::get_local_notice_from_url($data->object->id)->repeat($actor_profile, "ActivityPub");
ActivityPubReturn::answer("Notice repeated successfully.");
} else {
ActivityPubReturn::error('No object id was specified.');
}
} catch (Exception $e) { } catch (Exception $e) {
ActivityPubReturn::error($e->getMessage(), 403); ActivityPubReturn::error($e->getMessage(), 403);
} }