chris/pixelfed
1
0
Fork 0
forked from mirror/pixelfed
Code Pull requests Activity

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

Browse source 
Frontend ui refactor
This commit is contained in:
daniel 2019-04-04 14:51:44 -06:00 committed by GitHub
commit 15d4aff821
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Jobs/FollowPipeline/FollowActivityPubDeliver.php
View file

@ -49,7 +49,7 @@ class FollowActivityPubDeliver implements ShouldQueue
$actor = $follow->actor; $actor = $follow->actor;
$target = $follow->target; $target = $follow->target;
if($target->domain == null || $target->inbox_url == null) { if($target->domain == null || $target->inbox_url == null || !$actor->private_key) {
return; return;
} }

4
app/Jobs/FollowPipeline/FollowPipeline.php
View file

@ -46,6 +46,10 @@ class FollowPipeline implements ShouldQueue
$actor = $follower->actor; $actor = $follower->actor;
$target = $follower->target; $target = $follower->target;
if($target->domain || !$target->private_key) {
return;
}
try { try {
$notification = new Notification(); $notification = new Notification();
$notification->profile_id = $target->id; $notification->profile_id = $target->id;

5
app/Jobs/RemoteFollowPipeline/RemoteFollowImportRecent.php
View file

@ -186,6 +186,11 @@ class RemoteFollowImportRecent implements ShouldQueue
Log::info('Invalid media, skipping. '.$mime); Log::info('Invalid media, skipping. '.$mime);
continue; continue;
} }
if (Helpers::validateUrl($url) == false) {
Log::info('Skipping invalid attachment URL: ' . $url);
continue;
}
$count++; $count++;
if ($count === 1) { if ($count === 1) {