Skip to content

Commit

Permalink
fix: use proper api url
Browse files Browse the repository at this point in the history
no need to parse all tags since https://api.github.com/repos/NodeBB/NodeBB/releases/latest gives the latest non-prerelease, non-draft releases
  • Loading branch information
barisusakli committed Oct 7, 2020
1 parent 8eb62e2 commit 264818e
Showing 1 changed file with 9 additions and 21 deletions.
30 changes: 9 additions & 21 deletions src/admin/versions.js
@@ -1,6 +1,5 @@
'use strict';

const semver = require('semver');
const request = require('request');

const meta = require('../meta');
Expand All @@ -10,7 +9,7 @@ let versionCacheLastModified = '';

const isPrerelease = /^v?\d+\.\d+\.\d+-.+$/;

function getLatestRelease(page, callback) {
function getLatestVersion(callback) {
const headers = {
Accept: 'application/vnd.github.v3+json',
'User-Agent': encodeURIComponent('NodeBB Admin Control Panel/' + meta.config.title),
Expand All @@ -19,11 +18,12 @@ function getLatestRelease(page, callback) {
if (versionCacheLastModified) {
headers['If-Modified-Since'] = versionCacheLastModified;
}
request('https://api.github.com/repos/NodeBB/NodeBB/tags?page=' + page, {

request('https://api.github.com/repos/NodeBB/NodeBB/releases/latest', {
json: true,
headers: headers,
timeout: 1000,
}, function (err, res, releases) {
timeout: 2000,
}, function (err, res, latestRelease) {
if (err) {
return callback(err);
}
Expand All @@ -36,28 +36,16 @@ function getLatestRelease(page, callback) {
return callback(new Error(res.statusMessage));
}

releases = releases.filter(function (version) {
return !isPrerelease.test(version.name); // filter out automated prerelease versions
}).map(function (version) {
return version.name.replace(/^v/, '');
}).sort(function (a, b) {
return semver.lt(a, b) ? 1 : -1;
});

if (!releases.length) {
return getLatestRelease(page + 1, callback);
if (!latestRelease || !latestRelease.tag_name) {
return callback(new Error('[[error:cant-get-latest-release]]'));
}
versionCache = releases[0];
const tagName = latestRelease.tag_name.replace(/^v/, '');
versionCache = tagName;
versionCacheLastModified = res.headers['last-modified'];

callback(null, versionCache);
});
}

function getLatestVersion(callback) {
getLatestRelease(1, callback);
}

exports.getLatestVersion = getLatestVersion;
exports.isPrerelease = isPrerelease;

Expand Down

0 comments on commit 264818e

Please sign in to comment.