Revert "new profile mark and hood/write changes added"

This reverts commit c76f77994c.

.gitignore

@@ -1,2 +1 @@
 /sec/**/*.atom
-*.swp

app/hood.hoon

@@ -207,7 +207,8 @@
 ++  poke-write-paste          (wrap poke-paste):from-write
 ++  poke-write-comment        (wrap poke-comment):from-write
 ++  poke-write-fora-post      (wrap poke-fora-post):from-write
-++  poke-write-profile        (wrap poke-profile):from-write
+++  poke-write-plan-info      (wrap poke-plan-info):from-write
+++  poke-write-plan-account   (wrap poke-plan-account):from-write
 ++  poke-write-tree           (wrap poke-tree):from-write
 ++  poke-write-wipe           (wrap poke-wipe):from-write
 ++  poke-will                 (wrap poke-will):from-helm

lib/hood/write.hoon

@@ -3,7 +3,7 @@
 ::::  /hoon/write/hood/lib
   ::
 /?    310
-/-    profile
+/-    plan-diff, plan-acct
 =,  format
 =*  as-octs  as-octs:mimes:html
 =,  space:userlib
@@ -11,7 +11,7 @@
 ++  part  {$write $0 pith}           :: no state
 ++  pith  $~
 --
-::::
+::
 ::::
   ::
 |%
@@ -41,19 +41,42 @@
   |=  {sup/path mim/mime}  ^+  abet     ::  XX determine extension, beak
   (poke--data [`%md (flop sup)] %mime mim)
 ::
-++  poke-profile
+++  poke-plan-account
-  |=  pro=profile:profile
+  |=  {sev/knot usr/plan-acct}  ^+  abet
-  ^+  abet
+  (poke-plan-diff [~ ~ [[sev usr] ~ ~]])
+::
+++  poke-plan-info
+  |=  {who/@t loc/@t}
+  (poke-plan-diff [[~ who loc] ~ ~])
+::
+++  poke-plan-diff
+  |=  dif/plan-diff  ^+  abet
   ?.  =(our src)
     ~|(foreign-write+[our=our src=src] !!)
-  =/  serving=path  .^(path %e /(scot %p our)/serv/(scot %da now))
+  =/  sev
-  ?>  ?=([@ @ *] serving)
+    =+  .^(path %e /(scot %p our)/serv/(scot %da now))
-  =/  latest   .^(cass:clay %cw /(scot %p our)/[i.t.serving]/(scot %da now))  ::
+    ?>(?=({@tas @tas *} -) -)
-  =/  pax  /(scot %p our)/(scot %tas i.t.serving)/(scot %ud ud.latest)/web/profile
+  =;  sob/soba:clay
-  =<  abet
+    ?~(sob abet abet:(emit %info write+~ our `toro:clay`[i.t.sev %& sob]))
-  %-  emit
+  =+  pax=`path`/web/plan
-  =/  fol  (foal pax [%profile !>(pro)])
+  =+  paf=(en-beam beak-now (flop pax))
-  [%info /write-profile our fol]
+  ?~  [fil:.^(arch %cy paf)]
+    =+  ins=(pact-plan [['' ''] ~] dif)
+    [pax %ins plan+!>(ins)]~
+  =+  ole=.^({{@t @t} (map knot plan-acct)} %cx paf)
+  =+  neu=(pact-plan ole dif)
+  ?:  =(ole neu)  ~
+  [pax %dif plan-diff+!>(dif)]~
+::
+++  pact-plan                         :: XX clay should handle fused insert+diff
+  |=  {all/{{who/@t loc/@t} acc/(map knot plan-acct)} dif/plan-diff}
+  ^+  all
+  :-  (fall inf.dif -.all)
+  =;  neu  (~(uni by neu) put.dif)
+  =+  del=~(tap by del.dif)                             :: XXX map functions
+  |-  ^+  acc.all
+  ?~  del  acc.all
+  $(del t.del, acc.all (~(del by acc.all) p.i.del))
 ::
 ++  poke-paste
   |=  {typ/?($hoon $md $txt) txt/@t}  ^+  abet

mar/profile.hoon

@@ -1,70 +0,0 @@
-::
-::::  /hoon/profile/mar
-  ::
-/?    310
-::/-    plan-acct, plan-diff, hall
-/-    profile
-::
-=,  mimes:html
-=,  format
-|_  all=profile:profile
-::
-++  grow                                                ::  convert to
-  =+  all
-  |%
-  ++  json
-    |^
-    ^-  ^json
-    %-  pairs:enjs
-    :~  [%nickname s+nickname.all]
-        [%location s+location.all]
-        [%streams a+(turn ~(tap in streams.all) json-circle)]
-        [%collections a+(turn ~(tap in collections.all) json-circle)]
-    ==
-    ::
-    ++  json-circle
-      |=  a/circle:hall  
-      ^-  ^json
-      %-  pairs:enjs
-      :~  hos+(ship:enjs hos.a)
-          nom+s+nom.a
-      ==
-    --
-  ++  mime  [/mime/urb-profile (as-octs (jam all))]
-  ++  noun  all
-  --
-++  grab  
-  |%                                            ::  convert from
-  ++  noun  profile:profile                     ::  clam from %noun
-  ++  mime  
-    |=  [* a=octs]
-    ^-  profile:profile
-    ((hard profile:profile) (cue q.a))
-    ++  json
-      |^
-      |=  jon=^json
-      ^-  profile:profile
-      =/  out  %.  jon
-      %-  ot:dejs
-      :~  nickname+so:dejs
-          location+so:dejs
-          streams+(ar:dejs parse-circle)
-          collections+(ar:dejs parse-circle)
-      ==
-      %=  out
-        +>-  (silt +>-.out)
-        +>+  (silt +>+.out)
-      ==
-      ::
-      ++  parse-circle
-        |=  jon=^json
-        ^-  circle:hall
-        %.  jon
-        %-  ot:dejs
-        :~  hos+(su:dejs fed:ag)
-            nom+so:dejs
-        ==
-      --
-  --
-++  grad  %mime
---

mar/write/profile.hoon

@@ -1,39 +0,0 @@
-::
-::::  /hoon/profile/write/mar
-  ::
-/?  310
-/-  profile, hall
-::
-=,  dejs:format
-::
-|_  all=profile:profile
-++  grab
-  |%
-  ++  noun  profile:profile
-  ++  json
-    |^
-    |=  jon=^json
-    ^-  profile:profile
-    =/  out  %.  jon
-    %-  ot
-    :~  nickname+so
-        location+so
-        streams+(ar parse-circle)
-        collections+(ar parse-circle)
-    ==
-    %=  out
-      +>-  (silt +>-.out)
-      +>+  (silt +>+.out)
-    ==
-    ::
-    ++  parse-circle
-      |=  jon=^json
-      ^-  circle:hall
-      %.  jon
-      %-  ot
-      :~  hos+(su fed:ag)
-          nom+so
-      ==
-    --
-  --
---

sur/profile.hoon

@@ -1,12 +0,0 @@
-/?  309
-/-  hall
-|%
-+=  foreign-acct  (map knot [user=knot url=(unit purf:eyre)])
-+=  profile
-  $:  nickname=@t
-      location=@t
-::      accounts=foreign-acct
-      streams=(set circle:hall)
-      collections=(set circle:hall)
-  ==
---