Commit d0f1c4e8 authored by yPhil's avatar yPhil
Browse files

Updated search prefix in prefs

parent 7d251e7a
......@@ -541,6 +541,11 @@
"resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
"integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg=="
},
"bodec": {
"version": "0.1.0",
"resolved": "https://registry.npmjs.org/bodec/-/bodec-0.1.0.tgz",
"integrity": "sha1-vIUVVUMPI8n3ZQp172TGqUw0GMw="
},
"body-parser": {
"version": "1.19.0",
"resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz",
......@@ -882,6 +887,11 @@
"resolved": "https://registry.npmjs.org/css-what/-/css-what-4.0.0.tgz",
"integrity": "sha512-teijzG7kwYfNVsUh2H/YN62xW3KK9YhXEgSlbxMlcyjPNvdKJqFx5lrwlJgoFP1ZHlB89iGDlo/JyshKeRhv5A=="
},
"culvert": {
"version": "0.1.2",
"resolved": "https://registry.npmjs.org/culvert/-/culvert-0.1.2.tgz",
"integrity": "sha1-lQL18BVKLVoioCPnn3HMk2+m728="
},
"dashdash": {
"version": "1.14.1",
"resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
......@@ -1242,7 +1252,7 @@
}
},
"feedrat": {
"version": "git+https://framagit.org/yphil/feedrat.git#ea27f6a729df6d59daef89eddd2b47fab63b8906",
"version": "git+https://framagit.org/yphil/feedrat.git#deefb8fb927269948b587424e379b31f5b1c3b46",
"from": "git+https://framagit.org/yphil/feedrat.git",
"requires": {
"cheerio": "1.0.0-rc.5",
......@@ -1392,6 +1402,16 @@
"assert-plus": "^1.0.0"
}
},
"git-node-fs": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/git-node-fs/-/git-node-fs-1.0.0.tgz",
"integrity": "sha1-SbIV4kLr5Dqkx1Ybu6SZUhdSCA8="
},
"git-sha1": {
"version": "0.1.2",
"resolved": "https://registry.npmjs.org/git-sha1/-/git-sha1-0.1.2.tgz",
"integrity": "sha1-WZrBkrcYdYJeE6RF86bgURjC90U="
},
"gitlab-runner": {
"version": "0.0.10",
"resolved": "https://registry.npmjs.org/gitlab-runner/-/gitlab-runner-0.0.10.tgz",
......@@ -1581,6 +1601,11 @@
"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
"integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
},
"ini": {
"version": "1.3.8",
"resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
"integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew=="
},
"invert-kv": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
......@@ -1674,6 +1699,17 @@
"minimatch": "^3.0.4"
}
},
"js-git": {
"version": "0.7.8",
"resolved": "https://registry.npmjs.org/js-git/-/js-git-0.7.8.tgz",
"integrity": "sha1-UvplWrYYd9bxB578ZTS1VPMeVEQ=",
"requires": {
"bodec": "^0.1.0",
"culvert": "^0.1.2",
"git-sha1": "^0.1.2",
"pako": "^0.2.5"
}
},
"jsbn": {
"version": "0.1.1",
"resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
......@@ -1915,18 +1951,17 @@
"integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="
},
"npm": {
"version": "7.4.0",
"resolved": "https://registry.npmjs.org/npm/-/npm-7.4.0.tgz",
"integrity": "sha512-/+YQ8YpDPNDSd1YGke4ZvSJL40GHHlOsP3XLhB5jQqy/ciTfSCeEF9mW0hEbf5+nhDE0DYq2xbwt5bstG49FGw==",
"version": "7.5.2",
"resolved": "https://registry.npmjs.org/npm/-/npm-7.5.2.tgz",
"integrity": "sha512-ViuWTzFbHvjvdGDAa5HGsB3kIg3W1FfOxSuKPnjWzewZ0txVhDL/FzxA9bUVnvX8kXvL89Ps0vRhdaiWfDA8NQ==",
"requires": {
"@npmcli/arborist": "^2.0.3",
"@npmcli/arborist": "^2.1.1",
"@npmcli/ci-detect": "^1.2.0",
"@npmcli/config": "^1.2.8",
"@npmcli/config": "^1.2.9",
"@npmcli/run-script": "^1.8.1",
"abbrev": "~1.1.1",
"ansicolors": "~0.3.2",
"ansistyles": "~0.1.3",
"aproba": "^2.0.0",
"archy": "~1.0.0",
"byte-size": "^7.0.0",
"cacache": "^15.0.5",
......@@ -1937,13 +1972,14 @@
"columnify": "~1.5.4",
"glob": "^7.1.4",
"graceful-fs": "^4.2.3",
"hosted-git-info": "^3.0.6",
"hosted-git-info": "^3.0.8",
"ini": "^2.0.0",
"init-package-json": "^2.0.1",
"is-cidr": "^4.0.2",
"json-parse-even-better-errors": "*",
"json-parse-even-better-errors": "^2.3.1",
"leven": "^3.1.0",
"libnpmaccess": "^4.0.1",
"libnpmdiff": "^2.0.3",
"libnpmfund": "^1.0.2",
"libnpmhook": "^6.0.1",
"libnpmorg": "^2.0.1",
......@@ -1952,7 +1988,7 @@
"libnpmsearch": "^3.1.0",
"libnpmteam": "^2.0.2",
"libnpmversion": "^1.0.7",
"make-fetch-happen": "^8.0.12",
"make-fetch-happen": "^8.0.13",
"minipass": "^3.1.3",
"minipass-pipeline": "^1.2.4",
"mkdirp": "^1.0.4",
......@@ -1968,7 +2004,7 @@
"npm-user-validate": "^1.0.1",
"npmlog": "~4.1.2",
"opener": "^1.5.2",
"pacote": "^11.1.14",
"pacote": "^11.2.3",
"parse-conflict-json": "^1.1.1",
"qrcode-terminal": "^0.12.0",
"read": "~1.0.7",
......@@ -1977,7 +2013,7 @@
"readdir-scoped-modules": "^1.1.0",
"rimraf": "^3.0.2",
"semver": "^7.3.4",
"ssri": "^8.0.0",
"ssri": "^8.0.1",
"tar": "^6.1.0",
"text-table": "~0.2.0",
"tiny-relative-date": "^1.3.0",
......@@ -1989,13 +2025,13 @@
},
"dependencies": {
"@npmcli/arborist": {
"version": "2.0.3",
"version": "2.1.1",
"bundled": true,
"requires": {
"@npmcli/installed-package-contents": "^1.0.5",
"@npmcli/map-workspaces": "^1.0.1",
"@npmcli/metavuln-calculator": "^1.0.0",
"@npmcli/move-file": "^1.0.1",
"@npmcli/metavuln-calculator": "^1.0.1",
"@npmcli/move-file": "^1.1.0",
"@npmcli/name-from-folder": "^1.0.1",
"@npmcli/node-gyp": "^1.0.1",
"@npmcli/run-script": "^1.8.1",
......@@ -2008,7 +2044,8 @@
"npm-install-checks": "^4.0.0",
"npm-package-arg": "^8.1.0",
"npm-pick-manifest": "^6.1.0",
"pacote": "^11.1.14",
"npm-registry-fetch": "^9.0.0",
"pacote": "^11.2.4",
"parse-conflict-json": "^1.1.1",
"promise-all-reject-late": "^1.0.0",
"promise-call-limit": "^1.0.1",
......@@ -2025,7 +2062,7 @@
"bundled": true
},
"@npmcli/config": {
"version": "1.2.8",
"version": "1.2.9",
"bundled": true,
"requires": {
"ini": "^2.0.0",
......@@ -2035,6 +2072,13 @@
"walk-up-path": "^1.0.0"
}
},
"@npmcli/disparity-colors": {
"version": "1.0.1",
"bundled": true,
"requires": {
"ansi-styles": "^4.3.0"
}
},
"@npmcli/git": {
"version": "2.0.4",
"bundled": true,
......@@ -2071,7 +2115,7 @@
}
},
"@npmcli/metavuln-calculator": {
"version": "1.0.0",
"version": "1.0.2",
"bundled": true,
"requires": {
"cacache": "^15.0.5",
......@@ -2080,10 +2124,11 @@
}
},
"@npmcli/move-file": {
"version": "1.0.1",
"version": "1.1.1",
"bundled": true,
"requires": {
"mkdirp": "^1.0.4"
"mkdirp": "^1.0.4",
"rimraf": "^3.0.2"
}
},
"@npmcli/name-from-folder": {
......@@ -2240,6 +2285,10 @@
"write-file-atomic": "^3.0.3"
}
},
"binary-extensions": {
"version": "2.2.0",
"bundled": true
},
"brace-expansion": {
"version": "1.1.11",
"bundled": true,
......@@ -2622,7 +2671,7 @@
"bundled": true
},
"hosted-git-info": {
"version": "3.0.7",
"version": "3.0.8",
"bundled": true,
"requires": {
"lru-cache": "^6.0.0"
......@@ -2828,6 +2877,24 @@
"npm-registry-fetch": "^9.0.0"
}
},
"libnpmdiff": {
"version": "2.0.3",
"bundled": true,
"requires": {
"@npmcli/disparity-colors": "^1.0.1",
"binary-extensions": "^2.2.0",
"diff": "^5.0.0",
"minimatch": "^3.0.4",
"pacote": "^11.2.3",
"tar": "^6.1.0"
},
"dependencies": {
"diff": {
"version": "5.0.0",
"bundled": true
}
}
},
"libnpmfund": {
"version": "1.0.2",
"bundled": true,
......@@ -2905,7 +2972,7 @@
}
},
"make-fetch-happen": {
"version": "8.0.12",
"version": "8.0.13",
"bundled": true,
"requires": {
"agentkeepalive": "^4.1.3",
......@@ -2958,7 +3025,7 @@
}
},
"minipass-fetch": {
"version": "1.3.2",
"version": "1.3.3",
"bundled": true,
"requires": {
"encoding": "^0.1.12",
......@@ -3177,7 +3244,7 @@
}
},
"pacote": {
"version": "11.1.14",
"version": "11.2.4",
"bundled": true,
"requires": {
"@npmcli/git": "^2.0.1",
......@@ -3468,7 +3535,7 @@
}
},
"ssri": {
"version": "8.0.0",
"version": "8.0.1",
"bundled": true,
"requires": {
"minipass": "^3.1.1"
......@@ -3778,6 +3845,11 @@
"thunkify": "^2.1.2"
}
},
"pako": {
"version": "0.2.9",
"resolved": "https://registry.npmjs.org/pako/-/pako-0.2.9.tgz",
"integrity": "sha1-8/dSL073gjSNqBYbrZ7P1Rv4OnU="
},
"parse-json": {
"version": "2.2.0",
"resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
......@@ -3881,9 +3953,9 @@
}
},
"pm2": {
"version": "4.5.2",
"resolved": "https://registry.npmjs.org/pm2/-/pm2-4.5.2.tgz",
"integrity": "sha512-dLtutClRErywXQ5gf/oxA2Ru4aswwJNkSAUtvnHgqvVt0RFsaDp8WL3PobjPo/XOQnbKUdrJ7KDbcrYmwlappA==",
"version": "4.5.4",
"resolved": "https://registry.npmjs.org/pm2/-/pm2-4.5.4.tgz",
"integrity": "sha512-2xKXrKz21i1R3BK2XxVIPq5Iy9fKHBVgZ+KMfRrx72mc7bq84SG/D+iTO32ihLf2Qe+N1o8rDskAt4M30JWyiA==",
"requires": {
"@pm2/agent": "~1.0.4",
"@pm2/io": "~4.3.5",
......@@ -3892,7 +3964,7 @@
"async": "~3.2.0",
"blessed": "0.1.81",
"chalk": "3.0.0",
"chokidar": "^3.3.0",
"chokidar": "^3.5.1",
"cli-tableau": "^2.0.0",
"commander": "2.15.1",
"cron": "1.8.2",
......@@ -3914,7 +3986,7 @@
"source-map-support": "0.5.19",
"sprintf-js": "1.1.2",
"systeminformation": "^4.32",
"vizion": "0.2.13",
"vizion": "2.2.1",
"yamljs": "0.3.0"
},
"dependencies": {
......@@ -4696,17 +4768,23 @@
}
},
"vizion": {
"version": "0.2.13",
"resolved": "https://registry.npmjs.org/vizion/-/vizion-0.2.13.tgz",
"integrity": "sha1-ExTN7is0EW+fWxJIU2+V2/zW718=",
"version": "2.2.1",
"resolved": "https://registry.npmjs.org/vizion/-/vizion-2.2.1.tgz",
"integrity": "sha512-sfAcO2yeSU0CSPFI/DmZp3FsFE9T+8913nv1xWBOyzODv13fwkn6Vl7HqxGpkr9F608M+8SuFId3s+BlZqfXww==",
"requires": {
"async": "1.5"
"async": "^2.6.3",
"git-node-fs": "^1.0.0",
"ini": "^1.3.5",
"js-git": "^0.7.8"
},
"dependencies": {
"async": {
"version": "1.5.2",
"resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
"integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo="
"version": "2.6.3",
"resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz",
"integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==",
"requires": {
"lodash": "^4.17.14"
}
}
}
},
......
......@@ -31,8 +31,8 @@
"feedrat": "git+https://framagit.org/yphil/feedrat.git",
"gitlab-runner": "0.0.10",
"iconv": "^3.0.0",
"npm": "^7.3.0",
"pm2": "^4.5.1",
"npm": "^7.5.2",
"pm2": "^4.5.4",
"request": "latest"
}
}
......@@ -233,12 +233,7 @@ PTL.dialog = {
.attr('title', PTL.tr('Valid feed found! Now just press OK')) ;
}).always(function(req, status, xhr) {
if (status === 'error')
guessError();
console.log('status: %s', status);
if (status === 'error') guessError();
});
});
......
......@@ -72,8 +72,8 @@ PTL.prefs = (function() {
'gallerySlideTransition': 'fade',
'gallerySlideshowSpeed': 3000,
'lang': 'en',
'searchPrefix': 'https://trouvons.org/?format=rss&categories=news&q=',
'searchPrefixDefault': 'https://trouvons.org/?format=rss&categories=news&q=',
'searchPrefix': 'https://search.modalogi.com/searx/search?categories=news&language=en-US&format=rss&q=',
'searchPrefixDefault': 'https://search.modalogi.com/searx/search?categories=news&language=en-US&format=rss&q=',
'feeds': JSON.stringify(newList),
'tabDropActivate': true,
'theme': 'night',
......
......@@ -192,7 +192,6 @@ router.get('/favicon', function(req, res) {
router.get('/discover', function(req, res) {
feedrat(req.query.url, req.query.searchPrefix, function(err, feed) {
if (feed) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment