Add source tag with order message link

bot/messages.ts

@@ -13,6 +13,7 @@ const {
   getUserAge,
   getStars,
 } = require('../util');
+const OrderEvents = require('./modules/events/orders');
 const { logger } = require('../logger');
 import { MainContext } from './start';
 import { UserDocument } from '../models/user'
@@ -601,6 +602,8 @@ const publishBuyOrderMessage = async (
       message1 && (message1.message_id).toString() ? (message1.message_id).toString() : null;
 
     await order.save();
+    // We can publish the order on nostr now becase we have the message id
+    OrderEvents.orderUpdated(order);
     if (messageToUser) {
       // Message to user let know the order was published
       await pendingBuyMessage(bot, user, order, channel, i18n);
@@ -634,6 +637,8 @@ const publishSellOrderMessage = async (
       message1 && (message1.message_id).toString() ? (message1.message_id).toString() : null;
 
     await order.save();
+    // We can publish the order on nostr now becase we have the message id
+    OrderEvents.orderUpdated(order);
     // Message to user let know the order was published
     if (messageToUser)
       await pendingSellMessage(ctx, user, order, channel, i18n);

bot/modules/nostr/events.js

@@ -13,9 +13,14 @@ const orderToTags = async order => {
     Math.floor(Date.now() / 1000) +
     parseInt(process.env.ORDER_PUBLISHED_EXPIRATION_WINDOW);
   let fiat_amount = order.fiat_amount;
-  if (order.amount === 0) {
+  if (order.fiat_amount === undefined) {
     fiat_amount = `${order.min_amount}-${order.max_amount}`;
   }
+  const channel =
+    process.env.CHANNEL[0] === '@'
+      ? process.env.CHANNEL.slice(1)
+      : process.env.CHANNEL;
+  let source = `https://t.me/${channel}/${order.tg_channel_message1}`;
   const tags = [];
   tags.push(['d', order.id]);
   tags.push(['k', order.type]);
@@ -25,21 +30,24 @@ const orderToTags = async order => {
   tags.push(['fa', fiat_amount.toString()]);
   tags.push(['pm', order.payment_method]);
   tags.push(['premium', order.price_margin.toString()]);
-  tags.push(['y', 'lnp2pbot']);
-  tags.push(['z', 'order']);
-  tags.push(['expiration', expiration.toString()]);
   if (order.community_id) {
     const community = await Community.findById(order.community_id);
-    if (community.public) {
-      tags.push(['community_id', order.community_id]);
-    }
+    source = `https://t.me/${community.group}/${order.tg_channel_message1}`;
+    tags.push(['community_id', order.community_id]);
   }
+  tags.push(['source', source]);
+  tags.push(['y', 'lnp2pbot']);
+  tags.push(['z', 'order']);
+  tags.push(['expiration', expiration.toString()]);
 
   return tags;
 };
 
 exports.createOrderEvent = async order => {
   const myPrivKey = Config.getPrivateKey();
+  if (order.is_public === false) {
+    return;
+  }
 
   const created_at = Math.floor(Date.now() / 1000);
   const tags = await orderToTags(order);

bot/ordersActions.js

@@ -99,7 +99,9 @@ const createOrder = async (
     }
     await order.save();
 
-    OrderEvents.orderUpdated(order);
+    if (order.status !== 'PENDING') {
+      OrderEvents.orderUpdated(order);
+    }
 
     return order;
   } catch (error) {