From acf51a313070521913a534807c0ccd04f7dab652 Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Mon, 29 Mar 2021 18:23:03 +0200
Subject: [PATCH] Fix issues when group isn't local

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
---
 js/src/mixins/group.ts       | 10 ++++++++--
 lib/service/export/common.ex |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/js/src/mixins/group.ts b/js/src/mixins/group.ts
index 1ff873f9c..26be0c3e2 100644
--- a/js/src/mixins/group.ts
+++ b/js/src/mixins/group.ts
@@ -5,7 +5,13 @@ import {
 } from "@/graphql/actor";
 import { FETCH_GROUP } from "@/graphql/group";
 import RouteName from "@/router/name";
-import { Group, IActor, IGroup, IPerson } from "@/types/actor";
+import {
+  Group,
+  IActor,
+  IGroup,
+  IPerson,
+  usernameWithDomain,
+} from "@/types/actor";
 import { MemberRole } from "@/types/enums";
 import { Component, Vue } from "vue-property-decorator";
 
@@ -34,7 +40,7 @@ import { Component, Vue } from "vue-property-decorator";
       variables() {
         return {
           id: this.currentActor.id,
-          group: this.group.preferredUsername,
+          group: usernameWithDomain(this.group),
         };
       },
       subscribeToMore: {
diff --git a/lib/service/export/common.ex b/lib/service/export/common.ex
index 2b9a35692..dd3e53903 100644
--- a/lib/service/export/common.ex
+++ b/lib/service/export/common.ex
@@ -11,7 +11,7 @@ defmodule Mobilizon.Service.Export.Common do
 
   @spec fetch_actor_event_feed(String.t()) :: String.t()
   def fetch_actor_event_feed(name) do
-    with %Actor{} = actor <- Actors.get_local_actor_by_name(name),
+    with %Actor{} = actor <- Actors.get_actor_by_name(name),
          {:visibility, true} <- {:visibility, Actor.is_public_visibility?(actor)},
          %Page{elements: events} <- Events.list_public_events_for_actor(actor),
          %Page{elements: posts} <- Posts.get_public_posts_for_group(actor) do