Merge branch 'master' into wallet-ux-2

stackernews · May 23, 2024 · 1b6b02a · 1b6b02a
2 parents dcd59fd + 9c5bec0
commit 1b6b02a
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 5 deletions.
diff --git a/api/resolvers/user.js b/api/resolvers/user.js
@@ -313,6 +313,22 @@ export default {
         return true
       }
 
+      const [newSubPost] = await models.$queryRawUnsafe(`
+        SELECT EXISTS(
+          SELECT *
+          FROM "SubSubscription"
+          JOIN "Item" ON "SubSubscription"."subName" = "Item"."subName"
+          ${whereClause(
+            '"SubSubscription"."userId" = $1',
+            '"Item".created_at > $2',
+            '"Item"."parentId" IS NULL',
+            await filterClause(me, models),
+            muteClause(me))})`, me.id, lastChecked)
+      if (newSubPost.exists) {
+        foundNotes()
+        return true
+      }
+
       // check if they have any mentions since checkedNotesAt
       if (user.noteMentions) {
         const [newMentions] = await models.$queryRawUnsafe(`

diff --git a/awards.csv b/awards.csv
@@ -98,3 +98,4 @@ Radentor,issue,,#1177,easy,,,,10k,[email protected],2024-05-17
 tsmith123,pr,#1179,#790,good-first-issue,high,,,40k,[email protected],2024-05-17
 SatsAllDay,pr,#1159,#510,medium-hard,,1,,450k,[email protected],2024-05-22
 Darth-Coin,issue,#1159,#510,medium-hard,,1,,45k,[email protected],2024-05-22
+OneOneSeven117,issue,#1187,#1164,easy,,,,10k,[email protected],2024-05-23
diff --git a/components/item.module.css b/components/item.module.css
@@ -213,6 +213,7 @@ a.link:visited {
     width: 800px;
     border-radius: .3rem;
     line-height: .8rem;
+    max-width: 256px;
 }
 
 .skeleton .link::after {

diff --git a/pages/[name]/[type].js b/pages/[name]/[type].js
@@ -66,11 +66,10 @@ function UserItemsHeader ({ type, name }) {
       initial={{ type, by, when, from: '', to: '' }}
       onSubmit={select}
     >
-      <div className='text-muted fw-bold mt-0 mb-3 d-flex justify-content-start align-items-center flex-wrap'>
-        <div className='text-muted fw-bold mt-0 mb-2 d-flex justify-content-start align-items-center'>
+      <div className='text-muted fw-bold d-flex align-items-center flex-wrap'>
+        <div className='text-muted fw-bold mb-2 d-flex align-items-center'>
           <Select
             groupClassName='mb-0 me-2'
-            className='w-auto'
             name='type'
             size='sm'
             overrideValue={type}
@@ -80,7 +79,6 @@ function UserItemsHeader ({ type, name }) {
           by
           <Select
             groupClassName='mb-0 mx-2'
-            className='w-auto'
             name='by'
             size='sm'
             overrideValue={by}
@@ -90,7 +88,6 @@ function UserItemsHeader ({ type, name }) {
           for
           <Select
             groupClassName='mb-0 mx-2'
-            className='w-auto'
             name='when'
             size='sm'
             items={WHENS}