Fixed shelf activity display & updated book sort operation

app/Actions/ActivityService.php

@@ -108,13 +108,17 @@ class ActivityService
         if ($entity->isA('book')) {
             $query = $this->activity->where('book_id', '=', $entity->id);
         } else {
-            $query = $this->activity->where('entity_type', '=', get_class($entity))
+            $query = $this->activity->where('entity_type', '=', $entity->getMorphClass())
                 ->where('entity_id', '=', $entity->id);
         }
         
         $activity = $this->permissionService
             ->filterRestrictedEntityRelations($query, 'activities', 'entity_id', 'entity_type')
-            ->orderBy('created_at', 'desc')->with(['entity', 'user.avatar'])->skip($count * ($page - 1))->take($count)->get();
+            ->orderBy('created_at', 'desc')
+            ->with(['entity', 'user.avatar'])
+            ->skip($count * ($page - 1))
+            ->take($count)
+            ->get();
 
         return $this->filterSimilar($activity);
     }

app/Http/Controllers/BookController.php

@@ -415,6 +415,7 @@ class BookController extends Controller
     {
         // Update the cover image if in request
         if ($request->has('image')) {
+            $this->imageRepo->destroyImage($book->cover);
             $newImage = $request->file('image');
             $image = $this->imageRepo->saveNew($newImage, 'cover_book', $book->id, 512, 512, true);
             $book->image_id = $image->id;

app/Http/Controllers/BookshelfController.php

@@ -124,6 +124,7 @@ class BookshelfController extends Controller
         $this->entityContextManager->setShelfContext($shelf->id);
 
         $this->setPageTitle($shelf->getShortName());
+
         return view('shelves.show', [
             'shelf' => $shelf,
             'books' => $books,
@@ -287,6 +288,7 @@ class BookshelfController extends Controller
         // Update the cover image if in request
         if ($request->has('image')) {
             $newImage = $request->file('image');
+            $this->imageRepo->destroyImage($shelf->cover);
             $image = $this->imageRepo->saveNew($newImage, 'cover_shelf', $shelf->id, 512, 512, true);
             $shelf->image_id = $image->id;
             $shelf->save();