follow buttons

5 files changed, 72 insertions, 52 deletions

diff --git a/src/lib/nostr.ts b/src/lib/nostr.ts
index 62853f09..a9926ba1 100644
--- a/src/lib/nostr.ts
+++ b/src/lib/nostr.ts
@@ -147,7 +147,7 @@ export let sign = async ({ event, user }: SignParams) => {
 };
 
 export let send = (event: EventTemplate) => {
-  return post("/events", { event });
+    return post("/events", { event });
 };
 
 let getPassword = async (): Promise<string> => {
diff --git a/src/lib/utils.ts b/src/lib/utils.ts
index 0997eeb9..b32095cb 100644
--- a/src/lib/utils.ts
+++ b/src/lib/utils.ts
@@ -60,6 +60,7 @@ export let post = async (
     .then(async (r) => {
       if (r.ok) return r.text();
       let text = await r.text();
+      console.log("TEXT", text)
 
       let message;
       try {
diff --git a/src/routes/(app)/[username]/(profile)/+layout.server.ts b/src/routes/(app)/[username]/(profile)/+layout.server.ts
index 308422b3..ebb0d6ee 100644
--- a/src/routes/(app)/[username]/(profile)/+layout.server.ts
+++ b/src/routes/(app)/[username]/(profile)/+layout.server.ts
@@ -1,6 +1,6 @@
 import { get } from "$lib/utils";
 
-export async function load({ depends, parent }) {
+  export async function load({ depends, parent }) {
   depends("app:user");
 
   let { subject, user } = await parent();
diff --git a/src/routes/(app)/[username]/(profile)/+layout.svelte b/src/routes/(app)/[username]/(profile)/+layout.svelte
index eabaeeea..59d90e89 100644
--- a/src/routes/(app)/[username]/(profile)/+layout.svelte
+++ b/src/routes/(app)/[username]/(profile)/+layout.svelte
@@ -1,6 +1,8 @@
 <script>
+  import { invalidate } from "$app/navigation";
+  import { browser } from "$app/environment";
   import { hexToUint8Array } from "uint8array-extras";
-  import { copy, f, post, s, sats, success, fail } from "$lib/utils";
+  import { copy, f, get, post, s, sats, success, fail } from "$lib/utils";
   import Icon from "$comp/Icon.svelte";
   import { t } from "$lib/translations";
   import { sign, send } from "$lib/nostr";
@@ -28,8 +30,12 @@
   $: profile = `${$page.url.host}/${subject.anon ? npub : stripped}`;
 
   let follow = async () => {
-    user.follows.push(["p", subject.pubkey, "wss://nostr.coinos.io", stripped]);
-    update();
+    user.follows.push(subject.pubkey);
+    user.follows = user.follows;
+    let tags = await get(`/api/${user.pubkey}/follows?tagsonly=true`);
+    tags.push(["p", subject.pubkey]);
+    await update(tags);
+    invalidate("app:user");
   };
 
   let unfollow = async () => {
@@ -37,22 +43,32 @@
       user.follows.findIndex((t) => t[1] === subject.pubkey),
       1
     );
-    update();
+    user.follows = user.follows;
+    let tags = await get(`/api/${user.pubkey}/follows?tagsonly=true`);
+    tags.splice(
+      tags.findIndex((t) => t[1] === subject.pubkey),
+      1
+    );
+    await update(tags);
   };
 
-  let update = async () => {
+  let update = async (tags) => {
+    if (!browser) return;
+
     let event = {
       pubkey: user.pubkey,
       created_at: Math.floor(Date.now() / 1000),
       kind: 3,
       content: "",
-      tags: user.follows,
+      tags,
     };
 
-    await sign({ event, user });
-    await send(event);
-
-    user.follows = user.follows;
+    try {
+      await sign({ event, user });
+      await send(event);
+    } catch (e) {
+      console.log(e);
+    }
   };
 
   $: following = !!user?.follows.find((t) => t.includes(subject.pubkey));
@@ -179,45 +195,42 @@
     {/if}
 
     <div class="flex flex-wrap gap-2 w-full text-xl">
-      <!-- {#if user &#38;&#38; user.username !== subject.username &#38;&#38; subject.pubkey} -->
-      <!--   {#if following} -->
-      <!--     <button -->
-      <!--       class="mx-auto rounded-2xl border py-5 px-6 font-bold hover:opacity-80 flex bg-black text-white grow" -->
-      <!--       on:click={unfollow} -->
-      <!--     > -->
-      <!--       <div class="mx-auto flex"> -->
-      <!--         <Icon icon={"profile"} style="my-auto w-8 mr-2 invert" /> -->
-      <!--         <div class="my-auto">{$t("user.following")}</div> -->
-      <!--       </div> -->
-      <!--     </button> -->
-      <!--   {:else} -->
-      <!--     <button -->
-      <!--       class="mx-auto rounded-2xl border py-5 px-6 font-bold hover:opacity-80 flex grow" -->
-      <!--       on:click={follow} -->
-      <!--     > -->
-      <!--       <div class="mx-auto flex"> -->
-      <!--         <Icon icon={"profile"} style="my-auto h-6 mr-2" /> -->
-      <!--         <div class="my-auto">{$t("user.follow")}</div> -->
-      <!--       </div> -->
-      <!--     </button> -->
-      <!--   {/if} -->
-      <!-- {/if} -->
+      {#if user && user.username !== subject.username && subject.pubkey}
+        {#if following}
+          <button
+            class="mx-auto rounded-2xl border py-5 px-6 font-bold hover:opacity-80 flex bg-black text-white grow"
+            on:click={unfollow}
+          >
+            <div class="mx-auto flex">
+              <Icon icon={"profile"} style="my-auto w-8 mr-2 invert" />
+              <div class="my-auto">{$t("user.following")}</div>
+            </div>
+          </button>
+        {:else}
+          <button
+            class="mx-auto rounded-2xl border py-5 px-6 font-bold hover:opacity-80 flex grow"
+            on:click={follow}
+          >
+            <div class="mx-auto flex">
+              <Icon icon={"profile"} style="my-auto h-6 mr-2" />
+              <div class="my-auto">{$t("user.follow")}</div>
+            </div>
+          </button>
+        {/if}
+      {/if}
 
-      <!-- {#if user &#38;&#38; user.username !== subject.username &#38;&#38; subject.pubkey} -->
-      <!--   <a -->
-      <!--     href={`/messages/${subject.username}`} -->
-      <!--     class="contents" -->
-      <!--   > -->
-      <!--     <button -->
-      <!--       class="rounded-2xl border py-5 px-6 font-bold hover:opacity-80 flex w-60 grow" -->
-      <!--     > -->
-      <!--       <div class="mx-auto flex"> -->
-      <!--         <Icon icon="message" style="w-8 mr-2 my-auto" /> -->
-      <!--         <div class="mt-1 my-auto">{$t("user.message")}</div> -->
-      <!--       </div> -->
-      <!--     </button> -->
-      <!--   </a> -->
-      <!-- {/if} -->
+      {#if user && user.username !== subject.username && subject.pubkey}
+        <a href={`/messages/${subject.username}`} class="contents">
+          <button
+            class="rounded-2xl border py-5 px-6 font-bold hover:opacity-80 flex w-60 grow"
+          >
+            <div class="mx-auto flex">
+              <Icon icon="message" style="w-8 mr-2 my-auto" />
+              <div class="mt-1 my-auto">{$t("user.message")}</div>
+            </div>
+          </button>
+        </a>
+      {/if}
 
       {#if user?.admin && user.username !== subject.username}
         <form class="w-full flex" on:submit|preventDefault={reset}>
diff --git a/src/routes/(app)/events/+server.ts b/src/routes/(app)/events/+server.ts
index 95df0bc5..746f2caf 100644
--- a/src/routes/(app)/events/+server.ts
+++ b/src/routes/(app)/events/+server.ts
@@ -1,6 +1,12 @@
 import { auth, post } from "$lib/utils";
-import { json } from "@sveltejs/kit";
+import { json, error } from "@sveltejs/kit";
 
 export async function POST({ cookies, request }) {
-  return json(post("/event", await request.json(), auth(cookies)));
+  let body = await request.json();
+  try {
+    let result = await post("/event", body, auth(cookies));
+    return json(result);
+  } catch (e: any) {
+    error(500, e.message);
+  }
 }