Merge pull request #21 from ecency/feature/forward-message

Added message forwarding between contacts and channels

lib/mutations/resend-message.ts

@@ -48,7 +48,7 @@ export function useResendMessage(
       if (currentChannel) {
         return sendPublicMessage({ message: message.content });
       } else if (currentContact) {
-        return sendDirectMessage(message.content);
+        return sendDirectMessage({ message: message.content });
       } else {
         throw new Error("[Chat][SendMessage] – no receiver");
       }

lib/mutations/send-message.ts

@@ -38,7 +38,13 @@ export function useSendMessage(
 
   return useMutation(
     ["chats/send-message"],
-    async (message: string) => {
+    async ({
+      forwardedFrom,
+      message,
+    }: {
+      message: string;
+      forwardedFrom?: string;
+    }) => {
       if (!message || message.includes("Uploading")) {
         throw new Error(
           "[Chat][SendMessage] – empty message or has uploading file",
@@ -52,9 +58,9 @@ export function useSendMessage(
       }
 
       if (currentChannel) {
-        return sendPublicMessage({ message });
+        return sendPublicMessage({ message, forwardedFrom });
       } else if (currentContact) {
-        return sendDirectMessage(message);
+        return sendDirectMessage({ message, forwardedFrom });
       } else {
         throw new Error("[Chat][SendMessage] – no receiver");
       }

lib/nostr/mutations/send-direct-message.ts

@@ -18,34 +18,48 @@ export function useNostrSendDirectMessage(
   );
   const { mutateAsync: findHealthyRelay } = useFindHealthyRelayQuery();
 
-  return useMutation(["chats/send-direct-message"], async (message: string) => {
-    if (!publicKey || !privateKey || !destinationPublicKey) {
-      throw new Error(
-        "[Chat][Nostr] – attempting to send direct message with no private, destination or public key",
+  return useMutation(
+    ["chats/send-direct-message"],
+    async ({
+      message,
+      forwardedFrom,
+    }: {
+      message: string;
+      forwardedFrom?: string;
+    }) => {
+      if (!publicKey || !privateKey || !destinationPublicKey) {
+        throw new Error(
+          "[Chat][Nostr] – attempting to send direct message with no private, destination or public key",
+        );
+      }
+
+      const encryptedMessage = await nip04.encrypt(
+        ownerPrivateKey,
+        destinationPublicKey,
+        message,
       );
-    }
+      const tags = [["p", destinationPublicKey]];
 
-    const encryptedMessage = await nip04.encrypt(
-      ownerPrivateKey,
-      destinationPublicKey,
-      message,
-    );
-    const tags = [["p", destinationPublicKey]];
+      if (parent) {
+        const relay = await findHealthyRelay(parent);
+        if (relay) {
+          tags.push(["e", parent, relay, "root"]);
+        }
+      }
 
-    if (parent) {
-      const relay = await findHealthyRelay(parent);
-      if (relay) {
-        tags.push(["e", parent, relay, "root"]);
+      if (forwardedFrom) {
+        tags.push(["fwd", forwardedFrom]);
       }
-    }
-    const event = await publishEncryptedMessage({
-      tags,
-      eventMetadata: encryptedMessage,
-    });
-    return convertEvent<Kind.EncryptedDirectMessage>(
-      event,
-      publicKey,
-      privateKey,
-    )!!;
-  });
+
+      const event = await publishEncryptedMessage({
+        tags,
+        eventMetadata: encryptedMessage,
+      });
+      return convertEvent<Kind.EncryptedDirectMessage>(
+        event,
+        publicKey,
+        privateKey,
+      )!!;
+    },
+  );
 }

lib/nostr/mutations/send-public-message.ts

@@ -7,6 +7,7 @@ import { Kind } from "nostr-tools";
 interface Payload {
   message: string;
   mentions?: string[];
+  forwardedFrom?: string;
 }
 
 export function useNostrSendPublicMessage(channelId?: string, parent?: string) {
@@ -19,7 +20,7 @@ export function useNostrSendPublicMessage(channelId?: string, parent?: string) {
 
   return useMutation(
     ["chats/send-public-message"],
-    async ({ message, mentions }: Payload) => {
+    async ({ message, mentions, forwardedFrom }: Payload) => {
       const root = parent || channelId;
 
       if (!root) {
@@ -39,6 +40,10 @@ export function useNostrSendPublicMessage(channelId?: string, parent?: string) {
         mentions.forEach((m) => tags.push(["p", m]));
       }
 
+      if (forwardedFrom) {
+        tags.push(["fwd", forwardedFrom]);
+      }
+
       const event = await publishChannelMessage({
         tags,
         eventMetadata: message,

lib/nostr/types/messages.ts

@@ -1,24 +1,24 @@
-export type PublicMessage = {
+interface BaseMessage {
   id: string;
-  root: string;
   content: string;
   creator: string;
   created: number;
+  forwardedFrom?: string;
+}
+
+export interface PublicMessage extends BaseMessage {
+  root: string;
   children?: PublicMessage[];
   mentions: string[];
   sent?: number;
-};
+}
 
-export type DirectMessage = {
-  id: string;
+export interface DirectMessage extends BaseMessage {
   root?: string;
-  content: string;
   peer: string;
-  creator: string;
-  created: number;
   children?: DirectMessage[];
   decrypted: boolean;
   sent?: number;
-};
+}
 
 export type Message = PublicMessage | DirectMessage;

lib/nostr/utils/event-converter.ts

@@ -44,6 +44,7 @@ export function convertEvent<KIND extends keyof EventConverterResult>(
       return new Promise<Message>(async (resolve) => {
         const receiver = findTagValue(event, "p")!!;
         const peer = receiver === publicKey ? event.pubkey : receiver;
+        const forwardedFrom = event.tags.find(([t]) => t === "fwd")?.[1];
         const encryptedMessage = {
           id: event.id,
           root: filterTagValue(event, "e").find(
@@ -54,6 +55,7 @@ export function convertEvent<KIND extends keyof EventConverterResult>(
           created: event.created_at,
           decrypted: false,
           sent: 1,
+          forwardedFrom,
         };
 
         if (!privateKey) {
@@ -82,6 +84,7 @@ export function convertEvent<KIND extends keyof EventConverterResult>(
       const mentions = filterTagValue(event, "p")
         .map((mention) => mention?.[1])
         .filter((mention) => !!mention);
+      const forwardedFrom = event.tags.find(([t]) => t === "fwd")?.[1];
       if (!root) return null;
       return event.content
         ? {
@@ -90,6 +93,7 @@ export function convertEvent<KIND extends keyof EventConverterResult>(
             content: event.content,
             creator: event.pubkey,
             mentions,
+            forwardedFrom,
             created: event.created_at,
             sent: 1,
           }

package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ecency/ns-query",
   "description": "React-query based Nostr protocol SDK for Ecency vision and mobile",
-  "version": "1.1.7",
+  "version": "1.1.8",
   "repository": "https://github.com/ecency/ns-query",
   "author": "ildar.timerbaev <dkildar@gmail.com>",
   "license": "MIT",