mirror/mobilizon
1
0
Fork 0
mirror of https://framagit.org/framasoft/mobilizon.git synced 2024-12-21 23:44:30 +00:00
Code Issues Releases Wiki Activity

Merge branch 'fixes' into 'main'

Browse source 
Two last-minute fixes

Closes #1376 et #1357

See merge request framasoft/mobilizon!1489
This commit is contained in:
Thomas Citharel 2023-12-03 17:34:33 +00:00
commit 3a2c6afc0d
4 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/federation/activity_pub/utils.ex
View file

@ -126,6 +126,10 @@ defmodule Mobilizon.Federation.ActivityPub.Utils do
"@type" => "sc:Boolean",
"@id" => "mz:isOnline"
},
"externalParticipationUrl" => %{
"@id" => "mz:externalParticipationUrl",
"@type" => "sc:URL"
},
"PropertyValue" => "sc:PropertyValue",
"value" => "sc:value",
"propertyID" => "sc:propertyID",

2
lib/graphql/schema/custom/timezone.ex
View file

@ -17,6 +17,8 @@ defmodule Mobilizon.GraphQL.Schema.Custom.Timezone do
@spec decode(Absinthe.Blueprint.Input.String.t()) :: {:ok, term} | :error
@spec decode(Absinthe.Blueprint.Input.Null.t()) :: {:ok, nil}
defp decode(%Absinthe.Blueprint.Input.String{value: ""}), do: {:ok, nil}
defp decode(%Absinthe.Blueprint.Input.String{value: value}) do
if Tzdata.zone_exists?(value),
do: {:ok, value},

6
src/views/Group/CreateView.vue
View file

@ -287,12 +287,16 @@ const buildVariables = computed(() => {
preferredUsername: group.value.preferredUsername,
name: group.value.name,
summary: group.value.summary,
physicalAddress: cloneGroup.physicalAddress,
visibility: group.value.visibility,
openness: group.value.openness,
manuallyApprovesFollowers: group.value.manuallyApprovesFollowers,
};
if (cloneGroup.physicalAddress?.id || cloneGroup.physicalAddress?.geom) {
// @ts-expect-error No type for this variable
groupBasic.physicalAddress = cloneGroup.physicalAddress;
}
if (avatarFile.value) {
avatarObj = {
avatar: {

2
src/views/Group/GroupSettings.vue
View file

@ -345,7 +345,7 @@ const currentAddress = computed({
return editableGroup.value?.physicalAddress ?? null;
},
set(address: IAddress | null) {
if (editableGroup.value && address) {
if (editableGroup.value && address && (address.id || address.geom)) {
editableGroup.value = {
...editableGroup.value,
physicalAddress: address,