Merge remote-tracking branch 'origin/la/fix-feed'

This commit is contained in:
Liam Fitzgerald 2021-04-13 15:59:26 +10:00
commit 85b580f922
No known key found for this signature in database
GPG Key ID: D390E12C61D1CFFB

View File

@ -104,6 +104,7 @@
+$ state-6 [%6 base-state-1] +$ state-6 [%6 base-state-1]
+$ state-7 [%7 base-state-2] +$ state-7 [%7 base-state-2]
+$ state-8 [%8 base-state-3] +$ state-8 [%8 base-state-3]
+$ state-9 [%9 base-state-3]
+$ versioned-state +$ versioned-state
$% state-0 $% state-0
state-1 state-1
@ -114,10 +115,11 @@
state-6 state-6
state-7 state-7
state-8 state-8
state-9
== ==
:: ::
+$ inflated-state +$ inflated-state
$: state-8 $: state-9
cached-indices cached-indices
== ==
-- --
@ -230,7 +232,7 @@
=| cards=(list card) =| cards=(list card)
|^ |^
=* loop $ =* loop $
?: ?=(%8 -.old) ?: ?=(%9 -.old)
:- cards :- cards
%_ state %_ state
associations associations.old associations associations.old
@ -238,6 +240,24 @@
group-indices (rebuild-group-indices associations.old) group-indices (rebuild-group-indices associations.old)
app-indices (rebuild-app-indices associations.old) app-indices (rebuild-app-indices associations.old)
== ==
?: ?=(%8 -.old)
=/ groups (~(got by app-indices) %groups)
=/ pokes=(list card)
%+ murn ~(tap in ~(key by groups))
|= group=resource
^- (unit card)
=/ =association:store (~(got by associations) [%groups group])
=* met metadatum.association
?. ?=([%group [~ [~ [@ [@ @]]]]] config.met)
~
=* res resource.u.u.feed.config.met
=- `[%pass /fix-feed %agent [our.bowl %graph-pull-hook] %poke -]
:- %pull-hook-action
!> [%add entity.res name.res]
%_ $
cards (weld cards pokes)
-.old %9
==
?: ?=(%7 -.old) ?: ?=(%7 -.old)
$(old [%8 (associations-2-to-3 associations.old) ~]) $(old [%8 (associations-2-to-3 associations.old) ~])
?: ?=(%6 -.old) ?: ?=(%6 -.old)
@ -369,7 +389,7 @@
^- (quip card _state) ^- (quip card _state)
|^ |^
=^ cards state =^ cards state
(on-load !>([%8 (remake-metadata ;;(tree-metadata +.arc))])) (on-load !>([%9 (remake-metadata ;;(tree-metadata +.arc))]))
:_ state :_ state
%+ weld cards %+ weld cards
%+ turn ~(tap in ~(key by group-indices)) %+ turn ~(tap in ~(key by group-indices))