X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=config%2Fconfig.exs;h=df6ea09ae4c894dfa0d85fc5d43c5763a44b6716;hb=b12a90491156f1b31defd7aa1b322a86867dbf2b;hp=410b3c618d84b81d6478ce131cc43f5de456417a;hpb=10c156d98fee44444ed6d1366e615ddcdb2ee68a;p=akkoma

diff --git a/config/config.exs b/config/config.exs
index 410b3c618..df6ea09ae 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -50,6 +50,15 @@ config :pleroma, :uri_schemes,
 # Configures the endpoint
 config :pleroma, Pleroma.Web.Endpoint,
   url: [host: "localhost"],
+  http: [
+    dispatch: [
+      {:_,
+       [
+         {"/api/v1/streaming", Elixir.Pleroma.Web.MastodonAPI.WebsocketHandler, []},
+         {:_, Plug.Adapters.Cowboy.Handler, {Pleroma.Web.Endpoint, []}}
+       ]}
+    ]
+  ],
   protocol: "https",
   secret_key_base: "aK4Abxf29xU9TTDKre9coZPUgevcVCFQJe/5xP/7Lt4BEif6idBIbjupVbOrbKxl",
   signing_salt: "CqaoopA2",
@@ -65,6 +74,7 @@ config :logger, :console,
 config :mime, :types, %{
   "application/xml" => ["xml"],
   "application/xrd+xml" => ["xrd+xml"],
+  "application/jrd+json" => ["jrd+json"],
   "application/activity+json" => ["activity+json"],
   "application/ld+json" => ["activity+json"]
 }
@@ -101,8 +111,6 @@ config :pleroma, :instance,
   finmoji_enabled: true,
   mrf_transparency: true
 
-config :pleroma, Pleroma.Mailer, adapter: Swoosh.Adapters.Local
-
 config :pleroma, :markup,
   # XXX - unfortunately, inline images must be enabled by default right now, because
   # of custom emoji.  Issue #275 discusses defanging that somehow.