Fixed story chapter comment permission check not allowing other users to comment.

marko/components/date/index.marko

@@ -0,0 +1,5 @@
+import moment from "moment";
+
+<if(input.value != null)>
+  <span class=["date", input.class]>${(input.utc ? moment.utc(input.value) : moment(input.value)).format(input.format || "MMM D, YYYY")}</span>
+</if>

marko/components/markdown/index.marko

@@ -1,3 +1,4 @@
 <div class=["markdown-content", input.class]>
+  <include(input.renderBody) />
   <include(state.render) />
 </div>

marko/components/modal/component.js

@@ -47,6 +47,9 @@ module.exports = class {
     if (this.input.enabled) {
       window.removeEventListener("keydown", this.onPress)
     }
+
+    this.mounted = false
+    this.opened = false
   }
 
   /**

marko/global/base.less

@@ -51,3 +51,71 @@ body {
   background-color: #555;
   color: #000;
 }
+
+/*
+ * Tooltip magic.
+ */
+.tooltip {
+  position: relative;
+  border-bottom: 0.5px dotted; /* If you want dots under the hoverable text */
+
+  span {
+    cursor: default;
+  }
+
+  > .tooltip-content {
+    visibility: hidden;
+    width: 400px;
+    text-align: left;
+    padding: 0.25em 1ch;
+   
+    position: absolute;
+    z-index: 11000;
+    pointer-events: none;
+
+    top: 0;
+    left: 105%;
+
+    border: 1px solid;
+
+    > h1 {
+      font-size: 1.5em;
+      margin: 0;
+      text-align: center;
+      border: none;
+    }
+
+    > h2 {
+      font-size: 1em;
+      margin: 0;
+      margin-bottom: 0.15em;
+      margin-top: -0.25em;
+      font-weight: 200;
+      opacity: 0.5;
+      text-align: center;
+      border: none;
+    }
+
+    p:last-of-type {
+      padding-bottom: 0;
+    }
+  }
+}
+
+.no-tooltip {
+  position: relative;
+}
+
+.tooltip:hover {
+  > .tooltip-content {
+    visibility: visible;
+  }
+}
+
+@media screen and (max-width: 1200px) {
+  .tooltip {
+    > .tooltip-content {
+      visibility: hidden !important;
+    }
+  }
+}

marko/global/colors.less

@@ -92,7 +92,7 @@ body.theme-data {
 }
 
 
-div.markdown-content .orange, body.theme-logs div.markdown-content blockquote, body.theme-logs div.markdown-content table, body.theme-logs div.markdown-content pre {
+div.markdown-content .orange, body.theme-logs .color-blockquote, body.theme-logs div.markdown-content blockquote, body.theme-logs div.markdown-content table, body.theme-logs div.markdown-content pre {
   background-color: rgba(221, 170, 17, 0.125);
   color: #DA1;
 
@@ -100,7 +100,7 @@ div.markdown-content .orange, body.theme-logs div.markdown-content blockquote, b
     color: #DA1;
   }
 }
-div.markdown-content .blue, body.theme-story div.markdown-content blockquote, body.theme-story div.markdown-content table, body.theme-story div.markdown-content pre {
+div.markdown-content .blue, body.theme-story .color-blockquote, body.theme-story div.markdown-content blockquote, body.theme-story div.markdown-content table, body.theme-story div.markdown-content pre {
   background-color: rgba(34, 187, 255, 0.125);
   color: #4BF;
 
@@ -108,7 +108,7 @@ div.markdown-content .blue, body.theme-story div.markdown-content blockquote, bo
     color: #4BF; // 
   }
 }
-div.markdown-content .green, body.theme-mapp div.markdown-content blockquote, body.theme-mapp div.markdown-content table, body.theme-mapp div.markdown-content pre {
+div.markdown-content .green, body.theme-mapp .color-blockquote, body.theme-mapp div.markdown-content blockquote, body.theme-mapp div.markdown-content table, body.theme-mapp div.markdown-content pre {
   background-color: rgba(17,255,136, 0.125);
   color: #1F8;
 

marko/page/data/components/change/component.js

@@ -72,6 +72,21 @@ module.exports = class {
         break
       }
 
+      case "Comment": {
+        const storyKey = data.keys.find(k => k.model === "Story") || {}
+        const chapterKey = data.keys.find(k => k.model === "Chapter")
+        const chapter = data.objects.find(o => o.type === "Chapter") || {}
+        const comment = data.objects.find(o => o.type === "Comment") || {}
+        
+        this.state.operation += ' ' + comment.characterName + " comment in chapter"
+        this.state.links = [{
+          text: chapter.title || `ID (${chapterKey.id})`,
+          href: `/story/${storyKey.id}#${chapterKey.id}`,
+        }]
+
+        break
+      }
+
       case "Log": {
         const key = data.keys.find(k => k.id !== "*")
         

marko/page/logs-content/components/post/component.js

@@ -83,6 +83,20 @@ module.exports = class {
     
     this.state.text = input.post.text.replace(/\x02/g, "**").replace(/\x1D/g, "*").replace(/\`/g, "\\`").trim();
 
+    // Fix Ctrl-Bs
+    let left = false
+    this.state.text = this.state.text.replace(/\s*\*\*\s*/g, str => {
+      left = !left
+
+      if (left) {
+        return " **"
+      } else if (!left) {
+        return "** "
+      }
+
+      return str
+    })
+
     if (this.state.text.startsWith("|")) {
       this.state.name = ""
       this.state.text = this.state.text.slice(1).trim();

marko/page/story-content/components/chapter-meta/component.js

@@ -50,6 +50,13 @@ module.exports = class {
 
         break
       }
+
+      case "title": {
+        this.state.color = "color-primary"
+        this.state.text = value
+
+        break
+      }
   
       default: {
         this.state.color = "color-menu"

marko/page/story-content/components/chapter-meta/index.marko

@@ -1,6 +1,18 @@
 <if(state.text != null && state.text != "")>
   <div class=["chapter-meta", input.kind, state.color, input.weak ? "weak" : null] title=state.tooltip>
     <a if(state.href != null) href=state.href>${state.text}</a>
-    <span else>${state.text}</span>
+    <span else class="tooltip">
+      <span>${state.text}</span>
+
+      <div if(input.character != null) class="tooltip-content color-highlight-dark color-primary">
+        <h1>${input.character.name}</h1>
+        <h2>${input.character.author}</h2>
+        <markdown source=input.character.description />
+      </div>
+      <div else-if(input.ukAuthor != null) class="tooltip-content color-highlight-dark color-primary">
+        <h1>(Unknown Character)</h1>
+        <h2>${input.ukAuthor}</h2>
+      </div> 
+    </span>
   </div>
 </if>

marko/page/story-content/components/chapter-meta/style.less

@@ -13,6 +13,10 @@ div.chapter-meta {
   a:hover {
     border-bottom: 0.5px solid;    
   }
+
+  .tooltip {
+    border-bottom: 0.25px dotted;
+  }
 }
 
 div.chapter-meta.weak {

marko/page/story-content/components/chapter/component.js

@@ -3,9 +3,42 @@ module.exports = class {
     this.state = {
       modal: null,
       removed: false,
+      commentLabels: {
+        Article: "Comment", 
+        Message: "Message", 
+        Chat: "Chat Message",
+      },
+      selectedComment: null,
     }
   }
 
+  onOpenComment(comment, modal) {
+    this.state.selectedComment = comment
+    this.state.modal = modal
+  }
+
+  addComment(comment) {
+    this.updateChapter({
+      comments: this.input.chapter.comments.concat(comment),
+    })
+  }
+
+  editComment(comment) {
+    const comments = this.input.chapter.comments.slice()
+    const index = comments.findIndex(c => c.id === comment.id)
+    if (index != -1) {
+      comments[index] = comment
+    } else {
+      comments.push(comment)
+    }
+
+    this.updateChapter({comments})
+  }
+
+  removeComment(comment) {
+    this.updateChapter({comments: this.input.chapter.comments.filter(c => c.id !== comment.id)})
+  }
+
   updateChapter(data) {
     this.emit("edit", data)
   }

marko/page/story-content/components/chapter/index.marko

@@ -16,10 +16,26 @@
     <chapter-meta kind="date" utc=true value=input.chapter.fictionalDate />
     <chapter-meta weak kind="date" value=input.chapter.createdDate />
     <chapter-meta weak kind="author" value=input.chapter.author />
+    <chapter-meta weak kind="message" value=input.chapter.commentMode />
   </div>
   <markdown class="chapter-content color-text" source=input.chapter.source />
+  <div class=["comment-section", "type-" + (input.chapter.commentMode.toLowerCase() || "disabled")]>
+    <comment for(comment in input.chapter.comments) key=comment.id
+      comment=comment 
+      locked=input.chapter.commentsLocked 
+      mode=input.chapter.commentMode 
+      user=input.user
+      on-open("onOpenComment", comment)
+    />
 
+    <if-permitted if(input.chapter.canComment) user=input.user permission=["member", "chapter.edit"]>
+      <div class="add-comment color-menu" on-click("open", "addComment") >Add ${state.commentLabels[input.chapter.commentMode] || "Comment"}</div>
+    </if-permitted>
+  </div>
   <edit-chapter-modal enabled=(state.modal === "edit") chapter=input.chapter on-close("close") on-edit("updateChapter") />
+  <create-comment-modal enabled=(state.modal === "addComment") chapter=input.chapter user=input.user on-close("close") on-add("addComment") />
+  <edit-comment-modal enabled=(state.modal === "editComment") chapter=input.chapter comment=state.selectedComment user=input.user on-close("close") on-edit("editComment") />
+  <remove-comment-modal enabled=(state.modal === "removeComment") comment=state.selectedComment user=input.user on-close("close") on-remove("removeComment", state.selectedComment) />
   <move-chapter-modal enabled=(state.modal === "move") chapter=input.chapter user=input.user on-close("close") on-move("moveChapter") />
   <remove-chapter-modal enabled=(state.modal === "remove") chapter=input.chapter on-close("close") on-remove("removeChapter") />
 </div>

marko/page/story-content/components/chapter/style.less

@@ -49,4 +49,30 @@
   div.chapter-content {
     font-size: 1.25em;
   }
+
+  div.comment-section {
+    margin: 1em 4ch 2em 4ch;
+
+    div.add-comment {
+      text-align: center;
+      margin-top: 1em;
+      padding: 1em 0;
+      font-size: 1.5em;
+      border: 1px solid;
+      opacity: 0.5;
+      cursor: pointer;
+    }
+    div.add-comment:hover {
+      opacity: 1;
+    }
+    div.add-comment:first-child {
+      margin-top: 0;
+    }
+  }
+
+  @media screen and (max-width: 1200px) {
+    div.comment-section {
+      margin: 1em 2ch 2em 2ch;
+    }
+  }
 }

marko/page/story-content/components/comment/component.js

@@ -0,0 +1,18 @@
+module.exports = class {
+  onCreate(input) {
+    this.state = {
+      showCharacter: false,
+      paragraphs: input.comment.source.split('\n').filter(l => l.length > 1),
+    }
+  }
+
+  onInput(input) {
+    if (this.state) {
+      this.state.paragraphs = input.comment.source.split('\n').filter(l => l.length > 1)
+    }
+  }
+
+  toggle(key) {
+    this.state[key] = !this.state[key]
+  }
+}

marko/page/story-content/components/comment/index.marko

@@ -0,0 +1,119 @@
+import moment from "moment"
+
+<div class=["comment", "mode-" + input.mode.toLowerCase()]>
+  <if (input.mode === "Message")>
+    <div class="metadata">
+      <div class="options color-menu">
+        <if-permitted user=input.user author=input.comment.author permission="story.edit">
+          <a on-click("emit", "open", "editComment", input.comment) >Edit</a>
+        </if-permitted>
+        <if-permitted user=input.user author=input.comment.author permission="story.edit">
+          <a on-click("emit", "open", "removeComment", input.comment) >Remove</a>
+        </if-permitted>
+      </div>
+      <chapter-meta weak kind="date" value=input.comment.createdDate />
+      <chapter-meta weak kind="author" value=input.comment.author />
+    </div>
+    <div class="content color-blockquote">
+      <table class="header">
+        <tbody>
+          <tr if(input.comment.subject != "")>
+            <th>Subject:</th>
+            <td>${input.comment.subject}</td>
+          </tr>
+          <tr>
+            <th>From:</th>
+            <td>
+              <div if(input.comment.character != null) class="tooltip" style="display: inline-block">
+                <span>${input.comment.characterName}</span>
+                
+                <div class="tooltip-content color-highlight-dark">
+                  <h1>${input.comment.character.name}</h1>
+                  <h2>${input.comment.character.author}</h2>
+                  <markdown source=input.comment.character.description />
+                </div>
+              </div>
+              <div else>
+                <span class="tooltip color-primary">
+                  <span>${input.comment.characterName}</span>
+
+                  <div class="tooltip-content color-highlight-dark color-primary">
+                    <h1>(Unknown Character)</h1>
+                    <h2>${input.comment.author}</h2>
+                  </div>
+                </span>
+              </div>
+            </td>
+          </tr>
+          <tr if(input.comment.fictionalDate != null)>
+            <th>Date:</th>
+            <td>${moment(input.comment.fictionalDate).format("MMM D, YYYY")}</td>
+          </tr>
+        </tbody>
+      </table>
+      <markdown class="body" source=input.comment.source />
+    </div>
+  </if>
+  <if(input.mode === "Chat")>
+    <div class="content">
+      <div class="options color-menu">
+        <if-permitted user=input.user author=input.comment.author permission="story.edit">
+          <a on-click("emit", "open", "editComment", input.comment) >Edit</a>
+        </if-permitted>
+        <if-permitted user=input.user author=input.comment.author permission="story.edit">
+          <a on-click("emit", "open", "removeComment", input.comment) >Remove</a>
+        </if-permitted>
+      </div>
+      <for (paragraph in state.paragraphs)>
+        <div class="message-text color-text">
+          <markdown class="body" source=paragraph>
+            <if (input.comment.fictionalDate)>
+              <span class="decoration color-menu">[</span>
+              <date class="color-menu" value=input.comment.fictionalDate></date>
+              <span class="decoration color-menu">]&nbsp;</span>
+            </if>
+            <span class="decoration color-menu">&lt;</span>
+            <span if(input.comment.character != null) class="tooltip color-primary">
+              <span>${input.comment.characterName}</span>
+              
+              <div class="tooltip-content color-highlight-dark color-primary">
+                <h1>${input.comment.character.name}</h1>
+                <h2>${input.comment.character.author}</h2>
+                <markdown source=input.comment.character.description />
+              </div>
+            </span>
+            <span class="tooltip color-primary" else>
+              <span>${input.comment.characterName}</span>
+
+              <div class="tooltip-content color-highlight-dark color-primary">
+                <h1>(Unknown Character)</h1>
+                <h2>${input.comment.author}</h2>
+              </div>
+            </span>
+            <span class="decoration color-menu">&gt;&nbsp;</span>
+          </markdown>
+        </div>
+      </for>
+    </div>
+  </if>
+  <if(input.mode === "Article")>
+    <div class="metadata">
+      <div class="options color-menu">
+        <if-permitted user=input.user author=input.comment.author permission="story.edit">
+          <a on-click("emit", "open", "editComment", input.comment) >Edit</a>
+        </if-permitted>
+        <if-permitted user=input.user author=input.comment.author permission="story.edit">
+          <a on-click("emit", "open", "removeComment", input.comment) >Remove</a>
+        </if-permitted>
+      </div>
+      <chapter-meta kind="title" value=input.comment.subject />
+      <chapter-meta kind="name" value=input.comment.characterName character=(input.comment.character) ukAuthor=input.comment.author />
+      <chapter-meta kind="date" value=input.comment.fictionalDate />
+      <chapter-meta weak kind="date" value=input.comment.createdDate />
+      <chapter-meta weak kind="author" value=input.comment.author />
+    </div>
+    <div class="content color-text">
+      <markdown class="body" source=input.comment.source />
+    </div>
+  </if>
+</div>

marko/page/story-content/components/comment/style.less

@@ -0,0 +1,113 @@
+div.comment {
+  position: relative;
+
+  div.options {
+    width: 100%;
+    max-width: 95ch;
+  }
+}
+
+div.comment.mode-message {
+  margin-bottom: 1.5em;
+  font-size: 1em;
+
+  .metadata {
+    padding-bottom: 0.5em;
+  }
+
+  .content {
+    outline: 1px solid;
+    padding: 0.25em 1ch;
+
+    font-size: 1.25em;
+  
+    table.header {
+      border-bottom: 0.5px solid;
+      margin: 0;
+      width: 100%;
+  
+      tbody {
+        tr {
+          text-align: left;
+  
+          th {
+            width: 12ch;
+            padding-right: 1ch;
+          }
+  
+          td {
+            width: 100%;
+          }
+        }
+      }
+    }
+  }
+
+  div.body {
+    padding-top: 0.5em;
+
+    p:first-of-type {
+      margin-top: 0;
+      padding-top: 0;
+    }
+  }
+}
+
+div.comment.mode-chat {
+  div.options {
+    display: none;
+    bottom: -0.25em;
+
+    a {
+      background: black;
+      opacity: 0.666;
+    }
+    a:hover {
+      opacity: 1;
+    }
+  }
+
+  div.content {    
+    line-height: 2em;
+    font-size: 1.125em;
+
+    div.tooltip-content {
+      text-indent: 0;
+    }
+
+    div.message-text {
+      vertical-align: top;
+      padding-left: 2ch;
+      text-indent: -2ch;
+
+      div.body {
+        p:first-of-type {
+          display: inline;
+        }
+
+        p:last-of-type {
+          margin-bottom: 0;
+          padding-bottom: 0;
+        }
+
+        p {
+          line-height: 1.5em;
+        }
+      }
+    }
+  }
+}
+
+div.comment.mode-article {
+  margin-bottom: 1em;
+  
+  .content {
+    font-size: 1.25em;
+  }
+}
+
+div.comment.mode-chat:hover {
+  div.options {
+    display: block;
+  }
+}

marko/page/story-content/components/create-chapter-modal/component.js

@@ -11,6 +11,7 @@ module.exports = class {
         title: "",
         source: "",
         fictionalDate: "",
+        commentMode: "Disabled",
       },
     }
 
@@ -19,18 +20,18 @@ module.exports = class {
 
   onInput(input) {
     if (input.chapter && !this.first) {
-      let {fictionalDate, title, source} = input.chapter
+      let {fictionalDate, title, source, commentMode, commentsLocked} = input.chapter
 
       if (fictionalDate != null) {
         fictionalDate = moment.utc(fictionalDate).format("MMM D, YYYY")
       }
   
-      this.state.values = {fictionalDate, title, source}
+      this.state.values = {fictionalDate, title, source, commentMode, commentsLocked}
     }
   }
 
   change(key, ev) {
-    this.state.values[key] = ev.target.value
+    this.state.values = Object.assign({}, this.state.values, {[key]: ev.target.value})
   }
 
   open() {
@@ -52,15 +53,19 @@ module.exports = class {
     
     let fictionalDate = new Date(values.fictionalDate + " UTC")
     if (values.fictionalDate != "") {
-      if (Number.isNaN(fictionalDate)) {
-        this.state.error = `Could not parse ${values.fictionalDate} as date!`
+      if (Number.isNaN(fictionalDate.getTime())) {
+        this.state.error = `Could not parse ${values.fictionalDate} as date.`
+        if (values.fictionalDate.includes("th")) {
+          this.state.error += " Try to remove the 'th'."
+        }
+
         return
       }
     } else {
       fictionalDate = null
     }
     
-    const input = {storyId: this.input.storyId, title: values.title, source: values.source, fictionalDate}
+    const input = {storyId: this.input.storyId, title: values.title, source: values.source, fictionalDate, commentMode: values.commentMode}
 
     chapterApi.addChapter(input).then(chapter => {
       this.emit("add", chapter)
@@ -70,11 +75,12 @@ module.exports = class {
         title: "",
         source: "",
         fictionalDate: "",
+        commentMode: "Disabled",
       }
     }).catch(errs => {
       console.warn("Failed to edit:", errs)
 
-      this.state.error = "Failed to edit: " + errs[0].message
+      this.state.error = "Failed to edit: " + (errs[0]||errs||{}).message || errs
     }).then(() => {
       this.state.loading = false
     })

marko/page/story-content/components/create-chapter-modal/index.marko

@@ -12,5 +12,13 @@
   <label>Content</label>
   <textarea key="source" placeholder="" class="tall" on-change("change", "source") value=state.values.source />
 
+  <label>Comments</label>
+  <select key="kind" class="big" placeholder="Kind" on-change("change", "commentMode") value=state.values.commentMode>
+    <option value="Disabled" selected=(state.values.commentMode === "Disabled")>Disabled – Hide all comments</option>
+    <option value="Article" selected=(state.values.commentMode === "Article")>Article – Looks like story chapters</option>
+    <option value="Chat" selected=(state.values.commentMode === "Chat")>Chat – One-line chat messages</option>
+    <option value="Message" selected=(state.values.commentMode === "Message")>Message – Extranet Mail</option>
+  </select>
+
   <button disabled=state.loading on-click("save")>Save</button>
 </modal>

marko/page/story-content/components/create-comment-modal/component.js

@@ -0,0 +1,139 @@
+const moment = require("moment")
+
+const {commentApi} = require("../../../../../rpdata/api/Comment")
+const {charactersApi} = require("../../../../../rpdata/api/Character")
+
+module.exports = class {
+  onCreate(input) {
+    this.state = {
+      error: null,
+      loading: false,
+      values: {
+        subject: "",
+        source: "",
+        characterName: "",
+        characterId: "",
+        fictionalDate: "",
+      },
+      characters: [],
+      opened: false,
+      placeholder: "(Required)",
+    }
+
+    this.first = false
+  }
+
+  onMount() {
+    charactersApi.list({author: (this.input.user||{}).name}).then((characters) => {
+      this.state.characters = characters.sort((a,b) => a.name.localeCompare(b.name))
+    })
+
+    const comments = this.input.chapter.comments || []
+    const lastComment = comments[comments.length - 1]
+    if (lastComment != null) {
+      let date = lastComment.fictionalDate || this.input.chapter.fictionalDate
+      if (date != null) {
+        this.change("fictionalDate", {target: {value: moment(date).format("MMM D, YYYY")}})
+      }
+    }
+  }
+
+  change(key, ev) {
+    this.state.values = Object.assign({}, this.state.values, {[key]: ev.target.value})
+
+    if (key === "characterId") {
+      if (ev.target.value !== "") {
+        const character = this.state.characters.find(c => c.id === this.state.values.characterId)
+        if (character != null) {
+          this.state.placeholder = character.name
+        } else {
+          this.state.placeholder = "(Required)"
+        }
+      } else {
+        this.state.placeholder = "(Required)"
+      }
+    }
+  }
+
+  open() {
+    if (!this.state.opened) {
+      charactersApi.list({author: (this.input.user||{}).name}).then((characters) => {
+        this.state.characters = characters.sort((a,b) => a.name.localeCompare(b.name))
+      })
+    }
+  }
+
+  close() {
+    this.first = false
+    this.state.opened = false
+    this.emit("close")
+  }
+
+  save() {
+    const values = Object.assign({}, this.state.values)
+
+    if (values.source.length == 0) {
+      this.state.error = "The comment body is empty."
+      console.warn(values)
+      return
+    }
+
+    if (this.input.chapter.commentMode !== "Chat" && values.subject.trim().length == 0) {
+      this.state.error = "The subject is empty."
+      return
+    }
+
+    if (values.characterName.trim().length < 1) {
+      const character = this.state.characters.find(c => c.id === this.state.values.characterId)
+      if (character == null) {
+        this.state.error = "You need to give a display name for an anonymous character."
+        return
+      }
+
+      values.characterName = character.name
+    }
+    
+    let fictionalDate = new Date(values.fictionalDate + " UTC")
+    if (values.fictionalDate != "") {
+      if (Number.isNaN(fictionalDate)) {
+        this.state.error = `Could not parse ${values.fictionalDate} as date!`
+        return
+      }
+    } else {
+      fictionalDate = null
+    }
+    
+    const input = {
+      chapterId: this.input.chapter.id, 
+      subject: values.subject, 
+      source: values.source, 
+      characterName: values.characterName, 
+      characterId: values.characterId,
+      fictionalDate: fictionalDate, 
+    }
+
+    if (input.characterId == "") {
+      input.characterId = null
+    }
+
+    commentApi.addComment(input).then(comment => {
+      this.emit("add", comment)
+      this.emit("close")
+
+      this.state.values = {
+        subject: "",
+        source: "",
+        characterName: "",
+        characterId: "",
+        fictionalDate: "",
+      }
+      this.state.opened = false
+    }).catch(errs => {
+      console.warn("Failed to add comemnt:", errs)
+
+      this.state.error = "Failed to add comemnt: " + (errs[0]||errs||{}).message || errs
+    }).then(() => {
+      this.state.loading = false
+    })
+  }
+}

marko/page/story-content/components/create-comment-modal/index.marko

@@ -0,0 +1,27 @@
+<modal class="modal color-text nolabel" key="modal" enabled=(input.enabled) closable on-close("close") on-open("open") >
+  <h1>Add Comment</h1>
+
+  <p key="error" class="color-error">${state.error}</p>
+
+  <if(input.chapter.commentMode !== "Chat")>
+    <label>Subject</label>
+    <input key="subject" autofocus placeholder="" class="big" on-change("change", "subject") value=state.values.subject />
+  </if>
+
+  <label>Character ${state.characterId}</label>
+  <select on-change("change", "characterId")>
+    <option value="" selected=state.values.characterId=="">Anonymous</option>
+    <option for(character in state.characters) value=character.id selected=(state.values.characterId==character.id)>${character.name}</option>
+  </select>
+
+  <label>Display Name</label>
+  <input key="characterName" autofocus placeholder=state.placeholder on-change("change", "characterName") value=state.values.characterName />
+
+  <label>IC Date</label>
+  <input key="icdate" placeholder="(Optional)" on-change("change", "fictionalDate") value=state.values.fictionalDate />
+
+  <label>Content</label>
+  <textarea key="source" placeholder="" class="tall" on-change("change", "source") value=state.values.source />
+
+  <button disabled=state.loading on-click("save")>Save</button>
+</modal>

marko/page/story-content/components/edit-chapter-modal/component.js

@@ -11,6 +11,8 @@ module.exports = class {
         title: "",
         source: "",
         fictionalDate: "",
+        commentMode: "Article",
+        commentsLocked: false,
       },
     }
 
@@ -19,18 +21,20 @@ module.exports = class {
 
   onInput(input) {
     if (input.chapter && !this.first) {
-      let {fictionalDate, title, source} = input.chapter
+      let {fictionalDate, title, source, commentMode, commentsLocked} = input.chapter
 
       if (fictionalDate != null) {
         fictionalDate = moment.utc(fictionalDate).format("MMM D, YYYY")
+      } else {
+        fictionalDate = ""
       }
   
-      this.state.values = {fictionalDate, title, source}
+      this.state.values = {fictionalDate, title, source, commentMode, commentsLocked}
     }
   }
 
   change(key, ev) {
-    this.state.values[key] = ev.target.value
+    this.state.values = Object.assign({}, this.state.values, {[key]: ev.target.value})
   }
 
   open() {
@@ -47,15 +51,19 @@ module.exports = class {
     
     let fictionalDate = new Date(values.fictionalDate + " UTC")
     if (values.fictionalDate != "") {
-      if (Number.isNaN(fictionalDate)) {
-        this.state.error = `Could not parse ${values.fictionalDate} as date`
+      if (Number.isNaN(fictionalDate.getTime())) {
+        this.state.error = `Could not parse ${values.fictionalDate} as date.`
+        if (values.fictionalDate.includes("th")) {
+          this.state.error += " Try to remove the 'th'."
+        }
+
         return
       }
     } else {
       fictionalDate = null
     }
     
-    const input = {id: this.input.chapter.id, title: values.title, source: values.source}
+    const input = {id: this.input.chapter.id, title: values.title, source: values.source, commentsLocked: values.commentsLocked, commentMode: values.commentMode}
     
     if (fictionalDate != null) {
       input.fictionalDate = fictionalDate

marko/page/story-content/components/edit-chapter-modal/index.marko

@@ -12,5 +12,17 @@
   <label>Content</label>
   <textarea key="source" placeholder="Content" class="tall" on-change("change", "source") value=state.values.source />
 
+  <label>Comments</label>
+  <select key="kind" class="big" placeholder="Kind" on-change("change", "commentMode") value=state.values.commentMode>
+    <option value="Disabled" selected=(state.values.commentMode === "Disabled")>Disabled – Hide all comments</option>
+    <option value="Article" selected=(state.values.commentMode === "Article")>Article – Looks like story chapters</option>
+    <option value="Chat" selected=(state.values.commentMode === "Chat")>Chat – One-line chat messages</option>
+    <option value="Message" selected=(state.values.commentMode === "Message")>Message – Extranet Mail</option>
+  </select>
+  <toggle value=state.values.commentsLocked on="Locked" off="Unlocked"
+          onDesc="Logged-in users can post comments."
+          offDesc="Nobody can post comments to this chapter."
+          on-change("change", "commentsLocked") />
+
   <button disabled=state.loading on-click("save")>Save</button>
 </modal>

marko/page/story-content/components/edit-comment-modal/component.js

@@ -0,0 +1,139 @@
+const moment = require("moment")
+
+const {commentApi} = require("../../../../../rpdata/api/Comment")
+const {charactersApi} = require("../../../../../rpdata/api/Character")
+
+module.exports = class {
+  onCreate(input) {
+    this.state = {
+      error: null,
+      loading: false,
+      values: {
+        subject: "",
+        source: "",
+        characterName: "",
+        characterId: "",
+        fictionalDate: "",
+      },
+      characters: [],
+      opened: false,
+      placeholder: "(Required)",
+    }
+  }
+
+  onInput(input) {
+    if (input.comment) {
+      charactersApi.list({author: (input.user||{}).name}).then((characters) => {
+        this.state.characters = characters.sort((a,b) => a.name.localeCompare(b.name))
+      })
+
+      const comment = input.comment
+
+      let fictionalDate = new Date(comment.fictionalDate)
+      if (comment.fictionalDate && !Number.isNaN(fictionalDate.getTime()) && fictionalDate.getTime() !== 0) {
+        fictionalDate = moment(fictionalDate).format("MMM D, YYYY")
+      } else {
+        fictionalDate = ""
+      }
+
+      this.state.values = {
+        subject: comment.subject,
+        characterId: comment.characterId,
+        characterName: comment.characterName,
+        fictionalDate: fictionalDate,
+        source: comment.source,
+      }
+    }
+  }
+
+  change(key, ev) {
+    this.state.values = Object.assign({}, this.state.values, {[key]: ev.target.value})
+
+    if (key === "characterId") {
+      if (ev.target.value !== "") {
+        const character = this.state.characters.find(c => c.id === this.state.values.characterId)
+        if (character != null) {
+          this.state.placeholder = character.name
+        } else {
+          this.state.placeholder = "(Required)"
+        }
+      } else {
+        this.state.placeholder = "(Required)"
+      }
+    }
+  }
+
+  close() {
+    this.emit("close")
+  }
+
+  save() {
+    const values = Object.assign({}, this.state.values)
+    let clearFictionalDate = false
+
+    if (values.source.length == 0) {
+      this.state.error = "The comment body is empty."
+      console.warn(values)
+      return
+    }
+
+    if (this.input.chapter.commentMode !== "Chat" && values.subject.trim().length == 0) {
+      this.state.error = "The subject is empty."
+      return
+    }
+
+    if (values.characterName.trim().length < 1) {
+      const character = this.state.characters.find(c => c.id === this.state.values.characterId)
+      if (character == null) {
+        this.state.error = "You need to give a display name for an anonymous character."
+        return
+      }
+
+      values.characterName = character.name
+    }
+    
+    let fictionalDate = new Date(values.fictionalDate + " UTC")
+    if (values.fictionalDate != "") {
+      if (Number.isNaN(fictionalDate)) {
+        this.state.error = `Could not parse ${values.fictionalDate} as date!`
+        return
+      }
+    } else {
+      fictionalDate = null
+      clearFictionalDate = true
+    }
+    
+    const input = {
+      commentId: this.input.comment.id, 
+      subject: values.subject, 
+      source: values.source, 
+      characterName: values.characterName, 
+      characterId: values.characterId,
+      fictionalDate: fictionalDate,
+      clearFictionalDate: clearFictionalDate,
+    }
+
+    if (input.characterId == "") {
+      input.characterId = null
+    }
+
+    commentApi.editComment(input).then(comment => {
+      this.emit("edit", comment)
+      this.close()
+
+      this.state.values = {
+        subject: "",
+        source: "",
+        characterName: "",
+        characterId: "",
+        fictionalDate: "",
+      }
+    }).catch(errs => {
+      console.warn("Failed to add comemnt:", errs)
+
+      this.state.error = "Failed to add comemnt: " + (errs[0]||errs||{}).message || errs
+    }).then(() => {
+      this.state.loading = false
+    })
+  }
+}

marko/page/story-content/components/edit-comment-modal/index.marko

@@ -0,0 +1,27 @@
+<modal class="modal color-text nolabel" key="modal" enabled=(input.enabled) closable on-close("close") >
+  <h1>Edit Comment</h1>
+
+  <p key="error" class="color-error">${state.error}</p>
+
+  <if(input.chapter.commentMode !== "Chat")>
+    <label>Subject</label>
+    <input key="subject" autofocus placeholder="" class="big" on-change("change", "subject") value=state.values.subject />
+  </if>
+
+  <label>Character ${state.characterId}</label>
+  <select on-change("change", "characterId")>
+    <option value="" selected=state.values.characterId=="">Anonymous</option>
+    <option for(character in state.characters) value=character.id selected=(state.values.characterId==character.id)>${character.name}</option>
+  </select>
+
+  <label>Display Name</label>
+  <input key="characterName" autofocus placeholder=state.placeholder on-change("change", "characterName") value=state.values.characterName />
+
+  <label>IC Date</label>
+  <input key="icdate" placeholder="(Optional)" on-change("change", "fictionalDate") value=state.values.fictionalDate />
+
+  <label>Content</label>
+  <textarea key="source" placeholder="" class="tall" on-change("change", "source") value=state.values.source />
+
+  <button disabled=state.loading on-click("save")>Save</button>
+</modal>

marko/page/story-content/components/edit-story-modal/component.js

@@ -46,8 +46,12 @@ module.exports = class {
     
     let fictionalDate = new Date(values.fictionalDate + " UTC")
     if (values.fictionalDate != "") {
-      if (Number.isNaN(fictionalDate)) {
-        this.state.error = `Could not parse ${values.fictionalDate} as date`
+      if (Number.isNaN(fictionalDate.getTime())) {
+        this.state.error = `Could not parse ${values.fictionalDate} as date.`
+        if (values.fictionalDate.includes("th")) {
+          this.state.error += " Try to remove the 'th'."
+        }
+
         return
       }
     } else {

marko/page/story-content/components/page/component.js

@@ -36,13 +36,7 @@ module.exports = class {
       return
     }
 
-    for (const key in data) {
-      if (!data.hasOwnProperty(key)) {
-        continue
-      }
-
-      this.state.story.chapters[index][key] = data[key]
-    }
+    this.state.story.chapters[index] = Object.assign({}, this.state.story.chapters[index], data);
 
     this.refreshStory()
   }

marko/page/story-content/components/remove-comment-modal/component.js

@@ -0,0 +1,36 @@
+const {commentApi} = require("../../../../../rpdata/api/Comment")
+
+module.exports = class {
+  onCreate(input) {
+    this.state = {
+      error: null,
+      loading: false,
+      values: {
+        title: "",
+        source: "",
+        fictionalDate: "",
+      },
+    }
+  }
+
+  change(key, ev) {
+    this.state.values[key] = ev.target.value
+  }
+
+  close() {
+    this.emit("close")
+  }
+
+  doIt() {
+    commentApi.removeComment({commentId: this.input.comment.id}).then(() => {
+      this.emit("remove")
+      this.emit("close")
+    }).catch(errs => {
+      console.warn("Failed to delete:", errs)
+
+      this.state.error = "Failed to delete: " + errs.message || errs[0].message
+    }).then(() => {
+      this.state.loading = false
+    })
+  }
+}

marko/page/story-content/components/remove-comment-modal/index.marko

@@ -0,0 +1,9 @@
+<modal class="modal color-text nolabel" key="modal" enabled=(input.enabled) notification closable on-close("close") >
+  <h1>Delete Comment</h1>
+
+  <p class="color-error">${state.error}</p>
+  
+  <p class="color-danger">This is irreversible!</p>
+
+  <button disabled=state.loading on-click("doIt")>${Math.random() > 0.99 ? "Deleet" : "Delete"}</button>
+</modal>

marko/page/story/components/add-story-modal/component.js

@@ -42,8 +42,12 @@ module.exports = class {
     
     let fictionalDate = new Date(values.fictionalDate + " UTC")
     if (values.fictionalDate != "") {
-      if (Number.isNaN(fictionalDate)) {
-        this.state.error = `Could not parse ${values.fictionalDate} as date`
+      if (Number.isNaN(fictionalDate.getTime())) {
+        this.state.error = `Could not parse ${values.fictionalDate} as date.`
+        if (values.fictionalDate.includes("th")) {
+          this.state.error += " Try to remove the 'th'."
+        }
+
         return
       }
     } else {

rpdata/api/Change.js

@@ -68,6 +68,11 @@ class ChangesAPI {
               time
               nick
             }
+
+            ...on Comment {
+              chapterId
+              characterName
+            }
           }
         }
       }

rpdata/api/Chapter.js

@@ -1,4 +1,5 @@
 const {query} = require("../client")
+const {Comment} = require("./Comment")
 
 class Chapter {
   /**
@@ -8,9 +9,13 @@ class Chapter {
    * @param {string} source 
    * @param {string | Date} createdDate 
    * @param {string | Date} fictionalDate 
-   * @param {string | Date} editedDate 
+   * @param {string | Date} editedDate
+   * @param {boolean} canComment
+   * @param {"Disabled"|"Article"|"Chat"|"Message"} commentMode
+   * @param {boolean} commentsLocked
+   * @param {any[]} comments
    */
-  constructor(id, title, author, source, createdDate, fictionalDate, editedDate) {
+  constructor(id, title, author, source, createdDate, fictionalDate, editedDate, canComment, commentMode, commentsLocked, comments) {
     this.id = id
     this.title = title
     this.author = author
@@ -18,6 +23,10 @@ class Chapter {
     this.createdDate = new Date(createdDate)
     this.fictionalDate = fictionalDate != null ? new Date(fictionalDate) : null
     this.editedDate = new Date(editedDate)
+    this.canComment = canComment
+    this.commentMode = commentMode
+    this.commentsLocked = commentsLocked
+    this.comments = (comments||[]).map(c => Comment.fromData(c))
   }
 }
 
@@ -39,12 +48,31 @@ class ChapterAPI {
           createdDate
           fictionalDate
           editedDate
+          canComment
+          commentMode
+          commentsLocked
+          comments {
+            id
+            subject
+            author
+            characterName
+            character {
+              id
+              name
+              author
+              description
+            }
+            fictionalDate
+            createdDate
+            editedDate
+            source
+          }
         }
       }
     `, {input}, {permissions: ["member", "story.add"]}).then((data) => {
       const ac = data.addChapter
 
-      return new Chapter(ac.id, ac.title, ac.author, ac.source, ac.createdDate, ac.fictionalDate, ac.editedDate)
+      return new Chapter(ac.id, ac.title, ac.author, ac.source, ac.createdDate, ac.fictionalDate, ac.editedDate, ac.canComment, ac.commentMode, ac.commentsLocked, ac.comments)
     })
   }
 
@@ -61,6 +89,25 @@ class ChapterAPI {
           title
           fictionalDate
           source
+          canComment
+          commentMode
+          commentsLocked
+          comments {
+            id
+            subject
+            author
+            characterName
+            character {
+              id
+              name
+              author
+              description
+            }
+            fictionalDate
+            createdDate
+            editedDate
+            source
+          }
         }
       }
     `, {input}, {permissions: ["member", "story.edit"]}).then(({editChapter}) => {
@@ -68,7 +115,7 @@ class ChapterAPI {
         editChapter.fictionalDate = new Date(editChapter.fictionalDate)
       }
 
-      return editChapter
+      return Object.assign({comments:[]}, editChapter)
     })
   }
 

rpdata/api/Comment.js

@@ -0,0 +1,169 @@
+const {query} = require("../client")
+
+class Comment {
+  /**
+   * @param {string} id 
+   * @param {string} subject 
+   * @param {string} author 
+   * @param {string} characterName 
+   * @param {CommentCharacter} character 
+   * @param {string | number | Date} fictionalDate 
+   * @param {string | number | Date} createdDate 
+   * @param {string | number | Date} editedDate 
+   * @param {string} source 
+   */
+  constructor(id, subject, author, characterName, character, fictionalDate, createdDate, editedDate, source) {
+    this.id = id
+    this.subject = subject
+    this.author = author
+    this.characterName = characterName
+    this.character = character != null ? CommentCharacter.fromData(character) : null
+    this.fictionalDate = fictionalDate != null ? new Date(fictionalDate) : null
+    this.createdDate = new Date(createdDate)
+    this.editedDate = new Date(editedDate)
+    this.source = source
+  }
+
+  static fromData(data) {
+    return new Comment(data.id, data.subject, data.author, data.characterName, data.character, data.fictionalDate, data.createdDate, data.editedDate, data.source)
+  }
+}
+
+class CommentCharacter {
+  /**
+   * @param {string} id 
+   * @param {string} name 
+   * @param {string} author 
+   * @param {string} description 
+   */
+  constructor(id, name, author, description) {
+    this.id = id
+    this.name = name
+    this.author = author
+    this.description = description
+  }
+
+  static fromData(data) {
+    return new CommentCharacter(data.id, data.name, data.author, data.description)
+  }
+}
+
+class CommentAPI {
+  /**
+   * @param {string} id 
+   * @returns {Promise<Comment>}
+   */
+  find(id) {
+    return query(`
+      query FindComment($id: String!) {
+        comment(id: $id) {
+          id
+          subject
+          author
+          characterName
+          character {
+            id
+            name
+            author
+            description
+          }
+          fictionalDate
+          createdDate
+          editedDate
+          source
+        }
+      }
+    `, {id}).then(({comment}) => {
+      return new Comment(
+        comment.id, comment.subject, comment.author,
+        comment.characterName, comment.character,
+        comment.fictionalDate, comment.createdDate,
+        comment.editedDate, comment.source,
+      )
+    })
+  }
+
+  /**
+   * @param {any} input 
+   * @returns {Promise<Comment>}
+   */
+  addComment(input) {
+    return query(`
+      mutation AddComment($input: CommentAddInput!) {
+        addComment(input: $input) {
+          id
+          subject
+          author
+          characterName
+          character {
+            id
+            name
+            author
+            description
+          }
+          fictionalDate
+          createdDate
+          editedDate
+          source
+        }
+      }
+    `, {input}, {permissions:["member", "story.edit"]}).then(({addComment: comment}) => {
+      return new Comment(
+        comment.id, comment.subject, comment.author,
+        comment.characterName, comment.character,
+        comment.fictionalDate, comment.createdDate,
+        comment.editedDate, comment.source,
+      )
+    })
+  }
+
+  /**
+   * @param {any} input 
+   * @returns {Promise<Comment>}
+   */
+  editComment(input) {
+    return query(`
+      mutation EditComment($input: CommentEditInput!) {
+        editComment(input: $input) {
+          id
+          subject
+          author
+          characterName
+          character {
+            id
+            name
+            author
+            description
+          }
+          fictionalDate
+          createdDate
+          editedDate
+          source
+        }
+      }
+    `, {input}, {permissions:["member", "story.edit"]}).then(({editComment: comment}) => {
+      return new Comment(
+        comment.id, comment.subject, comment.author,
+        comment.characterName, comment.character,
+        comment.fictionalDate, comment.createdDate,
+        comment.editedDate, comment.source,
+      )
+    })
+  }
+
+  /**
+   * @param {{commentId:string}} input 
+   * @returns {Promise<{commentId:string}>}
+   */
+  removeComment(input) {
+    return query(`
+      mutation RemoveComment($input: CommentRemoveInput!) {
+        removeComment(input: $input) {
+          id
+        }
+      }
+    `, {input}, {permissions:["member", "story.edit"]})
+  }
+}
+
+module.exports = {Comment, CommentCharacter, commentApi: new CommentAPI}

rpdata/api/Story.js

@@ -29,7 +29,7 @@ class Story {
     this.updatedDate = new Date(updatedDate)
     this.fictionalDate = fictionalDate != null ? new Date(fictionalDate) : null
     this.tags = tags.map(dt => new Tag(dt.kind, dt.name))
-    this.chapters = chapters != null ? chapters.map(c => new Chapter(c.id, c.title, c.author, c.source, c.createdDate, c.fictionalDate, c.editedDate)) : null
+    this.chapters = chapters != null ? chapters.map(c => new Chapter(c.id, c.title, c.author, c.source, c.createdDate, c.fictionalDate, c.editedDate, c.canComment, c.commentMode, c.commentsLocked, c.comments)) : null
   }
 }
 
@@ -91,32 +91,51 @@ const storyApi = {
    */
   find(id) {
     return query(`
-      query FindStory($id: String!) {
-        story(id: $id) {
-          id
+    query FindStory($id: String!) {
+      story(id: $id) {
+        id
+        name
+        author
+        category
+        tags {
+          kind
           name
+        }
+        listed
+        open
+        createdDate
+        fictionalDate
+        updatedDate
+        chapters {
+          id
+          title
           author
-          category
-          tags {
-            kind
-            name
-          }
-          listed
-          open
+          source
           createdDate
           fictionalDate
-          updatedDate
-          chapters {
+          editedDate
+          canComment
+          commentMode
+          commentsLocked
+          comments {
             id
-            title
+            subject
             author
-            source
-            createdDate
+            characterName
+            character {
+              id
+              name
+              author
+              description
+            }
             fictionalDate
+            createdDate
             editedDate
+            source
           }
         }
       }
+    }
     `, {id}).then(({story}) => {
       return new Story(
         story.id, story.name, story.author, story.category,