Merge pull request #48 from Permissionless-Software-Foundation/ct-unstable

Better error handling for tokens without mutable data

production/docker/docker-compose.yml

@@ -70,10 +70,10 @@ services:
     restart: always
 
   bch-dex:
-    build:
-      context: ./bch-dex/
-      dockerfile: Dockerfile
-    #image: christroutner/bch-dex:v1.9.6
+    #build:
+    #  context: ./bch-dex/
+    #  dockerfile: Dockerfile
+    image: christroutner/bch-dex:v1.13.0
     container_name: bch-dex
     environment:
       CONSUMER_URL: 'https://free-bch.fullstack.cash'
@@ -94,10 +94,10 @@ services:
     restart: always
 
   dex-ui:
-    build:
-      context: ./bch-dex-ui/
-      dockerfile: Dockerfile
-    #image: christroutner/bch-dex-ui:v1.6.6
+    #build:
+    #  context: ./bch-dex-ui/
+    #  dockerfile: Dockerfile
+    image: christroutner/bch-dex-ui:v1.12.0
     container_name: dex-ui
     environment:
       SERVER: 'http://192.168.2.3'

production/rpi-docker/docker-compose.yml

@@ -46,7 +46,7 @@ services:
     image: christroutner/p2wdb-rpi:v3.0.10
     container_name: p2wdb
     environment:
-      CONSUMER_URL: 'https://free-bch.fullstack.cash'
+      CONSUMER_URL: 'https://wa-usa-bch-consumer.fullstackcash.nl'
       DEBUG_LEVEL: 1
     logging:
       driver: 'json-file'
@@ -67,13 +67,14 @@ services:
     restart: always
 
   bch-dex:
-    build:
-     context: ./bch-dex/
-     dockerfile: Dockerfile
-    #image: christroutner/bch-dex-rpi:v1.9.8
+    #build:
+    # context: ./bch-dex/
+    # dockerfile: Dockerfile
+    image: christroutner/bch-dex-rpi:v1.13.0
     container_name: bch-dex
     environment:
-      CONSUMER_URL: 'https://free-bch.fullstack.cash'
+      #CONSUMER_URL: 'https://free-bch.fullstack.cash'
+      CONSUMER_URL: 'https://wa-usa-bch-consumer.fullstackcash.nl'
     logging:
       driver: 'json-file'
       options:
@@ -94,7 +95,7 @@ services:
     #build:
     #  context: ./bch-dex-ui/
     #  dockerfile: Dockerfile
-    image: christroutner/bch-dex-ui-rpi:v1.7.5
+    image: christroutner/bch-dex-ui-rpi:v1.13.0
     container_name: dex-ui
     logging:
       driver: 'json-file'

src/use-cases/offer/index.js

@@ -122,7 +122,13 @@ class OfferUseCases {
     try {
       let nsfw = false
 
-      const cid = tokenData.mutableData.substring(7)
+      const mutableCid = tokenData.mutableData
+
+      // If there is no mutable IPFS CID, then skip this token.
+      if (!mutableCid.includes('ipfs://')) return nsfw
+
+      // Revove the ipfs:// prefix.
+      const cid = mutableCid.substring(7)
 
       // Retrieve the mutable data from Filecoin/IPFS.
       const url = `https://${cid}.ipfs.w3s.link/data.json`
@@ -144,7 +150,7 @@ class OfferUseCases {
       return nsfw
     } catch (err) {
       console.error('Error in detectNsfw(): ', err)
-      throw err
+      return false
     }
   }