Commit 51de081b authored by Ben Hayward's avatar Ben Hayward

Fixed up

1 merge request!384[Sprint/QuietQuail](fix): Blog & media edit updated to new nsfw system #1936
Pipeline #93606182 passed with stages
in 10 minutes and 24 seconds
......@@ -271,7 +271,7 @@ class blog implements Interfaces\Api
}
if ($blog->isMonetized()) {
if ($blog->isNsfw()) {
if ($blog->getNsfw()) {
return Factory::response([
'status' => 'error',
'message' => 'Cannot monetize an explicit blog'
......
......@@ -337,7 +337,8 @@ class newsfeed implements Interfaces\Api
->setURL($embeded->getURL())
->setThumbnail($embeded->getIconUrl())
->setFromEntity($embeded)
->setMessage($message);
->setMessage($message)
->setNsfw($embeded instanceof Flaggable ? $embeded->getFlag('nsfw') : false);
} else {
$activity->setRemind((new Activity())
->setTimeCreated($embeded->time_created)
......@@ -347,7 +348,8 @@ class newsfeed implements Interfaces\Api
->setThumbnail($embeded->getIconUrl())
->setFromEntity($embeded)
->export())
->setMessage($message);
->setMessage($message)
->setNsfw($embeded instanceof Flaggable ? $embeded->getFlag('nsfw') : false);
}
$save->setEntity($activity)
->save();
......@@ -361,6 +363,7 @@ class newsfeed implements Interfaces\Api
'mature' => $embeded instanceof Flaggable ? $embeded->getFlag('mature') : false
])
->setTitle($embeded->title)
->setNsfw($embeded instanceof Flaggable ? $embeded->getFlag('nsfw') : false)
->setBlurb($embeded->description)
->setMessage($message);
} else {
......@@ -375,6 +378,7 @@ class newsfeed implements Interfaces\Api
'mature' => $embeded instanceof Flaggable ? $embeded->getFlag('mature') : false
])
->setMature($embeded instanceof Flaggable ? $embeded->getFlag('mature') : false)
->setNsfw($embeded instanceof Flaggable ? $embeded->getFlag('nsfw') : false)
->setTitle($embeded->title)
->setBlurb($embeded->description)
->export()
......@@ -395,6 +399,7 @@ class newsfeed implements Interfaces\Api
'gif' => (bool) $embeded->gif ?? false,
]])
->setMature($embeded instanceof Flaggable ? $embeded->getFlag('mature') : false)
->setNsfw($embeded instanceof Flaggable ? $embeded->getFlag('nsfw') : false)
->setFromEntity($embeded)
->setTitle($embeded->title)
->setBlurb($embeded->description)
......@@ -538,6 +543,7 @@ class newsfeed implements Interfaces\Api
$activity = new Activity();
$activity->setMature(isset($_POST['mature']) && !!$_POST['mature']);
$activity->setNsfw($_POST['nsfw'] ?? []);
$user = Core\Session::getLoggedInUser();
......
......@@ -52,14 +52,13 @@ class CreateActivity
}
$owner = $blog->getOwnerEntity();
$activity = (new Activity())
->setTitle($blog->getTitle())
->setBlurb(strip_tags($blog->getBody()))
->setURL($blog->getURL())
->setThumbnail($blog->getIconUrl())
->setFromEntity($blog)
->setMature($blog->isMature())
->setNsfw($blog->getNsfw())
->setOwner($owner->export())
->setWireThreshold($blog->getWireThreshold())
->setPaywall($blog->isPaywall());
......
......@@ -56,9 +56,9 @@ class CreateActivitySpec extends ObjectBehavior
->shouldBeCalled()
->willReturn('http://phpspec/icon.spec.ext');
$blog->isMature()
$blog->getNsfw()
->shouldBeCalled()
->willReturn(false);
->willReturn([]);
$blog->getWireThreshold()
->shouldBeCalled()
......
Please register or to comment