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