Trading ban

backend/api/src/app.ts

@@ -73,7 +73,8 @@ import {
 } from './get-dashboard-from-slug'
 import { unresolve } from './unresolve'
 import { referuser } from 'api/refer-user'
-import { banuser } from 'api/ban-user'
+import { banUserFromPosting } from 'api/ban-user-from-posting'
+import { banUserFromTrading } from './ban-user-from-trading'
 import { updateMarket } from 'api/update-market'
 import { createprivateusermessage } from 'api/create-private-user-message'
 import { createprivateusermessagechannel } from 'api/create-private-user-message-channel'
@@ -516,7 +517,8 @@ app.post('/updatedashboard', ...apiRoute(updatedashboard))
 app.post('/delete-dashboard', ...apiRoute(deletedashboard))
 app.get('/get-news-dashboards', ...apiRoute(getnews))
 app.post('/getdashboardfromslug', ...apiRoute(getdashboardfromslug))
-app.post('/ban-user', ...apiRoute(banuser))
+app.post('/ban-user-from-posting', ...apiRoute(banUserFromPosting))
+app.post('/ban-user-from-trading', ...apiRoute(banUserFromTrading))
 app.post('/create-private-user-message', ...apiRoute(createprivateusermessage))
 app.post(
   '/create-private-user-message-channel',

backend/api/src/ban-user.ts → backend/api/src/ban-user-from-posting.ts

@@ -14,7 +14,7 @@ const bodySchema = z
   })
   .strict()
 
-export const banuser = authEndpoint(async (req, auth) => {
+export const banUserFromPosting = authEndpoint(async (req, auth) => {
   const { userId, unban } = validate(bodySchema, req.body)
   const db = createSupabaseDirectClient()
   await throwErrorIfNotMod(auth.uid)

backend/api/src/ban-user-from-trading.ts

@@ -0,0 +1,30 @@
+import { APIError, authEndpoint, validate } from 'api/helpers/endpoint'
+import { z } from 'zod'
+import { trackPublicEvent } from 'shared/analytics'
+import { throwErrorIfNotMod } from 'shared/helpers/auth'
+import { isAdminId } from 'common/envs/constants'
+import { log } from 'shared/utils'
+import { createSupabaseDirectClient } from 'shared/supabase/init'
+import { updateUser } from 'shared/supabase/users'
+
+const bodySchema = z
+  .object({
+    userId: z.string(),
+    unban: z.boolean().optional(),
+  })
+  .strict()
+
+export const banUserFromTrading = authEndpoint(async (req, auth) => {
+  const { userId, unban } = validate(bodySchema, req.body)
+  const db = createSupabaseDirectClient()
+  await throwErrorIfNotMod(auth.uid)
+  if (isAdminId(userId)) throw new APIError(403, 'Cannot ban admin')
+  await trackPublicEvent(auth.uid, 'ban user from trading', {
+    userId,
+  })
+  await updateUser(db, userId, {
+    isBannedFromTrading: !unban,
+  })
+  log(`Updated trading ban status for user ${userId}`)
+  return { success: true }
+})

backend/api/src/delete-me.ts

@@ -20,7 +20,6 @@ export const deleteMe: APIHandler<'me/delete'> = async (body, auth) => {
   const pg = createSupabaseDirectClient()
   await updateUser(pg, auth.uid, {
     userDeleted: true,
-    isBannedFromPosting: true,
   })
   await updatePrivateUser(pg, auth.uid, {
     email: FieldVal.delete(),

backend/api/src/get-mod-reports.ts

@@ -15,7 +15,8 @@ export const getModReports: APIHandler<'get-mod-reports'> = async () => {
       owner.username as owner_username,
       owner.data->>'avatarUrl' as owner_avatar_url,
       owner.name as owner_name,
-      (owner.data->>'isBannedFromPosting')::boolean as owner_is_banned_from_posting
+      (owner.data->>'isBannedFromPosting')::boolean as owner_is_banned_from_posting,
+      (owner.data->>'isBannedFromTrading')::boolean as owner_is_banned_from_trading
     from mod_reports mr
     join contract_comments cc on cc.comment_id = mr.comment_id
     join contracts c on c.id = mr.contract_id

backend/api/src/get-user.ts

@@ -22,9 +22,15 @@ export const getLiteUser = async (
 ) => {
   const pg = createSupabaseDirectClient()
   const liteUser = await pg.oneOrNone(
-    `select id, name, username, data->>'avatarUrl' as "avatarUrl", data->'isBannedFromPosting' as "isBannedFromPosting"
-            from users
-            where ${'id' in props ? 'id' : 'username'} = $1`,
+    `select
+      id,
+      name,
+      username,
+      data->>'avatarUrl' as "avatarUrl",
+      (data->>'isBannedFromPosting')::boolean as "isBannedFromPosting",
+      (data->>'isBannedFromTrading')::boolean as "isBannedFromTrading"
+    from users
+    where ${'id' in props ? 'id' : 'username'} = $1`,
     ['id' in props ? props.id : props.username]
   )
   if (!liteUser) throw new APIError(404, 'User not found')

backend/api/src/place-bet.ts

@@ -24,7 +24,7 @@ import { Answer } from 'common/answer'
 import { CpmmState, getCpmmProbability } from 'common/calculate-cpmm'
 import { ValidatedAPIParams } from 'common/api/schema'
 import { onCreateBets } from 'api/on-create-bet'
-import { BANNED_TRADING_USER_IDS } from 'common/envs/constants'
+import { isAdminId } from 'common/envs/constants'
 import * as crypto from 'crypto'
 import { formatMoneyWithDecimals } from 'common/util/format'
 import {
@@ -654,6 +654,10 @@ export const validateBet = async (
   const user = await getUser(uid, pgTrans)
   if (!user) throw new APIError(404, 'User not found.')
 
+  if (isAdminId(uid) && contract.token === 'CASH') {
+    throw new APIError(403, 'Admins cannot trade on sweepstakes markets.')
+  }
+
   const balance = contract.token === 'CASH' ? user.cashBalance : user.balance
   if (amount !== undefined && balance < amount)
     throw new APIError(403, 'Insufficient balance.')
@@ -666,8 +670,8 @@ export const validateBet = async (
       'You must be kyc verified to trade on sweepstakes markets.'
     )
   }
-  if (BANNED_TRADING_USER_IDS.includes(uid) || user.userDeleted) {
-    throw new APIError(403, 'You are banned or deleted. And not #blessed.')
+  if (user.isBannedFromTrading || user.userDeleted) {
+    throw new APIError(403, 'You are banned or deleted.')
   }
   // if (!isVerified(user)) {
   //   throw new APIError(403, 'You must verify your phone number to bet.')

common/src/api/user-types.ts

@@ -8,6 +8,7 @@ export type DisplayUser = {
   username: string
   avatarUrl: string
   isBannedFromPosting?: boolean
+  isBannedFromTrading?: boolean
 }
 
 export type FullUser = User & {

common/src/envs/constants.ts

@@ -265,13 +265,6 @@ export const VERIFIED_USERNAMES = [
   'DanHendrycks',
 ]
 
-export const BANNED_TRADING_USER_IDS = [
-  'zgCIqq8AmRUYVu6AdQ9vVEJN8On1', //firstuserhere aka _deleted_
-  'LIBAoi7tpqeNLYM1xxJ1QJBQqW32', //lastuserhere
-  'p3ADzwIUS3fk0ka80XYEE3OM3S32', //PC
-  '4JuXgDx47xPagH5mcLDqLzUSN5g2', // BTE
-]
-
 export const PARTNER_USER_IDS: string[] = [
   'sTUV8ejuM2byukNZp7qKP2OKXMx2', // NFL
   'rFJu0EIdR6RP8d1vHKSh62pbnbH2', // SimonGrayson

common/src/mod-report.ts

@@ -17,5 +17,6 @@ export type ModReport = {
   owner_username: string
   owner_avatar_url: string
   owner_is_banned_from_posting: boolean
+  owner_is_banned_from_trading: boolean
   owner_name: string
 }

common/src/user.ts

@@ -63,6 +63,7 @@ export type User = {
   hasSeenLoanModal?: boolean
   hasSeenContractFollowModal?: boolean
   isBannedFromPosting?: boolean
+  isBannedFromTrading?: boolean
   userDeleted?: boolean
   optOutBetWarnings?: boolean
   freeQuestionsCreated?: number

twitch-bot/common/types/manifold-api-types.ts

@@ -66,6 +66,7 @@ export type LiteUser = {
   isTrustworthy: boolean;
 
   isBannedFromPosting?: boolean;
+  isBannedFromTrading?: boolean;
   userDeleted?: boolean;
 
   followerCountCached: number;

web/components/auth-context.tsx

@@ -7,11 +7,7 @@ import { createUser } from 'web/lib/api/api'
 import { randomString } from 'common/util/random'
 import { identifyUser, setUserProperty } from 'web/lib/service/analytics'
 import { useStateCheckEquality } from 'web/hooks/use-state-check-equality'
-import {
-  AUTH_COOKIE_NAME,
-  BANNED_TRADING_USER_IDS,
-  TEN_YEARS_SECS,
-} from 'common/envs/constants'
+import { AUTH_COOKIE_NAME, TEN_YEARS_SECS } from 'common/envs/constants'
 import { getCookie, setCookie } from 'web/lib/util/cookie'
 import {
   type PrivateUser,
@@ -114,12 +110,13 @@ export function AuthProvider(props: {
   useEffect(() => {
     if (authUser) {
       if (
-        BANNED_TRADING_USER_IDS.includes(authUser.user.id) ||
+        (authUser.user.isBannedFromPosting &&
+          authUser.user.isBannedFromTrading) ||
         authUser.user.userDeleted
       ) {
         const message = authUser.user.userDeleted
           ? 'You have deleted the account associated with this email. To restore your account please email [email protected]'
-          : 'You are banned from trading. To learn more please email [email protected]'
+          : 'You are banned from Manifold. To learn more please email [email protected]'
 
         firebaseLogout().then(() => {
           alert(message)

web/components/buttons/user-settings-button.tsx

@@ -22,7 +22,7 @@ import {
   Referrals,
   useReferralCount,
 } from 'web/components/buttons/referrals-button'
-import { banUser } from 'web/lib/api/api'
+import { banUserFromPosting, banUserFromTrading } from 'web/lib/api/api'
 import SuperBanControl from '../SuperBanControl'
 import { buildArray } from 'common/util/array'
 import { AccountSettings } from '../profile/settings'
@@ -86,13 +86,30 @@ export function UserSettingButton(props: { user: User }) {
                     color={'red'}
                     size="xs"
                     onClick={() => {
-                      banUser({
+                      banUserFromPosting({
                         userId,
                         unban: user.isBannedFromPosting ?? false,
                       })
                     }}
                   >
-                    {user.isBannedFromPosting ? 'Banned' : 'Ban User'}
+                    {user.isBannedFromPosting
+                      ? 'Banned (posting)'
+                      : 'Ban Posting'}
+                  </Button>
+
+                  <Button
+                    color={'red'}
+                    size="xs"
+                    onClick={() => {
+                      banUserFromTrading({
+                        userId,
+                        unban: user.isBannedFromTrading ?? false,
+                      })
+                    }}
+                  >
+                    {user.isBannedFromTrading
+                      ? 'Banned (trading)'
+                      : 'Ban Trading'}
                   </Button>
                 </Row>
               )}

web/components/mod-report-item.tsx

@@ -50,8 +50,17 @@ const ModReportItem: React.FC<ReportItemProps> = ({
                   avatarUrl={report.owner_avatar_url || ''}
                   size="sm"
                 />
+
                 <UserLink user={owner} className="text-ink-800 ml-2" />
-                {report.owner_is_banned_from_posting && <BannedBadge />}
+                {(report.owner_is_banned_from_posting ||
+                  report.owner_is_banned_from_trading) && (
+                  <span className="ml-1.5">
+                    <BannedBadge
+                      isBannedFromPosting={report.owner_is_banned_from_posting}
+                      isBannedFromTrading={report.owner_is_banned_from_trading}
+                    />
+                  </span>
+                )}
               </div>
             </UserHovercard>
             <Row className="ml-2">commented:</Row>

web/components/profile/blocked-user.tsx

@@ -39,7 +39,12 @@ export function BlockedUser(props: { user: User; privateUser: PrivateUser }) {
                   {user.name}
                   {' (Blocked) '}
                   {<UserBadge userId={user.id} username={user.username} />}
-                  {user.isBannedFromPosting && <BannedBadge />}
+                  <span className="ml-1.5">
+                    <BannedBadge
+                      isBannedFromPosting={user.isBannedFromPosting ?? false}
+                      isBannedFromTrading={user.isBannedFromTrading ?? false}
+                    />
+                  </span>
                 </span>
                 <Row className="sm:text-md items-center gap-x-3 text-sm ">
                   <span className={' text-ink-400'}>@{user.username}</span>

web/components/widgets/user-link.tsx

@@ -136,14 +136,39 @@ function BotBadge() {
   )
 }
 
-export function BannedBadge() {
+export function BannedBadge({
+  isBannedFromPosting,
+  isBannedFromTrading,
+  className,
+}: {
+  isBannedFromPosting: boolean
+  isBannedFromTrading: boolean
+  className?: string
+}) {
+  let badgeText = ''
+  let tooltipText = ''
+
+  if (isBannedFromPosting && isBannedFromTrading) {
+    badgeText = 'Banned from posting & trading'
+    tooltipText = "Can't create comments, messages, questions, or trade"
+  } else if (isBannedFromPosting) {
+    badgeText = 'Banned from posting'
+    tooltipText = "Can't create comments, messages, or questions"
+  } else if (isBannedFromTrading) {
+    badgeText = 'Banned from trading'
+    tooltipText = "Can't participate in trading"
+  }
+
+  if (!badgeText) return null
+
   return (
-    <Tooltip
-      text="Can't create comments, messages, or questions"
-      placement="bottom"
-    >
-      <span className="ml-1.5 rounded-full bg-yellow-100 px-2.5 py-0.5 text-xs font-medium text-yellow-800 dark:bg-yellow-700 dark:text-yellow-100">
-        Banned
+    <Tooltip text={tooltipText} placement="bottom">
+      <span
+        className={
+          'rounded-full bg-yellow-100 px-2.5 py-0.5 text-xs font-medium text-yellow-800 dark:bg-yellow-700 dark:text-yellow-100'
+        }
+      >
+        {badgeText}
       </span>
     </Tooltip>
   )
@@ -260,6 +285,7 @@ export const StackedUserNames = (props: {
     username: string
     createdTime: number
     isBannedFromPosting?: boolean
+    isBannedFromTrading?: boolean
   }
   followsYou?: boolean
   className?: string
@@ -277,8 +303,12 @@ export const StackedUserNames = (props: {
             fresh={isFresh(user.createdTime)}
           />
         }
-        {user.isBannedFromPosting && <BannedBadge />}
+        <BannedBadge
+          isBannedFromPosting={user.isBannedFromPosting ?? false}
+          isBannedFromTrading={user.isBannedFromTrading ?? false}
+        />
       </div>
+
       <Row className={'flex-shrink flex-wrap gap-x-2'}>
         <span className={clsx('text-ink-400 text-sm', usernameClassName)}>
           @{user.username}{' '}

web/lib/api/api.ts

@@ -334,15 +334,25 @@ export const updateMarket = curriedAPI('market/:contractId/update')
 
 export const updateUser = curriedAPI('me/update')
 
-export function banUser(params: { userId: string; unban?: boolean }) {
-  return call(getApiUrl('ban-user'), 'POST', params)
+export function banUserFromPosting(params: {
+  userId: string
+  unban?: boolean
+}) {
+  return call(getApiUrl('ban-user-from-posting'), 'POST', params)
 }
 export function createPrivateMessageChannelWithUsers(params: {
   userIds: string[]
 }) {
   return call(getApiUrl('create-private-user-message-channel'), 'POST', params)
 }
 
+export function banUserFromTrading(params: {
+  userId: string
+  unban?: boolean
+}) {
+  return call(getApiUrl('ban-user-from-trading'), 'POST', params)
+}
+
 export function sendUserPrivateMessage(params: {
   channelId: number
   content: JSONContent

web/lib/supabase/super-ban-user.ts

@@ -1,11 +1,11 @@
-import { api, banUser } from 'web/lib/api/api'
+import { api, banUserFromPosting } from 'web/lib/api/api'
 
 async function superBanUser(userId: string) {
   let marketsStatus = "could not be unlisted nor N/A'd due to an unknown error"
   let commentsStatus = 'could not be hidden due to an unknown error'
 
   try {
-    await banUser({ userId })
+    await banUserFromPosting({ userId })
     await api('unlist-and-cancel-user-contracts', { userId })
     marketsStatus = "successfully unlisted & NA'd"
   } catch (error) {