From c898c4d8c0f95066f3a4cf0cb5489510106c9ce9 Mon Sep 17 00:00:00 2001 From: Jeremy Kauffman Date: Fri, 7 Feb 2020 16:19:52 -0500 Subject: [PATCH] fix year --- lib/thirdparty/Github.class.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/thirdparty/Github.class.php b/lib/thirdparty/Github.class.php index 8b6ef160..ee830ed2 100644 --- a/lib/thirdparty/Github.class.php +++ b/lib/thirdparty/Github.class.php @@ -43,14 +43,14 @@ class Github $bestAsset = null; foreach ($release['assets'] as $asset) { if (static::isAssetForOs($asset, $os)) { - if (!$bestAsset) { - $bestAsset = $asset; - } else if ($os === Os::OS_LINUX) { - $ext = pathinfo($asset['name'], PATHINFO_EXTENSION); - if ($ext === $preferredExt || (!$preferredExt && $ext === 'AppImage')) { - $bestAsset = $asset; + if (!$bestAsset) { + $bestAsset = $asset; + } elseif ($os === Os::OS_LINUX) { + $ext = pathinfo($asset['name'], PATHINFO_EXTENSION); + if ($ext === $preferredExt || (!$preferredExt && $ext === 'AppImage')) { + $bestAsset = $asset; + } } - } } } @@ -112,14 +112,14 @@ class Github static::get('/repos/lbryio/internal-issues/issues?labels=' . $year . '&filter=all') : include ROOT_DIR . '/data/dummy/githubroadmap.php'; - $issues = array_reduce($apiResponse, function ($issues, $issue) { + $issues = array_reduce($apiResponse, function ($issues, $issue) use ($year) { return array_merge($issues, [[ 'name' => $issue['title'], 'quarter_date' => array_reduce($issue['labels'], function ($carry, $label) { if ($carry) { return $carry; } - return $label['name'][0] === 'Q' ? $label['name'] . ' 2019' : ''; + return $label['name'][0] === 'Q' ? ($label['name'] . ' ' . $year) : ''; }, ''), 'body' => $issue['body_html'] ]]);