Merge branch 'dev' of github.com:BinaryStudioAcademy/thread-php into feature/no-content-fix

# Conflicts:
#	frontend/src/components/view/feed/FeedContainer.vue

Author: nemoipaha

backend/.env.example

@@ -52,3 +52,4 @@ APP_PORT=7777
 MYSQL_PORT_TEST_DB=33062
 
 BEANSTALKD_HOST=
+FILESYSTEM_DRIVER=public

backend/app/Action/Auth/UploadProfileImageAction.php

@@ -5,37 +5,31 @@
 namespace App\Action\Auth;
 
 use App\Repository\UserRepository;
-use Illuminate\Filesystem\FilesystemManager;
 use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Storage;
+use Illuminate\Support\Facades\Config;
 
 final class UploadProfileImageAction
 {
-    private const UPLOAD_DIR = 'profile-images';
-
     private $userRepository;
-    private $filesystemManager;
 
-    public function __construct(UserRepository $userRepository, FilesystemManager $filesystemManager)
+    public function __construct(UserRepository $userRepository)
     {
         $this->userRepository = $userRepository;
-        $this->filesystemManager = $filesystemManager;
     }
 
     public function execute(UploadProfileImageRequest $request): UploadProfileImageResponse
     {
         $user = Auth::user();
 
-        $disk = $this->filesystemManager->disk('public');
-
-        $filePath = $disk->putFileAs(
-            self::UPLOAD_DIR,
+        $filePath = Storage::putFileAs(
+            Config::get('filesystems.profile_images_dir'),
             $request->getImage(),
-            $user->id,
+            $request->getImage()->hashName(),
             'public'
         );
 
-        // added timestamp to url to let browser know that image was changed
-        $user->profile_image = $disk->url($filePath) . '?t=' . time();
+        $user->profile_image = Storage::url($filePath);
 
         $user = $this->userRepository->save($user);
 

backend/app/Action/Tweet/AddTweetAction.php

@@ -7,6 +7,7 @@
 use App\Entity\Tweet;
 use App\Repository\TweetRepository;
 use Illuminate\Support\Facades\Auth;
+use App\Events\TweetAddedEvent;
 
 final class AddTweetAction
 {
@@ -24,6 +25,8 @@ public function execute(AddTweetRequest $request): AddTweetResponse
         $tweet->text = $request->getText();
 
         $tweet = $this->tweetRepository->save($tweet);
+        
+        broadcast(new TweetAddedEvent($tweet))->toOthers();
 
         return new AddTweetResponse($tweet);
     }

backend/app/Events/TweetAddedEvent.php

@@ -0,0 +1,36 @@
+<?php
+
+namespace App\Events;
+
+use Illuminate\Broadcasting\Channel;
+use Illuminate\Queue\SerializesModels;
+use Illuminate\Broadcasting\PrivateChannel;
+use Illuminate\Broadcasting\PresenceChannel;
+use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Broadcasting\InteractsWithSockets;
+use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
+use App\Entity\Tweet;
+use App\Http\Presenter\Tweet\TweetArrayPresenter;
+use Illuminate\Support\Facades\App;
+
+class TweetAddedEvent implements ShouldBroadcast
+{
+    use Dispatchable, InteractsWithSockets, SerializesModels;
+
+    public $tweet;
+
+    public function __construct(Tweet $tweet)
+    {
+        $this->tweet = App::make(TweetArrayPresenter::class)->present($tweet);
+    }
+
+    public function broadcastAs(): string
+    {
+        return 'tweet.added';
+    }
+
+    public function broadcastOn(): PrivateChannel
+    {
+        return new PrivateChannel('tweets');
+    }
+}

backend/app/Providers/BroadcastServiceProvider.php

@@ -14,7 +14,9 @@ class BroadcastServiceProvider extends ServiceProvider
      */
     public function boot()
     {
-        Broadcast::routes();
+        Broadcast::routes([
+            'middleware' => ['api']
+        ]);
 
         require base_path('routes/channels.php');
     }

backend/composer.json

@@ -17,6 +17,7 @@
         "laravel/framework": "5.8.*",
         "laravel/tinker": "^1.0",
         "pda/pheanstalk": "^4.0",
+        "pusher/pusher-php-server": "^3.4",
         "tymon/jwt-auth": "1.0.*"
     },
     "require-dev": {

backend/composer.lock

@@ -171,7 +171,7 @@
          */
         App\Providers\AppServiceProvider::class,
         App\Providers\AuthServiceProvider::class,
-        // App\Providers\BroadcastServiceProvider::class,
+        App\Providers\BroadcastServiceProvider::class,
         App\Providers\EventServiceProvider::class,
         App\Providers\RouteServiceProvider::class,
 

backend/config/app.php

@@ -66,6 +66,7 @@
 
     ],
 
-    'tweet_images_dir' => 'tweet-images'
+    'tweet_images_dir' => 'tweet-images',
+    'profile_images_dir' => 'profile-images'
 
 ];

backend/config/filesystems.php

@@ -14,3 +14,7 @@
 Broadcast::channel('App.User.{id}', function ($user, $id) {
     return (int) $user->id === (int) $id;
 });
+
+Broadcast::channel('tweets', function () {
+    return true;
+});