Merge branch 'fixes' into 'main'

Do not list drafts in upcoming / old events event if moderator Closes #466 et #1086 See merge request framasoft/mobilizon!1314
2022-11-02 17:47:45 +00:00 · 2022-11-02 17:47:45 +00:00 · ce3fa41505
parent 48da35ee41 84009a9530
commit ce3fa41505
8 changed files with 125 additions and 63 deletions
--- a/js/src/assets/oruga-tailwindcss.css
+++ b/js/src/assets/oruga-tailwindcss.css
@ -266,7 +266,7 @@ button.menubar__button {
  @apply px-3 dark:text-black;
 }
 .pagination-link-current {
-  @apply bg-primary cursor-not-allowed pointer-events-none border-primary text-white;
+  @apply bg-primary cursor-not-allowed pointer-events-none border-primary text-white dark:text-zinc-900;
 }
 .pagination-ellipsis {
  @apply text-center m-1 text-gray-300;
--- a/js/src/components/Post/SharePostModal.vue
+++ b/js/src/components/Post/SharePostModal.vue
@ -2,7 +2,7 @@
  <share-modal
    :title="t('Share this post')"
    :text="post.title"
-    :url="postURL"
+    :url="post.url ?? ''"
    :input-label="t('Post URL')"
  >
    <o-notification
@ -11,7 +11,7 @@
      :closable="false"
    >
      {{
-        $t(
+        t(
          "This post is accessible only through it's link. Be careful where you post this link."
        )
      }}
@ -22,29 +22,14 @@
 <script lang="ts" setup>
 import { PostVisibility } from "@/types/enums";
 import { IPost } from "../../types/post.model";
-import RouteName from "@/router/name";
-import { computed } from "vue";
-import { useRouter } from "vue-router";
 import { useI18n } from "vue-i18n";
 import ShareModal from "@/components/Share/ShareModal.vue";

-const props = defineProps<{
+defineProps<{
  post: IPost;
 }>();

 const { t } = useI18n({ useScope: "global" });
-
-const router = useRouter();
-
-const postURL = computed((): string => {
-  if (props.post.id) {
-    return router.resolve({
-      name: RouteName.POST,
-      params: { id: props.post.id },
-    }).href;
-  }
-  return props.post.url ?? "";
-});
 </script>
 <style lang="scss" scoped>
 .diaspora,
--- a/js/src/components/TextEditor.vue
+++ b/js/src/components/TextEditor.vue
@ -44,8 +44,18 @@
        <button
          v-if="!isBasicMode"
          class="menubar__button"
-          :class="{ 'is-active': editor?.isActive('heading', { level: 3 }) }"
-          @click="editor?.chain().focus().toggleHeading({ level: 3 }).run()"
+          :class="{
+            'is-active': editor?.isActive('heading', {
+              level: props.headingLevel[0],
+            }),
+          }"
+          @click="
+            editor
+              ?.chain()
+              .focus()
+              .toggleHeading({ level: props.headingLevel[0] })
+              .run()
+          "
          type="button"
          :title="t('Heading Level 1')"
        >
@ -55,8 +65,18 @@
        <button
          v-if="!isBasicMode"
          class="menubar__button"
-          :class="{ 'is-active': editor?.isActive('heading', { level: 4 }) }"
-          @click="editor?.chain().focus().toggleHeading({ level: 4 }).run()"
+          :class="{
+            'is-active': editor?.isActive('heading', {
+              level: props.headingLevel[1],
+            }),
+          }"
+          @click="
+            editor
+              ?.chain()
+              .focus()
+              .toggleHeading({ level: props.headingLevel[1] })
+              .run()
+          "
          type="button"
          :title="t('Heading Level 2')"
        >
@ -66,8 +86,18 @@
        <button
          v-if="!isBasicMode"
          class="menubar__button"
-          :class="{ 'is-active': editor?.isActive('heading', { level: 5 }) }"
-          @click="editor?.chain().focus().toggleHeading({ level: 5 }).run()"
+          :class="{
+            'is-active': editor?.isActive('heading', {
+              level: props.headingLevel[2],
+            }),
+          }"
+          @click="
+            editor
+              ?.chain()
+              .focus()
+              .toggleHeading({ level: props.headingLevel[2] })
+              .run()
+          "
          type="button"
          :title="t('Heading Level 3')"
        >
@ -196,7 +226,7 @@
 import { useEditor, EditorContent, BubbleMenu } from "@tiptap/vue-3";
 import Blockquote from "@tiptap/extension-blockquote";
 import BulletList from "@tiptap/extension-bullet-list";
-import Heading from "@tiptap/extension-heading";
+import Heading, { Level } from "@tiptap/extension-heading";
 import Document from "@tiptap/extension-document";
 import Paragraph from "@tiptap/extension-paragraph";
 import Bold from "@tiptap/extension-bold";
@ -248,10 +278,12 @@ const props = withDefaults(
    ariaLabel?: string;
    currentActor: IPerson;
    placeholder?: string;
+    headingLevel?: Level[];
  }>(),
  {
    mode: "description",
    maxSize: 100_000_000,
+    headingLevel: () => [3, 4, 5],
  }
 );

@ -310,7 +342,7 @@ const editor = useEditor({
    Blockquote,
    BulletList,
    Heading.configure({
-      levels: [3, 4, 5],
+      levels: props.headingLevel,
    }),
    Document,
    Paragraph,
@ -611,3 +643,12 @@ onBeforeUnmount(() => {
  height: 0;
 }
 </style>
+<style>
+.menubar__button {
+  @apply mx-0.5;
+}
+
+.menubar__button.is-active {
+  @apply bg-zinc-300 dark:bg-zinc-500;
+}
+</style>
--- a/js/src/composition/apollo/group.ts
+++ b/js/src/composition/apollo/group.ts
@ -55,7 +55,10 @@ export function useGroup(
      name: unref(name),
      ...options,
    }),
-    () => ({ enabled: unref(name) !== undefined && unref(name) !== "" })
+    () => ({
+      enabled: unref(name) !== undefined && unref(name) !== "",
+      fetchPolicy: "cache-and-network",
+    })
  );
  const group = computed(() => result.value?.group);
  return { group, error, loading, onResult, onError, refetch };
--- a/js/src/views/Posts/EditView.vue
+++ b/js/src/views/Posts/EditView.vue
@ -43,6 +43,7 @@
            :aria-label="t('Post body')"
            :current-actor="currentActor"
            :placeholder="t('Write your post')"
+            :headingLevel="[2, 3, 4]"
          />
        </o-field>
        <h2 class="mt-2">{{ t("Who can view this post") }}</h2>
--- a/js/src/views/Posts/PostView.vue
+++ b/js/src/views/Posts/PostView.vue
@ -1,22 +1,38 @@
 <template>
  <article class="container mx-auto post" v-if="post">
+    <breadcrumbs-nav
+      v-if="post.attributedTo"
+      :links="[
+        { name: RouteName.MY_GROUPS, text: t('My groups') },
+        {
+          name: RouteName.GROUP,
+          params: { preferredUsername: usernameWithDomain(post.attributedTo) },
+          text: displayName(post.attributedTo),
+        },
+        {
+          name: RouteName.POST,
+          params: { slug: post.slug },
+          text: post.title,
+        },
+      ]"
+    />
    <header>
      <div class="flex justify-center">
        <lazy-image-wrapper :picture="post.picture" />
      </div>
      <div class="relative flex flex-col">
        <div
-          class="px-2 py-3 flex flex-wrap justify-center items-center"
+          class="px-2 py-3 flex flex-wrap gap-4 justify-center items-center"
          dir="auto"
        >
-          <div class="flex-1">
+          <div class="flex-auto min-w-[300px] max-w-screen-lg">
            <div class="inline">
              <tag
                class="mr-2"
                variant="warning"
                size="medium"
                v-if="post.draft"
-                >{{ $t("Draft") }}</tag
+                >{{ t("Draft") }}</tag
              >
              <h1 class="inline" :lang="post.language">
                {{ post.title }}
@ -52,7 +68,7 @@
              >
                <Clock :size="16" />
                {{
-                  $t("Edited {relative_time} ago", {
+                  t("Edited {relative_time} ago", {
                    relative_time: formatDistanceToNowStrict(
                      new Date(post.updatedAt),
                      {
@ -64,7 +80,7 @@
              </span>
              <span v-if="post.visibility === PostVisibility.UNLISTED" class="">
                <o-icon icon="link" size="small" />
-                {{ $t("Accessible only by link") }}
+                {{ t("Accessible only by link") }}
              </span>
              <span
                v-else-if="post.visibility === PostVisibility.PRIVATE"
@ -72,7 +88,7 @@
              >
                <Lock :size="16" />
                {{
-                  $t("Accessible only to members", {
+                  t("Accessible only to members", {
                    group: post.attributedTo?.name,
                  })
                }}
@ -82,24 +98,28 @@
          <o-dropdown position="bottom-left" aria-role="list">
            <template #trigger>
              <o-button role="button" icon-right="dots-horizontal">
-                {{ $t("Actions") }}
+                {{ t("Actions") }}
              </o-button>
            </template>
            <o-dropdown-item
              aria-role="listitem"
              has-link
+              tabIndex="-1"
              v-if="
                currentActor?.id === post?.author?.id ||
                isCurrentActorAGroupModerator
              "
            >
              <router-link
+                class="flex gap-1 whitespace-nowrap flex-1"
                :to="{
                  name: RouteName.POST_EDIT,
                  params: { slug: post.slug },
                }"
-                >{{ $t("Edit") }} <o-icon icon="pencil"
-              /></router-link>
+              >
+                <Pencil />
+                {{ t("Edit") }}
+              </router-link>
            </o-dropdown-item>
            <o-dropdown-item
              aria-role="listitem"
@ -107,11 +127,15 @@
                currentActor?.id === post?.author?.id ||
                isCurrentActorAGroupModerator
              "
-              @click="openDeletePostModal"
-              @keyup.enter="openDeletePostModal"
+              tabIndex="-1"
            >
-              {{ $t("Delete") }}
-              <o-icon icon="delete" />
+              <button
+                @click="openDeletePostModal"
+                class="flex gap-1 whitespace-nowrap"
+              >
+                <Delete />
+                {{ t("Delete") }}
+              </button>
            </o-dropdown-item>

            <hr
@ -126,32 +150,36 @@
            <o-dropdown-item
              aria-role="listitem"
              v-if="!post.draft"
-              @click="triggerShare()"
-              @keyup.enter="triggerShare()"
+              tabIndex="-1"
            >
-              <span>
-                {{ $t("Share this event") }}
-                <o-icon icon="share" />
-              </span>
+              <button
+                @click="triggerShare()"
+                class="flex gap-1 whitespace-nowrap"
+              >
+                <Share />
+                {{ t("Share this event") }}
+              </button>
            </o-dropdown-item>

            <o-dropdown-item
              aria-role="listitem"
              v-if="ableToReport"
-              @click="isReportModalActive = true"
-              @keyup.enter="isReportModalActive = true"
+              tabIndex="-1"
            >
-              <span>
-                {{ $t("Report") }}
-                <o-icon icon="flag" />
-              </span>
+              <button
+                @click="isReportModalActive = true"
+                class="flex gap-1 whitespace-nowrap"
+              >
+                <Flag />
+                {{ t("Report") }}
+              </button>
            </o-dropdown-item>
          </o-dropdown>
        </div>
      </div>
    </header>
    <o-notification
-      :title="$t('Members-only post')"
+      :title="t('Members-only post')"
      class="mx-4"
      variant="warning"
      :closable="false"
@ -164,7 +192,7 @@
      "
    >
      {{
-        $t(
+        t(
          "This post is accessible only for members. You have access to it for moderation purposes only because you are an instance moderator."
        )
      }}
@ -173,10 +201,10 @@
    <section
      v-html="post.body"
      dir="auto"
-      class="px-1 prose lg:prose-xl prose-p:mt-6 dark:prose-invert"
+      class="px-2 md:px-4 py-4 prose lg:prose-xl prose-p:mt-6 dark:prose-invert bg-white dark:bg-zinc-700 mx-auto"
      :lang="post.language"
    />
-    <section class="flex gap-2 my-6" dir="auto">
+    <section class="flex gap-2 my-6 justify-center" dir="auto">
      <router-link
        v-for="tag in post.tags"
        :key="tag.title"
@ -186,14 +214,14 @@
      </router-link>
    </section>
    <o-modal
-      :close-button-aria-label="$t('Close')"
+      :close-button-aria-label="t('Close')"
      v-model:active="isReportModalActive"
      has-modal-card
      ref="reportModal"
    >
      <ReportModal
        :on-confirm="reportPost"
-        :title="$t('Report this post')"
+        :title="t('Report this post')"
        :outside-domain="groupDomain"
        @close="isReportModalActive = false"
      />
@ -202,7 +230,7 @@
      v-model:active="isShareModalActive"
      has-modal-card
      ref="shareModal"
-      :close-button-aria-label="$t('Close')"
+      :close-button-aria-label="t('Close')"
    >
      <share-post-modal :post="post" />
    </o-modal>
@ -241,6 +269,10 @@ import { useRouter } from "vue-router";
 import { useCreateReport } from "@/composition/apollo/report";
 import Clock from "vue-material-design-icons/Clock.vue";
 import Lock from "vue-material-design-icons/Lock.vue";
+import Pencil from "vue-material-design-icons/Pencil.vue";
+import Delete from "vue-material-design-icons/Delete.vue";
+import Share from "vue-material-design-icons/Share.vue";
+import Flag from "vue-material-design-icons/Flag.vue";
 import { Dialog } from "@/plugins/dialog";
 import { useI18n } from "vue-i18n";
 import { Notifier } from "@/plugins/notifier";
--- a/lib/graphql/resolvers/group.ex
+++ b/lib/graphql/resolvers/group.ex
@ -446,8 +446,7 @@ defmodule Mobilizon.GraphQL.Resolvers.Group do
          }
        }
      ) do
-    if Actors.is_member?(actor_id, group_id) or is_moderator(user_role) do
-      # TODO : Handle public / restricted to group members events
+    if Actors.is_member?(actor_id, group_id) do
      {:ok,
       Events.list_organized_events_for_group(
         group,
--- a/lib/mix/tasks/mobilizon/actors/delete.ex
+++ b/lib/mix/tasks/mobilizon/actors/delete.ex
@ -93,7 +93,8 @@ defmodule Mix.Tasks.Mobilizon.Actors.Delete do
    end
  end

-  defp check_actor(%Actor{type: :Person, domain: nil} = profile, assume_yes?) do
+  defp check_actor(%Actor{type: :Person, domain: nil, user_id: user_id} = profile, assume_yes?)
+       when not is_nil(user_id) do
    %User{actors: actors, email: email} = Users.get_user_with_actors!(profile.user_id)

    if length(actors) == 1 do