Merge branch 'main' into support-fediverse-posts

src/claimDefinitions/devto.js

@@ -46,11 +46,11 @@ const processURI = (uri) => {
         }
       }
     },
-    claim: {
+    claim: [{
       format: E.ClaimFormat.URI,
       relation: E.ClaimRelation.CONTAINS,
       path: ['body_markdown']
-    }
+    }]
   }
 }
 

src/claimDefinitions/discourse.js

@@ -46,11 +46,11 @@ const processURI = (uri) => {
         }
       }
     },
-    claim: {
+    claim: [{
       format: E.ClaimFormat.URI,
       relation: E.ClaimRelation.CONTAINS,
       path: ['user', 'bio_raw']
-    }
+    }]
   }
 }
 

src/claimDefinitions/dns.js

@@ -45,11 +45,11 @@ const processURI = (uri) => {
         }
       }
     },
-    claim: {
+    claim: [{
       format: E.ClaimFormat.URI,
       relation: E.ClaimRelation.CONTAINS,
       path: ['records', 'txt']
-    }
+    }]
   }
 }
 

src/claimDefinitions/gitea.js

@@ -46,11 +46,11 @@ const processURI = (uri) => {
         }
       }
     },
-    claim: {
+    claim: [{
       format: E.ClaimFormat.URI,
       relation: E.ClaimRelation.EQUALS,
       path: ['description']
-    }
+    }]
   }
 }
 

src/claimDefinitions/github.js

@@ -46,11 +46,11 @@ const processURI = (uri) => {
         }
       }
     },
-    claim: {
+    claim: [{
       format: E.ClaimFormat.URI,
       relation: E.ClaimRelation.CONTAINS,
       path: ['files', 'openpgp.md', 'content']
-    }
+    }]
   }
 }
 

src/claimDefinitions/gitlab.js

@@ -46,11 +46,11 @@ const processURI = (uri) => {
         }
       }
     },
-    claim: {
+    claim: [{
       format: E.ClaimFormat.URI,
       relation: E.ClaimRelation.EQUALS,
       path: ['description']
-    }
+    }]
   }
 }
 

src/claimDefinitions/hackernews.js

@@ -46,11 +46,11 @@ const processURI = (uri) => {
         }
       }
     },
-    claim: {
+    claim: [{
       format: E.ClaimFormat.URI,
       relation: E.ClaimRelation.CONTAINS,
       path: ['about']
-    }
+    }]
   }
 }
 

src/claimDefinitions/irc.js

@@ -46,11 +46,11 @@ const processURI = (uri) => {
         }
       }
     },
-    claim: {
+    claim: [{
       format: E.ClaimFormat.URI,
       relation: E.ClaimRelation.CONTAINS,
       path: []
-    }
+    }]
   }
 }
 

src/claimDefinitions/liberapay.js

@@ -46,11 +46,11 @@ const processURI = (uri) => {
         }
       }
     },
-    claim: {
+    claim: [{
       format: E.ClaimFormat.URI,
       relation: E.ClaimRelation.CONTAINS,
       path: ['statements', 'content']
-    }
+    }]
   }
 }
 

src/claimDefinitions/lichess.js

@@ -46,11 +46,11 @@ const processURI = (uri) => {
         }
       }
     },
-    claim: {
+    claim: [{
       format: E.ClaimFormat.FINGERPRINT,
       relation: E.ClaimRelation.CONTAINS,
       path: ['profile', 'links']
-    }
+    }]
   }
 }
 

src/claimDefinitions/lobsters.js

@@ -46,11 +46,11 @@ const processURI = (uri) => {
         }
       }
     },
-    claim: {
+    claim: [{
       format: E.ClaimFormat.URI,
       relation: E.ClaimRelation.CONTAINS,
       path: ['about']
-    }
+    }]
   }
 }
 

src/claimDefinitions/matrix.js

@@ -60,11 +60,11 @@ const processURI = (uri) => {
         }
       }
     },
-    claim: {
+    claim: [{
       format: E.ClaimFormat.URI,
       relation: E.ClaimRelation.CONTAINS,
       path: ['content', 'body']
-    }
+    }]
   }
 }
 

src/claimDefinitions/owncast.js

@@ -46,11 +46,11 @@ const processURI = (uri) => {
         }
       }
     },
-    claim: {
+    claim: [{
       format: E.ClaimFormat.FINGERPRINT,
       relation: E.ClaimRelation.CONTAINS,
       path: ['socialHandles', 'url']
-    }
+    }]
   }
 }
 

src/claimDefinitions/reddit.js

@@ -46,11 +46,11 @@ const processURI = (uri) => {
         }
       }
     },
-    claim: {
+    claim: [{
       format: E.ClaimFormat.URI,
       relation: E.ClaimRelation.CONTAINS,
       path: ['data', 'children', 'data', 'selftext']
-    }
+    }]
   }
 }
 

src/claimDefinitions/stackexchange.js

@@ -48,11 +48,11 @@ const processURI = (uri) => {
         }
       }
     },
-    claim: {
+    claim: [{
       format: E.ClaimFormat.URI,
       relation: E.ClaimRelation.CONTAINS,
       path: ['items', 'about_me']
-    }
+    }]
   }
 }
 

src/claimDefinitions/telegram.js

@@ -46,11 +46,11 @@ const processURI = (uri) => {
         }
       }
     },
-    claim: {
+    claim: [{
       format: E.ClaimFormat.URI,
       relation: E.ClaimRelation.EQUALS,
       path: ['text']
-    }
+    }]
   }
 }
 

src/claimDefinitions/twitter.js

@@ -45,11 +45,11 @@ const processURI = (uri) => {
         }
       }
     },
-    claim: {
+    claim: [{
       format: E.ClaimFormat.URI,
       relation: E.ClaimRelation.CONTAINS,
       path: []
-    }
+    }]
   }
 }
 

src/claimDefinitions/xmpp.js

@@ -46,11 +46,11 @@ const processURI = (uri) => {
         }
       }
     },
-    claim: {
+    claim: [{
       format: E.ClaimFormat.URI,
       relation: E.ClaimRelation.CONTAINS,
       path: []
-    }
+    }]
   }
 }
 

src/verifications.js

@@ -200,14 +200,10 @@ const run = async (proofData, claimData, fingerprint) => {
     errors: []
   }
 
-  const claimMethods = Array.isArray(claimData.claim)
-    ? claimData.claim
-    : [claimData.claim]
-
   switch (claimData.proof.request.format) {
     case E.ProofFormat.JSON:
-      for (let index = 0; index < claimMethods.length; index++) {
-        const claimMethod = claimMethods[index]
+      for (let index = 0; index < claimData.claim.length; index++) {
+        const claimMethod = claimData.claim[index]
         try {
           res.result = res.result || await runJSON(
             proofData,
@@ -223,8 +219,8 @@ const run = async (proofData, claimData, fingerprint) => {
       res.completed = true
       break
     case E.ProofFormat.TEXT:
-      for (let index = 0; index < claimMethods.length; index++) {
-        const claimMethod = claimMethods[index]
+      for (let index = 0; index < claimData.claim.length; index++) {
+        const claimMethod = claimData.claim[index]
         try {
           res.result = res.result || await containsProof(
             proofData,