Merge branch 'master' into p2p-nip

1 files changed, 18 insertions, 17 deletions

diff --git a/15.md b/15.md
index 55814fb..b55b444 100644
--- a/15.md
+++ b/15.md
@@ -6,7 +6,7 @@ Nostr Marketplace
 
 `draft` `optional`
 
-Based on https://github.com/lnbits/Diagon-Alley.
+Based on [Diagon-Alley](https://github.com/lnbits/Diagon-Alley).
 
 Implemented in [NostrMarket](https://github.com/lnbits/nostrmarket) and [Plebeian Market](https://github.com/PlebeianTech/plebeian-market).
 
@@ -73,10 +73,10 @@ Fields that are not self-explanatory:
 
 **Event Tags**
 
-```json
+```jsonc
 {
   "tags": [["d", <string, id of stall]],
-  ...
+  // other fields...
 }
 ```
  - the `d` tag is required, its value MUST be the same as the stall `id`.
@@ -124,12 +124,12 @@ Fields that are not self-explanatory:
 
 **Event Tags**
 
-```json
+```jsonc
   "tags": [
     ["d", <string, id of product],
     ["t", <string (optional), product category],
     ["t", <string (optional), product category],
-    ...
+    // other fields...
   ],
   ...
 ```
@@ -139,7 +139,7 @@ Fields that are not self-explanatory:
 
 ## Checkout events
 
-All checkout events are sent as JSON strings using ([NIP-04](https://github.com/nostr-protocol/nips/blob/master/04.md)).
+All checkout events are sent as JSON strings using [NIP-04](04.md).
 
 The `merchant` and the `customer` can exchange JSON messages that represent different actions. Each `JSON` message `MUST` have a `type` field indicating the what the JSON represents. Possible types:
 
@@ -150,7 +150,7 @@ The `merchant` and the `customer` can exchange JSON messages that represent diff
 | 2            | Merchant | Order Status Update |
 
 ### Step 1: `customer` order (event)
-The below JSON goes in content of [NIP-04](https://github.com/nostr-protocol/nips/blob/master/04.md).
+The below JSON goes in content of [NIP-04](04.md).
 
 ```json
 {
@@ -158,7 +158,7 @@ The below JSON goes in content of [NIP-04](https://github.com/nostr-protocol/nip
   "type": 0,
   "name": <string (optional), ???>,
   "address": <string (optional), for physical goods an address should be provided>,
-  "message": "<string (optional), message for merchant>,
+  "message": <string (optional), message for merchant>,
   "contact": {
     "nostr": <32-bytes hex of a pubkey>,
     "phone": <string (optional), if the customer wants to be contacted by phone>,
@@ -182,7 +182,7 @@ _Open_: is `contact.nostr` required?
 
 Sent back from the merchant for payment. Any payment option is valid that the merchant can check.
 
-The below JSON goes in `content` of [NIP-04](https://github.com/nostr-protocol/nips/blob/master/04.md).
+The below JSON goes in `content` of [NIP-04](04.md).
 
 `payment_options`/`type` include:
 
@@ -217,7 +217,7 @@ The below JSON goes in `content` of [NIP-04](https://github.com/nostr-protocol/n
 
 Once payment has been received and processed.
 
-The below JSON goes in `content` of [NIP-04](https://github.com/nostr-protocol/nips/blob/master/04.md).
+The below JSON goes in `content` of [NIP-04](04.md).
 
 ```json
 {
@@ -231,13 +231,13 @@ The below JSON goes in `content` of [NIP-04](https://github.com/nostr-protocol/n
 
 ## Customize Marketplace
 
-Create a customized user experience using the `naddr` from [NIP-19](https://github.com/nostr-protocol/nips/blob/master/19.md#shareable-identifiers-with-extra-metadata). The use of `naddr` enables easy sharing of marketplace events while incorporating a rich set of metadata. This metadata can include relays, merchant profiles, and more. Subsequently, it allows merchants to be grouped into a market, empowering the market creator to configure the marketplace's user interface and user experience, and share that marketplace. This customization can encompass elements such as market name, description, logo, banner, themes, and even color schemes, offering a tailored and unique marketplace experience.
+Create a customized user experience using the `naddr` from [NIP-19](19.md#shareable-identifiers-with-extra-metadata). The use of `naddr` enables easy sharing of marketplace events while incorporating a rich set of metadata. This metadata can include relays, merchant profiles, and more. Subsequently, it allows merchants to be grouped into a market, empowering the market creator to configure the marketplace's user interface and user experience, and share that marketplace. This customization can encompass elements such as market name, description, logo, banner, themes, and even color schemes, offering a tailored and unique marketplace experience.
 
 ### Event `30019`: Create or update marketplace UI/UX
 
 **Event Content**
 
-```json
+```jsonc
 {
   "name": <string (optional), market name>,
   "about": <string (optional), market description>,
@@ -248,7 +248,7 @@ Create a customized user experience using the `naddr` from [NIP-19](https://gith
     "darkMode": <bool, true/false>
   },
   "merchants": [array of pubkeys (optional)],
-  ...
+  // other fields...
 }
 ```
 
@@ -290,17 +290,18 @@ This event leverages naddr to enable comprehensive customization and sharing of
 
 ### Event `1021`: Bid
 
-```json
+```jsonc
 {
     "content": <int, amount of sats>,
     "tags": [["e", <event ID of the auction to bid on>]],
+    // other fields...
 }
 ```
 
 Bids are simply events of kind `1021` with a `content` field specifying the amount, in the currency of the auction. Bids must reference an auction.
 
 > [!NOTE]
-> Auctions can be edited as many times as desired (they are "parameterized replaceable events") by the author - even after the start_date, but they cannot be edited after they have received the first bid! This is enforced by the fact that bids reference the event ID of the auction (rather than the product UUID), which changes with every new version of the auctioned product. So a bid is always attached to one "version". Editing the auction after a bid would result in the new product losing the bid!
+> Auctions can be edited as many times as desired (they are "addressable events") by the author - even after the start_date, but they cannot be edited after they have received the first bid! This is enforced by the fact that bids reference the event ID of the auction (rather than the product UUID), which changes with every new version of the auctioned product. So a bid is always attached to one "version". Editing the auction after a bid would result in the new product losing the bid!
 
 ### Event `1022`: Bid confirmation
 
@@ -331,8 +332,8 @@ Another thing that can happen is - if bids happen very close to the end date of
 
 ## Customer support events
 
-Customer support is handled over whatever communication method was specified. If communicating via nostr, NIP-04 is used https://github.com/nostr-protocol/nips/blob/master/04.md.
+Customer support is handled over whatever communication method was specified. If communicating via nostr, [NIP-04](04.md) is used.
 
 ## Additional
 
-Standard data models can be found <a href="https://raw.githubusercontent.com/lnbits/nostrmarket/main/models.py">here</a>
+Standard data models can be found [here](https://raw.githubusercontent.com/lnbits/nostrmarket/main/models.py)