mix format
This commit is contained in:
parent
f3c35e8e55
commit
385afb9308
6 changed files with 77 additions and 46 deletions
|
@ -88,20 +88,22 @@ defmodule Nulla.ActivityPub do
|
|||
@spec note(String.t(), Nulla.Models.Note.t()) :: Jason.OrderedObject.t()
|
||||
def note(domain, note) do
|
||||
attachment =
|
||||
case note.media_attachments do
|
||||
[] -> []
|
||||
attachments ->
|
||||
[
|
||||
attachment:
|
||||
Enum.map(attachments, fn att ->
|
||||
Jason.OrderedObject.new(
|
||||
type: "Document",
|
||||
mediaType: att.mime_type,
|
||||
url: "https://#{domain}/files/#{att.file}"
|
||||
)
|
||||
end)
|
||||
]
|
||||
end
|
||||
case note.media_attachments do
|
||||
[] ->
|
||||
[]
|
||||
|
||||
attachments ->
|
||||
[
|
||||
attachment:
|
||||
Enum.map(attachments, fn att ->
|
||||
Jason.OrderedObject.new(
|
||||
type: "Document",
|
||||
mediaType: att.mime_type,
|
||||
url: "https://#{domain}/files/#{att.file}"
|
||||
)
|
||||
end)
|
||||
]
|
||||
end
|
||||
|
||||
Jason.OrderedObject.new(
|
||||
"@context": [
|
||||
|
@ -151,8 +153,16 @@ defmodule Nulla.ActivityPub do
|
|||
)
|
||||
end
|
||||
|
||||
@spec following(String.t(), Nulla.Models.User.t(), Integer.t(), List.t(), Integer.t(), Integer.t()) :: Jason.OrderedObject.t()
|
||||
def following(domain, user, total, following_list, page, offset) when is_integer(page) and page > 0 do
|
||||
@spec following(
|
||||
String.t(),
|
||||
Nulla.Models.User.t(),
|
||||
Integer.t(),
|
||||
List.t(),
|
||||
Integer.t(),
|
||||
Integer.t()
|
||||
) :: Jason.OrderedObject.t()
|
||||
def following(domain, user, total, following_list, page, offset)
|
||||
when is_integer(page) and page > 0 do
|
||||
data = [
|
||||
"@context": "https://www.w3.org/ns/activitystreams",
|
||||
id: "https://#{domain}/@#{user.username}/following?page=#{page}",
|
||||
|
@ -194,8 +204,16 @@ defmodule Nulla.ActivityPub do
|
|||
)
|
||||
end
|
||||
|
||||
@spec followers(String.t(), Nulla.Models.User.t(), Integer.t(), List.t(), Integer.t(), Integer.t()) :: Jason.OrderedObject.t()
|
||||
def followers(domain, user, total, followers_list, page, offset) when is_integer(page) and page > 0 do
|
||||
@spec followers(
|
||||
String.t(),
|
||||
Nulla.Models.User.t(),
|
||||
Integer.t(),
|
||||
List.t(),
|
||||
Integer.t(),
|
||||
Integer.t()
|
||||
) :: Jason.OrderedObject.t()
|
||||
def followers(domain, user, total, followers_list, page, offset)
|
||||
when is_integer(page) and page > 0 do
|
||||
data = [
|
||||
"@context": "https://www.w3.org/ns/activitystreams",
|
||||
id: "https://#{domain}/@#{user.username}/followers?page=#{page}",
|
||||
|
|
|
@ -5,11 +5,14 @@ defmodule Nulla.KeyGen do
|
|||
{:RSAPrivateKey, :"two-prime", n, e, _d, _p, _q, _dp, _dq, _qi, _other} = rsa_key
|
||||
public_key = {:RSAPublicKey, n, e}
|
||||
|
||||
private_entry = {:PrivateKeyInfo, :public_key.der_encode(:RSAPrivateKey, rsa_key), :not_encrypted}
|
||||
public_entry = {:SubjectPublicKeyInfo, :public_key.der_encode(:RSAPublicKey, public_key), :not_encrypted}
|
||||
private_entry =
|
||||
{:PrivateKeyInfo, :public_key.der_encode(:RSAPrivateKey, rsa_key), :not_encrypted}
|
||||
|
||||
public_entry =
|
||||
{:SubjectPublicKeyInfo, :public_key.der_encode(:RSAPublicKey, public_key), :not_encrypted}
|
||||
|
||||
private_pem = :public_key.pem_encode([private_entry])
|
||||
public_pem = :public_key.pem_encode([public_entry])
|
||||
public_pem = :public_key.pem_encode([public_entry])
|
||||
|
||||
{public_pem, private_pem}
|
||||
end
|
||||
|
|
|
@ -32,15 +32,17 @@ defmodule Nulla.Utils do
|
|||
offset = (page - 1) * per_page
|
||||
|
||||
query =
|
||||
from [f, u] in
|
||||
from(f in Follow,
|
||||
join: u in User, on: u.id == f.target_id,
|
||||
from(
|
||||
[f, u] in from(f in Follow,
|
||||
join: u in User,
|
||||
on: u.id == f.target_id,
|
||||
where: f.user_id == ^user_id,
|
||||
order_by: [asc: u.inserted_at],
|
||||
offset: ^offset,
|
||||
limit: ^per_page,
|
||||
select: u
|
||||
)
|
||||
)
|
||||
|
||||
users = Repo.all(query)
|
||||
|
||||
|
@ -73,7 +75,8 @@ defmodule Nulla.Utils do
|
|||
query =
|
||||
from f in Follow,
|
||||
where: f.target_id == ^user_id,
|
||||
join: u in User, on: u.id == f.user_id,
|
||||
join: u in User,
|
||||
on: u.id == f.user_id,
|
||||
order_by: [asc: u.inserted_at],
|
||||
offset: ^offset,
|
||||
limit: ^per_page,
|
||||
|
|
|
@ -11,16 +11,18 @@ defmodule NullaWeb.FollowController do
|
|||
offset = instance_settings.offset
|
||||
user = User.get_user_by_username!(username)
|
||||
total = Utils.count_following_by_username!(user.username)
|
||||
|
||||
page =
|
||||
case Integer.parse(page_param) do
|
||||
{int, _} when int > 0 -> int
|
||||
_ -> 1
|
||||
end
|
||||
case Integer.parse(page_param) do
|
||||
{int, _} when int > 0 -> int
|
||||
_ -> 1
|
||||
end
|
||||
|
||||
following_list = Utils.get_following_users_by_username!(user.username, page)
|
||||
|
||||
conn
|
||||
|> put_resp_content_type("application/activity+json")
|
||||
|> json(ActivityPub.following(domain, user, total, following_list, page, offset))
|
||||
|> put_resp_content_type("application/activity+json")
|
||||
|> json(ActivityPub.following(domain, user, total, following_list, page, offset))
|
||||
end
|
||||
|
||||
def following(conn, %{"username" => username}) do
|
||||
|
@ -30,8 +32,8 @@ defmodule NullaWeb.FollowController do
|
|||
total = Utils.count_following_by_username!(user.username)
|
||||
|
||||
conn
|
||||
|> put_resp_content_type("application/activity+json")
|
||||
|> json(ActivityPub.following(domain, user, total))
|
||||
|> put_resp_content_type("application/activity+json")
|
||||
|> json(ActivityPub.following(domain, user, total))
|
||||
end
|
||||
|
||||
def followers(conn, %{"username" => username, "page" => page_param}) do
|
||||
|
@ -40,16 +42,18 @@ defmodule NullaWeb.FollowController do
|
|||
offset = instance_settings.offset
|
||||
user = User.get_user_by_username!(username)
|
||||
total = Utils.count_followers_by_username!(user.username)
|
||||
|
||||
page =
|
||||
case Integer.parse(page_param) do
|
||||
{int, _} when int > 0 -> int
|
||||
_ -> 1
|
||||
end
|
||||
case Integer.parse(page_param) do
|
||||
{int, _} when int > 0 -> int
|
||||
_ -> 1
|
||||
end
|
||||
|
||||
followers_list = Utils.get_followers_by_username!(user.username, page)
|
||||
|
||||
conn
|
||||
|> put_resp_content_type("application/activity+json")
|
||||
|> json(ActivityPub.followers(domain, user, total, followers_list, page, offset))
|
||||
|> put_resp_content_type("application/activity+json")
|
||||
|> json(ActivityPub.followers(domain, user, total, followers_list, page, offset))
|
||||
end
|
||||
|
||||
def followers(conn, %{"username" => username}) do
|
||||
|
@ -59,7 +63,7 @@ defmodule NullaWeb.FollowController do
|
|||
total = Utils.count_followers_by_username!(user.username)
|
||||
|
||||
conn
|
||||
|> put_resp_content_type("application/activity+json")
|
||||
|> json(ActivityPub.followers(domain, user, total))
|
||||
|> put_resp_content_type("application/activity+json")
|
||||
|> json(ActivityPub.followers(domain, user, total))
|
||||
end
|
||||
end
|
||||
|
|
|
@ -49,10 +49,10 @@ defmodule NullaWeb.NoteController do
|
|||
end
|
||||
end
|
||||
|
||||
#def show(conn, %{"id" => id}) do
|
||||
# def show(conn, %{"id" => id}) do
|
||||
# note = Notes.get_note!(id)
|
||||
# render(conn, :show, note: note)
|
||||
#end
|
||||
# end
|
||||
|
||||
def edit(conn, %{"id" => id}) do
|
||||
note = Notes.get_note!(id)
|
||||
|
|
|
@ -21,11 +21,14 @@ defmodule Nulla.Repo.Migrations.CreateInstanceSettings do
|
|||
execute(fn ->
|
||||
{public_key, private_key} = Nulla.KeyGen.generate_keys()
|
||||
now = NaiveDateTime.utc_now() |> NaiveDateTime.truncate(:second)
|
||||
|
||||
domain =
|
||||
Application.get_env(:nulla, NullaWeb.Endpoint, [])
|
||||
|> Keyword.get(:url, [])
|
||||
|> Keyword.get(:host, "localhost")
|
||||
Application.get_env(:nulla, NullaWeb.Endpoint, [])
|
||||
|> Keyword.get(:url, [])
|
||||
|> Keyword.get(:host, "localhost")
|
||||
|
||||
esc = fn str -> "'#{String.replace(str, "'", "''")}'" end
|
||||
|
||||
sql = """
|
||||
INSERT INTO instance_settings (
|
||||
name, description, domain, registration,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue