projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c464355
)
Unify wss uri generation.
author
lain
<lain@soykaf.club>
Sat, 5 May 2018 11:40:31 +0000
(13:40 +0200)
committer
lain
<lain@soykaf.club>
Sat, 5 May 2018 11:40:31 +0000
(13:40 +0200)
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
patch
|
blob
|
history
diff --git
a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
index 2b4e9e72b2c58fdc6b78b965d214e9618fcc6eff..b77c9fc02f86dedc05fef7a3b3064810aa402cd5 100644
(file)
--- a/
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
+++ b/
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
@@
-112,7
+112,7
@@
defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
version: "#{@mastodon_api_level} (compatible; #{Keyword.get(@instance, :version)})",
email: Keyword.get(@instance, :email),
urls: %{
- streaming_api: String.replace(
Web.base_url(), ["http", "https"], "ws
s")
+ streaming_api: String.replace(
Pleroma.Web.Endpoint.static_url(), "http", "w
s")
},
stats: Stats.get_stats(),
thumbnail: Web.base_url() <> "/instance/thumbnail.jpeg",