Merge branch 'master' into remodel

Author: huumn

api/resolvers/notifications.js

@@ -316,13 +316,36 @@ export default {
 
       if (meFull.noteCowboyHat) {
         queries.push(
-          `(SELECT id::text, updated_at AS "sortTime", 0 as "earnedSats", 'Streak' AS type
+          `(SELECT id::text, updated_at AS "sortTime", 0 as "earnedSats", 'CowboyHat' AS type
           FROM "Streak"
           WHERE "userId" = $1
           AND updated_at < $2
+          AND type = 'COWBOY_HAT'
           ORDER BY "sortTime" DESC
           LIMIT ${LIMIT})`
         )
+        for (const type of ['HORSE', 'GUN']) {
+          const gqlType = type.charAt(0) + type.slice(1).toLowerCase()
+          queries.push(
+            `(SELECT id::text, "startedAt" AS "sortTime", 0 as "earnedSats", 'New${gqlType}' AS type
+            FROM "Streak"
+            WHERE "userId" = $1
+            AND updated_at < $2
+            AND type = '${type}'::"StreakType"
+            ORDER BY "sortTime" DESC
+            LIMIT ${LIMIT})`
+          )
+          queries.push(
+            `(SELECT id::text AS id, "endedAt" AS "sortTime", 0 as "earnedSats", 'Lost${gqlType}' AS type
+            FROM "Streak"
+            WHERE "userId" = $1
+            AND updated_at < $2
+            AND "endedAt" IS NOT NULL
+            AND type = '${type}'::"StreakType"
+            ORDER BY "sortTime" DESC
+            LIMIT ${LIMIT})`
+          )
+        }
       }
 
       queries.push(
@@ -500,23 +523,14 @@ export default {
       }
     }
   },
-  Streak: {
+  CowboyHat: {
     days: async (n, args, { models }) => {
       const res = await models.$queryRaw`
-        SELECT "endedAt" - "startedAt" AS days
+        SELECT "endedAt"::date - "startedAt"::date AS days
         FROM "Streak"
         WHERE id = ${Number(n.id)} AND "endedAt" IS NOT NULL
       `
-
       return res.length ? res[0].days : null
-    },
-    type: async (n, args, { models }) => {
-      const res = await models.$queryRaw`
-        SELECT "type"
-        FROM "Streak"
-        WHERE id = ${Number(n.id)}
-      `
-      return res.length ? res[0].type : null
     }
   },
   Earn: {

api/resolvers/user.js

@@ -1082,27 +1082,25 @@ export default {
 
       return user.streak
     },
-    gunStreak: async (user, args, { models }) => {
+    hasSendWallet: async (user, args, { models }) => {
       if (user.hideCowboyHat) {
-        return null
+        return false
       }
-
-      return user.gunStreak
+      return user.hasSendWallet
     },
-    horseStreak: async (user, args, { models }) => {
+    hasRecvWallet: async (user, args, { models }) => {
       if (user.hideCowboyHat) {
-        return null
+        return false
       }
-
-      return user.horseStreak
+      return user.hasRecvWallet
     },
     maxStreak: async (user, args, { models }) => {
       if (user.hideCowboyHat) {
         return null
       }
 
       const [{ max }] = await models.$queryRaw`
-        SELECT MAX(COALESCE("endedAt", (now() AT TIME ZONE 'America/Chicago')::date) - "startedAt")
+        SELECT MAX(COALESCE("endedAt"::date, (now() AT TIME ZONE 'America/Chicago')::date) - "startedAt"::date)
         FROM "Streak" WHERE "userId" = ${user.id}`
       return max
     },

api/typeDefs/notifications.js

@@ -75,13 +75,6 @@ export default gql`
     tipComments: Int!
   }
 
-  type Streak {
-    id: ID!
-    sortTime: Date!
-    days: Int
-    type: String!
-  }
-
   type Earn {
     id: ID!
     earnedSats: Int!
@@ -156,11 +149,37 @@ export default gql`
     sortTime: Date!
   }
 
+  type CowboyHat {
+    id: ID!
+    sortTime: Date!
+    days: Int
+  }
+
+  type NewHorse {
+    id: ID!
+    sortTime: Date!
+  }
+
+  type LostHorse {
+    id: ID!
+    sortTime: Date!
+  }
+
+  type NewGun {
+    id: ID!
+    sortTime: Date!
+  }
+
+  type LostGun {
+    id: ID!
+    sortTime: Date!
+  }
+
   union Notification = Reply | Votification | Mention
     | Invitification | Earn | JobChanged | InvoicePaid | WithdrawlPaid | Referral
-    | Streak | FollowActivity | ForwardedVotification | Revenue | SubStatus
+    | FollowActivity | ForwardedVotification | Revenue | SubStatus
     | TerritoryPost | TerritoryTransfer | Reminder | ItemMention | Invoicification
-    | ReferralReward
+    | ReferralReward | CowboyHat | NewHorse | LostHorse | NewGun | LostGun
 
   type Notifications {
     lastChecked: Date

api/typeDefs/user.js

@@ -211,6 +211,8 @@ export default gql`
     streak: Int
     gunStreak: Int
     horseStreak: Int
+    hasSendWallet: Boolean
+    hasRecvWallet: Boolean
     maxStreak: Int
     isContributor: Boolean
     githubId: String

components/badge.js

@@ -1,29 +1,14 @@
+import { Fragment } from 'react'
 import OverlayTrigger from 'react-bootstrap/OverlayTrigger'
 import Tooltip from 'react-bootstrap/Tooltip'
 import CowboyHatIcon from '@/svgs/cowboy.svg'
 import AnonIcon from '@/svgs/spy-fill.svg'
-import { numWithUnits } from '@/lib/format'
-import { USER_ID } from '@/lib/constants'
 import GunIcon from '@/svgs/revolver.svg'
 import HorseIcon from '@/svgs/horse.svg'
+import { numWithUnits } from '@/lib/format'
+import { USER_ID } from '@/lib/constants'
 import classNames from 'classnames'
 
-const BADGES = [
-  {
-    icon: CowboyHatIcon,
-    streakName: 'streak'
-  },
-  {
-    icon: HorseIcon,
-    streakName: 'horseStreak'
-  },
-  {
-    icon: GunIcon,
-    streakName: 'gunStreak',
-    sizeDelta: 2
-  }
-]
-
 export default function Badges ({ user, badge, className = 'ms-1', badgeClassName, spacingClassName = 'ms-1', height = 16, width = 16 }) {
   if (!user || Number(user.id) === USER_ID.ad) return null
   if (Number(user.id) === USER_ID.anon) {
@@ -34,14 +19,41 @@ export default function Badges ({ user, badge, className = 'ms-1', badgeClassNam
     )
   }
 
+  const badges = []
+
+  const streak = user.optional.streak
+  if (streak !== null) {
+    badges.push({
+      icon: CowboyHatIcon,
+      overlayText: streak
+        ? `${numWithUnits(streak, { abbreviate: false, unitSingular: 'day', unitPlural: 'days' })}`
+        : 'new'
+    })
+  }
+
+  if (user.optional.hasSendWallet) {
+    badges.push({
+      icon: GunIcon,
+      sizeDelta: 2,
+      overlayText: 'can send sats'
+    })
+  }
+
+  if (user.optional.hasRecvWallet) {
+    badges.push({
+      icon: HorseIcon,
+      overlayText: 'can receive sats'
+    })
+  }
+
   return (
     <span className={className}>
-      {BADGES.map(({ icon, streakName, sizeDelta }, i) => (
+      {badges.map(({ icon, overlayText, sizeDelta }, i) => (
         <SNBadge
-          key={streakName}
+          key={i}
           user={user}
           badge={badge}
-          streakName={streakName}
+          overlayText={overlayText}
           badgeClassName={classNames(badgeClassName, i > 0 && spacingClassName)}
           IconForBadge={icon}
           height={height}
@@ -53,20 +65,19 @@ export default function Badges ({ user, badge, className = 'ms-1', badgeClassNam
   )
 }
 
-function SNBadge ({ user, badge, streakName, badgeClassName, IconForBadge, height = 16, width = 16, sizeDelta = 0 }) {
-  const streak = user.optional[streakName]
-  if (streak === null) {
-    return null
+function SNBadge ({ user, badge, overlayText, badgeClassName, IconForBadge, height = 16, width = 16, sizeDelta = 0 }) {
+  let Wrapper = Fragment
+
+  if (overlayText) {
+    Wrapper = ({ children }) => (
+      <BadgeTooltip overlayText={overlayText}>{children}</BadgeTooltip>
+    )
   }
 
   return (
-    <BadgeTooltip
-      overlayText={streak
-        ? `${numWithUnits(streak, { abbreviate: false, unitSingular: 'day', unitPlural: 'days' })}`
-        : 'new'}
-    >
+    <Wrapper>
       <span><IconForBadge className={badgeClassName} height={height + sizeDelta} width={width + sizeDelta} /></span>
-    </BadgeTooltip>
+    </Wrapper>
   )
 }
 

components/item-act.js

@@ -327,7 +327,7 @@ export function useZap () {
       // but right now this toast is noisy for optimistic zaps
       console.error(error)
     }
-  }, [act, toaster, strike, wallets.length])
+  }, [act, toaster, strike, wallets])
 }
 
 export class ActCanceledError extends Error {

components/notifications.js

@@ -58,7 +58,9 @@ function Notification ({ n, fresh }) {
         (type === 'InvoicePaid' && (n.invoice.nostr ? <NostrZap n={n} /> : <InvoicePaid n={n} />)) ||
         (type === 'WithdrawlPaid' && <WithdrawlPaid n={n} />) ||
         (type === 'Referral' && <Referral n={n} />) ||
-        (type === 'Streak' && <Streak n={n} />) ||
+        (type === 'CowboyHat' && <CowboyHat n={n} />) ||
+        (['NewHorse', 'LostHorse'].includes(type) && <Horse n={n} />) ||
+        (['NewGun', 'LostGun'].includes(type) && <Gun n={n} />) ||
         (type === 'Votification' && <Votification n={n} />) ||
         (type === 'ForwardedVotification' && <ForwardedVotification n={n} />) ||
         (type === 'Mention' && <Mention n={n} />) ||
@@ -165,7 +167,7 @@ const defaultOnClick = n => {
   if (type === 'WithdrawlPaid') return { href: `/withdrawals/${n.id}` }
   if (type === 'Referral') return { href: '/referrals/month' }
   if (type === 'ReferralReward') return { href: '/referrals/month' }
-  if (type === 'Streak') return {}
+  if (['CowboyHat', 'NewHorse', 'LostHorse', 'NewGun', 'LostGun'].includes(type)) return {}
   if (type === 'TerritoryTransfer') return { href: `/~${n.sub.name}` }
 
   if (!n.item) return {}
@@ -174,30 +176,64 @@ const defaultOnClick = n => {
   return itemLink(n.item)
 }
 
-function Streak ({ n }) {
-  function blurb (n) {
-    const type = n.type ?? 'COWBOY_HAT'
-    const index = Number(n.id) % Math.min(FOUND_BLURBS[type].length, LOST_BLURBS[type].length)
-    if (n.days) {
-      return `After ${numWithUnits(n.days, {
-        abbreviate: false,
-        unitSingular: 'day',
-         unitPlural: 'days'
-      })}, ` + LOST_BLURBS[type][index]
-    }
+function blurb (n) {
+  const type = n.__typename === 'CowboyHat'
+    ? 'COWBOY_HAT'
+    : (n.__typename.includes('Horse') ? 'HORSE' : 'GUN')
+  const index = Number(n.id) % Math.min(FOUND_BLURBS[type].length, LOST_BLURBS[type].length)
+  const lost = n.days || n.__typename.includes('Lost')
+  return lost ? LOST_BLURBS[type][index] : FOUND_BLURBS[type][index]
+}
 
-    return FOUND_BLURBS[type][index]
+function CowboyHat ({ n }) {
+  const Icon = n.days ? BaldIcon : CowboyHatIcon
+
+  let body = ''
+  if (n.days) {
+    body = `After ${numWithUnits(n.days, {
+      abbreviate: false,
+      unitSingular: 'day',
+      unitPlural: 'days'
+    })}, `
   }
 
-  const Icon = n.days
-    ? n.type === 'GUN' ? HolsterIcon : n.type === 'HORSE' ? SaddleIcon : BaldIcon
-    : n.type === 'GUN' ? GunIcon : n.type === 'HORSE' ? HorseIcon : CowboyHatIcon
+  body += `you ${n.days ? 'lost your' : 'found a'} cowboy hat`
+
+  return (
+    <div className='d-flex'>
+      <div style={{ fontSize: '2rem' }}><Icon className='fill-grey' height={40} width={40} /></div>
+      <div className='ms-1 p-1'>
+        <span className='fw-bold'>{body}</span>
+        <div><small style={{ lineHeight: '140%', display: 'inline-block' }}>{blurb(n)}</small></div>
+      </div>
+    </div>
+  )
+}
+
+function Horse ({ n }) {
+  const found = n.__typename.includes('New')
+  const Icon = found ? HorseIcon : SaddleIcon
+
+  return (
+    <div className='d-flex'>
+      <div style={{ fontSize: '2rem' }}><Icon className='fill-grey' height={40} width={40} /></div>
+      <div className='ms-1 p-1'>
+        <span className='fw-bold'>you {found ? 'found a' : 'lost your'} horse</span>
+        <div><small style={{ lineHeight: '140%', display: 'inline-block' }}>{blurb(n)}</small></div>
+      </div>
+    </div>
+  )
+}
+
+function Gun ({ n }) {
+  const found = n.__typename.includes('New')
+  const Icon = found ? GunIcon : HolsterIcon
 
   return (
     <div className='d-flex'>
       <div style={{ fontSize: '2rem' }}><Icon className='fill-grey' height={40} width={40} /></div>
       <div className='ms-1 p-1'>
-        <span className='fw-bold'>you {n.days ? 'lost your' : 'found a'} {n.type.toLowerCase().replace('_', ' ')}</span>
+        <span className='fw-bold'>you {found ? 'found a' : 'lost your'} gun</span>
         <div><small style={{ lineHeight: '140%', display: 'inline-block' }}>{blurb(n)}</small></div>
       </div>
     </div>

fragments/comments.js

@@ -4,9 +4,9 @@ import { gql } from '@apollo/client'
 const STREAK_FIELDS = gql`
   fragment StreakFields on User {
     optional {
-    streak
-    gunStreak
-      horseStreak
+      streak
+      hasSendWallet
+      hasRecvWallet
     }
   }
 `