From: Roger Braun <roger@rogerbraun.net>
Date: Fri, 21 Apr 2017 16:42:28 +0000 (+0200)
Subject: Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into ostatus
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=1c00eb4a90cddb7518a823d9304f6aee4fd3ef78;p=akkoma

Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into ostatus
---

1c00eb4a90cddb7518a823d9304f6aee4fd3ef78
diff --cc lib/pleroma/web/router.ex
index 33e395218,6a2b37aec..a4f13c879
--- a/lib/pleroma/web/router.ex
+++ b/lib/pleroma/web/router.ex
@@@ -50,35 -58,7 +62,35 @@@ defmodule Pleroma.Web.Router d
      post "/favorites/create/:id", TwitterAPI.Controller, :favorite
      post "/favorites/create", TwitterAPI.Controller, :favorite
      post "/favorites/destroy/:id", TwitterAPI.Controller, :unfavorite
-     post "/statuses/retweet/:id", TwitterAPI.Controller, :retweet
+ 
      post "/qvitter/update_avatar", TwitterAPI.Controller, :update_avatar
    end
 +
 +  pipeline :ostatus do
 +    plug :accepts, ["xml", "atom"]
 +  end
 +
 +  scope "/", Pleroma.Web do
 +    pipe_through :ostatus
 +
 +    get "/users/:nickname/feed", OStatus.OStatusController, :feed
 +    post "/push/hub/:nickname", Websub.WebsubController, :websub_subscription_request
 +  end
 +
 +  scope "/.well-known", Pleroma.Web do
 +    pipe_through :well_known
 +
 +    get "/host-meta", WebFinger.WebFingerController, :host_meta
 +    get "/webfinger", WebFinger.WebFingerController, :webfinger
 +  end
 +
 +  scope "/", Fallback do
 +    get "/*path", RedirectController, :redirector
 +  end
 +
 +end
 +
 +defmodule Fallback.RedirectController do
 +  use Pleroma.Web, :controller
 +  def redirector(conn, _params), do: send_file(conn, 200, "priv/static/index.html")
  end