Merge branch 'fixes' into 'main'

Various fixes

Closes #1170

See merge request framasoft/mobilizon!1303

js/src/components/Group/GroupMemberCard.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="rounded shadow-lg bg-white dark:bg-mbz-purple dark:text-white">
     <div
-      class="bg-yellow-2 text-black flex items-center gap-1 p-2 rounded-t-lg"
+      class="bg-mbz-yellow-alt-50 text-black flex items-center gap-1 p-2 rounded-t-lg"
       dir="auto"
     >
       <figure class="" v-if="member.actor.avatar">

js/src/components/Group/InvitationCard.vue

@@ -1,75 +1,54 @@
 <template>
-  <div class="">
-    <div class="">
-      <div class="">
-        <div class="prose dark:prose-invert">
-          <i18n-t
-            tag="p"
-            keypath="You have been invited by {invitedBy} to the following group:"
-          >
-            <template #invitedBy>
-              <b>{{ member?.invitedBy?.name }}</b>
-            </template>
-          </i18n-t>
-        </div>
+  <div class="border rounded p-2 bg-mbz-yellow-alt-50 dark:bg-zinc-700">
+    <div class="prose dark:prose-invert">
+      <i18n-t
+        tag="p"
+        keypath="You have been invited by {invitedBy} to the following group:"
+      >
+        <template #invitedBy>
+          <b>{{ member?.invitedBy?.name }}</b>
+        </template>
+      </i18n-t>
+    </div>
+    <div class="flex justify-between gap-2">
+      <div class="flex gap-2">
         <div class="">
+          <figure v-if="member.parent.avatar">
+            <img
+              class="rounded-full"
+              :src="member.parent.avatar.url"
+              alt=""
+              height="48"
+              width="48"
+            />
+          </figure>
+          <AccountGroup :size="48" v-else />
+        </div>
+        <div class="mr-3">
+          <router-link
+            :to="{
+              name: RouteName.GROUP,
+              params: {
+                preferredUsername: usernameWithDomain(member.parent),
+              },
+            }"
+          >
+            <p class="">{{ member.parent.name }}</p>
+            <p class="text-sm">@{{ usernameWithDomain(member.parent) }}</p>
+          </router-link>
+        </div>
+      </div>
+      <div>
+        <div class="flex gap-2">
           <div class="">
-            <figure v-if="member.parent.avatar">
-              <img
-                class="rounded"
-                :src="member.parent.avatar.url"
-                alt=""
-                height="48"
-                width="48"
-              />
-            </figure>
-            <AccountGroup :size="48" v-else />
+            <o-button variant="success" @click="$emit('accept', member.id)">
+              {{ t("Accept") }}
+            </o-button>
           </div>
-          <div class="media-content">
-            <div class="level">
-              <div class="level-left">
-                <div class="level-item mr-3">
-                  <router-link
-                    :to="{
-                      name: RouteName.GROUP,
-                      params: {
-                        preferredUsername: usernameWithDomain(member.parent),
-                      },
-                    }"
-                  >
-                    <h3 class="">{{ member.parent.name }}</h3>
-                    <p class="">
-                      <span v-if="member.parent.domain">
-                        {{
-                          `@${member.parent.preferredUsername}@${member.parent.domain}`
-                        }}
-                      </span>
-                      <span v-else>{{
-                        `@${member.parent.preferredUsername}`
-                      }}</span>
-                    </p>
-                  </router-link>
-                </div>
-              </div>
-              <div class="">
-                <div class="">
-                  <o-button
-                    variant="success"
-                    @click="$emit('accept', member.id)"
-                  >
-                    {{ $t("Accept") }}
-                  </o-button>
-                </div>
-                <div class="">
-                  <o-button
-                    variant="danger"
-                    @click="$emit('reject', member.id)"
-                  >
-                    {{ $t("Decline") }}
-                  </o-button>
-                </div>
-              </div>
-            </div>
+          <div class="">
+            <o-button variant="danger" @click="$emit('reject', member.id)">
+              {{ t("Decline") }}
+            </o-button>
           </div>
         </div>
       </div>
@@ -82,6 +61,9 @@ import { usernameWithDomain } from "@/types/actor";
 import { IMember } from "@/types/actor/member.model";
 import RouteName from "../../router/name";
 import AccountGroup from "vue-material-design-icons/AccountGroup.vue";
+import { useI18n } from "vue-i18n";
+
+const { t } = useI18n({ useScope: "global" });
 
 defineProps<{
   member: IMember;

js/src/components/Group/InvitationsList.vue

@@ -1,11 +1,11 @@
 <template>
-  <section class="card my-3" v-if="invitations && invitations.length > 0">
+  <section class="my-3" v-if="invitations && invitations.length > 0">
     <InvitationCard
       v-for="member in invitations"
       :key="member.id"
       :member="member"
-      @accept="acceptInvitation"
-      @reject="rejectInvitation"
+      @accept="acceptInvitation({ id: member.id })"
+      @reject="rejectInvitation({ id: member.id })"
     />
   </section>
 </template>
@@ -25,21 +25,24 @@ defineProps<{
 }>();
 
 const { mutate: acceptInvitation, onError: onAcceptInvitationError } =
-  useMutation(ACCEPT_INVITATION, {
-    refetchQueries({ data }) {
-      const profile = data?.acceptInvitation?.actor as IPerson;
-      const group = data?.acceptInvitation?.parent as IGroup;
-      if (profile && group) {
-        return [
-          {
-            query: PERSON_STATUS_GROUP,
-            variables: { id: profile.id, group: usernameWithDomain(group) },
-          },
-        ];
-      }
-      return [];
-    },
-  });
+  useMutation<{ acceptInvitation: IMember }, { id: string }>(
+    ACCEPT_INVITATION,
+    {
+      refetchQueries({ data }) {
+        const profile = data?.acceptInvitation?.actor as IPerson;
+        const group = data?.acceptInvitation?.parent as IGroup;
+        if (profile && group) {
+          return [
+            {
+              query: PERSON_STATUS_GROUP,
+              variables: { id: profile.id, group: usernameWithDomain(group) },
+            },
+          ];
+        }
+        return [];
+      },
+    }
+  );
 
 const notifier = inject<Notifier>("notifier");
 
@@ -53,21 +56,24 @@ const onError = (error: ErrorResponse) => {
 onAcceptInvitationError((err) => onError(err as unknown as ErrorResponse));
 
 const { mutate: rejectInvitation, onError: onRejectInvitationError } =
-  useMutation(REJECT_INVITATION, {
-    refetchQueries({ data }) {
-      const profile = data?.rejectInvitation?.actor as IPerson;
-      const group = data?.rejectInvitation?.parent as IGroup;
-      if (profile && group) {
-        return [
-          {
-            query: PERSON_STATUS_GROUP,
-            variables: { id: profile.id, group: usernameWithDomain(group) },
-          },
-        ];
-      }
-      return [];
-    },
-  });
+  useMutation<{ rejectInvitation: IMember }, { id: string }>(
+    REJECT_INVITATION,
+    {
+      refetchQueries({ data }) {
+        const profile = data?.rejectInvitation?.actor as IPerson;
+        const group = data?.rejectInvitation?.parent as IGroup;
+        if (profile && group) {
+          return [
+            {
+              query: PERSON_STATUS_GROUP,
+              variables: { id: profile.id, group: usernameWithDomain(group) },
+            },
+          ];
+        }
+        return [];
+      },
+    }
+  );
 
 onRejectInvitationError((err) => onError(err as unknown as ErrorResponse));
 </script>

js/src/components/core/CustomDialog.vue

@@ -137,7 +137,9 @@ const close = () => {
  */
 const cancel = (source: string) => {
   emit("cancel", source);
-  props.onCancel?.apply(null, [source]);
+  if (props?.onCancel) {
+    props?.onCancel(source);
+  }
   close();
 };
 </script>

js/src/views/Group/GroupView.vue

@@ -806,15 +806,20 @@ const openLeaveGroupModal = async (): Promise<void> => {
       "Are you sure you want to leave the group {groupName}? You'll loose access to this group's private content. This action cannot be undone.",
       { groupName: `<b>${displayName(group.value)}</b>` }
     ),
-    onConfirm: () => leaveGroup(),
+    onConfirm: leaveGroup,
     confirmText: t("Leave group"),
     cancelText: t("Cancel"),
   });
 };
 
+const {
+  mutate: leaveGroupMutation,
+  onError: onLeaveGroupError,
+  onDone: onLeaveGroupDone,
+} = useLeaveGroup();
+
 const leaveGroup = () => {
-  const { mutate: leaveGroupMutation, onError: onLeaveGroupError } =
-    useLeaveGroup();
+  console.debug("called leaveGroup");
 
   const [groupFederatedUsername, currentActorId] = [
     usernameWithDomain(group.value),
@@ -837,14 +842,18 @@ const leaveGroup = () => {
       ],
     }
   );
-
-  onLeaveGroupError((error: any) => {
-    if (error.graphQLErrors && error.graphQLErrors.length > 0) {
-      notifier?.error(error.graphQLErrors[0].message);
-    }
-  });
 };
 
+onLeaveGroupError((error: any) => {
+  if (error.graphQLErrors && error.graphQLErrors.length > 0) {
+    notifier?.error(error.graphQLErrors[0].message);
+  }
+});
+
+onLeaveGroupDone(() => {
+  console.debug("done");
+});
+
 const { mutate: followGroupMutation, onError: onFollowGroupError } =
   useMutation(FOLLOW_GROUP, () => ({
     refetchQueries: [

lib/graphql/resolvers/group.ex

@@ -341,6 +341,10 @@ defmodule Mobilizon.GraphQL.Resolvers.Group do
       {:group, nil} ->
         {:error, dgettext("errors", "Group not found")}
 
+      # Actions.Leave.leave can also return nil if the member isn't found. Probably something to fix.
+      nil ->
+        {:error, dgettext("errors", "Member not found")}
+
       {:error, :is_not_only_admin} ->
         {:error,
          dgettext("errors", "You can't leave this group because you are the only administrator")}

mix.lock

@@ -24,7 +24,7 @@
   "dialyxir": {:hex, :dialyxir, "1.2.0", "58344b3e87c2e7095304c81a9ae65cb68b613e28340690dfe1a5597fd08dec37", [:mix], [{:erlex, ">= 0.2.6", [hex: :erlex, repo: "hexpm", optional: false]}], "hexpm", "61072136427a851674cab81762be4dbeae7679f85b1272b6d25c3a839aff8463"},
   "digital_token": {:hex, :digital_token, "0.4.0", "2ad6894d4a40be8b2890aad286ecd5745fa473fa5699d80361a8c94428edcd1f", [:mix], [{:cldr_utils, "~> 2.17", [hex: :cldr_utils, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "a178edf61d1fee5bb3c34e14b0f4ee21809ee87cade8738f87337e59e5e66e26"},
   "doctor": {:hex, :doctor, "0.20.0", "2a8ff8f87eaf3fc78f20ffcfa7a3181f2bdb6a115a4abd52582e6156a89649a5", [:mix], [{:decimal, "~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}], "hexpm", "36ba43bdf7d799c41e1dc00b3429eb48bc5d4dc3f63b181ca1aa8829ec638862"},
-  "earmark_parser": {:hex, :earmark_parser, "1.4.28", "0bf6546eb7cd6185ae086cbc5d20cd6dbb4b428aad14c02c49f7b554484b4586", [:mix], [], "hexpm", "501cef12286a3231dc80c81352a9453decf9586977f917a96e619293132743fb"},
+  "earmark_parser": {:hex, :earmark_parser, "1.4.29", "149d50dcb3a93d9f3d6f3ecf18c918fb5a2d3c001b5d3305c926cddfbd33355b", [:mix], [], "hexpm", "4902af1b3eb139016aed210888748db8070b8125c2342ce3dcae4f38dcc63503"},
   "eblurhash": {:hex, :eblurhash, "1.2.2", "7da4255aaea984b31bb71155f673257353b0e0554d0d30dcf859547e74602582", [:rebar3], [], "hexpm", "8c20ca00904de023a835a9dcb7b7762fed32264c85a80c3cafa85288e405044c"},
   "ecto": {:hex, :ecto, "3.9.1", "67173b1687afeb68ce805ee7420b4261649d5e2deed8fe5550df23bab0bc4396", [:mix], [{:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "c80bb3d736648df790f7f92f81b36c922d9dd3203ca65be4ff01d067f54eb304"},
   "ecto_autoslug_field": {:hex, :ecto_autoslug_field, "3.0.0", "37fbc2f07e6691136afff246f2cf5b159ad395b665a55d06db918975fd2397db", [:mix], [{:ecto, ">= 3.7.0", [hex: :ecto, repo: "hexpm", optional: false]}, {:slugger, ">= 0.3.0", [hex: :slugger, repo: "hexpm", optional: false]}], "hexpm", "8ec252c7cf85f13132062f56a484d6a0ef1f981f7be9ce4ad7e9546dd8c0cc0f"},
@@ -36,14 +36,14 @@
   "erlex": {:hex, :erlex, "0.2.6", "c7987d15e899c7a2f34f5420d2a2ea0d659682c06ac607572df55a43753aa12e", [:mix], [], "hexpm", "2ed2e25711feb44d52b17d2780eabf998452f6efda104877a3881c2f8c0c0c75"},
   "erlport": {:hex, :erlport, "0.10.1", "c96ffa51bbcab0298232fcdfe8c3e110f1598011de71ae6b9082b80c9e2e476a", [:rebar3], [], "hexpm", "34931e8cb62a131d1bc8a2bd04d4007c73c03e4f10e22ee4a218e7172227a918"},
   "eternal": {:hex, :eternal, "1.2.2", "d1641c86368de99375b98d183042dd6c2b234262b8d08dfd72b9eeaafc2a1abd", [:mix], [], "hexpm", "2c9fe32b9c3726703ba5e1d43a1d255a4f3f2d8f8f9bc19f094c7cb1a7a9e782"},
-  "ex_cldr": {:hex, :ex_cldr, "2.33.2", "8adc4df3985e7f5d1d55cbbf72f993569de20eff5012ff3ea9412753961d4c00", [:mix], [{:castore, "~> 0.1", [hex: :castore, repo: "hexpm", optional: true]}, {:certifi, "~> 2.5", [hex: :certifi, repo: "hexpm", optional: true]}, {:cldr_utils, "~> 2.18", [hex: :cldr_utils, repo: "hexpm", optional: false]}, {:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:gettext, "~> 0.19", [hex: :gettext, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:nimble_parsec, "~> 0.5 or ~> 1.0", [hex: :nimble_parsec, repo: "hexpm", optional: true]}], "hexpm", "fd81a7147b4ed86c0c44c0251444cb8d1defccc7b33b89067ca1635f23e9fbf8"},
-  "ex_cldr_calendars": {:hex, :ex_cldr_calendars, "1.20.0", "92c38bcd9d0c3b2b7eee966da2219fe3d57a8326de4c5a88ccec5462e6614f74", [:mix], [{:calendar_interval, "~> 0.2", [hex: :calendar_interval, repo: "hexpm", optional: true]}, {:ex_cldr_lists, "~> 2.10", [hex: :ex_cldr_lists, repo: "hexpm", optional: true]}, {:ex_cldr_numbers, "~> 2.25", [hex: :ex_cldr_numbers, repo: "hexpm", optional: false]}, {:ex_cldr_units, "~> 3.12", [hex: :ex_cldr_units, repo: "hexpm", optional: true]}, {:ex_doc, "~> 0.21", [hex: :ex_doc, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "86b9fa6ce295814784deef277ee91f517eb0beebcfd0f89091b1cea2417e46d9"},
+  "ex_cldr": {:hex, :ex_cldr, "2.34.0", "50385e1445f33537bea7d24ca7525aa849ccabb3cf88ac41a6d183693116aba7", [:mix], [{:castore, "~> 0.1", [hex: :castore, repo: "hexpm", optional: true]}, {:certifi, "~> 2.5", [hex: :certifi, repo: "hexpm", optional: true]}, {:cldr_utils, "~> 2.18", [hex: :cldr_utils, repo: "hexpm", optional: false]}, {:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:gettext, "~> 0.19", [hex: :gettext, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:nimble_parsec, "~> 0.5 or ~> 1.0", [hex: :nimble_parsec, repo: "hexpm", optional: true]}], "hexpm", "d026df7d580424ab8daf0d908fd38d3c12e0a63962b495b7faeabd66ab072588"},
+  "ex_cldr_calendars": {:hex, :ex_cldr_calendars, "1.21.0", "5f3c71a145926cfa7f8691aa3566921957543f635ec345e52282c613e8985ba8", [:mix], [{:calendar_interval, "~> 0.2", [hex: :calendar_interval, repo: "hexpm", optional: true]}, {:ex_cldr_lists, "~> 2.10", [hex: :ex_cldr_lists, repo: "hexpm", optional: true]}, {:ex_cldr_numbers, "~> 2.25", [hex: :ex_cldr_numbers, repo: "hexpm", optional: false]}, {:ex_cldr_units, "~> 3.12", [hex: :ex_cldr_units, repo: "hexpm", optional: true]}, {:ex_doc, "~> 0.21", [hex: :ex_doc, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "8ce8737b70f9c36828324995f96464a1a4c87cf2f76e5868e20662ca31c4098f"},
   "ex_cldr_currencies": {:hex, :ex_cldr_currencies, "2.14.2", "354b48134faa011d58ae2e89be69b7de607d81fcc74c7ac684c5fb77b20186f5", [:mix], [{:ex_cldr, "~> 2.27", [hex: :ex_cldr, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "c970533103cdc97b1dedc2fead2209c0f5ae0aee0f1e504fdea5be5ee1466cd1"},
-  "ex_cldr_dates_times": {:hex, :ex_cldr_dates_times, "2.12.0", "a6b065657b06535914b0b18f0d86549187950256c0b1d1c0e055a27126f753b1", [:mix], [{:calendar_interval, "~> 0.2", [hex: :calendar_interval, repo: "hexpm", optional: true]}, {:ex_cldr_calendars, "~> 1.18", [hex: :ex_cldr_calendars, repo: "hexpm", optional: false]}, {:ex_cldr_numbers, "~> 2.25", [hex: :ex_cldr_numbers, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "c15b424c1f9512e1be17cc128415f8b69bd5a283e63db71c44bf60e70253eba0"},
+  "ex_cldr_dates_times": {:hex, :ex_cldr_dates_times, "2.13.0", "bb570836f12a9df7fa86dbf81abf6bcb55295992c5bc86487abafb622080380f", [:mix], [{:calendar_interval, "~> 0.2", [hex: :calendar_interval, repo: "hexpm", optional: true]}, {:ex_cldr_calendars, "~> 1.18", [hex: :ex_cldr_calendars, repo: "hexpm", optional: false]}, {:ex_cldr_numbers, "~> 2.28", [hex: :ex_cldr_numbers, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "8937faab399d0ec7cee3801c6e310e4724e71d93da3f4c5ec61941aa0f5c98eb"},
   "ex_cldr_languages": {:hex, :ex_cldr_languages, "0.3.3", "9787002803552b15a7ade19496c9e46fc921baca992ea80d0394e11fe3acea45", [:mix], [{:ex_cldr, "~> 2.25", [hex: :ex_cldr, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "22fb1fef72b7b4b4872d243b34e7b83734247a78ad87377986bf719089cc447a"},
-  "ex_cldr_numbers": {:hex, :ex_cldr_numbers, "2.27.3", "d6c1f1fb27ada01a77a7e0cf4ef0c59ad122a23829b6fd601820ac783d1bc9a5", [:mix], [{:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:digital_token, "~> 0.3 or ~> 1.0", [hex: :digital_token, repo: "hexpm", optional: false]}, {:ex_cldr, "~> 2.28", [hex: :ex_cldr, repo: "hexpm", optional: false]}, {:ex_cldr_currencies, "~> 2.14", [hex: :ex_cldr_currencies, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "2550dccc5232b90507e78a9fdee49d453249681e85d874f7d6703059be426724"},
+  "ex_cldr_numbers": {:hex, :ex_cldr_numbers, "2.28.0", "506f5d36a2b72a21bbcb6e55dfdc5c3ff7f1c07d65e516461125158d10661beb", [:mix], [{:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:digital_token, "~> 0.3 or ~> 1.0", [hex: :digital_token, repo: "hexpm", optional: false]}, {:ex_cldr, "~> 2.34", [hex: :ex_cldr, repo: "hexpm", optional: false]}, {:ex_cldr_currencies, ">= 2.14.2", [hex: :ex_cldr_currencies, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "83342ff668aedf3aa5c54b048ce1da0f91317b6596b14880a5f87d45cd1c49d2"},
   "ex_cldr_plugs": {:hex, :ex_cldr_plugs, "1.2.0", "e02cc03a4cb19bb028c331680cf09f826b4180f1545f8c35825fb5d4b918ac8a", [:mix], [{:ex_cldr, "~> 2.29", [hex: :ex_cldr, repo: "hexpm", optional: false]}, {:gettext, "~> 0.19", [hex: :gettext, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:plug, "~> 1.9", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "e111249ed7a7e2ef6322c93ff2d1c930d9e296dc8181351ff6c6a1be50b1cf8e"},
-  "ex_doc": {:hex, :ex_doc, "0.28.5", "3e52a6d2130ce74d096859e477b97080c156d0926701c13870a4e1f752363279", [:mix], [{:earmark_parser, "~> 1.4.19", [hex: :earmark_parser, repo: "hexpm", optional: false]}, {:makeup_elixir, "~> 0.14", [hex: :makeup_elixir, repo: "hexpm", optional: false]}, {:makeup_erlang, "~> 0.1", [hex: :makeup_erlang, repo: "hexpm", optional: false]}], "hexpm", "d2c4b07133113e9aa3e9ba27efb9088ba900e9e51caa383919676afdf09ab181"},
+  "ex_doc": {:hex, :ex_doc, "0.29.0", "4a1cb903ce746aceef9c1f9ae8a6c12b742a5461e6959b9d3b24d813ffbea146", [:mix], [{:earmark_parser, "~> 1.4.19", [hex: :earmark_parser, repo: "hexpm", optional: false]}, {:makeup_elixir, "~> 0.14", [hex: :makeup_elixir, repo: "hexpm", optional: false]}, {:makeup_erlang, "~> 0.1", [hex: :makeup_erlang, repo: "hexpm", optional: false]}], "hexpm", "f096adb8bbca677d35d278223361c7792d496b3fc0d0224c9d4bc2f651af5db1"},
   "ex_ical": {:hex, :ex_ical, "0.2.0", "4b928b554614704016cc0c9ee226eb854da9327a1cc460457621ceacb1ac29a6", [:mix], [{:timex, "~> 3.1", [hex: :timex, repo: "hexpm", optional: false]}], "hexpm", "db76473b2ae0259e6633c6c479a5a4d8603f09497f55c88f9ef4d53d2b75befb"},
   "ex_machina": {:hex, :ex_machina, "2.7.0", "b792cc3127fd0680fecdb6299235b4727a4944a09ff0fa904cc639272cd92dc7", [:mix], [{:ecto, "~> 2.2 or ~> 3.0", [hex: :ecto, repo: "hexpm", optional: true]}, {:ecto_sql, "~> 3.0", [hex: :ecto_sql, repo: "hexpm", optional: true]}], "hexpm", "419aa7a39bde11894c87a615c4ecaa52d8f107bbdd81d810465186f783245bf8"},
   "ex_optimizer": {:hex, :ex_optimizer, "0.1.1", "62da37e206fc2233ff7a4e54e40eae365c40f96c81992fcd15b782eb25169b80", [:mix], [{:file_info, "~> 0.0.4", [hex: :file_info, repo: "hexpm", optional: false]}], "hexpm", "e6f5c059bcd58b66be2f6f257fdc4f69b74b0fa5c9ddd669486af012e4b52286"},
@@ -126,11 +126,11 @@
   "ssl_verify_fun": {:hex, :ssl_verify_fun, "1.1.6", "cf344f5692c82d2cd7554f5ec8fd961548d4fd09e7d22f5b62482e5aeaebd4b0", [:make, :mix, :rebar3], [], "hexpm", "bdb0d2471f453c88ff3908e7686f86f9be327d065cc1ec16fa4540197ea04680"},
   "struct_access": {:hex, :struct_access, "1.1.2", "a42e6ceedd9b9ea090ee94a6da089d56e16f374dbbc010c3eebdf8be17df286f", [:mix], [], "hexpm", "e4c411dcc0226081b95709909551fc92b8feb1a3476108348ea7e3f6c12e586a"},
   "sweet_xml": {:hex, :sweet_xml, "0.7.3", "debb256781c75ff6a8c5cbf7981146312b66f044a2898f453709a53e5031b45b", [:mix], [], "hexpm", "e110c867a1b3fe74bfc7dd9893aa851f0eed5518d0d7cad76d7baafd30e4f5ba"},
-  "swoosh": {:hex, :swoosh, "1.8.1", "b1694d57c01852f50f7d4e6a74f5d119b2d8722d6a82f7288703c3e448ddbbf8", [:mix], [{:cowboy, "~> 1.1 or ~> 2.4", [hex: :cowboy, repo: "hexpm", optional: true]}, {:ex_aws, "~> 2.1", [hex: :ex_aws, repo: "hexpm", optional: true]}, {:finch, "~> 0.6", [hex: :finch, repo: "hexpm", optional: true]}, {:gen_smtp, "~> 0.13 or ~> 1.0", [hex: :gen_smtp, repo: "hexpm", optional: true]}, {:hackney, "~> 1.9", [hex: :hackney, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}, {:mail, "~> 0.2", [hex: :mail, repo: "hexpm", optional: true]}, {:mime, "~> 1.1 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}, {:plug_cowboy, ">= 1.0.0", [hex: :plug_cowboy, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4.2 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "e64a93d71d1e1e32db681cf7870697495c9cb2df4a5484f4d91ded326ccd3cbb"},
+  "swoosh": {:hex, :swoosh, "1.8.2", "af9a22ab2c0d20b266f61acca737fa11a121902de9466a39e91bacdce012101c", [:mix], [{:cowboy, "~> 1.1 or ~> 2.4", [hex: :cowboy, repo: "hexpm", optional: true]}, {:ex_aws, "~> 2.1", [hex: :ex_aws, repo: "hexpm", optional: true]}, {:finch, "~> 0.6", [hex: :finch, repo: "hexpm", optional: true]}, {:gen_smtp, "~> 0.13 or ~> 1.0", [hex: :gen_smtp, repo: "hexpm", optional: true]}, {:hackney, "~> 1.9", [hex: :hackney, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}, {:mail, "~> 0.2", [hex: :mail, repo: "hexpm", optional: true]}, {:mime, "~> 1.1 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}, {:plug_cowboy, ">= 1.0.0", [hex: :plug_cowboy, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4.2 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "d058ba750eafadb6c09a84a352c14c5d1eeeda6e84945fcc95785b7f3067b7db"},
   "telemetry": {:hex, :telemetry, "1.1.0", "a589817034a27eab11144ad24d5c0f9fab1f58173274b1e9bae7074af9cbee51", [:rebar3], [], "hexpm", "b727b2a1f75614774cff2d7565b64d0dfa5bd52ba517f16543e6fc7efcc0df48"},
   "tesla": {:hex, :tesla, "1.4.4", "bb89aa0c9745190930366f6a2ac612cdf2d0e4d7fff449861baa7875afd797b2", [:mix], [{:castore, "~> 0.1", [hex: :castore, repo: "hexpm", optional: true]}, {:exjsx, ">= 3.0.0", [hex: :exjsx, repo: "hexpm", optional: true]}, {:finch, "~> 0.3", [hex: :finch, repo: "hexpm", optional: true]}, {:fuse, "~> 2.4", [hex: :fuse, repo: "hexpm", optional: true]}, {:gun, "~> 1.3", [hex: :gun, repo: "hexpm", optional: true]}, {:hackney, "~> 1.6", [hex: :hackney, repo: "hexpm", optional: true]}, {:ibrowse, "4.4.0", [hex: :ibrowse, repo: "hexpm", optional: true]}, {:jason, ">= 1.0.0", [hex: :jason, repo: "hexpm", optional: true]}, {:mime, "~> 1.0 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}, {:mint, "~> 1.0", [hex: :mint, repo: "hexpm", optional: true]}, {:poison, ">= 1.0.0", [hex: :poison, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: true]}], "hexpm", "d5503a49f9dec1b287567ea8712d085947e247cb11b06bc54adb05bfde466457"},
   "timex": {:hex, :timex, "3.7.9", "790cdfc4acfce434e442f98c02ea6d84d0239073bfd668968f82ac63e9a6788d", [:mix], [{:combine, "~> 0.10", [hex: :combine, repo: "hexpm", optional: false]}, {:gettext, "~> 0.10", [hex: :gettext, repo: "hexpm", optional: false]}, {:tzdata, "~> 1.1", [hex: :tzdata, repo: "hexpm", optional: false]}], "hexpm", "64691582e5bb87130f721fc709acfb70f24405833998fabf35be968984860ce1"},
-  "tz_world": {:hex, :tz_world, "1.1.0", "af078ccbc63b618912d05a18402abf450252535a086e5a5e5189b54b710e5653", [:mix], [{:castore, "~> 0.1", [hex: :castore, repo: "hexpm", optional: true]}, {:certifi, "~> 2.5", [hex: :certifi, repo: "hexpm", optional: true]}, {:geo, "~> 1.0 or ~> 2.0 or ~> 3.3", [hex: :geo, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "8e0a89a8e00968e0260f3176cab03c8960393cc10990ad10622d9eceb7ccfbe6"},
+  "tz_world": {:hex, :tz_world, "1.2.0", "74ae7ef660a70ab35a25af4dfba46b1354fc904eb5da9b2464151cf885fc1a2c", [:mix], [{:castore, "~> 0.1", [hex: :castore, repo: "hexpm", optional: true]}, {:certifi, "~> 2.5", [hex: :certifi, repo: "hexpm", optional: true]}, {:geo, "~> 1.0 or ~> 2.0 or ~> 3.3", [hex: :geo, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "3cdd255f0a96942496a9edf61c86976a07fa6c0552ad287604c282b9bc1d9cf8"},
   "tzdata": {:hex, :tzdata, "1.1.1", "20c8043476dfda8504952d00adac41c6eda23912278add38edc140ae0c5bcc46", [:mix], [{:hackney, "~> 1.17", [hex: :hackney, repo: "hexpm", optional: false]}], "hexpm", "a69cec8352eafcd2e198dea28a34113b60fdc6cb57eb5ad65c10292a6ba89787"},
   "ueberauth": {:hex, :ueberauth, "0.10.3", "4a3bd7ab7b5d93d301d264f0f6858392654ee92171f4437d067d1ae227c051d9", [:mix], [{:plug, "~> 1.5", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "1394f36a6c64e97f2038cf95228e7e52b4cb75417962e30418fbe9902b30e6d3"},
   "ueberauth_cas": {:hex, :ueberauth_cas, "2.3.1", "df45a1f2c5df8bc80191cbca4baeeed808d697702ec5ebe5bd5d5a264481752f", [:mix], [{:httpoison, "~> 1.8", [hex: :httpoison, repo: "hexpm", optional: false]}, {:sweet_xml, "~> 0.7", [hex: :sweet_xml, repo: "hexpm", optional: false]}, {:ueberauth, "~> 0.6", [hex: :ueberauth, repo: "hexpm", optional: false]}], "hexpm", "5068ae2b9e217c2f05aa9a67483a6531e21ba0be9a6f6c8749bb7fd1599be321"},

test/service/date_time/date_time_test.exs

@@ -10,31 +10,31 @@ defmodule Mobilizon.Service.DateTimeTest do
   describe "render a datetime to string" do
     test "standard datetime" do
       {:ok, datetime, _} = DateTime.from_iso8601(@datetime)
-      assert DateTimeTools.datetime_to_string(datetime) == "Jun 22, 2021, 3:25:29 PM"
+      assert DateTimeTools.datetime_to_string(datetime) == "Jun 22, 2021, 3:25:29 PM"
       assert DateTimeTools.datetime_to_string(datetime, "fr") == "22 juin 2021, 15:25:29"
 
       assert DateTimeTools.datetime_to_string(datetime, "fr", :long) ==
-               "22 juin 2021 à 15:25:29 UTC"
+               "22 juin 2021, 15:25:29 UTC"
     end
 
     test "non existing or loaded locale fallbacks to english" do
       {:ok, datetime, _} = DateTime.from_iso8601(@datetime)
 
-      assert DateTimeTools.datetime_to_string(datetime, "es") == "Jun 22, 2021, 3:25:29 PM"
+      assert DateTimeTools.datetime_to_string(datetime, "es") == "Jun 22, 2021, 3:25:29 PM"
     end
   end
 
   describe "render a time to string" do
     test "standard time" do
       {:ok, datetime, _} = DateTime.from_iso8601(@datetime)
-      assert DateTimeTools.datetime_to_time_string(datetime) == "3:25 PM"
+      assert DateTimeTools.datetime_to_time_string(datetime) == "3:25 PM"
       assert DateTimeTools.datetime_to_time_string(datetime, "fr") == "15:25"
     end
 
     test "non existing or loaded locale fallbacks to english" do
       {:ok, datetime, _} = DateTime.from_iso8601(@datetime)
 
-      assert DateTimeTools.datetime_to_time_string(datetime, "pl") == "3:25 PM"
+      assert DateTimeTools.datetime_to_time_string(datetime, "pl") == "3:25 PM"
     end
   end