ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2025-01-02 20:15:27 +03:00
Code Issues Packages Projects Releases Wiki Activity

hark: rework unread tracking, pt.3

Browse Source
This commit is contained in:
Liam Fitzgerald 2020-12-16 17:37:10 +10:00
parent 610a8730b7
commit 169955b45a
No known key found for this signature in database
GPG Key ID: D390E12C61D1CFFB
9 changed files with 117 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/arvo/app/hark-graph-hook.hoon
View File

@ -1,6 +1,6 @@
:: hark-graph-hook: notifications for graph-store [landscape]
::
/- post, group-store, metadata-store, hook=hark-graph-hook
/- post, group-store, metadata-store, hook=hark-graph-hook, store=hark-store
/+ resource, metadata, default-agent, dbug, graph-store, graph, grouplib=group, store=hark-store
::
::
@ -19,7 +19,7 @@
==
::
+$ notif-kind
[name=@t parent-lent=@ud mode=?(%each %count) watch=?]
[name=@t parent-lent=@ud mode=?(%each %count %none) watch=?]
::
++ scry
|* [[our=@p now=@da] =mold p=path]
@ -340,7 +340,6 @@
::
++ update-unread-count
|= [=notif-kind =index:store time=@da ref=index:graph-store]
=. description.index name.notif-kind
=/ =stats-index:store
(to-stats-index:store index)
?- mode.notif-kind
@ -352,10 +351,11 @@
++ self-post
|= $: =node:graph-store
=index:store
mode=?(%count %each)
mode=?(%count %each %none)
watch=?
==
^+ update-core
?: ?=(%none mode) update-core
=/ =stats-index:store
(to-stats-index:store index)
=. update-core

161
pkg/arvo/app/hark-store.hoon
View File

@ -10,7 +10,7 @@
:: Usefull for non-linear, low-volume applications, i.e. blogs,
:: collections
::
/- post, group-store, metadata-store
/- post, group-store, metadata-store, store=hark-store
/+ resource, metadata, default-agent, dbug, graph-store, graphl=graph, verb, store=hark-store
::
::
@ -26,7 +26,8 @@
[indices=(set index:graph-store) last=@da]
::
+$ state-2
$: unreads-each=(jug stats-index:store index:graph-store)
$: %2
unreads-each=(jug stats-index:store index:graph-store)
unreads-count=(map stats-index:store @ud)
last-seen=(map stats-index:store @da)
=notifications:store
@ -77,17 +78,30 @@
=| cards=(list card)
|^
?- -.old
%2 [cards this]
%2
:- cards
this(-.state old, +.state (inflate-cache:ha old))
::
%1
$(old *state-two)
%_ $
::
old
%* . *state-2
unreads-each ((convert-unread ,(set index:graph-store)) uni-by unreads-each.old)
unreads-count ((convert-unread ,@ud) add unreads-count.old)
last-seen ((convert-unread ,@da) max last-seen.old)
notifications notifications.old
archive archive.old
current-timebox current-timebox.old
dnd dnd.old
==
==
::
%0
%_ $
::
old
%* . *state-1
%* . *state:state-one:store
notifications (convert-notifications-1 notifications.old)
archive (convert-notifications-1 archive.old)
current-timebox current-timebox.old
@ -95,16 +109,28 @@
==
==
==
:: discard publish edits
++ uni-by
|= [a=(set index:graph-store) b=(set index:graph-store)]
=/ merged
(~(uni in a) b)
%- ~(gas in *(set index:graph-store))
%+ skip ~(tap in merged)
|=(=index:graph-store &(=((lent index) 3) !=(-:(flop index) 1)))
::
++ convert-unread
|* value=mold
|= [combine=$-([value value] value) unreads=(map index:store value)]
^- (map stats-index:store value)
%+ roll
~(tap in unreads)
|= [[=index:store val=value] out=(map stats-index:store value)]
=/ old=value
(~(gut by unreads) index (combine))
=/ =stats-index:store
(to-stats-index:store index)
(~(put by out) stats-index (combine old val))
::
++ clear-mention-unreads
|* =mold
|= unreads=(map index mold)
%+ murn
~(gas by unreads)
|= [=index value=mold]
?. ?=(%graph -.index) `[index value]
?: =(description.index 'mention') ~
`[index value]
++ convert-notifications-1
|= old=notifications:state-zero:store
%+ gas:orm *notifications:store
@ -183,25 +209,25 @@
(timebox-update |)
::
++ give-since-unreads
^- (list [index:store index-stats:store])
^- (list [stats-index:store stats:store])
%+ turn
~(tap by unreads-count)
|= [=index:store count=@ud]
?> ?=(%graph -.index)
:* index
~(wyt in (~(gut by by-index) index ~))
|= [=stats-index:store count=@ud]
?> ?=(%graph -.stats-index)
:* stats-index
~(wyt in (~(gut by by-index) stats-index ~))
[%count count]
(~(gut by last-seen) index *time)
(~(gut by last-seen) stats-index *time)
==
++ give-each-unreads
^- (list [index:store index-stats:store])
^- (list [stats-index:store stats:store])
%+ turn
~(tap by unreads-each)
|= [=index:store indices=(set index:graph-store)]
:* index
~(wyt in (~(gut by by-index) index ~))
|= [=stats-index:store indices=(set index:graph-store)]
:* stats-index
~(wyt in (~(gut by by-index) stats-index ~))
[%each indices]
(~(gut by last-seen) index *time)
(~(gut by last-seen) stats-index *time)
==
::
++ give-unreads
@ -393,39 +419,43 @@
:: each unread tracking
::
++ unread-each
|= [=index:store unread=index:graph-store time=@da]
=. poke-core (seen-index time index)
%+ jub-unreads-each:(give %unread-each index unread time)
index
|= [=stats-index:store unread=index:graph-store time=@da]
=. poke-core (seen-index time stats-index)
%+ jub-unreads-each:(give %unread-each stats-index unread time)
stats-index
|= indices=(set index:graph-store)
(~(put ^in indices) unread)
::
++ read-index-each
|= [=stats-index:store ref=index:graph-store]
%+ read-boxes index
%+ read-index stats-index
%+ skim
~(tap ^in (~(get ju by-index) index))
~(tap ^in (~(get ju by-index) stats-index))
|= time=@da
=/ =timebox:store
(gut-orm notifications time)
=/ not=notification:store
(~(gut by timebox) index [now.bowl %.n %graph ~])
?> ?=(%graph -.contents.not)
%+ roll
~(tap ^in timebox)
|= [[=index:store not=notification:store] out=?]
?: out out
?. (stats-index-is-index:store stats-index index) out
?. ?=(%graph -.index) out
?. ?=(%graph -.contents.not) out
(lien list.contents.not |=(p=post:post =(index.p ref)))
::
++ read-each
|= [=index:store ref=index:graph-store]
=. poke-core (read-index-each index ref)
%+ jub-unreads-each:(give %read-each index ref)
index
|= [=stats-index:store ref=index:graph-store]
=. poke-core (read-index-each stats-index ref)
%+ jub-unreads-each:(give %read-each stats-index ref)
stats-index
|= indices=(set index:graph-store)
(~(del ^in indices) ref)
::
++ jub-unreads-each
|= $: =index:store
|= $: =stats-index:store
f=$-((set index:graph-store) (set index:graph-store))
==
poke-core(unreads-each (jub index f))
poke-core(unreads-each (jub stats-index f))
::
++ unread-count
|= [=stats-index:store time=@da]
@ -433,30 +463,29 @@
+((~(gut by unreads-count) stats-index 0))
=. unreads-count
(~(put by unreads-count) stats-index new-count)
(seen-index:(give %unread-count index time) time index)
(seen-index:(give %unread-count stats-index time) time stats-index)
::
++ read-count
|= =index:store
=. unreads-count (~(put by unreads-count) index 0)
(give:(read-index index) %read-count index)
|= =stats-index:store
=. unreads-count (~(put by unreads-count) stats-index 0)
=/ times=(list @da)
~(tap ^in (~(get ju by-index) stats-index))
(give:(read-index stats-index times) %read-count stats-index)
::
++ read-index
|= =stats-index:store
(read-boxes stats-index ~(tap ^in (~(get ju by-index) stats-index)))
::
++ read-boxes
|= [=stats-index:store boxes=(list @da)]
?~ boxes poke-core
=/ core=_poke-core
(read-note i.boxes index)
$(poke-core core, boxes t.boxes)
|= [=stats-index:store times=(list @da)]
|-
?~ times poke-core
=/ core
(read-stats-index i.times stats-index)
$(poke-core core, times t.times)
::
++ read-stats-index
|= [time=@da =stats-index]
|= [time=@da =stats-index:store]
=/ keys
~(tap in ~(key by (get:orm notifications time)))
~(tap ^in ~(key by (gut-orm notifications time)))
|- ^+ poke-core
?~ read-note
?~ keys
poke-core
?. (stats-index-is-index:store stats-index i.keys)
$(keys t.keys)
@ -465,12 +494,12 @@
$(poke-core core, keys t.keys)
::
++ seen-index
|= [time=@da =index:store]
|= [time=@da =stats-index:store]
=/ new-time=@da
(max time (~(gut by last-seen) index 0))
(max time (~(gut by last-seen) stats-index 0))
=. last-seen
(~(put by last-seen) index new-time)
(give %seen-index new-time index)
(~(put by last-seen) stats-index new-time)
(give %seen-index new-time stats-index)
::
++ seen
=> (emit cancel-autoseen)
@ -511,11 +540,11 @@
(fun (gut-orm notifications time))
(put:orm notifications time timebox)
++ jub
|= [=index:store f=$-((set index:graph-store) (set index:graph-store))]
^- (jug index:store index:graph-store)
|= [=stats-index:store f=$-((set index:graph-store) (set index:graph-store))]
^- (jug stats-index:store index:graph-store)
=/ val=(set index:graph-store)
(~(gut by unreads-each) index ~)
(~(put by unreads-each) index (f val))
(~(gut by unreads-each) stats-index ~)
(~(put by unreads-each) stats-index (f val))
:: +gut-orm: +gut:by for ordered maps
:: TODO: move to zuse.hoon
++ gut-orm
@ -563,7 +592,7 @@
==
::
++ inflate-cache
|= state-1
|= state-2
^+ +.state
=/ nots=(list [p=@da =timebox:store])
(tap:orm notifications)

14
pkg/arvo/lib/hark/store.hoon
View File

@ -31,12 +31,12 @@
++ stats-index
%- of
:~ graph+graph-stats-index
group+dejs:resource
group+dejs-path:resource
==
++ graph-stats-index
%- ot
:~ graph+dejs:resource
index+graph-index
:~ graph+dejs-path:resource
index+graph-store-index
==
:: parse date as @ud
:: TODO: move to zuse
@ -52,7 +52,7 @@
:~ time+sd
index+index
==
++ graph-index
++ graph-store-index
(su ;~(pfix fas (more fas dem)))
::
++ add
@ -62,7 +62,7 @@
++ read-graph-index
%- ot
:~ index+stats-index
target+graph-index
target+graph-store-index
==
::
++ action
@ -110,13 +110,13 @@
|^
?- -.s
%graph (graph-stats-index +.s)
%group (enjs:resource +.s)
%group s+(enjs-path:resource +.s)
==
::
++ graph-stats-index
|= [graph=resource =index:graph-store]
%- pairs
:~ graph+(enjs:resource graph)
:~ graph+s+(enjs-path:resource graph)
index+(index:enjs:graph-store index)
==
--

2
pkg/arvo/mar/graph/validator/link.hoon
View File

@ -7,7 +7,7 @@
?+ index.p.i ~
[@ ~] `[%link 0 %each %.y]
[@ @ %1 ~] `[%comment 1 %count %.n]
[@ @ @ ~] `[%edit-comment 1 %count %.n]
[@ @ @ ~] `[%edit-comment 1 %none %.n]
==
--
++ grab

4
pkg/arvo/mar/graph/validator/publish.hoon
View File

@ -9,9 +9,9 @@
++ notification-kind
?+ index.p.i ~
[@ %1 %1 ~] `[%note 0 %each %.n]
[@ %1 @ ~] `[%edit-note 0 %each %.n]
[@ %1 @ ~] `[%edit-note 0 %none %.n]
[@ %2 @ %1 ~] `[%comment 1 %count %.n]
[@ %2 @ @ ~] `[%edit-comment 1 %count %.n]
[@ %2 @ @ ~] `[%edit-comment 1 %none %.n]
==
--
++ grab

5
pkg/arvo/sur/hark-store.hoon
View File

@ -37,8 +37,9 @@
::
++ state-one
|%
+$ state-1
$: unreads-each=(jug index index:graph-store)
+$ state
$: %1
unreads-each=(jug index index:graph-store)
unreads-count=(map index @ud)
last-seen=(map index @da)
=notifications

1
pkg/interface/src/views/apps/links/components/LinkItem.tsx
View File

@ -76,7 +76,6 @@ export const LinkItem = (props: LinkItemProps) => {
const markRead = () => {
api.hark.markEachAsRead(props.association, '/', `/${index}`, 'link', 'link');
console.log('mark read');
}
return (
<Box width="100%" {...rest}>

6
pkg/interface/src/views/apps/publish/components/Note.tsx
View File

@ -45,12 +45,14 @@ export function Note(props: NoteProps & RouteComponentProps) {
const comments = getComments(note);
const [revNum, title, body, post] = getLatestRevision(note);
const index = note.post.index.split('/');
const noteId = bigInt(index[1]);
useEffect(() => {
api.hark.markEachAsRead(props.association, '/', post.index, 'note', 'publish');
api.hark.markEachAsRead(props.association, '/',`/${index[1]}/1/1`, 'note', 'publish');
}, [props.association]);
const noteId = bigInt(note.post.index.split('/')[1]);
let adminLinks: JSX.Element | null = null;
if (window.ship === note?.post?.author) {

2
pkg/interface/src/views/apps/publish/components/NotePreview.tsx
View File

@ -45,7 +45,7 @@ export function NotePreview(props: NotePreviewProps) {
const [rev, title, body, content] = getLatestRevision(node);
const appPath = `/ship/${props.host}/${props.book}`;
const isUnread = props.unreads.graph?.[appPath]?.['/']?.unreads?.has(content.index);
const isUnread = props.unreads.graph?.[appPath]?.['/']?.unreads?.has(`/${noteId}/1/1`);
const snippet = getSnippet(body);