-
0 ? ` (${item.meSats} from me)` : ''}`}>{item.sats + item.tips} sats
-
\
+ {!item.position &&
+ <>
+
0 ? ` (${item.meSats} from me)` : ''}`}>{item.sats + item.tips} sats
+
\
+ }
{item.boost > 0 &&
<>
{item.boost} boost
diff --git a/components/item.module.css b/components/item.module.css
index d1a027f5..bbc62c43 100644
--- a/components/item.module.css
+++ b/components/item.module.css
@@ -16,6 +16,12 @@
flex: 1 0 128px;
}
+.pin {
+ fill: var(--theme-body);
+ stroke: var(--theme-color);
+ margin-right: .2rem;
+}
+
.linkSmall {
width: 128px;
display: inline-block;
diff --git a/components/items.js b/components/items.js
index f048c899..9c8f9c92 100644
--- a/components/items.js
+++ b/components/items.js
@@ -3,8 +3,9 @@ import Item, { ItemSkeleton } from './item'
import styles from './items.module.css'
import { MORE_ITEMS } from '../fragments/items'
import MoreFooter from './more-footer'
+import React from 'react'
-export default function Items ({ variables, rank, items, cursor }) {
+export default function Items ({ variables, rank, items, pins, cursor }) {
const { data, fetchMore } = useQuery(MORE_ITEMS, { variables })
if (!data && !items) {
@@ -12,14 +13,19 @@ export default function Items ({ variables, rank, items, cursor }) {
}
if (data) {
- ({ moreItems: { items, cursor } } = data)
+ ({ moreItems: { items, pins, cursor } } = data)
}
+ const pinMap = pins?.reduce((a, p) => { a[p.position] = p; return a }, {})
+
return (
<>
{items.map((item, i) => (
-
diff --git a/prisma/migrations/20220106220010_pins/migration.sql b/prisma/migrations/20220106220010_pins/migration.sql
new file mode 100644
index 00000000..caa73eaf
--- /dev/null
+++ b/prisma/migrations/20220106220010_pins/migration.sql
@@ -0,0 +1,59 @@
+-- AlterTable
+ALTER TABLE "Item" ADD COLUMN "pinId" INTEGER,
+ALTER COLUMN "updated_at" SET DEFAULT CURRENT_TIMESTAMP;
+
+-- CreateTable
+CREATE TABLE "Pin" (
+ "id" SERIAL NOT NULL,
+ "created_at" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+ "updated_at" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+ "cron" TEXT,
+ "timezone" TEXT,
+ "position" INTEGER NOT NULL,
+
+ PRIMARY KEY ("id")
+);
+
+-- AddForeignKey
+ALTER TABLE "Item" ADD FOREIGN KEY ("pinId") REFERENCES "Pin"("id") ON DELETE SET NULL ON UPDATE CASCADE;
+
+-- pin upserts add new pgboss.schedule
+CREATE OR REPLACE FUNCTION pin_upsert_trigger_func() RETURNS TRIGGER AS $$
+ BEGIN
+ -- only schedule if pin has new.cron set
+ IF new.cron IS NOT NULL THEN
+ -- pgboss updates when inserts have the same name
+ INSERT INTO pgboss.schedule (name, cron, timezone)
+ VALUES ('repin-' || new.id, new.cron, new.timezone)
+ ON CONFLICT (name) DO UPDATE SET
+ cron = EXCLUDED.cron,
+ timezone = EXCLUDED.timezone,
+ data = EXCLUDED.data,
+ options = EXCLUDED.options,
+ updated_on = now();
+ -- if old.cron is set but new.cron isn't ... we need to delete the job
+ ELSIF old.cron IS NOT NULL AND new.cron IS NULL THEN
+ DELETE FROM pgboss.schedule where name = 'repin-' || new.id;
+ END IF;
+
+ RETURN new;
+ END;
+$$ LANGUAGE plpgsql;
+
+DROP TRIGGER IF EXISTS pin_upsert_trigger ON "Pin";
+CREATE TRIGGER pin_upsert_trigger
+ AFTER INSERT OR UPDATE ON "Pin"
+ FOR EACH ROW EXECUTE PROCEDURE pin_upsert_trigger_func();
+
+-- pin delete removes from pgboss.schedule
+CREATE OR REPLACE FUNCTION pin_delete_trigger_func() RETURNS TRIGGER AS $$
+ BEGIN
+ DELETE FROM pgboss.schedule where name = 'repin-' || old.id;
+ RETURN NULL;
+ END;
+$$ LANGUAGE plpgsql;
+
+DROP TRIGGER IF EXISTS pin_delete_trigger ON "Pin";
+CREATE TRIGGER pin_delete_trigger
+ AFTER DELETE ON "Pin"
+ FOR EACH ROW EXECUTE PROCEDURE pin_delete_trigger_func();
\ No newline at end of file
diff --git a/prisma/schema.prisma b/prisma/schema.prisma
index aef7744f..2c987bc9 100644
--- a/prisma/schema.prisma
+++ b/prisma/schema.prisma
@@ -83,7 +83,7 @@ model Message {
model Item {
id Int @id @default(autoincrement())
createdAt DateTime @default(now()) @map(name: "created_at")
- updatedAt DateTime @updatedAt @map(name: "updated_at")
+ updatedAt DateTime @default(now()) @updatedAt @map(name: "updated_at")
title String?
text String?
url String?
@@ -95,13 +95,27 @@ model Item {
actions ItemAct[]
mentions Mention[]
path Unsupported("LTREE")?
+ pin Pin? @relation(fields: [pinId], references: [id])
+ pinId Int?
User User[] @relation("Item")
+
@@index([createdAt])
@@index([userId])
@@index([parentId])
}
+// the active pin is the latest one when it's a recurring cron
+model Pin {
+ id Int @id @default(autoincrement())
+ createdAt DateTime @default(now()) @map(name: "created_at")
+ updatedAt DateTime @default(now()) @updatedAt @map(name: "updated_at")
+ cron String?
+ timezone String?
+ position Int
+ Item Item[]
+}
+
enum ItemActType {
VOTE
BOOST
diff --git a/svgs/pin.svg b/svgs/pin.svg
new file mode 100644
index 00000000..cf94b064
--- /dev/null
+++ b/svgs/pin.svg
@@ -0,0 +1,5 @@
+
diff --git a/worker/index.js b/worker/index.js
index 39387b6b..8781ba9b 100644
--- a/worker/index.js
+++ b/worker/index.js
@@ -21,9 +21,49 @@ async function work () {
await boss.start()
await boss.work('checkInvoice', checkInvoice)
await boss.work('checkWithdrawal', checkWithdrawal)
+ await boss.work('repin-*', repin)
console.log('working jobs')
}
+async function repin ({ name }) {
+ console.log(name)
+ // get the id
+ const id = name.slice('repin-'.length)
+ if (id.length === 0 || isNaN(id)) {
+ console.log('repin id not found in', name)
+ return
+ }
+
+ // get the latest item with this id
+ const pinId = Number(id)
+ const current = await models.item.findFirst(
+ {
+ where: {
+ pinId
+ },
+ orderBy: {
+ createdAt: 'desc'
+ }
+ }
+ )
+
+ if (!current) {
+ console.log('could not find existing item for', name)
+ return
+ }
+
+ // create a new item with matching 1) title, text, and url and 2) setting pinId
+ await models.item.create({
+ data: {
+ title: current.title,
+ text: current.text,
+ url: current.url,
+ userId: current.userId,
+ pinId
+ }
+ })
+}
+
async function checkInvoice ({ data: { hash } }) {
const inv = await getInvoice({ id: hash, lnd })
console.log(inv)
@@ -44,7 +84,7 @@ async function checkInvoice ({ data: { hash } }) {
}))
} else if (new Date(inv.expires_at) > new Date()) {
// not expired, recheck in 5 seconds
- boss.send('checkInvoice', { hash }, walletOptions)
+ await boss.send('checkInvoice', { hash }, walletOptions)
}
}
@@ -83,7 +123,7 @@ async function checkWithdrawal ({ data: { id, hash } }) {
SELECT reverse_withdrawl(${id}, ${status})`)
} else {
// we need to requeue to check again in 5 seconds
- boss.send('checkWithdrawal', { id, hash }, walletOptions)
+ await boss.send('checkWithdrawal', { id, hash }, walletOptions)
}
}