Update
This commit is contained in:
parent
124149129e
commit
ee68ec870d
9 changed files with 92 additions and 41 deletions
|
@ -10,7 +10,7 @@ defmodule NullaWeb.ActorController do
|
|||
instance_settings = InstanceSettings.get_instance_settings!()
|
||||
domain = instance_settings.domain
|
||||
|
||||
case Actor.get_actor(username, domain) do
|
||||
case Actor.get_actor(preferredUsername: username, domain: domain) do
|
||||
nil ->
|
||||
conn
|
||||
|> put_status(:not_found)
|
||||
|
|
|
@ -9,7 +9,7 @@ defmodule NullaWeb.FollowController do
|
|||
instance_settings = InstanceSettings.get_instance_settings!()
|
||||
domain = instance_settings.domain
|
||||
limit = instance_settings.api_limit
|
||||
actor = Actor.get_actor(username, domain)
|
||||
actor = Actor.get_actor(preferredUsername: username, domain: domain)
|
||||
total = Relation.count_following(actor.id)
|
||||
|
||||
page =
|
||||
|
@ -28,7 +28,7 @@ defmodule NullaWeb.FollowController do
|
|||
def following(conn, %{"username" => username}) do
|
||||
instance_settings = InstanceSettings.get_instance_settings!()
|
||||
domain = instance_settings.domain
|
||||
actor = Actor.get_actor(username, domain)
|
||||
actor = Actor.get_actor(preferredUsername: username, domain: domain)
|
||||
total = Relation.count_following(actor.id)
|
||||
|
||||
conn
|
||||
|
@ -40,7 +40,7 @@ defmodule NullaWeb.FollowController do
|
|||
instance_settings = InstanceSettings.get_instance_settings!()
|
||||
domain = instance_settings.domain
|
||||
limit = instance_settings.api_limit
|
||||
actor = Actor.get_actor(username, domain)
|
||||
actor = Actor.get_actor(preferredUsername: username, domain: domain)
|
||||
total = Relation.count_followers(actor.id)
|
||||
|
||||
page =
|
||||
|
@ -59,7 +59,7 @@ defmodule NullaWeb.FollowController do
|
|||
def followers(conn, %{"username" => username}) do
|
||||
instance_settings = InstanceSettings.get_instance_settings!()
|
||||
domain = instance_settings.domain
|
||||
actor = Actor.get_actor(username, domain)
|
||||
actor = Actor.get_actor(preferredUsername: username, domain: domain)
|
||||
total = Relation.count_followers(actor.id)
|
||||
|
||||
conn
|
||||
|
|
|
@ -11,7 +11,7 @@ defmodule NullaWeb.InboxController do
|
|||
conn,
|
||||
%{"id" => follow_id, "type" => "Follow", "actor" => actor_uri, "object" => target_uri}
|
||||
) do
|
||||
with {:ok, local_actor} <- Utils.resolve_local_actor(target_uri),
|
||||
with local_actor <- Actor.get_actor(ap_id: target_uri),
|
||||
{:ok, remote_actor_json} <- Utils.fetch_remote_actor(actor_uri),
|
||||
:ok <- HTTPSignature.verify(conn, remote_actor_json),
|
||||
remote_actor <-
|
||||
|
@ -31,7 +31,7 @@ defmodule NullaWeb.InboxController do
|
|||
accept_activity <-
|
||||
Activity.create_activity(%{
|
||||
type: "Accept",
|
||||
actor: local_actor.id,
|
||||
actor: local_actor.ap_id,
|
||||
object: follow_activity
|
||||
}),
|
||||
_ <-
|
||||
|
|
|
@ -10,7 +10,7 @@ defmodule NullaWeb.OutboxController do
|
|||
"true" ->
|
||||
instance_settings = InstanceSettings.get_instance_settings!()
|
||||
domain = instance_settings.domain
|
||||
actor = Actor.get_actor(username, domain)
|
||||
actor = Actor.get_actor(preferredUsername: username, domain: domain)
|
||||
max_id = params["max_id"] && String.to_integer(params["max_id"])
|
||||
|
||||
notes =
|
||||
|
@ -44,7 +44,7 @@ defmodule NullaWeb.OutboxController do
|
|||
_ ->
|
||||
instance_settings = InstanceSettings.get_instance_settings!()
|
||||
domain = instance_settings.domain
|
||||
actor = Actor.get_actor(username, domain)
|
||||
actor = Actor.get_actor(preferredUsername: username, domain: domain)
|
||||
total = Note.get_total_notes_count(actor.id)
|
||||
|
||||
conn
|
||||
|
|
|
@ -7,7 +7,7 @@ defmodule NullaWeb.WebfingerController do
|
|||
def index(conn, %{"resource" => resource}) do
|
||||
case Regex.run(~r/^acct:(.+)@(.+)$/, resource) do
|
||||
[_, username, domain] ->
|
||||
case Actor.get_actor(username, domain) do
|
||||
case Actor.get_actor(preferredUsername: username, domain: domain) do
|
||||
nil ->
|
||||
conn
|
||||
|> put_resp_content_type("text/plain")
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue