Make a few improvements to lookup endpoints (#405)

* Escape user input passed to regex searches

* Dedupe trader searches

Author: cbovis

src/relayers/search-relayers.js

@@ -65,14 +65,20 @@ const getSuggestedRelayers = async limit => {
   return relayersWithStats;
 };
 
+function escapeRegex(text) {
+  return text.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, '\\$&');
+}
+
 const searchRelayers = async (query, options) => {
   if (query === '' || query === null) {
     const relayers = await getSuggestedRelayers(options.limit);
 
     return relayers;
   }
 
-  const relayers = await Relayer.find({ name: new RegExp(query, 'ig') })
+  const relayers = await Relayer.find({
+    name: new RegExp(escapeRegex(query), 'ig'),
+  })
     .sort({ name: 1 })
     .limit(options.limit)
     .lean();

src/tokens/search-tokens.js

@@ -67,6 +67,10 @@ const getSuggestedTokens = async limit => {
   });
 };
 
+function escapeRegex(text) {
+  return text.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, '\\$&');
+}
+
 const searchTokens = async (query, options) => {
   if (query === '' || query === null) {
     const tokens = await getSuggestedTokens(options.limit);
@@ -77,8 +81,8 @@ const searchTokens = async (query, options) => {
   const tokens = await Token.find({
     $or: [
       { address: query },
-      { name: new RegExp(query, 'ig') },
-      { symbol: new RegExp(query, 'ig') },
+      { name: new RegExp(escapeRegex(query), 'ig') },
+      { symbol: new RegExp(escapeRegex(query), 'ig') },
     ],
   })
     .sort({ name: 1 })

src/traders/search-traders.js

@@ -1,8 +1,9 @@
 const _ = require('lodash');
 const moment = require('moment');
 
-const elasticsearch = require('../util/elasticsearch');
 const AddressMetadata = require('../model/address-metadata');
+const elasticsearch = require('../util/elasticsearch');
+const getTrader = require('./get-trader');
 
 const getSuggestedTraders = async limit => {
   const response = await elasticsearch.getClient().search({
@@ -105,20 +106,30 @@ const getValidTraderAddresses = async (addresses, limit) => {
     response.body.aggregations.matching_takers.takers.buckets,
   );
 
-  const validAddresses = buckets.map(bucket => bucket.key);
+  const validAddresses = _.uniq(buckets.map(bucket => bucket.key));
 
   return validAddresses;
 };
 
+function escapeRegex(text) {
+  return text.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, '\\$&');
+}
+
 const searchTraders = async (query, options) => {
   if (query === '' || query === null) {
     const traders = await getSuggestedTraders(options.limit);
 
     return traders;
   }
 
+  const trader = await getTrader(query);
+
+  if (trader !== null) {
+    return [trader];
+  }
+
   const metadatas = await AddressMetadata.find({
-    name: new RegExp(query, 'ig'),
+    name: new RegExp(escapeRegex(query), 'ig'),
   })
     .sort({ name: 1 })
     .limit(options.limit)