fixed conflicts

konwro · Nov 10, 2020 · 3bc945e · 3bc945e
1 parent 491abe2
commit 3bc945e
Show file tree

Hide file tree

Showing 2 changed files with 313 additions and 303 deletions.
diff --git a/sherlock/resources/data.json b/sherlock/resources/data.json
@@ -14,6 +14,15 @@
     "username_claimed": "red",
     "username_unclaimed": "noonewouldeverusethis7"
   },
+  "500px": {
+    "errorMsg": "No message available",
+    "errorType": "message",
+    "url": "https://500px.com/p/{}",
+    "urlMain": "https://500px.com/",
+    "urlProbe": "https://api.500px.com/graphql?operationName=ProfileRendererQuery&variables=%7B%22username%22%3A%22{}%22%7D&extensions=%7B%22persistedQuery%22%3A%7B%22version%22%3A1%2C%22sha256Hash%22%3A%224d02ff5c13927a3ac73b3eef306490508bc765956940c31051468cf30402a503%22%7D%7D",
+    "username_claimed": "blue",
+    "username_unclaimed": "noonewouldeverusethis7"
+  },
   "7Cups": {
     "errorType": "status_code",
     "url": "https://www.7cups.com/@{}",
@@ -806,10 +815,10 @@
     "username_unclaimed": "noonewouldeverusethis7"
   },
   "Instructables": {
-    "errorMsg": "404: We're sorry, things break sometimes",
-    "errorType": "message",
+    "errorType": "status_code",
     "url": "https://www.instructables.com/member/{}",
     "urlMain": "https://www.instructables.com/",
+    "urlProbe": "https://www.instructables.com/json-api/showAuthorExists?screenName={}",
     "username_claimed": "blue",
     "username_unclaimed": "noonewouldeverusethis7"
   },