Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: daily stacked and spent sats notification #1756

Draft
wants to merge 16 commits into
base: master
Choose a base branch
from
Draft

feat: daily stacked and spent sats notification #1756

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
e80fa99
daily summary of stacked and spent sats
Soxasora Dec 22, 2024
057fc59
scales of justice as icon
Soxasora Dec 22, 2024
d1663ee
cleanup: query follows satistics design; refactor: DailyStats to SatS…
Soxasora Dec 23, 2024
5d12a90
hasNewNotes now supports noteSatSummary; web push notifications place…
Soxasora Dec 23, 2024
6e4e4ff
enhance: slimmer query, satsummary notification links to full satistics
Soxasora Dec 23, 2024
3795668
2 days interval workaround for different timezones; restore svg
Soxasora Dec 23, 2024
b73a0cd
push notifications, add dailySatSummary to pgboss scheduler
Soxasora Dec 23, 2024
fb61520
cleanup: typo, old comments
Soxasora Dec 23, 2024
82553a2
hotfix: if stacked and spent are 0, don't show/push notification
Soxasora Dec 23, 2024
421772e
hotfix: new push notification query, adjusted names and props
Soxasora Dec 24, 2024
0bc1872
hotfix: convert msats to sats for push notification
Soxasora Dec 24, 2024
3a09439
Merge branch 'master' into daily_sats_summary_notifications
Soxasora Dec 29, 2024
4a67890
fix: dailySatSummary job depends on views-days
Soxasora Jan 7, 2025
b23e0bb
hotfix: include DAILY_STATS in immediate push notifications
Soxasora Dec 30, 2024
a789e7d
Merge branch 'master' into daily_sats_summary_notifications
Soxasora Jan 7, 2025
f832aff
Merge branch 'master' into daily_sats_summary_notifications
Soxasora Jan 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/webPush.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,11 +393,11 @@ export async function notifyStreakLost (userId, streak) {
}
}

export async function notifySatSummary (userId, stats) {
export async function notifySatSummary (userId, stacked, spent) {
try {
await sendUserNotification(userId, {
title: 'your daily sat summary is ready',
body: `you stacked ${numWithUnits(stats.stacked, { abbreviate: false })} and spent ${numWithUnits(stats.spent, { abbreviate: false })}`,
body: `you stacked ${numWithUnits(stacked, { abbreviate: false })} and spent ${numWithUnits(spent, { abbreviate: false })}`,
tag: 'DAILY_STATS'
})
} catch (err) {
Expand Down
4 changes: 2 additions & 2 deletions worker/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import { ApolloClient, HttpLink, InMemoryCache } from '@apollo/client'
import { indexItem, indexAllItems } from './search'
import { timestampItem } from './ots'
import { computeStreaks, checkStreak } from './streak'
import { summarizeDailySats } from './satSummary'
import { dailySatSummary } from './satSummary'
import { nip57 } from './nostr'
import fetch from 'cross-fetch'
import { authenticatedLndGrpc } from '@/lib/lnd'
Expand Down Expand Up @@ -132,7 +132,7 @@ async function work () {
await boss.work('earn', jobWrapper(earn))
await boss.work('streak', jobWrapper(computeStreaks))
await boss.work('checkStreak', jobWrapper(checkStreak))
await boss.work('dailySatSummary', jobWrapper(summarizeDailySats))
await boss.work('dailySatSummary', jobWrapper(dailySatSummary))
await boss.work('nip57', jobWrapper(nip57))
await boss.work('views-*', jobWrapper(views))
await boss.work('rankViews', jobWrapper(rankViews))
Expand Down
18 changes: 9 additions & 9 deletions worker/satSummary.js
View file
Open in desktop
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

realized I didn't push this before, sorry

Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
import { notifySatSummary } from '@/lib/webPush'
export async function summarizeDailySats ({ data: { userId }, models }) {
export async function dailySatSummary ({ models }) {
try {
const stats = await models.$queryRaw`
SELECT
sum(msats_stacked) as stacked, sum(msats_spent) as spent,
id as userId, sum(msats_stacked) as stacked, sum(msats_spent) as spent
FROM user_stats_days
WHERE id = ${userId}
AND t >= date_trunc('day', CURRENT_DATE - INTERVAL '1 day')
WHERE t >= date_trunc('day', CURRENT_DATE - INTERVAL '1 day')
AND t <= date_trunc('day', CURRENT_DATE)
GROUP BY id
HAVING sum(msats_stacked) != 0 OR sum(msats_spent) != 0
LIMIT 1
`

if (stats.length) {
await notifySatSummary({
userId,
satSummary: stats[0]
})
for (const stat of stats) {
const user = await models.user.findUnique({ where: { id: stat.userid } })
if (user && user.noteSatSummary) {
await notifySatSummary(stat.userid, stat.stacked || 0, stat.spent || 0)
}
}
}
} catch (err) {
console.error('failed to process daily sat summary', err)
Expand Down
Loading