Merge branch 'fixes' into 'main'
Add GraphQL query name to other queries See merge request framasoft/mobilizon!1327
This commit is contained in:
commit
394428cda7
@ -17,7 +17,7 @@ export const ACTOR_FRAGMENT = gql`
|
|||||||
`;
|
`;
|
||||||
|
|
||||||
export const FETCH_PERSON = gql`
|
export const FETCH_PERSON = gql`
|
||||||
query ($username: String!) {
|
query FetchPerson($username: String!) {
|
||||||
fetchPerson(preferredUsername: $username) {
|
fetchPerson(preferredUsername: $username) {
|
||||||
...ActorFragment
|
...ActorFragment
|
||||||
suspended
|
suspended
|
||||||
|
@ -2,7 +2,7 @@ import gql from "graphql-tag";
|
|||||||
import { ACTOR_FRAGMENT } from "./actor";
|
import { ACTOR_FRAGMENT } from "./actor";
|
||||||
|
|
||||||
export const GROUP_FOLLOWERS = gql`
|
export const GROUP_FOLLOWERS = gql`
|
||||||
query (
|
query GroupFollowers(
|
||||||
$name: String!
|
$name: String!
|
||||||
$followersPage: Int
|
$followersPage: Int
|
||||||
$followersLimit: Int
|
$followersLimit: Int
|
||||||
|
@ -44,7 +44,7 @@ export const REJECT_INVITATION = gql`
|
|||||||
`;
|
`;
|
||||||
|
|
||||||
export const GROUP_MEMBERS = gql`
|
export const GROUP_MEMBERS = gql`
|
||||||
query (
|
query GroupMembers(
|
||||||
$groupName: String!
|
$groupName: String!
|
||||||
$name: String
|
$name: String
|
||||||
$roles: String
|
$roles: String
|
||||||
|
@ -201,6 +201,10 @@ defmodule Mobilizon.Federation.ActivityPub.Transmogrifier do
|
|||||||
|
|
||||||
{:ok, entity} ->
|
{:ok, entity} ->
|
||||||
Actions.Delete.delete(entity, Relay.get_actor(), false)
|
Actions.Delete.delete(entity, Relay.get_actor(), false)
|
||||||
|
|
||||||
|
{:error, err} ->
|
||||||
|
Logger.warn("Error while fetching object from URL", error: inspect(err))
|
||||||
|
:error
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -65,7 +65,7 @@ defmodule Mobilizon.Service.FrontEndAnalytics do
|
|||||||
|
|
||||||
defp merge_csp_config(config, global_config) do
|
defp merge_csp_config(config, global_config) do
|
||||||
Keyword.merge(global_config, config, fn _key, global, config ->
|
Keyword.merge(global_config, config, fn _key, global, config ->
|
||||||
"#{global} #{config}"
|
global ++ config
|
||||||
end)
|
end)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
Loading…
Reference in New Issue
Block a user