Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Reddit] Add keyword search function #2229

Merged
merged 4 commits into from
Aug 25, 2021
Merged

[Reddit] Add keyword search function #2229

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
adff8d8
[Reddit] Add keyword search function
Bockiii Jul 30, 2021
8b5c752
linting
Bockiii Jul 30, 2021
efb737a
wops... one delete too much
Bockiii Jul 30, 2021
0b58d1c
one day I wont have linting errors.
Bockiii Jul 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 32 additions & 8 deletions bridges/RedditBridge.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ class RedditBridge extends BridgeAbstract {
const MAINTAINER = 'dawidsowa';
const NAME = 'Reddit Bridge';
const URI = 'https://www.reddit.com';
const DESCRIPTION = 'Return hot, new and top submissions from Reddit';
const DESCRIPTION = 'Return hot submissions from Reddit';

const PARAMETERS = array(
'global' => array(
Expand All @@ -17,14 +17,22 @@ class RedditBridge extends BridgeAbstract {
'title' => 'Filter out posts with lower score'
),
'd' => array(
'name' => 'Section',
'name' => 'Sort By',
'type' => 'list',
'title' => 'Choose whether to have new, hot and top submissions',
'title' => 'Sort by new, hot, top or relevancy',
'values' => array(
'Hot' => '', // By default, Reddit displays hot submissions.
'Hot' => 'hot',
'Relevance' => 'relevance',
'New' => 'new',
'Top' => 'top'
)
),
'defaultValue' => 'Hot'
),
'search' => array(
'name' => 'Keyword search',
'required' => false,
'exampleValue' => 'cats, dogs',
'title' => 'Keyword search, separated by commas'
)
),
'single' => array(
Expand Down Expand Up @@ -112,11 +120,23 @@ public function collectData() {
break;
}

if(!($this->getInput('search') === '')) {
$keywords = $this->getInput('search');
$keywords = str_replace(array(',', ' '), '%20', $keywords);
$keywords = $keywords . '%20';
} else {
$keywords = '';
}

foreach ($subreddits as $subreddit) {
$name = trim($subreddit);
$values = getContents(self::URI . ($user ? '/user/' : '/r/')
. $name . ((!$user && $section != '') ? "/$section" : '') . '.json'
. (($user && $section != '') ? "?sort=$section" : ''))
$values = getContents(self::URI
. '/search.json?q='
. $keywords
. ($user ? 'author%3A' : 'subreddit%3A')
. $name
. '&sort='
. $this->getInput('d'))
or returnServerError('Unable to fetch posts!');
$decodedValues = json_decode($values);

Expand Down Expand Up @@ -243,6 +263,10 @@ public function collectData() {
$this->items[] = $item;
}
}
// Sort the order to put the latest posts first, even for mixed subreddits
usort($this->items, function($a, $b) {
return $a['timestamp'] < $b['timestamp'];
});
}

private function encodePermalink($link) {
Expand Down