Make credo happy
This commit is contained in:
parent
c5f8df08a7
commit
8bcfac93a8
|
@ -57,7 +57,7 @@
|
||||||
|
|
||||||
# For some checks, like AliasUsage, you can only customize the priority
|
# For some checks, like AliasUsage, you can only customize the priority
|
||||||
# Priority values are: `low, normal, high, higher`
|
# Priority values are: `low, normal, high, higher`
|
||||||
{Credo.Check.Design.AliasUsage, priority: :low},
|
{Credo.Check.Design.AliasUsage, priority: :low, if_called_more_often_than: 3},
|
||||||
|
|
||||||
# For others you can set parameters
|
# For others you can set parameters
|
||||||
|
|
||||||
|
|
|
@ -211,7 +211,7 @@ def run(["unsubscribe", nickname]) do
|
||||||
|
|
||||||
user = Repo.get(User, user.id)
|
user = Repo.get(User, user.id)
|
||||||
|
|
||||||
if length(user.following) == 0 do
|
if Enum.empty?(user.following) do
|
||||||
Mix.shell().info("Successfully unsubscribed all followers from #{user.nickname}")
|
Mix.shell().info("Successfully unsubscribed all followers from #{user.nickname}")
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
|
|
|
@ -23,7 +23,7 @@ def get_peers do
|
||||||
def schedule_update do
|
def schedule_update do
|
||||||
spawn(fn ->
|
spawn(fn ->
|
||||||
# 1 hour
|
# 1 hour
|
||||||
Process.sleep(1000 * 60 * 60 * 1)
|
Process.sleep(1000 * 60 * 60)
|
||||||
schedule_update()
|
schedule_update()
|
||||||
end)
|
end)
|
||||||
|
|
||||||
|
|
|
@ -119,7 +119,7 @@ def stream_out(activity) do
|
||||||
activity.data["object"]
|
activity.data["object"]
|
||||||
|> Map.get("tag", [])
|
|> Map.get("tag", [])
|
||||||
|> Enum.filter(fn tag -> is_bitstring(tag) end)
|
|> Enum.filter(fn tag -> is_bitstring(tag) end)
|
||||||
|> Enum.map(fn tag -> Pleroma.Web.Streamer.stream("hashtag:" <> tag, activity) end)
|
|> Enum.each(fn tag -> Pleroma.Web.Streamer.stream("hashtag:" <> tag, activity) end)
|
||||||
|
|
||||||
if activity.data["object"]["attachment"] != [] do
|
if activity.data["object"]["attachment"] != [] do
|
||||||
Pleroma.Web.Streamer.stream("public:media", activity)
|
Pleroma.Web.Streamer.stream("public:media", activity)
|
||||||
|
|
|
@ -6,8 +6,7 @@ defmodule Pleroma.Web.CommonAPI.Utils do
|
||||||
alias Calendar.Strftime
|
alias Calendar.Strftime
|
||||||
alias Comeonin.Pbkdf2
|
alias Comeonin.Pbkdf2
|
||||||
alias Pleroma.{Activity, Formatter, Object, Repo}
|
alias Pleroma.{Activity, Formatter, Object, Repo}
|
||||||
alias Pleroma.User
|
alias Pleroma.{User, Web}
|
||||||
alias Pleroma.Web
|
|
||||||
alias Pleroma.Web.ActivityPub.Utils
|
alias Pleroma.Web.ActivityPub.Utils
|
||||||
alias Pleroma.Web.Endpoint
|
alias Pleroma.Web.Endpoint
|
||||||
alias Pleroma.Web.MediaProxy
|
alias Pleroma.Web.MediaProxy
|
||||||
|
|
|
@ -25,7 +25,7 @@ def init(args) do
|
||||||
def start_link do
|
def start_link do
|
||||||
spawn(fn ->
|
spawn(fn ->
|
||||||
# 1 minute
|
# 1 minute
|
||||||
Process.sleep(1000 * 60 * 1)
|
Process.sleep(1000 * 60)
|
||||||
enqueue(:refresh_subscriptions, nil)
|
enqueue(:refresh_subscriptions, nil)
|
||||||
end)
|
end)
|
||||||
|
|
||||||
|
@ -197,7 +197,6 @@ def handle_cast({:enqueue, type, payload, _priority}, state) do
|
||||||
end
|
end
|
||||||
|
|
||||||
def handle_cast(m, state) do
|
def handle_cast(m, state) do
|
||||||
IO.inspect("Unknown: #{inspect(m)}, #{inspect(state)}")
|
|
||||||
{:noreply, state}
|
{:noreply, state}
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -4,23 +4,22 @@
|
||||||
|
|
||||||
defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
|
defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
|
||||||
use Pleroma.Web, :controller
|
use Pleroma.Web, :controller
|
||||||
alias Pleroma.{Repo, Object, Activity, User, Notification, Stats}
|
alias Pleroma.{Activity, Config, Filter, Notification, Object, Repo, Stats, User}
|
||||||
alias Pleroma.Web
|
alias Pleroma.Web
|
||||||
|
alias Pleroma.Web.{CommonAPI, MediaProxy, Push}
|
||||||
|
alias Push.Subscription
|
||||||
|
|
||||||
alias Pleroma.Web.MastodonAPI.{
|
alias Pleroma.Web.MastodonAPI.{
|
||||||
StatusView,
|
|
||||||
AccountView,
|
AccountView,
|
||||||
MastodonView,
|
|
||||||
ListView,
|
|
||||||
FilterView,
|
FilterView,
|
||||||
PushSubscriptionView
|
ListView,
|
||||||
|
MastodonView,
|
||||||
|
PushSubscriptionView,
|
||||||
|
StatusView
|
||||||
}
|
}
|
||||||
|
|
||||||
alias Pleroma.Web.ActivityPub.ActivityPub
|
alias Pleroma.Web.ActivityPub.{ActivityPub, Utils}
|
||||||
alias Pleroma.Web.ActivityPub.Utils
|
alias Pleroma.Web.OAuth.{App, Authorization, Token}
|
||||||
alias Pleroma.Web.CommonAPI
|
|
||||||
alias Pleroma.Web.OAuth.{Authorization, Token, App}
|
|
||||||
alias Pleroma.Web.MediaProxy
|
|
||||||
|
|
||||||
import Ecto.Query
|
import Ecto.Query
|
||||||
require Logger
|
require Logger
|
||||||
|
@ -131,7 +130,7 @@ def user(%{assigns: %{user: for_user}} = conn, %{"id" => id}) do
|
||||||
@mastodon_api_level "2.5.0"
|
@mastodon_api_level "2.5.0"
|
||||||
|
|
||||||
def masto_instance(conn, _params) do
|
def masto_instance(conn, _params) do
|
||||||
instance = Pleroma.Config.get(:instance)
|
instance = Config.get(:instance)
|
||||||
|
|
||||||
response = %{
|
response = %{
|
||||||
uri: Web.base_url(),
|
uri: Web.base_url(),
|
||||||
|
@ -227,7 +226,8 @@ def home_timeline(%{assigns: %{user: user}} = conn, params) do
|
||||||
|> Map.put("user", user)
|
|> Map.put("user", user)
|
||||||
|
|
||||||
activities =
|
activities =
|
||||||
ActivityPub.fetch_activities([user.ap_id | user.following], params)
|
[user.ap_id | user.following]
|
||||||
|
|> ActivityPub.fetch_activities(params)
|
||||||
|> ActivityPub.contain_timeline(user)
|
|> ActivityPub.contain_timeline(user)
|
||||||
|> Enum.reverse()
|
|> Enum.reverse()
|
||||||
|
|
||||||
|
@ -240,14 +240,12 @@ def home_timeline(%{assigns: %{user: user}} = conn, params) do
|
||||||
def public_timeline(%{assigns: %{user: user}} = conn, params) do
|
def public_timeline(%{assigns: %{user: user}} = conn, params) do
|
||||||
local_only = params["local"] in [true, "True", "true", "1"]
|
local_only = params["local"] in [true, "True", "true", "1"]
|
||||||
|
|
||||||
params =
|
activities =
|
||||||
params
|
params
|
||||||
|> Map.put("type", ["Create", "Announce"])
|
|> Map.put("type", ["Create", "Announce"])
|
||||||
|> Map.put("local_only", local_only)
|
|> Map.put("local_only", local_only)
|
||||||
|> Map.put("blocking_user", user)
|
|> Map.put("blocking_user", user)
|
||||||
|
|> ActivityPub.fetch_public_activities()
|
||||||
activities =
|
|
||||||
ActivityPub.fetch_public_activities(params)
|
|
||||||
|> Enum.reverse()
|
|> Enum.reverse()
|
||||||
|
|
||||||
conn
|
conn
|
||||||
|
@ -316,6 +314,7 @@ def get_context(%{assigns: %{user: user}} = conn, %{"id" => id}) do
|
||||||
as: :activity
|
as: :activity
|
||||||
)
|
)
|
||||||
|> Enum.reverse(),
|
|> Enum.reverse(),
|
||||||
|
# credo:disable-for-previous-line Credo.Check.Refactor.PipeChainStart
|
||||||
descendants:
|
descendants:
|
||||||
StatusView.render(
|
StatusView.render(
|
||||||
"index.json",
|
"index.json",
|
||||||
|
@ -324,6 +323,7 @@ def get_context(%{assigns: %{user: user}} = conn, %{"id" => id}) do
|
||||||
as: :activity
|
as: :activity
|
||||||
)
|
)
|
||||||
|> Enum.reverse()
|
|> Enum.reverse()
|
||||||
|
# credo:disable-for-previous-line Credo.Check.Refactor.PipeChainStart
|
||||||
}
|
}
|
||||||
|
|
||||||
json(conn, result)
|
json(conn, result)
|
||||||
|
@ -451,9 +451,8 @@ def notifications(%{assigns: %{user: user}} = conn, params) do
|
||||||
notifications = Notification.for_user(user, params)
|
notifications = Notification.for_user(user, params)
|
||||||
|
|
||||||
result =
|
result =
|
||||||
Enum.map(notifications, fn x ->
|
notifications
|
||||||
render_notification(user, x)
|
|> Enum.map(fn x -> render_notification(user, x) end)
|
||||||
end)
|
|
||||||
|> Enum.filter(& &1)
|
|> Enum.filter(& &1)
|
||||||
|
|
||||||
conn
|
conn
|
||||||
|
@ -582,7 +581,7 @@ def hashtag_timeline(%{assigns: %{user: user}} = conn, params) do
|
||||||
[]
|
[]
|
||||||
|> Enum.map(&String.downcase(&1))
|
|> Enum.map(&String.downcase(&1))
|
||||||
|
|
||||||
query_params =
|
activities =
|
||||||
params
|
params
|
||||||
|> Map.put("type", "Create")
|
|> Map.put("type", "Create")
|
||||||
|> Map.put("local_only", local_only)
|
|> Map.put("local_only", local_only)
|
||||||
|
@ -590,9 +589,7 @@ def hashtag_timeline(%{assigns: %{user: user}} = conn, params) do
|
||||||
|> Map.put("tag", tags)
|
|> Map.put("tag", tags)
|
||||||
|> Map.put("tag_all", tag_all)
|
|> Map.put("tag_all", tag_all)
|
||||||
|> Map.put("tag_reject", tag_reject)
|
|> Map.put("tag_reject", tag_reject)
|
||||||
|
|> ActivityPub.fetch_public_activities()
|
||||||
activities =
|
|
||||||
ActivityPub.fetch_public_activities(query_params)
|
|
||||||
|> Enum.reverse()
|
|> Enum.reverse()
|
||||||
|
|
||||||
conn
|
conn
|
||||||
|
@ -692,7 +689,7 @@ def follow(%{assigns: %{user: follower}} = conn, %{"id" => id}) do
|
||||||
{:ok, _activity} <- ActivityPub.follow(follower, followed),
|
{:ok, _activity} <- ActivityPub.follow(follower, followed),
|
||||||
{:ok, follower, followed} <-
|
{:ok, follower, followed} <-
|
||||||
User.wait_and_refresh(
|
User.wait_and_refresh(
|
||||||
Pleroma.Config.get([:activitypub, :follow_handshake_timeout]),
|
Config.get([:activitypub, :follow_handshake_timeout]),
|
||||||
follower,
|
follower,
|
||||||
followed
|
followed
|
||||||
) do
|
) do
|
||||||
|
@ -821,7 +818,8 @@ def search2(%{assigns: %{user: user}} = conn, %{"q" => query} = params) do
|
||||||
tags_path = Web.base_url() <> "/tag/"
|
tags_path = Web.base_url() <> "/tag/"
|
||||||
|
|
||||||
tags =
|
tags =
|
||||||
String.split(query)
|
query
|
||||||
|
|> String.split()
|
||||||
|> Enum.uniq()
|
|> Enum.uniq()
|
||||||
|> Enum.filter(fn tag -> String.starts_with?(tag, "#") end)
|
|> Enum.filter(fn tag -> String.starts_with?(tag, "#") end)
|
||||||
|> Enum.map(fn tag -> String.slice(tag, 1..-1) end)
|
|> Enum.map(fn tag -> String.slice(tag, 1..-1) end)
|
||||||
|
@ -843,7 +841,8 @@ def search(%{assigns: %{user: user}} = conn, %{"q" => query} = params) do
|
||||||
statuses = status_search(user, query)
|
statuses = status_search(user, query)
|
||||||
|
|
||||||
tags =
|
tags =
|
||||||
String.split(query)
|
query
|
||||||
|
|> String.split()
|
||||||
|> Enum.uniq()
|
|> Enum.uniq()
|
||||||
|> Enum.filter(fn tag -> String.starts_with?(tag, "#") end)
|
|> Enum.filter(fn tag -> String.starts_with?(tag, "#") end)
|
||||||
|> Enum.map(fn tag -> String.slice(tag, 1..-1) end)
|
|> Enum.map(fn tag -> String.slice(tag, 1..-1) end)
|
||||||
|
@ -867,14 +866,12 @@ def account_search(%{assigns: %{user: user}} = conn, %{"q" => query} = params) d
|
||||||
end
|
end
|
||||||
|
|
||||||
def favourites(%{assigns: %{user: user}} = conn, params) do
|
def favourites(%{assigns: %{user: user}} = conn, params) do
|
||||||
params =
|
activities =
|
||||||
params
|
params
|
||||||
|> Map.put("type", "Create")
|
|> Map.put("type", "Create")
|
||||||
|> Map.put("favorited_by", user.ap_id)
|
|> Map.put("favorited_by", user.ap_id)
|
||||||
|> Map.put("blocking_user", user)
|
|> Map.put("blocking_user", user)
|
||||||
|
|> ActivityPub.fetch_public_activities()
|
||||||
activities =
|
|
||||||
ActivityPub.fetch_public_activities(params)
|
|
||||||
|> Enum.reverse()
|
|> Enum.reverse()
|
||||||
|
|
||||||
conn
|
conn
|
||||||
|
@ -990,12 +987,10 @@ def list_timeline(%{assigns: %{user: user}} = conn, %{"list_id" => id} = params)
|
||||||
|
|
||||||
# we must filter the following list for the user to avoid leaking statuses the user
|
# we must filter the following list for the user to avoid leaking statuses the user
|
||||||
# does not actually have permission to see (for more info, peruse security issue #270).
|
# does not actually have permission to see (for more info, peruse security issue #270).
|
||||||
following_to =
|
activities =
|
||||||
following
|
following
|
||||||
|> Enum.filter(fn x -> x in user.following end)
|
|> Enum.filter(fn x -> x in user.following end)
|
||||||
|
|> ActivityPub.fetch_activities_bounded(following, params)
|
||||||
activities =
|
|
||||||
ActivityPub.fetch_activities_bounded(following_to, following, params)
|
|
||||||
|> Enum.reverse()
|
|> Enum.reverse()
|
||||||
|
|
||||||
conn
|
conn
|
||||||
|
@ -1017,7 +1012,7 @@ def index(%{assigns: %{user: user}} = conn, _params) do
|
||||||
if user && token do
|
if user && token do
|
||||||
mastodon_emoji = mastodonized_emoji()
|
mastodon_emoji = mastodonized_emoji()
|
||||||
|
|
||||||
limit = Pleroma.Config.get([:instance, :limit])
|
limit = Config.get([:instance, :limit])
|
||||||
|
|
||||||
accounts =
|
accounts =
|
||||||
Map.put(%{}, user.id, AccountView.render("account.json", %{user: user, for: user}))
|
Map.put(%{}, user.id, AccountView.render("account.json", %{user: user, for: user}))
|
||||||
|
@ -1041,8 +1036,8 @@ def index(%{assigns: %{user: user}} = conn, _params) do
|
||||||
max_toot_chars: limit
|
max_toot_chars: limit
|
||||||
},
|
},
|
||||||
rights: %{
|
rights: %{
|
||||||
delete_others_notice: !!user.info.is_moderator,
|
delete_others_notice: present?(user.info.is_moderator),
|
||||||
admin: !!user.info.is_admin
|
admin: present?(user.info.is_admin)
|
||||||
},
|
},
|
||||||
compose: %{
|
compose: %{
|
||||||
me: "#{user.id}",
|
me: "#{user.id}",
|
||||||
|
@ -1234,7 +1229,7 @@ def render_notification(user, %{id: id, activity: activity, inserted_at: created
|
||||||
end
|
end
|
||||||
|
|
||||||
def get_filters(%{assigns: %{user: user}} = conn, _) do
|
def get_filters(%{assigns: %{user: user}} = conn, _) do
|
||||||
filters = Pleroma.Filter.get_filters(user)
|
filters = Filter.get_filters(user)
|
||||||
res = FilterView.render("filters.json", filters: filters)
|
res = FilterView.render("filters.json", filters: filters)
|
||||||
json(conn, res)
|
json(conn, res)
|
||||||
end
|
end
|
||||||
|
@ -1243,7 +1238,7 @@ def create_filter(
|
||||||
%{assigns: %{user: user}} = conn,
|
%{assigns: %{user: user}} = conn,
|
||||||
%{"phrase" => phrase, "context" => context} = params
|
%{"phrase" => phrase, "context" => context} = params
|
||||||
) do
|
) do
|
||||||
query = %Pleroma.Filter{
|
query = %Filter{
|
||||||
user_id: user.id,
|
user_id: user.id,
|
||||||
phrase: phrase,
|
phrase: phrase,
|
||||||
context: context,
|
context: context,
|
||||||
|
@ -1252,13 +1247,13 @@ def create_filter(
|
||||||
# expires_at
|
# expires_at
|
||||||
}
|
}
|
||||||
|
|
||||||
{:ok, response} = Pleroma.Filter.create(query)
|
{:ok, response} = Filter.create(query)
|
||||||
res = FilterView.render("filter.json", filter: response)
|
res = FilterView.render("filter.json", filter: response)
|
||||||
json(conn, res)
|
json(conn, res)
|
||||||
end
|
end
|
||||||
|
|
||||||
def get_filter(%{assigns: %{user: user}} = conn, %{"id" => filter_id}) do
|
def get_filter(%{assigns: %{user: user}} = conn, %{"id" => filter_id}) do
|
||||||
filter = Pleroma.Filter.get(filter_id, user)
|
filter = Filter.get(filter_id, user)
|
||||||
res = FilterView.render("filter.json", filter: filter)
|
res = FilterView.render("filter.json", filter: filter)
|
||||||
json(conn, res)
|
json(conn, res)
|
||||||
end
|
end
|
||||||
|
@ -1267,7 +1262,7 @@ def update_filter(
|
||||||
%{assigns: %{user: user}} = conn,
|
%{assigns: %{user: user}} = conn,
|
||||||
%{"phrase" => phrase, "context" => context, "id" => filter_id} = params
|
%{"phrase" => phrase, "context" => context, "id" => filter_id} = params
|
||||||
) do
|
) do
|
||||||
query = %Pleroma.Filter{
|
query = %Filter{
|
||||||
user_id: user.id,
|
user_id: user.id,
|
||||||
filter_id: filter_id,
|
filter_id: filter_id,
|
||||||
phrase: phrase,
|
phrase: phrase,
|
||||||
|
@ -1277,32 +1272,32 @@ def update_filter(
|
||||||
# expires_at
|
# expires_at
|
||||||
}
|
}
|
||||||
|
|
||||||
{:ok, response} = Pleroma.Filter.update(query)
|
{:ok, response} = Filter.update(query)
|
||||||
res = FilterView.render("filter.json", filter: response)
|
res = FilterView.render("filter.json", filter: response)
|
||||||
json(conn, res)
|
json(conn, res)
|
||||||
end
|
end
|
||||||
|
|
||||||
def delete_filter(%{assigns: %{user: user}} = conn, %{"id" => filter_id}) do
|
def delete_filter(%{assigns: %{user: user}} = conn, %{"id" => filter_id}) do
|
||||||
query = %Pleroma.Filter{
|
query = %Filter{
|
||||||
user_id: user.id,
|
user_id: user.id,
|
||||||
filter_id: filter_id
|
filter_id: filter_id
|
||||||
}
|
}
|
||||||
|
|
||||||
{:ok, _} = Pleroma.Filter.delete(query)
|
{:ok, _} = Filter.delete(query)
|
||||||
json(conn, %{})
|
json(conn, %{})
|
||||||
end
|
end
|
||||||
|
|
||||||
def create_push_subscription(%{assigns: %{user: user, token: token}} = conn, params) do
|
def create_push_subscription(%{assigns: %{user: user, token: token}} = conn, params) do
|
||||||
true = Pleroma.Web.Push.enabled()
|
true = Push.enabled()
|
||||||
Pleroma.Web.Push.Subscription.delete_if_exists(user, token)
|
Subscription.delete_if_exists(user, token)
|
||||||
{:ok, subscription} = Pleroma.Web.Push.Subscription.create(user, token, params)
|
{:ok, subscription} = Subscription.create(user, token, params)
|
||||||
view = PushSubscriptionView.render("push_subscription.json", subscription: subscription)
|
view = PushSubscriptionView.render("push_subscription.json", subscription: subscription)
|
||||||
json(conn, view)
|
json(conn, view)
|
||||||
end
|
end
|
||||||
|
|
||||||
def get_push_subscription(%{assigns: %{user: user, token: token}} = conn, _params) do
|
def get_push_subscription(%{assigns: %{user: user, token: token}} = conn, _params) do
|
||||||
true = Pleroma.Web.Push.enabled()
|
true = Push.enabled()
|
||||||
subscription = Pleroma.Web.Push.Subscription.get(user, token)
|
subscription = Subscription.get(user, token)
|
||||||
view = PushSubscriptionView.render("push_subscription.json", subscription: subscription)
|
view = PushSubscriptionView.render("push_subscription.json", subscription: subscription)
|
||||||
json(conn, view)
|
json(conn, view)
|
||||||
end
|
end
|
||||||
|
@ -1311,15 +1306,15 @@ def update_push_subscription(
|
||||||
%{assigns: %{user: user, token: token}} = conn,
|
%{assigns: %{user: user, token: token}} = conn,
|
||||||
params
|
params
|
||||||
) do
|
) do
|
||||||
true = Pleroma.Web.Push.enabled()
|
true = Push.enabled()
|
||||||
{:ok, subscription} = Pleroma.Web.Push.Subscription.update(user, token, params)
|
{:ok, subscription} = Subscription.update(user, token, params)
|
||||||
view = PushSubscriptionView.render("push_subscription.json", subscription: subscription)
|
view = PushSubscriptionView.render("push_subscription.json", subscription: subscription)
|
||||||
json(conn, view)
|
json(conn, view)
|
||||||
end
|
end
|
||||||
|
|
||||||
def delete_push_subscription(%{assigns: %{user: user, token: token}} = conn, _params) do
|
def delete_push_subscription(%{assigns: %{user: user, token: token}} = conn, _params) do
|
||||||
true = Pleroma.Web.Push.enabled()
|
true = Push.enabled()
|
||||||
{:ok, _response} = Pleroma.Web.Push.Subscription.delete(user, token)
|
{:ok, _response} = Subscription.delete(user, token)
|
||||||
json(conn, %{})
|
json(conn, %{})
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -1330,17 +1325,21 @@ def errors(conn, _) do
|
||||||
end
|
end
|
||||||
|
|
||||||
def suggestions(%{assigns: %{user: user}} = conn, _) do
|
def suggestions(%{assigns: %{user: user}} = conn, _) do
|
||||||
suggestions = Pleroma.Config.get(:suggestions)
|
suggestions = Config.get(:suggestions)
|
||||||
|
|
||||||
if Keyword.get(suggestions, :enabled, false) do
|
if Keyword.get(suggestions, :enabled, false) do
|
||||||
api = Keyword.get(suggestions, :third_party_engine, "")
|
api = Keyword.get(suggestions, :third_party_engine, "")
|
||||||
timeout = Keyword.get(suggestions, :timeout, 5000)
|
timeout = Keyword.get(suggestions, :timeout, 5000)
|
||||||
limit = Keyword.get(suggestions, :limit, 23)
|
limit = Keyword.get(suggestions, :limit, 23)
|
||||||
|
|
||||||
host = Pleroma.Config.get([Pleroma.Web.Endpoint, :url, :host])
|
host = Config.get([Pleroma.Web.Endpoint, :url, :host])
|
||||||
|
|
||||||
user = user.nickname
|
user = user.nickname
|
||||||
url = String.replace(api, "{{host}}", host) |> String.replace("{{user}}", user)
|
|
||||||
|
url =
|
||||||
|
api
|
||||||
|
|> String.replace("{{host}}", host)
|
||||||
|
|> String.replace("{{user}}", user)
|
||||||
|
|
||||||
with {:ok, %{status: 200, body: body}} <-
|
with {:ok, %{status: 200, body: body}} <-
|
||||||
@httpoison.get(
|
@httpoison.get(
|
||||||
|
@ -1353,8 +1352,9 @@ def suggestions(%{assigns: %{user: user}} = conn, _) do
|
||||||
]
|
]
|
||||||
),
|
),
|
||||||
{:ok, data} <- Jason.decode(body) do
|
{:ok, data} <- Jason.decode(body) do
|
||||||
data2 =
|
data =
|
||||||
Enum.slice(data, 0, limit)
|
data
|
||||||
|
|> Enum.slice(0, limit)
|
||||||
|> Enum.map(fn x ->
|
|> Enum.map(fn x ->
|
||||||
Map.put(
|
Map.put(
|
||||||
x,
|
x,
|
||||||
|
@ -1373,7 +1373,7 @@ def suggestions(%{assigns: %{user: user}} = conn, _) do
|
||||||
end)
|
end)
|
||||||
|
|
||||||
conn
|
conn
|
||||||
|> json(data2)
|
|> json(data)
|
||||||
else
|
else
|
||||||
e -> Logger.error("Could not retrieve suggestions at fetch #{url}, #{inspect(e)}")
|
e -> Logger.error("Could not retrieve suggestions at fetch #{url}, #{inspect(e)}")
|
||||||
end
|
end
|
||||||
|
@ -1416,4 +1416,8 @@ def try_render(conn, _, _) do
|
||||||
|> put_status(501)
|
|> put_status(501)
|
||||||
|> json(%{error: "Can't display this activity"})
|
|> json(%{error: "Can't display this activity"})
|
||||||
end
|
end
|
||||||
|
|
||||||
|
defp present?(nil), do: false
|
||||||
|
defp present?(false), do: false
|
||||||
|
defp present?(_), do: true
|
||||||
end
|
end
|
||||||
|
|
|
@ -4,11 +4,11 @@
|
||||||
|
|
||||||
defmodule Pleroma.Web.MastodonAPI.AccountView do
|
defmodule Pleroma.Web.MastodonAPI.AccountView do
|
||||||
use Pleroma.Web, :view
|
use Pleroma.Web, :view
|
||||||
alias Pleroma.User
|
|
||||||
alias Pleroma.Web.MastodonAPI.AccountView
|
alias Pleroma.{HTML, User}
|
||||||
alias Pleroma.Web.CommonAPI.Utils
|
alias Pleroma.Web.CommonAPI.Utils
|
||||||
|
alias Pleroma.Web.MastodonAPI.AccountView
|
||||||
alias Pleroma.Web.MediaProxy
|
alias Pleroma.Web.MediaProxy
|
||||||
alias Pleroma.HTML
|
|
||||||
|
|
||||||
def render("accounts.json", %{users: users} = opts) do
|
def render("accounts.json", %{users: users} = opts) do
|
||||||
users
|
users
|
||||||
|
|
|
@ -4,8 +4,8 @@
|
||||||
|
|
||||||
defmodule Pleroma.Web.MastodonAPI.FilterView do
|
defmodule Pleroma.Web.MastodonAPI.FilterView do
|
||||||
use Pleroma.Web, :view
|
use Pleroma.Web, :view
|
||||||
alias Pleroma.Web.MastodonAPI.FilterView
|
|
||||||
alias Pleroma.Web.CommonAPI.Utils
|
alias Pleroma.Web.CommonAPI.Utils
|
||||||
|
alias Pleroma.Web.MastodonAPI.FilterView
|
||||||
|
|
||||||
def render("filters.json", %{filters: filters} = opts) do
|
def render("filters.json", %{filters: filters} = opts) do
|
||||||
render_many(filters, FilterView, "filter.json", opts)
|
render_many(filters, FilterView, "filter.json", opts)
|
||||||
|
|
|
@ -5,14 +5,10 @@
|
||||||
defmodule Pleroma.Web.MastodonAPI.StatusView do
|
defmodule Pleroma.Web.MastodonAPI.StatusView do
|
||||||
use Pleroma.Web, :view
|
use Pleroma.Web, :view
|
||||||
|
|
||||||
alias Pleroma.Activity
|
alias Pleroma.{Activity, HTML, Repo, User}
|
||||||
alias Pleroma.HTML
|
|
||||||
alias Pleroma.Repo
|
|
||||||
alias Pleroma.User
|
|
||||||
alias Pleroma.Web.CommonAPI.Utils
|
alias Pleroma.Web.CommonAPI.Utils
|
||||||
|
alias Pleroma.Web.MastodonAPI.{AccountView, StatusView}
|
||||||
alias Pleroma.Web.MediaProxy
|
alias Pleroma.Web.MediaProxy
|
||||||
alias Pleroma.Web.MastodonAPI.AccountView
|
|
||||||
alias Pleroma.Web.MastodonAPI.StatusView
|
|
||||||
|
|
||||||
# TODO: Add cached version.
|
# TODO: Add cached version.
|
||||||
defp get_replied_to_activities(activities) do
|
defp get_replied_to_activities(activities) do
|
||||||
|
|
|
@ -6,7 +6,7 @@ defmodule Pleroma.Web.MastodonAPI.WebsocketHandler do
|
||||||
require Logger
|
require Logger
|
||||||
|
|
||||||
alias Pleroma.Web.OAuth.Token
|
alias Pleroma.Web.OAuth.Token
|
||||||
alias Pleroma.{User, Repo}
|
alias Pleroma.{Repo, User}
|
||||||
|
|
||||||
@behaviour :cowboy_websocket_handler
|
@behaviour :cowboy_websocket_handler
|
||||||
|
|
||||||
|
|
|
@ -4,11 +4,12 @@
|
||||||
|
|
||||||
defmodule Pleroma.Web.MediaProxy.MediaProxyController do
|
defmodule Pleroma.Web.MediaProxy.MediaProxyController do
|
||||||
use Pleroma.Web, :controller
|
use Pleroma.Web, :controller
|
||||||
alias Pleroma.{Web.MediaProxy, ReverseProxy}
|
alias Pleroma.ReverseProxy
|
||||||
|
alias Pleroma.Web.MediaProxy
|
||||||
|
|
||||||
@default_proxy_opts [max_body_length: 25 * 1_048_576, http: [follow_redirect: true]]
|
@default_proxy_opts [max_body_length: 25 * 1_048_576, http: [follow_redirect: true]]
|
||||||
|
|
||||||
def remote(conn, params = %{"sig" => sig64, "url" => url64}) do
|
def remote(conn, %{"sig" => sig64, "url" => url64} = params) do
|
||||||
with config <- Pleroma.Config.get([:media_proxy], []),
|
with config <- Pleroma.Config.get([:media_proxy], []),
|
||||||
true <- Keyword.get(config, :enabled, false),
|
true <- Keyword.get(config, :enabled, false),
|
||||||
{:ok, url} <- MediaProxy.decode_url(sig64, url64),
|
{:ok, url} <- MediaProxy.decode_url(sig64, url64),
|
||||||
|
|
|
@ -9,7 +9,7 @@ def url(nil), do: nil
|
||||||
|
|
||||||
def url(""), do: nil
|
def url(""), do: nil
|
||||||
|
|
||||||
def url(url = "/" <> _), do: url
|
def url("/" <> _ = url), do: url
|
||||||
|
|
||||||
def url(url) do
|
def url(url) do
|
||||||
config = Application.get_env(:pleroma, :media_proxy, [])
|
config = Application.get_env(:pleroma, :media_proxy, [])
|
||||||
|
|
|
@ -5,10 +5,7 @@
|
||||||
defmodule Pleroma.Web.Nodeinfo.NodeinfoController do
|
defmodule Pleroma.Web.Nodeinfo.NodeinfoController do
|
||||||
use Pleroma.Web, :controller
|
use Pleroma.Web, :controller
|
||||||
|
|
||||||
alias Pleroma.Stats
|
alias Pleroma.{Config, Repo, Stats, User, Web}
|
||||||
alias Pleroma.Web
|
|
||||||
alias Pleroma.{User, Repo}
|
|
||||||
alias Pleroma.Config
|
|
||||||
alias Pleroma.Web.ActivityPub.MRF
|
alias Pleroma.Web.ActivityPub.MRF
|
||||||
|
|
||||||
plug(Pleroma.Web.FederatingPlug)
|
plug(Pleroma.Web.FederatingPlug)
|
||||||
|
@ -32,7 +29,7 @@ def schemas(conn, _params) do
|
||||||
|
|
||||||
# returns a nodeinfo 2.0 map, since 2.1 just adds a repository field
|
# returns a nodeinfo 2.0 map, since 2.1 just adds a repository field
|
||||||
# under software.
|
# under software.
|
||||||
def raw_nodeinfo() do
|
def raw_nodeinfo do
|
||||||
instance = Application.get_env(:pleroma, :instance)
|
instance = Application.get_env(:pleroma, :instance)
|
||||||
media_proxy = Application.get_env(:pleroma, :media_proxy)
|
media_proxy = Application.get_env(:pleroma, :media_proxy)
|
||||||
suggestions = Application.get_env(:pleroma, :suggestions)
|
suggestions = Application.get_env(:pleroma, :suggestions)
|
||||||
|
@ -66,10 +63,8 @@ def raw_nodeinfo() do
|
||||||
Config.get([:mrf_user_allowlist], [])
|
Config.get([:mrf_user_allowlist], [])
|
||||||
|> Enum.into(%{}, fn {k, v} -> {k, length(v)} end)
|
|> Enum.into(%{}, fn {k, v} -> {k, length(v)} end)
|
||||||
|
|
||||||
mrf_transparency = Keyword.get(instance, :mrf_transparency)
|
|
||||||
|
|
||||||
federation_response =
|
federation_response =
|
||||||
if mrf_transparency do
|
if Keyword.get(instance, :mrf_transparency) do
|
||||||
%{
|
%{
|
||||||
mrf_policies: mrf_policies,
|
mrf_policies: mrf_policies,
|
||||||
mrf_simple: mrf_simple,
|
mrf_simple: mrf_simple,
|
||||||
|
|
|
@ -3,7 +3,7 @@ defmodule Pleroma.Web.UploaderController do
|
||||||
|
|
||||||
alias Pleroma.Uploaders.Uploader
|
alias Pleroma.Uploaders.Uploader
|
||||||
|
|
||||||
def callback(conn, params = %{"upload_path" => upload_path}) do
|
def callback(conn, %{"upload_path" => upload_path} = params) do
|
||||||
process_callback(conn, :global.whereis_name({Uploader, upload_path}), params)
|
process_callback(conn, :global.whereis_name({Uploader, upload_path}), params)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue