Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/Http/Controllers/Api/GlobalController.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ class GlobalController extends Controller
public function getRandomUsers()
{
try {
$randomUsers = User::inRandomOrder()->limit(10)->get();

$suggested = User::inRandomOrder()->limit(5)->get();
$following = User::inRandomOrder()->limit(10)->get();

return response()->json([
'suggested' => new UsersCollection($suggested),
'following' => new UsersCollection($following)
], 200);
} catch (\Exception $e) {
return response()->json(['error' => $e->getMessage()], 400);
Expand Down
4 changes: 3 additions & 1 deletion app/Http/Controllers/Api/HomeController.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

use App\Http\Controllers\Controller;
use App\Http\Resources\AllPostsCollection;
use App\Http\Resources\UsersCollection;
use App\Models\Post;
use App\Models\User;

Expand All @@ -15,10 +16,11 @@ class HomeController extends Controller
public function index()
{
try {
$posts = Post::orderBy('created_at', 'desc')->get();
$posts = Post::inRandomOrder()->limit(20)->get();
return response()->json(new AllPostsCollection($posts), 200);
} catch (\Exception $e) {
return response()->json(['error' => $e->getMessage()], 400);
}
}

}
8 changes: 6 additions & 2 deletions app/Http/Controllers/Api/PostController.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,20 @@ class PostController extends Controller
*/
public function store(Request $request)
{

$request->validate([
'video' => 'required|mimes:mp4',
'text' => 'required'
]);

try {
$post = new Post;
$post = (new FileService)->addVideo($post, $request);

$post->user_id = auth()->user()->id;
if (isset($request->user_id)) {
$post->user_id = $request->user_id;
} else {
$post->user_id = auth()->user()->id;
}
$post->text = $request->input('text');
$post->save();

Expand Down
8 changes: 6 additions & 2 deletions app/Services/FileService.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
namespace App\Services;

use Image;
use Illuminate\Support\Str;


class FileService
{
Expand Down Expand Up @@ -39,8 +41,10 @@ public function addVideo($model, $request)
{
$video = $request->file('video');
$extension = $video->getClientOriginalExtension();
$name = time() . '.' . $extension;
$video->move(public_path() . '/files/', $name);

$name = str::random() . '.' . $extension;
copy($video->path(), public_path() . '/files/' . $name);
//$video->move(public_path() . '/files/', $name); //TODO UNCOMMENT THIS LINE AND DELETE THE LINE ABOVE
$model->video = '/files/' . $name;

return $model;
Expand Down
3 changes: 2 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
"intervention/image": "^2.7",
"laravel/framework": "^10.0",
"laravel/sanctum": "^3.2",
"laravel/tinker": "^2.8"
"laravel/tinker": "^2.8",
"ext-fileinfo": "*"
},
"require-dev": {
"fakerphp/faker": "^1.9.1",
Expand Down
Loading