Merge pull request #2369 from urbit/unmanaged-chats-rc

Unmanaged Chats Work Properly and Support Metadata Syncing

pkg/arvo/app/chat-view.hoon

@@ -208,8 +208,8 @@
     %-  zing
     :~  (create-chat app-path.act security.act allow-history.act)
         (create-managed-group group-path.act security.act members.act)
+        (create-metadata title.act description.act group-path.act app-path.act)
         (create-security group-path.act security.act)
-        (create-metadata group-path.act app-path.act)
         ~[(permission-hook-poke [%add-owned group-path.act group-path.act])]
     ==
   ::
@@ -224,6 +224,7 @@
       ::
         ?:  (is-managed group-path)  ~
         :~  (permission-hook-poke [%remove group-path])
+            (permission-poke [%delete group-path])
             (group-poke [%unbundle group-path])
             (metadata-hook-poke [%remove group-path])
         ==
@@ -249,26 +250,24 @@
   ++  create-managed-group
     |=  [=path security=rw-security ships=(set ship)]
     ^-  (list card)
-    ?>  ?=(^ path)
     ?^  (group-scry path)  ~
     ::  do not create a managed group if this is a sig path or a blacklist
     ::
     ?:  =(security %channel)
       ~[(group-poke [%bundle path])]
-    ?:  =(i.path '~')
-      :~  (group-poke [%bundle path])
-          (group-poke [%add ships path])
-      ==
-    ~[(contact-view-poke [%create path ships])]
+    ?:  (is-managed path)
+      ~[(contact-view-poke [%create path ships])]
+    :~  (group-poke [%bundle path])
+        (group-poke [%add ships path])
+    ==
   ::
   ++  create-metadata
-    |=  [group-path=path app-path=path]
+    |=  [title=@t description=@t group-path=path app-path=path]
     ^-  (list card)
-    ~&  group-path+group-path
-    ~&  app-path+app-path
-    ~&  is-managed+(is-managed app-path)
     =/  =metadata
       %*  .  *metadata
+          title         title
+          description   description
           date-created  now.bol
           creator
         %+  slav  %p
@@ -373,6 +372,11 @@
   ^-  card
   [%pass / %agent [our.bol %group-store] %poke %group-action !>(act)]
 ::
+++  permission-poke
+  |=  act=permission-action
+  ^-  card
+  [%pass / %agent [our.bol %permission-store] %poke %permission-action !>(act)]
+::
 ++  chat-hook-poke
   |=  act=chat-hook-action
   ^-  card

pkg/arvo/app/metadata-hook.hoon

@@ -132,7 +132,7 @@
     |=  pax=^path
     ^-  associations
     =.  pax  ;:(weld /=metadata-store/(scot %da now.bowl)/group pax /noun)
-    (need .^((unit associations) %gx pax))
+    .^(associations %gx pax)
   --
 ::
 ++  fact-metadata-update

pkg/arvo/app/metadata-store.hoon

@@ -171,6 +171,7 @@
 ::
 ++  metadata-for-app
   |=  =app-name
+  ^-  ^associations
   %-  ~(gas by *^associations)
   %+  turn  ~(tap in (~(gut by app-indices) app-name ~))
   |=  [=group-path =app-path]
@@ -179,6 +180,7 @@
 ::
 ++  metadata-for-group
   |=  =group-path
+  ^-  ^associations
   %-  ~(gas by *^associations)
   %+  turn  ~(tap in (~(got by group-indices) group-path))
   |=  =resource

pkg/arvo/app/permission-group-hook.hoon

@@ -117,7 +117,6 @@
     (snoc (recreate-permissions perm-paths associate) (watch-group group))
   ::
   =/  grp  (group-scry group)
-  ~&  associate+grp
   =.  u.perms  (~(uni in u.perms) perm-paths)
   :_  state(relation (~(put by relation) group u.perms))
   %+  weld

pkg/arvo/lib/chat-json.hoon

@@ -224,7 +224,9 @@
   ::
   ++  create
     %-  ot
-    :~  [%app-path pa]
+    :~  [%title so]
+        [%description so]
+        [%app-path pa]
         [%group-path pa]
         [%security sec]
         [%members (as (su ;~(pfix sig fed:ag)))]

pkg/arvo/sur/chat-view.hoon

@@ -2,6 +2,8 @@
 |%
 +$  chat-view-action
   $%  $:  %create
+          title=@t
+          description=@t
           app-path=path
           group-path=path
           security=rw-security

pkg/interface/chat/src/js/api.js

@@ -128,9 +128,14 @@ class UrbitApi {
     return this.action("chat-view", "json", data);
   }
 
-  chatViewCreate(appPath, groupPath, security, members, allowHistory) {
-   return this.chatViewAction({
+  chatViewCreate(
+    title, description, appPath, groupPath,
+    security, members, allowHistory
+  ) {
+    return this.chatViewAction({
       create: {
+        title,
+        description,
         'app-path': appPath,
         'group-path': groupPath,
         security,

pkg/interface/chat/src/js/components/join.js

@@ -64,14 +64,14 @@ export class JoinScreen extends Component {
     }
 
     let station = text.split('/');
-    let sig = state.station.includes("/~/");
-    let ship = !!sig ? station[2] : station[1];
+    let sig = state.station.includes("~/");
+    let ship = !!sig ? station[1] : station[0];
 
     station = station.join('/');
 
     if (
-      station.length < 2 ||
-      (!!sig && station.length < 3) ||
+      (!sig && station.split('/').length < 2) ||
+      (!!sig && station.split('/').length < 3) ||
       !urbitOb.isValidPatp(ship)
     ) {
       this.setState({
@@ -80,7 +80,7 @@ export class JoinScreen extends Component {
       return;
     }
 
-    props.api.chatView.join(ship, station, true);
+    props.api.chatView.join(ship, `/${station}`, true);
   }
 
   stationChange(event) {
@@ -115,7 +115,7 @@ export class JoinScreen extends Component {
         </div>
         <h2 className="mb3 f8">Join Existing Chat</h2>
         <div className="w-100">
-          <p className="f8 lh-copy mt3 db">Enter a <span className="mono">~ship/chat-name</span></p>
+          <p className="f8 lh-copy mt3 db">Enter a <span className="mono">~ship/chat-name</span> or <span className="mono">~/~ship/chat-name</span></p>
           <p className="f9 gray2 mb4">Chat names use lowercase, hyphens, and slashes.</p>
           <textarea
             ref={ e => { this.textarea = e; } }

pkg/interface/chat/src/js/components/new.js

@@ -10,6 +10,8 @@ export class NewScreen extends Component {
   constructor(props) {
     super(props);
     this.state = {
+      title: '',
+      description: '',
       idName: '',
       groups: [],
       ships: [],
@@ -20,7 +22,8 @@ export class NewScreen extends Component {
       createGroup: true
     };
 
-    this.idChange = this.idChange.bind(this);
+    this.titleChange = this.titleChange.bind(this);
+    this.descriptionChange = this.descriptionChange.bind(this);
     this.securityChange = this.securityChange.bind(this);
     this.allowHistoryChange = this.allowHistoryChange.bind(this);
     this.setInvite = this.setInvite.bind(this);
@@ -38,9 +41,18 @@ export class NewScreen extends Component {
     }
   }
 
-  idChange(event) {
+  titleChange(event) {
+    let asciiSafe = event.target.value.toLowerCase()
+      .replace(/[^a-z0-9~_.-]/g, "-");
     this.setState({
-      idName: event.target.value
+      idName: asciiSafe,
+      title: event.target.value
+    });
+  }
+
+  descriptionChange(event) {
+    this.setState({
+      description: event.target.value
     });
   }
 
@@ -82,13 +94,7 @@ export class NewScreen extends Component {
   onClickCreate() {
     const { props, state } = this;
 
-    let validChar = /^[a-z0-9~_.-]*$/;
-
-    let invalid = (
-      (!state.idName) || (!validChar.test(state.idName))
-    );
-
-    if (invalid) {
+    if (!state.title) {
       this.setState({
         idError: true,
         inviteError: false
@@ -147,6 +153,8 @@ export class NewScreen extends Component {
         groupPath = state.groups[0];
       }
       let submit = props.api.chatView.create(
+        state.title,
+        state.description,
         appPath,
         groupPath,
         state.security,
@@ -220,19 +228,29 @@ export class NewScreen extends Component {
         <h2 className="mb3 f8">New Chat</h2>
         <div className="w-100">
           <p className="f8 mt3 lh-copy db">Name</p>
-          <p className="f9 gray2 db mb2 pt1">
-            Lowercase alphanumeric characters, dashes, and slashes only
-          </p>
           <textarea
             className={idClasses}
-            placeholder="secret-chat"
+            placeholder="Secret Chat"
             rows={1}
             style={{
               resize: "none"
             }}
-            onChange={this.idChange}
+            onChange={this.titleChange}
+          />
+              {idErrElem}
+          <p className="f8 mt3 lh-copy db">
+            Description
+            <span className="gray3"> (Optional)</span>
+          </p>
+          <textarea
+            className={idClasses}
+            placeholder="The coolest chat"
+            rows={1}
+            style={{
+              resize: "none"
+            }}
+            onChange={this.descriptionChange}
           />
-          {idErrElem}
           <p className="f8 mt4 lh-copy db">
             Invite
             <span className="gray3"> (Optional)</span>