Fix slider inputs (#1103)

* fix slider value propagation
* use cached sub for sticky detect
* user banning

Author: sceuick

common/template-parser.ts

@@ -39,6 +39,10 @@ export type TemplateOpts = {
     flags: { [key in Section]?: boolean }
     sections: { [key in Section]: string[] }
     done: boolean
+    warnings: {
+      noHistory: boolean
+      noPost: boolean
+    }
   }
 
   /**
@@ -186,6 +190,10 @@ export async function parseTemplate(
     flags: {},
     sections: { system: [], history: [], post: [] },
     done: false,
+    warnings: {
+      noHistory: true,
+      noPost: true,
+    },
   }
 
   opts.sections = sections
@@ -643,6 +651,7 @@ function renderIterator(holder: IterableHolder, children: CNode[], opts: Templat
     opts.limit.output[id] = { src: holder, lines: output }
     if (opts.sections) {
       opts.sections.flags.history = true
+      opts.sections.warnings.noHistory = false
     }
     return id
   }
@@ -713,10 +722,18 @@ function getPlaceholder(
       return opts.jsonValues?.[node.values] || ''
 
     case 'post': {
+      if (opts.sections) {
+        opts.sections.warnings.noPost = false
+      }
+
       return opts.parts?.post?.join('\n') || ''
     }
 
     case 'history': {
+      if (opts.sections) {
+        opts.sections.warnings.noHistory = false
+      }
+
       if (opts.limit) {
         const id = `__${v4()}__`
         opts.limit.output![id] = {

common/types/schema.ts

@@ -209,6 +209,13 @@ export namespace AppSchema {
       lastChecked?: string
     }
     stripeSessions?: string[]
+
+    banned?: {
+      at: Date
+      reason: string
+    }
+
+    banHistory?: Array<{ at: Date; reason: string }>
   }
 
   export interface ApiKey {

srv/adapter/generate.ts

@@ -395,6 +395,21 @@ export async function createChatStream(
    */
 
   const prompt = await assemblePrompt(opts, opts.parts, opts.lines, encoder)
+
+  if (prompt.sections.warnings.noHistory) {
+    throw new StatusError(
+      `Your prompt template does not contain the 'chat history' placeholder. Please fix your prompt template.`,
+      400
+    )
+  }
+
+  // if (prompt.sections.warnings.noPost) {
+  //   throw new StatusError(
+  //     `Your prompt template does not contain the 'post' placeholder. Please fix your prompt template.`,
+  //     400
+  //   )
+  // }
+
   if (prompt.linesAddedCount === 0 && opts.linesCount) {
     throw new StatusError(
       `Could not fit any messages in prompt. Check your character definition, context size, and template`,

srv/api/admin.ts

@@ -26,6 +26,23 @@ const searchUsers = handle(async (req) => {
   return { users: users.map((u) => ({ ...u, hash: undefined })) }
 })
 
+const banUser = handle(async (req) => {
+  const user = await store.users.getUser(req.params.userId)
+  assertValid({ reason: 'string' }, req.body)
+
+  if (!user) {
+    throw new StatusError('User not found', 404)
+  }
+
+  const next = await store.admin.banUser(req.params.userId, req.body.reason)
+  return next
+})
+
+const unbanUser = handle(async (req) => {
+  const next = await store.admin.unbanUser(req.params.userId)
+  return next
+})
+
 const impersonateUser = handle(async (req) => {
   const userId = req.params.userId
   const user = await store.users.getUser(userId)
@@ -138,5 +155,7 @@ router.get('/users/:id/info', getUserInfo)
 router.post('/user/password', setUserPassword)
 router.post('/notify', notifyAll)
 router.post('/configuration', updateConfiguration)
+router.post('/ban/:userId', banUser)
+router.post('/unban/:userId', unbanUser)
 
 export default router

srv/api/chat/message.ts

@@ -278,6 +278,7 @@ export const generateMessageV2 = handle(async (req, res) => {
     ).catch((err) => ({ err }))
 
     if ('err' in chatStream) {
+      await releaseLock(chatId)
       throw chatStream.err
     }
 

srv/api/wrap.ts

@@ -31,6 +31,14 @@ export class StatusError extends Error {
   }
 }
 
+class BannedError extends StatusError {
+  public banned = true
+
+  constructor(public reason: string) {
+    super(reason, 401)
+  }
+}
+
 export type Handler = (req: AppRequest, res: express.Response, next: express.NextFunction) => any
 
 export type AppRequest = Omit<express.Request, 'log'> & {
@@ -49,4 +57,5 @@ export const errors = {
   Unauthorized: new StatusError('Unauthorized', 401),
   Forbidden: new StatusError('Forbidden', 403),
   BadRequest: new StatusError('Bad request', 400),
+  UserBanned: (reason: string) => new BannedError(reason || 'No reason given'),
 }

srv/api/ws/handlers.ts

@@ -20,7 +20,7 @@ type Handlers = {
 }
 
 export const handlers: Handlers = {
-  login: (client: AppSocket, data: any) => {
+  login: async (client: AppSocket, data: any) => {
     assertValid({ token: 'string' }, data)
     try {
       if (client.userId) {
@@ -31,6 +31,12 @@ export const handlers: Handlers = {
       client.token = data.token
       client.userId = payload.userId
 
+      const user = await store.users.getUser(payload.userId)
+      if (!user || user.banned) {
+        client.dispatch({ type: 'login', success: false })
+        return
+      }
+
       const sockets = userSockets.get(client.userId) || []
       sockets.push(client)
       userSockets.set(client.userId, sockets)

srv/app.ts

@@ -23,15 +23,15 @@ export function createApp() {
   const app = express()
   const server = createServer(app)
 
-  app.use(express.urlencoded({ limit: `${config.limits.upload}mb`, extended: false }))
-  app.use(express.json({ limit: `${config.limits.payload}mb` }))
-  app.use(logMiddleware())
   app.use(
     cors({
       origin: true,
       optionsSuccessStatus: 200,
     })
   )
+  app.use(express.urlencoded({ limit: `${config.limits.upload}mb`, extended: false }))
+  app.use(express.json({ limit: `${config.limits.payload}mb` }))
+  app.use(logMiddleware())
   app.use(upload.any())
 
   const baseFolder = resolve(__dirname, '..')
@@ -94,6 +94,11 @@ export function createApp() {
     return res.sendFile(index)
   })
   app.use((err: any, _req: any, res: express.Response, _next: any) => {
+    if (err.banned) {
+      res.status(401)
+      res.json({ message: err.message, user_banned: true })
+      return
+    }
     if (err.status > 0) {
       res.status(err.status)
     } else {

srv/db/admin.ts

@@ -4,6 +4,7 @@ import { encryptPassword } from './util'
 import { AppSchema } from '../../common/types/schema'
 import { domain } from '../domains'
 import { config } from '../config'
+import { StatusError } from '../api/wrap'
 
 type UsersOpts = {
   username?: string
@@ -104,6 +105,7 @@ export async function getUserInfo(userId: string) {
         patreon: 1,
         stripeSessions: 1,
         google: 1,
+        banned: 1,
       },
     }
   )
@@ -122,3 +124,38 @@ export async function getUserInfo(userId: string) {
     ...billing,
   }
 }
+
+export async function banUser(userId: string, reason: string) {
+  await db('user').updateOne(
+    { _id: userId },
+    {
+      $set: {
+        banned: {
+          at: new Date(),
+          reason: reason || 'No reason given',
+        },
+      },
+    }
+  )
+
+  const next = await getUserInfo(userId)
+  return next
+}
+
+export async function unbanUser(userId: string) {
+  const user = await db('user').findOne({ _id: userId })
+  if (!user) {
+    throw new StatusError(`User not found`, 404)
+  }
+
+  if (!user.banned) {
+    throw new StatusError(`User not banned`, 400)
+  }
+
+  const banHistory = user.banHistory || []
+  banHistory.push(user.banned)
+
+  await db('user').updateOne({ _id: userId }, { $set: { banHistory, banned: null as any } })
+  const next = await getUserInfo(userId)
+  return next
+}

srv/db/user.ts

@@ -78,6 +78,10 @@ export async function authenticate(username: string, password: string) {
   const user = await db('user').findOne({ username: username.toLowerCase() })
   if (!user) return
 
+  if (user.banned) {
+    throw errors.UserBanned(user.banned.reason)
+  }
+
   const match = await bcrypt.compare(password, user.hash)
   if (!match) return
 

srv/middleware.ts

@@ -134,6 +134,12 @@ export function logMiddleware() {
         return next(errors.Unauthorized)
       }
 
+      if (user.banned) {
+        // res.status(401)
+        res.json({ message: `${user.banned.reason}`, user_banned: true })
+        return
+      }
+
       const sub = getUserSubscriptionTier(user, getCachedTiers())
       req.authed = user
       req.tier = sub?.tier

tests/__snapshots__/placeholder.spec.js.snap

@@ -22,6 +22,10 @@ MainChar's personality: MainCharacter talks a lot",
         "MainChar's personality: MainCharacter talks a lot",
       ],
     },
+    "warnings": Object {
+      "noHistory": true,
+      "noPost": true,
+    },
   },
 }
 `;

web/App.tsx

@@ -179,6 +179,10 @@ const Layout: Component<{ children?: any }> = (props) => {
                   <Maintenance />
                 </Match>
 
+                <Match when={!!state.banned}>
+                  <div class="flex h-[80vh] flex-col items-center justify-center gap-2"></div>
+                </Match>
+
                 <Match when={cfg.initLoading}>
                   <div class="flex h-[80vh] flex-col items-center justify-center gap-2">
                     <div>
@@ -211,6 +215,7 @@ const Layout: Component<{ children?: any }> = (props) => {
       />
       <InfoModal />
       <ProfileModal />
+      <BannedModal />
       <For each={rootModals.modals}>{(modal) => modal.element}</For>
       <ImageModal />
       <Show when={cfg.showImgSettings}>
@@ -243,4 +248,20 @@ const InfoModal: Component = (props) => {
   )
 }
 
+const BannedModal: Component = () => {
+  const state = userStore((u) => ({
+    banned: u.banned,
+  }))
+
+  return (
+    <Modal show={!!state.banned} close={() => userStore.logout()} title="Account Banned">
+      <div class="flex flex-col items-center">
+        <p class="">This account has been banned for the following reason:</p>
+        <p class="my-2 flex items-center font-bold">{state.banned}</p>
+        <p>If you believe this is an error, please contact support.</p>
+      </div>
+    </Modal>
+  )
+}
+
 export default App

web/emitter.ts

@@ -19,6 +19,7 @@ export const EVENTS = {
   checkoutSuccess: 'checkout-success',
   chatOpened: 'chat-opened',
   chatClosed: 'chat-closed',
+  userBanned: 'user-banned',
 } as const
 
 type EventType = (typeof EVENTS)[keyof typeof EVENTS]