Commit 587ee91b authored by Ben Hayward's avatar Ben Hayward

Refactored

1 merge request!384[Sprint/QuietQuail](fix): Blog & media edit updated to new nsfw system #1936
Pipeline #100731088 passed with stages
in 7 minutes and 2 seconds
......@@ -337,8 +337,7 @@ class newsfeed implements Interfaces\Api
->setURL($embeded->getURL())
->setThumbnail($embeded->getIconUrl())
->setFromEntity($embeded)
->setMessage($message)
->setNsfw($embeded->getNSFW());
->setMessage($message);
} else {
$activity->setRemind((new Activity())
->setTimeCreated($embeded->time_created)
......@@ -348,8 +347,7 @@ class newsfeed implements Interfaces\Api
->setThumbnail($embeded->getIconUrl())
->setFromEntity($embeded)
->export())
->setMessage($message)
->setNsfw($embeded->getNSFW());
->setMessage($message);
}
$save->setEntity($activity)
->save();
......@@ -364,7 +362,6 @@ class newsfeed implements Interfaces\Api
'full_hd' => $embeded->getFlag('full_hd') ?? false,
])
->setTitle($embeded->title)
->setNsfw($embeded->getNSFW())
->setBlurb($embeded->description)
->setMessage($message);
} else {
......@@ -379,7 +376,6 @@ class newsfeed implements Interfaces\Api
'mature' => $embeded instanceof Flaggable ? $embeded->getFlag('mature') : false
])
->setMature($embeded instanceof Flaggable ? $embeded->getFlag('mature') : false)
->setNsfw($embeded->getNSFW())
->setTitle($embeded->title)
->setBlurb($embeded->description)
->export()
......@@ -400,7 +396,6 @@ class newsfeed implements Interfaces\Api
'gif' => (bool) $embeded->gif ?? false,
]])
->setMature($embeded instanceof Flaggable ? $embeded->getFlag('mature') : false)
->setNsfw($embeded->getNSFW())
->setFromEntity($embeded)
->setTitle($embeded->title)
->setBlurb($embeded->description)
......@@ -418,7 +413,6 @@ class newsfeed implements Interfaces\Api
'gif' => (bool) $embeded->gif ?? false,
]])
->setMature($embeded instanceof Flaggable ? $embeded->getFlag('mature') : false)
->setNsfw($embeded->getNSFW())
->setFromEntity($embeded)
->setTitle($embeded->title)
->setBlurb($embeded->description)
......
......@@ -212,7 +212,6 @@ class Repository
if (isset($fields['published'])) {
$fields['published'] = $fields['published'] ? '1' : '0';
}
if (!$fields) {
return $guid;
}
......
......@@ -225,10 +225,6 @@ class Video extends MindsObject
continue;
}
if (in_array($field, ['nsfw'], true)) {
$this->nsfw = !is_array($data['nsfw']) ? json_decode($data['nsfw']) : $data['nsfw'];
}
$this->$field = $data[$field];
}
......
Please register or to comment