From 43281fd5b34cf3ff32aa6b4f39c90ee3e3947f0f Mon Sep 17 00:00:00 2001 From: Peetz0r Date: Sun, 29 Mar 2020 16:57:30 +0200 Subject: [PATCH] Configurable email address for user agent --- config.example.json | 1 + get-barcode.js | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/config.example.json b/config.example.json index 3225284..b6e93a6 100644 --- a/config.example.json +++ b/config.example.json @@ -2,6 +2,7 @@ "apiKeys": { "eanData": "YOURKEYGOESHERE" }, + "email": "you@example.com", "irc": { "host": "irc.freenode.net", "port": 6667, diff --git a/get-barcode.js b/get-barcode.js index 4e18a4e..342c4b3 100644 --- a/get-barcode.js +++ b/get-barcode.js @@ -1,13 +1,13 @@ "use strict"; const Promise = require("bluebird"); -const bhttp = require("bhttp").session({ headers: { "user-agent": "barcodebot (problems: admin@cryto.net)" } }); const dotty = require("dotty"); const cheerio = require("cheerio"); const url = require("url"); const chalk = require("chalk"); const config = require("./config.json"); +const bhttp = require("bhttp").session({ headers: { "user-agent": `barcodebot (problems: ${config.email})` } }); const parseFoodbook = require("./parse-foodbook"); function log(barcode, message) { @@ -157,7 +157,7 @@ function getBarcode_foodBook(barcode) { function getBarcode_openFoodFacts(barcode) { return Promise.try(() => { log(barcode, "Trying OpenFoodFacts..."); - + return bhttp.get(`https://world.openfoodfacts.org/api/v0/product/${encodeURIComponent(barcode)}.json`); }).then((response) => { if (response.statusCode === 200 && response.body.status === 1 && response.body.product.product_name != null) { @@ -200,7 +200,7 @@ function getBarcode_buycott(barcode) { } else { productName = product; } - + return { name: productName, image: $(".header_image img").attr("src")