Merge pull request #1350 from ThibG/glitch-soc/merge-upstream

Merge upstream changes

1 files changed, 18 insertions, 0 deletions

diff --git a/config/routes.rb b/config/routes.rb
index 42f2f0f7f..d2f350580 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -79,6 +79,7 @@ Rails.application.routes.draw do
 
     resource :outbox, only: [:show], module: :activitypub
     resource :inbox, only: [:create], module: :activitypub
+    resource :claim, only: [:create], module: :activitypub
     resources :collections, only: [:show], module: :activitypub
   end
 
@@ -342,6 +343,23 @@ Rails.application.routes.draw 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