Allow to join an open group
Also: * Refactor interacting with a remote event so that you can interact with a remote group as well * Add a setting for group admins to pick between an open and invite-only group * Fix new groups without posts/todos/resources/events/conversations URL set * Repair local groups that haven't got their posts/todos/resources/events/conversations URL set * Add a scheduled job to refresh remote groups every hour * Add a user setting to pick when to receive notifications when there's new members to approve (will be used when this feature is available) * Fix pagination for members Signed-off-by: Thomas Citharel <tcit@tcit.fr>
This commit is contained in:
@@ -17,7 +17,7 @@ defmodule Mobilizon.GraphQL.Schema.Actors.GroupType do
|
||||
Represents a group of actors
|
||||
"""
|
||||
object :group do
|
||||
interfaces([:actor])
|
||||
interfaces([:actor, :interactable])
|
||||
|
||||
field(:id, :id, description: "Internal ID for this group")
|
||||
field(:url, :string, description: "The ActivityPub actor's URL")
|
||||
@@ -196,6 +196,10 @@ defmodule Mobilizon.GraphQL.Schema.Actors.GroupType do
|
||||
|
||||
arg(:visibility, :group_visibility, description: "The visibility for the group")
|
||||
|
||||
arg(:openness, :openness,
|
||||
description: "Whether the group can be join freely, with approval or is invite-only."
|
||||
)
|
||||
|
||||
arg(:avatar, :picture_input,
|
||||
description:
|
||||
"The avatar for the group, either as an object or directly the ID of an existing Picture"
|
||||
|
||||
@@ -38,7 +38,6 @@ defmodule Mobilizon.GraphQL.Schema.Actors.MemberType do
|
||||
@desc "Join a group"
|
||||
field :join_group, :member do
|
||||
arg(:group_id, non_null(:id))
|
||||
arg(:actor_id, non_null(:id))
|
||||
|
||||
resolve(&Group.join_group/3)
|
||||
end
|
||||
|
||||
@@ -197,5 +197,13 @@ defmodule Mobilizon.GraphQL.Schema.Actors.PersonType do
|
||||
{:ok, topic: args.person_id}
|
||||
end)
|
||||
end
|
||||
|
||||
field :group_membership_changed, :person do
|
||||
arg(:person_id, non_null(:id))
|
||||
|
||||
config(fn args, _ ->
|
||||
{:ok, topic: args.person_id}
|
||||
end)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
@@ -17,7 +17,7 @@ defmodule Mobilizon.GraphQL.Schema.EventType do
|
||||
|
||||
@desc "An event"
|
||||
object :event do
|
||||
interfaces([:action_log_object])
|
||||
interfaces([:action_log_object, :interactable])
|
||||
field(:id, :id, description: "Internal ID for this event")
|
||||
field(:uuid, :uuid, description: "The Event UUID")
|
||||
field(:url, :string, description: "The ActivityPub Event URL")
|
||||
|
||||
@@ -4,6 +4,8 @@ defmodule Mobilizon.GraphQL.Schema.SearchType do
|
||||
"""
|
||||
use Absinthe.Schema.Notation
|
||||
|
||||
alias Mobilizon.Actors.Actor
|
||||
alias Mobilizon.Events.Event
|
||||
alias Mobilizon.GraphQL.Resolvers.Search
|
||||
|
||||
@desc "Search persons result"
|
||||
@@ -24,6 +26,21 @@ defmodule Mobilizon.GraphQL.Schema.SearchType do
|
||||
field(:elements, non_null(list_of(:event)), description: "Event elements")
|
||||
end
|
||||
|
||||
interface :interactable do
|
||||
field(:url, :string, description: "A public URL for the entity")
|
||||
|
||||
resolve_type(fn
|
||||
%Actor{type: :Group}, _ ->
|
||||
:group
|
||||
|
||||
%Event{}, _ ->
|
||||
:event
|
||||
|
||||
_, _ ->
|
||||
nil
|
||||
end)
|
||||
end
|
||||
|
||||
object :search_queries do
|
||||
@desc "Search persons"
|
||||
field :search_persons, :persons do
|
||||
@@ -58,5 +75,12 @@ defmodule Mobilizon.GraphQL.Schema.SearchType do
|
||||
|
||||
resolve(&Search.search_events/3)
|
||||
end
|
||||
|
||||
@desc "Interact with an URI"
|
||||
field :interact, :interactable do
|
||||
arg(:uri, non_null(:string), description: "The URI for to interact with")
|
||||
|
||||
resolve(&Search.interact/3)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
@@ -132,12 +132,17 @@ defmodule Mobilizon.GraphQL.Schema.UserType do
|
||||
description: "Whether this user will receive a notification right before event"
|
||||
)
|
||||
|
||||
field(:notification_pending_participation, :notification_pending_participation_enum,
|
||||
field(:notification_pending_participation, :notification_pending_enum,
|
||||
description: "When does the user receives a notification about new pending participations"
|
||||
)
|
||||
|
||||
field(:notification_pending_membership, :notification_pending_enum,
|
||||
description:
|
||||
"When does the user receives a notification about a new pending membership in one of the group they're admin for"
|
||||
)
|
||||
end
|
||||
|
||||
enum :notification_pending_participation_enum do
|
||||
enum :notification_pending_enum do
|
||||
value(:none, as: :none)
|
||||
value(:direct, as: :direct)
|
||||
value(:one_hour, as: :one_hour)
|
||||
@@ -258,7 +263,8 @@ defmodule Mobilizon.GraphQL.Schema.UserType do
|
||||
arg(:notification_on_day, :boolean)
|
||||
arg(:notification_each_week, :boolean)
|
||||
arg(:notification_before_event, :boolean)
|
||||
arg(:notification_pending_participation, :notification_pending_participation_enum)
|
||||
arg(:notification_pending_participation, :notification_pending_enum)
|
||||
arg(:notification_pending_membership, :notification_pending_enum)
|
||||
resolve(&User.set_user_setting/3)
|
||||
end
|
||||
|
||||
|
||||
Reference in New Issue
Block a user