prepare mediaendpoint
This commit is contained in:
parent
7627886c32
commit
43a3dc59a1
6 changed files with 92 additions and 23 deletions
|
@ -5,7 +5,7 @@ defmodule Chiya.Notes do
|
|||
|
||||
import Ecto.Query, warn: false
|
||||
alias Chiya.Repo
|
||||
alias Chiya.Notes.{Note, NoteImage, NoteNote, NoteTag, NoteComment}
|
||||
alias Chiya.Notes.{Note, NoteImage, NoteImageTemp, NoteNote, NoteTag, NoteComment}
|
||||
|
||||
@preloads [
|
||||
:channels,
|
||||
|
@ -262,6 +262,13 @@ defmodule Chiya.Notes do
|
|||
Note.changeset(note, attrs)
|
||||
end
|
||||
|
||||
@doc """
|
||||
Returns an `%Ecto.Changeset{}` for tracking note_image changes.
|
||||
"""
|
||||
def change_note_image(%NoteImage{} = note_image, attrs \\ %{}) do
|
||||
NoteImage.update_changeset(note_image, attrs)
|
||||
end
|
||||
|
||||
@doc """
|
||||
Gets a single note image.
|
||||
"""
|
||||
|
@ -296,6 +303,12 @@ defmodule Chiya.Notes do
|
|||
:ok
|
||||
end
|
||||
|
||||
def create_note_image_temp(attrs \\ %{}) do
|
||||
%NoteImageTemp{}
|
||||
|> NoteImageTemp.changeset(attrs)
|
||||
|> Repo.insert()
|
||||
end
|
||||
|
||||
def get_note_note!(attrs \\ %{}) do
|
||||
Repo.get_by!(NoteNote, attrs)
|
||||
end
|
||||
|
@ -314,13 +327,6 @@ defmodule Chiya.Notes do
|
|||
Repo.delete(note_note)
|
||||
end
|
||||
|
||||
@doc """
|
||||
Returns an `%Ecto.Changeset{}` for tracking note_image changes.
|
||||
"""
|
||||
def change_note_image(%NoteImage{} = note_image, attrs \\ %{}) do
|
||||
NoteImage.update_changeset(note_image, attrs)
|
||||
end
|
||||
|
||||
def get_note_tag!(attrs \\ %{}) do
|
||||
Repo.get_by!(NoteTag, attrs)
|
||||
end
|
||||
|
|
20
lib/chiya/notes/note_image_temp.ex
Normal file
20
lib/chiya/notes/note_image_temp.ex
Normal file
|
@ -0,0 +1,20 @@
|
|||
defmodule Chiya.Notes.NoteImageTemp do
|
||||
use Ecto.Schema
|
||||
use Waffle.Ecto.Schema
|
||||
import Ecto.Changeset
|
||||
|
||||
schema "note_images_temp" do
|
||||
field :content, :string, default: ""
|
||||
field :path, ChiyaWeb.Uploaders.NoteImage.Type
|
||||
|
||||
timestamps()
|
||||
end
|
||||
|
||||
@doc false
|
||||
def changeset(note_image, attrs) do
|
||||
note_image
|
||||
|> cast(attrs, [:content])
|
||||
|> cast_attachments(attrs, [:path], allow_paths: true)
|
||||
|> validate_required([:path])
|
||||
end
|
||||
end
|
|
@ -16,10 +16,10 @@ defmodule ChiyaWeb.PageHTML do
|
|||
|
||||
def do_render_outline(%{text: text, children: children, level: _level}) do
|
||||
slug = Slugger.slugify_downcase(text)
|
||||
|
||||
content_tag(:ul, [class: "m-0"],
|
||||
do: [
|
||||
content_tag(:li, do:
|
||||
content_tag(:a, text, href: "##{slug}")),
|
||||
content_tag(:li, do: content_tag(:a, text, href: "##{slug}")),
|
||||
Enum.map(children, &do_render_outline/1)
|
||||
]
|
||||
)
|
||||
|
|
|
@ -3,7 +3,9 @@
|
|||
<%= @note.name %>
|
||||
</.header>
|
||||
|
||||
<aside class="max-w-2xl mx-auto mt-8 prose prose-gruvbox bg-theme-background1 rounded p-2 empty:hidden"><%= raw render_outline(@note) %></aside>
|
||||
<aside class="max-w-2xl mx-auto mt-8 prose prose-gruvbox bg-theme-background1 rounded p-2 empty:hidden">
|
||||
<%= raw(render_outline(@note)) %>
|
||||
</aside>
|
||||
|
||||
<section class="mt-8 mx-auto prose prose-gruvbox md:prose-lg lg:prose-xl | p-summary e-content">
|
||||
<%= Markdown.render(@note.content) |> raw %>
|
||||
|
@ -11,8 +13,7 @@
|
|||
|
||||
<%= if not Enum.empty?(@note.links_to) do %>
|
||||
<section class="mt-8 prose prose-gruvbox max-w-2xl mx-auto">
|
||||
<.divider text="" />
|
||||
Notes linking here:
|
||||
<.divider text="" /> Notes linking here:
|
||||
<ul class="">
|
||||
<%= for link <- @note.links_to do %>
|
||||
<li><a href={~p"/note/#{link.slug}"}><%= link.name %></a></li>
|
||||
|
|
|
@ -54,9 +54,16 @@ defmodule ChiyaWeb.Indie.MicropubHandler do
|
|||
end
|
||||
|
||||
@impl true
|
||||
def handle_media(_files, _access_token) do
|
||||
def handle_media(file, access_token) do
|
||||
with :ok <- verify_token(access_token),
|
||||
{:ok, image} <- Chiya.Notes.create_note_image_temp(%{path: file.path}) do
|
||||
url = ChiyaWeb.Uploaders.UserImageTemp.url({image.path, image}, :original)
|
||||
{:ok, url}
|
||||
else
|
||||
_ ->
|
||||
{:error, :insufficient_scope}
|
||||
end
|
||||
end
|
||||
|
||||
@impl true
|
||||
def handle_source_query(url, filter_properties, access_token) do
|
||||
|
@ -175,6 +182,7 @@ defmodule ChiyaWeb.Indie.MicropubHandler do
|
|||
content = Props.get_content(p)
|
||||
name = Props.get_title(p) || Chiya.Notes.Note.note_title(content)
|
||||
tags = Props.get_tags(p) |> Enum.join(",")
|
||||
photo = Props.get_photo(p)
|
||||
|
||||
published_at =
|
||||
if Props.is_published?(p),
|
||||
|
|
34
lib/chiya_web/uploaders/note_image_temp.ex
Normal file
34
lib/chiya_web/uploaders/note_image_temp.ex
Normal file
|
@ -0,0 +1,34 @@
|
|||
defmodule ChiyaWeb.Uploaders.NoteImageTemp do
|
||||
use Waffle.Definition
|
||||
use Waffle.Ecto.Definition
|
||||
|
||||
# Include ecto support (requires package waffle_ecto installed):
|
||||
# use Waffle.Ecto.Definition
|
||||
|
||||
@versions [:original]
|
||||
|
||||
# Whitelist file extensions:
|
||||
def validate({file, _}) do
|
||||
file_extension = file.file_name |> Path.extname() |> String.downcase()
|
||||
|
||||
case Enum.member?(~w(.jpg .jpeg .gif .png), file_extension) do
|
||||
true -> :ok
|
||||
false -> {:error, "invalid file type"}
|
||||
end
|
||||
end
|
||||
|
||||
# Override the persisted filenames:
|
||||
def filename(_version, {_file, %{id: image_id}}) do
|
||||
image_id
|
||||
end
|
||||
|
||||
# Override the storage directory:
|
||||
def storage_dir(_version, _scope) do
|
||||
"uploads/temp"
|
||||
end
|
||||
|
||||
# Provide a default URL if there hasn't been a file uploaded
|
||||
# def default_url(version, scope) do
|
||||
# "/images/avatars/default_#{version}.png"
|
||||
# end
|
||||
end
|
Loading…
Reference in a new issue