From 8eaa66e7f74198a225cf4e07f70cdb2267741ca3 Mon Sep 17 00:00:00 2001
From: Fulmine <jake.fulminated@gmail.com>
Date: Sat, 19 Mar 2022 17:22:50 +0100
Subject: [PATCH] link to profile when member/group is not from own system

---
 src/pages/Group.svelte  | 16 +++++++++++-----
 src/pages/Member.svelte | 16 +++++++++++-----
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/src/pages/Group.svelte b/src/pages/Group.svelte
index 56a67ec9..62fbe20e 100644
--- a/src/pages/Group.svelte
+++ b/src/pages/Group.svelte
@@ -23,6 +23,7 @@
     let systemMembers: Group[] = [];
     let isMainDash = false;
     let isDeleted = false;
+    let notOwnSystem = false;
 
     const isPage = true;
     export let isPublic = true;
@@ -45,7 +46,10 @@
     async function fetchGroup() {
         try {
             group = await api().groups($params.id).get({auth: !isPublic});
-            if (!isPublic && !group.privacy) throw new Error("This group does not belong to your system, did you mean to look up their public page?")
+            if (!isPublic && !group.privacy) {
+                notOwnSystem = true;
+                throw new Error("Group is not from own system.");
+            }
             err = "";
             loading = false;
             memberLoading = true;
@@ -101,10 +105,10 @@
   }
 </script>
 
-{#if settings && settings.appearance.color_background}
+{#if settings && settings.appearance.color_background && !notOwnSystem}
     <div class="background" style="background-color: {group && `#${group.color}`}"></div>
 {/if}
-{#if group && group.banner && ((settings && settings.appearance.banner_top))}
+{#if group && group.banner && settings && settings.appearance.banner_top && !notOwnSystem}
 <div class="banner" style="background-image: url({group.banner})" />
 {/if}
 <Container>
@@ -116,8 +120,10 @@
             {#if isPublic}
                 <Alert color="info">You are currently <b>viewing</b> a group.</Alert>
             {/if}
-            {#if err}
-                <Alert color="danger">{err}</Alert>
+            {#if notOwnSystem}
+                <Alert color="danger">This group does not belong to your system, did you mean to look up <Link to={`/profile/g/${group.id}`}>it's public page</Link>?</Alert>
+            {:else if err}
+                <Alert color="danger">{@html err}</Alert>
             {:else if loading}
                 <Spinner/>
             {:else if group && group.id}
diff --git a/src/pages/Member.svelte b/src/pages/Member.svelte
index 69f72d0c..14e3f742 100644
--- a/src/pages/Member.svelte
+++ b/src/pages/Member.svelte
@@ -24,6 +24,7 @@
     let systemMembers: Member[] = [];
     let isMainDash = false;
     let isDeleted = false;
+    let notOwnSystem = false;
 
     const isPage = true;
     export let isPublic = true;
@@ -46,7 +47,10 @@
     async function fetchMember() {
         try {
             member = await api().members($params.id).get({auth: !isPublic});
-            if (!isPublic && !member.privacy) throw new Error("This member does not belong to your system, did you mean to look up their public page?")
+            if (!isPublic && !member.privacy) {
+                notOwnSystem = true;
+                throw new Error("Member is not from own system.");
+            }
             err = "";
             loading = false;
             groupLoading = true;
@@ -102,10 +106,10 @@
   }
 </script>
 
-{#if settings && settings.appearance.color_background}
+{#if settings && settings.appearance.color_background && !notOwnSystem}
     <div class="background" style="background-color: {member && `#${member.color}`}"></div>
 {/if}
-{#if member && member.banner && ((settings && settings.appearance.banner_top))}
+{#if member && member.banner && settings && settings.appearance.banner_top && !notOwnSystem}
 <div class="banner" style="background-image: url({member.banner})" />
 {/if}
 <Container>
@@ -117,8 +121,10 @@
             {#if isPublic}
                 <Alert color="info">You are currently <b>viewing</b> a member.</Alert>
             {/if}
-            {#if err}
-                <Alert color="danger">{err}</Alert>
+            {#if notOwnSystem}
+                <Alert color="danger">This member does not belong to your system, did you mean to look up <Link to={`/profile/m/${member.id}`}>their public page</Link>?</Alert>
+            {:else if err}
+                <Alert color="danger">{@html err}</Alert>
             {:else if loading}
                 <Spinner/>
             {:else if member && member.id}