UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-11-14 02:24:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1125 from pixelfed/frontend-ui-refactor

Browse source 
Frontend ui refactor
This commit is contained in:
daniel 2019-04-04 23:20:39 -06:00 committed by GitHub
commit 5971a4144e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/Util/ActivityPub/Helpers.php
View file

@ -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,6 +295,7 @@ 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 = DB::transaction(function() use($profile, $res, $url, $ts, $reply_to, $cw, $scope) {
$status = new Status; $status = new Status;
$status->profile_id = $profile->id; $status->profile_id = $profile->id;
$status->url = isset($res['url']) ? $res['url'] : $url; $status->url = isset($res['url']) ? $res['url'] : $url;
@ -308,8 +309,10 @@ class Helpers {
$status->scope = $scope; $status->scope = $scope;
$status->visibility = $scope; $status->visibility = $scope;
$status->save(); $status->save();
self::importNoteAttachment($res, $status); self::importNoteAttachment($res, $status);
return $status;
});
return $status; return $status;
} }

25
app/Util/ActivityPub/Inbox.php
View file

@ -122,13 +122,16 @@ class Inbox
{ {
$activity = $this->payload['object']; $activity = $this->payload['object'];
$actor = $this->actorFirstOrCreate($this->payload['actor']); $actor = $this->actorFirstOrCreate($this->payload['actor']);
if(!$actor || $actor->domain == null) {
return;
}
$inReplyTo = $activity['inReplyTo']; $inReplyTo = $activity['inReplyTo'];
$url = $activity['id']; $url = $activity['id'];
if(!Helpers::statusFirstOrFetch($url, true)) { Helpers::statusFirstOrFetch($url, true);
return; return;
} }
}
public function handleNoteCreate() public function handleNoteCreate()
{ {
@ -139,7 +142,6 @@ class Inbox
} }
if(Helpers::userInAudience($this->profile, $this->payload) == false) { if(Helpers::userInAudience($this->profile, $this->payload) == false) {
//Log::error('AP:inbox:userInAudience:false - Activity#'.$this->logger->id);
return; return;
} }
@ -147,21 +149,8 @@ class Inbox
if(Status::whereUrl($url)->exists()) { if(Status::whereUrl($url)->exists()) {
return; return;
} }
Helpers::statusFirstOrFetch($url, false);
$status = DB::transaction(function() use($activity, $actor, $url) { return;
$caption = str_limit(strip_tags($activity['content']), config('pixelfed.max_caption_length'));
$status = new Status;
$status->profile_id = $actor->id;
$status->caption = strip_tags($caption);
$status->rendered = Purify::clean($caption);
$status->visibility = $status->scope = 'public';
$status->uri = $url;
$status->url = $url;
$status->save();
return $status;
});
Helpers::importNoteAttachment($activity, $status);
} }
public function handleFollowActivity() public function handleFollowActivity()