Merge pull request #1886 from pixelfed/staging

Staging
This commit is contained in:
daniel 2019-12-09 00:50:34 -07:00 committed by GitHub
commit 4e7b5b79d3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 142 additions and 9 deletions

View file

@ -62,10 +62,23 @@ class RegisterController extends Controller
'max:15', 'max:15',
'unique:users', 'unique:users',
function ($attribute, $value, $fail) { function ($attribute, $value, $fail) {
$dash = substr_count($value, '-');
$underscore = substr_count($value, '_');
$period = substr_count($value, '.');
if(($dash + $underscore + $period) > 1) {
return $fail('Username is invalid. Can only contain one dash (-), period (.) or underscore (_).');
}
if (!ctype_alpha($value[0])) { if (!ctype_alpha($value[0])) {
return $fail('Username is invalid. Must start with a letter or number.'); return $fail('Username is invalid. Must start with a letter or number.');
} }
$val = str_replace(['_', '-', '.'], '', $value);
if (!ctype_alnum($value[strlen($value) - 1])) {
return $fail('Username is invalid. Must end with a letter or number.');
}
$val = str_replace(['_', '.', '-'], '', $value);
if(!ctype_alnum($val)) { if(!ctype_alnum($val)) {
return $fail('Username is invalid. Username must be alpha-numeric and may contain dashes (-), periods (.) and underscores (_).'); return $fail('Username is invalid. Username must be alpha-numeric and may contain dashes (-), periods (.) and underscores (_).');
} }
@ -77,7 +90,7 @@ class RegisterController extends Controller
'name' => 'nullable|string|max:'.config('pixelfed.max_name_length'), 'name' => 'nullable|string|max:'.config('pixelfed.max_name_length'),
'username' => $usernameRules, 'username' => $usernameRules,
'email' => 'required|string|email|max:255|unique:users', 'email' => 'required|string|email|max:255|unique:users',
'password' => 'required|string|min:8|confirmed', 'password' => 'required|string|min:12|confirmed',
]; ];
return Validator::make($data, $rules); return Validator::make($data, $rules);
@ -145,8 +158,11 @@ class RegisterController extends Controller
*/ */
public function register(Request $request) public function register(Request $request)
{ {
abort_if(config('pixelfed.open_registration') == false, 400);
$count = User::count(); $count = User::count();
$limit = config('pixelfed.max_users'); $limit = config('pixelfed.max_users');
if(false == config('pixelfed.open_registration') || $limit && $limit <= $count) { if(false == config('pixelfed.open_registration') || $limit && $limit <= $count) {
return abort(403); return abort(403);
} }

View file

@ -22,6 +22,7 @@ use League\Fractal;
use App\Transformer\Api\{ use App\Transformer\Api\{
AccountTransformer, AccountTransformer,
StatusTransformer, StatusTransformer,
// StatusMediaContainerTransformer,
}; };
use App\Util\Media\Filter; use App\Util\Media\Filter;
use App\Jobs\StatusPipeline\NewStatusPipeline; use App\Jobs\StatusPipeline\NewStatusPipeline;
@ -89,7 +90,8 @@ class InternalApiController extends Controller
->whereDate('created_at', '>', now()->subMonths(3)) ->whereDate('created_at', '>', now()->subMonths(3))
->with('media') ->with('media')
->inRandomOrder() ->inRandomOrder()
->take(36) ->latest()
->take(37)
->get(); ->get();
$res = [ $res = [
@ -264,6 +266,7 @@ class InternalApiController extends Controller
$attachments = []; $attachments = [];
$status = new Status; $status = new Status;
$mimes = []; $mimes = [];
$place = $request->input('place');
$cw = $request->input('cw'); $cw = $request->input('cw');
foreach($medias as $k => $media) { foreach($medias as $k => $media) {
@ -287,8 +290,8 @@ class InternalApiController extends Controller
array_push($mimes, $m->mime); array_push($mimes, $m->mime);
} }
if($request->filled('place')) { if($place && is_array($place)) {
$status->place_id = $request->input('place')['id']; $status->place_id = $place['id'];
} }
if($request->filled('comments_disabled')) { if($request->filled('comments_disabled')) {
@ -298,7 +301,6 @@ class InternalApiController extends Controller
$status->caption = strip_tags($request->caption); $status->caption = strip_tags($request->caption);
$status->scope = 'draft'; $status->scope = 'draft';
$status->profile_id = $profile->id; $status->profile_id = $profile->id;
$status->save(); $status->save();
foreach($attachments as $media) { foreach($attachments as $media) {
@ -306,6 +308,10 @@ class InternalApiController extends Controller
$media->save(); $media->save();
} }
// $resource = new Fractal\Resource\Collection($status->media()->orderBy('order')->get(), new StatusMediaContainerTransformer());
// $mediaContainer = $this->fractal->createData($resource)->toArray();
// $status->media_container = json_encode($mediaContainer);
$visibility = $profile->unlisted == true && $visibility == 'public' ? 'unlisted' : $visibility; $visibility = $profile->unlisted == true && $visibility == 'public' ? 'unlisted' : $visibility;
$cw = $profile->cw == true ? true : $cw; $cw = $profile->cw == true ? true : $cw;
$status->is_nsfw = $cw; $status->is_nsfw = $cw;
@ -334,4 +340,115 @@ class InternalApiController extends Controller
return response()->json($res); return response()->json($res);
} }
public function remoteProfile(Request $request, $id)
{
$profile = Profile::whereNull('status')
->whereNotNull('domain')
->findOrFail($id);
$settings = [
'crawlable' => false,
'following' => [
'count' => true,
'list' => false
],
'followers' => [
'count' => true,
'list' => false
]
];
return view('profile.show', compact('profile', 'settings'));
}
public function accountStatuses(Request $request, $id)
{
$this->validate($request, [
'only_media' => 'nullable',
'pinned' => 'nullable',
'exclude_replies' => 'nullable',
'max_id' => 'nullable|integer|min:0|max:' . PHP_INT_MAX,
'since_id' => 'nullable|integer|min:0|max:' . PHP_INT_MAX,
'min_id' => 'nullable|integer|min:0|max:' . PHP_INT_MAX,
'limit' => 'nullable|integer|min:1|max:24'
]);
$profile = Profile::whereNull('status')->findOrFail($id);
$limit = $request->limit ?? 9;
$max_id = $request->max_id;
$min_id = $request->min_id;
$scope = $request->only_media == true ?
['photo', 'photo:album', 'video', 'video:album'] :
['photo', 'photo:album', 'video', 'video:album', 'share', 'reply'];
if($profile->is_private) {
if(!Auth::check()) {
return response()->json([]);
}
$pid = Auth::user()->profile->id;
$following = Cache::remember('profile:following:'.$pid, now()->addMinutes(1440), function() use($pid) {
$following = Follower::whereProfileId($pid)->pluck('following_id');
return $following->push($pid)->toArray();
});
$visibility = true == in_array($profile->id, $following) ? ['public', 'unlisted', 'private'] : [];
} else {
if(Auth::check()) {
$pid = Auth::user()->profile->id;
$following = Cache::remember('profile:following:'.$pid, now()->addMinutes(1440), function() use($pid) {
$following = Follower::whereProfileId($pid)->pluck('following_id');
return $following->push($pid)->toArray();
});
$visibility = true == in_array($profile->id, $following) ? ['public', 'unlisted', 'private'] : ['public', 'unlisted'];
} else {
$visibility = ['public', 'unlisted'];
}
}
$dir = $min_id ? '>' : '<';
$id = $min_id ?? $max_id;
$timeline = Status::select(
'id',
'uri',
'caption',
'rendered',
'profile_id',
'type',
'in_reply_to_id',
'reblog_of_id',
'is_nsfw',
'likes_count',
'reblogs_count',
'scope',
'local',
'created_at',
'updated_at'
)->whereProfileId($profile->id)
->whereIn('type', $scope)
->where('id', $dir, $id)
->whereIn('visibility', $visibility)
->latest()
->limit($limit)
->get();
$resource = new Fractal\Resource\Collection($timeline, new StatusTransformer());
$res = $this->fractal->createData($resource)->toArray();
return response()->json($res);
}
public function remoteStatus(Request $request, $profileId, $statusId)
{
$user = Profile::whereNull('status')
->whereNotNull('domain')
->findOrFail($profileId);
$status = Status::whereProfileId($user->id)
->whereNull('reblog_of_id')
->whereVisibility('public')
->findOrFail($statusId);
$template = $status->in_reply_to_id ? 'status.reply' : 'status.show';
return view($template, compact('user', 'status'));
}
} }

View file

@ -70,7 +70,7 @@ return [
'redis' => [ 'redis' => [
'driver' => 'redis', 'driver' => 'redis',
'client' => 'predis', 'client' => env('REDIS_CLIENT', 'predis'),
'default' => [ 'default' => [
'scheme' => env('REDIS_SCHEME', 'tcp'), 'scheme' => env('REDIS_SCHEME', 'tcp'),

View file

@ -106,7 +106,7 @@ return [
'redis' => [ 'redis' => [
'client' => 'predis', 'client' => env('REDIS_CLIENT', 'predis'),
'default' => [ 'default' => [
'scheme' => env('REDIS_SCHEME', 'tcp'), 'scheme' => env('REDIS_SCHEME', 'tcp'),