Chapril/mobilizon.chapril.org-mobilizon
Chapril/mobilizon.chapril.org-mobilizon
26
0
Fork 0
Code Issues Pull Requests Releases Activity

Attach actor to pictures entity

Browse Source
This commit is contained in:
Thomas Citharel 2019-05-31 17:58:03 +02:00
parent 290b4ba7d3
commit 7ef4ef264b
15 changed files with 645 additions and 785 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
js/src/components/Editor.vue
View File

@ -1,6 +1,6 @@
<template>
<div>
<div class="editor">
<div class="editor" id="tiptab-editor" :data-actor-id="loggedPerson && loggedPerson.id">
<editor-menu-bar :editor="editor" v-slot="{ commands, isActive, focused }">
<div class="menubar bar-is-hidden" :class="{ 'is-focused': focused }">
@ -172,16 +172,25 @@ import {
} from 'tiptap-extensions';
import tippy, { Instance } from 'tippy.js';
import { SEARCH_PERSONS } from '@/graphql/search';
import { IActor } from '@/types/actor';
import { IActor, IPerson } from '@/types/actor';
import Image from '@/components/Editor/Image';
import { UPLOAD_PICTURE } from '@/graphql/upload';
import { listenFileUpload } from '@/utils/upload';
import { LOGGED_PERSON } from '@/graphql/actor';
@Component({
components: { EditorContent, EditorMenuBar, EditorMenuBubble },
apollo: {
loggedPerson: {
query: LOGGED_PERSON,
},
},
})
export default class CreateEvent extends Vue {
@Prop({ required: true }) value!: String;
loggedPerson!: IPerson;
editor: Editor = null;
/**
@ -429,6 +438,7 @@ export default class CreateEvent extends Vue {
variables: {
file: image,
name: image.name,
actorId: this.loggedPerson.id,
},
});
if (data.uploadPicture && data.uploadPicture.url) {

3
js/src/components/Editor/Image.ts
View File

@ -71,11 +71,14 @@ export default class Image extends Node {
const { schema } = view.state;
const coordinates = view.posAtCoords({ left: event.clientX, top: event.clientY });
const client = apolloProvider.defaultClient as ApolloClient<InMemoryCache>;
const editorElem = document.getElementById('tiptab-editor');
const actorId = editorElem && editorElem.dataset.actorId;
for (const image of images) {
const { data } = await client.mutate({
mutation: UPLOAD_PICTURE,
variables: {
actorId,
file: image,
name: image.name,
},

4
js/src/graphql/upload.ts
View File

@ -1,8 +1,8 @@
import gql from 'graphql-tag';
export const UPLOAD_PICTURE = gql`
mutation UploadPicture($file: Upload!, $alt: String, $name: String!){
uploadPicture(file: $file, alt: $alt, name: $name) {
mutation UploadPicture($file: Upload!, $alt: String, $name: String!, $actorId: ID!){
uploadPicture(file: $file, alt: $alt, name: $name, actorId: $actorId) {
url,
id
}

4
lib/mobilizon/media/picture.ex
View File

@ -5,9 +5,11 @@ defmodule Mobilizon.Media.Picture do
use Ecto.Schema
import Ecto.Changeset
alias Mobilizon.Media.File
alias Mobilizon.Actors.Actor
schema "pictures" do
embeds_one(:file, File, on_replace: :update)
belongs_to(:actor, Actor)
timestamps()
end
@ -15,7 +17,7 @@ defmodule Mobilizon.Media.Picture do
@doc false
def changeset(picture, attrs) do
picture
|> cast(attrs, [])
|> cast(attrs, [:actor_id])
|> cast_embed(:file)
end
end

12
lib/mobilizon/users/user.ex
View File

@ -149,6 +149,18 @@ defmodule Mobilizon.Users.User do
def is_confirmed(%User{confirmed_at: nil} = _user), do: {:error, :unconfirmed}
def is_confirmed(%User{} = user), do: {:ok, user}
@doc """
Returns whether an user owns an actor
"""
@spec owns_actor(struct(), String.t()) :: {:is_owned, false} | {:is_owned, true, Actor.t()}
def owns_actor(%User{} = user, actor_id) when is_binary(actor_id) do
case Integer.parse(actor_id) do
{actor_id, ""} -> owns_actor(user, actor_id)
_ -> {:is_owned, false}
end
end
@spec owns_actor(struct(), integer()) :: {:is_owned, false} | {:is_owned, true, Actor.t()}
def owns_actor(%User{actors: actors}, actor_id) do
case Enum.find(actors, fn a -> a.id == actor_id end) do
nil -> {:is_owned, false}

14
lib/mobilizon_web/resolvers/picture.ex
View File

@ -4,6 +4,7 @@ defmodule MobilizonWeb.Resolvers.Picture do
"""
alias Mobilizon.Media
alias Mobilizon.Media.Picture
alias Mobilizon.Users.User
@doc """
Get picture for an event's pic
@ -43,16 +44,21 @@ defmodule MobilizonWeb.Resolvers.Picture do
end
@spec upload_picture(map(), map(), map()) :: {:ok, Picture.t()} | {:error, any()}
def upload_picture(_parent, %{file: %Plug.Upload{} = file} = args, %{
def upload_picture(_parent, %{file: %Plug.Upload{} = file, actor_id: actor_id} = args, %{
context: %{
current_user: _user
current_user: user
}
}) do
with {:ok, %{"url" => [%{"href" => url}]}} <- MobilizonWeb.Upload.store(file),
with {:is_owned, true, _actor} <- User.owns_actor(user, actor_id),
{:ok, %{"url" => [%{"href" => url}]}} <- MobilizonWeb.Upload.store(file),
args <- Map.put(args, :url, url),
{:ok, picture = %Picture{}} <- Media.create_picture(%{"file" => args}) do
{:ok, picture = %Picture{}} <-
Media.create_picture(%{"file" => args, "actor_id" => actor_id}) do
{:ok, %{name: picture.file.name, url: picture.file.url, id: picture.id}}
else
{:is_owned, false} ->
{:error, "Actor id is not owned by authenticated user"}
err ->
{:error, err}
end

2
lib/mobilizon_web/router.ex
View File

@ -31,7 +31,7 @@ defmodule MobilizonWeb.Router do
end
pipeline :browser do
plug(Plug.Static, at: "/", from: "priv/static")
plug(Plug.Static, at: "/", from: "priv/static/js")
plug(:accepts, ["html"])
plug(:fetch_session)
plug(:fetch_flash)

2
lib/mobilizon_web/schema/picture.ex
View File

@ -26,6 +26,7 @@ defmodule MobilizonWeb.Schema.PictureType do
field(:name, non_null(:string))
field(:alt, :string)
field(:file, non_null(:upload))
field(:actor_id, :id)
end
object :picture_queries do
@ -42,6 +43,7 @@ defmodule MobilizonWeb.Schema.PictureType do
arg(:name, non_null(:string))
arg(:alt, :string)
arg(:file, non_null(:upload))
arg(:actor_id, non_null(:id))
resolve(&Picture.upload_picture/3)
end
end

13
lib/service/activity_pub/utils.ex
View File

@ -176,6 +176,9 @@ defmodule Mobilizon.Service.ActivityPub.Utils do
# Repo.one(query)
# end
@doc """
Save picture data from %Plug.Upload{} and return AS Link data.
"""
def make_picture_data(%Plug.Upload{} = picture) do
with {:ok, picture} <- MobilizonWeb.Upload.store(picture) do
picture
@ -184,6 +187,10 @@ defmodule Mobilizon.Service.ActivityPub.Utils do
end
end
@doc """
Convert a picture model into an AS Link representation
"""
# TODO: Move me to Mobilizon.Service.ActivityPub.Converters
def make_picture_data(%Picture{file: file} = _picture) do
%{
"type" => "Document",
@ -198,6 +205,9 @@ defmodule Mobilizon.Service.ActivityPub.Utils do
}
end
@doc """
Save picture data from raw data and return AS Link data.
"""
def make_picture_data(%{picture: picture}) do
with {:ok, %{"url" => [%{"href" => url}]}} <- MobilizonWeb.Upload.store(picture.file),
{:ok, %Picture{file: _file} = pic} <-
@ -205,7 +215,8 @@ defmodule Mobilizon.Service.ActivityPub.Utils do
"file" => %{
"url" => url,
"name" => picture.name
}
},
"actor_id" => picture.actor_id
}) do
make_picture_data(pic)
end

9
priv/repo/migrations/20190531131458_attach-pictures-to-actors.exs Normal file
View File

@ -0,0 +1,9 @@
defmodule :"Elixir.Mobilizon.Repo.Migrations.Attach-pictures-to-actors" do
use Ecto.Migration
def change do
alter table(:pictures) do
add(:actor_id, references(:actors, on_delete: :delete_all), null: false)
end
end
end

1320
schema.graphql
View File

File diff suppressed because it is too large Load Diff

11
test/mobilizon/media/media_test.exs
View File

@ -22,17 +22,22 @@ defmodule Mobilizon.MediaTest do
test "get_picture!/1 returns the picture with given id" do
picture = insert(:picture)
assert Media.get_picture!(picture.id) == picture
assert Media.get_picture!(picture.id).id == picture.id
end
test "create_picture/1 with valid data creates a picture" do
assert {:ok, %Picture{} = picture} = Media.create_picture(@valid_attrs)
assert {:ok, %Picture{} = picture} =
Media.create_picture(Map.put(@valid_attrs, :actor_id, insert(:actor).id))
assert picture.file.name == "something old"
end
test "update_picture/2 with valid data updates the picture" do
picture = insert(:picture)
assert {:ok, %Picture{} = picture} = Media.update_picture(picture, @update_attrs)
assert {:ok, %Picture{} = picture} =
Media.update_picture(picture, Map.put(@update_attrs, :actor_id, insert(:actor).id))
assert picture.file.name == "something new"
end

6
test/mobilizon_web/resolvers/event_resolver_test.exs
View File

@ -103,7 +103,8 @@ defmodule MobilizonWeb.Resolvers.EventResolverTest do
picture: {
name: "picture for my event",
alt: "A very sunny landscape",
file: "event.jpg"
file: "event.jpg",
actor_id: #{actor.id}
}
}
) {
@ -148,7 +149,8 @@ defmodule MobilizonWeb.Resolvers.EventResolverTest do
mutation { uploadPicture(
name: "#{picture.name}",
alt: "#{picture.alt}",
file: "#{picture.file}"
file: "#{picture.file}",
actor_id: #{actor.id}
) {
id,
url,

13
test/mobilizon_web/resolvers/picture_resolver_test.exs
View File

@ -7,8 +7,9 @@ defmodule MobilizonWeb.Resolvers.PictureResolverTest do
setup %{conn: conn} do
user = insert(:user)
actor = insert(:actor, user: user)
{:ok, conn: conn, user: user}
{:ok, conn: conn, user: user, actor: actor}
end
describe "Resolver: Get picture" do
@ -56,14 +57,15 @@ defmodule MobilizonWeb.Resolvers.PictureResolverTest do
end
describe "Resolver: Upload picture" do
test "upload_picture/3 uploads a new picture", %{conn: conn, user: user} do
test "upload_picture/3 uploads a new picture", %{conn: conn, user: user, actor: actor} do
picture = %{name: "my pic", alt: "represents something", file: "picture.png"}
mutation = """
mutation { uploadPicture(
name: "#{picture.name}",
alt: "#{picture.alt}",
file: "#{picture.file}"
file: "#{picture.file}",
actor_id: #{actor.id}
) {
url,
name
@ -92,14 +94,15 @@ defmodule MobilizonWeb.Resolvers.PictureResolverTest do
assert json_response(res, 200)["data"]["uploadPicture"]["url"]
end
test "upload_picture/3 forbids uploading if no auth", %{conn: conn} do
test "upload_picture/3 forbids uploading if no auth", %{conn: conn, actor: actor} do
picture = %{name: "my pic", alt: "represents something", file: "picture.png"}
mutation = """
mutation { uploadPicture(
name: "#{picture.name}",
alt: "#{picture.alt}",
file: "#{picture.file}"
file: "#{picture.file}",
actor_id: #{actor.id}
) {
url,
name

3
test/support/factory.ex
View File

@ -180,7 +180,8 @@ defmodule Mobilizon.Factory do
def picture_factory do
%Mobilizon.Media.Picture{
file: build(:file)
file: build(:file),
actor: build(:actor)
}
end
end