forked from mirror/pixelfed
Update APHelpers
This commit is contained in:
parent
c86f36d53d
commit
5d2f93bd6d
1 changed files with 18 additions and 15 deletions
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
namespace App\Util\ActivityPub;
|
namespace App\Util\ActivityPub;
|
||||||
|
|
||||||
use Cache, Purify, Storage, Request, Validator;
|
use DB, Cache, Purify, Storage, Request, Validator;
|
||||||
use App\{
|
use App\{
|
||||||
Activity,
|
Activity,
|
||||||
Follower,
|
Follower,
|
||||||
|
@ -295,21 +295,24 @@ class Helpers {
|
||||||
$reply_to = null;
|
$reply_to = null;
|
||||||
}
|
}
|
||||||
$ts = is_array($res['published']) ? $res['published'][0] : $res['published'];
|
$ts = is_array($res['published']) ? $res['published'][0] : $res['published'];
|
||||||
$status = new Status;
|
$status = DB::transaction(function() use($profile, $res, $url, $ts, $reply_to, $cw, $scope) {
|
||||||
$status->profile_id = $profile->id;
|
$status = new Status;
|
||||||
$status->url = isset($res['url']) ? $res['url'] : $url;
|
$status->profile_id = $profile->id;
|
||||||
$status->uri = isset($res['url']) ? $res['url'] : $url;
|
$status->url = isset($res['url']) ? $res['url'] : $url;
|
||||||
$status->caption = strip_tags($res['content']);
|
$status->uri = isset($res['url']) ? $res['url'] : $url;
|
||||||
$status->rendered = Purify::clean($res['content']);
|
$status->caption = strip_tags($res['content']);
|
||||||
$status->created_at = Carbon::parse($ts);
|
$status->rendered = Purify::clean($res['content']);
|
||||||
$status->in_reply_to_id = $reply_to;
|
$status->created_at = Carbon::parse($ts);
|
||||||
$status->local = false;
|
$status->in_reply_to_id = $reply_to;
|
||||||
$status->is_nsfw = $cw;
|
$status->local = false;
|
||||||
$status->scope = $scope;
|
$status->is_nsfw = $cw;
|
||||||
$status->visibility = $scope;
|
$status->scope = $scope;
|
||||||
$status->save();
|
$status->visibility = $scope;
|
||||||
|
$status->save();
|
||||||
|
self::importNoteAttachment($res, $status);
|
||||||
|
return $status;
|
||||||
|
});
|
||||||
|
|
||||||
self::importNoteAttachment($res, $status);
|
|
||||||
|
|
||||||
return $status;
|
return $status;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue