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

add notification settings

Browse Source
This commit is contained in:
keyan 2022-04-21 17:50:02 -05:00
parent d91eb02c74
commit 188230c37c
11 changed files with 257 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

172
api/resolvers/notifications.js
View File

@ -64,60 +64,32 @@ export default {
// HACK to make notifications faster, we only return a limited sub set of the unioned
// queries ... we only ever need at most LIMIT+current offset in the child queries to
// have enough items to return in the union
const notifications = await models.$queryRaw(
inc === 'replies'
? `SELECT DISTINCT "Item".id::TEXT, "Item".created_at AS "sortTime", NULL::BIGINT as "earnedSats",
const queries = []
if (inc === 'replies') {
queries.push(
`SELECT DISTINCT "Item".id::TEXT, "Item".created_at AS "sortTime", NULL::BIGINT as "earnedSats",
'Reply' AS type
FROM "Item"
JOIN "Item" p ON "Item".path <@ p.path
WHERE p."userId" = $1
AND "Item"."userId" <> $1 AND "Item".created_at <= $2
FROM "Item"
JOIN "Item" p ON ${me.noteAllDescendants ? '"Item".path <@ p.path' : '"Item"."parentId" = p.id'}
WHERE p."userId" = $1
AND "Item"."userId" <> $1 AND "Item".created_at <= $2`
)
} else {
queries.push(
`(SELECT DISTINCT "Item".id::TEXT, "Item".created_at AS "sortTime", NULL::BIGINT as "earnedSats",
'Reply' AS type
FROM "Item"
JOIN "Item" p ON ${me.noteAllDescendants ? '"Item".path <@ p.path' : '"Item"."parentId" = p.id'}
WHERE p."userId" = $1
AND "Item"."userId" <> $1 AND "Item".created_at <= $2
ORDER BY "sortTime" DESC
OFFSET $3
LIMIT ${LIMIT}`
: `(SELECT DISTINCT "Item".id::TEXT, "Item".created_at AS "sortTime", NULL::BIGINT as "earnedSats",
'Reply' AS type
FROM "Item"
JOIN "Item" p ON "Item".path <@ p.path
WHERE p."userId" = $1
AND "Item"."userId" <> $1 AND "Item".created_at <= $2
ORDER BY "sortTime" DESC
LIMIT ${LIMIT}+$3)
UNION ALL
(SELECT "Item".id::TEXT, MAX("ItemAct".created_at) AS "sortTime",
sum("ItemAct".sats) as "earnedSats", 'Votification' AS type
FROM "Item"
JOIN "ItemAct" ON "ItemAct"."itemId" = "Item".id
WHERE "ItemAct"."userId" <> $1
AND "ItemAct".created_at <= $2
AND "ItemAct".act <> 'BOOST'
AND "Item"."userId" = $1
GROUP BY "Item".id
ORDER BY "sortTime" DESC
LIMIT ${LIMIT}+$3)
UNION ALL
(SELECT "Item".id::TEXT, "Mention".created_at AS "sortTime", NULL as "earnedSats",
'Mention' AS type
FROM "Mention"
JOIN "Item" ON "Mention"."itemId" = "Item".id
LEFT JOIN "Item" p ON "Item"."parentId" = p.id
WHERE "Mention"."userId" = $1
AND "Mention".created_at <= $2
AND "Item"."userId" <> $1
AND (p."userId" IS NULL OR p."userId" <> $1)
ORDER BY "sortTime" DESC
LIMIT ${LIMIT}+$3)
UNION ALL
(SELECT "Invite".id, MAX(users.created_at) AS "sortTime", NULL as "earnedSats",
'Invitification' AS type
FROM users JOIN "Invite" on users."inviteId" = "Invite".id
WHERE "Invite"."userId" = $1
AND users.created_at <= $2
GROUP BY "Invite".id
ORDER BY "sortTime" DESC
LIMIT ${LIMIT}+$3)
UNION ALL
(SELECT "Item".id::text, "Item"."statusUpdatedAt" AS "sortTime", NULL as "earnedSats",
LIMIT ${LIMIT}+$3)`
)
queries.push(
`(SELECT "Item".id::text, "Item"."statusUpdatedAt" AS "sortTime", NULL as "earnedSats",
'JobChanged' AS type
FROM "Item"
WHERE "Item"."userId" = $1
@ -125,25 +97,83 @@ export default {
AND status <> 'STOPPED'
AND "statusUpdatedAt" <= $2
ORDER BY "sortTime" DESC
LIMIT ${LIMIT}+$3)
UNION ALL
(SELECT "Earn".id::text, "Earn".created_at AS "sortTime", FLOOR(msats / 1000) as "earnedSats",
'Earn' AS type
FROM "Earn"
WHERE "Earn"."userId" = $1
AND FLOOR(msats / 1000) > 0
AND created_at <= $2
ORDER BY "sortTime" DESC
LIMIT ${LIMIT}+$3)
UNION ALL
(SELECT "Invoice".id::text, "Invoice"."confirmedAt" AS "sortTime", FLOOR("msatsReceived" / 1000) as "earnedSats",
'InvoicePaid' AS type
FROM "Invoice"
WHERE "Invoice"."userId" = $1
AND "confirmedAt" IS NOT NULL
AND created_at <= $2
ORDER BY "sortTime" DESC
LIMIT ${LIMIT}+$3)
LIMIT ${LIMIT}+$3)`
)
if (me.noteItemSats) {
queries.push(
`(SELECT "Item".id::TEXT, MAX("ItemAct".created_at) AS "sortTime",
sum("ItemAct".sats) as "earnedSats", 'Votification' AS type
FROM "Item"
JOIN "ItemAct" ON "ItemAct"."itemId" = "Item".id
WHERE "ItemAct"."userId" <> $1
AND "ItemAct".created_at <= $2
AND "ItemAct".act <> 'BOOST'
AND "Item"."userId" = $1
GROUP BY "Item".id
ORDER BY "sortTime" DESC
LIMIT ${LIMIT}+$3)`
)
}
if (me.noteEarning) {
queries.push(
`(SELECT "Earn".id::text, "Earn".created_at AS "sortTime", FLOOR(msats / 1000) as "earnedSats",
'Earn' AS type
FROM "Earn"
WHERE "Earn"."userId" = $1
AND FLOOR(msats / 1000) > 0
AND created_at <= $2
ORDER BY "sortTime" DESC
LIMIT ${LIMIT}+$3)`
)
}
if (me.noteMentions) {
queries.push(
`(SELECT "Item".id::TEXT, "Mention".created_at AS "sortTime", NULL as "earnedSats",
'Mention' AS type
FROM "Mention"
JOIN "Item" ON "Mention"."itemId" = "Item".id
LEFT JOIN "Item" p ON "Item"."parentId" = p.id
WHERE "Mention"."userId" = $1
AND "Mention".created_at <= $2
AND "Item"."userId" <> $1
AND (p."userId" IS NULL OR p."userId" <> $1)
ORDER BY "sortTime" DESC
LIMIT ${LIMIT}+$3)`
)
}
if (me.noteDeposits) {
queries.push(
`(SELECT "Invoice".id::text, "Invoice"."confirmedAt" AS "sortTime", FLOOR("msatsReceived" / 1000) as "earnedSats",
'InvoicePaid' AS type
FROM "Invoice"
WHERE "Invoice"."userId" = $1
AND "confirmedAt" IS NOT NULL
AND created_at <= $2
ORDER BY "sortTime" DESC
LIMIT ${LIMIT}+$3)`
)
}
if (me.noteInvites) {
queries.push(
`(SELECT "Invite".id, MAX(users.created_at) AS "sortTime", NULL as "earnedSats",
'Invitification' AS type
FROM users JOIN "Invite" on users."inviteId" = "Invite".id
WHERE "Invite"."userId" = $1
AND users.created_at <= $2
GROUP BY "Invite".id
ORDER BY "sortTime" DESC
LIMIT ${LIMIT}+$3)`
)
}
}
const notifications = await models.$queryRaw(
`${queries.join(' UNION ALL ')}
ORDER BY "sortTime" DESC
OFFSET $3
LIMIT ${LIMIT}`, me.id, decodedCursor.time, decodedCursor.offset)

79
api/resolvers/user.js
View File

@ -98,12 +98,12 @@ export default {
throw error
}
},
setSettings: async (parent, { tipDefault }, { me, models }) => {
setSettings: async (parent, data, { me, models }) => {
if (!me) {
throw new AuthenticationError('you must be logged in')
}
await models.user.update({ where: { id: me.id }, data: { tipDefault } })
await models.user.update({ where: { id: me.id }, data })
return true
},
@ -172,10 +172,12 @@ export default {
})
return !!anInvite
},
hasNewNotes: async (user, args, { models }) => {
// check if any votes have been cast for them since checkedNotesAt
hasNewNotes: async (user, args, { me, models }) => {
const lastChecked = user.checkedNotesAt || new Date(0)
const votes = await models.$queryRaw(`
// check if any votes have been cast for them since checkedNotesAt
if (me.noteItemSats) {
const votes = await models.$queryRaw(`
SELECT "ItemAct".id, "ItemAct".created_at
FROM "Item"
JOIN "ItemAct" on "ItemAct"."itemId" = "Item".id
@ -184,15 +186,16 @@ export default {
AND "ItemAct".act <> 'BOOST'
AND "Item"."userId" = $1
LIMIT 1`, user.id, lastChecked)
if (votes.length > 0) {
return true
if (votes.length > 0) {
return true
}
}
// check if they have any replies since checkedNotesAt
const newReplies = await models.$queryRaw(`
SELECT "Item".id, "Item".created_at
FROM "Item"
JOIN "Item" p ON "Item".path <@ p.path
JOIN "Item" p ON ${me.noteAllDescendants ? '"Item".path <@ p.path' : '"Item"."parentId" = p.id'}
WHERE p."userId" = $1
AND "Item".created_at > $2 AND "Item"."userId" <> $1
LIMIT 1`, user.id, lastChecked)
@ -201,7 +204,8 @@ export default {
}
// check if they have any mentions since checkedNotesAt
const newMentions = await models.$queryRaw(`
if (me.noteMentions) {
const newMentions = await models.$queryRaw(`
SELECT "Item".id, "Item".created_at
FROM "Mention"
JOIN "Item" ON "Mention"."itemId" = "Item".id
@ -209,8 +213,9 @@ export default {
AND "Mention".created_at > $2
AND "Item"."userId" <> $1
LIMIT 1`, user.id, lastChecked)
if (newMentions.length > 0) {
return true
if (newMentions.length > 0) {
return true
}
}
const job = await models.item.findFirst({
@ -231,41 +236,51 @@ export default {
return true
}
const earn = await models.earn.findFirst({
where: {
userId: user.id,
createdAt: {
gt: lastChecked
},
msats: {
gte: 1000
if (me.noteEarning) {
const earn = await models.earn.findFirst({
where: {
userId: user.id,
createdAt: {
gt: lastChecked
},
msats: {
gte: 1000
}
}
})
if (earn) {
return true
}
})
if (earn) {
return true
}
const invoice = await models.invoice.findFirst({
where: {
userId: user.id,
confirmedAt: {
gt: lastChecked
if (me.noteDeposits) {
const invoice = await models.invoice.findFirst({
where: {
userId: user.id,
confirmedAt: {
gt: lastChecked
}
}
})
if (invoice) {
return true
}
})
if (invoice) {
return true
}
// check if new invites have been redeemed
const newInvitees = await models.$queryRaw(`
if (me.noteInvites) {
const newInvitees = await models.$queryRaw(`
SELECT "Invite".id
FROM users JOIN "Invite" on users."inviteId" = "Invite".id
WHERE "Invite"."userId" = $1
AND users.created_at > $2
LIMIT 1`, user.id, lastChecked)
return newInvitees.length > 0
if (newInvitees.length > 0) {
return true
}
}
return false
}
}
}

33
api/ssrApollo.js
View File

@ -22,7 +22,9 @@ export default async function getSSRApolloClient (req, me = null) {
}),
context: {
models,
me: session ? session.user : me,
me: session
? await models.user.findUnique({ where: { id: session.user?.id } })
: me,
lnd,
search
}
@ -42,14 +44,24 @@ export function getGetServerSideProps (query, variables = null, notFoundFunc, re
}
}
const { error, data } = await client.query({
query,
variables: vars
})
let error = null; let data = null; let props = {}
if (query) {
({ error, data } = await client.query({
query,
variables: vars
}))
if (error || !data || (notFoundFunc && notFoundFunc(data))) {
return {
notFound: true
if (error || !data || (notFoundFunc && notFoundFunc(data))) {
return {
notFound: true
}
}
props = {
apollo: {
query: print(query),
variables: { ...params, ...variables }
}
}
}
@ -61,10 +73,7 @@ export function getGetServerSideProps (query, variables = null, notFoundFunc, re
return {
props: {
apollo: {
query: print(query),
variables: { ...params, ...variables }
},
...props,
me,
price,
data

10
api/typeDefs/user.js
View File

@ -27,7 +27,9 @@ export default gql`
extend type Mutation {
setName(name: String!): Boolean
setSettings(tipDefault: Int!): Boolean
setSettings(tipDefault: Int!, noteItemSats: Boolean!, noteEarning: Boolean!,
noteAllDescendants: Boolean!, noteMentions: Boolean!, noteDeposits: Boolean!,
noteInvites:Boolean!): Boolean
upsertBio(bio: String!): User!
setWalkthrough(tipPopover: Boolean, upvotePopover: Boolean): Boolean
}
@ -48,5 +50,11 @@ export default gql`
sats: Int!
upvotePopover: Boolean!
tipPopover: Boolean!
noteItemSats: Boolean!
noteEarning: Boolean!
noteAllDescendants: Boolean!
noteMentions: Boolean!
noteDeposits: Boolean!
noteInvites: Boolean!
}
`

6
fragments/users.js
View File

@ -19,6 +19,12 @@ export const ME = gql`
hasInvites
upvotePopover
tipPopover
noteItemSats
noteEarning
noteAllDescendants
noteMentions
noteDeposits
noteInvites
}
}`

4
pages/api/graphql.js
View File

@ -15,7 +15,9 @@ global.apolloServer ||= new ApolloServer({
return {
models,
lnd,
me: session ? session.user : null,
me: session
? await models.user.findUnique({ where: { id: session.user?.id } })
: null,
search
}
}

3
pages/post.js
View File

@ -5,6 +5,9 @@ import LayoutCenter from '../components/layout-center'
import { useMe } from '../components/me'
import { DiscussionForm } from '../components/discussion-form'
import { LinkForm } from '../components/link-form'
import { getGetServerSideProps } from '../api/ssrApollo'
export const getServerSideProps = getGetServerSideProps()
export function PostForm () {
const router = useRouter()

55
pages/settings.js
View File

@ -1,10 +1,13 @@
import { Form, Input, SubmitButton } from '../components/form'
import { Checkbox, Form, Input, SubmitButton } from '../components/form'
import * as Yup from 'yup'
import { Alert, InputGroup } from 'react-bootstrap'
import { useMe } from '../components/me'
import LayoutCenter from '../components/layout-center'
import { useState } from 'react'
import { gql, useMutation } from '@apollo/client'
import { getGetServerSideProps } from '../api/ssrApollo'
export const getServerSideProps = getGetServerSideProps()
export const SettingsSchema = Yup.object({
tipDefault: Yup.number().typeError('must be a number').required('required')
@ -16,8 +19,12 @@ export default function Settings () {
const [success, setSuccess] = useState()
const [setSettings] = useMutation(
gql`
mutation setSettings($tipDefault: Int!) {
setSettings(tipDefault: $tipDefault)
mutation setSettings($tipDefault: Int!, $noteItemSats: Boolean!, $noteEarning: Boolean!,
$noteAllDescendants: Boolean!, $noteMentions: Boolean!, $noteDeposits: Boolean!,
$noteInvites: Boolean!) {
setSettings(tipDefault: $tipDefault, noteItemSats: $noteItemSats,
noteEarning: $noteEarning, noteAllDescendants: $noteAllDescendants,
noteMentions: $noteMentions, noteDeposits: $noteDeposits, noteInvites: $noteInvites)
}`
)
@ -26,11 +33,17 @@ export default function Settings () {
<h2 className='mb-5 text-left'>settings</h2>
<Form
initial={{
tipDefault: me?.tipDefault || 21
tipDefault: me?.tipDefault || 21,
noteItemSats: me?.noteItemSats,
noteEarning: me?.noteEarning,
noteAllDescendants: me?.noteAllDescendants,
noteMentions: me?.noteMentions,
noteDeposits: me?.noteDeposits,
noteInvites: me?.noteInvites
}}
schema={SettingsSchema}
onSubmit={async ({ tipDefault }) => {
await setSettings({ variables: { tipDefault: Number(tipDefault) } })
onSubmit={async ({ tipDefault, ...values }) => {
await setSettings({ variables: { tipDefault: Number(tipDefault), ...values } })
setSuccess('settings saved')
}}
>
@ -42,6 +55,36 @@ export default function Settings () {
autoFocus
append={<InputGroup.Text className='text-monospace'>sats</InputGroup.Text>}
/>
<div className='form-label'>notify me when ...</div>
<Checkbox
label='I stack sats from posts and comments'
name='noteItemSats'
groupClassName='mb-0'
/>
<Checkbox
label='I get a daily airdrops'
name='noteEarning'
groupClassName='mb-0'
/>
<Checkbox
label='someone replies to someone who replied to me'
name='noteAllDescendants'
groupClassName='mb-0'
/>
<Checkbox
label='my invite links are redeemed'
name='noteInvites'
groupClassName='mb-0'
/>
<Checkbox
label='sats are deposited in my account'
name='noteDeposits'
groupClassName='mb-0'
/>
<Checkbox
label='someone mentions me'
name='noteMentions'
/>
<div className='d-flex'>
<SubmitButton variant='info' className='ml-auto mt-1 px-4'>save</SubmitButton>
</div>

3
pages/wallet.js
View File

@ -13,6 +13,9 @@ import { useEffect, useState } from 'react'
import { requestProvider } from 'webln'
import { Alert } from 'react-bootstrap'
import { CREATE_WITHDRAWL, SEND_TO_LNADDR } from '../fragments/wallet'
import { getGetServerSideProps } from '../api/ssrApollo'
export const getServerSideProps = getGetServerSideProps()
export default function Wallet () {
return (

7
prisma/migrations/20220421195241_note_settings/migration.sql Normal file
View File

@ -0,0 +1,7 @@
-- AlterTable
ALTER TABLE "users" ADD COLUMN "noteAllDescendants" BOOLEAN NOT NULL DEFAULT true,
ADD COLUMN "noteDeposits" BOOLEAN NOT NULL DEFAULT true,
ADD COLUMN "noteEarning" BOOLEAN NOT NULL DEFAULT true,
ADD COLUMN "noteInvites" BOOLEAN NOT NULL DEFAULT true,
ADD COLUMN "noteItemSats" BOOLEAN NOT NULL DEFAULT true,
ADD COLUMN "noteMentions" BOOLEAN NOT NULL DEFAULT true;

8
prisma/schema.prisma
View File

@ -43,6 +43,14 @@ model User {
upvotePopover Boolean @default(false)
tipPopover Boolean @default(false)
// notification settings
noteItemSats Boolean @default(true)
noteEarning Boolean @default(true)
noteAllDescendants Boolean @default(true)
noteMentions Boolean @default(true)
noteDeposits Boolean @default(true)
noteInvites Boolean @default(true)
Earn Earn[]
@@index([createdAt])
@@index([inviteId])