Merge remote-tracking branch 'origin/main'

CHANGELOG.md

@@ -6,8 +6,16 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 
-## 3.2.0-beta.4  (2023-09-05)
+## 3.2.0-beta.5 (2023-09-06)
 
+### Bug Fixes
+
+* **docker:** make Docker entrypoint port configurable via $MOBILIZON_DATABASE_PORT ([13099e0](https://framagit.org/framasoft/mobilizon/commits/13099e0f118b727a1472282c6419ef9b1842c191))
+* **front:** fix fetching and rendering profile mentions and fetching tags ([895378a](https://framagit.org/framasoft/mobilizon/commits/895378a96bf8a6c7662ed02509c37b8d8a95db0b))
+* **sitemap:** save generated sitemaps in configurable directory ([f28109a](https://framagit.org/framasoft/mobilizon/commits/f28109ad50d85143e38c8e9f5d09c28f80566462)), closes [#1321](https://framagit.org/framasoft/mobilizon/issues/1321)
+
+
+## 3.2.0-beta.4  (2023-09-05)
 
 ### Bug Fixes
 
@@ -19,7 +27,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## 3.2.0-beta.3  (2023-09-04)
 
-
 ### Bug Fixes
 
 * **i18n:** add missing translations ([af670f3](https://framagit.org/framasoft/mobilizon/commit/af670f39478b11465205fbea9b9268bab401bbb6))
@@ -41,7 +48,6 @@ Fixes a CI issue that prevented 3.2.0-beta.2 being released.
 * **front:** fix behavior of local toggle for profiles & groups view depending on domain value ([84f62cd](https://framagit.org/framasoft/mobilizon/commit/84f62cd043d5cf5d186fea6f24a1a9dff5fc64ce))
 
 
-
 ## 3.2.0-beta.1  (2023-09-01)
 
 ### Features

config/config.exs

@@ -393,6 +393,9 @@ config :mobilizon, Mobilizon.Service.GlobalSearch.SearchMobilizon,
 
 config :mobilizon, Mobilizon.Service.AntiSpam, service: Mobilizon.Service.AntiSpam.Akismet
 
+config :mobilizon, Mobilizon.Service.SiteMap,
+  path: System.get_env("MOBILIZON_SITEMAP_PATH", "/var/lib/mobilizon/sitemap")
+
 # Import environment specific config. This must remain at the bottom
 # of this file so it overrides the configuration defined above.
 import_config "#{config_env()}.exs"

config/dev.exs

@@ -92,6 +92,9 @@ config :mobilizon, Mobilizon.Web.Upload.Uploader.Local, uploads: "uploads"
 
 config :mobilizon, :exports, path: "uploads/exports"
 
+config :mobilizon, Mobilizon.Service.SiteMap,
+  path: System.get_env("MOBILIZON_SITEMAP_PATH", "priv/static")
+
 config :tz_world, data_dir: "_build/dev/lib/tz_world/priv"
 
 config :mobilizon, :anonymous,

config/test.exs

@@ -62,6 +62,9 @@ config :mobilizon, Mobilizon.Web.Upload.Uploader.Local, uploads: "test/uploads"
 
 config :mobilizon, :exports, path: "test/uploads/exports"
 
+config :mobilizon, Mobilizon.Service.SiteMap,
+  path: System.get_env("MOBILIZON_SITEMAP_PATH", "test/sitemap")
+
 config :tz_world, data_dir: "_build/test/lib/tz_world/priv"
 
 config :tesla, Mobilizon.Service.HTTP.ActivityPub,

docker/multiarch/Dockerfile

@@ -1,4 +1,4 @@
-FROM elixir as build
+FROM elixir:1.15 as build
 SHELL ["/bin/bash", "-c"]
 ENV MIX_ENV prod
 # ENV LANG en_US.UTF-8
@@ -12,7 +12,7 @@ ENV ERL_FLAGS=$ERL_FLAGS
 # Set the right versions
 ENV ELIXIR_VERSION latest
 ENV ERLANG_VERSION latest
-ENV NODE_VERSION 16
+ENV NODE_VERSION 18
 
 # Install system dependencies
 RUN apt-get update -yq && apt-get install -yq build-essential cmake postgresql-client git curl gnupg unzip exiftool webp imagemagick gifsicle

docker/production/Dockerfile

@@ -10,7 +10,7 @@ RUN yarn install --network-timeout 100000 \
     && yarn run build
 
 # Then, build the application binary
-FROM elixir:1.14-alpine AS builder
+FROM elixir:1.15-alpine AS builder
 
 # Fix qemu segfault on arm64
 # See https://github.com/plausible/analytics/pull/2879 and https://github.com/erlang/otp/pull/6340

docker/production/docker-entrypoint.sh

@@ -3,7 +3,7 @@
 set -e
 
 echo "-- Waiting for database..."
-while ! pg_isready -U ${MOBILIZON_DATABASE_USERNAME} -d postgres://${MOBILIZON_DATABASE_HOST}:5432/${MOBILIZON_DATABASE_DBNAME} -t 1; do
+while ! pg_isready -U ${MOBILIZON_DATABASE_USERNAME} -d postgres://${MOBILIZON_DATABASE_HOST}:${MOBILIZON_DATABASE_PORT:-5432}/${MOBILIZON_DATABASE_DBNAME} -t 1; do
    sleep 1s
 done
 

js/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mobilizon",
-  "version": "3.2.0-beta.4",
+  "version": "3.2.0-beta.5",
   "private": true,
   "scripts": {
     "dev": "vite",

js/src/components/Editor/Mention.ts

@@ -2,37 +2,32 @@ import { SEARCH_PERSONS } from "@/graphql/search";
 import { VueRenderer } from "@tiptap/vue-3";
 import tippy from "tippy.js";
 import MentionList from "./MentionList.vue";
-import { apolloClient } from "@/vue-apollo";
+import { apolloClient, waitApolloQuery } from "@/vue-apollo";
 import { IPerson } from "@/types/actor";
 import pDebounce from "p-debounce";
 import { MentionOptions } from "@tiptap/extension-mention";
 import { Editor } from "@tiptap/core";
 import { provideApolloClient, useQuery } from "@vue/apollo-composable";
 import { Paginate } from "@/types/paginate";
-import { onError } from "@apollo/client/link/error";
 
-const fetchItems = (query: string): Promise<IPerson[]> => {
+const fetchItems = async (query: string): Promise<IPerson[]> => {
-  return new Promise((resolve, reject) => {
+  try {
-    const { onResult } = provideApolloClient(apolloClient)(() => {
+    if (query === "") return [];
-      return useQuery<{ searchPersons: Paginate<IPerson> }>(
+    const res = await waitApolloQuery(
-        SEARCH_PERSONS,
+      provideApolloClient(apolloClient)(() => {
-        () => ({
+        return useQuery<
-          variables: {
+          { searchPersons: Paginate<IPerson> },
-            searchText: query,
+          { searchText: string }
-          },
+        >(SEARCH_PERSONS, () => ({
-        })
+          searchText: query,
-      );
+        }));
-    });
+      })
-
+    );
-    onResult(({ data }) => {
+    return res.data.searchPersons.elements;
-      resolve(data.searchPersons.elements);
+  } catch (e) {
-    });
+    console.error(e);
-
+    return [];
-    onError(reject);
+  }
-  });
-
-  // // TipTap doesn't handle async for onFilter, hence the following line.
-  // return result.data.searchPersons.elements;
 };
 
 const debouncedFetchItems = pDebounce(fetchItems, 200);
@@ -68,6 +63,10 @@ const mentionOptions: MentionOptions = {
             editor: props.editor,
           });
 
+          if (!props.clientRect) {
+            return;
+          }
+
           popup = tippy("body", {
             getReferenceClientRect: props.clientRect,
             appendTo: () => document.body,
@@ -86,6 +85,12 @@ const mentionOptions: MentionOptions = {
           });
         },
         onKeyDown(props: any) {
+          if (props.event.key === "Escape") {
+            popup[0].hide();
+
+            return true;
+          }
+
           // eslint-disable-next-line @typescript-eslint/ban-ts-comment
           // @ts-ignore
           return component.ref?.onKeyDown(props);

js/src/components/Editor/MentionList.vue

@@ -1,8 +1,8 @@
 <template>
-  <div class="items">
+  <div class="relative border overflow-hidden dark:border-transparent">
     <button
-      class="item"
+      class="block w-full text-start bg-white dark:bg-violet-1 border py-1 px-2 rounded dark:border-transparent"
-      :class="{ 'is-selected': index === selectedIndex }"
+      :class="{ 'border-black dark:!border-white': index === selectedIndex }"
       v-for="(item, index) in items"
       :key="index"
       @click="selectItem(index)"
@@ -34,37 +34,37 @@ watch(
   }
 );
 
-// const onKeyDown = ({ event }: { event: KeyboardEvent }): boolean => {
+const onKeyDown = ({ event }: { event: KeyboardEvent }): boolean => {
-//   if (event.key === "ArrowUp") {
+  if (event.key === "ArrowUp") {
-//     upHandler();
+    upHandler();
-//     return true;
+    return true;
-//   }
+  }
 
-//   if (event.key === "ArrowDown") {
+  if (event.key === "ArrowDown") {
-//     downHandler();
+    downHandler();
-//     return true;
+    return true;
-//   }
+  }
 
-//   if (event.key === "Enter") {
+  if (event.key === "Enter") {
-//     enterHandler();
+    enterHandler();
-//     return true;
+    return true;
-//   }
+  }
 
-//   return false;
+  return false;
-// };
+};
 
-// const upHandler = (): void => {
+const upHandler = (): void => {
-//   selectedIndex.value =
+  selectedIndex.value =
-//     (selectedIndex.value + props.items.length - 1) % props.items.length;
+    (selectedIndex.value + props.items.length - 1) % props.items.length;
-// };
+};
 
-// const downHandler = (): void => {
+const downHandler = (): void => {
-//   selectedIndex.value = (selectedIndex.value + 1) % props.items.length;
+  selectedIndex.value = (selectedIndex.value + 1) % props.items.length;
-// };
+};
 
-// const enterHandler = (): void => {
+const enterHandler = (): void => {
-//   selectItem(selectedIndex.value);
+  selectItem(selectedIndex.value);
-// };
+};
 
 const selectItem = (index: number): void => {
   const item = props.items[index];
@@ -73,27 +73,8 @@ const selectItem = (index: number): void => {
     props.command({ id: usernameWithDomain(item) });
   }
 };
+
+defineExpose({
+  onKeyDown,
+});
 </script>
-
-<style lang="scss" scoped>
-.items {
-  position: relative;
-  border-radius: 0.25rem;
-  background: white;
-  color: rgba(black, 0.8);
-  overflow: hidden;
-  font-size: 0.9rem;
-  box-shadow:
-    0 0 0 1px rgba(0, 0, 0, 0.1),
-    0px 10px 20px rgba(0, 0, 0, 0.1);
-}
-
-.item {
-  display: block;
-  width: 100%;
-  text-align: left;
-  background: transparent;
-  border: none;
-  padding: 0.5rem 0.75rem;
-}
-</style>

js/src/components/TextEditor.vue

@@ -657,4 +657,8 @@ onBeforeUnmount(() => {
 .menubar__button.is-active {
   @apply bg-zinc-300 dark:bg-zinc-500;
 }
+
+.mention[data-id] {
+  @apply inline-block border border-zinc-600 dark:border-zinc-300 rounded py-0.5 px-1;
+}
 </style>

js/src/composition/apollo/tags.ts

@@ -1,23 +1,20 @@
 import { FILTER_TAGS } from "@/graphql/tags";
 import { ITag } from "@/types/tag.model";
-import { apolloClient } from "@/vue-apollo";
+import { apolloClient, waitApolloQuery } from "@/vue-apollo";
 import { provideApolloClient, useQuery } from "@vue/apollo-composable";
 
-export function fetchTags(text: string): Promise<ITag[]> {
+export async function fetchTags(text: string): Promise<ITag[]> {
-  return new Promise((resolve, reject) => {
+  try {
-    const { onResult, onError } = provideApolloClient(apolloClient)(() =>
+    const res = await waitApolloQuery(
-      useQuery<{ tags: ITag[] }, { filter: string }>(FILTER_TAGS, {
+      provideApolloClient(apolloClient)(() =>
-        filter: text,
+        useQuery<{ tags: ITag[] }, { filter: string }>(FILTER_TAGS, {
-      })
+          filter: text,
+        })
+      )
     );
-
+    return res.data.tags;
-    onResult((result) => {
+  } catch (e) {
-      if (result.loading) {
+    console.error(e);
-        return;
+    return [];
-      }
+  }
-      return resolve(result.data.tags);
-    });
-
-    onError((error) => reject(error));
-  });
 }

js/src/views/Event/EventView.vue

@@ -628,4 +628,8 @@ useHead({
 .event-description a {
   @apply inline-block p-1 bg-mbz-yellow-alt-200 text-black;
 }
+
+.event-description .mention.h-card {
+  @apply inline-block border border-zinc-600 dark:border-zinc-300 rounded py-0.5 px-1;
+}
 </style>

lib/service/site_map.ex

@@ -24,7 +24,7 @@ defmodule Mobilizon.Service.SiteMap do
 
     config = [
       store: Sitemapper.FileStore,
-      store_config: [path: Application.app_dir(:mobilizon, "priv/static")],
+      store_config: [path: Application.get_env(:mobilizon, __MODULE__) |> get_in([:path])],
       sitemap_url: Endpoint.url(),
       gzip: false
     ]

mix.exs

@@ -1,7 +1,7 @@
 defmodule Mobilizon.Mixfile do
   use Mix.Project
 
-  @version "3.2.0-beta.4"
+  @version "3.2.0-beta.5"
 
   def project do
     [