From 9b4ee66af718d6700304c64692bcbcc21631b124 Mon Sep 17 00:00:00 2001
From: Arthur Monney <monneylobe@gmail.com>
Date: Wed, 15 Mar 2023 22:24:53 +0100
Subject: [PATCH] :recycle: Update activities on user profile

---
 app/Models/Discussion.php                                | 5 -----
 .../views/components/feeds/created_article.blade.php     | 9 +++++++--
 .../views/components/feeds/created_discussion.blade.php  | 5 ++++-
 resources/views/components/feeds/created_reply.blade.php | 9 +++++----
 resources/views/livewire/user/activities.blade.php       | 8 +++++++-
 5 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/app/Models/Discussion.php b/app/Models/Discussion.php
index 3ba2dae0..a7b32cf3 100644
--- a/app/Models/Discussion.php
+++ b/app/Models/Discussion.php
@@ -78,11 +78,6 @@ class Discussion extends Model implements ReactableInterface, ReplyInterface, Su
 
     protected $removeViewsOnDelete = true;
 
-    public static function boot()
-    {
-        parent::boot();
-    }
-
     /**
      * Get the route key for the model.
      *
diff --git a/resources/views/components/feeds/created_article.blade.php b/resources/views/components/feeds/created_article.blade.php
index 403319bb..c7471fdc 100644
--- a/resources/views/components/feeds/created_article.blade.php
+++ b/resources/views/components/feeds/created_article.blade.php
@@ -14,10 +14,15 @@
                 </div>
                 <div class="min-w-0 flex-1">
                     <div>
-                        <p class="text-sm text-skin-base">a créé l'article <a href="{{ route('articles.show', $activity->subject) }}" class="font-medium text-skin-primary hover:text-skin-primary-hover">{{ $activity->subject->title }}</a></p>
+                        <p class="text-sm text-skin-base">
+                            {{ __('a créé l\'article') }}
+                            <a href="{{ route('articles.show', $activity->subject) }}" class="font-medium text-skin-primary hover:text-skin-primary-hover">{{ $activity->subject->title }}</a>
+                        </p>
                     </div>
                     <div class="mt-1.5 text-sm whitespace-nowrap text-skin-muted font-sans">
-                        <time datetime="{{ $activity->created_at->format('Y-m-d') }}">{{ $activity->created_at->diffForHumans() }}</time>
+                        <time datetime="{{ $activity->created_at->format('Y-m-d') }}">
+                            {{ $activity->created_at->diffForHumans() }}
+                        </time>
                     </div>
                 </div>
             </div>
diff --git a/resources/views/components/feeds/created_discussion.blade.php b/resources/views/components/feeds/created_discussion.blade.php
index 9d6ca82d..8f4c2335 100644
--- a/resources/views/components/feeds/created_discussion.blade.php
+++ b/resources/views/components/feeds/created_discussion.blade.php
@@ -13,7 +13,10 @@
             </div>
             <div class="min-w-0 flex-1">
                 <div>
-                    <p class="text-sm text-skin-base">a démarré une conversation <a href="{{ route('discussions.show', $activity->subject) }}" class="font-medium text-skin-primary hover:text-skin-primary-hover">{{ $activity->subject->title }}</a></p>
+                    <p class="text-sm text-skin-base">
+                        {{ __('a démarré une conversation') }}
+                        <a href="{{ route('discussions.show', $activity->subject) }}" class="font-medium text-skin-primary hover:text-skin-primary-hover">{{ $activity->subject->title }}</a>
+                    </p>
                 </div>
                 <div class="mt-1.5 text-sm whitespace-nowrap text-skin-muted font-sans">
                     <time datetime="{{ $activity->created_at->format('Y-m-d') }}">{{ $activity->created_at->diffForHumans() }}</time>
diff --git a/resources/views/components/feeds/created_reply.blade.php b/resources/views/components/feeds/created_reply.blade.php
index ee8e148e..47340486 100644
--- a/resources/views/components/feeds/created_reply.blade.php
+++ b/resources/views/components/feeds/created_reply.blade.php
@@ -15,7 +15,10 @@
                 <div>
                     <div>
                         <p class="text-sm text-skin-base">
-                            a répondu au sujet <a href="{{ url("/forum/{$activity->subject->replyAble->slug()}#reply-{$activity->subject->id}") }}" class="font-medium text-skin-primary hover:text-skin-primary-hover">{{ $activity->subject->replyAble->title }}</a>
+                            {{ __('a répondu au sujet') }}
+                            <a href="{{ url("/forum/{$activity->subject->replyAble->slug()}#reply-{$activity->subject->id}") }}" class="font-medium text-skin-primary hover:text-skin-primary-hover">
+                                {{ $activity->subject->replyAble->title }}
+                            </a>
                         </p>
                     </div>
                     <div class="mt-1.5 text-sm whitespace-nowrap text-skin-muted font-sans">
@@ -23,9 +26,7 @@
                     </div>
                 </div>
                 <div class="mt-2 text-sm text-skin-inverted-muted font-normal">
-                    <p>
-                        {{ $activity->subject->excerpt() }}
-                    </p>
+                    <p>{{ $activity->subject->excerpt() }}</p>
                 </div>
             </div>
         </div>
diff --git a/resources/views/livewire/user/activities.blade.php b/resources/views/livewire/user/activities.blade.php
index 335e4954..c85a834e 100644
--- a/resources/views/livewire/user/activities.blade.php
+++ b/resources/views/livewire/user/activities.blade.php
@@ -4,7 +4,13 @@
     </h3>
     <ul role="list" class="mt-6 -mb-8">
         @forelse($activities as $activity)
-            <x-dynamic-component :component="'feeds.' . $activity->type" :activity="$activity" />
+            @if(! str_ends_with($activity->type, 'reply'))
+                <x-dynamic-component
+                    :component="'feeds.' . $activity->type"
+                    :folder="$activity->getTable()"
+                    :activity="$activity"
+                />
+            @endif
         @empty
             <x-feeds.placeholder />
         @endforelse