Merge pull request #3 from blomstra/sm/fix-default-sort-pref

fix: default sort not saved

extend.php

@@ -17,9 +17,6 @@
 return [
     new Extend\Locales(__DIR__.'/locale'),
 
-    (new Extend\Routes('api'))
-        ->get('/sorting-preference', 'sorting-preferences.show', ShowUserPreferredSortingController::class),
-
     (new Extend\Middleware('forum'))->add(ApplyUserSortingMiddleware::class),
 
     (new Extend\Middleware('api'))->add(ApplyUserSortingMiddleware::class),

js/src/forum/index.tsx

@@ -12,21 +12,14 @@ app.initializers.add('blomstra/save-sorting-preferences', () => {
     return;
   }
 
-  if (!sort) {
-    m.request({
-      method: 'GET',
-      url: '/api/sorting-preference',
-    }).then((response) => {
-      sort = response.data.attributes.sort;
-
-      m.redraw();
-    });
-  }
-
   override(IndexPage.prototype, 'viewItems', function (this, user) {
     const items = new ItemList();
     const sortMap = app.discussions.sortMap();
 
+    if (!sort) {
+      sort = app.session.user?.preferences()?.['discussion_sort'];
+    }
+
     const sortOptions = Object.keys(sortMap).reduce((acc: any, sortId) => {
       acc[sortId] = app.translator.trans(`core.forum.index_sort.${sortId}_button`);
       return acc;
@@ -45,8 +38,8 @@ app.initializers.add('blomstra/save-sorting-preferences', () => {
 
           function handleClick() {
             app.search.changeSort.bind(app.search, value)();
-
             sort = value;
+            app.session.user?.savePreferences({ discussion_sort: value });
           }
 
           return (

src/ApplyUserSortingMiddleware.php

@@ -27,11 +27,6 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
         $sort = Arr::get($request->getQueryParams(), 'sort');
         $lastSelectedSort = $actor->getPreference('discussion_sort');
 
-        if ($sort && $sort !== $lastSelectedSort) {
-            $actor->setPreference('discussion_sort', $sort);
-            $actor->save();
-        }
-
         return $handler->handle($request->withQueryParams([
             'sort' => $sort ?? $lastSelectedSort,
         ]));