Merge branch 'master' of github.com:AliasIO/Wappalyzer

8 years ago · 06523bf467
parent 8652b417b3 d15a7688ad
commit 06523bf467
27 changed files with 79 additions and 25 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -1,6 +1,6 @@
 language: node_js
 node_js:
-  - "4"
+  - "node"
 sudo: false
 before_install:
 - export WAPPALYZER_ROOT=$TRAVIS_BUILD_DIR
--- a/bin/wappalyzer-build
+++ b/bin/wappalyzer-build
@ -22,13 +22,9 @@ echo "Prettifying apps.json..."

 node $WAPPALYZER_NODE_PATH/node_modules/jsonlint/lib/cli.js -ist $'\t' $WAPPALYZER_ROOT/src/apps.json

-echo "Compressing PNG icons..."
+echo "Compressing PNG and SVG icons..."

-node $WAPPALYZER_NODE_PATH/node_modules/imagemin-cli/cli.js $WAPPALYZER_ROOT/src/icons $WAPPALYZER_ROOT/src/icons -o 7
-
-echo "Compressing SVG icons..."
-
-node $WAPPALYZER_NODE_PATH/node_modules/svgo/bin/svgo -q -f $WAPPALYZER_ROOT/src/icons $WAPPALYZER_ROOT/src/icons
+node $WAPPALYZER_NODE_PATH/node_modules/imagemin-cli/cli.js $WAPPALYZER_ROOT/src/icons/* $WAPPALYZER_ROOT/src/icons

 echo "Converting SVG icons to PNG..."

@ -42,12 +38,16 @@ do
 	dest="$WAPPALYZER_ROOT/src/icons/converted/$(basename "$svg").png"

 	if [[ ! -f "$dest" ]]; then
-		svg2png "$svg" --width=32 --height=32 --output "$dest" || true
+		node $WAPPALYZER_NODE_PATH/node_modules/svg2png/bin/svg2png-cli "$svg" --width=32 --height=32 --output "$dest" || true
 	fi
 done

 IFS="$OIFS"

+echo "Compressing converted PNG icons..."
+
+node $WAPPALYZER_NODE_PATH/node_modules/imagemin-cli/cli.js $WAPPALYZER_ROOT/src/icons/converted/* $WAPPALYZER_ROOT/src/icons/converted
+
 wappalyzer links

 # Npm Module
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@ -39,7 +39,6 @@ RUN su wappalyzer -c "mkdir $WAPPALYZER_NODE_PATH"

 ADD node/package.json $WAPPALYZER_NODE_PATH/package.json

-RUN npm i -g npm svg2png --prefix=/usr/local
 RUN ln -s -f /usr/local/bin/npm /usr/bin/npm
 RUN su wappalyzer -c "cd $WAPPALYZER_NODE_PATH && npm i"

--- a/docker/node/package.json
+++ b/docker/node/package.json
@ -12,14 +12,14 @@
    "test": "./bin/wappalyzer build"
  },
  "devDependencies": {
-    "file-type": "3.4.*",
-	"is-svg": "1.1.*",
-    "read-chunk": "1.0.*",
+    "file-type": "3.8.*",
+    "is-svg": "2.0.*",
+    "read-chunk": "2.0.*",
    "jsonlint": "*",
    "jpm": "*",
-    "imagemin-cli": "*",
-		"phantomjs-prebuilt": "*",
-    "svgo": "*"
+    "imagemin-cli": "2.*.*",
+    "phantomjs-prebuilt": "*",
+    "svg2png": "3.*.*"
  },
  "engines": {
    "node": ">= 4"
--- a/src/apps.json
+++ b/src/apps.json
@ -3932,6 +3932,22 @@
 			"implies": "PHP",
 			"website": "www.lithium.com"
 		},
+		"LiveAgent": {
+			"cats": [
+				52
+			],
+			"env": "^LiveAgent$",
+			"icon": "LiveAgent.png",
+			"website": "www.ladesk.com"
+		},
+		"LiveChat": {
+			"cats": [
+				52
+			],
+			"icon": "LiveChat.png",
+			"script": "cdn\\.livechatinc\\.com/.*tracking\\.js",
+			"website": "livechatinc.com"
+		},
 		"LiveJournal": {
 			"cats": [
 				11
@ -6958,6 +6974,14 @@
 			],
 			"website": "taiga.io"
 		},
+		"Tawk.to": {
+			"cats": [
+				52
+			],
+			"icon": "TawkTo.png",
+			"script": "//embed\\.tawk\\.to",
+			"website": "tawk.to"
+		},
 		"Tealeaf": {
 			"cats": [
 				10
@ -7337,6 +7361,17 @@
 			"script": "underscore.*\\.js",
 			"website": "underscorejs.org"
 		},
+		"UserLike": {
+			"cats": [
+				52
+			],
+			"icon": "UserLike.svg",
+			"script": [
+				"userlike\\.min\\.js",
+				"userlikelib\\.min\\.js"
+			],
+			"website": "userlike.com"
+		},
 		"UserRules": {
 			"cats": [
 				13
@ -9190,6 +9225,7 @@
 		"48": "Network Storage",
 		"49": "Feed Readers",
 		"50": "Document Management Systems",
-		"51": "Landing Page Builders"
+		"51": "Landing Page Builders",
+		"52": "Live Chat"
 	}
-}
+}
--- a/src/drivers/chrome/_locales/el/messages.json
+++ b/src/drivers/chrome/_locales/el/messages.json
@ -55,5 +55,6 @@
 	"categoryName48":           { "message": "Δικτυακός Αποθηκευτικός Χώρος" },
 	"categoryName49":           { "message": "Feed Readers" },
 	"categoryName50":           { "message": "Συστήματα Διαχειρίσης Εγγράφων" },
-	"categoryName51":           { "message": "Σύστημα Κατασκευής Σελίδων Υποδοχής" }
+	"categoryName51":           { "message": "Σύστημα Κατασκευής Σελίδων Υποδοχής" },
+	"categoryName52":           { "message": "Live Chat" }
 }
--- a/src/drivers/chrome/_locales/en/messages.json
+++ b/src/drivers/chrome/_locales/en/messages.json
@ -55,5 +55,6 @@
 	"categoryName48":           { "message": "Network Storage" },
 	"categoryName49":           { "message": "Feed Readers" },
 	"categoryName50":           { "message": "Document Management Systems" },
-	"categoryName51":           { "message": "Landing Page Builder" }
+	"categoryName51":           { "message": "Landing Page Builder" },
+	"categoryName52":           { "message": "Live Chat" }
 }
--- a/src/drivers/chrome/_locales/es/messages.json
+++ b/src/drivers/chrome/_locales/es/messages.json
@ -59,5 +59,6 @@
 	"categoryName48":           { "message": "Network Storage" },
 	"categoryName49":           { "message": "Feed Readers" },
 	"categoryName50":           { "message": "Document Management Systems" },
-	"categoryName51":           { "message": "Landing Page Builder" }
+	"categoryName51":           { "message": "Landing Page Builder" },
+	"categoryName52":           { "message": "Live Chat" }
 }
--- a/src/drivers/chrome/_locales/fr/messages.json
+++ b/src/drivers/chrome/_locales/fr/messages.json
@ -59,5 +59,6 @@
 	"categoryName48":       { "message": "Stockage réseau" },
 	"categoryName49":       { "message": "Lecteur RSS" },
 	"categoryName50":       { "message": "Système de gestion de documents" },
-	"categoryName51":       { "message": "Landing Page Builder" }
+	"categoryName51":       { "message": "Landing Page Builder" },
+	"categoryName52":       { "message": "Chat en direct" }
 }
--- a/src/drivers/chrome/_locales/gr/messages.json
+++ b/src/drivers/chrome/_locales/gr/messages.json
@ -55,5 +55,6 @@
 	"categoryName48":           { "message": "Δικτυακός Αποθηκευτικός Χώρος" },
 	"categoryName49":           { "message": "Feed Readers" },
 	"categoryName50":           { "message": "Συστήματα Διαχειρίσης Εγγράφων" },
-	"categoryName51":           { "message": "Σύστημα Κατασκευής Σελίδων Υποδοχής" }
+	"categoryName51":           { "message": "Σύστημα Κατασκευής Σελίδων Υποδοχής" },
+	"categoryName52":           { "message": "Live Chat" }
 }
--- a/src/drivers/chrome/_locales/it/messages.json
+++ b/src/drivers/chrome/_locales/it/messages.json
@ -59,6 +59,7 @@
 	"categoryName48":           { "message": "Network Storage" },
 	"categoryName49":           { "message": "Lettore di Feed" },
 	"categoryName50":           { "message": "Sistema di Gestione Documenti" },
-	"categoryName51":           { "message": "Landing Page Builder" }
+	"categoryName51":           { "message": "Landing Page Builder" },
+	"categoryName52":           { "message": "Live Chat" }
 }

--- a/src/drivers/chrome/_locales/ro/messages.json
+++ b/src/drivers/chrome/_locales/ro/messages.json
@ -55,5 +55,6 @@
 	"categoryName48":           { "message": "Network Storage" },
 	"categoryName49":           { "message": "Feed Readers" },
 	"categoryName50":           { "message": "Document Management Systems" },
-	"categoryName51":           { "message": "Landing Page Builder" }
+	"categoryName51":           { "message": "Landing Page Builder" },
+	"categoryName52":           { "message": "Live Chat" }
 }
--- a/src/drivers/chrome/_locales/ru/messages.json
+++ b/src/drivers/chrome/_locales/ru/messages.json
@ -45,7 +45,8 @@
  "categoryName48" : { "message" : "Сетевое хранилище" },
  "categoryName49" : { "message" : "Граббер контента" },
  "categoryName50" : { "message" : "Управление документами" },
-  "categoryName51":  { "message": "Генератор лендингов" },
+  "categoryName51" : { "message": "Генератор лендингов" },
+  "categoryName52" : { "message": "Live Chat" },
  "github" : { "message" : "Форкнуть на GitHub!" },
  "noAppsDetected" : { "message" : "Нет данных о сайте" },
  "nothingToDo" : { "message" : "Тут нечего искать" },
--- a/src/drivers/firefox/locale/de-DE.properties
+++ b/src/drivers/firefox/locale/de-DE.properties
@ -65,3 +65,4 @@ cat48                = Netzwerkspeicher
 cat49                = Feed-Leser
 cat50                = Document Management Systems
 cat51                = Landing Page Builder
+cat52                = Live Chat
--- a/src/drivers/firefox/locale/el-GR.properties
+++ b/src/drivers/firefox/locale/el-GR.properties
@ -65,3 +65,4 @@ cat48                = Δικτυακός Αποθηκευτικός Χώρος
 cat49                = Feed Readers
 cat50                = Συστήματα Διαχειρίσης Εγγράφων
 cat51                = Σύστημα Κατασκευής Σελίδων Υποδοχής
+cat52                = Live Chat
--- a/src/drivers/firefox/locale/en-GB.properties
+++ b/src/drivers/firefox/locale/en-GB.properties
@ -65,3 +65,4 @@ cat48                = Network Storage
 cat49                = Feed Readers
 cat50                = Document Management Systems
 cat51                = Landing Page Builder
+cat52                = Live Chat
--- a/src/drivers/firefox/locale/en-US.properties
+++ b/src/drivers/firefox/locale/en-US.properties
@ -65,3 +65,4 @@ cat48                = Network Storage
 cat49                = Feed Readers
 cat50                = Document Management Systems
 cat51                = Landing Page Builder
+cat52                = Live Chat
--- a/src/drivers/firefox/locale/es-ES.properties
+++ b/src/drivers/firefox/locale/es-ES.properties
@ -65,3 +65,4 @@ cat48                = Network Storage
 cat49                = Feed Readers
 cat50                = Document Management Systems
 cat51                = Landing Page Builder
+cat52                = Live Chat
--- a/src/drivers/firefox/locale/fr-FR.properties
+++ b/src/drivers/firefox/locale/fr-FR.properties
@ -65,3 +65,4 @@ cat48                = Stockage réseau
 cat49                = Lecteur RSS
 cat50                = Système de gestion de documents
 cat51                = Landing Page Builder
+cat52                = Chat en direct
--- a/src/drivers/firefox/locale/it-IT.properties
+++ b/src/drivers/firefox/locale/it-IT.properties
@ -65,3 +65,4 @@ cat48                = Network Storage
 cat49                = Lettore di Feed
 cat50                = Sistema di Gestione Documenti
 cat51                = Landing Page Builder
+cat52                = Live Chat
--- a/src/drivers/firefox/locale/nl-NL.properties
+++ b/src/drivers/firefox/locale/nl-NL.properties
@ -65,3 +65,4 @@ cat48                = Network Storage
 cat49                = Feed Readers
 cat50                = Document Management Systems
 cat51                = Landing Page Builder
+cat52                = Live Chat
--- a/src/drivers/firefox/locale/ro-RO.properties
+++ b/src/drivers/firefox/locale/ro-RO.properties
@ -62,3 +62,4 @@ cat48                = Network Storage
 cat49                = Feed Readers
 cat50                = Document Management Systems
 cat51                = Landing Page Builder
+cat52                = Live Chat
--- a/src/drivers/firefox/locale/ru-RU.properties
+++ b/src/drivers/firefox/locale/ru-RU.properties
@ -65,3 +65,4 @@ cat48                = Сетевое хранилище
 cat49                = Граббер контента
 cat50                = Управление документами
 cat51                = Генератор лендингов
+cat52                = Live Chat
--- a/src/icons/LiveAgent.png
+++ b/src/icons/LiveAgent.png
--- a/src/icons/LiveChat.png
+++ b/src/icons/LiveChat.png
--- a/src/icons/TawkTo.png
+++ b/src/icons/TawkTo.png
--- a/src/icons/UserLike.svg
+++ b/src/icons/UserLike.svg
@ -0,0 +1 @@
+<svg width="60" height="60" viewBox="0 0 60 60" xmlns="http://www.w3.org/2000/svg"><title>userlike_general_logo_small_60x60</title><g fill="none" fill-rule="evenodd"><path d="M37.971 17v17.045c0 2.88-.32 3.984-.92 4.853-1.596 2.446-4.593 2.486-5.59 2.486-6.031 0-6.272-3.906-6.272-7.024v-7.777c-.992.635-2.22.96-3.692.96A9.913 9.913 0 0 1 19 27.215v6.829c0 2.644.079 4.853 1.477 7.022C23.195 45.368 28.466 46 31.34 46 37.173 46 44 43.277 44 34.795V17h-6.029z" fill="#3D3D3F"/><path d="M8.375 12.446c1.304 1.974 2.446 3.457 3.424 4.456 1.692 1.762 3.29 2.64 4.798 2.64.43 0 .777-.107 1.04-.319.247-.232.367-.56.367-.984 0-.212-.027-.476-.076-.797a4.755 4.755 0 0 1-.077-.667 4.79 4.79 0 0 1 1.314-3.36c.876-.944 2.06-1.415 3.547-1.415 1.57 0 2.842.495 3.822 1.482.976.986 1.466 2.275 1.466 3.865 0 1.952-.656 3.549-1.973 4.79-1.312 1.24-3.071 1.863-5.27 1.863-3.363 0-6.422-1.401-9.172-4.203-1.467-1.526-2.997-3.723-4.585-6.586l1.375-.765z" fill="#009DE0"/></g></svg>
				`@ -0,0 +1 @@`
				<svg width="60" height="60" viewBox="0 0 60 60" xmlns="http://www.w3.org/2000/svg"><title>userlike_general_logo_small_60x60</title><g fill="none" fill-rule="evenodd"><path d="M37.971 17v17.045c0 2.88-.32 3.984-.92 4.853-1.596 2.446-4.593 2.486-5.59 2.486-6.031 0-6.272-3.906-6.272-7.024v-7.777c-.992.635-2.22.96-3.692.96A9.913 9.913 0 0 1 19 27.215v6.829c0 2.644.079 4.853 1.477 7.022C23.195 45.368 28.466 46 31.34 46 37.173 46 44 43.277 44 34.795V17h-6.029z" fill="#3D3D3F"/><path d="M8.375 12.446c1.304 1.974 2.446 3.457 3.424 4.456 1.692 1.762 3.29 2.64 4.798 2.64.43 0 .777-.107 1.04-.319.247-.232.367-.56.367-.984 0-.212-.027-.476-.076-.797a4.755 4.755 0 0 1-.077-.667 4.79 4.79 0 0 1 1.314-3.36c.876-.944 2.06-1.415 3.547-1.415 1.57 0 2.842.495 3.822 1.482.976.986 1.466 2.275 1.466 3.865 0 1.952-.656 3.549-1.973 4.79-1.312 1.24-3.071 1.863-5.27 1.863-3.363 0-6.422-1.401-9.172-4.203-1.467-1.526-2.997-3.723-4.585-6.586l1.375-.765z" fill="#009DE0"/></g></svg>