fix bad merge

stackernews · Sep 26, 2023 · 8f53dd0 · 8f53dd0
1 parent 2421664
commit 8f53dd0
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 65 deletions.
diff --git a/components/search.js b/components/search.js
@@ -106,19 +106,7 @@ export default function Search ({ sub }) {
                     <Select
                       groupClassName='mb-0 ms-2'
                       onChange={(formik, e) => {
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
                         search({ ...formik?.values, when: e.target.value, from: from || dayMonthYear(new Date()), to: to || dayMonthYear(new Date()) })
-=======
-                        search({ ...formik?.values, when: e.target.value, from: from || dayMonthYear(new Date()), to: to || dayMonthYear(new Date()) });
->>>>>>> 9659a98 (add date picker)
-=======
-                        search({ ...formik?.values, when: e.target.value, from: from || dayMonthYear(new Date()), to: to || dayMonthYear(new Date()) })
->>>>>>> f1ec4ad (lint)
-=======
-                        search({ ...formik?.values, when: e.target.value, from: from || new Date().toISOString(), to: to || new Date().toISOString() })
->>>>>>> ea8d479 (finish query parameter passing & incremental cleanup)
                         setDatePicker(e.target.value === 'custom')
                         if (e.target.value === 'custom') setRange({ start: new Date(), end: new Date() })
                       }}

diff --git a/lib/constants.js b/lib/constants.js
@@ -3,7 +3,6 @@
 export const SUBS = ['bitcoin', 'nostr', 'tech', 'meta', 'jobs']
 export const SUBS_NO_JOBS = SUBS.filter(s => s !== 'jobs')
 
-<<<<<<< HEAD
 export const NOFOLLOW_LIMIT = 100
 export const BOOST_MIN = 5000
 export const UPLOAD_SIZE_MAX = 2 * 1024 * 1024
@@ -43,58 +42,6 @@ export const ITEM_TYPES = context => {
     items.push('jobs', 'bookmarks')
   }
   return items
-=======
-module.exports = {
-  NOFOLLOW_LIMIT: 100,
-  BOOST_MIN: 5000,
-  UPLOAD_SIZE_MAX: 2 * 1024 * 1024,
-  IMAGE_PIXELS_MAX: 35000000,
-  UPLOAD_TYPES_ALLOW: [
-    'image/gif',
-    'image/heic',
-    'image/png',
-    'image/jpeg',
-    'image/webp'
-  ],
-  COMMENT_DEPTH_LIMIT: 10,
-  MAX_TITLE_LENGTH: 80,
-  MAX_POLL_CHOICE_LENGTH: 30,
-  ITEM_SPAM_INTERVAL: '10m',
-  ANON_ITEM_SPAM_INTERVAL: '0',
-  INV_PENDING_LIMIT: 10,
-  BALANCE_LIMIT_MSATS: 1000000000, // 1m sats
-  ANON_INV_PENDING_LIMIT: 100,
-  ANON_BALANCE_LIMIT_MSATS: 0, // disable
-  MAX_POLL_NUM_CHOICES: 10,
-  MIN_POLL_NUM_CHOICES: 2,
-  POLL_COST: 1,
-  ITEM_FILTER_THRESHOLD: 1.2,
-  DONT_LIKE_THIS_COST: 1,
-  COMMENT_TYPE_QUERY: ['comments', 'freebies', 'outlawed', 'borderland', 'all', 'bookmarks'],
-  SUBS,
-  SUBS_NO_JOBS,
-  USER_SORTS: ['stacked', 'spent', 'comments', 'posts', 'referrals'],
-  ITEM_SORTS: ['zaprank', 'comments', 'sats'],
-  WHENS: ['day', 'week', 'month', 'year', 'forever', 'custom'],
-  ITEM_TYPES: context => {
-    const items = ['all', 'posts', 'comments', 'bounties', 'links', 'discussions', 'polls']
-    if (!context) {
-      items.push('bios', 'jobs')
-    }
-    items.push('freebies')
-    if (context === 'user') {
-      items.push('jobs', 'bookmarks')
-    }
-    return items
-  },
-  OLD_ITEM_DAYS: 3,
-  ANON_USER_ID: 27,
-  AD_USER_ID: 9,
-  ANON_POST_FEE: 1000,
-  ANON_COMMENT_FEE: 100,
-  SSR: typeof window === 'undefined',
-  MAX_FORWARDS: 5
->>>>>>> 310d277 (refine)
 }
 export const OLD_ITEM_DAYS = 3
 export const ANON_USER_ID = 27