Disincentivizing the use of all caps in post titles

.gitignore

@@ -20,6 +20,7 @@
 .DS_Store
 *.pem
 /*.sql
+/*.patch
 
 # debug
 npm-debug.log*

api/resolvers/item.js

@@ -9,14 +9,14 @@ import {
   ITEM_SPAM_INTERVAL, ITEM_FILTER_THRESHOLD,
   DONT_LIKE_THIS_COST, COMMENT_DEPTH_LIMIT, COMMENT_TYPE_QUERY,
   ANON_COMMENT_FEE, ANON_USER_ID, ANON_POST_FEE, ANON_ITEM_SPAM_INTERVAL, POLL_COST,
-  ITEM_ALLOW_EDITS, GLOBAL_SEED
+  ITEM_ALLOW_EDITS, GLOBAL_SEED, UPPER_CHARS_TITLE_FEE_MULT
 } from '../../lib/constants'
 import { msatsToSats } from '../../lib/format'
 import { parse } from 'tldts'
 import uu from 'url-unshort'
 import { advSchema, amountSchema, bountySchema, commentSchema, discussionSchema, jobSchema, linkSchema, pollSchema, ssValidate } from '../../lib/validate'
 import { sendUserNotification } from '../webPush'
-import { defaultCommentSort, isJob, deleteItemByAuthor, getDeleteCommand, hasDeleteCommand } from '../../lib/item'
+import { defaultCommentSort, isJob, deleteItemByAuthor, getDeleteCommand, hasDeleteCommand, titleExceedsFreeUppercase } from '../../lib/item'
 import { notifyItemParents, notifyUserSubscribers, notifyZapped } from '../../lib/push-notifications'
 import { datePivot, whenRange } from '../../lib/time'
 import { imageFeesInfo, uploadIdsFromText } from './image'
@@ -1092,10 +1092,35 @@ export const updateItem = async (parent, { sub: subName, forward, options, ...it
   const uploadIds = uploadIdsFromText(item.text, { models })
   const { fees: imgFees } = await imageFeesInfo(uploadIds, { models, me })
 
+  const hasPaidUpperTitleFee = old.upperTitleFeePaid
+  const titleUpperMult = !hasPaidUpperTitleFee && titleExceedsFreeUppercase(item) ? UPPER_CHARS_TITLE_FEE_MULT : 1
+  let additionalFeeMsats = 0
+  if (titleUpperMult > 1) {
+    const { _sum: { msats: paidMsats } } = await models.itemAct.aggregate({
+      _sum: {
+        msats: true
+      },
+      where: {
+        itemId: Number(item.id),
+        userId: me.id,
+        act: 'FEE'
+      }
+    })
+    const { baseCost } = await models.sub.findUnique({ where: { name: item.subName || item.root?.subName } })
+    // If the original post was a freebie, that doesn't mean this edit should be free
+    if (Number(paidMsats) === 0) {
+      additionalFeeMsats = titleUpperMult * baseCost * 1000
+      item.freebie = false
+    } else {
+      additionalFeeMsats = (titleUpperMult - 1) * baseCost * 1000
+    }
+    item.upperTitleFeePaid = true
+  }
+
   item = await serializeInvoicable(
-    models.$queryRawUnsafe(`${SELECT} FROM update_item($1::JSONB, $2::JSONB, $3::JSONB, $4::INTEGER[]) AS "Item"`,
-      JSON.stringify(item), JSON.stringify(fwdUsers), JSON.stringify(options), uploadIds),
-    { models, lnd, hash, hmac, me, enforceFee: imgFees }
+    models.$queryRawUnsafe(`${SELECT} FROM update_item($1::JSONB, $2::JSONB, $3::JSONB, $4::INTEGER[], $5::BIGINT) AS "Item"`,
+      JSON.stringify(item), JSON.stringify(fwdUsers), JSON.stringify(options), uploadIds, additionalFeeMsats),
+    { models, lnd, hash, hmac, me, enforceFee: imgFees + additionalFeeMsats }
   )
 
   await createMentions(item, models)
@@ -1128,11 +1153,14 @@ export const createItem = async (parent, { forward, options, ...item }, { me, mo
   const uploadIds = uploadIdsFromText(item.text, { models })
   const { fees: imgFees } = await imageFeesInfo(uploadIds, { models, me })
 
-  const enforceFee = (me ? undefined : (item.parentId ? ANON_COMMENT_FEE : (ANON_POST_FEE + (item.boost || 0)))) + imgFees
+  const titleUpperMult = titleExceedsFreeUppercase(item) ? UPPER_CHARS_TITLE_FEE_MULT : 1
+  item.upperTitleFeePaid = titleUpperMult > 1
+
+  const enforceFee = (me ? undefined : (item.parentId ? ANON_COMMENT_FEE : (ANON_POST_FEE * titleUpperMult + (item.boost || 0)))) + imgFees
   item = await serializeInvoicable(
     models.$queryRawUnsafe(
-      `${SELECT} FROM create_item($1::JSONB, $2::JSONB, $3::JSONB, '${spamInterval}'::INTERVAL, $4::INTEGER[]) AS "Item"`,
-      JSON.stringify(item), JSON.stringify(fwdUsers), JSON.stringify(options), uploadIds),
+      `${SELECT} FROM create_item($1::JSONB, $2::JSONB, $3::JSONB, '${spamInterval}'::INTERVAL, $4::INTEGER[], $5::INTEGER) AS "Item"`,
+      JSON.stringify(item), JSON.stringify(fwdUsers), JSON.stringify(options), uploadIds, titleUpperMult),
     { models, lnd, hash, hmac, me, enforceFee }
   )
 
@@ -1184,7 +1212,8 @@ export const SELECT =
   "Item"."subName", "Item".status, "Item"."uploadId", "Item"."pollCost", "Item".boost, "Item".msats,
   "Item".ncomments, "Item"."commentMsats", "Item"."lastCommentAt", "Item"."weightedVotes",
   "Item"."weightedDownVotes", "Item".freebie, "Item".bio, "Item"."otsHash", "Item"."bountyPaidTo",
-  ltree2text("Item"."path") AS "path", "Item"."weightedComments", "Item"."imgproxyUrls"`
+  ltree2text("Item"."path") AS "path", "Item"."weightedComments", "Item"."imgproxyUrls",
+  "Item"."upperTitleFeePaid"`
 
 function topOrderByWeightedSats (me, models) {
   return `ORDER BY ${orderByNumerator(models)} DESC NULLS LAST, "Item".id DESC`

api/typeDefs/item.js

@@ -117,6 +117,7 @@ export default gql`
     parentOtsHash: String
     forwards: [ItemForward]
     imgproxyUrls: JSONObject
+    upperTitleFeePaid: Boolean
   }
 
   input ItemForwardInput {

components/adv-post-form.js

@@ -55,9 +55,10 @@ export default function AdvPostForm ({ children }) {
             name='boost'
             onChange={(_, e) => merge({
               boost: {
-                term: `+ ${e.target.value}`,
+                term: `+ ${numWithUnits(e.target.value, { abbreviate: false, format: true })}`,
                 label: 'boost',
-                modifier: cost => cost + Number(e.target.value)
+                modifier: cost => cost + Number(e.target.value),
+                omit: !Number(e.target.value)
               }
             })}
             hint={<span className='text-muted'>ranks posts higher temporarily based on the amount</span>}

components/bounty-form.js

@@ -3,6 +3,7 @@ import { useRouter } from 'next/router'
 import { gql, useApolloClient, useMutation } from '@apollo/client'
 import Countdown from './countdown'
 import AdvPostForm, { AdvPostInitial } from './adv-post-form'
+import { useFeeButton, uppercaseTitleFeeHandler } from './fee-button'
 import InputGroup from 'react-bootstrap/InputGroup'
 import { bountySchema } from '../lib/validate'
 import { SubSelectInitial } from './sub-select-form'
@@ -84,6 +85,7 @@ export function BountyForm ({
       toastDeleteScheduled(toaster, data, !!item, values.text)
     }, [upsertBounty, router]
   )
+  const feeButton = useFeeButton()
 
   return (
     <Form
@@ -110,6 +112,11 @@ export function BountyForm ({
         autoFocus
         clear
         maxLength={MAX_TITLE_LENGTH}
+        onChange={async (formik, e) => {
+          if (e.target.value) {
+            uppercaseTitleFeeHandler(feeButton, e.target.value, item)
+          }
+        }}
       />
       <Input
         label={bountyLabel} name='bounty' required

components/discussion-form.js

@@ -3,6 +3,7 @@ import { useRouter } from 'next/router'
 import { gql, useApolloClient, useLazyQuery, useMutation } from '@apollo/client'
 import Countdown from './countdown'
 import AdvPostForm, { AdvPostInitial } from './adv-post-form'
+import { useFeeButton, uppercaseTitleFeeHandler } from './fee-button'
 import { ITEM_FIELDS } from '../fragments/items'
 import AccordianItem from './accordian-item'
 import Item from './item'
@@ -93,6 +94,7 @@ export function DiscussionForm ({
     }`)
 
   const related = relatedData?.related?.items || []
+  const feeButton = useFeeButton()
 
   return (
     <Form
@@ -120,6 +122,7 @@ export function DiscussionForm ({
             getRelated({
               variables: { title: e.target.value }
             })
+            uppercaseTitleFeeHandler(feeButton, e.target.value, item)
           }
         }}
         maxLength={MAX_TITLE_LENGTH}

components/fee-button.js

@@ -4,13 +4,14 @@ import ActionTooltip from './action-tooltip'
 import Info from './info'
 import styles from './fee-button.module.css'
 import { gql, useQuery } from '@apollo/client'
-import { FREEBIE_BASE_COST_THRESHOLD, SSR } from '../lib/constants'
+import { SSR, UPPER_CHARS_TITLE_FEE_MULT, FREEBIE_BASE_COST_THRESHOLD } from '../lib/constants'
 import { numWithUnits } from '../lib/format'
 import { useMe } from './me'
 import AnonIcon from '../svgs/spy-fill.svg'
 import { useShowModal } from './modal'
 import Link from 'next/link'
 import { SubmitButton } from './form'
+import { titleExceedsFreeUppercase } from '../lib/item'
 
 const FeeButtonContext = createContext()
 
@@ -80,7 +81,19 @@ export function FeeButtonProvider ({ baseLineItems = {}, useRemoteLineItems = ()
     return {
       lines,
       merge: mergeLineItems,
-      total: Object.values(lines).reduce((acc, { modifier }) => modifier(acc), 0),
+      total: Object.entries(lines)
+        .sort(([keyA], [keyB]) => {
+          // boost and image uploads comes last, so they don't get multiplied by any multipliers
+          if (['boost', 'imageFee'].includes(keyB)) {
+            return -1
+          }
+          if (['boost', 'imageFee'].includes(keyA)) {
+            return 1
+          }
+          return 0
+        })
+        .map(entry => entry[1])
+        .reduce((acc, { modifier }) => modifier(acc), 0),
       disabled,
       setDisabled
     }
@@ -134,6 +147,35 @@ export default function FeeButton ({ ChildButton = SubmitButton, variant, text,
   )
 }
 
+export const uppercaseTitleFeeHandler = (feeButtonHook, title, item) => {
+  const { freebie, sub } = item ?? {}
+  const tooManyUppercase = !item?.hasPaidUpperTitleFee && titleExceedsFreeUppercase({ title })
+  feeButtonHook.merge({
+    uppercaseTitle: {
+      term: (() => {
+        if (freebie) {
+          return `+ ${numWithUnits(UPPER_CHARS_TITLE_FEE_MULT * sub.baseCost)}`
+        }
+        if (item) {
+          return `+ ${numWithUnits((UPPER_CHARS_TITLE_FEE_MULT - 1) * sub.baseCost)}`
+        }
+        return `x ${UPPER_CHARS_TITLE_FEE_MULT}`
+      })(),
+      label: 'uppercase title mult',
+      modifier: cost => {
+        if (freebie) {
+          return cost + (tooManyUppercase ? UPPER_CHARS_TITLE_FEE_MULT * sub.baseCost : 0)
+        }
+        if (item) {
+          return cost + (tooManyUppercase ? (UPPER_CHARS_TITLE_FEE_MULT - 1) * sub.baseCost : 0)
+        }
+        return cost * (tooManyUppercase ? UPPER_CHARS_TITLE_FEE_MULT : 1)
+      },
+      omit: !tooManyUppercase
+    }
+  })
+}
+
 function Receipt ({ lines, total }) {
   return (
     <Table className={styles.receipt} borderless size='sm'>

components/job-form.js

@@ -16,6 +16,7 @@ import { usePrice } from './price'
 import Avatar from './avatar'
 import { jobSchema } from '../lib/validate'
 import { MAX_TITLE_LENGTH } from '../lib/constants'
+import { useFeeButton, uppercaseTitleFeeHandler } from './fee-button'
 import { useToast } from './toast'
 import { toastDeleteScheduled } from '../lib/form'
 import { ItemButtonBar } from './post'
@@ -85,6 +86,7 @@ export default function JobForm ({ item, sub }) {
       toastDeleteScheduled(toaster, data, !!item, values.text)
     }, [upsertJob, router, logoId]
   )
+  const feeButton = useFeeButton()
 
   return (
     <>
@@ -122,6 +124,11 @@ export default function JobForm ({ item, sub }) {
           autoFocus
           clear
           maxLength={MAX_TITLE_LENGTH}
+          onChange={async (formik, e) => {
+            if (e.target.value) {
+              uppercaseTitleFeeHandler(feeButton, e.target.value, item)
+            }
+          }}
         />
         <Input
           label='company'

components/link-form.js

@@ -7,6 +7,7 @@ import AdvPostForm, { AdvPostInitial } from './adv-post-form'
 import { ITEM_FIELDS } from '../fragments/items'
 import Item from './item'
 import AccordianItem from './accordian-item'
+import { useFeeButton, uppercaseTitleFeeHandler } from './fee-button'
 import { linkSchema } from '../lib/validate'
 import Moon from '../svgs/moon-fill.svg'
 import { SubSelectInitial } from './sub-select-form'
@@ -118,6 +119,7 @@ export function LinkForm ({ item, sub, editThreshold, children }) {
 
   const [postDisabled, setPostDisabled] = useState(false)
   const [titleOverride, setTitleOverride] = useState()
+  const feeButton = useFeeButton()
 
   return (
     <Form
@@ -145,10 +147,7 @@ export function LinkForm ({ item, sub, editThreshold, children }) {
             getRelated({
               variables: { title: e.target.value }
             })
-          }
-          if (e.target.value === e.target.value.toUpperCase()) {
-            setTitleOverride(e.target.value.replace(/\w\S*/g, txt =>
-              txt.charAt(0).toUpperCase() + txt.substr(1).toLowerCase()))
+            uppercaseTitleFeeHandler(feeButton, e.target.value, item)
           }
         }}
         maxLength={MAX_TITLE_LENGTH}

components/poll-form.js

@@ -4,6 +4,7 @@ import { gql, useApolloClient, useMutation } from '@apollo/client'
 import Countdown from './countdown'
 import AdvPostForm, { AdvPostInitial } from './adv-post-form'
 import { MAX_POLL_CHOICE_LENGTH, MAX_POLL_NUM_CHOICES, MAX_TITLE_LENGTH } from '../lib/constants'
+import { useFeeButton, uppercaseTitleFeeHandler } from './fee-button'
 import { pollSchema } from '../lib/validate'
 import { SubSelectInitial } from './sub-select-form'
 import { useCallback } from 'react'
@@ -59,6 +60,7 @@ export function PollForm ({ item, sub, editThreshold, children }) {
   )
 
   const initialOptions = item?.poll?.options.map(i => i.option)
+  const feeButton = useFeeButton()
 
   return (
     <Form
@@ -80,6 +82,11 @@ export function PollForm ({ item, sub, editThreshold, children }) {
         name='title'
         required
         maxLength={MAX_TITLE_LENGTH}
+        onChange={async (formik, e) => {
+          if (e.target.value) {
+            uppercaseTitleFeeHandler(feeButton, e.target.value, item)
+          }
+        }}
       />
       <MarkdownInput
         topLevel

docker-compose.yml

@@ -39,7 +39,7 @@ services:
       db:
         condition: service_started
       app:
-        condition: service_healthy
+        condition: service_started
     env_file:
       - ./.env.sample
     ports:

fragments/items.js

@@ -48,6 +48,7 @@ export const ITEM_FIELDS = gql`
     uploadId
     mine
     imgproxyUrls
+    upperTitleFeePaid
   }`
 
 export const ITEM_FULL_FIELDS = gql`
@@ -70,6 +71,9 @@ export const ITEM_FULL_FIELDS = gql`
         }
       }
     }
+    sub {
+      baseCost
+    }
     forwards {
       userId
       pct

lib/constants.js

@@ -57,6 +57,8 @@ export const MAX_FORWARDS = 5
 export const LNURLP_COMMENT_MAX_LENGTH = 1000
 export const RESERVED_MAX_USER_ID = 615
 export const GLOBAL_SEED = 616
+export const MAX_FREE_UPPER_CHARS_TITLE = 12
+export const UPPER_CHARS_TITLE_FEE_MULT = 100
 export const FREEBIE_BASE_COST_THRESHOLD = 10
 
 export const FOUND_BLURBS = [

lib/item.js

@@ -1,4 +1,4 @@
-import { OLD_ITEM_DAYS } from './constants'
+import { OLD_ITEM_DAYS, MAX_FREE_UPPER_CHARS_TITLE } from './constants'
 import { datePivot } from './time'
 
 export const defaultCommentSort = (pinned, bio, createdAt) => {
@@ -52,3 +52,7 @@ export const deleteItemByAuthor = async ({ models, id, item }) => {
 
   return await models.item.update({ where: { id: Number(id) }, data: updateData })
 }
+
+export const getUppercaseCharCountInTitle = item => (item?.title?.match(/[A-Z]/g) || []).length
+
+export const titleExceedsFreeUppercase = item => getUppercaseCharCountInTitle(item) > MAX_FREE_UPPER_CHARS_TITLE