pendulum
/
schat2-clive
1
0
Fork 0
Code Issues 3 Pull Requests Projects Releases Wiki Activity

Compare commits

base: pendulum:4b8077f7e71b77748278fe9e4f55e66ab14c8b9c
Branches Tags
pendulum:master
pendulum:socketio
...
compare: pendulum:8960a23448f1335607455c4d0e5276be942d3498
Branches Tags
pendulum:master
pendulum:socketio

2 Commits
4b8077f7e7 ... 8960a23448

Author SHA1 Message Date
Niels Simenon 8960a23448 1.24.6 2023-04-09 15:54:42 +02:00
Niels Simenon ef30c41758 Added username parameter to chat token, tracking by username. 2023-04-09 15:54:39 +02:00
3 changed files with 13 additions and 10 deletions
Show Stats Expand all files Collapse all files

4
package-lock.json generated
View File

@ -1,12 +1,12 @@
{
"name": "schat2-clive",
"version": "1.24.5",
"version": "1.24.6",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "schat2-clive",
"version": "1.24.5",
"version": "1.24.6",
"license": "ISC",
"dependencies": {
"better-sqlite3": "^8.3.0",

2
package.json
View File

@ -1,6 +1,6 @@
{
"name": "schat2-clive",
"version": "1.24.5",
"version": "1.24.6",
"description": "Game host for SChat 2-powered chat sites",
"main": "src/app.js",
"scripts": {

17
src/games/chat.js
View File

@ -123,10 +123,10 @@ function setRule(rule, context) {
context.sendMessage(`Chat rule must be at least 3 characters long, ${context.user.prefixedUsername}`, context.room.id, { label: false });
}
async function getTokens(context) {
async function getTokens(username) {
const { used_tokens: usedTokens } = await knex('chat_tokens')
.sum('tokens as used_tokens')
.where('user_id', context.user.id)
.where('user_id', username)
.where('created', '>', knex.raw(`datetime('now', '-${config.chat.userTokenPeriod} hour')`)) // 1 day ago
.first();
@ -154,9 +154,11 @@ async function onCommand(args, context) {
return;
}
if (['tokens', 'credit'].includes(context.subcommand)) {
const tokens = await getTokens(context);
context.sendMessage(`You have ${config.chat.userTokenLimit - tokens} chat tokens remaining. They will be returned gradually over ${config.chat.userTokenPeriod} hours.`, context.room.id, { label: false });
if (['tokens', 'credit'].includes(context.subcommand || context.command)) {
const username = args[0] ? args[0].replace(new RegExp(`^${config.usernamePrefix}`), '') : context.user.username;
const tokens = await getTokens(username);
context.sendMessage(`${args[0] ? `${style.bold(username)} has` : 'You have'} ${style.bold(config.chat.userTokenLimit - tokens)} chat tokens remaining. They will be returned gradually over ${config.chat.userTokenPeriod} hours.`, context.room.id, { label: false });
return;
}
@ -164,7 +166,7 @@ async function onCommand(args, context) {
const prompt = args.join(' ');
try {
const usedTokens = await getTokens(context);
const usedTokens = await getTokens(context.user.username);
if (usedTokens >= config.chat.userTokenLimit) {
context.logger.info(`${context.user.username} was rate limited at ${usedTokens}: ${prompt}`);
@ -200,7 +202,7 @@ async function onCommand(args, context) {
context.sendMessage(`${context.user.prefixedUsername}: ${curatedContent}`, context.room.id, { label: false });
await knex('chat_tokens').insert({
user_id: context.user.id,
user_id: context.user.username,
tokens: res.body.usage.total_tokens,
created: knex.raw("datetime('now')"),
});
@ -224,4 +226,5 @@ module.exports = {
onCommand,
onMessage,
onStart,
commands: ['tokens'],
};