Encore des commits degeu

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

lib/eventos/actors/actors.ex

@@ -133,6 +133,15 @@ defmodule Eventos.Actors do
     Repo.all(from a in Actor, where: a.type == "Group")
   end
 
+  def get_group_by_name(name) do
+    actor = case String.split(name, "@") do
+      [name] ->
+        Repo.get_by(Actor, preferred_username: name, type: :Group)
+      [name, domain] ->
+        Repo.get_by(Actor, preferred_username: name, domain: domain, type: :Group)
+    end
+  end
+
   @doc """
   Creates a group.
 
@@ -176,7 +185,7 @@ defmodule Eventos.Actors do
 
   def insert_or_update_actor(data) do
     cs = Actor.remote_actor_creation(data)
-    Repo.insert(cs, on_conflict: [set: [public_key: data.public_key, avatar_url: data.avatar_url, banner: data.banner_url, name: data.name]], conflict_target: [:preferred_username, :domain])
+    Repo.insert(cs, on_conflict: [set: [public_key: data.public_key, avatar_url: data.avatar_url, banner_url: data.banner_url, name: data.name]], conflict_target: [:preferred_username, :domain])
   end
 
 #  def increase_event_count(%Actor{} = actor) do
@@ -494,7 +503,8 @@ defmodule Eventos.Actors do
   def create_member(attrs \\ %{}) do
     %Member{}
     |> Member.changeset(attrs)
-    |> Repo.insert()
+    |> Repo.insert!()
+    |> Repo.preload([:actor, :parent])
   end
 
   @doc """
@@ -544,6 +554,22 @@ defmodule Eventos.Actors do
     Member.changeset(member, %{})
   end
 
+  def groups_for_actor(%Actor{id: id} = _actor) do
+    Repo.all(
+      from m in Member,
+      where: m.actor_id == ^id,
+      preload: [:parent]
+    )
+  end
+
+  def members_for_group(%Actor{type: :Group, id: id} = _group) do
+    Repo.all(
+      from m in Member,
+      where: m.parent_id == ^id,
+      preload: [:parent, :actor]
+    )
+  end
+
 
   alias Eventos.Actors.Bot
 

lib/eventos/actors/member.ex

@@ -7,10 +7,10 @@ defmodule Eventos.Actors.Member do
   alias Eventos.Actors.Member
   alias Eventos.Actors.Actor
 
-
+  @primary_key false
   schema "members" do
-    field :approved, :boolean
-    field :role, :integer
+    field :approved, :boolean, default: true
+    field :role, :integer, default: 0 # 0 : Member, 1 : Moderator, 2 : Admin
     belongs_to :parent, Actor
     belongs_to :actor, Actor
 
@@ -20,7 +20,7 @@ defmodule Eventos.Actors.Member do
   @doc false
   def changeset(%Member{} = member, attrs) do
     member
-    |> cast(attrs, [:role])
-    |> validate_required([:role])
+    |> cast(attrs, [:role, :approved, :parent_id, :actor_id])
+    |> validate_required([:parent_id, :actor_id])
   end
 end