From 2bef6b9d6d066158ebd3b88ca21d348db9677584 Mon Sep 17 00:00:00 2001 From: miraikumiko Date: Fri, 6 Jun 2025 15:54:43 +0200 Subject: [PATCH 01/10] Remove static files --- priv/static/images/avatar.jpg | Bin 37876 -> 0 bytes priv/static/images/banner.jpg | Bin 22671 -> 0 bytes 2 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 priv/static/images/avatar.jpg delete mode 100644 priv/static/images/banner.jpg diff --git a/priv/static/images/avatar.jpg b/priv/static/images/avatar.jpg deleted file mode 100644 index 3df25a703e942962d6a42bd5d4d5e39472f40fcb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 37876 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≪R?)*F&}`Rtp;C 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

|$eCQH^J(LM2 znKXJ0x%pES9i-*Z+MLILPUG^YoV^URKr$n=>c-TmKT_Z;1ZO<4KzjMCr`xVB$7W2V zgphd4c;t`{c(1&g>!&r9=H)5&lRjcn+eLXyr!$?v4rj#EA6Tra{U<$y59JiU(OhLn zoiQjGQo5GM?>YYfDhZ9%+}LeyyQno95QGA?3CrR+a0i*s06R$nq8^v-l4M=c21NOi z-DN3T{*vi%p~5&Lap$o(9oZ_!jNh+sY_(@{>Q;ekh_aZ796cdhihBP5E@^CeukPZl zT;@AIe3?=ex!0U4Q71e}peaIy3IRfe3IRfe3IRfe3IRqT$5e+x5!=l7XN7PBG@#H^ zG18O+*SMen^B?p1&~G`!^(U)1LyFkg?m~ae@uOB7EZOT)q5zi@?C0$(1cZLluy8wT zrK-&{QD5U)tufaoLBlP!fzKS&PhjRrJOHa*p>zZ-C1ho_byIGrJ#l%?4WaB{Y#o{4 zo!-}WIaD!HS-Qwl+G+KDNM3P_aql&~?gP8mDF=IeGCNcM04jTQozdmO&@Q@x9)>Lf zZo~$Zt=VyIZ5Shm1m~Y3p89ECW%@i6MhEMbkPm?W0G$w(2I1AOGD_S?K}tq)MR#(0 zCQ*3-M{8I}Bkg90MTq>Z{*J@0>={>9f~}*x;+=82HPtU!C0)Nk+))ZUN_lQL#=*5C zB#p!q!?+$*TGL%D%9>W{L0&nW@}j=7NgSx;DT{*QiUJme3>2tj8YWIjqBDgNMlJE4 zeq?sqZ>({}r6@--qD}zEGsm*69iyRL8y3}S{Vc@iZgS%xXl+w^p!>aAR8Wo>$%?6$$Lw}Zrv$odvZ#5NNvO%5xsl1DJLMO80XHYiF#7BqS4WFwrP=_i7FzR zb*;p>)Q19yacO%PQ6WT>s|pz8K&t3cM=@T4TcBLrOP1^0Xp<1IQnHr9cMN^D&Qh>@ z)9|YC)6YZf*qCsxCRk{9Uv?hmKzp$+6bjNpwmWm=Nhc2v)WGPRUkgRy`ZAafv-i6@xmg}AMSt92nWMX?` zHIyL!^18+T@T~s;TbDTwkz=OYs4N%Nr!be+S*`?+R5JbxYFB`DDIQBTO*O0~>9%h= zR!9NZcW$|^2i9!1q~sp#1XrM1hTjh5Vz@%Nr+g_4Ew_enb`W!q5zKhiHtEjICVZ&9 zdq?!$vf8!Ff3kZBa3!~r2in0=SUieV*@IPsW1tI}v+Ft61duJIqpKxZ{oE|Dl)Rip%0NsV3brO}de09Xqww9g>4<<8ea1+OQ8u7TtnRWfgBEU%;(sVPBrGZz$LStUiXf^pf!flo^kiml|Fe{AnB_ll?# zD5LR|<<1m&pm0AQc`%BmwgxsEqYnZ86d1`rt_pF4^d( zxCFl7A2m_=ne>N%;;qCCdE$xdF`Wf+h_!mI+|dZ*jsoW-ehZ~rbAFL`X(x{7w;v!% zzIdb#)?%eL^u;_!SJj;PVwnl$;y4=Xt~ErYJZze6ZT^>a0ZvI!DsB@*YD`>E!m z;0dO_nMLi19ZkkmiE%)2JLaJYdjUitc}4*$#&+X?P&p@s1DPQt?Qm{wM+zLl9ipk! zXe`G^NKm3U=b|u`^;}e)$wR8!k;AYKVy+?L2=J=4uB9{mJn2v{KCQ&{WA^u@B>w;r zGz@(Z$|P%6*n4n8th$4PgT<3mww8{G8e-7vip~uXUE^q-$|4Lg$fh`g$fh` zg$fh`g$fiKBZ7u`Qj{epu5v=psT~DC_pg$EXFlpnqwgoEwX&T0@2I$cWN;rmnhCe) zpDqG#x9E<9{*`_zRUO51Eu~p?1H}5L!~@+{66Mt}lP-Gm1|v$4TR_T|q=IsLI1glf z>FeApwYklcVZ4``Q5hK>gm#0(9|KnZ0HV!WI#iI_8nnFz93`Se^)1l0 z)Ua~fC_L~~Hyr(xwD-u+k9xn%j1r=GWx~9v13U)Qs3)_6Y6JfO zpzTE-Dkf?PF=II6>_%=YO6%TQoLE2}uc|OIu6%*3y*b8XL3!C&>d=x_NYA>Mnr0&J zT94A?1^P9m#VH9q0;IT+@z~OU@KcAhR7SlTbbn{iT70byraPMpvYv5!w`~OOS>?cS z;lOdnd0o?&7WIXN>1&Lpm|TaMXRRKwLKaXKLFJqij^mE{E7DUg%ZF-$90-E+#4cdY z3#}v84FTJ^dqEw*(%zD_F41CUBgzVRE!P}S?NZ!Q&&^n(t8YnvN5d`I67-4_9$`6D z6>w!|{hGeP@H{+4N1YIKKX}wy#v^yA5+YgSthp`66O4o?g3$3LB`3SKuWk+q;6*hI zH!ND6`K+NoqV8lWNC%901BY4r3jrZmKpYb#0|1Tzz&r7YNh5)-K9a(pTM2cwK7bUa z!huppVIXl8Lu$z~Hl(#S;vGueND6J#9%H<9?AR z(XFx?1AA=6+?2SS=%%euMkB(ABe$Mvz{W}KB;@<*QAxGtfw|c4&q=gL+89$#W-5q7YhL9bv`-P8 zq=X+>V*_vim*$M=^~NV!zo)kO54{1$TvVvY32|#vVYI1joB~33@f`9vaN{d!CK^&|$&#eOQx2_?Be&`W za6fH9YU9{bLb|Kz7t!ij-kG-rD;Wq7mI*!Fczo&SqUK%ij;`}IE4Hg^$jn#|f$0kb z53G9}5x`+69B^`@*+g`|L|PwB$Zh*>pNwR-a);!S`qF#BSvaSispBFFA15KwrKk2v zjy_nS4E=W%_TRruLO@~NI{QU^yW3GxN5N{RCXtYd7B*CYgOk7ZiOKwFqteXxZT7pu z1IMe8Wqc)~cy3FGNjUwNepKqw>FVvW5IH7Gi5^1&s9mJZLkIMQo=iY+TmuKhC@6fz z9*+7XC2DNsC2DN&?McD>D2ArE3r&LKaZ&=)5<1^0Cm9JD=RqFd-VYB#$iup|2_W(* zZ2|RX_;Xknm(wmqzQ`JS>Xv|Y)$wW?Rn1Ognuz4s;(447G~T~6a=2=zqT5{&oJGof z((2YxhW4_?Qa~gqg)9YNjyQ*d@uPbpmB&llwNY7sBbxP}Akm<{hxr`O8_wWD#!6N{0r4ZV}N!YEUw1NQl(j~zR!+8j~->z;x z-~|zyaV;&*IT&e_gW<=Ad8o@(bfKhlK$zs&fMJ^Ybn*%2!zI<%eHdzR?bK ziYLs9(^+b(o~^vQa=b_`ysij9;D(d;5T3;U0QzYar4;YSXvG7EMlz|Isv8OcN|Z`e zdxE&A{{RkZ$irDN)UFsLk>yphNxoUt5S)s#g`u(n$6?rWQlhT6Bt-RR$ruW)IDgXcg diff --git a/priv/static/images/banner.jpg b/priv/static/images/banner.jpg deleted file mode 100644 index df9b751907c61feba52a43074a8ecb5b186b7ca6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 22671 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 From 762914c3c65512bd6ef6c08918e2732fd82141f8 Mon Sep 17 00:00:00 2001 From: miraikumiko Date: Fri, 6 Jun 2025 16:04:36 +0200 Subject: [PATCH 02/10] Remove tests --- test/nulla/users_test.exs | 59 ------------- .../controllers/page_controller_test.exs | 8 -- .../controllers/user_controller_test.exs | 84 ------------------- test/support/fixtures/users_fixtures.ex | 20 ----- 4 files changed, 171 deletions(-) delete mode 100644 test/nulla/users_test.exs delete mode 100644 test/nulla_web/controllers/page_controller_test.exs delete mode 100644 test/nulla_web/controllers/user_controller_test.exs delete mode 100644 test/support/fixtures/users_fixtures.ex diff --git a/test/nulla/users_test.exs b/test/nulla/users_test.exs deleted file mode 100644 index 653e5cc..0000000 --- a/test/nulla/users_test.exs +++ /dev/null @@ -1,59 +0,0 @@ -defmodule Nulla.UsersTest do - use Nulla.DataCase - - alias Nulla.Users - - describe "users" do - alias Nulla.Users.User - - import Nulla.UsersFixtures - - @invalid_attrs %{username: nil} - - test "list_users/0 returns all users" do - user = user_fixture() - assert Users.list_users() == [user] - end - - test "get_user!/1 returns the user with given id" do - user = user_fixture() - assert Users.get_user!(user.id) == user - end - - test "create_user/1 with valid data creates a user" do - valid_attrs = %{username: "some username"} - - assert {:ok, %User{} = user} = Users.create_user(valid_attrs) - assert user.username == "some username" - end - - test "create_user/1 with invalid data returns error changeset" do - assert {:error, %Ecto.Changeset{}} = Users.create_user(@invalid_attrs) - end - - test "update_user/2 with valid data updates the user" do - user = user_fixture() - update_attrs = %{username: "some updated username"} - - assert {:ok, %User{} = user} = Users.update_user(user, update_attrs) - assert user.username == "some updated username" - end - - test "update_user/2 with invalid data returns error changeset" do - user = user_fixture() - assert {:error, %Ecto.Changeset{}} = Users.update_user(user, @invalid_attrs) - assert user == Users.get_user!(user.id) - end - - test "delete_user/1 deletes the user" do - user = user_fixture() - assert {:ok, %User{}} = Users.delete_user(user) - assert_raise Ecto.NoResultsError, fn -> Users.get_user!(user.id) end - end - - test "change_user/1 returns a user changeset" do - user = user_fixture() - assert %Ecto.Changeset{} = Users.change_user(user) - end - end -end diff --git a/test/nulla_web/controllers/page_controller_test.exs b/test/nulla_web/controllers/page_controller_test.exs deleted file mode 100644 index 5e8da73..0000000 --- a/test/nulla_web/controllers/page_controller_test.exs +++ /dev/null @@ -1,8 +0,0 @@ -defmodule NullaWeb.PageControllerTest do - use NullaWeb.ConnCase - - test "GET /", %{conn: conn} do - conn = get(conn, ~p"/") - assert html_response(conn, 200) =~ "Peace of mind from prototype to production" - end -end diff --git a/test/nulla_web/controllers/user_controller_test.exs b/test/nulla_web/controllers/user_controller_test.exs deleted file mode 100644 index 2d67f42..0000000 --- a/test/nulla_web/controllers/user_controller_test.exs +++ /dev/null @@ -1,84 +0,0 @@ -defmodule NullaWeb.UserControllerTest do - use NullaWeb.ConnCase - - import Nulla.UsersFixtures - - @create_attrs %{username: "some username"} - @update_attrs %{username: "some updated username"} - @invalid_attrs %{username: nil} - - describe "index" do - test "lists all users", %{conn: conn} do - conn = get(conn, ~p"/users") - assert html_response(conn, 200) =~ "Listing Users" - end - end - - describe "new user" do - test "renders form", %{conn: conn} do - conn = get(conn, ~p"/users/new") - assert html_response(conn, 200) =~ "New User" - end - end - - describe "create user" do - test "redirects to show when data is valid", %{conn: conn} do - conn = post(conn, ~p"/users", user: @create_attrs) - - assert %{id: id} = redirected_params(conn) - assert redirected_to(conn) == ~p"/users/#{id}" - - conn = get(conn, ~p"/users/#{id}") - assert html_response(conn, 200) =~ "User #{id}" - end - - test "renders errors when data is invalid", %{conn: conn} do - conn = post(conn, ~p"/users", user: @invalid_attrs) - assert html_response(conn, 200) =~ "New User" - end - end - - describe "edit user" do - setup [:create_user] - - test "renders form for editing chosen user", %{conn: conn, user: user} do - conn = get(conn, ~p"/users/#{user}/edit") - assert html_response(conn, 200) =~ "Edit User" - end - end - - describe "update user" do - setup [:create_user] - - test "redirects when data is valid", %{conn: conn, user: user} do - conn = put(conn, ~p"/users/#{user}", user: @update_attrs) - assert redirected_to(conn) == ~p"/users/#{user}" - - conn = get(conn, ~p"/users/#{user}") - assert html_response(conn, 200) =~ "some updated username" - end - - test "renders errors when data is invalid", %{conn: conn, user: user} do - conn = put(conn, ~p"/users/#{user}", user: @invalid_attrs) - assert html_response(conn, 200) =~ "Edit User" - end - end - - describe "delete user" do - setup [:create_user] - - test "deletes chosen user", %{conn: conn, user: user} do - conn = delete(conn, ~p"/users/#{user}") - assert redirected_to(conn) == ~p"/users" - - assert_error_sent 404, fn -> - get(conn, ~p"/users/#{user}") - end - end - end - - defp create_user(_) do - user = user_fixture() - %{user: user} - end -end diff --git a/test/support/fixtures/users_fixtures.ex b/test/support/fixtures/users_fixtures.ex deleted file mode 100644 index ae82587..0000000 --- a/test/support/fixtures/users_fixtures.ex +++ /dev/null @@ -1,20 +0,0 @@ -defmodule Nulla.UsersFixtures do - @moduledoc """ - This module defines test helpers for creating - entities via the `Nulla.Users` context. - """ - - @doc """ - Generate a user. - """ - def user_fixture(attrs \\ %{}) do - {:ok, user} = - attrs - |> Enum.into(%{ - username: "some username" - }) - |> Nulla.Users.create_user() - - user - end -end From 182523d36dd745d6ee48c6c592f0d7663ba5c3cf Mon Sep 17 00:00:00 2001 From: miraikumiko Date: Fri, 6 Jun 2025 16:06:24 +0200 Subject: [PATCH 03/10] Remove page_* --- lib/nulla_web/controllers/page_controller.ex | 11 ---------- lib/nulla_web/controllers/page_html.ex | 10 ---------- .../controllers/page_html/home.html.heex | 20 ------------------- 3 files changed, 41 deletions(-) delete mode 100644 lib/nulla_web/controllers/page_controller.ex delete mode 100644 lib/nulla_web/controllers/page_html.ex delete mode 100644 lib/nulla_web/controllers/page_html/home.html.heex diff --git a/lib/nulla_web/controllers/page_controller.ex b/lib/nulla_web/controllers/page_controller.ex deleted file mode 100644 index 76dd567..0000000 --- a/lib/nulla_web/controllers/page_controller.ex +++ /dev/null @@ -1,11 +0,0 @@ -defmodule NullaWeb.PageController do - use NullaWeb, :controller - - def home(conn, _params) do - render(conn, :home, layout: false) - end - - def profile(conn, %{"username" => _username}) do - render(conn, :profile, layout: false) - end -end diff --git a/lib/nulla_web/controllers/page_html.ex b/lib/nulla_web/controllers/page_html.ex deleted file mode 100644 index fbb6c6e..0000000 --- a/lib/nulla_web/controllers/page_html.ex +++ /dev/null @@ -1,10 +0,0 @@ -defmodule NullaWeb.PageHTML do - @moduledoc """ - This module contains pages rendered by PageController. - - See the `page_html` directory for all templates available. - """ - use NullaWeb, :html - - embed_templates "page_html/*" -end diff --git a/lib/nulla_web/controllers/page_html/home.html.heex b/lib/nulla_web/controllers/page_html/home.html.heex deleted file mode 100644 index 6bcfbd1..0000000 --- a/lib/nulla_web/controllers/page_html/home.html.heex +++ /dev/null @@ -1,20 +0,0 @@ -<.flash_group flash={@flash} /> -

-
- -
- -
- -
-
-
-
- -
-
-
- -
-
-
From 9e542bc7909ac1a3e1cbbedefc354a175cc36b00 Mon Sep 17 00:00:00 2001 From: miraikumiko Date: Fri, 6 Jun 2025 16:07:04 +0200 Subject: [PATCH 04/10] Add models and migrations --- lib/nulla/activitypub.ex | 41 ++++++- lib/nulla/models/bookmarks.ex | 23 ++++ lib/nulla/models/follow.ex | 19 ++++ lib/nulla/models/hashtag.ex | 19 ++++ lib/nulla/{ => models}/instance_settings.ex | 11 +- lib/nulla/models/media_attachment.ex | 20 ++++ lib/nulla/models/moderation_log.ex | 23 ++++ lib/nulla/models/note.ex | 29 +++++ lib/nulla/models/notification.ex | 22 ++++ lib/nulla/models/session.ex | 21 ++++ lib/nulla/{users => models}/user.ex | 11 +- lib/nulla/users.ex | 106 ------------------ lib/nulla_web.ex | 2 +- lib/nulla_web/controllers/note_controller.ex | 62 ++++++++++ lib/nulla_web/controllers/note_html.ex | 13 +++ .../controllers/note_html/edit.html.heex | 8 ++ .../controllers/note_html/index.html.heex | 23 ++++ .../controllers/note_html/new.html.heex | 8 ++ .../controllers/note_html/note_form.html.heex | 9 ++ .../controllers/note_html/show.html.heex | 15 +++ lib/nulla_web/controllers/user_controller.ex | 10 +- lib/nulla_web/controllers/user_html.ex | 38 +++++++ .../controllers/user_html/show.html.heex | 53 ++++++++- ...250527054942_create_instance_settings.exs} | 4 + .../20250530110822_create_users.exs | 1 - .../20250604083506_create_notes.exs | 18 +++ .../20250606100445_create_bookmarks.exs | 14 +++ .../20250606103230_create_notifications.exs | 18 +++ ...20250606103527_create_moderations_logs.exs | 19 ++++ .../20250606103649_create_hashtags.exs | 14 +++ .../20250606103707_create_follows.exs | 15 +++ .../20250606131715_create_sessions.exs | 17 +++ ...0250606132108_create_media_attachments.exs | 16 +++ 33 files changed, 597 insertions(+), 125 deletions(-) create mode 100644 lib/nulla/models/bookmarks.ex create mode 100644 lib/nulla/models/follow.ex create mode 100644 lib/nulla/models/hashtag.ex rename lib/nulla/{ => models}/instance_settings.ex (64%) create mode 100644 lib/nulla/models/media_attachment.ex create mode 100644 lib/nulla/models/moderation_log.ex create mode 100644 lib/nulla/models/note.ex create mode 100644 lib/nulla/models/notification.ex create mode 100644 lib/nulla/models/session.ex rename lib/nulla/{users => models}/user.ex (80%) delete mode 100644 lib/nulla/users.ex create mode 100644 lib/nulla_web/controllers/note_controller.ex create mode 100644 lib/nulla_web/controllers/note_html.ex create mode 100644 lib/nulla_web/controllers/note_html/edit.html.heex create mode 100644 lib/nulla_web/controllers/note_html/index.html.heex create mode 100644 lib/nulla_web/controllers/note_html/new.html.heex create mode 100644 lib/nulla_web/controllers/note_html/note_form.html.heex create mode 100644 lib/nulla_web/controllers/note_html/show.html.heex rename priv/repo/migrations/{20250527054942_create_instance.exs => 20250527054942_create_instance_settings.exs} (86%) create mode 100644 priv/repo/migrations/20250604083506_create_notes.exs create mode 100644 priv/repo/migrations/20250606100445_create_bookmarks.exs create mode 100644 priv/repo/migrations/20250606103230_create_notifications.exs create mode 100644 priv/repo/migrations/20250606103527_create_moderations_logs.exs create mode 100644 priv/repo/migrations/20250606103649_create_hashtags.exs create mode 100644 priv/repo/migrations/20250606103707_create_follows.exs create mode 100644 priv/repo/migrations/20250606131715_create_sessions.exs create mode 100644 priv/repo/migrations/20250606132108_create_media_attachments.exs diff --git a/lib/nulla/activitypub.ex b/lib/nulla/activitypub.ex index 85647e1..2bea870 100644 --- a/lib/nulla/activitypub.ex +++ b/lib/nulla/activitypub.ex @@ -20,12 +20,12 @@ defmodule Nulla.ActivityPub do indexable: "toot:indexable", attributionDomains: %{"@id" => "toot:attributionDomains", "@type" => "@id"}, Hashtag: "as:Hashtag", - focalPoint: %{"@container" => "@list", "@id" => "toot:focalPoint"} + vcard: "http://www.w3.org/2006/vcard/ns#" ) ] end - @spec ap_user(String.t(), Nulla.Users.User.t()) :: Jason.OrderedObject.t() + @spec ap_user(String.t(), Nulla.Models.User.t()) :: Jason.OrderedObject.t() def ap_user(domain, user) do Jason.OrderedObject.new([ "@context": context(), @@ -81,4 +81,41 @@ defmodule Nulla.ActivityPub do "vcard:Address": user.location ]) end + + @spec note(String.t(), Nulla.Models.User.t(), Nulla.Models.Note.t()) :: Jason.OrderedObject.t() + def note(domain, user, note) do + Jason.OrderedObject.new([ + "@context": [ + "https://www.w3.org/ns/activitystreams", + Jason.OrderedObject.new( + sensitive: "as:sensitive" + ) + ], + id: "https://#{domain}/@#{user.username}/#{note.id}", + type: "Note", + summary: nil, + inReplyTo: nil, + published: note.inserted_at, + url: "https://#{domain}/@#{user.username}/#{note.id}", + attributedTo: "https://#{domain}/@#{user.username}", + to: [ + "https://www.w3.org/ns/activitystreams#Public" + ], + cc: [ + "https://#{domain}/@#{user.username}/followers" + ], + sensetive: false, + content: note.content, + contentMap: Jason.OrderedObject.new( + "#{note.language}": "

@rf@mastodonsocial.ru Вниманию новичкам!

Вам небольшое руководство о том, как импротировать пост, которого нет в вашей ленте.

" + ), + attachment: [ + Jason.OrderedObject.new( + type: "Document", + mediaType: "video/mp4", + url: "https://mastodon.ml/system/media_attachments/files/000/040/494/original/8c06de179c11daea.mp4" + ) + ] + ]) + end end diff --git a/lib/nulla/models/bookmarks.ex b/lib/nulla/models/bookmarks.ex new file mode 100644 index 0000000..b4e7a5b --- /dev/null +++ b/lib/nulla/models/bookmarks.ex @@ -0,0 +1,23 @@ +defmodule Nulla.Models.Bookmark do + use Ecto.Schema + import Ecto.Changeset + import Ecto.Query + alias Nulla.Repo + alias Nulla.Models.Bookmark + + schema "bookmarks" do + field :url, :string + field :user_id, :id + + timestamps(type: :utc_datetime) + end + + @doc false + def changeset(bookmark, attrs) do + bookmark + |> cast(attrs, [:url, :user_id]) + |> validate_required([:url, :user_id]) + end + + def get_all_bookmarks!(user_id), do: Repo.all(from n in Bookmark, where: n.user_id == ^user_id) +end diff --git a/lib/nulla/models/follow.ex b/lib/nulla/models/follow.ex new file mode 100644 index 0000000..0469dbd --- /dev/null +++ b/lib/nulla/models/follow.ex @@ -0,0 +1,19 @@ +defmodule Nulla.Models.Follow do + use Ecto.Schema + import Ecto.Changeset + + schema "follows" do + belongs_to :user, Nulla.Models.User + belongs_to :target, Nulla.Models.User + + timestamps() + end + + @doc false + def changeset(follow, attrs) do + follow + |> cast(attrs, [:user_id, :target_id]) + |> validate_required([:user_id, :target_id]) + |> unique_constraint([:user_id, :target_id]) + end +end diff --git a/lib/nulla/models/hashtag.ex b/lib/nulla/models/hashtag.ex new file mode 100644 index 0000000..0be647d --- /dev/null +++ b/lib/nulla/models/hashtag.ex @@ -0,0 +1,19 @@ +defmodule Nulla.Models.Hashtag do + use Ecto.Schema + import Ecto.Changeset + + schema "hashtags" do + field :tag, :string + field :usage_count, :integer, default: 0 + + timestamps() + end + + @doc false + def changeset(hashtag, attrs) do + hashtag + |> cast(attrs, [:tag, :usage_count]) + |> validate_required([:tag]) + |> unique_constraint(:tag) + end +end diff --git a/lib/nulla/instance_settings.ex b/lib/nulla/models/instance_settings.ex similarity index 64% rename from lib/nulla/instance_settings.ex rename to lib/nulla/models/instance_settings.ex index 3e4f495..96280c1 100644 --- a/lib/nulla/instance_settings.ex +++ b/lib/nulla/models/instance_settings.ex @@ -1,7 +1,8 @@ -defmodule Nulla.InstanceSettings do +defmodule Nulla.Models.InstanceSettings do use Ecto.Schema import Ecto.Changeset alias Nulla.Repo + alias Nulla.Models.InstanceSettings schema "instance_settings" do field :name, :string, default: "Nulla" @@ -10,14 +11,16 @@ defmodule Nulla.InstanceSettings do field :registration, :boolean, default: false field :max_characters, :integer, default: 5000 field :max_upload_size, :integer, default: 50 + field :public_key, :string + field :private_key, :string end @doc false def changeset(instance_settings, attrs) do instance_settings - |> cast(attrs, [:name, :description, :domain, :registration, :max_characters, :max_upload_size]) - |> validate_required([:name, :description, :domain, :registration, :max_characters, :max_upload_size]) + |> cast(attrs, [:name, :description, :domain, :registration, :max_characters, :max_upload_size, :public_key, :private_key]) + |> validate_required([:name, :description, :domain, :registration, :max_characters, :max_upload_size, :public_key, :private_key]) end - def get_instance_settings!, do: Repo.one!(Nulla.InstanceSettings) + def get_instance_settings!, do: Repo.one!(InstanceSettings) end diff --git a/lib/nulla/models/media_attachment.ex b/lib/nulla/models/media_attachment.ex new file mode 100644 index 0000000..9eca245 --- /dev/null +++ b/lib/nulla/models/media_attachment.ex @@ -0,0 +1,20 @@ +defmodule Nulla.Models.MediaAttachment do + use Ecto.Schema + import Ecto.Changeset + + schema "media_attachments" do + field :file, :string + field :mime_type, :string + field :description, :string + + belongs_to :note, Nulla.Models.Note + + timestamps(type: :utc_datetime) + end + + def changeset(media, attrs) do + media + |> cast(attrs, [:note_id, :file, :mime_type, :description]) + |> validate_required([:note_id, :file]) + end +end diff --git a/lib/nulla/models/moderation_log.ex b/lib/nulla/models/moderation_log.ex new file mode 100644 index 0000000..f6d3469 --- /dev/null +++ b/lib/nulla/models/moderation_log.ex @@ -0,0 +1,23 @@ +defmodule Nulla.Models.ModerationLog do + use Ecto.Schema + import Ecto.Changeset + + schema "moderation_logs" do + field :target_type, :string + field :target_id, :string + field :action, :string + field :reason, :string + field :metadata, :map + + belongs_to :moderator, Nulla.Models.User + + timestamps() + end + + @doc false + def changeset(moderation_log, attrs) do + moderation_log + |> cast(attrs, [:moderator_id, :target_type, :target_id, :action, :reason, :metadata]) + |> validate_required([:moderator_id, :target_type, :target_id, :action]) + end +end diff --git a/lib/nulla/models/note.ex b/lib/nulla/models/note.ex new file mode 100644 index 0000000..f4d5960 --- /dev/null +++ b/lib/nulla/models/note.ex @@ -0,0 +1,29 @@ +defmodule Nulla.Models.Note do + use Ecto.Schema + import Ecto.Changeset + import Ecto.Query + alias Nulla.Repo + alias Nulla.Models.Note + + schema "notes" do + field :content, :string + field :visibility, Ecto.Enum, values: [:public, :unlisted, :followers, :private], default: :public + field :sensitive, :boolean, default: false + field :language, :string + field :in_reply_to, :string + + belongs_to :user, Nulla.Models.User + has_many :media_attachments, Nulla.Models.MediaAttachment + + timestamps(type: :utc_datetime) + end + + @doc false + def changeset(note, attrs) do + note + |> cast(attrs, [:content, :visibility, :sensitive, :language, :in_reply_to, :user_id]) + |> validate_required([:content, :visibility, :sensitive, :language, :in_reply_to, :user_id]) + end + + def get_all_notes!(user_id), do: Repo.all(from n in Note, where: n.user_id == ^user_id) +end diff --git a/lib/nulla/models/notification.ex b/lib/nulla/models/notification.ex new file mode 100644 index 0000000..c0d595c --- /dev/null +++ b/lib/nulla/models/notification.ex @@ -0,0 +1,22 @@ +defmodule Nulla.Models.Notification do + use Ecto.Schema + import Ecto.Changeset + + schema "notifications" do + field :type, :string + field :data, :map + field :read, :boolean, default: false + + belongs_to :user, Nulla.Models.User + belongs_to :actor, Nulla.Models.User + + timestamps() + end + + @doc false + def changeset(notification, attrs) do + notification + |> cast(attrs, [:user_id, :actor_id, :type, :data, :read]) + |> validate_required([:user_id, :type]) + end +end diff --git a/lib/nulla/models/session.ex b/lib/nulla/models/session.ex new file mode 100644 index 0000000..c505ad6 --- /dev/null +++ b/lib/nulla/models/session.ex @@ -0,0 +1,21 @@ +defmodule Nulla.Models.Session do + use Ecto.Schema + import Ecto.Changeset + + schema "sessions" do + field :token, :string + field :user_agent, :string + field :ip, :string + + belongs_to :user, Nulla.Models.User + + timestamps(type: :utc_datetime) + end + + def changeset(session, attrs) do + session + |> cast(attrs, [:user_id, :token, :user_agent, :ip]) + |> validate_required([:user_id, :token]) + |> unique_constraint(:token) + end +end diff --git a/lib/nulla/users/user.ex b/lib/nulla/models/user.ex similarity index 80% rename from lib/nulla/users/user.ex rename to lib/nulla/models/user.ex index b03f068..d350ad0 100644 --- a/lib/nulla/users/user.ex +++ b/lib/nulla/models/user.ex @@ -1,13 +1,14 @@ -defmodule Nulla.Users.User do +defmodule Nulla.Models.User do use Ecto.Schema import Ecto.Changeset + alias Nulla.Repo + alias Nulla.Models.User schema "users" do field :username, :string field :email, :string field :password, :string field :is_moderator, :boolean, default: false - field :realname, :string field :bio, :string field :location, :string @@ -24,6 +25,10 @@ defmodule Nulla.Users.User do field :avatar, :string field :banner, :string + has_many :user_sessions, Nulla.Models.Session + has_many :notes, Nulla.Models.Note + has_many :media_attachments, through: [:notes, :media_attachments] + timestamps(type: :utc_datetime) end @@ -33,4 +38,6 @@ defmodule Nulla.Users.User do |> cast(attrs, [:username, :email, :password, :is_moderator, :realname, :bio, :location, :birthday, :fields, :follow_approval, :is_bot, :is_discoverable, :is_indexable, :is_memorial, :private_key, :public_key, :avatar, :banner]) |> validate_required([:username, :email, :password, :is_moderator, :realname, :bio, :location, :birthday, :fields, :follow_approval, :is_bot, :is_discoverable, :is_indexable, :is_memorial, :private_key, :public_key, :avatar, :banner]) end + + def get_user_by_username!(username), do: Repo.get_by!(User, username: username) end diff --git a/lib/nulla/users.ex b/lib/nulla/users.ex deleted file mode 100644 index 292db75..0000000 --- a/lib/nulla/users.ex +++ /dev/null @@ -1,106 +0,0 @@ -defmodule Nulla.Users do - @moduledoc """ - The Users context. - """ - - import Ecto.Query, warn: false - alias Nulla.Repo - - alias Nulla.Users.User - - @doc """ - Returns the list of users. - - ## Examples - - iex> list_users() - [%User{}, ...] - - """ - def list_users do - Repo.all(User) - end - - @doc """ - Gets a single user. - - Raises `Ecto.NoResultsError` if the User does not exist. - - ## Examples - - iex> get_user!(123) - %User{} - - iex> get_user!(456) - ** (Ecto.NoResultsError) - - """ - def get_user!(id), do: Repo.get!(User, id) - - def get_user_by_username!(username), do: Repo.get_by!(User, username: username) - - @doc """ - Creates a user. - - ## Examples - - iex> create_user(%{field: value}) - {:ok, %User{}} - - iex> create_user(%{field: bad_value}) - {:error, %Ecto.Changeset{}} - - """ - def create_user(attrs \\ %{}) do - %User{} - |> User.changeset(attrs) - |> Repo.insert() - end - - @doc """ - Updates a user. - - ## Examples - - iex> update_user(user, %{field: new_value}) - {:ok, %User{}} - - iex> update_user(user, %{field: bad_value}) - {:error, %Ecto.Changeset{}} - - """ - def update_user(%User{} = user, attrs) do - user - |> User.changeset(attrs) - |> Repo.update() - end - - @doc """ - Deletes a user. - - ## Examples - - iex> delete_user(user) - {:ok, %User{}} - - iex> delete_user(user) - {:error, %Ecto.Changeset{}} - - """ - def delete_user(%User{} = user) do - Repo.delete(user) - end - - @doc """ - Returns an `%Ecto.Changeset{}` for tracking user changes. - - ## Examples - - iex> change_user(user) - %Ecto.Changeset{data: %User{}} - - """ - def change_user(%User{} = user, attrs \\ %{}) do - User.changeset(user, attrs) - end -end diff --git a/lib/nulla_web.ex b/lib/nulla_web.ex index 862aea6..9feaa88 100644 --- a/lib/nulla_web.ex +++ b/lib/nulla_web.ex @@ -17,7 +17,7 @@ defmodule NullaWeb do those modules here. """ - def static_paths, do: ~w(assets fonts images favicon.ico robots.txt) + def static_paths, do: ~w(assets files fonts images favicon.ico robots.txt) def router do quote do diff --git a/lib/nulla_web/controllers/note_controller.ex b/lib/nulla_web/controllers/note_controller.ex new file mode 100644 index 0000000..814a1dd --- /dev/null +++ b/lib/nulla_web/controllers/note_controller.ex @@ -0,0 +1,62 @@ +defmodule NullaWeb.NoteController do + use NullaWeb, :controller + + alias Nulla.Notes + alias Nulla.Models.Note + + def index(conn, _params) do + notes = Notes.list_notes() + render(conn, :index, notes: notes) + end + + def new(conn, _params) do + changeset = Notes.change_note(%Note{}) + render(conn, :new, changeset: changeset) + end + + def create(conn, %{"note" => note_params}) do + case Notes.create_note(note_params) do + {:ok, note} -> + conn + |> put_flash(:info, "Note created successfully.") + |> redirect(to: ~p"/notes/#{note}") + + {:error, %Ecto.Changeset{} = changeset} -> + render(conn, :new, changeset: changeset) + end + end + + def show(conn, %{"id" => id}) do + note = Notes.get_note!(id) + render(conn, :show, note: note) + end + + def edit(conn, %{"id" => id}) do + note = Notes.get_note!(id) + changeset = Notes.change_note(note) + render(conn, :edit, note: note, changeset: changeset) + end + + def update(conn, %{"id" => id, "note" => note_params}) do + note = Notes.get_note!(id) + + case Notes.update_note(note, note_params) do + {:ok, note} -> + conn + |> put_flash(:info, "Note updated successfully.") + |> redirect(to: ~p"/notes/#{note}") + + {:error, %Ecto.Changeset{} = changeset} -> + render(conn, :edit, note: note, changeset: changeset) + end + end + + def delete(conn, %{"id" => id}) do + note = Notes.get_note!(id) + {:ok, _note} = Notes.delete_note(note) + + conn + |> put_flash(:info, "Note deleted successfully.") + |> redirect(to: ~p"/notes") + end +end diff --git a/lib/nulla_web/controllers/note_html.ex b/lib/nulla_web/controllers/note_html.ex new file mode 100644 index 0000000..447c9ab --- /dev/null +++ b/lib/nulla_web/controllers/note_html.ex @@ -0,0 +1,13 @@ +defmodule NullaWeb.NoteHTML do + use NullaWeb, :html + + embed_templates "note_html/*" + + @doc """ + Renders a note form. + """ + attr :changeset, Ecto.Changeset, required: true + attr :action, :string, required: true + + def note_form(assigns) +end diff --git a/lib/nulla_web/controllers/note_html/edit.html.heex b/lib/nulla_web/controllers/note_html/edit.html.heex new file mode 100644 index 0000000..3bef388 --- /dev/null +++ b/lib/nulla_web/controllers/note_html/edit.html.heex @@ -0,0 +1,8 @@ +<.header> + Edit Note {@note.id} + <:subtitle>Use this form to manage note records in your database. + + +<.note_form changeset={@changeset} action={~p"/notes/#{@note}"} /> + +<.back navigate={~p"/notes"}>Back to notes diff --git a/lib/nulla_web/controllers/note_html/index.html.heex b/lib/nulla_web/controllers/note_html/index.html.heex new file mode 100644 index 0000000..ffeedbc --- /dev/null +++ b/lib/nulla_web/controllers/note_html/index.html.heex @@ -0,0 +1,23 @@ +<.header> + Listing Notes + <:actions> + <.link href={~p"/notes/new"}> + <.button>New Note + + + + +<.table id="notes" rows={@notes} row_click={&JS.navigate(~p"/notes/#{&1}")}> + <:col :let={note} label="Content">{note.content} + <:action :let={note}> +
+ <.link navigate={~p"/notes/#{note}"}>Show +
+ <.link navigate={~p"/notes/#{note}/edit"}>Edit + + <:action :let={note}> + <.link href={~p"/notes/#{note}"} method="delete" data-confirm="Are you sure?"> + Delete + + + diff --git a/lib/nulla_web/controllers/note_html/new.html.heex b/lib/nulla_web/controllers/note_html/new.html.heex new file mode 100644 index 0000000..4cf47a4 --- /dev/null +++ b/lib/nulla_web/controllers/note_html/new.html.heex @@ -0,0 +1,8 @@ +<.header> + New Note + <:subtitle>Use this form to manage note records in your database. + + +<.note_form changeset={@changeset} action={~p"/notes"} /> + +<.back navigate={~p"/notes"}>Back to notes diff --git a/lib/nulla_web/controllers/note_html/note_form.html.heex b/lib/nulla_web/controllers/note_html/note_form.html.heex new file mode 100644 index 0000000..da6ac0f --- /dev/null +++ b/lib/nulla_web/controllers/note_html/note_form.html.heex @@ -0,0 +1,9 @@ +<.simple_form :let={f} for={@changeset} action={@action}> + <.error :if={@changeset.action}> + Oops, something went wrong! Please check the errors below. + + <.input field={f[:content]} type="text" label="Content" /> + <:actions> + <.button>Save Note + + diff --git a/lib/nulla_web/controllers/note_html/show.html.heex b/lib/nulla_web/controllers/note_html/show.html.heex new file mode 100644 index 0000000..d7f2f70 --- /dev/null +++ b/lib/nulla_web/controllers/note_html/show.html.heex @@ -0,0 +1,15 @@ +<.header> + Note {@note.id} + <:subtitle>This is a note record from your database. + <:actions> + <.link href={~p"/notes/#{@note}/edit"}> + <.button>Edit note + + + + +<.list> + <:item title="Content">{@note.content} + + +<.back navigate={~p"/notes"}>Back to notes diff --git a/lib/nulla_web/controllers/user_controller.ex b/lib/nulla_web/controllers/user_controller.ex index 76e8b80..0f078e0 100644 --- a/lib/nulla_web/controllers/user_controller.ex +++ b/lib/nulla_web/controllers/user_controller.ex @@ -1,21 +1,23 @@ defmodule NullaWeb.UserController do use NullaWeb, :controller - alias Nulla.Users - alias Nulla.InstanceSettings + alias Nulla.Models.User + alias Nulla.Models.Note + alias Nulla.Models.InstanceSettings alias Nulla.ActivityPub def show(conn, %{"username" => username}) do accept = List.first(get_req_header(conn, "accept")) instance_settings = InstanceSettings.get_instance_settings!() domain = instance_settings.domain - user = Users.get_user_by_username!(username) + user = User.get_user_by_username!(username) + notes = Note.get_all_notes!(user.id) if accept in ["application/activity+json", "application/ld+json"] do conn |> put_resp_content_type("application/activity+json") |> json(ActivityPub.ap_user(domain, user)) else - render(conn, :show, user: user, domain: domain, layout: false) + render(conn, :show, domain: domain, user: user, notes: notes, layout: false) end end end diff --git a/lib/nulla_web/controllers/user_html.ex b/lib/nulla_web/controllers/user_html.ex index db0df5b..fe6103e 100644 --- a/lib/nulla_web/controllers/user_html.ex +++ b/lib/nulla_web/controllers/user_html.ex @@ -38,4 +38,42 @@ defmodule NullaWeb.UserHTML do "#{formatted} (#{relative})" end + + def format_note_datetime(datetime) do + Timex.format!(datetime, "{0D} {Mfull} {YYYY}, {h24}:{m}", :strftime) + end + + def format_note_datetime_diff(datetime) do + now = Timex.now() + diff = Timex.diff(now, datetime, :seconds) + + cond do + diff < 60 -> + "now" + + diff < 3600 -> + minutes = div(diff, 60) + "#{minutes}m ago" + + diff < 86400 -> + hours = div(diff, 3600) + "#{hours}h ago" + + diff < 518400 -> + days = div(diff, 86400) + "#{days}d ago" + + diff < 2419200 -> + weeks = div(diff, 604800) + "#{weeks}w ago" + + diff < 28512000 -> + months = Timex.diff(now, datetime, :months) + "#{months}mo ago" + + true -> + years = Timex.diff(now, datetime, :years) + "#{years}y ago" + end + end end diff --git a/lib/nulla_web/controllers/user_html/show.html.heex b/lib/nulla_web/controllers/user_html/show.html.heex index 708842f..9ce9f87 100644 --- a/lib/nulla_web/controllers/user_html/show.html.heex +++ b/lib/nulla_web/controllers/user_html/show.html.heex @@ -10,8 +10,11 @@
- - + +
+ + +
{@user.realname} @@ -26,14 +29,12 @@
<%= @user.location %>
<% end %> - <%= if @user.birthday do %>
<.icon name="hero-cake" class="mt-0.5 h-5 w-5 flex-none" />
<%= format_birthdate(@user.birthday) %>
<% end %> -
<.icon name="hero-calendar" class="mt-0.5 h-5 w-5 flex-none" />
@@ -59,12 +60,54 @@ 31 Followers
-
+
Featured Posts Posts and replies Media
+
+ <%= for note <- @notes do %> +
+
+ +
+
+
+ + <%= @user.realname %> + + + @<%= @user.username %>@<%= @domain %> + +
+
+ <%= case note.visibility do %> + <% :public -> %> + <.icon name="hero-globe-americas" class="h-5 w-5" /> + <% :unlisted -> %> + <.icon name="hero-moon" class="h-5 w-5" /> + <% :followers -> %> + <.icon name="hero-lock-closed" class="h-5 w-5" /> + <% :private -> %> + <.icon name="hero-at-symbol" class="h-5 w-5" /> + <% end %> + <%= format_note_datetime_diff(note.inserted_at) %> +
+
+
+

<%= note.content %>

+
+
+ + + +
+
+
+
+ <% end %> +
diff --git a/priv/repo/migrations/20250527054942_create_instance.exs b/priv/repo/migrations/20250527054942_create_instance_settings.exs similarity index 86% rename from priv/repo/migrations/20250527054942_create_instance.exs rename to priv/repo/migrations/20250527054942_create_instance_settings.exs index 4fe6dc8..b316d05 100644 --- a/priv/repo/migrations/20250527054942_create_instance.exs +++ b/priv/repo/migrations/20250527054942_create_instance_settings.exs @@ -9,6 +9,10 @@ defmodule Nulla.Repo.Migrations.CreateInstanceSettings do add :registration, :boolean, default: false, null: false add :max_characters, :integer, default: 5000, null: false add :max_upload_size, :integer, default: 50, null: false + add :public_key, :string + add :private_key, :string + + timestamps() end end end diff --git a/priv/repo/migrations/20250530110822_create_users.exs b/priv/repo/migrations/20250530110822_create_users.exs index 265c22c..54ab8cb 100644 --- a/priv/repo/migrations/20250530110822_create_users.exs +++ b/priv/repo/migrations/20250530110822_create_users.exs @@ -7,7 +7,6 @@ defmodule Nulla.Repo.Migrations.CreateUsers do add :email, :string add :password, :string add :is_moderator, :boolean, default: false, null: false - add :realname, :string add :bio, :string add :location, :string diff --git a/priv/repo/migrations/20250604083506_create_notes.exs b/priv/repo/migrations/20250604083506_create_notes.exs new file mode 100644 index 0000000..61ce44f --- /dev/null +++ b/priv/repo/migrations/20250604083506_create_notes.exs @@ -0,0 +1,18 @@ +defmodule Nulla.Repo.Migrations.CreateNotes do + use Ecto.Migration + + def change do + create table(:notes) do + add :content, :string + add :visibility, :string, default: "public" + add :sensitive, :boolean, default: false + add :language, :string + add :in_reply_to, :string + add :user_id, references(:users, on_delete: :delete_all) + + timestamps(type: :utc_datetime) + end + + create index(:notes, [:user_id]) + end +end diff --git a/priv/repo/migrations/20250606100445_create_bookmarks.exs b/priv/repo/migrations/20250606100445_create_bookmarks.exs new file mode 100644 index 0000000..810721e --- /dev/null +++ b/priv/repo/migrations/20250606100445_create_bookmarks.exs @@ -0,0 +1,14 @@ +defmodule Nulla.Repo.Migrations.CreateBookmarks do + use Ecto.Migration + + def change do + create table(:bookmarks) do + add :url, :string + add :user_id, references(:users, on_delete: :delete_all) + + timestamps(type: :utc_datetime) + end + + create index(:bookmarks, [:user_id]) + end +end diff --git a/priv/repo/migrations/20250606103230_create_notifications.exs b/priv/repo/migrations/20250606103230_create_notifications.exs new file mode 100644 index 0000000..85ec848 --- /dev/null +++ b/priv/repo/migrations/20250606103230_create_notifications.exs @@ -0,0 +1,18 @@ +defmodule Nulla.Repo.Migrations.CreateNotifications do + use Ecto.Migration + + def change do + create table(:notifications) do + add :user_id, references(:users, on_delete: :delete_all), null: false + add :actor_id, references(:users, on_delete: :nilify_all) + add :type, :string, null: false + add :data, :map + add :read, :boolean, default: false, null: false + + timestamps() + end + + create index(:notifications, [:user_id]) + create index(:notifications, [:actor_id]) + end +end diff --git a/priv/repo/migrations/20250606103527_create_moderations_logs.exs b/priv/repo/migrations/20250606103527_create_moderations_logs.exs new file mode 100644 index 0000000..252231f --- /dev/null +++ b/priv/repo/migrations/20250606103527_create_moderations_logs.exs @@ -0,0 +1,19 @@ +defmodule Nulla.Repo.Migrations.CreateModerationLogs do + use Ecto.Migration + + def change do + create table(:moderation_logs) do + add :moderator_id, references(:users, on_delete: :nilify_all), null: false + add :target_type, :string, null: false + add :target_id, :string, null: false + add :action, :string, null: false + add :reason, :text + add :metadata, :map + + timestamps() + end + + create index(:moderation_logs, [:moderator_id]) + create index(:moderation_logs, [:target_type, :target_id]) + end +end diff --git a/priv/repo/migrations/20250606103649_create_hashtags.exs b/priv/repo/migrations/20250606103649_create_hashtags.exs new file mode 100644 index 0000000..6a155cc --- /dev/null +++ b/priv/repo/migrations/20250606103649_create_hashtags.exs @@ -0,0 +1,14 @@ +defmodule Nulla.Repo.Migrations.CreateHashtags do + use Ecto.Migration + + def change do + create table(:hashtags) do + add :tag, :string, null: false + add :usage_count, :integer, default: 0, null: false + + timestamps() + end + + create unique_index(:hashtags, [:tag]) + end +end diff --git a/priv/repo/migrations/20250606103707_create_follows.exs b/priv/repo/migrations/20250606103707_create_follows.exs new file mode 100644 index 0000000..27f161f --- /dev/null +++ b/priv/repo/migrations/20250606103707_create_follows.exs @@ -0,0 +1,15 @@ +defmodule Nulla.Repo.Migrations.CreateFollows do + use Ecto.Migration + + def change do + create table(:follows) do + add :user_id, references(:users, on_delete: :delete_all), null: false + add :target_id, references(:users, on_delete: :delete_all), null: false + + timestamps() + end + + create unique_index(:follows, [:user_id, :target_id]) + create index(:follows, [:target_id]) + end +end diff --git a/priv/repo/migrations/20250606131715_create_sessions.exs b/priv/repo/migrations/20250606131715_create_sessions.exs new file mode 100644 index 0000000..b11c9fc --- /dev/null +++ b/priv/repo/migrations/20250606131715_create_sessions.exs @@ -0,0 +1,17 @@ +defmodule Nulla.Repo.Migrations.CreateSessions do + use Ecto.Migration + + def change do + create table(:sessions) do + add :user_id, references(:users, on_delete: :delete_all), null: false + add :token, :string, null: false + add :user_agent, :string + add :ip, :string + + timestamps(type: :utc_datetime) + end + + create index(:sessions, [:user_id]) + create unique_index(:sessions, [:token]) + end +end diff --git a/priv/repo/migrations/20250606132108_create_media_attachments.exs b/priv/repo/migrations/20250606132108_create_media_attachments.exs new file mode 100644 index 0000000..0aef7bd --- /dev/null +++ b/priv/repo/migrations/20250606132108_create_media_attachments.exs @@ -0,0 +1,16 @@ +defmodule Nulla.Repo.Migrations.CreateMediaAttachments do + use Ecto.Migration + + def change do + create table(:media_attachments) do + add :note_id, references(:notes, on_delete: :delete_all), null: false + add :file, :string, null: false + add :mime_type, :string + add :description, :string + + timestamps(type: :utc_datetime) + end + + create index(:media_attachments, [:note_id]) + end +end From 1e36317c47a67113538bcf15ccd77806a0d150e2 Mon Sep 17 00:00:00 2001 From: miraikumiko Date: Fri, 6 Jun 2025 16:43:20 +0200 Subject: [PATCH 05/10] Move CONTRIBUTING.md to README.md --- CONTRIBUTING.md | 9 --------- README.md | 10 ++++++++++ 2 files changed, 10 insertions(+), 9 deletions(-) delete mode 100644 CONTRIBUTING.md diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md deleted file mode 100644 index feed8c0..0000000 --- a/CONTRIBUTING.md +++ /dev/null @@ -1,9 +0,0 @@ -# Contributing - -## Patches via Email - -You can create a patch with this command `git format-patch -M origin/main` and send it to this [email address](mailto:miraikumiko@disroot.org). Check out this [guide](https://git-send-email.io). - -## Your repository - -You fork this repository and make your changes in the feature branch, then I pull it. diff --git a/README.md b/README.md index 6985540..8771475 100644 --- a/README.md +++ b/README.md @@ -73,3 +73,13 @@ filter keyword #tag user@example.com example.com * Show replies of all followed users * Show replies of this followed users + +## Contributing + +### Patches via Email + +You can create a patch with this command `git format-patch -M origin/main` and send it to this [email address](mailto:miraikumiko@disroot.org). Check out this [guide](https://git-send-email.io). + +### Your repository + +You fork this repository and make your changes in the feature branch, then I pull it. From ab12fb47a80fea41694c594f91494deed33d57f6 Mon Sep 17 00:00:00 2001 From: miraikumiko Date: Fri, 6 Jun 2025 16:43:55 +0200 Subject: [PATCH 06/10] Add uploader.ex --- lib/nulla/uploader.ex | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 lib/nulla/uploader.ex diff --git a/lib/nulla/uploader.ex b/lib/nulla/uploader.ex new file mode 100644 index 0000000..9704674 --- /dev/null +++ b/lib/nulla/uploader.ex @@ -0,0 +1,25 @@ +defmodule Nulla.Uploader do + def upload(%Plug.Upload{path: temp_path, filename: original_name}) do + {:ok, binary} = File.read(temp_path) + hash = :crypto.hash(:sha1, binary) |> Base.encode16(case: :lower) + file_type = Path.extname(original_name) + + segments = + hash + |> String.slice(0, 15) + |> String.codepoints() + |> Enum.chunk_every(3) + |> Enum.map(&Enum.join/1) + + filename = String.slice(hash, 15..-1) <> file_type + relative_path = Path.join(segments) <> "/" <> filename + + dest_path = Path.join(["priv/static/files", relative_path]) + + dest_path |> Path.dirname() |> File.mkdir_p!() + + File.write!(dest_path, binary) + + relative_path + end +end From 7d8cb334053a15b53bb2c24fef4ad197a6e5ba02 Mon Sep 17 00:00:00 2001 From: miraikumiko Date: Fri, 6 Jun 2025 16:54:05 +0200 Subject: [PATCH 07/10] Update LICENSE --- LICENSE | 233 +------------------------------------------------------- 1 file changed, 4 insertions(+), 229 deletions(-) diff --git a/LICENSE b/LICENSE index 0ea81f1..42fa4fb 100644 --- a/LICENSE +++ b/LICENSE @@ -1,232 +1,7 @@ -GNU GENERAL PUBLIC LICENSE -Version 3, 29 June 2007 +Copyright (c) 2025 Nulla -Copyright © 2007 Free Software Foundation, Inc. +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: -Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. -Preamble - -The GNU General Public License is a free, copyleft license for software and other kinds of works. - -The licenses for most software and other practical works are designed to take away your freedom to share and change the works. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change all versions of a program--to make sure it remains free software for all its users. We, the Free Software Foundation, use the GNU General Public License for most of our software; it applies also to any other work released this way by its authors. You can apply it to your programs, too. - -When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for them if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs, and that you know you can do these things. - -To protect your rights, we need to prevent others from denying you these rights or asking you to surrender the rights. Therefore, you have certain responsibilities if you distribute copies of the software, or if you modify it: responsibilities to respect the freedom of others. - -For example, if you distribute copies of such a program, whether gratis or for a fee, you must pass on to the recipients the same freedoms that you received. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights. - -Developers that use the GNU GPL protect your rights with two steps: (1) assert copyright on the software, and (2) offer you this License giving you legal permission to copy, distribute and/or modify it. - -For the developers' and authors' protection, the GPL clearly explains that there is no warranty for this free software. For both users' and authors' sake, the GPL requires that modified versions be marked as changed, so that their problems will not be attributed erroneously to authors of previous versions. - -Some devices are designed to deny users access to install or run modified versions of the software inside them, although the manufacturer can do so. This is fundamentally incompatible with the aim of protecting users' freedom to change the software. The systematic pattern of such abuse occurs in the area of products for individuals to use, which is precisely where it is most unacceptable. Therefore, we have designed this version of the GPL to prohibit the practice for those products. If such problems arise substantially in other domains, we stand ready to extend this provision to those domains in future versions of the GPL, as needed to protect the freedom of users. - -Finally, every program is threatened constantly by software patents. States should not allow patents to restrict development and use of software on general-purpose computers, but in those that do, we wish to avoid the special danger that patents applied to a free program could make it effectively proprietary. To prevent this, the GPL assures that patents cannot be used to render the program non-free. - -The precise terms and conditions for copying, distribution and modification follow. - -TERMS AND CONDITIONS - -0. Definitions. - -“This License” refers to version 3 of the GNU General Public License. - -“Copyright” also means copyright-like laws that apply to other kinds of works, such as semiconductor masks. - -“The Program” refers to any copyrightable work licensed under this License. Each licensee is addressed as “you”. “Licensees” and “recipients” may be individuals or organizations. - -To “modify” a work means to copy from or adapt all or part of the work in a fashion requiring copyright permission, other than the making of an exact copy. The resulting work is called a “modified version” of the earlier work or a work “based on” the earlier work. - -A “covered work” means either the unmodified Program or a work based on the Program. - -To “propagate” a work means to do anything with it that, without permission, would make you directly or secondarily liable for infringement under applicable copyright law, except executing it on a computer or modifying a private copy. Propagation includes copying, distribution (with or without modification), making available to the public, and in some countries other activities as well. - -To “convey” a work means any kind of propagation that enables other parties to make or receive copies. Mere interaction with a user through a computer network, with no transfer of a copy, is not conveying. - -An interactive user interface displays “Appropriate Legal Notices” to the extent that it includes a convenient and prominently visible feature that (1) displays an appropriate copyright notice, and (2) tells the user that there is no warranty for the work (except to the extent that warranties are provided), that licensees may convey the work under this License, and how to view a copy of this License. If the interface presents a list of user commands or options, such as a menu, a prominent item in the list meets this criterion. - -1. Source Code. -The “source code” for a work means the preferred form of the work for making modifications to it. “Object code” means any non-source form of a work. - -A “Standard Interface” means an interface that either is an official standard defined by a recognized standards body, or, in the case of interfaces specified for a particular programming language, one that is widely used among developers working in that language. - -The “System Libraries” of an executable work include anything, other than the work as a whole, that (a) is included in the normal form of packaging a Major Component, but which is not part of that Major Component, and (b) serves only to enable use of the work with that Major Component, or to implement a Standard Interface for which an implementation is available to the public in source code form. A “Major Component”, in this context, means a major essential component (kernel, window system, and so on) of the specific operating system (if any) on which the executable work runs, or a compiler used to produce the work, or an object code interpreter used to run it. - -The “Corresponding Source” for a work in object code form means all the source code needed to generate, install, and (for an executable work) run the object code and to modify the work, including scripts to control those activities. However, it does not include the work's System Libraries, or general-purpose tools or generally available free programs which are used unmodified in performing those activities but which are not part of the work. For example, Corresponding Source includes interface definition files associated with source files for the work, and the source code for shared libraries and dynamically linked subprograms that the work is specifically designed to require, such as by intimate data communication or control flow between those subprograms and other parts of the work. - -The Corresponding Source need not include anything that users can regenerate automatically from other parts of the Corresponding Source. - -The Corresponding Source for a work in source code form is that same work. - -2. Basic Permissions. -All rights granted under this License are granted for the term of copyright on the Program, and are irrevocable provided the stated conditions are met. This License explicitly affirms your unlimited permission to run the unmodified Program. The output from running a covered work is covered by this License only if the output, given its content, constitutes a covered work. This License acknowledges your rights of fair use or other equivalent, as provided by copyright law. - -You may make, run and propagate covered works that you do not convey, without conditions so long as your license otherwise remains in force. You may convey covered works to others for the sole purpose of having them make modifications exclusively for you, or provide you with facilities for running those works, provided that you comply with the terms of this License in conveying all material for which you do not control copyright. Those thus making or running the covered works for you must do so exclusively on your behalf, under your direction and control, on terms that prohibit them from making any copies of your copyrighted material outside their relationship with you. - -Conveying under any other circumstances is permitted solely under the conditions stated below. Sublicensing is not allowed; section 10 makes it unnecessary. - -3. Protecting Users' Legal Rights From Anti-Circumvention Law. -No covered work shall be deemed part of an effective technological measure under any applicable law fulfilling obligations under article 11 of the WIPO copyright treaty adopted on 20 December 1996, or similar laws prohibiting or restricting circumvention of such measures. - -When you convey a covered work, you waive any legal power to forbid circumvention of technological measures to the extent such circumvention is effected by exercising rights under this License with respect to the covered work, and you disclaim any intention to limit operation or modification of the work as a means of enforcing, against the work's users, your or third parties' legal rights to forbid circumvention of technological measures. - -4. Conveying Verbatim Copies. -You may convey verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice; keep intact all notices stating that this License and any non-permissive terms added in accord with section 7 apply to the code; keep intact all notices of the absence of any warranty; and give all recipients a copy of this License along with the Program. - -You may charge any price or no price for each copy that you convey, and you may offer support or warranty protection for a fee. - -5. Conveying Modified Source Versions. -You may convey a work based on the Program, or the modifications to produce it from the Program, in the form of source code under the terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is released under this License and any conditions added under section 7. This requirement modifies the requirement in section 4 to “keep intact all notices”. - - c) You must license the entire work, as a whole, under this License to anyone who comes into possession of a copy. This License will therefore apply, along with any applicable section 7 additional terms, to the whole of the work, and all its parts, regardless of how they are packaged. This License gives no permission to license the work in any other way, but it does not invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display Appropriate Legal Notices; however, if the Program has interactive interfaces that do not display Appropriate Legal Notices, your work need not make them do so. - -A compilation of a covered work with other separate and independent works, which are not by their nature extensions of the covered work, and which are not combined with it such as to form a larger program, in or on a volume of a storage or distribution medium, is called an “aggregate” if the compilation and its resulting copyright are not used to limit the access or legal rights of the compilation's users beyond what the individual works permit. Inclusion of a covered work in an aggregate does not cause this License to apply to the other parts of the aggregate. - -6. Conveying Non-Source Forms. -You may convey a covered work in object code form under the terms of sections 4 and 5, provided that you also convey the machine-readable Corresponding Source under the terms of this License, in one of these ways: - - a) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by the Corresponding Source fixed on a durable physical medium customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by a written offer, valid for at least three years and valid for as long as you offer spare parts or customer support for that product model, to give anyone who possesses the object code either (1) a copy of the Corresponding Source for all the software in the product that is covered by this License, on a durable physical medium customarily used for software interchange, for a price no more than your reasonable cost of physically performing this conveying of source, or (2) access to copy the Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the written offer to provide the Corresponding Source. This alternative is allowed only occasionally and noncommercially, and only if you received the object code with such an offer, in accord with subsection 6b. - - d) Convey the object code by offering access from a designated place (gratis or for a charge), and offer equivalent access to the Corresponding Source in the same way through the same place at no further charge. You need not require recipients to copy the Corresponding Source along with the object code. If the place to copy the object code is a network server, the Corresponding Source may be on a different server (operated by you or a third party) that supports equivalent copying facilities, provided you maintain clear directions next to the object code saying where to find the Corresponding Source. Regardless of what server hosts the Corresponding Source, you remain obligated to ensure that it is available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided you inform other peers where the object code and Corresponding Source of the work are being offered to the general public at no charge under subsection 6d. - -A separable portion of the object code, whose source code is excluded from the Corresponding Source as a System Library, need not be included in conveying the object code work. - -A “User Product” is either (1) a “consumer product”, which means any tangible personal property which is normally used for personal, family, or household purposes, or (2) anything designed or sold for incorporation into a dwelling. In determining whether a product is a consumer product, doubtful cases shall be resolved in favor of coverage. For a particular product received by a particular user, “normally used” refers to a typical or common use of that class of product, regardless of the status of the particular user or of the way in which the particular user actually uses, or expects or is expected to use, the product. A product is a consumer product regardless of whether the product has substantial commercial, industrial or non-consumer uses, unless such uses represent the only significant mode of use of the product. - -“Installation Information” for a User Product means any methods, procedures, authorization keys, or other information required to install and execute modified versions of a covered work in that User Product from a modified version of its Corresponding Source. The information must suffice to ensure that the continued functioning of the modified object code is in no case prevented or interfered with solely because modification has been made. - -If you convey an object code work under this section in, or with, or specifically for use in, a User Product, and the conveying occurs as part of a transaction in which the right of possession and use of the User Product is transferred to the recipient in perpetuity or for a fixed term (regardless of how the transaction is characterized), the Corresponding Source conveyed under this section must be accompanied by the Installation Information. But this requirement does not apply if neither you nor any third party retains the ability to install modified object code on the User Product (for example, the work has been installed in ROM). - -The requirement to provide Installation Information does not include a requirement to continue to provide support service, warranty, or updates for a work that has been modified or installed by the recipient, or for the User Product in which it has been modified or installed. Access to a network may be denied when the modification itself materially and adversely affects the operation of the network or violates the rules and protocols for communication across the network. - -Corresponding Source conveyed, and Installation Information provided, in accord with this section must be in a format that is publicly documented (and with an implementation available to the public in source code form), and must require no special password or key for unpacking, reading or copying. - -7. Additional Terms. -“Additional permissions” are terms that supplement the terms of this License by making exceptions from one or more of its conditions. Additional permissions that are applicable to the entire Program shall be treated as though they were included in this License, to the extent that they are valid under applicable law. If additional permissions apply only to part of the Program, that part may be used separately under those permissions, but the entire Program remains governed by this License without regard to the additional permissions. - -When you convey a copy of a covered work, you may at your option remove any additional permissions from that copy, or from any part of it. (Additional permissions may be written to require their own removal in certain cases when you modify the work.) You may place additional permissions on material, added by you to a covered work, for which you have or can give appropriate copyright permission. - -Notwithstanding any other provision of this License, for material you add to a covered work, you may (if authorized by the copyright holders of that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or author attributions in that material or in the Appropriate Legal Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or requiring that modified versions of such material be marked in reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or authors of the material; or - - e) Declining to grant rights under trademark law for use of some trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that material by anyone who conveys the material (or modified versions of it) with contractual assumptions of liability to the recipient, for any liability that these contractual assumptions directly impose on those licensors and authors. - -All other non-permissive additional terms are considered “further restrictions” within the meaning of section 10. If the Program as you received it, or any part of it, contains a notice stating that it is governed by this License along with a term that is a further restriction, you may remove that term. If a license document contains a further restriction but permits relicensing or conveying under this License, you may add to a covered work material governed by the terms of that license document, provided that the further restriction does not survive such relicensing or conveying. - -If you add terms to a covered work in accord with this section, you must place, in the relevant source files, a statement of the additional terms that apply to those files, or a notice indicating where to find the applicable terms. - -Additional terms, permissive or non-permissive, may be stated in the form of a separately written license, or stated as exceptions; the above requirements apply either way. - -8. Termination. -You may not propagate or modify a covered work except as expressly provided under this License. Any attempt otherwise to propagate or modify it is void, and will automatically terminate your rights under this License (including any patent licenses granted under the third paragraph of section 11). - -However, if you cease all violation of this License, then your license from a particular copyright holder is reinstated (a) provisionally, unless and until the copyright holder explicitly and finally terminates your license, and (b) permanently, if the copyright holder fails to notify you of the violation by some reasonable means prior to 60 days after the cessation. - -Moreover, your license from a particular copyright holder is reinstated permanently if the copyright holder notifies you of the violation by some reasonable means, this is the first time you have received notice of violation of this License (for any work) from that copyright holder, and you cure the violation prior to 30 days after your receipt of the notice. - -Termination of your rights under this section does not terminate the licenses of parties who have received copies or rights from you under this License. If your rights have been terminated and not permanently reinstated, you do not qualify to receive new licenses for the same material under section 10. - -9. Acceptance Not Required for Having Copies. -You are not required to accept this License in order to receive or run a copy of the Program. Ancillary propagation of a covered work occurring solely as a consequence of using peer-to-peer transmission to receive a copy likewise does not require acceptance. However, nothing other than this License grants you permission to propagate or modify any covered work. These actions infringe copyright if you do not accept this License. Therefore, by modifying or propagating a covered work, you indicate your acceptance of this License to do so. - -10. Automatic Licensing of Downstream Recipients. -Each time you convey a covered work, the recipient automatically receives a license from the original licensors, to run, modify and propagate that work, subject to this License. You are not responsible for enforcing compliance by third parties with this License. - -An “entity transaction” is a transaction transferring control of an organization, or substantially all assets of one, or subdividing an organization, or merging organizations. If propagation of a covered work results from an entity transaction, each party to that transaction who receives a copy of the work also receives whatever licenses to the work the party's predecessor in interest had or could give under the previous paragraph, plus a right to possession of the Corresponding Source of the work from the predecessor in interest, if the predecessor has it or can get it with reasonable efforts. - -You may not impose any further restrictions on the exercise of the rights granted or affirmed under this License. For example, you may not impose a license fee, royalty, or other charge for exercise of rights granted under this License, and you may not initiate litigation (including a cross-claim or counterclaim in a lawsuit) alleging that any patent claim is infringed by making, using, selling, offering for sale, or importing the Program or any portion of it. - -11. Patents. -A “contributor” is a copyright holder who authorizes use under this License of the Program or a work on which the Program is based. The work thus licensed is called the contributor's “contributor version”. - -A contributor's “essential patent claims” are all patent claims owned or controlled by the contributor, whether already acquired or hereafter acquired, that would be infringed by some manner, permitted by this License, of making, using, or selling its contributor version, but do not include claims that would be infringed only as a consequence of further modification of the contributor version. For purposes of this definition, “control” includes the right to grant patent sublicenses in a manner consistent with the requirements of this License. - -Each contributor grants you a non-exclusive, worldwide, royalty-free patent license under the contributor's essential patent claims, to make, use, sell, offer for sale, import and otherwise run, modify and propagate the contents of its contributor version. - -In the following three paragraphs, a “patent license” is any express agreement or commitment, however denominated, not to enforce a patent (such as an express permission to practice a patent or covenant not to sue for patent infringement). To “grant” such a patent license to a party means to make such an agreement or commitment not to enforce a patent against the party. - -If you convey a covered work, knowingly relying on a patent license, and the Corresponding Source of the work is not available for anyone to copy, free of charge and under the terms of this License, through a publicly available network server or other readily accessible means, then you must either (1) cause the Corresponding Source to be so available, or (2) arrange to deprive yourself of the benefit of the patent license for this particular work, or (3) arrange, in a manner consistent with the requirements of this License, to extend the patent license to downstream recipients. “Knowingly relying” means you have actual knowledge that, but for the patent license, your conveying the covered work in a country, or your recipient's use of the covered work in a country, would infringe one or more identifiable patents in that country that you have reason to believe are valid. - -If, pursuant to or in connection with a single transaction or arrangement, you convey, or propagate by procuring conveyance of, a covered work, and grant a patent license to some of the parties receiving the covered work authorizing them to use, propagate, modify or convey a specific copy of the covered work, then the patent license you grant is automatically extended to all recipients of the covered work and works based on it. - -A patent license is “discriminatory” if it does not include within the scope of its coverage, prohibits the exercise of, or is conditioned on the non-exercise of one or more of the rights that are specifically granted under this License. You may not convey a covered work if you are a party to an arrangement with a third party that is in the business of distributing software, under which you make payment to the third party based on the extent of your activity of conveying the work, and under which the third party grants, to any of the parties who would receive the covered work from you, a discriminatory patent license (a) in connection with copies of the covered work conveyed by you (or copies made from those copies), or (b) primarily for and in connection with specific products or compilations that contain the covered work, unless you entered into that arrangement, or that patent license was granted, prior to 28 March 2007. - -Nothing in this License shall be construed as excluding or limiting any implied license or other defenses to infringement that may otherwise be available to you under applicable patent law. - -12. No Surrender of Others' Freedom. -If conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot convey a covered work so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not convey it at all. For example, if you agree to terms that obligate you to collect a royalty for further conveying from those to whom you convey the Program, the only way you could satisfy both those terms and this License would be to refrain entirely from conveying the Program. - -13. Use with the GNU Affero General Public License. -Notwithstanding any other provision of this License, you have permission to link or combine any covered work with a work licensed under version 3 of the GNU Affero General Public License into a single combined work, and to convey the resulting work. The terms of this License will continue to apply to the part which is the covered work, but the special requirements of the GNU Affero General Public License, section 13, concerning interaction through a network will apply to the combination as such. - -14. Revised Versions of this License. -The Free Software Foundation may publish revised and/or new versions of the GNU General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the Program specifies that a certain numbered version of the GNU General Public License “or any later version” applies to it, you have the option of following the terms and conditions either of that numbered version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of the GNU General Public License, you may choose any version ever published by the Free Software Foundation. - -If the Program specifies that a proxy can decide which future versions of the GNU General Public License can be used, that proxy's public statement of acceptance of a version permanently authorizes you to choose that version for the Program. - -Later license versions may give you additional or different permissions. However, no additional obligations are imposed on any author or copyright holder as a result of your choosing to follow a later version. - -15. Disclaimer of Warranty. -THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM “AS IS” WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - -16. Limitation of Liability. -IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - -17. Interpretation of Sections 15 and 16. -If the disclaimer of warranty and limitation of liability provided above cannot be given local legal effect according to their terms, reviewing courts shall apply local law that most closely approximates an absolute waiver of all civil liability in connection with the Program, unless a warranty or assumption of liability accompanies a copy of the Program in return for a fee. - -END OF TERMS AND CONDITIONS - -How to Apply These Terms to Your New Programs - -If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms. - -To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the “copyright” line and a pointer to where the full notice is found. - - nulla - Copyright (C) 2025 nulla - - This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - -If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - - nulla Copyright (C) 2025 nulla - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate parts of the General Public License. Of course, your program's commands might be different; for a GUI interface, you would use an “about box”. - -You should also get your employer (if you work as a programmer) or school, if any, to sign a “copyright disclaimer” for the program, if necessary. For more information on this, and how to apply and follow the GNU GPL, see . - -The GNU General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. But first, please read . +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. From 4fb1e200f1fb792718c8f9613bbef6c33c5c6583 Mon Sep 17 00:00:00 2001 From: miraikumiko Date: Sun, 8 Jun 2025 10:58:48 +0200 Subject: [PATCH 08/10] mix format --- lib/nulla/activitypub.ex | 78 +++++++++++-------- lib/nulla/models/activity.ex | 21 +++++ lib/nulla/models/instance_settings.ex | 22 +++++- lib/nulla/models/note.ex | 6 +- lib/nulla/models/user.ex | 42 +++++++++- lib/nulla/uploader.ex | 2 +- lib/nulla_web/controllers/inbox_controller.ex | 25 ++++++ lib/nulla_web/controllers/user_controller.ex | 2 +- lib/nulla_web/controllers/user_html.ex | 23 ++++-- .../controllers/user_html/show.html.heex | 45 ++++++----- lib/nulla_web/router.ex | 7 +- .../20250607124601_create_activities.exs | 17 ++++ 12 files changed, 221 insertions(+), 69 deletions(-) create mode 100644 lib/nulla/models/activity.ex create mode 100644 lib/nulla_web/controllers/inbox_controller.ex create mode 100644 priv/repo/migrations/20250607124601_create_activities.exs diff --git a/lib/nulla/activitypub.ex b/lib/nulla/activitypub.ex index 2bea870..66a439a 100644 --- a/lib/nulla/activitypub.ex +++ b/lib/nulla/activitypub.ex @@ -25,9 +25,9 @@ defmodule Nulla.ActivityPub do ] end - @spec ap_user(String.t(), Nulla.Models.User.t()) :: Jason.OrderedObject.t() - def ap_user(domain, user) do - Jason.OrderedObject.new([ + @spec user(String.t(), Nulla.Models.User.t()) :: Jason.OrderedObject.t() + def user(domain, user) do + Jason.OrderedObject.new( "@context": context(), id: "https://#{domain}/@#{user.username}", type: "Person", @@ -45,51 +45,52 @@ defmodule Nulla.ActivityPub do indexable: user.is_indexable, published: DateTime.to_iso8601(user.inserted_at), memorial: user.is_memorial, - publicKey: Jason.OrderedObject.new( - id: "https://#{domain}/@#{user.username}#main-key", - owner: "https://#{domain}/@#{user.username}", - publicKeyPem: user.public_key - ), - tag: Enum.map(user.tags, fn tag -> + publicKey: + Jason.OrderedObject.new( + id: "https://#{domain}/@#{user.username}#main-key", + owner: "https://#{domain}/@#{user.username}", + publicKeyPem: user.public_key + ), + tag: + Enum.map(user.tags, fn tag -> Jason.OrderedObject.new( type: "Hashtag", href: "https://#{domain}/tags/#{tag}", name: "##{tag}" ) end), - attachment: Enum.map(user.fields, fn {name, value} -> + attachment: + Enum.map(user.fields, fn {name, value} -> Jason.OrderedObject.new( type: "PropertyValue", name: name, value: value ) end), - endpoints: Jason.OrderedObject.new( - sharedInbox: "https://#{domain}/inbox" - ), - icon: Jason.OrderedObject.new( - type: "Image", - mediaType: MIME.from_path(user.avatar), - url: "https://#{domain}#{user.avatar}" - ), - image: Jason.OrderedObject.new( - type: "Image", - mediaType: MIME.from_path(user.banner), - url: "https://#{domain}#{user.banner}" - ), + endpoints: Jason.OrderedObject.new(sharedInbox: "https://#{domain}/inbox"), + icon: + Jason.OrderedObject.new( + type: "Image", + mediaType: MIME.from_path(user.avatar), + url: "https://#{domain}#{user.avatar}" + ), + image: + Jason.OrderedObject.new( + type: "Image", + mediaType: MIME.from_path(user.banner), + url: "https://#{domain}#{user.banner}" + ), "vcard:bday": user.birthday, "vcard:Address": user.location - ]) + ) end @spec note(String.t(), Nulla.Models.User.t(), Nulla.Models.Note.t()) :: Jason.OrderedObject.t() def note(domain, user, note) do - Jason.OrderedObject.new([ + Jason.OrderedObject.new( "@context": [ "https://www.w3.org/ns/activitystreams", - Jason.OrderedObject.new( - sensitive: "as:sensitive" - ) + Jason.OrderedObject.new(sensitive: "as:sensitive") ], id: "https://#{domain}/@#{user.username}/#{note.id}", type: "Note", @@ -106,16 +107,25 @@ defmodule Nulla.ActivityPub do ], sensetive: false, content: note.content, - contentMap: Jason.OrderedObject.new( - "#{note.language}": "

@rf@mastodonsocial.ru Вниманию новичкам!

Вам небольшое руководство о том, как импротировать пост, которого нет в вашей ленте.

" - ), + contentMap: Jason.OrderedObject.new("#{note.language}": note.content), attachment: [ Jason.OrderedObject.new( type: "Document", - mediaType: "video/mp4", - url: "https://mastodon.ml/system/media_attachments/files/000/040/494/original/8c06de179c11daea.mp4" + mediaType: "#{note.media_attachment.mime_type}", + url: "https://#{domain}/files/#{note.media_attachment.file}" ) ] - ]) + ) + end + + def activity(domain, action) do + Jason.OrderedObject.new( + "@context": "https://www.w3.org/ns/activitystreams", + id: "https://#{domain}/activities/#{action.id}", + type: action.type, + actor: action.actor, + object: action.object, + to: action.to + ) end end diff --git a/lib/nulla/models/activity.ex b/lib/nulla/models/activity.ex new file mode 100644 index 0000000..bf0101e --- /dev/null +++ b/lib/nulla/models/activity.ex @@ -0,0 +1,21 @@ +defmodule Nulla.Models.Activity do + use Ecto.Schema + import Ecto.Changeset + + schema "activities" do + field :type, :string + field :actor, :string + field :object, :map + field :cc, {:array, :string}, default: [] + + timestamps() + end + + @doc false + def changeset(activity, attrs) do + activity + |> cast(attrs, [:type, :actor, :object, :to]) + |> validate_required([:type, :actor, :object]) + |> validate_inclusion(:type, ~w(Create Update Delete Undo Like Announce Follow Accept Reject)) + end +end diff --git a/lib/nulla/models/instance_settings.ex b/lib/nulla/models/instance_settings.ex index 96280c1..5ed8860 100644 --- a/lib/nulla/models/instance_settings.ex +++ b/lib/nulla/models/instance_settings.ex @@ -18,8 +18,26 @@ defmodule Nulla.Models.InstanceSettings do @doc false def changeset(instance_settings, attrs) do instance_settings - |> cast(attrs, [:name, :description, :domain, :registration, :max_characters, :max_upload_size, :public_key, :private_key]) - |> validate_required([:name, :description, :domain, :registration, :max_characters, :max_upload_size, :public_key, :private_key]) + |> cast(attrs, [ + :name, + :description, + :domain, + :registration, + :max_characters, + :max_upload_size, + :public_key, + :private_key + ]) + |> validate_required([ + :name, + :description, + :domain, + :registration, + :max_characters, + :max_upload_size, + :public_key, + :private_key + ]) end def get_instance_settings!, do: Repo.one!(InstanceSettings) diff --git a/lib/nulla/models/note.ex b/lib/nulla/models/note.ex index f4d5960..965e642 100644 --- a/lib/nulla/models/note.ex +++ b/lib/nulla/models/note.ex @@ -7,7 +7,11 @@ defmodule Nulla.Models.Note do schema "notes" do field :content, :string - field :visibility, Ecto.Enum, values: [:public, :unlisted, :followers, :private], default: :public + + field :visibility, Ecto.Enum, + values: [:public, :unlisted, :followers, :private], + default: :public + field :sensitive, :boolean, default: false field :language, :string field :in_reply_to, :string diff --git a/lib/nulla/models/user.ex b/lib/nulla/models/user.ex index d350ad0..cd20f48 100644 --- a/lib/nulla/models/user.ex +++ b/lib/nulla/models/user.ex @@ -35,8 +35,46 @@ defmodule Nulla.Models.User do @doc false def changeset(user, attrs) do user - |> cast(attrs, [:username, :email, :password, :is_moderator, :realname, :bio, :location, :birthday, :fields, :follow_approval, :is_bot, :is_discoverable, :is_indexable, :is_memorial, :private_key, :public_key, :avatar, :banner]) - |> validate_required([:username, :email, :password, :is_moderator, :realname, :bio, :location, :birthday, :fields, :follow_approval, :is_bot, :is_discoverable, :is_indexable, :is_memorial, :private_key, :public_key, :avatar, :banner]) + |> cast(attrs, [ + :username, + :email, + :password, + :is_moderator, + :realname, + :bio, + :location, + :birthday, + :fields, + :follow_approval, + :is_bot, + :is_discoverable, + :is_indexable, + :is_memorial, + :private_key, + :public_key, + :avatar, + :banner + ]) + |> validate_required([ + :username, + :email, + :password, + :is_moderator, + :realname, + :bio, + :location, + :birthday, + :fields, + :follow_approval, + :is_bot, + :is_discoverable, + :is_indexable, + :is_memorial, + :private_key, + :public_key, + :avatar, + :banner + ]) end def get_user_by_username!(username), do: Repo.get_by!(User, username: username) diff --git a/lib/nulla/uploader.ex b/lib/nulla/uploader.ex index 9704674..2abd925 100644 --- a/lib/nulla/uploader.ex +++ b/lib/nulla/uploader.ex @@ -11,7 +11,7 @@ defmodule Nulla.Uploader do |> Enum.chunk_every(3) |> Enum.map(&Enum.join/1) - filename = String.slice(hash, 15..-1) <> file_type + filename = String.slice(hash, 15..-1//1) <> file_type relative_path = Path.join(segments) <> "/" <> filename dest_path = Path.join(["priv/static/files", relative_path]) diff --git a/lib/nulla_web/controllers/inbox_controller.ex b/lib/nulla_web/controllers/inbox_controller.ex new file mode 100644 index 0000000..e4ed4c4 --- /dev/null +++ b/lib/nulla_web/controllers/inbox_controller.ex @@ -0,0 +1,25 @@ +defmodule NullaWeb.InboxController do + use NullaWeb, :controller + + def receive(conn, %{"type" => "Follow"} = activity) do + # Check signature + # Verify actor and object + # Save follow to db + # Send Accept or Reject + json(conn, %{"status" => "Follow received"}) + end + + def receive(conn, %{"type" => "Like"} = activity) do + # Process Like + json(conn, %{"status" => "Like received"}) + end + + def receive(conn, %{"type" => "Create"} = activity) do + # Create object and save + json(conn, %{"status" => "Object created"}) + end + + def receive(conn, _params) do + json(conn, %{"status" => "Unhandled type"}) + end +end diff --git a/lib/nulla_web/controllers/user_controller.ex b/lib/nulla_web/controllers/user_controller.ex index 0f078e0..4c93d99 100644 --- a/lib/nulla_web/controllers/user_controller.ex +++ b/lib/nulla_web/controllers/user_controller.ex @@ -15,7 +15,7 @@ defmodule NullaWeb.UserController do if accept in ["application/activity+json", "application/ld+json"] do conn |> put_resp_content_type("application/activity+json") - |> json(ActivityPub.ap_user(domain, user)) + |> json(ActivityPub.user(domain, user)) else render(conn, :show, domain: domain, user: user, notes: notes, layout: false) end diff --git a/lib/nulla_web/controllers/user_html.ex b/lib/nulla_web/controllers/user_html.ex index fe6103e..2f1ec2f 100644 --- a/lib/nulla_web/controllers/user_html.ex +++ b/lib/nulla_web/controllers/user_html.ex @@ -25,12 +25,19 @@ defmodule NullaWeb.UserHTML do relative = cond do - diff == 0 -> "today" - diff == 1 -> "1 day ago" - diff < 30 -> "#{diff} days ago" + diff == 0 -> + "today" + + diff == 1 -> + "1 day ago" + + diff < 30 -> + "#{diff} days ago" + diff < 365 -> months = Timex.diff(now, date, :months) if months == 1, do: "1 month ago", else: "#{months} months ago" + true -> years = Timex.diff(now, date, :years) if years == 1, do: "1 year ago", else: "#{years} years ago" @@ -46,7 +53,7 @@ defmodule NullaWeb.UserHTML do def format_note_datetime_diff(datetime) do now = Timex.now() diff = Timex.diff(now, datetime, :seconds) - + cond do diff < 60 -> "now" @@ -59,15 +66,15 @@ defmodule NullaWeb.UserHTML do hours = div(diff, 3600) "#{hours}h ago" - diff < 518400 -> + diff < 518_400 -> days = div(diff, 86400) "#{days}d ago" - diff < 2419200 -> - weeks = div(diff, 604800) + diff < 2_419_200 -> + weeks = div(diff, 604_800) "#{weeks}w ago" - diff < 28512000 -> + diff < 28_512_000 -> months = Timex.diff(now, datetime, :months) "#{months}mo ago" diff --git a/lib/nulla_web/controllers/user_html/show.html.heex b/lib/nulla_web/controllers/user_html/show.html.heex index 9ce9f87..9184f8b 100644 --- a/lib/nulla_web/controllers/user_html/show.html.heex +++ b/lib/nulla_web/controllers/user_html/show.html.heex @@ -1,8 +1,14 @@
- +
- +
@@ -12,8 +18,13 @@
- - + +
@@ -27,28 +38,28 @@
<.icon name="hero-map-pin" class="mt-0.5 h-5 w-5 flex-none" />
-
<%= @user.location %>
+
{@user.location}
<% end %> <%= if @user.birthday do %>
<.icon name="hero-cake" class="mt-0.5 h-5 w-5 flex-none" />
-
<%= format_birthdate(@user.birthday) %>
+
{format_birthdate(@user.birthday)}
<% end %>
<.icon name="hero-calendar" class="mt-0.5 h-5 w-5 flex-none" />
-
<%= format_registration_date(@user.inserted_at) %>
+
{format_registration_date(@user.inserted_at)}
<%= if @user.fields do %>
<%= for {key, value} <- @user.fields do %> -
<%= key %>
+
{key}
<%= if Regex.match?(~r{://}, value) do %> - <%= Regex.replace(~r{^\w+://}, value, "") %> + {Regex.replace(~r{^\w+://}, value, "")} <% else %> - <%= value %> + {value} <% end %>
<% end %> @@ -70,15 +81,15 @@ <%= for note <- @notes do %>
- +
- <%= @user.realname %> + {@user.realname} - @<%= @user.username %>@<%= @domain %> + @{@user.username}@{@domain}
@@ -92,11 +103,11 @@ <% :private -> %> <.icon name="hero-at-symbol" class="h-5 w-5" /> <% end %> - <%= format_note_datetime_diff(note.inserted_at) %> + {format_note_datetime_diff(note.inserted_at)}
-

<%= note.content %>

+

{note.content}

@@ -110,8 +121,6 @@
-
- -
+
diff --git a/lib/nulla_web/router.ex b/lib/nulla_web/router.ex index 4f956cd..5af267b 100644 --- a/lib/nulla_web/router.ex +++ b/lib/nulla_web/router.ex @@ -11,13 +11,16 @@ defmodule NullaWeb.Router do end pipeline :api do - plug :accepts, ["json"] + plug :accepts, ["activity+json", "ld+json"] + + post "/inbox", InboxController, :receive + post "/@:username/inbox", InboxController, :receive + get "/@:username/outbox", OutboxController, :index end scope "/", NullaWeb do pipe_through :browser - get "/", PageController, :home get "/@:username", UserController, :show resources "/users", UserController end diff --git a/priv/repo/migrations/20250607124601_create_activities.exs b/priv/repo/migrations/20250607124601_create_activities.exs new file mode 100644 index 0000000..0ed3cf2 --- /dev/null +++ b/priv/repo/migrations/20250607124601_create_activities.exs @@ -0,0 +1,17 @@ +defmodule Nulla.Repo.Migrations.CreateActivities do + use Ecto.Migration + + def change do + create table(:activities) do + add :type, :string, null: false + add :actor, :string, null: false + add :object, :map, null: false + add :to, {:array, :string}, default: [] + + timestamps() + end + + create index(:activities, [:actor]) + create index(:activities, [:type]) + end +end From cd1e5887c5d3e0234bb3e58d91d76fc7d13f98aa Mon Sep 17 00:00:00 2001 From: miraikumiko Date: Sun, 8 Jun 2025 13:32:58 +0200 Subject: [PATCH 09/10] Move templates to components --- .../user_html.ex => components/templates.ex} | 16 +++++++++++++++- .../templates/note}/edit.html.heex | 0 .../templates/note}/index.html.heex | 0 .../templates/note}/new.html.heex | 0 .../templates/note}/note_form.html.heex | 0 .../templates/note}/show.html.heex | 0 .../templates/user}/edit.html.heex | 0 .../templates/user}/index.html.heex | 0 .../templates/user}/new.html.heex | 0 .../templates/user}/show.html.heex | 0 .../templates/user}/user_form.html.heex | 0 lib/nulla_web/controllers/note_html.ex | 13 ------------- 12 files changed, 15 insertions(+), 14 deletions(-) rename lib/nulla_web/{controllers/user_html.ex => components/templates.ex} (86%) rename lib/nulla_web/{controllers/note_html => components/templates/note}/edit.html.heex (100%) rename lib/nulla_web/{controllers/note_html => components/templates/note}/index.html.heex (100%) rename lib/nulla_web/{controllers/note_html => components/templates/note}/new.html.heex (100%) rename lib/nulla_web/{controllers/note_html => components/templates/note}/note_form.html.heex (100%) rename lib/nulla_web/{controllers/note_html => components/templates/note}/show.html.heex (100%) rename lib/nulla_web/{controllers/user_html => components/templates/user}/edit.html.heex (100%) rename lib/nulla_web/{controllers/user_html => components/templates/user}/index.html.heex (100%) rename lib/nulla_web/{controllers/user_html => components/templates/user}/new.html.heex (100%) rename lib/nulla_web/{controllers/user_html => components/templates/user}/show.html.heex (100%) rename lib/nulla_web/{controllers/user_html => components/templates/user}/user_form.html.heex (100%) delete mode 100644 lib/nulla_web/controllers/note_html.ex diff --git a/lib/nulla_web/controllers/user_html.ex b/lib/nulla_web/components/templates.ex similarity index 86% rename from lib/nulla_web/controllers/user_html.ex rename to lib/nulla_web/components/templates.ex index 2f1ec2f..87fc303 100644 --- a/lib/nulla_web/controllers/user_html.ex +++ b/lib/nulla_web/components/templates.ex @@ -1,7 +1,7 @@ defmodule NullaWeb.UserHTML do use NullaWeb, :html - embed_templates "user_html/*" + embed_templates "templates/user/*" @doc """ Renders a user form. @@ -84,3 +84,17 @@ defmodule NullaWeb.UserHTML do end end end + +defmodule NullaWeb.NoteHTML do + use NullaWeb, :html + + embed_templates "templates/note/*" + + @doc """ + Renders a note form. + """ + attr :changeset, Ecto.Changeset, required: true + attr :action, :string, required: true + + def note_form(assigns) +end diff --git a/lib/nulla_web/controllers/note_html/edit.html.heex b/lib/nulla_web/components/templates/note/edit.html.heex similarity index 100% rename from lib/nulla_web/controllers/note_html/edit.html.heex rename to lib/nulla_web/components/templates/note/edit.html.heex diff --git a/lib/nulla_web/controllers/note_html/index.html.heex b/lib/nulla_web/components/templates/note/index.html.heex similarity index 100% rename from lib/nulla_web/controllers/note_html/index.html.heex rename to lib/nulla_web/components/templates/note/index.html.heex diff --git a/lib/nulla_web/controllers/note_html/new.html.heex b/lib/nulla_web/components/templates/note/new.html.heex similarity index 100% rename from lib/nulla_web/controllers/note_html/new.html.heex rename to lib/nulla_web/components/templates/note/new.html.heex diff --git a/lib/nulla_web/controllers/note_html/note_form.html.heex b/lib/nulla_web/components/templates/note/note_form.html.heex similarity index 100% rename from lib/nulla_web/controllers/note_html/note_form.html.heex rename to lib/nulla_web/components/templates/note/note_form.html.heex diff --git a/lib/nulla_web/controllers/note_html/show.html.heex b/lib/nulla_web/components/templates/note/show.html.heex similarity index 100% rename from lib/nulla_web/controllers/note_html/show.html.heex rename to lib/nulla_web/components/templates/note/show.html.heex diff --git a/lib/nulla_web/controllers/user_html/edit.html.heex b/lib/nulla_web/components/templates/user/edit.html.heex similarity index 100% rename from lib/nulla_web/controllers/user_html/edit.html.heex rename to lib/nulla_web/components/templates/user/edit.html.heex diff --git a/lib/nulla_web/controllers/user_html/index.html.heex b/lib/nulla_web/components/templates/user/index.html.heex similarity index 100% rename from lib/nulla_web/controllers/user_html/index.html.heex rename to lib/nulla_web/components/templates/user/index.html.heex diff --git a/lib/nulla_web/controllers/user_html/new.html.heex b/lib/nulla_web/components/templates/user/new.html.heex similarity index 100% rename from lib/nulla_web/controllers/user_html/new.html.heex rename to lib/nulla_web/components/templates/user/new.html.heex diff --git a/lib/nulla_web/controllers/user_html/show.html.heex b/lib/nulla_web/components/templates/user/show.html.heex similarity index 100% rename from lib/nulla_web/controllers/user_html/show.html.heex rename to lib/nulla_web/components/templates/user/show.html.heex diff --git a/lib/nulla_web/controllers/user_html/user_form.html.heex b/lib/nulla_web/components/templates/user/user_form.html.heex similarity index 100% rename from lib/nulla_web/controllers/user_html/user_form.html.heex rename to lib/nulla_web/components/templates/user/user_form.html.heex diff --git a/lib/nulla_web/controllers/note_html.ex b/lib/nulla_web/controllers/note_html.ex deleted file mode 100644 index 447c9ab..0000000 --- a/lib/nulla_web/controllers/note_html.ex +++ /dev/null @@ -1,13 +0,0 @@ -defmodule NullaWeb.NoteHTML do - use NullaWeb, :html - - embed_templates "note_html/*" - - @doc """ - Renders a note form. - """ - attr :changeset, Ecto.Changeset, required: true - attr :action, :string, required: true - - def note_form(assigns) -end From f8bedff9133b6fae5327d6257d44be6c98f6d191 Mon Sep 17 00:00:00 2001 From: miraikumiko Date: Sun, 8 Jun 2025 13:44:23 +0200 Subject: [PATCH 10/10] Update --- lib/nulla/activitypub.ex | 49 ++++++++++++-------- lib/nulla/models/note.ex | 2 + lib/nulla_web/controllers/note_controller.ex | 33 +++++++++++-- lib/nulla_web/router.ex | 2 +- 4 files changed, 61 insertions(+), 25 deletions(-) diff --git a/lib/nulla/activitypub.ex b/lib/nulla/activitypub.ex index 66a439a..2be7a2e 100644 --- a/lib/nulla/activitypub.ex +++ b/lib/nulla/activitypub.ex @@ -85,47 +85,58 @@ defmodule Nulla.ActivityPub do ) end - @spec note(String.t(), Nulla.Models.User.t(), Nulla.Models.Note.t()) :: Jason.OrderedObject.t() - def note(domain, user, note) 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 + Jason.OrderedObject.new( "@context": [ "https://www.w3.org/ns/activitystreams", Jason.OrderedObject.new(sensitive: "as:sensitive") ], - id: "https://#{domain}/@#{user.username}/#{note.id}", + id: "https://#{domain}/@#{note.user.username}/#{note.id}", type: "Note", summary: nil, inReplyTo: nil, published: note.inserted_at, - url: "https://#{domain}/@#{user.username}/#{note.id}", - attributedTo: "https://#{domain}/@#{user.username}", + url: "https://#{domain}/@#{note.user.username}/#{note.id}", + attributedTo: "https://#{domain}/@#{note.user.username}", to: [ "https://www.w3.org/ns/activitystreams#Public" ], cc: [ - "https://#{domain}/@#{user.username}/followers" + "https://#{domain}/@#{note.user.username}/followers" ], sensetive: false, content: note.content, contentMap: Jason.OrderedObject.new("#{note.language}": note.content), - attachment: [ - Jason.OrderedObject.new( - type: "Document", - mediaType: "#{note.media_attachment.mime_type}", - url: "https://#{domain}/files/#{note.media_attachment.file}" - ) - ] + attachment: attachment ) end - def activity(domain, action) do + @spec activity(String.t(), Nulla.Models.Activity.t()) :: Jason.OrderedObject.t() + def activity(domain, activity) do Jason.OrderedObject.new( "@context": "https://www.w3.org/ns/activitystreams", - id: "https://#{domain}/activities/#{action.id}", - type: action.type, - actor: action.actor, - object: action.object, - to: action.to + id: "https://#{domain}/activities/#{activity.id}", + type: activity.type, + actor: activity.actor, + object: activity.object, + to: activity.to ) end end diff --git a/lib/nulla/models/note.ex b/lib/nulla/models/note.ex index 965e642..57a07e6 100644 --- a/lib/nulla/models/note.ex +++ b/lib/nulla/models/note.ex @@ -29,5 +29,7 @@ defmodule Nulla.Models.Note do |> validate_required([:content, :visibility, :sensitive, :language, :in_reply_to, :user_id]) end + def get_note!(id), do: Repo.get!(Note, id) + def get_all_notes!(user_id), do: Repo.all(from n in Note, where: n.user_id == ^user_id) end diff --git a/lib/nulla_web/controllers/note_controller.ex b/lib/nulla_web/controllers/note_controller.ex index 814a1dd..ae4516a 100644 --- a/lib/nulla_web/controllers/note_controller.ex +++ b/lib/nulla_web/controllers/note_controller.ex @@ -1,8 +1,9 @@ defmodule NullaWeb.NoteController do use NullaWeb, :controller - - alias Nulla.Notes + alias Nulla.Repo alias Nulla.Models.Note + alias Nulla.Models.InstanceSettings + alias Nulla.ActivityPub def index(conn, _params) do notes = Notes.list_notes() @@ -26,11 +27,33 @@ defmodule NullaWeb.NoteController do end end - def show(conn, %{"id" => id}) do - note = Notes.get_note!(id) - render(conn, :show, note: note) + def show(conn, %{"username" => username, "note_id" => note_id}) do + accept = List.first(get_req_header(conn, "accept")) + instance_settings = InstanceSettings.get_instance_settings!() + domain = instance_settings.domain + note = Note.get_note!(note_id) |> Repo.preload([:user, :media_attachments]) + + if username != note.user.username do + conn + |> put_status(:not_found) + |> json(%{error: "Note not found"}) + |> halt() + end + + if accept in ["application/activity+json", "application/ld+json"] do + conn + |> put_resp_content_type("application/activity+json") + |> json(ActivityPub.note(domain, note)) + else + render(conn, :show, domain: domain, note: note, layout: false) + end end + #def show(conn, %{"id" => id}) do + # note = Notes.get_note!(id) + # render(conn, :show, note: note) + #end + def edit(conn, %{"id" => id}) do note = Notes.get_note!(id) changeset = Notes.change_note(note) diff --git a/lib/nulla_web/router.ex b/lib/nulla_web/router.ex index 5af267b..783534f 100644 --- a/lib/nulla_web/router.ex +++ b/lib/nulla_web/router.ex @@ -22,7 +22,7 @@ defmodule NullaWeb.Router do pipe_through :browser get "/@:username", UserController, :show - resources "/users", UserController + get "/@:username/:note_id", NoteController, :show end # Other scopes may use custom stacks.