Merge pull request #1338 from urbit/8.0-announce

8.0 announce

pkg/arvo/app/chat.hoon

@@ -58,14 +58,48 @@
     =/  inboxwir  /circle/[(scot %p our.bol)]/inbox/config/group
     =/  inboxi/poke 
       :-  %hall-action
-          [%source %inbox %.y (silt [[our.bol %i] ~]~)]
-    :_  this
+      [%source %inbox %.y (silt [[our.bol %i] ~]~)]
+    =/  fakeannounce=poke
+      :-  %hall-action
+      [%create %hall-internal-announcements '' %village]
+    =/  announce=poke
+      :-  %hall-action
+      [%create %announcements 'Announcements from Tlon' %journal]
+    =/  help=poke
+      :-  %hall-action
+        [%create %urbit-help 'Get help about Urbit' %channel]
+    =/  dev=poke
+      :-  %hall-action
+      [%create %urbit-dev 'Chat about developing on Urbit' %channel]
+    =/  sourcefakeannounce/poke 
+      :-  %hall-action
+      [%source %inbox %.y (silt [[our.bol %hall-internal-announcements] ~]~)]
+    =/  sourceannounce/poke 
+      :-  %hall-action
+      [%source %inbox %.y (silt [[~marzod %announcements] ~]~)]
+    =/  hallactions=(list move)
+      ?:  =((clan:title our.bol) %czar)
+        ~
+      ?:  =(our.bol ~marzod)
+        ~&  %marzod-chat
+        :-  [ost.bol %poke /announce [our.bol %hall] announce]
+        [ost.bol %poke /announce [our.bol %hall] sourceannounce]~
+      ?:  =(our.bol ~dopzod)
+        ~&  %dopzod-chat
+        :-  [ost.bol %poke /announce [our.bol %hall] dev]
+        [ost.bol %poke /announce [our.bol %hall] help]~
+      :-  [ost.bol %poke /announce [our.bol %hall] fakeannounce]
+      :-  [ost.bol %poke /announce [our.bol %hall] sourcefakeannounce]
+      [ost.bol %poke /announce [our.bol %hall] sourceannounce]~
+    =/  moves=(list move)
     :~  [ost.bol %peer inboxwir [our.bol %hall] inboxpat]
         [ost.bol %peer circlespat [our.bol %hall] circlespat]
         [ost.bol %connect / [~ /'~chat'] %chat]
         [ost.bol %poke /chat [our.bol %hall] inboxi]
         [ost.bol %poke /chat [our.bol %launch] launcha]
     ==
+    :_  this
+    %+  weld  moves  hallactions  
   :-  [ost.bol %poke /chat [our.bol %launch] launcha]~
   this(sta u.old)
 ::

pkg/arvo/app/timer.hoon

@@ -77,7 +77,7 @@
     [~ this]
   =/  str/@t  +.jon
   ?:  =(str 'start')
-    =/  data/@da  (add now.bol ~s10)
+    =/  data/@da  (add now.bol ~m20)
     :_  this(tim data)
     [[ost.bol %wait /timer data] (send-tile-diff [%s (scot %da data)])]
   ?:  =(str 'stop')

pkg/arvo/lib/server.hoon

@@ -47,7 +47,7 @@
   ++  js-response
     |=  oct-js=octs
     ^-  http-event:http
-    [%start [200 ['content-type' 'application/js']~] [~ oct-js] %.y]
+    [%start [200 ['content-type' 'text/javascript']~] [~ oct-js] %.y]
   ::
   ++  json-response
     |=  oct-js=octs
@@ -103,7 +103,7 @@
   ++  js-response
     |=  =octs
     ^-  simple-payload:http
-    [[200 ['content-type' 'application/js']~] `octs]
+    [[200 ['content-type' 'text/javascript']~] `octs]
   ::
   ++  json-response
     |=  =octs

pkg/arvo/sys/vane/eyre.hoon

@@ -1098,7 +1098,7 @@
           ==
         ::  client is requesting the javascript shim
         ::
-        (return-static-data-on-duct 200 'application/javascript' channel-js)
+        (return-static-data-on-duct 200 'text/javascript' channel-js)
       ::
       ?:  =('PUT' method.request)
         ::  PUT methods starts/modifies a channel, and returns a result immediately