Merge remote-tracking branch 'parent/main' into upstream-20240926

config/routes/api.rb

@@ -79,23 +79,6 @@ namespace :api, format: false do
       end
     end
 
-    # namespace :crypto do
-    #   resources :deliveries, only: :create
-
-    #   namespace :keys do
-    #     resource :upload, only: [:create]
-    #     resource :query,  only: [:create]
-    #     resource :claim,  only: [:create]
-    #     resource :count,  only: [:show]
-    #   end
-
-    #   resources :encrypted_messages, only: [:index] do
-    #     collection do
-    #       post :clear
-    #     end
-    #   end
-    # end
-
     resources :conversations, only: [:index, :destroy] do
       member do
         post :read
@@ -154,6 +137,10 @@ namespace :api, format: false do
       get :search, to: 'search#index'
     end
 
+    namespace :domain_blocks do
+      resource :preview, only: [:show]
+    end
+
     resource :domain_blocks, only: [:show, :create, :destroy]
 
     resource :directory, only: [:show]
@@ -351,21 +338,6 @@ namespace :api, format: false do
     end
   end
 
-  concern :grouped_notifications do
-    resources :notifications, param: :group_key, only: [:index, :show] do
-      collection do
-        post :clear
-        get :unread_count
-      end
-
-      member do
-        post :dismiss
-      end
-
-      resources :accounts, only: [:index], module: :notifications
-    end
-  end
-
   namespace :v2 do
     get '/search', to: 'search#index', as: :search
 
@@ -392,11 +364,18 @@ namespace :api, format: false do
       resource :policy, only: [:show, :update]
     end
 
-    concerns :grouped_notifications
-  end
+    resources :notifications, param: :group_key, only: [:index, :show] do
+      collection do
+        post :clear
+        get :unread_count
+      end
 
-  namespace :v2_alpha, module: 'v2' do
-    concerns :grouped_notifications
+      member do
+        post :dismiss
+      end
+
+      resources :accounts, only: [:index], module: :notifications
+    end
   end
 
   namespace :web do