This commit is contained in:
MENTAL 2020-08-03 16:44:45 +02:00 committed by GitHub
parent caa9438d8c
commit 8cf0d6005c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 6 deletions

View File

@ -27,7 +27,7 @@ class FreshRSS extends \App\SupportedApps implements \App\EnhancedApps {
if($res->getStatusCode() == 200) {
$data = json_decode($res->getBody());
if($data->auth == 1){
if($data != null && $data->auth === 1){
echo "Welcome " . $this->config->username . ", you are connected to API v".$data->api_version;
}
}
@ -46,8 +46,10 @@ class FreshRSS extends \App\SupportedApps implements \App\EnhancedApps {
$res = parent::execute($this->url('api/fever.php?api&unread_item_ids'), $attrs, $this->clientVars, 'POST');
if($res->getStatusCode() == 200) {
$body = json_decode($res->getBody());
$unread = count(explode(",", $body->unread_item_ids));
$data['unread'] = $unread ?? 0;
if($data->auth === 1){
$unread = count(explode(",", $body->unread_item_ids));
$data['unread'] = $unread ?? 0;
}
}
return parent::getLiveStats($status, $data);
@ -55,7 +57,7 @@ class FreshRSS extends \App\SupportedApps implements \App\EnhancedApps {
public function url($endpoint)
{
$api_url = parent::normaliseurl($this->config->override_url).$endpoint;
$api_url = parent::normaliseurl($this->config->url).$endpoint;
return $api_url;
}
@ -63,4 +65,4 @@ class FreshRSS extends \App\SupportedApps implements \App\EnhancedApps {
{
return md5($this->config->username.":".$this->config->apikey);
}
}
}

View File

@ -2,7 +2,7 @@
<div class="items">
<div class="input">
<label>{{ strtoupper(__('app.url')) }}</label>
{!! Form::text('config[override_url]', $item->getconfig()->override_url ?? null, array('placeholder' => __('app.apps.override'), 'id' => 'override_url', 'class' => 'form-control')) !!}
{!! Form::text('config[override_url]', (isset($item) ? $item->getconfig()->override_url : null), array('placeholder' => __('app.apps.override'), 'id' => 'override_url', 'class' => 'form-control')) !!}
</div>
<div class="input">
<label>{{ __('app.apps.username') }}</label>