Merge branch 'fixes' into 'main'

Various fixes

See merge request framasoft/mobilizon!1262

.gitlab-ci.yml

@@ -144,26 +144,32 @@ vitest:
         - js/junit.xml
     expire_in: 30 days
 
-# cypress:
+e2e:
-#   stage: test
+  stage: test
-#   services:
+  services:
-#     - name: postgis/postgis:13.3
+    - name: postgis/postgis:14-3.2
-#       alias: postgres
+      alias: postgres
-#   variables:
+  variables:
-#     MIX_ENV=e2e
+    MIX_ENV: "e2e"
-#   script:
+  before_script:
-#     - mix ecto.create
+    - mix deps.get
-#     - mix ecto.migrate
+    - mix ecto.create
-#     - mix run priv/repo/e2e.seed.exs
+    - mix ecto.migrate
-#     - mix phx.server &
+    - mix run priv/repo/e2e.seed.exs
-#     - cd js
+    - cd js && yarn run build && npx playwright install && cd ../
-#     - npx wait-on http://localhost:4000
+    - mix phx.digest
-#     - if [ -z "$CYPRESS_KEY" ]; then npx cypress run; else npx cypress run --record --parallel --key $CYPRESS_KEY; fi
+  script:
-#   artifacts:
+    - mix phx.server &
-#     expire_in: 2 day
+    - cd js
-#     paths:
+    - npx wait-on http://localhost:4000
-#       - js/tests/e2e/screenshots/**/*.png
+    - npx playwright test --project $BROWSER
-#       - js/tests/e2e/videos/**/*.mp4
+  parallel:
+    matrix:
+      - BROWSER: ['firefox', 'chromium']
+  artifacts:
+    expire_in: 2 days
+    paths:
+      - js/playwright-report
 
 pages:
   stage: deploy

config/e2e.exs

@@ -19,19 +19,39 @@ config :mobilizon, Mobilizon.Web.Endpoint,
     yarn: [cd: Path.expand("../js", __DIR__)]
   ]
 
-require Logger
+config :vite_phx,
+  release_app: :mobilizon,
+  # Hard code :prod as an environment as :e2e will not be recongnized
+  environment: :prod,
+  vite_manifest: "priv/static/manifest.json",
+  phx_manifest: "priv/static/cache_manifest.json",
+  dev_server_address: "http://localhost:5173"
 
-cond do
+config :mobilizon, :instance,
-  System.get_env("INSTANCE_CONFIG") &&
+  name: "E2E Testing instance",
-      File.exists?("./config/#{System.get_env("INSTANCE_CONFIG")}") ->
+  description: "E2E is safety",
-    import_config System.get_env("INSTANCE_CONFIG")
+  hostname: "mobilizon1.com",
+  registrations_open: true,
+  registration_email_denylist: ["gmail.com", "deny@tcit.fr"],
+  demo: false,
+  default_language: "en",
+  allow_relay: true,
+  federating: true,
+  email_from: "mobilizon@mobilizon1.com",
+  email_reply_to: nil,
+  enable_instance_feeds: true,
+  koena_connect_link: true,
+  extra_categories: [
+    %{
+      id: :something_else,
+      label: "Quelque chose d'autre"
+    }
+  ]
 
-  System.get_env("DOCKER", "false") == "false" && File.exists?("./config/e2e.secret.exs") ->
+config :mobilizon, Mobilizon.Storage.Repo,
-    import_config "e2e.secret.exs"
+  adapter: Ecto.Adapters.Postgres,
-
+  username: System.get_env("MOBILIZON_DATABASE_USERNAME", "mobilizon_e2e"),
-  System.get_env("DOCKER", "false") == "true" ->
+  password: System.get_env("MOBILIZON_DATABASE_PASSWORD", "mobilizon_e2e"),
-    Logger.info("Using environment configuration for Docker")
+  database: System.get_env("MOBILIZON_DATABASE_DBNAME", "mobilizon_e2e"),
-
+  hostname: System.get_env("MOBILIZON_DATABASE_HOST", "localhost"),
-  true ->
+  port: System.get_env("MOBILIZON_DATABASE_PORT") || "5432"
-    Logger.error("No configuration file found")
-end

js/.gitignore

@@ -2,8 +2,6 @@
 node_modules
 /dist
 
-/tests/e2e/videos/
-/tests/e2e/screenshots/
 /coverage
 stats.html
 

js/README.md

@@ -1,41 +0,0 @@
-# mobilizon
-
-## Project setup
-
-```
-yarn install
-```
-
-### Compiles and hot-reloads for development
-
-```
-yarn serve
-```
-
-### Compiles and minifies for production
-
-```
-yarn build
-```
-
-### Run your unit tests
-
-```
-yarn test:unit
-```
-
-### Run your end-to-end tests
-
-```
-yarn test:e2e
-```
-
-### Lints and fixes files
-
-```
-yarn lint
-```
-
-### Customize configuration
-
-See [Configuration Reference](https://cli.vuejs.org/config/).

js/cypress.json

@@ -1,7 +0,0 @@
-{
-  "pluginsFile": "tests/e2e/plugins/index.js",
-  "projectId": "86dpkx",
-  "baseUrl": "http://localhost:4000",
-  "viewportWidth": 1920,
-  "viewportHeight": 1080
-}

js/playwright.config.ts

@@ -13,7 +13,7 @@ import { devices } from "@playwright/test";
 const config: PlaywrightTestConfig = {
   testDir: "./tests/e2e",
   /* Maximum time one test can run for. */
-  timeout: 30 * 1000,
+  timeout: 10 * 1000,
   expect: {
     /**
      * Maximum time expect() should wait for the condition to be met.
@@ -36,7 +36,7 @@ const config: PlaywrightTestConfig = {
     /* Maximum time each action such as `click()` can take. Defaults to 0 (no limit). */
     actionTimeout: 0,
     /* Base URL to use in actions like `await page.goto('/')`. */
-    baseURL: "http://localhost:4005",
+    baseURL: "http://localhost:4000",
 
     /* Collect trace when retrying the failed test. See https://playwright.dev/docs/trace-viewer */
     trace: "on-first-retry",

js/src/App.vue

@@ -57,13 +57,17 @@ import {
 } from "vue";
 import { LocationType } from "@/types/user-location.model";
 import { useMutation, useQuery } from "@vue/apollo-composable";
-import { initializeCurrentActor } from "@/utils/identity";
+import {
+  initializeCurrentActor,
+  NoIdentitiesException,
+} from "@/utils/identity";
 import { useI18n } from "vue-i18n";
 import { Snackbar } from "@/plugins/snackbar";
 import { Notifier } from "@/plugins/notifier";
 import { CONFIG } from "@/graphql/config";
 import { IConfig } from "@/types/config.model";
 import { useRouter } from "vue-router";
+import RouteName from "@/router/name";
 
 const { result: configResult } = useQuery<{ config: IConfig }>(CONFIG);
 
@@ -130,7 +134,19 @@ interval.value = setInterval(async () => {
 
 onBeforeMount(async () => {
   if (initializeCurrentUser()) {
-    await initializeCurrentActor();
+    try {
+      await initializeCurrentActor();
+    } catch (err) {
+      if (err instanceof NoIdentitiesException) {
+        await router.push({
+          name: RouteName.REGISTER_PROFILE,
+          params: {
+            email: localStorage.getItem(AUTH_USER_EMAIL),
+            userAlreadyActivated: "true",
+          },
+        });
+      }
+    }
   }
 });
 

js/src/components/Event/EventCard.vue

@@ -26,13 +26,13 @@
             variant="info"
             v-if="event.status === EventStatus.TENTATIVE"
           >
-            {{ $t("Tentative") }}
+            {{ t("Tentative") }}
           </mobilizon-tag>
           <mobilizon-tag
             variant="danger"
             v-if="event.status === EventStatus.CANCELLED"
           >
-            {{ $t("Cancelled") }}
+            {{ t("Cancelled") }}
           </mobilizon-tag>
           <router-link
             :to="{ name: RouteName.TAG, params: { tag: tag.title } }"
@@ -100,24 +100,40 @@
               v-else-if="event.options && event.options.isOnline"
             >
               <Video />
-              <span class="ltr:pl-2 rtl:pr-2">{{ $t("Online") }}</span>
+              <span class="ltr:pl-2 rtl:pr-2">{{ t("Online") }}</span>
             </div>
             <div
               class="mt-1 no-underline gap-1 items-center hidden"
               :class="{ 'sm:flex': mode === 'row' }"
-              v-if="event.tags || event.status !== EventStatus.CONFIRMED"
+              v-if="
+                event.tags ||
+                event.status !== EventStatus.CONFIRMED ||
+                event.participantStats?.participant > 0
+              "
             >
+              <mobilizon-tag
+                variant="info"
+                v-if="event.participantStats?.participant > 0"
+              >
+                {{
+                  t(
+                    "{count} participants",
+                    event.participantStats?.participant,
+                    { count: event.participantStats?.participant }
+                  )
+                }}
+              </mobilizon-tag>
               <mobilizon-tag
                 variant="info"
                 v-if="event.status === EventStatus.TENTATIVE"
               >
-                {{ $t("Tentative") }}
+                {{ t("Tentative") }}
               </mobilizon-tag>
               <mobilizon-tag
                 variant="danger"
                 v-if="event.status === EventStatus.CANCELLED"
               >
-                {{ $t("Cancelled") }}
+                {{ t("Cancelled") }}
               </mobilizon-tag>
               <router-link
                 :to="{ name: RouteName.TAG, params: { tag: tag.title } }"
@@ -156,6 +172,9 @@ import Video from "vue-material-design-icons/Video.vue";
 import { formatDateTimeForEvent } from "@/utils/datetime";
 import type { Locale } from "date-fns";
 import LinkOrRouterLink from "../core/LinkOrRouterLink.vue";
+import { useI18n } from "vue-i18n";
+
+const { t } = useI18n({ useScope: "global" });
 
 const props = withDefaults(
   defineProps<{

js/src/components/NavBar.vue

@@ -406,11 +406,11 @@ watch(identities, () => {
   // If we don't have any identities, the user has validated their account,
   // is logging for the first time but didn't create an identity somehow
   if (identities.value && identities.value.length === 0) {
-    console.debug(
+    console.warn(
       "We have no identities listed for current user",
       identities.value
     );
-    console.debug("Pushing route to REGISTER_PROFILE");
+    console.info("Pushing route to REGISTER_PROFILE");
     router.push({
       name: RouteName.REGISTER_PROFILE,
       params: {

js/src/components/TagElement.vue

@@ -1,6 +1,6 @@
 <template>
   <span
-    class="rounded-md my-1 truncate text-sm text-violet-title px-2 py-1"
+    class="rounded-md truncate text-sm text-violet-title px-2 py-1"
     :class="[
       typeClasses,
       capitalize,

js/src/composition/apollo/user.ts

@@ -66,15 +66,7 @@ export async function updateLocale(locale: string) {
   }));
 }
 
-export function registerAccount(
+export function registerAccount() {
-  variables: {
-    preferredUsername: string;
-    name: string;
-    summary: string;
-    email: string;
-  },
-  userAlreadyActivated: boolean
-) {
   return useMutation<
     { registerPerson: IPerson },
     {
@@ -84,12 +76,12 @@ export function registerAccount(
       email: string;
     }
   >(REGISTER_PERSON, () => ({
-    variables,
     update: (
       store: ApolloCache<{ registerPerson: IPerson }>,
-      { data: localData }: FetchResult
+      { data: localData }: FetchResult,
+      { context }
     ) => {
-      if (userAlreadyActivated) {
+      if (context?.userAlreadyActivated) {
         const identitiesData = store.readQuery<{ identities: IPerson[] }>({
           query: IDENTITIES,
         });

js/src/graphql/search.ts

@@ -38,6 +38,9 @@ export const SEARCH_EVENTS_AND_GROUPS = gql`
     $eventPage: Int
     $groupPage: Int
     $limit: Int
+    $sortByEvents: SearchEventSortOptions
+    $sortByGroups: SearchGroupSortOptions
+    $boostLanguages: [String]
   ) {
     searchEvents(
       location: $location
@@ -55,6 +58,8 @@ export const SEARCH_EVENTS_AND_GROUPS = gql`
       zoom: $zoom
       page: $eventPage
       limit: $limit
+      sortBy: $sortByEvents
+      boostLanguages: $boostLanguages
     ) {
       total
       elements {
@@ -80,6 +85,9 @@ export const SEARCH_EVENTS_AND_GROUPS = gql`
         attributedTo {
           ...ActorFragment
         }
+        participantStats {
+          participant
+        }
         options {
           isOnline
         }
@@ -96,6 +104,8 @@ export const SEARCH_EVENTS_AND_GROUPS = gql`
       zoom: $zoom
       page: $groupPage
       limit: $limit
+      sortBy: $sortByGroups
+      boostLanguages: $boostLanguages
     ) {
       total
       elements {

js/src/router/user.ts

@@ -28,7 +28,7 @@ export const userRoutes: RouteRecordRaw[] = [
     beforeEnter: beforeRegisterGuard,
   },
   {
-    path: "/register/profile",
+    path: "/register/profile/:email/:userAlreadyActivated?",
     name: UserRouteName.REGISTER_PROFILE,
     component: (): Promise<any> => import("@/views/Account/RegisterView.vue"),
     // We can only pass string values through params, therefore

js/src/utils/identity.ts

@@ -11,7 +11,7 @@ import { computed, watch } from "vue";
 
 export class NoIdentitiesException extends Error {}
 
-export function saveActorData(obj: IPerson): void {
+function saveActorData(obj: IPerson): void {
   localStorage.setItem(AUTH_USER_ACTOR_ID, `${obj.id}`);
 }
 

js/src/views/Account/RegisterView.vue

@@ -1,120 +1,127 @@
 <template>
-  <section class="container mx-auto">
+  <section class="container mx-auto max-w-screen-sm">
-    <div class="">
+    <h1 class="text-2xl" v-if="userAlreadyActivated">
-      <div class="">
+      {{ t("Congratulations, your account is now created!") }}
-        <h1 class="text-2xl" v-if="userAlreadyActivated">
+    </h1>
-          {{ $t("Congratulations, your account is now created!") }}
+    <h1 class="text-2xl" v-else>
-        </h1>
+      {{
-        <h1 class="text-2xl" v-else>
+        t("Register an account on {instanceName}!", {
+          instanceName,
+        })
+      }}
+    </h1>
+    <p class="prose dark:prose-invert" v-if="userAlreadyActivated">
+      {{ t("Now, create your first profile:") }}
+    </p>
+    <form v-if="!validationSent" @submit.prevent="submit">
+      <o-notification variant="danger" v-if="errors.extra">
+        {{ errors.extra }}
+      </o-notification>
+
+      <o-field :label="t('Displayed nickname')" labelFor="identityName">
+        <o-input
+          aria-required="true"
+          required
+          v-model="identity.name"
+          id="identityName"
+          @input="autoUpdateUsername"
+        />
+      </o-field>
+
+      <o-field
+        :label="t('Username')"
+        :variant="errors.preferred_username ? 'danger' : null"
+        :message="errors.preferred_username"
+        labelFor="identityPreferredUsername"
+      >
+        <o-field
+          :message="
+            t(
+              'Only alphanumeric lowercased characters and underscores are supported.'
+            )
+          "
+        >
+          <o-input
+            aria-required="true"
+            required
+            expanded
+            id="identityPreferredUsername"
+            v-model="identity.preferredUsername"
+            :validation-message="
+              identity.preferredUsername
+                ? t(
+                    'Only alphanumeric lowercased characters and underscores are supported.'
+                  )
+                : null
+            "
+          />
+          <p class="control">
+            <span class="button">@{{ host }}</span>
+          </p>
+        </o-field>
+      </o-field>
+      <p class="prose dark:prose-invert">
+        {{
+          t(
+            "This identifier is unique to your profile. It allows others to find you."
+          )
+        }}
+      </p>
+
+      <o-field :label="t('Short bio')" labelFor="identitySummary">
+        <o-input
+          type="textarea"
+          maxlength="100"
+          rows="2"
+          id="identitySummary"
+          v-model="identity.summary"
+        />
+      </o-field>
+
+      <p class="prose dark:prose-invert">
+        {{
+          t(
+            "You will be able to add an avatar and set other options in your account settings."
+          )
+        }}
+      </p>
+
+      <p class="text-center">
+        <o-button
+          variant="primary"
+          size="large"
+          native-type="submit"
+          :disabled="sendingValidation"
+          >{{ t("Create my profile") }}</o-button
+        >
+      </p>
+    </form>
+
+    <div v-if="validationSent && !userAlreadyActivated">
+      <o-notification variant="success" :closable="false">
+        <h2 class="title">
           {{
-            $t("Register an account on {instanceName}!", {
+            t("Your account is nearly ready, {username}", {
-              instanceName,
+              username: identity.name ?? identity.preferredUsername,
             })
           }}
-        </h1>
+        </h2>
-        <p class="prose dark:prose-invert" v-if="userAlreadyActivated">
+        <i18n-t keypath="A validation email was sent to {email}" tag="p">
-          {{ $t("Now, create your first profile:") }}
+          <template #email>
+            <code>{{ email }}</code>
+          </template>
+        </i18n-t>
+        <p>
+          {{
+            t(
+              "Before you can login, you need to click on the link inside it to validate your account."
+            )
+          }}
         </p>
-        <form v-if="!validationSent" @submit.prevent="submit">
+        <o-button tag="router-link" :to="{ name: RouteName.HOME }">{{
-          <o-field :label="$t('Displayed nickname')">
+          t("Back to homepage")
-            <o-input
+        }}</o-button>
-              aria-required="true"
+      </o-notification>
-              required
-              v-model="identity.name"
-              @input="autoUpdateUsername"
-            />
-          </o-field>
-
-          <o-field
-            :label="$t('Username')"
-            :type="errors.preferred_username ? 'is-danger' : null"
-            :message="errors.preferred_username"
-          >
-            <o-field
-              :message="
-                $t(
-                  'Only alphanumeric lowercased characters and underscores are supported.'
-                )
-              "
-            >
-              <o-input
-                aria-required="true"
-                required
-                expanded
-                v-model="identity.preferredUsername"
-                :validation-message="
-                  identity.preferredUsername
-                    ? $t(
-                        'Only alphanumeric lowercased characters and underscores are supported.'
-                      )
-                    : null
-                "
-              />
-              <p class="control">
-                <span class="button is-static">@{{ host }}</span>
-              </p>
-            </o-field>
-          </o-field>
-          <p class="description">
-            {{
-              $t(
-                "This identifier is unique to your profile. It allows others to find you."
-              )
-            }}
-          </p>
-
-          <o-field :label="$t('Short bio')">
-            <o-input
-              type="textarea"
-              maxlength="100"
-              rows="2"
-              v-model="identity.summary"
-            />
-          </o-field>
-
-          <p class="prose dark:prose-invert">
-            {{
-              $t(
-                "You will be able to add an avatar and set other options in your account settings."
-              )
-            }}
-          </p>
-
-          <p class="control has-text-centered">
-            <o-button
-              variant="primary"
-              size="large"
-              native-type="submit"
-              :disabled="sendingValidation"
-              >{{ $t("Create my profile") }}</o-button
-            >
-          </p>
-        </form>
-
-        <div v-if="validationSent && !userAlreadyActivated">
-          <o-notification variant="success" :closable="false">
-            <h2 class="title">
-              {{
-                $t("Your account is nearly ready, {username}", {
-                  username: identity.name ?? identity.preferredUsername,
-                })
-              }}
-            </h2>
-            <i18n-t keypath="A validation email was sent to {email}" tag="p">
-              <template #email>
-                <code>{{ email }}</code>
-              </template>
-            </i18n-t>
-            <p>
-              {{
-                $t(
-                  "Before you can login, you need to click on the link inside it to validate your account."
-                )
-              }}
-            </p>
-          </o-notification>
-        </div>
-      </div>
     </div>
   </section>
 </template>
@@ -173,61 +180,42 @@ const autoUpdateUsername = () => {
   identity.value.preferredUsername = convertToUsername(identity.value.name);
 };
 
+const { onDone, onError, mutate } = registerAccount();
+
+onDone(async ({ data }) => {
+  validationSent.value = true;
+  window.localStorage.setItem("new-registered-user", "yes");
+
+  if (data && props.userAlreadyActivated) {
+    await changeIdentity(data.registerPerson);
+
+    await router.push({ name: RouteName.HOME });
+  }
+});
+
+onError((err) => {
+  errors.value = err.graphQLErrors.reduce(
+    (acc: { [key: string]: string }, error: any) => {
+      acc[error.details ?? error.field ?? "extra"] = Array.isArray(
+        error.message
+      )
+        ? (error.message as string[]).join(",")
+        : error.message;
+      return acc;
+    },
+    {}
+  );
+  console.error("Error while registering person", err);
+  console.error("Errors while registering person", errors);
+  sendingValidation.value = false;
+});
+
 const submit = async (): Promise<void> => {
   sendingValidation.value = true;
   errors.value = {};
-  const { onDone, onError } = registerAccount(
+  mutate(
     { email: props.email, ...identity.value },
-    props.userAlreadyActivated
+    { context: { userAlreadyActivated: props.userAlreadyActivated } }
   );
-
-  onDone(async ({ data }) => {
-    validationSent.value = true;
-    window.localStorage.setItem("new-registered-user", "yes");
-
-    if (data && props.userAlreadyActivated) {
-      await changeIdentity(data.registerPerson);
-
-      await router.push({ name: RouteName.HOME });
-    }
-  });
-
-  onError((err) => {
-    errors.value = err.graphQLErrors.reduce(
-      (acc: { [key: string]: string }, error: any) => {
-        acc[error.details || error.field] = error.message;
-        return acc;
-      },
-      {}
-    );
-    console.error("Error while registering person", err);
-    console.error("Errors while registering person", errors);
-    sendingValidation.value = false;
-  });
 };
 </script>
-
-<style lang="scss" scoped>
-.avatar-enter-active {
-  transition: opacity 1s ease;
-}
-
-.avatar-enter,
-.avatar-leave-to {
-  opacity: 0;
-}
-
-.avatar-leave {
-  display: none;
-}
-
-.container .columns {
-  margin: 1rem auto 3rem;
-}
-
-p.description {
-  font-size: 0.9rem;
-  margin-bottom: 15px;
-  margin-top: -10px;
-}
-</style>

js/src/views/HomeView.vue

@@ -365,7 +365,12 @@ onMounted(() => {
 const router = useRouter();
 
 watch(loggedUser, (loggedUserValue) => {
-  if (loggedUserValue?.id && loggedUserValue?.settings === null) {
+  if (
+    loggedUserValue?.id &&
+    loggedUserValue?.settings === null &&
+    loggedUserValue.defaultActor?.id
+  ) {
+    console.info("No user settings, going to onboarding", loggedUserValue);
     router.push({
       name: RouteName.WELCOME_SCREEN,
       params: { step: "1" },

js/src/views/SearchView.vue

@@ -2,7 +2,7 @@
   <div class="max-w-4xl mx-auto">
     <SearchFields
       class="md:ml-10 mr-2"
-      v-model:search="searchDebounced"
+      v-model:search="search"
       v-model:location="location"
       :locationDefaultText="locationName"
     />
@@ -736,13 +736,26 @@ enum ViewMode {
   MAP = "map",
 }
 
+enum EventSortValues {
+  MATCH_DESC = "MATCH_DESC",
+  START_TIME_DESC = "START_TIME_DESC",
+  CREATED_AT_DESC = "CREATED_AT_DESC",
+  CREATED_AT_ASC = "CREATED_AT_ASC",
+  PARTICIPANT_COUNT_DESC = "PARTICIPANT_COUNT_DESC",
+}
+
+enum GroupSortValues {
+  MATCH_DESC = "MATCH_DESC",
+  MEMBER_COUNT_DESC = "MEMBER_COUNT_DESC",
+}
+
 enum SortValues {
-  MATCH_DESC = "-match",
+  MATCH_DESC = "MATCH_DESC",
-  START_TIME_DESC = "-startTime",
+  START_TIME_DESC = "START_TIME_DESC",
-  CREATED_AT_DESC = "-createdAt",
+  CREATED_AT_DESC = "CREATED_AT_DESC",
-  CREATED_AT_ASC = "createdAt",
+  CREATED_AT_ASC = "CREATED_AT_ASC",
-  PARTICIPANT_COUNT_DESC = "-participantCount",
+  PARTICIPANT_COUNT_DESC = "PARTICIPANT_COUNT_DESC",
-  MEMBER_COUNT_DESC = "-memberCount",
+  MEMBER_COUNT_DESC = "MEMBER_COUNT_DESC",
 }
 
 const arrayTransformer: RouteQueryTransformer<string[]> = {
@@ -1121,6 +1134,27 @@ watch(isOnline, (newIsOnline) => {
   }
 });
 
+const sortByForType = (
+  value: SortValues,
+  allowed: typeof EventSortValues | typeof GroupSortValues
+): SortValues | undefined => {
+  return Object.values(allowed).includes(value) ? value : undefined;
+};
+
+const boostLanguagesQuery = computed((): string[] => {
+  const languages = new Set<string>();
+
+  for (const completeLanguage of navigator.languages) {
+    const language = completeLanguage.split("-")[0];
+
+    if (Object.keys(langs).find((langKey) => langKey === language)) {
+      languages.add(language);
+    }
+  }
+
+  return Array.from(languages);
+});
+
 const { result: searchElementsResult, loading: searchLoading } = useQuery<{
   searchEvents: Paginate<TypeNamed<IEvent>>;
   searchGroups: Paginate<TypeNamed<IGroup>>;
@@ -1139,7 +1173,10 @@ const { result: searchElementsResult, loading: searchLoading } = useQuery<{
   statusOneOf: statusOneOf.value,
   languageOneOf: languageOneOf.value,
   searchTarget: searchTarget.value,
-  bbox: bbox.value,
+  bbox: mode.value === ViewMode.MAP ? bbox.value : undefined,
   zoom: zoom.value,
+  sortByEvents: sortByForType(sortBy.value, EventSortValues),
+  sortByGroups: sortByForType(sortBy.value, GroupSortValues),
+  boostLanguages: boostLanguagesQuery.value,
 }));
 </script>

js/src/views/User/RegisterView.vue

@@ -91,7 +91,7 @@
         <form @submit.prevent="submit">
           <o-field
             :label="t('Email')"
-            :type="errorEmailType"
+            :variant="errorEmailType"
             :message="errorEmailMessage"
             label-for="email"
           >

js/tests/e2e/login.spec.ts

@@ -25,17 +25,17 @@ test("Login has everything we need", async ({ page }) => {
 
   await forgotPasswordLink.click();
   await page.waitForURL("/password-reset/send");
-  await expect(page.url()).toContain("/password-reset/send");
+  expect(page.url()).toContain("/password-reset/send");
   await page.goBack();
 
   await reAskInstructionsLink.click();
   await page.waitForURL("/resend-instructions");
-  await expect(page.url()).toContain("/resend-instructions");
+  expect(page.url()).toContain("/resend-instructions");
   await page.goBack();
 
   await registerLink.click();
   await page.waitForURL("/register/user");
-  await expect(page.url()).toContain("/register/user");
+  expect(page.url()).toContain("/register/user");
   await page.goBack();
 });
 
@@ -59,8 +59,8 @@ test("Login rejects unknown users properly", async ({ page }) => {
 test("Tries to login with valid credentials", async ({ page, context }) => {
   await page.goto("/login");
 
-  await page.locator("#email").fill("user@provider.org");
+  await page.locator("#email").fill("user@email.com");
-  await page.locator("#password").fill("valid_passw0rd");
+  await page.locator("#password").fill("some password");
 
   const loginButton = page.locator("form button", { hasText: "Login" });
 
@@ -68,6 +68,103 @@ test("Tries to login with valid credentials", async ({ page, context }) => {
 
   await loginButton.click();
   await page.waitForURL("/");
-  await expect(new URL(page.url()).pathname).toBe("/");
+  expect(new URL(page.url()).pathname).toBe("/");
-  expect((await context.storageState()).origins[0].localStorage).toBe("toto");
+  const localStorage = (
+    await context.storageState()
+  ).origins[0].localStorage.reduce((acc: Record<string, string>, elem) => {
+    acc[elem.name] = elem.value;
+    return acc;
+  }, {});
+  expect(localStorage["auth-user-role"]).toBe("USER");
+  expect(localStorage["auth-access-token"]).toBeDefined();
+  expect(localStorage["auth-refresh-token"]).toBeDefined();
+  expect(localStorage["auth-user-email"]).toBe("user@email.com");
+  // Changes each run
+  // expect(localStorage["auth-user-id"]).toBe("3");
+  // Doesn't work in Chrome for some reason
+  // expect(localStorage['auth-user-actor-id']).toBe('2');
+});
+
+test("Tries to login with valid credentials but unconfirmed account", async ({
+  page,
+}) => {
+  await page.goto("/login");
+  await page.locator("#email").fill("unconfirmed@email.com");
+  await page.locator("#password").fill("some password");
+  await page.keyboard.press("Enter");
+
+  await expect(page.locator(".notification-danger")).toHaveText(
+    "User not found"
+  );
+});
+
+test("Tries to login with valid credentials, confirmed account but no profile", async ({
+  page,
+}) => {
+  await page.goto("/login");
+  await page.locator("#email").fill("confirmed@email.com");
+  await page.locator("#password").fill("some password");
+  await page.keyboard.press("Enter");
+
+  await page.waitForURL("/register/profile/confirmed@email.com/true");
+  expect(page.url()).toContain("/register/profile/confirmed@email.com/true");
+
+  await expect(page.locator("p.prose").first()).toHaveText(
+    "Now, create your first profile:"
+  );
+
+  const displayNameField = page.locator("form > .field").first();
+  await expect(displayNameField.locator("label")).toHaveText(
+    "Displayed nickname"
+  );
+  const displayNameInput = displayNameField.locator("input");
+  await displayNameInput.fill("Duplicate");
+
+  const usernameField = page.locator("form > .field").nth(1);
+  await expect(usernameField.locator("label")).toHaveText("Username");
+  const usernameFieldInput = usernameField.locator("input");
+  await usernameFieldInput.fill("test_user");
+
+  const descriptionField = page.locator("form > .field").nth(2);
+  await expect(descriptionField.locator("label")).toHaveText("Short bio");
+  await descriptionField
+    .locator("textarea")
+    .fill("This shouln't work because it's using a dupublicated username");
+
+  const submitButton = page.locator('button[type="submit"]', {
+    hasText: "Create my profile",
+  });
+  await submitButton.click();
+
+  await expect(page.locator("p.field-message-danger")).toHaveText(
+    "This username is already taken."
+  );
+
+  await displayNameInput.fill("");
+  await displayNameInput.fill("Not");
+
+  await usernameFieldInput.fill("");
+  await usernameFieldInput.fill("test_user_2");
+
+  await submitButton.click();
+
+  // cy.get("form .field input").first(0).clear().type("test_user_2");
+  // cy.get("form .field input").eq(1).type("Not");
+  // cy.get("form .field textarea").clear().type("This will now work");
+  // cy.get("form").submit();
+
+  // cy.get(".navbar-link span.icon i").should(
+  //   "have.class",
+  //   "mdi-account-circle"
+  // );
+
+  await page.waitForURL("/");
+  expect(page.url()).toContain("/");
+
+  await expect(page.locator(".notification-info")).toHaveText(
+    "Welcome to Mobilizon, Not!"
+  );
+  await expect(
+    page.locator("button#user-menu-button span:not(.sr-only)")
+  ).toHaveClass("material-design-icon account-circle-icon");
 });

js/tests/unit/specs/components/Post/__snapshots__/PostListItem.spec.ts.snap

@@ -30,7 +30,7 @@ exports[`PostListItem > renders post list item with tags 1`] = `
   <div class=\\"flex flex-col gap-1 bg-inherit p-2 rounded-lg flex-1\\" data-v-6ca7cc69=\\"\\">
     <h3 class=\\"text-xl color-violet-3 line-clamp-3 mb-2 font-bold\\" lang=\\"en\\" data-v-6ca7cc69=\\"\\">My Blog Post</h3>
     <p class=\\"flex gap-2\\" data-v-6ca7cc69=\\"\\"><span aria-hidden=\\"true\\" class=\\"material-design-icon clock-icon\\" role=\\"img\\" data-v-6ca7cc69=\\"\\"><svg fill=\\"currentColor\\" class=\\"material-design-icon__svg\\" width=\\"24\\" height=\\"24\\" viewBox=\\"0 0 24 24\\"><path d=\\"M12,2A10,10 0 0,0 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12A10,10 0 0,0 12,2M16.2,16.2L11,13V7H12.5V12.2L17,14.9L16.2,16.2Z\\"><!--v-if--></path></svg></span><span dir=\\"auto\\" class=\\"\\" data-v-6ca7cc69=\\"\\">Dec 2, 2020</span></p>
-    <div class=\\"flex flex-wrap gap-y-0 gap-x-2\\" data-v-6ca7cc69=\\"\\"><span aria-hidden=\\"true\\" class=\\"material-design-icon tag-icon\\" role=\\"img\\" data-v-6ca7cc69=\\"\\"><svg fill=\\"currentColor\\" class=\\"material-design-icon__svg\\" width=\\"24\\" height=\\"24\\" viewBox=\\"0 0 24 24\\"><path d=\\"M5.5,7A1.5,1.5 0 0,1 4,5.5A1.5,1.5 0 0,1 5.5,4A1.5,1.5 0 0,1 7,5.5A1.5,1.5 0 0,1 5.5,7M21.41,11.58L12.41,2.58C12.05,2.22 11.55,2 11,2H4C2.89,2 2,2.89 2,4V11C2,11.55 2.22,12.05 2.59,12.41L11.58,21.41C11.95,21.77 12.45,22 13,22C13.55,22 14.05,21.77 14.41,21.41L21.41,14.41C21.78,14.05 22,13.55 22,13C22,12.44 21.77,11.94 21.41,11.58Z\\"><!--v-if--></path></svg></span><span class=\\"rounded-md my-1 truncate text-sm text-violet-title px-2 py-1 bg-purple-3 dark:text-violet-3\\" data-v-6955ca87=\\"\\" data-v-6ca7cc69=\\"\\">A tag</span></div>
+    <div class=\\"flex flex-wrap gap-y-0 gap-x-2\\" data-v-6ca7cc69=\\"\\"><span aria-hidden=\\"true\\" class=\\"material-design-icon tag-icon\\" role=\\"img\\" data-v-6ca7cc69=\\"\\"><svg fill=\\"currentColor\\" class=\\"material-design-icon__svg\\" width=\\"24\\" height=\\"24\\" viewBox=\\"0 0 24 24\\"><path d=\\"M5.5,7A1.5,1.5 0 0,1 4,5.5A1.5,1.5 0 0,1 5.5,4A1.5,1.5 0 0,1 7,5.5A1.5,1.5 0 0,1 5.5,7M21.41,11.58L12.41,2.58C12.05,2.22 11.55,2 11,2H4C2.89,2 2,2.89 2,4V11C2,11.55 2.22,12.05 2.59,12.41L11.58,21.41C11.95,21.77 12.45,22 13,22C13.55,22 14.05,21.77 14.41,21.41L21.41,14.41C21.78,14.05 22,13.55 22,13C22,12.44 21.77,11.94 21.41,11.58Z\\"><!--v-if--></path></svg></span><span class=\\"rounded-md truncate text-sm text-violet-title px-2 py-1 bg-purple-3 dark:text-violet-3\\" data-v-6955ca87=\\"\\" data-v-6ca7cc69=\\"\\">A tag</span></div>
     <!--v-if-->
   </div>
 </a>"

lib/federation/activity_pub/types/actors.ex

@@ -1,6 +1,6 @@
 defmodule Mobilizon.Federation.ActivityPub.Types.Actors do
   @moduledoc false
-  alias Mobilizon.Actors
+  alias Mobilizon.{Actors, Instances}
   alias Mobilizon.Actors.{Actor, Follower, Member}
   alias Mobilizon.Federation.ActivityPub.{Actions, Audience, Permission, Relay}
   alias Mobilizon.Federation.ActivityPub.Types.Entity
@@ -204,7 +204,13 @@ defmodule Mobilizon.Federation.ActivityPub.Types.Actors do
   def follow(%Actor{} = follower_actor, %Actor{type: type} = followed, _local, additional)
       when type != :Person do
     case Mobilizon.Actors.follow(followed, follower_actor, additional["activity_id"], false) do
-      {:ok, %Follower{} = follower} ->
+      {:ok, %Follower{actor: %Actor{type: actor_type}} = follower} ->
+        # We refresh the instance materialized view to make sure the instance page will be available
+        # when the admin clicks on the email link and access it
+        if actor_type == :Application do
+          Instances.refresh()
+        end
+
         FollowMailer.send_notification_to_admins(follower)
         follower_as_data = Convertible.model_to_as(follower)
         approve_if_manually_approves_followers(follower, follower_as_data)

lib/graphql/resolvers/admin.ex

@@ -62,7 +62,7 @@ defmodule Mobilizon.GraphQL.Resolvers.Admin do
     Map.merge(map, %{actor: actor, id: id, inserted_at: inserted_at})
   end
 
-  @spec transform_action_log(module(), atom(), ActionLog.t()) :: map()
+  @spec transform_action_log(module(), atom(), ActionLog.t()) :: map() | nil
   defp transform_action_log(
          Report,
          :update,
@@ -132,6 +132,8 @@ defmodule Mobilizon.GraphQL.Resolvers.Admin do
     }
   end
 
+  defp transform_action_log(_, _, _), do: nil
+
   # Changes are stored as %{"key" => "value"} so we need to convert them back as struct
   @spec convert_changes_to_struct(module(), map()) :: struct()
   defp convert_changes_to_struct(struct, %{"report_id" => _report_id} = changes) do
@@ -464,6 +466,9 @@ defmodule Mobilizon.GraphQL.Resolvers.Admin do
     {:error, :unauthenticated}
   end
 
+  @spec get_instance(any, map(), Absinthe.Resolution.t()) ::
+          {:error, :unauthenticated | :unauthorized | :not_found}
+          | {:ok, Mobilizon.Instances.Instance.t()}
   def get_instance(_parent, %{domain: domain}, %{
         context: %{current_user: %User{role: role}}
       })
@@ -482,7 +487,10 @@ defmodule Mobilizon.GraphQL.Resolvers.Admin do
       followed_status: follow_status(local_relay, remote_relay)
     }
 
-    {:ok, Map.merge(Instances.instance(domain), result)}
+    case Instances.instance(domain) do
+      nil -> {:error, :not_found}
+      instance -> {:ok, Map.merge(instance, result)}
+    end
   end
 
   def get_instance(_parent, _args, %{context: %{current_user: %User{}}}) do

lib/graphql/resolvers/event.ex

@@ -183,7 +183,7 @@ defmodule Mobilizon.GraphQL.Resolvers.Event do
          stats.participant + stats.moderator + stats.administrator + stats.creator
        )}
     else
-      {:ok, %{participant: stats.participant}}
+      {:ok, %EventParticipantStats{participant: stats.participant}}
     end
   end
 

lib/graphql/schema/search.ex

@@ -25,6 +25,10 @@ defmodule Mobilizon.GraphQL.Schema.SearchType do
     field(:category, :event_category, description: "The event's category")
     field(:options, :event_options, description: "The event options")
 
+    field(:participant_stats, :participant_stats,
+      description: "Statistics on the event's participants"
+    )
+
     resolve_type(fn
       %Event{}, _ ->
         :event
@@ -54,6 +58,10 @@ defmodule Mobilizon.GraphQL.Schema.SearchType do
     field(:tags, list_of(:tag), description: "The event's tags")
     field(:category, :event_category, description: "The event's category")
     field(:options, :event_options, description: "The event options")
+
+    field(:participant_stats, :participant_stats,
+      description: "Statistics on the event's participants"
+    )
   end
 
   interface :group_search_result do
@@ -152,6 +160,19 @@ defmodule Mobilizon.GraphQL.Schema.SearchType do
     value(:global, description: "Search using the global fediverse search")
   end
 
+  enum :search_group_sort_options do
+    value(:match_desc, description: "The pertinence of the result")
+    value(:member_count_desc, description: "The members count of the group")
+  end
+
+  enum :search_event_sort_options do
+    value(:match_desc, description: "The pertinence of the result")
+    value(:start_time_desc, description: "The start date of the result")
+    value(:created_at_desc, description: "When the event was published")
+    value(:created_at_asc, description: "When the event was published")
+    value(:participant_count_desc, description: "With the most participants")
+  end
+
   object :search_queries do
     @desc "Search persons"
     field :search_persons, :persons do
@@ -184,6 +205,10 @@ defmodule Mobilizon.GraphQL.Schema.SearchType do
         description: "The list of languages this event can be in"
       )
 
+      arg(:boost_languages, list_of(:string),
+        description: "The user's languages that can benefit from a boost in search results"
+      )
+
       arg(:search_target, :search_target,
         default_value: :internal,
         description: "The target of the search (internal or global)"
@@ -195,6 +220,11 @@ defmodule Mobilizon.GraphQL.Schema.SearchType do
       arg(:page, :integer, default_value: 1, description: "Result page")
       arg(:limit, :integer, default_value: 10, description: "Results limit per page")
 
+      arg(:sort_by, :search_group_sort_options,
+        default_value: :match_desc,
+        description: "How to sort search results"
+      )
+
       resolve(&Search.search_groups/3)
     end
 
@@ -218,6 +248,10 @@ defmodule Mobilizon.GraphQL.Schema.SearchType do
         description: "The list of languages this event can be in"
       )
 
+      arg(:boost_languages, list_of(:string),
+        description: "The user's languages that can benefit from a boost in search results"
+      )
+
       arg(:search_target, :search_target,
         default_value: :internal,
         description: "The target of the search (internal or global)"
@@ -236,6 +270,11 @@ defmodule Mobilizon.GraphQL.Schema.SearchType do
       arg(:begins_on, :datetime, description: "Filter events by their start date")
       arg(:ends_on, :datetime, description: "Filter events by their end date")
 
+      arg(:sort_by, :search_event_sort_options,
+        default_value: :match_desc,
+        description: "How to sort search results"
+      )
+
       resolve(&Search.search_events/3)
     end
 

lib/mobilizon/events/events.ex

@@ -541,7 +541,7 @@ defmodule Mobilizon.Events do
     |> filter_draft()
     |> filter_local_or_from_followed_instances_events()
     |> filter_public_visibility()
-    |> event_order_begins_on_asc()
+    |> event_order(Map.get(args, :sort_by, :match_desc))
     |> Page.build_page(page, limit, :begins_on)
   end
 
@@ -1272,15 +1272,14 @@ defmodule Mobilizon.Events do
     end
   end
 
-  @spec events_for_search_query(String.t()) :: Ecto.Query.t()
+  # @spec events_for_search_query(String.t()) :: Ecto.Query.t()
-  defp events_for_search_query("") do
+  # defp events_for_search_query("") do
-    Event
+  #   Event
-    |> distinct([e], asc: e.begins_on, asc: e.id)
+  #   |> join: rank in fragment("")
-  end
+  # end
 
   defp events_for_search_query(search_string) do
     from(event in Event,
-      distinct: [asc: event.begins_on, asc: event.id],
       join: id_and_rank in matching_event_ids_and_ranks(search_string),
       on: id_and_rank.id == event.id
     )
@@ -1820,6 +1819,18 @@ defmodule Mobilizon.Events do
     |> event_order_begins_on_asc()
   end
 
+  defp event_order(query, :match_desc),
+    do: order_by(query, [e, f], desc: f.rank, asc: e.begins_on)
+
+  defp event_order(query, :start_time_desc), do: order_by(query, [e], asc: e.begins_on)
+  defp event_order(query, :created_at_desc), do: order_by(query, [e], desc: e.publish_at)
+  defp event_order(query, :created_at_asc), do: order_by(query, [e], asc: e.publish_at)
+
+  defp event_order(query, :participant_count_desc),
+    do: order_by(query, [e], fragment("participant_stats->>'participant' DESC"))
+
+  defp event_order(query, _), do: query
+
   defp event_order_begins_on_asc(query),
     do: order_by(query, [e], asc: e.begins_on)
 

lib/mobilizon/instances/instances.ex

@@ -67,7 +67,7 @@ defmodule Mobilizon.Instances do
     }
   end
 
-  @spec instance(String.t()) :: Instance.t()
+  @spec instance(String.t()) :: Instance.t() | nil
   def instance(domain) do
     Instance
     |> where(domain: ^domain)

lib/service/global_search/event_result.ex

@@ -13,7 +13,7 @@ defmodule Mobilizon.Service.GlobalSearch.EventResult do
     :category,
     :tags,
     :organizer_actor,
-    :participants,
+    :participant_stats,
     :physical_address
   ]
 end

lib/service/global_search/search_mobilizon.ex

@@ -15,6 +15,15 @@ defmodule Mobilizon.Service.GlobalSearch.SearchMobilizon do
   @search_events_api "/api/v1/search/events"
   @search_groups_api "/api/v1/search/groups"
 
+  @sort_by_options %{
+    match_desc: "-match",
+    start_time_desc: "-startTime",
+    created_at_desc: "-createdAt",
+    created_at_asc: "createdAt",
+    participant_count_desc: "-participantCount",
+    member_count_desc: "-memberCount"
+  }
+
   @behaviour Provider
 
   @impl Provider
@@ -39,9 +48,11 @@ defmodule Mobilizon.Service.GlobalSearch.SearchMobilizon do
           end),
         distance: if(options[:radius], do: "#{options[:radius]}_km", else: nil),
         count: options[:limit],
-        start: (options[:page] - 1) * options[:limit],
+        start: (Keyword.get(options, :page, 1) - 1) * Keyword.get(options, :limit, 16),
         latlon: to_lat_lon(options[:location]),
-        bbox: options[:bbox]
+        bbox: options[:bbox],
+        sortBy: Map.get(@sort_by_options, options[:sort_by]),
+        boostLanguages: options[:boost_languages]
       )
       |> Keyword.take([
         :search,
@@ -56,7 +67,8 @@ defmodule Mobilizon.Service.GlobalSearch.SearchMobilizon do
         :statusOneOf,
         :bbox,
         :start,
-        :count
+        :count,
+        :sortBy
       ])
       |> Keyword.reject(fn {_key, val} -> is_nil(val) end)
 
@@ -85,21 +97,25 @@ defmodule Mobilizon.Service.GlobalSearch.SearchMobilizon do
       |> Keyword.merge(
         term: options[:search],
         languageOneOf: options[:language_one_of],
+        boostLanguages: options[:boost_languages],
         distance: if(options[:radius], do: "#{options[:radius]}_km", else: nil),
         count: options[:limit],
         start: (options[:page] - 1) * options[:limit],
         latlon: to_lat_lon(options[:location]),
-        bbox: options[:bbox]
+        bbox: options[:bbox],
+        sortBy: Map.get(@sort_by_options, options[:sort_by])
       )
       |> Keyword.take([
         :search,
+        :languageOneOf,
         :boostLanguages,
         :latlon,
         :distance,
         :sort,
         :start,
         :count,
-        :bbox
+        :bbox,
+        :sortBy
       ])
       |> Keyword.reject(fn {_key, val} -> is_nil(val) end)
 
@@ -179,6 +195,7 @@ defmodule Mobilizon.Service.GlobalSearch.SearchMobilizon do
         avatar: organizer_actor_avatar
       },
       physical_address: address,
+      participant_stats: %{participant: data["participantCount"]},
       tags:
         Enum.map(data["tags"], fn tag ->
           tag = String.trim_leading(tag, "#")

priv/repo/e2e.seed.exs

@@ -3,7 +3,7 @@ defmodule EndToEndSeed do
 
   def delete_user(email) do
     with {:ok, user} <- Users.get_user_by_email(email) do
-      Users.delete_user(user)
+      Users.delete_user(user, reserve_email: false)
     end
   end
 end