Le mirroring des dépôts vers Github est maintenant natif dans Gitlab (et donc Framagit). Merci de passer à la fonction native pour que nous puissions couper notre solution maison. Détails sur https://docs.gitlab.com/ee/workflow/repository_mirroring.html#pushing-to-a-remote-repository (pensez à supprimer le webhook de notre solution maison).

Commit d9c9d83d by yPhil

Merge branch 'mastodon'

parents bf3d040a 8e275768
Pipeline #52873 passed with stage
in 36 seconds
......@@ -20,12 +20,12 @@
"postinstall": "bower install"
},
"dependencies": {
"bower": "1.8.2",
"ejs": "2.5.7",
"express": "4.16.2",
"bower": "1.8.4",
"ejs": "2.6.1",
"express": "4.16.3",
"feedparser": "2.2.9",
"favrat": "latest",
"feedrat": "latest",
"pm2": "2.10.2"
"pm2": "2.10.4"
}
}
......@@ -3,7 +3,7 @@
"name" : "petrolette",
"script" : "./bin/www",
"watch" : true,
"ignore_watch" : ["#*", "favicons-cache"],
"ignore_watch" : ["#*", "favicons-cache", ".git/"],
"log_date_format" : "YYYY-MM-DD HH:mm",
"env" : {
"PORT" : 8666,
......
......@@ -339,7 +339,7 @@ PTL.feed = {
if (typeof imageUrls != 'undefined') {
console.log('imageUrls');
// console.log('imageUrls');
$image = $('<div>')
.attr('class', 'ptl-img')
......@@ -360,7 +360,7 @@ PTL.feed = {
} else if (imageUrl) {
console.log('imageUrl: (%s)', imageUrl);
// console.log('imageUrl: (%s)', imageUrl);
if (!PTL.util.isUrl(imageUrl)) {
imageUrl = feedHost + '/' + imageUrl.substring(imageUrl.indexOf("/") + 1);
......
......@@ -52,7 +52,7 @@ function getFeed (urlfeed, callback) {
var feedItems = [];
req.on ('response', function (res) {
var stream = this;
if (res.statusCode === 200 && res.headers['content-type'].includes('xml')) {
if (res && typeof res !== 'undefined' && res.statusCode === 200 && res.headers['content-type'] && res.headers['content-type'].includes('xml')) {
stream.pipe (feedparser);
} else {
......
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