starred/newznab-tmux
1
0
Fork 0
mirror of https://github.com/NNTmux/newznab-tmux.git synced 2026-08-29 01:08:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove requirement for userid when using RSS, API and APIv2, its useless as we already have the token

Browse Source
This commit is contained in:
DariusIII
2018-12-12 20:26:38 +01:00
parent 89c3204d79
commit 327b6be8b2
7 changed files with 28 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/RssController.php
+5 -5
View File
@@ -14,7 +14,7 @@ class RssController extends BasePageController
{
/**
* @param \Illuminate\Http\Request $request
* @throws \Exception
* @throws \Throwable
*/
public function rss(Request $request)
{
@@ -72,11 +72,11 @@ class RssController extends BasePageController
$rssToken = $this->userdata['api_token'];
$maxRequests = $this->userdata->role->apirequests;
} else {
if (! $request->has('i') || ! $request->has('r')) {
Utility::showApiError(100, 'Both the User ID and API key are required for viewing the RSS!');
if (! $request->has('r')) {
Utility::showApiError(100, 'API key is required for viewing the RSS!');
}
$res = User::getByIdAndRssToken($request->input('i'), $request->input('r'));
$res = User::getByRssToken($request->input('r'));
if (! $res) {
Utility::showApiError(100);
@@ -94,7 +94,7 @@ class RssController extends BasePageController
if (UserRequest::getApiRequests($uid) > $maxRequests) {
Utility::showApiError(500, 'You have reached your daily limit for API requests!');
} else {
UserRequest::addApiRequest($uid, $request->getRequestUri());
UserRequest::addApiRequest($rssToken, $request->getRequestUri());
}
// Valid or logged in user, get them the requested feed.