projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' into 'remove-avatar-header'
[akkoma]
/
lib
/
pleroma
/
web
/
router.ex
diff --git
a/lib/pleroma/web/router.ex
b/lib/pleroma/web/router.ex
index e699f6ae2e162fe1efcaeccd0f21c38555b3cbb0..36458b2f491601e8be4c48acf292a551023498a5 100644
(file)
--- a/
lib/pleroma/web/router.ex
+++ b/
lib/pleroma/web/router.ex
@@
-202,6
+202,9
@@
defmodule Pleroma.Web.Router do
put("/statuses/:id", AdminAPIController, :status_update)
delete("/statuses/:id", AdminAPIController, :status_delete)
put("/statuses/:id", AdminAPIController, :status_update)
delete("/statuses/:id", AdminAPIController, :status_delete)
+
+ get("/config", AdminAPIController, :config_show)
+ post("/config", AdminAPIController, :config_update)
end
scope "/", Pleroma.Web.TwitterAPI do
end
scope "/", Pleroma.Web.TwitterAPI do
@@
-316,6
+319,10
@@
defmodule Pleroma.Web.Router do
patch("/accounts/update_credentials", MastodonAPIController, :update_credentials)
patch("/accounts/update_credentials", MastodonAPIController, :update_credentials)
+ patch("/accounts/update_avatar", MastodonAPIController, :update_avatar)
+ patch("/accounts/update_banner", MastodonAPIController, :update_banner)
+ patch("/accounts/update_background", MastodonAPIController, :update_background)
+
post("/statuses", MastodonAPIController, :post_status)
delete("/statuses/:id", MastodonAPIController, :delete_status)
post("/statuses", MastodonAPIController, :post_status)
delete("/statuses/:id", MastodonAPIController, :delete_status)
@@
-412,7
+419,7
@@
defmodule Pleroma.Web.Router do
get("/trends", MastodonAPIController, :empty_array)
get("/trends", MastodonAPIController, :empty_array)
- get("/accounts/search",
MastodonAPI
Controller, :account_search)
+ get("/accounts/search",
Search
Controller, :account_search)
scope [] do
pipe_through(:oauth_read_or_public)
scope [] do
pipe_through(:oauth_read_or_public)
@@
-431,7
+438,7
@@
defmodule Pleroma.Web.Router do
get("/accounts/:id/following", MastodonAPIController, :following)
get("/accounts/:id", MastodonAPIController, :user)
get("/accounts/:id/following", MastodonAPIController, :following)
get("/accounts/:id", MastodonAPIController, :user)
- get("/search",
MastodonAPI
Controller, :search)
+ get("/search",
Search
Controller, :search)
get("/pleroma/accounts/:id/favourites", MastodonAPIController, :user_favourites)
end
get("/pleroma/accounts/:id/favourites", MastodonAPIController, :user_favourites)
end
@@
-439,7
+446,7
@@
defmodule Pleroma.Web.Router do
scope "/api/v2", Pleroma.Web.MastodonAPI do
pipe_through([:api, :oauth_read_or_public])
scope "/api/v2", Pleroma.Web.MastodonAPI do
pipe_through([:api, :oauth_read_or_public])
- get("/search",
MastodonAPI
Controller, :search2)
+ get("/search",
Search
Controller, :search2)
end
scope "/api", Pleroma.Web do
end
scope "/api", Pleroma.Web do
@@
-604,12
+611,6
@@
defmodule Pleroma.Web.Router do
post("/push/subscriptions/:id", Websub.WebsubController, :websub_incoming)
end
post("/push/subscriptions/:id", Websub.WebsubController, :websub_incoming)
end
- scope "/", Pleroma.Web do
- pipe_through(:oembed)
-
- get("/oembed", OEmbed.OEmbedController, :url)
- end
-
pipeline :activitypub do
plug(:accepts, ["activity+json", "json"])
plug(Pleroma.Web.Plugs.HTTPSignaturePlug)
pipeline :activitypub do
plug(:accepts, ["activity+json", "json"])
plug(Pleroma.Web.Plugs.HTTPSignaturePlug)
@@
-699,7
+700,7
@@
defmodule Pleroma.Web.Router do
get("/:sig/:url/:filename", MediaProxyController, :remote)
end
get("/:sig/:url/:filename", MediaProxyController, :remote)
end
- if
Mix.env(
) == :dev do
+ if
Pleroma.Config.get(:env
) == :dev do
scope "/dev" do
pipe_through([:mailbox_preview])
scope "/dev" do
pipe_through([:mailbox_preview])