ekzyis/stacker.news
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix expirein used instead of keepuntil (#1788)

Browse Source 
* Fix expirein used instead of keepuntil

* Fix existing boost jobs
This commit is contained in:
ekzyis 2025-01-03 15:52:34 +01:00 committed by GitHub
parent d53bc09773
commit 077727dced
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/paidAction/boost.js
View File

@ -67,9 +67,9 @@ export async function onPaid ({ invoice, actId }, { tx }) {
}) })
await tx.$executeRaw` await tx.$executeRaw`
INSERT INTO pgboss.job (name, data, retrylimit, retrybackoff, startafter, expirein) INSERT INTO pgboss.job (name, data, retrylimit, retrybackoff, startafter, keepuntil)
VALUES ('expireBoost', jsonb_build_object('id', ${itemAct.itemId}::INTEGER), 21, true, VALUES ('expireBoost', jsonb_build_object('id', ${itemAct.itemId}::INTEGER), 21, true,
now() + interval '30 days', interval '40 days')` now() + interval '30 days', now() + interval '40 days')`
} }
export async function onFail ({ invoice }, { tx }) { export async function onFail ({ invoice }, { tx }) {

4
api/paidAction/index.js
View File

@ -461,11 +461,11 @@ async function createDbInvoice (actionType, args, context) {
// insert a job to check the invoice after it's set to expire // insert a job to check the invoice after it's set to expire
await db.$executeRaw` await db.$executeRaw`
INSERT INTO pgboss.job (name, data, retrylimit, retrybackoff, startafter, expirein, priority) INSERT INTO pgboss.job (name, data, retrylimit, retrybackoff, startafter, keepuntil, priority)
VALUES ('checkInvoice', VALUES ('checkInvoice',
jsonb_build_object('hash', ${invoice.hash}::TEXT), 21, true, jsonb_build_object('hash', ${invoice.hash}::TEXT), 21, true,
${expiresAt}::TIMESTAMP WITH TIME ZONE, ${expiresAt}::TIMESTAMP WITH TIME ZONE,
${expiresAt}::TIMESTAMP WITH TIME ZONE - now() + interval '10m', 100)` ${expiresAt}::TIMESTAMP WITH TIME ZONE + interval '10m', 100)`
// the HMAC is only returned during invoice creation // the HMAC is only returned during invoice creation
// this makes sure that only the person who created this invoice // this makes sure that only the person who created this invoice

4
api/paidAction/itemCreate.js
View File

@ -216,9 +216,9 @@ export async function onPaid ({ invoice, id }, context) {
if (item.boost > 0) { if (item.boost > 0) {
await tx.$executeRaw` await tx.$executeRaw`
INSERT INTO pgboss.job (name, data, retrylimit, retrybackoff, startafter, expirein) INSERT INTO pgboss.job (name, data, retrylimit, retrybackoff, startafter, keepuntil)
VALUES ('expireBoost', jsonb_build_object('id', ${item.id}::INTEGER), 21, true, VALUES ('expireBoost', jsonb_build_object('id', ${item.id}::INTEGER), 21, true,
now() + interval '30 days', interval '40 days')` now() + interval '30 days', now() + interval '40 days')`
} }
if (item.parentId) { if (item.parentId) {

8
api/paidAction/itemUpdate.js
View File

@ -137,15 +137,15 @@ export async function perform (args, context) {
}) })
await tx.$executeRaw` await tx.$executeRaw`
INSERT INTO pgboss.job (name, data, retrylimit, retrybackoff, startafter, expirein) INSERT INTO pgboss.job (name, data, retrylimit, retrybackoff, startafter, keepuntil)
VALUES ('imgproxy', jsonb_build_object('id', ${id}::INTEGER), 21, true, VALUES ('imgproxy', jsonb_build_object('id', ${id}::INTEGER), 21, true,
now() + interval '5 seconds', interval '1 day')` now() + interval '5 seconds', now() + interval '1 day')`
if (newBoost > 0) { if (newBoost > 0) {
await tx.$executeRaw` await tx.$executeRaw`
INSERT INTO pgboss.job (name, data, retrylimit, retrybackoff, startafter, expirein) INSERT INTO pgboss.job (name, data, retrylimit, retrybackoff, startafter, keepuntil)
VALUES ('expireBoost', jsonb_build_object('id', ${id}::INTEGER), 21, true, VALUES ('expireBoost', jsonb_build_object('id', ${id}::INTEGER), 21, true,
now() + interval '30 days', interval '40 days')` now() + interval '30 days', now() + interval '40 days')`
} }
await performBotBehavior(args, context) await performBotBehavior(args, context)

8
api/paidAction/lib/item.js
View File

@ -60,23 +60,23 @@ export async function performBotBehavior ({ text, id }, { me, tx }) {
const deleteAt = getDeleteAt(text) const deleteAt = getDeleteAt(text)
if (deleteAt) { if (deleteAt) {
await tx.$queryRaw` await tx.$queryRaw`
INSERT INTO pgboss.job (name, data, startafter, expirein) INSERT INTO pgboss.job (name, data, startafter, keepuntil)
VALUES ( VALUES (
'deleteItem', 'deleteItem',
jsonb_build_object('id', ${id}::INTEGER), jsonb_build_object('id', ${id}::INTEGER),
${deleteAt}::TIMESTAMP WITH TIME ZONE, ${deleteAt}::TIMESTAMP WITH TIME ZONE,
${deleteAt}::TIMESTAMP WITH TIME ZONE - now() + interval '1 minute')` ${deleteAt}::TIMESTAMP WITH TIME ZONE + interval '1 minute')`
} }
const remindAt = getRemindAt(text) const remindAt = getRemindAt(text)
if (remindAt) { if (remindAt) {
await tx.$queryRaw` await tx.$queryRaw`
INSERT INTO pgboss.job (name, data, startafter, expirein) INSERT INTO pgboss.job (name, data, startafter, keepuntil)
VALUES ( VALUES (
'reminder', 'reminder',
jsonb_build_object('itemId', ${id}::INTEGER, 'userId', ${userId}::INTEGER), jsonb_build_object('itemId', ${id}::INTEGER, 'userId', ${userId}::INTEGER),
${remindAt}::TIMESTAMP WITH TIME ZONE, ${remindAt}::TIMESTAMP WITH TIME ZONE,
${remindAt}::TIMESTAMP WITH TIME ZONE - now() + interval '1 minute')` ${remindAt}::TIMESTAMP WITH TIME ZONE + interval '1 minute')`
await tx.reminder.create({ await tx.reminder.create({
data: { data: {
userId, userId,

4
prisma/migrations/20250103011357_fix_expireboost_keepuntil/migration.sql Normal file
View File

@ -0,0 +1,4 @@
-- fix existing boost jobs
UPDATE pgboss.job
SET keepuntil = startafter + interval '10 days'
WHERE name = 'expireBoost' AND state = 'created';