Skip to content

Switch to RegExp.test #39

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

Merged
sagarkarira merged 1 commit into from
Mar 20, 2020
Merged

Switch to RegExp.test #39

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 6 additions & 3 deletions app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ const { getLiveUpdates } = require('./lib/reddit.js');

const app = express();
const port = process.env.PORT || 3001;
const IS_CURL_RE = /\bcurl\b/gim;

function errorHandler(error, res) {
console.error(error);
Expand All @@ -24,7 +25,7 @@ app.use((req, res, next) => {
});

app.get('/', (req, res) => {
const isCurl = req.headers['user-agent'].match(/\bcurl\b/gim) !== null;
const isCurl = IS_CURL_RE.test(req.headers['user-agent']);
const format = req.query.format ? req.query.format : '';
const minimal = req.query.minimal === 'true';
const emojis = req.query.emojis === 'true';
Expand All @@ -43,8 +44,9 @@ app.get('/', (req, res) => {
});

app.get('/updates', (req, res) => {
const isCurl = IS_CURL_RE.test(req.headers['user-agent']);
const format = req.query.format ? req.query.format : '';
const isCurl = req.headers['user-agent'].match(/\bcurl\b/gim) !== null;

if (format.toLowerCase() === 'json') {
return getLiveUpdates({ json: true, isCurl }).then(result => {
return res.json(result);
Expand All @@ -58,10 +60,11 @@ app.get('/updates', (req, res) => {

app.get('/:country', (req, res) => {
const { country } = req.params;
const isCurl = req.headers['user-agent'].match(/\bcurl\b/gim) !== null;
const isCurl = IS_CURL_RE.test(req.headers['user-agent']);
const format = req.query.format ? req.query.format : '';
const minimal = req.query.minimal === 'true';
const emojis = req.query.emojis === 'true';

if (!country || country.toUpperCase() === 'ALL') {
if (format.toLowerCase() === 'json') {
return getJSONData().then(result => {
Expand Down