Added log suggestions to the bottom of logs.

.browser-refresh-ignore

@@ -0,0 +1,4 @@
+.git
+**/*.marko.js
+.cache
+.static

build.js

@@ -11,6 +11,7 @@ prebuild.run({
     "./marko/page/logs/list.marko",
     "./marko/page/data/channels.marko",
     "./marko/page/data/characters.marko",
+    "./marko/page/data/changes.marko",
     "./marko/page/story-content/view.marko",
     "./marko/page/logs-content/view.marko",
   ]

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/irc-caret-notation/component.js

@@ -0,0 +1,23 @@
+const {parse, BOLD} = require("irc-caret-notation")
+
+module.exports = class {
+  onCreate() {
+    this.state = {
+      paragraphs: [],
+      prev: "",
+    }
+  }
+
+  onInput(input) {
+    if (this.state == null) {
+      return
+    }
+
+    if (input.source != this.state.prev) {
+      this.state.prev = input.source
+      this.state.paragraphs = input.source.split("\n").filter(l => l.length > 0).map(l => parse(l, {
+        "*": (!(input.source.startsWith("(")) ? BOLD : null),
+      }))
+    }
+  }
+}

marko/components/irc-caret-notation/index.marko

@@ -0,0 +1,5 @@
+<div class=["irc-caret-notation", input.class]>
+  <p for(p in state.paragraphs)>
+    <span for(chunk in p) class=chunk.cssClasses("icn-")>${chunk.text}</span>
+  </p>
+</div>

marko/components/markdown/index.marko

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

marko/components/menu-link/index.marko

@@ -1,6 +1,6 @@
 <a on-click("onClick") href=input.href>
-  <div class=state.classes>
-    <div class="icon color-primary">${input.icon}</div>
+  <div class=[state.classes, input.weak ? "dark" : null]>
+    <div class=["icon", "color-primary"]>${input.icon}</div>
     <div class=["text", input.selected ? "color-primary" : input.textClass]>
       <include(input.renderBody) />
     </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/components/unknown-nick-list/component.js

@@ -0,0 +1,17 @@
+const {charactersApi} = require("../../../rpdata/api/Character")
+
+module.exports = class {
+  onCreate() {
+    this.state = {
+      nicks: [],
+    }
+  }
+
+  onMount() {
+    charactersApi.unknownNicks(100).then(unknowns => {
+      this.state.nicks = unknowns.map(u => u.nick)
+    }).catch(err => {
+      console.warn("Failed to get unknown nicks:", err)
+    })
+  }
+}

marko/components/unknown-nick-list/index.marko

@@ -0,0 +1,3 @@
+<div class="unknown-nick-list">
+  <div for(nick in state.nicks) on-click("emit", "select", nick) key=nick class="nick">${nick}</div>
+</div>

marko/components/unknown-nick-list/style.less

@@ -0,0 +1,16 @@
+div.unknown-nick-list {
+  padding: 0.5em 0;
+
+  div.nick {
+    display: inline-block;
+    padding: 0.25em 0.5ch;
+    margin: 2px;
+    background-color: #111;
+    color: #881;
+  }
+  div.nick:hover {
+    cursor: pointer;
+    background-color: #222;
+    color: #CC2;
+  }
+}

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/changes.marko

@@ -0,0 +1,6 @@
+<include("../layout", {title: "Data", site: "data"})>
+  <@body>
+    <background src="/assets/images/bg.png" opacity=0.25 />
+    <changes-page user=input.user changes=input.changes selected=input.selected />
+  </@body>
+</include>

marko/page/data/components/add-channel-modal/index.marko

@@ -18,7 +18,5 @@
           offDesc="The logbot will not monitor this channel."
           on-change("change", "logged") />
           
-  <p class="color-danger" if(state.values.logged)>The logbot is not yet available, so this does nothing right now.</p>
-
   <button disabled=state.loading on-click("save")>Save</button>
 </modal>

marko/page/data/components/add-character-modal/component.js

@@ -33,6 +33,14 @@ module.exports = class {
     this.emit("close")
   }
 
+  selectUnknown(nick) {
+    this.state.values = Object.assign({}, this.state.values, {
+      nick: nick,
+      name: nick.replace(/_/g, " ").replace(/`/g, "'"),
+      shortName: (!nick.includes("_") && nick.includes("`")) ? nick.split("`")[0] : "",
+    })
+  }
+
   save() {
     if (this.state.loading) {
       return

marko/page/data/components/add-character-modal/index.marko

@@ -21,4 +21,12 @@
   <textarea key="description" placeholder="Description" on-change("change", "description") value=state.values.description />
 
   <button disabled=state.loading on-click("save")>Save</button>
+
+  <h2>Unknown Nicks</h2>
+  <p>After you're done adding the one you're here for, why not take a look at the unknown nicks discovered in the last log character updates?</p>
+  <p>Clicking one will change the nick in the form above, and add a guess for what the full name is.</p>
+  <if-permitted not user=input.user permission="character.add">
+    <p class="color-danger">You don't have permission to set a different author on characters, so only add your own.</p>
+  </if-permitted>
+  <unknown-nick-list on-select("selectUnknown") />
 </modal>

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

@@ -0,0 +1,134 @@
+const moment = require("moment")
+
+module.exports = class {
+  onCreate() {
+    this.state = {
+      operation: "",
+      links: [],
+      parentLink: null,
+    }
+  }
+
+  onInput(input) {
+    if (input.data) {
+      this.refresh(input.data)
+    }
+  }
+
+  refresh(data) {
+    this.state.links = []
+    this.state.operation = opText[data.op]
+    this.state.parentLink = null
+
+    switch (data.model) {
+      case "Channel": {
+        const key = data.keys.find(k => k.id !== "*")
+
+        this.state.operation += " channel"
+        this.state.links = [{
+          text: key.id,
+          href: `/data/channels/`,
+        }]
+
+        break
+      }
+
+      case "Character": {
+        const character = data.objects.find(o => o.type === "Character")
+
+        this.state.operation += " character"
+        this.state.links = [{
+          text: `${character.name} (${character.id})`,
+          href: `/data/characters/`,
+        }]
+
+        break
+      }
+
+      case "Story": {
+        const key = data.keys.find(k => k.model === "Story" && k.id !== "*")
+        const story = data.objects.find(o => o.type === "Story")
+        
+        this.state.operation += " story"
+        this.state.links = [{
+          text: story.name,
+          href: `/story/${key.id}`,
+        }]
+
+        break
+      }
+
+      case "Chapter": {
+        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")
+        
+        this.state.operation += " chapter"
+        this.state.links = [{
+          text: chapter.title || `Untitled chapter (${chapterKey.id})`,
+          href: `/story/${storyKey.id}#${chapterKey.id}`,
+        }]
+
+        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 !== "*")
+        
+        this.state.operation += " log"
+        this.state.links = [{
+          text: key.id,
+          href: `/logs/${key.id}`,
+        }]
+
+        break
+      }
+
+      case "Post": {
+        const logKey = data.keys.find(k => k.model === "Log")
+        const postKeys = data.keys.filter(k => k.model === "Post")
+        const postObjs = data.objects.filter(o => o.type === "Post")
+        
+        this.state.operation += (postKeys.length > 1) ? " posts" : " post"
+        this.state.links = postObjs.map(po => ({
+          text: `[${moment(po.time).format("HH:mm")}] ${po.nick}`,
+          href: `/logs/${logKey.id}#${po.id}`,
+        }))
+        this.state.parentLink = {
+          prefix: "in log",
+          text: `${logKey.id}`,
+          href: `/logs/${logKey.id}`,
+        }
+
+        break
+      }
+    }
+  }
+}
+
+const opText = {
+  add: "added",
+  remove: "removed",
+  move: "moved",
+  edit: "edited",
+  import: "imported",
+  tag: "tagged",
+  untag: "untagged",
+  "move-in": "moved in",
+  "move-out": "moved out",
+}

marko/page/data/components/change/index.marko

@@ -0,0 +1,15 @@
+import moment from "moment";
+
+<div class="change">
+  <span class="change-id color-menu">[${moment(input.data.date).format("MMM D HH:mm:ss")}] * </span>
+  <span class="author color-text">${input.data.author} </span>
+  <span class="text color-text">${state.operation} </span>
+  <span for(link in state.links | status-var=loop) key=link.href class="link">
+    <a class="color-primary" href=link.href>${link.text}</a>
+    <span if(loop.getIndex() < state.links.length - 1) class="comma">, </span>
+  </span>
+  <if (state.parentLink != null)>
+    <span class="text"> ${state.parentLink.prefix} </span>
+    <a class="color-primary" href=state.parentLink.href>${state.parentLink.text}</a>
+  </if>
+</div>

marko/page/data/components/change/style.less

@@ -0,0 +1,8 @@
+div.change {
+  text-indent: -2ch;
+  margin-left: 2ch;
+
+  a:hover {
+    text-decoration: underline;
+  }
+}

marko/page/data/components/changes-page/component.js

@@ -0,0 +1,16 @@
+module.exports = class {
+  onCreate(input) {
+    this.state = {
+      characters: input.characters,
+      modal: null,
+    }
+  }
+
+  open(modal) {
+    this.state.modal = modal
+  }
+
+  close() {
+    this.state.modal = null
+  }
+}

marko/page/data/components/changes-page/index.marko

@@ -0,0 +1,12 @@
+<data-menu categories=input.categories selected=(input.selected || {}) user=input.user on-open("open") />
+<main>
+  <div class="changes-page">
+    <h1 class="color-primary">Changes</h1>
+    <p>All changes to <em>listed</em> resources is stored for 90 days for transparency reasons. The current state of an object after each change exists, but is only available through the GraphQL API at this time.</p>
+    <for (change in input.changes)>
+      <change data=change />
+    </for>
+  </div>
+</main>
+<add-character-modal enabled=(state.modal === "character.add") user=input.user on-added("characterAdded") on-close("close") />
+<add-channel-modal enabled=(state.modal === "channel.add") user=input.user on-close("close") />

marko/page/data/components/changes-page/style.less

@@ -0,0 +1,36 @@
+.changes-page {
+  width: 90%;
+  max-width: 95ch;
+  margin: auto;
+
+  > p {
+    text-align: center;
+  }
+
+  h1 {
+    font-weight: 200;
+    text-align: center;
+  }
+
+  .header {
+    text-align: center;
+    vertical-align: middle;
+    margin-bottom: 1em;
+    
+    h1 {
+      display: block;
+      margin-bottom: 0;
+    }
+    
+    a {
+      vertical-align: middle;
+      display: inline-block;
+      padding: 0.5em 0.5ch 0.5em 0.5ch;
+      opacity: 0.5;
+    }
+    a:hover {
+      cursor: pointer;
+      opacity: 1;
+    }
+  }
+}

marko/page/data/components/character-nicks-modal/component.js

@@ -39,7 +39,24 @@ module.exports = class {
     }).catch(errs => {
       console.warn("Failed to add nick:", errs)
 
-      this.state.error = "Failed to add nick: " + errs[0].message
+      this.state.error = errs[0].message
+    }).then(() => {
+      this.state.loading = false
+    })
+  }
+
+  selectUnknown(nick) {
+    if (this.state.loading) {
+      return
+    }
+
+    const input = {id: this.input.character.id, nick}
+
+    this.state.loading = true
+    charactersApi.addNick(input).then((res) => {
+      this.emit("nicks", res.nicks)
+    }).catch(errs => {
+      this.state.error = errs[0].message
     }).then(() => {
       this.state.loading = false
     })

marko/page/data/components/character-nicks-modal/index.marko

@@ -10,9 +10,12 @@
   </div>
   
   <label>Current Nicks</label>
-  <div for(nick in input.character.nicks) class="existing-nick-row" >
+  <div for(nick in input.character.nicks) class="existing-nick-row" key=nick >
     <div class="content color-text">${nick}</div>
     <button disabled=state.loading on-click("removeNick", nick)>Remove</button>
   </div>
 
+  <h2>Unknown Nicks</h2>
+  <p>These are the 100 most common nicks in the logs, maybe one of these belongs to <strong>${input.character.name}</strong>?</p>
+  <unknown-nick-list key="un-list" on-select("selectUnknown") />
 </modal>

marko/page/data/components/data-menu/index.marko

@@ -2,6 +2,7 @@
   <menu-header>List</menu-header>
   <menu-link key="characters" selected=input.selected.characters icon="C" href="/data/characters/">Characters</menu-link>
   <menu-link key="channels" selected=input.selected.channels icon="#" href="/data/channels/">Channels</menu-link>
+  <menu-link key="history" selected=input.selected.changes icon="H" href="/data/changes/">History</menu-link>
   <if-permitted user=input.user permission=["member", "character.add", "channel.add"]>
     <menu-gap />
     <menu-header>Add</menu-header>

marko/page/data/components/edit-channel-modal/index.marko

@@ -15,7 +15,5 @@
           offDesc="The logbot will not monitor this channel."
           on-change("change", "logged") />
 
-  <p class="color-danger" if(state.values.logged)>The logbot is not yet available, so this does nothing right now.</p>
-
   <button disabled=state.loading on-click("save")>Save</button>
 </modal>

marko/page/logs-content/components/edit-log-modal/component.js

@@ -19,16 +19,12 @@ module.exports = class {
   }
 
   onInput(input) {
-    if (input.log && !this.first) {
     this.state.values = {
       title: input.log.title,
       event: input.log.eventName,
       description: input.log.description,
       open: input.log.open,
     }
-
-      this.first = true
-    }
   }
 
   change(key, ev) {

marko/page/logs-content/components/log-suggestions/component.js

@@ -0,0 +1,93 @@
+const {logHeaderApi} = require("../../../../../rpdata/api/LogHeader")
+
+module.exports = class {
+  onCreate(input) {
+    this.state = {
+      id: input.log.id,
+      channelName: input.log.channelName,
+      eventName: input.log.eventName,
+      nexts: [],
+      prevs: [],
+      loaded: false,
+      error: null,
+    }
+  }
+
+  onMount() {
+    this.timeout = setTimeout(() => {
+      logHeaderApi.list().then(logs => {
+        const index = logs.findIndex(l => l.id === this.state.id);
+        if (index === -1) {
+          return Promise.reject("This log not found in list.")
+        }
+        const log = logs[index]
+        const characterIds = log.characters.map(c => c.id);
+        const nexts = []
+        const prevs = []
+        const foundGroups = {}
+        let foundChannel = false
+
+        for (let i = index - 1; i >= 0; --i) {
+          const log2 = logs[i]
+          const hasEvent = (log.eventName ? log.eventName === log2.eventName : false)
+          const hasChannel = (log.channelName === log2.channelName)
+
+          const characters = log2.findCharacters(...characterIds)
+          const characterIdsKey = characters.map(c => c.id).sort().join(",")
+
+          const suggestion = {log: log2, characters, hasEvent, hasChannel}
+
+          if (hasChannel && !foundChannel) {
+            foundChannel = true
+            foundGroups[characterIdsKey] = true
+
+            nexts.push(suggestion)
+          } else if (hasEvent) {
+            foundGroups[characterIdsKey] = true
+
+            nexts.push(suggestion)
+          } else if (nexts.length < 8 && !hasEvent && characters.length > 1 && !foundGroups[characterIdsKey]) {
+            foundGroups[characterIdsKey] = true
+            nexts.push(suggestion)
+          }
+        }
+
+        for (let i = index + 1; i < logs.length; ++i) {
+          const log2 = logs[i]
+          const hasEvent = (log.eventName ? log.eventName === log2.eventName : false)
+          const hasChannel = (log.channelName === log2.channelName)
+
+          const characters = log2.findCharacters(...characterIds)
+          const characterIdsKey = characters.map(c => c.id).sort().join(",")
+
+          const suggestion = {log: log2, characters, hasEvent, hasChannel}
+
+          if (hasChannel && !foundChannel) {
+            foundChannel = true
+            foundGroups[characterIdsKey] = true
+
+            prevs.push(suggestion)
+          } else if (hasEvent) {
+            foundGroups[characterIdsKey] = true
+
+            prevs.push(suggestion)
+          } else if (prevs.length < 8 && !hasEvent && characters.length > 1 && !foundGroups[characterIdsKey]) {
+            foundGroups[characterIdsKey] = true
+            prevs.push(suggestion)
+          }
+        }
+
+        this.state.nexts = nexts;
+        this.state.prevs = prevs;
+        this.state.loaded = true;
+      }).catch(err => {
+        console.warn("Suggestions load error:", err)
+        this.suggestionsError = "Failed to load suggestions: " + err.toString()
+      })
+    }, 1000)
+  }
+
+  onUnmount() {
+    clearTimeout(this.timeout)
+  }
+}

marko/page/logs-content/components/log-suggestions/index.marko

@@ -0,0 +1,41 @@
+import moment from "moment"
+
+<div class="log-suggestions">
+  <if (state.loaded && state.error == null)>
+    <if (state.nexts.length > 0 || state.prevs.length > 0)>
+      <if (state.nexts.length > 0)>
+        <h2 class="color-primary">Next Logs</h2>
+        <div for(s in state.nexts) class="suggestion color-primary">
+          <div class="suggestion-header color-primary"><a href=`/logs/${s.log.id}`>${s.log.name || `${s.log.channelName} - ${moment(s.log.date).format("MMMM D, YYYY")}`}</a></div>
+          <div for(paragraph in (s.log.description||"").split("\n").filter(p => p)) class="suggestion-description color-text">${paragraph}</div>
+          <div class="suggestion-tags">
+            <div if(s.hasEvent) class="suggestion-tag color-tag-event">${s.log.eventName}</div>
+            <div if(s.hasChannel) class="suggestion-tag color-tag-location">${s.log.channelName}</div>
+            <div for(c in s.characters) class="suggestion-tag color-tag-character">${c.name}</div>
+          </div>
+        </div>
+      </if>
+      <if (state.prevs.length > 0)>
+        <h2 class="color-primary">Previous Logs</h2>
+        <div for(s in state.prevs) class="suggestion color-primary">
+          <div class="suggestion-header color-primary"><a href=`/logs/${s.log.id}`>${s.log.name || `${s.log.channelName} - ${moment(s.log.date).format("MMMM D, YYYY")}`}</a></div>
+          <div for(paragraph in (s.log.description||"").split("\n").filter(p => p)) class="suggestion-description color-text">${paragraph}</div>
+          <div class="suggestion-tags">
+            <div if(s.hasEvent) class="suggestion-tag color-tag-event">${s.log.eventName}</div>
+            <div if(s.hasChannel) class="suggestion-tag color-tag-location">${s.log.channelName}</div>
+            <div for(c in s.characters) class="suggestion-tag color-tag-character">${c.name}</div>
+          </div>
+        </div>
+      </if>
+    </if>
+    <else>
+      <div class="empty color-menu">(No suggestions)</div>
+    </else>
+  </if>
+  <else-if(state.error != null)>
+    <div class="error color-danger">{state.error}</div>
+  </else-if>
+  <else>
+    <div class="loading color-menu">Loading suggestions...</div>  
+  </else>
+</div>

marko/page/logs-content/components/log-suggestions/style.less

@@ -0,0 +1,46 @@
+div.log-suggestions {
+  padding: 0 0.5ch;
+  margin-top: 1em;
+  margin-bottom: 2em;
+
+  h2 {
+    text-align: center;
+    margin: 0;
+    margin-bottom: 0.25em;
+  }
+
+  div.empty, div.loading {
+    text-align: center;
+  }
+
+  div.suggestion {
+    margin-bottom: 0.5em;
+    padding: 0.5em;
+
+    div.suggestion-header {
+      margin: 0.125em 0.5ch;
+
+      a {
+        color: inherit;
+      }
+      a:hover {
+        color: white;
+      }
+    }
+
+    div.suggestion-description {
+      margin: 0.125em 0.5ch;
+    }
+
+    div.suggestion-tags {
+      margin-top: 0.25em;
+
+      div.suggestion-tag {
+        display: inline-block;
+        padding: 0 0.5ch;
+        margin: 0.125em 0.5ch;
+        border: 0.25px solid;
+      }
+    }
+  }
+}

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

@@ -1,5 +1,21 @@
 module.exports = class {
+  onCreate() {
+    this.state = {
+      highlights: [],
+    }
+  }
+  
   select(value) {
     this.emit("select", value)
   }
+
+  toggleHighlight(id) {
+    if (this.state.highlights.includes(id)) {
+      this.state.highlights = this.state.highlights.filter(id2 => id2 !== id)
+    } else {
+      this.state.highlights = this.state.highlights.concat(id)
+    }
+
+    this.emit("hightlights", this.state.highlights);
+  }
 }

marko/page/logs-content/components/logs-content-menu/index.marko

@@ -4,10 +4,23 @@
     <menu-link dark key="_create" on-click("select", "post.add", null) icon="+">Add Post</menu-link>
     <menu-gap />
   </if-permitted>
-  <menu-header>Links</menu-header>
+  <menu-header>Channel</menu-header>
   <menu-link href=("/logs/?channels="+encodeURIComponent(input.log.channel.name)) icon="#">${input.log.channel.name}</menu-link>
-  <menu-link if(input.log.channel.eventName) href=("/logs/?channels="+input.log.channel.eventName) icon="E">${input.log.channel.eventName}</menu-link>
+  <menu-gap />
+  <if(input.log.eventName)>
+    <menu-header>Event</menu-header>
+    <menu-link href=("/logs/?events="+input.log.eventName) icon="E">${input.log.eventName}</menu-link>
+    <menu-gap />
+  </if>
+  <if(input.log.characters.length > 0)>
+    <menu-header>Characters</menu-header>
     <for(character in input.log.characters)>
-    <menu-link href=("/logs/?characters="+character.id) icon="C">${character.name} <span class="weak">(${character.author})</span></menu-link>
+      <menu-link weak=(state.highlights.length > 0 && !state.highlights.includes(character.id)) 
+                 icon="C"
+                 on-click("toggleHighlight", character.id)>
+        ${character.name} <span class="weak">(${character.author})</span>
+      </menu-link>
     </for>
+    <menu-gap />
+  </if>
 </menu>

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

@@ -1,6 +1,7 @@
 const moment = require("moment")
 
 const {postApi} = require("../../../../../rpdata/api/Post")
+const {logsApi} = require("../../../../../rpdata/api/Log")
 
 module.exports = class {
   onCreate(input) {
@@ -8,6 +9,23 @@ module.exports = class {
       log: input.log,
       modal: null,
       removed: false,
+      highlights: [],
+    }
+  }  
+  
+  onMount() {
+    this.sub = logsApi.subscribeChanges(this.state.log.id)
+
+    this.sub.on("data", data => {
+      this.handleChange(data.changes)
+    })
+
+    this.sub.connect()
+  }
+
+  onUnmount() {
+    if (this.sub != null) {
+      this.sub.disconnect()
     }
   }
 
@@ -30,8 +48,6 @@ module.exports = class {
     for (const patch of patches) {
       const index = posts.findIndex(p => p.id === patch.id)
       if (index == -1) {
-        console.warn("Post not found for patch:", patch)
-        // TODO: Force full refresh
         continue
       }
 
@@ -42,8 +58,7 @@ module.exports = class {
     posts.sort((a, b) => a.position - b.position)
     for (let i = 1; i < posts.length; ++i) {
       if (posts[i].position !== posts[i - 1].position + 1) {
-        console.warn("Discontinuity detected!")
-        // TODO: Force full refresh
+        console.warn("Discontinuity detected:", i, posts)
       }
     }
 
@@ -65,15 +80,7 @@ module.exports = class {
 
   removePost(post) {
     postApi.remove({id: post.id}).then(() => {
-      this.state.log.posts = this.state.log.posts.filter(p => p.id !== post.id)
-    
-      for (const p of this.state.log.posts) {
-        if (p.position > post.position) {
-          p.position--
-        }
-      }
-  
-      this.state.log = Object.assign({}, this.state.log)
+      this.postRemoved(post)
     }).catch(errs => {
       console.warn("Failed to delete:", errs)
       this.state.error = "Failed to delete: " + (errs.message || errs[0].message)
@@ -88,15 +95,82 @@ module.exports = class {
     this.state.log = Object.assign(Object.assign({}, this.state.log), patch)
   }
 
+  postRemoved(post) {
+    if (this.state.log.posts.find(p => p.id === post.id) == null) {
+      return
+    }
+
+    const posts = this.state.log.posts.filter(p => p.id !== post.id).map(p => {
+      if (p.position > post.position) {
+        return Object.assign({}, p, {position: p.position - 1})
+      }
+
+      return p
+    })
+
+    this.state.log = Object.assign({}, this.state.log, {posts: posts})
+  }
+
   postAdded(post) {
+    // Stop duplicates in case of race condition.
+    if (this.state.log.posts.find(p => p.id === post.id)) {
+      return
+    }
+
     this.state.log.posts = this.state.log.posts.concat([post])
     this.state.log = Object.assign({}, this.state.log)    
   }
 
+  handleChange(change) {
+    switch (`${change.model}.${change.op}`) {
+      case "Post.add": {
+        for (const post of change.objects.filter(o => o.type === "Post")) {
+          this.postAdded(post)
+        }
+
+        break
+      }
+
+      case "Post.move":
+      case "Post.edit": {
+        this.patch(change.objects.filter(o => o.type === "Post"))
+
+        break
+      }
+
+      case "Post.remove": {
+        for (const post of change.objects.filter(o => o.type === "Post")) {
+          this.postRemoved(post)
+        }
+      }
+
+      case "Log.edit": {
+        const patch = change.objects.find(o => o.type === "Log")
+        if (patch == null) {
+          break
+        }
+
+        this.logEdited(patch)
+
+        break
+      }
+
+      case "Log.remove": {
+        this.logRemoved()
+
+        break
+      }
+    }
+  }
+
   logRemoved() {
     this.state.removed = true
   }
 
+  highlightsChanged(highlights) {
+    this.state.highlights = highlights.slice();
+  }
+
   get title() {
     if (this.state.log.title) {
       return this.state.log.title

marko/page/logs-content/components/page/index.marko

@@ -1,8 +1,9 @@
-<logs-content-menu user=input.user log=state.log on-select("open") />
+<logs-content-menu on-hightlights("highlightsChanged") user=input.user log=state.log on-select("open") />
 <main>
   <div class="logs-content">
     <div class="header">
       <h1 class="color-primary">${component.title}</h1>
+      <p for(paragraph in state.log.description.split("\n").filter(p => p)) class="color-text">${paragraph}</p>
       <if-permitted user=input.user permission="log.edit">
         <a on-click("open", "log.edit") class="color-menu">Edit</a>
       </if-permitted>
@@ -25,8 +26,10 @@
           prev=(state.log.posts[loop.getIndex() - 1] || {})
           post=post
           characters=state.log.characters
+          highlights=state.highlights
           last=(post.position === state.log.posts.length)
     />
+    <log-suggestions log=state.log />
   </div>
 
   <add-post-modal enabled=(state.modal === "post.add") logId=state.log.id on-close("close") on-added("postAdded") />

marko/page/logs-content/components/page/style.less

@@ -15,6 +15,10 @@ div.logs-content {
       margin-bottom: 0;
     }
 
+    p {
+      margin: 0.25em 0 0 0;
+    }
+
     a {
       vertical-align: middle;
       display: inline-block;

marko/page/logs-content/components/post-meta/index.marko

@@ -1,5 +1,5 @@
 <if(state.text != null && state.text != "")>
-  <div class=["post-meta", input.kind, state.color, input.weak ? "weak" : null] title=state.tooltip>
+  <div class=["post-meta", input.kind, state.color, input.weak ? "weak" : null, input.class] title=state.tooltip>
     <a if(state.href != null) href=state.href>${state.text}</a>
     <span else>${state.text}</span>
   </div>

marko/page/logs-content/components/post-meta/style.less

@@ -18,3 +18,13 @@ div.post-meta {
 div.post-meta.weak {
   opacity: 0.5;
 }
+
+div.post-meta.nick.pk-text {
+  color: #AAA;
+}
+div.post-meta.nick.pk-action {
+  color: #A64;
+}
+div.post-meta.nick.pk-scene {
+  color: #68A;
+}

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

@@ -1,3 +1,7 @@
+const EventEmitter = require("events");
+
+let linkSignal = null;
+
 module.exports = class {
   onCreate(input) {
     this.state = {
@@ -8,8 +12,13 @@ module.exports = class {
       modal: null,
       removed: false,
       multipart: false,
+      anchored: false,
+      prevWasText: false,
+      dark: false,
     }
 
+    this.mounted = false;
+
     this.updatePost(input)
   }
 
@@ -40,20 +49,45 @@ module.exports = class {
     }
 
     const timediff = Date.parse(input.post.time) - Date.parse(input.prev.time)
-    this.state.multipart = (input.post.nick == input.prev.nick && input.prev.multipart !== false) && (Math.abs(timediff) < 60000);
+    this.state.multipart = (!input.post.kind.startsWith("annotation.") && input.post.nick == input.prev.nick && input.prev.multipart !== false) && (Math.abs(timediff) < 60000);
+    this.state.prevWasText = (input.prev.kind === "text");
 
     this.updatePost(input)
   }
 
+  onMount() {
+    this.linkSignalCallback = () => {
+      this.state.anchored = false
+    }
+    if (linkSignal == null) {
+      linkSignal = new EventEmitter()
+      linkSignal.setMaxListeners(10000)
+    }
+    linkSignal.on("signal", this.linkSignalCallback)
+
+    this.state.anchored = window.location.hash.slice(1) === this.input.post.id;
+  }
+
+  onUnmount() {
+    linkSignal.removeListener("signal", this.linkSignalCallback)
+  }
+
+  link() {
+    linkSignal.emit("signal")
+    this.state.anchored = true
+  }
+
   updatePost(input) {
     this.state.shortName = input.post.nick.split("_").shift()
     this.state.name = input.post.nick
     this.state.nameSuffix = ""
 
-    this.state.text = input.post.text.replace(/\x02/g, "**").replace(/\x1D/g, "_")
+    this.state.text = input.post.text
 
-    if (input.post.kind === "text" && !this.state.text.includes("\"")) {
-      this.state.text = '"' + this.state.text + '"'
+    if (input.highlights.length > 0 && (input.post.kind === "action" || input.post.kind === "text")) {
+      this.state.dark = true
+    } else {
+      this.state.dark = false
     }
 
     if (!input.post.nick.startsWith("=")) {
@@ -61,13 +95,19 @@ module.exports = class {
       for (const character of input.characters) {
         for (const nick of character.nicks) {
           if (nick === postNick) {
-            this.state.name = character.name
+            this.state.name = character.name + character.id
             this.state.shortName = character.shortName
 
             if (input.post.nick.endsWith("'s") || input.post.nick.endsWith("'")) {
               this.state.nameSuffix = (character.shortName.endsWith("s") || character.shortName.endsWith("z")) ? "'" : "'s"
             }
 
+            if (input.highlights.length > 0) {
+              this.state.dark = !(input.highlights.includes(character.id))
+            } else {
+              this.state.dark = false
+            }
+
             return
           }
         }

marko/page/logs-content/components/post/index.marko

@@ -1,6 +1,8 @@
-<div if(!state.removed) class=["post", component.kindClass("post-type"), state.multipart ? "multipart" : null]>
+<div if(!state.removed) class=["post", component.kindClass("pk-"), state.multipart ? "multipart" : null, state.anchored ? "anchored" : null, state.dark ? "dark" : null]>
+  <a class="anchor" id=input.post.id />  
   <div class="post-meta-row">
     <div class="options color-menu">
+      <a on-click("link") href=("#" + input.post.id) class="color-menu">Link</a>
       <if-permitted user=input.user permission="post.move">
         <a on-click("move", -1, true)>Up</a>
         <a on-click("move", +1, true)>Down</a>
@@ -13,22 +15,22 @@
       </if-permitted>
     </div>
     <post-meta kind="timestamp" value=input.post.time />
-    <post-meta kind="nick" value=input.post.nick />
+    <post-meta kind="nick" class=("pk-"+input.post.kind) value=input.post.nick />
   </div>
   <div if(input.post.kind.startsWith("annotation.")) class="post-body" >
     <annotation level=(input.post.kind.substring(11))>
-      <markdown class="post-content" source=state.text />
+      <irc-caret-notation class="post-content" source=state.text />
     </annotation>
   </div>
   <div if(input.post.kind === "scene") class="post-body color-text">
-    <markdown class="post-content post-scene" source=state.text />
+    <irc-caret-notation class="post-content post-scene" source=state.text />
   </div>
   <div if(input.post.kind === "action") class="post-body color-text">
-    $ const prefix = (!state.multipart ? state.shortName + state.nameSuffix + " " : "");
-    <markdown class="post-content post-action" source=(prefix + state.text) />
+    $ const prefix = ((!state.multipart || state.prevWasText) ? state.shortName + state.nameSuffix + " " : "");
+    <irc-caret-notation class="post-content post-action" source=(prefix + state.text) />
   </div>
   <div if(input.post.kind === "text") class="post-body color-text">
-    <markdown class="post-content post-text" source=state.text />
+    <irc-caret-notation class="post-content post-text" source=state.text />
   </div>
   <remove-post-modal enabled=(state.modal === "remove") post=input.post on-close("close") on-remove("remove") />
   <edit-post-modal enabled=(state.modal === "edit") post=input.post on-close("close") on-edited("edited") />

marko/page/logs-content/components/post/style.less

@@ -1,11 +1,23 @@
 div.post {
-  margin-bottom: 1ch;
+  margin-top: 1em;
+  margin-bottom: 1.25em;
+  margin-left: -12px;
+  padding-left: 12px;
+  padding-right: 0.5ch;
+
+  transition: background-color 0.333s linear;
 
   div.post-meta-row {
     padding: 0;
     margin: 0;
   }
 
+  a.anchor {
+    display: block;
+    position: relative;
+    top: -4em;
+  }
+
   div.options {
     position: absolute;
     text-align: right;
@@ -24,6 +36,10 @@ div.post {
     a:hover {
       opacity: 1;
     }
+
+    @media screen and (max-width: 700px) {
+      width: calc(100% - 6.5ch);
+    }
   }
 
   div.post-body {
@@ -48,15 +64,76 @@ div.post {
     div.annotation {
       margin-top: 0.33em;
     }
+
+    p {
+      line-height: 1.33em;
+      margin-bottom: -0.25em;
+
+      span.icn-bold      { font-weight: 800; }
+      span.icn-underline { text-decoration: underline; }
+      span.icn-italic    { font-style: italic; }
+
+      span.icn-fg-0  { color: #fff; }
+      span.icn-fg-1  { color: #111; }
+      span.icn-fg-2  { color: #13d; }
+      span.icn-fg-3  { color: #173; }
+      span.icn-fg-4  { color: #d21; }
+      span.icn-fg-5  { color: #721; }
+      span.icn-fg-6  { color: #727; }
+      span.icn-fg-7  { color: #d71; }
+      span.icn-fg-8  { color: #aa1; }
+      span.icn-fg-9  { color: #1d3; }
+      span.icn-fg-10 { color: #177; }
+      span.icn-fg-11 { color: #1DD; }
+      span.icn-fg-12 { color: #127; }
+      span.icn-fg-13 { color: #c1a; }
+      span.icn-fg-14 { color: #444; }
+      span.icn-fg-15 { color: #aaa; }
+      span.icn-bg-0  { background-color: #fff; }
+      span.icn-bg-1  { background-color: #111; }
+      span.icn-bg-2  { background-color: #13d; }
+      span.icn-bg-3  { background-color: #173; }
+      span.icn-bg-4  { background-color: #d21; }
+      span.icn-bg-5  { background-color: #721; }
+      span.icn-bg-6  { background-color: #727; }
+      span.icn-bg-7  { background-color: #d71; }
+      span.icn-bg-8  { background-color: #aa1; }
+      span.icn-bg-9  { background-color: #1d3; }
+      span.icn-bg-10 { background-color: #177; }
+      span.icn-bg-11 { background-color: #1DD; }
+      span.icn-bg-12 { background-color: #127; }
+      span.icn-bg-13 { background-color: #c1a; }
+      span.icn-bg-14 { background-color: #444; }
+      span.icn-bg-15 { background-color: #aaa; }
     }
-  div.post-body p:first-of-type {
+    p:first-of-type {
       margin-top: 0;
       padding-top: 0;
     }
+    p:last-of-type {
+      padding-bottom: 0.1em;
+      margin-bottom: 0em;
+    }
+  } 
+}
+
+div.post.pk-scene {
+  margin-left: -14px;
+  border-left: 2px solid #68A;
+}
+
+div.post.pk-scene.anchored {
+  background-color: rgba(102, 136, 170, 0.25);
+}
+div.post.pk-action.anchored {
+  background-color: rgba(170, 102, 68, 0.25);
+} 
+div.post.pk-text.anchored {
+  background-color: rgba(170, 170, 170, 0.25);
 }
 
 div.post.multipart {
-  margin-top: -1.25em;
+  margin-top: -1.5em;
 
   div.post-meta {
     span {
@@ -64,3 +141,7 @@ div.post.multipart {
     }
   }
 }
+
+div.post.dark {
+  opacity: 0.25;
+}

marko/page/logs/components/filter-menu/component.js

@@ -49,9 +49,9 @@ module.exports = class {
 
     const search = this.state.search.toLocaleLowerCase()
 
-    this.state.characters = input.characters.filter(c => !this.state.activeMap.characters[c.id]).filter(c => this.matches(c.name, search)).sort((a,b) => a.name.localeCompare(b.name))
-    this.state.channels = input.channels.filter(c => !this.state.activeMap.channels[c.name]).filter(c => this.matches(c.name, search)).sort((a,b) => a.name.localeCompare(b.name))
-    this.state.eventNames = input.eventNames.filter(e => !this.state.activeMap.events[e]).filter(e => this.matches(e, search)).sort((a,b) => a.localeCompare(b))
+    this.state.characters = input.characters.filter(c => !this.state.activeMap.characters[c.id]).filter(c => this.matches(c.name, search)).sort((a,b) => compareFilters(a.name, b.name, search))
+    this.state.channels = input.channels.filter(c => !this.state.activeMap.channels[c.name]).filter(c => this.matches(c.name, search)).sort((a,b) => compareFilters(a.name, b.name, search))
+    this.state.eventNames = input.eventNames.filter(e => !this.state.activeMap.events[e]).filter(e => this.matches(e, search)).sort((a,b) => compareFilters(a, b, search))
   }
 
   updateActive({filter, characters, channels, eventNames}) {
@@ -127,3 +127,28 @@ module.exports = class {
     return str.toLowerCase().indexOf(search) !== -1
   }
 }
+
+/**
+ * 
+ * @param {string} a 
+ * @param {string} b 
+ * @param {string} search 
+ */
+function compareFilters(a, b, search) {
+  if (search != "") {
+    if (search.charAt(0) != "#" && a.charAt(0) == "#" && b.charAt(0) == "#") {
+      search = '#' + search
+    }
+
+    const aStarts = a.toLocaleLowerCase().startsWith(search)
+    const bStarts = b.toLocaleLowerCase().startsWith(search)
+  
+    if (aStarts && !bStarts) {
+      return -1
+    } else if (bStarts && !aStarts) {
+      return 1
+    }
+  }
+
+  return a.localeCompare(b)
+}

marko/page/logs/components/import-log-modal/component.js

@@ -0,0 +1,83 @@
+const {tz} = require("moment-timezone")
+
+const {logsApi} = require("../../../../../rpdata/api/Log")
+
+module.exports = class {
+  onCreate(input) {
+    this.state = {
+      error: null,
+      loading: false,
+      imported: null,
+      values: {
+        importer: "MircLike",
+        timezone: tz.guess() || "UTC",
+        channelName: "",
+        date: "",
+        data: "",
+      },
+      timezones: tz.names(),
+    }
+
+    this.first = false
+  }
+
+  change(key, ev) {
+    this.state.values[key] = ev.target.value
+    this.state.values = Object.assign({}, this.state.values)
+  }
+
+  open() {
+    this.state.loading = false
+  }
+
+  close() {
+    this.emit("close")
+
+    this.state.values = {
+      importer: "MircLike",
+      timezone: tz.guess() || "UTC",
+      channelName: "",
+      date: "",
+      data: "",
+    }
+    this.state.imported = null
+    this.state.loading = false
+  }
+
+  save() {
+    if (this.state.loading) {
+      return
+    }
+    this.state.error = null;
+
+    const input = Object.assign({}, this.state.values)
+    if (input.date != "" && input.importer !== "ForumLog") {
+      input.date = new Date(input.date)
+      if (Number.isNaN(input.date)) {
+        this.state.error = "Invalid date"
+        return
+      }
+    } else if (input.importer === "MircLike") {
+      this.state.error = "Date is required for mIRC-like logs"
+      return
+    } else {
+      input.date = null;
+    }
+
+    if (input.channelName.length < 2 || input.channelName.includes(" ") || input.channelName.includes(" ") || input.channelName.charAt(0) !== "#") {
+      this.state.error = "A valid channelName name is required"
+      return
+    }
+
+    this.state.loading = true
+    logsApi.import(input).then(logs => {
+      this.state.imported = logs
+    }).catch(errs => {
+      console.warn("Import failed:", errs)
+
+      this.state.error = "Import failed: " + errs[0].message
+    }).then(() => {
+      this.state.loading = false
+    })
+  }
+}

marko/page/logs/components/import-log-modal/index.marko

@@ -0,0 +1,44 @@
+import moment from "moment"
+
+<modal class="modal color-text nolabel" key="modal" enabled=(input.enabled) closable on-close("close") on-open("open") >
+  <if(state.imported == null)>
+    <h1>Import Log</h1>
+
+    <p key="error" class="color-error">${state.error}</p>
+
+    <label>Type</label>
+    <select key="importer" autofocus class="big" placeholder="Kind" on-change("change", "importer") value=state.values.importer>
+      <option value="MircLike" selected=(state.values.importer === "MircLike")>mIRC-Like log</option>
+      <option value="ForumLog" selected=(state.values.importer === "ForumLog")>Forum Log</option>
+    </select>
+
+    <label>Timezone</label>
+    <select key="timezone" class="big" placeholder="Kind" on-change("change", "timezone") value=state.values.timezone>
+      <option for(tz in state.timezones) value=tz selected=(state.values.timezone === tz)>${tz}</option>
+    </select>
+
+    <label>Channel</label>
+    <input key="channelName" placeholder="(Required)" class="big" on-change("change", "channelName") value=state.values.channelName />
+
+    <if(state.values.importer === "MircLike")>
+      <label>Date</label>
+      <input key="date" class="big" placeholder="(Required)" on-change("change", "date") value=state.values.date />
+    </if>
+
+    <label>Content</label>
+    <textarea key="data" placeholder="(Required)" class="tall" on-change("change", "data") value=state.values.data />
+
+    <button disabled=state.loading on-click("save")>Import</button>
+  </if>
+  <else>
+    <h1>Import Successful</h1>
+
+    <p>The following logs were imported.</p>
+
+    <ol class="imported-log-list">
+      <for (log in state.imported)>
+        <li><a class="color-primary" href=("/logs/" + log.id)>${log.id} (${moment(log.date).format("MMMM D, YYYY")})</a></li>
+      </for>
+    </ol>
+  </else>
+</modal>

marko/page/logs/components/import-log-modal/style.less

@@ -0,0 +1,9 @@
+ol.imported-log-list {
+  color: #777;
+
+  li {
+    a:hover {
+      text-decoration: underline;
+    }
+  }
+}

marko/page/logs/components/logs-menu/index.marko

@@ -3,5 +3,6 @@
   <menu-link key="logs" selected=(input.selected.index && !state.filtered) icon="L" href="/logs/">All</menu-link>
   <if-permitted key="if-permitted" user=input.user permission="log.add">
     <menu-link key="add_log" dark on-click("select", "log.add") icon="+">Add Log</menu-link>
+    <menu-link key="import_log" dark on-click("select", "log.import") icon="+">Import Log</menu-link>
   </if-permitted>
 </menu>

marko/page/logs/components/page/component.js

@@ -24,11 +24,12 @@ module.exports = class {
       } else {
         this.state.filter = Object.assign({}, this.state.filter, {search: null})
       }
-
     } else {
       this.state.filter = Object.assign({}, this.state.filter, {[type]: (this.state.filter[type] || []).filter(f => f !== filter).concat(filter)})
     }
 
+    this.state.filter = Object.assign({}, this.state.filter, {limit: 0})    
+
     this.updateQuery(this.state.filter)
 
     this.refresh()
@@ -67,6 +68,9 @@ module.exports = class {
     if (filter.search) {
       queries.push("search=" + encodeURIComponent(filter.search))
     }
+    if (filter.limit != null) {
+      queries.push("limit=" + encodeURIComponent(filter.limit.toString()))
+    }
 
     if (queries.length > 0) {
       history.replaceState("", "", `/logs/?${queries.join("&")}`)
@@ -75,6 +79,13 @@ module.exports = class {
     }
   }
 
+  clearLimit() {
+    this.state.filter = Object.assign({}, this.state.filter, {limit: 0})
+
+    this.refresh()
+    this.updateQuery(this.state.filter)
+  }
+
   refresh() {
     logHeaderApi.list(this.state.filter).then(logs => {
       this.state.logs = logs

marko/page/logs/components/page/index.marko

@@ -1,7 +1,13 @@
 <background src="/assets/images/bg.png" opacity=0.25 />
 <logs-menu key="menu" on-select("open") selected=(input.selected || {}) user=input.user filter=state.filter characters=input.characters />
 <filter-menu on-add("addFilter") on-remove("removeFilter") filter=state.filter characters=input.characters channels=input.channels eventNames=input.eventNames />
-<main class="with-right">
+<main class="logs-page with-right">
   <logs-table logs=state.logs on-addfilter("addFilter") />
+  <if(state.filter.limit > 0)>
+    <div class="show-more-button" on-click("clearLimit")>
+      <span>Show All</span>
+    </div>
+  </if>
 </main>
 <add-log-modal enabled=(state.modal === "log.add") on-close("close") />
+<import-log-modal enabled=(state.modal === "log.import") on-close("close") />

marko/page/logs/components/page/style.less

@@ -0,0 +1,17 @@
+main.logs-page {
+  div.show-more-button {
+    margin: 1em 0;
+    padding: 0.5em 2em;
+    font-size: 2em;
+    text-align: center;
+    user-select: none;
+
+    color: #DA1;
+  }
+
+  div.show-more-button:hover {
+    cursor: pointer;
+
+    text-decoration: underline;
+  }
+}

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

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

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

@@ -1,6 +1,6 @@
 <div class="story-chapter">
   <a class="anchor" id=input.chapter.id />
-  <h1 if(input.chapter.title) class="title color-primary">${input.chapter.title}</h1>
+  <h1 if(input.chapter.title && !input.hideTitle) class="title color-primary">${input.chapter.title}</h1>
   <div class="metadata">
     <div class="options color-menu">
       <if-permitted user=input.user author=input.chapter.author permission="chapter.edit">
@@ -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

@@ -40,9 +40,39 @@
     a:hover {
       opacity: 1;
     }
+
+    @media screen and (max-width: 700px) {
+      width: calc(100% - 6.5ch);
+    }
   }
 
   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,121 @@
+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>
+              <date utc value=input.comment.fictionalDate></date>
+            </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 utc 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 utc 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

@@ -2,6 +2,8 @@ const moment = require("moment")
 
 const {storyApi} = require("../../../../../rpdata/api/Story")
 
+const ORDINAL_REGEX = /[0-9]{1,2}(st|nd|rd|th)/g
+
 module.exports = class {
   onCreate() {
     this.state = {
@@ -45,9 +47,15 @@ module.exports = class {
     const values = this.state.values
     
     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 (values.fictionalDate) {
+      if (Number.isNaN(fictionalDate.getTime())) {
+        this.state.error = `Could not parse ${values.fictionalDate} as date.`
+        
+        const ordinal = values.fictionalDate.match(ORDINAL_REGEX)[0]
+        if (ordinal != null) {
+          this.state.error += " Try to remove the '"+ordinal.slice(-2)+"'."
+        }
+
         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/page/index.marko

@@ -12,14 +12,18 @@
         </if-permitted>
       </if>
     </div>
-    <story-tags tags=state.story.tags author=state.story.author user=(!state.removed ? input.user : null) on-select("open", "story.tags")/>
+    <story-tags tags=state.story.tags open=state.story.open author=state.story.author user=(!state.removed ? input.user : null) on-select("open", "story.tags")/>
     <annotation if(state.removed) level="error">
       <p>
         This story has been removed. Your browser has not refreshed the page yet, 
         so you can still read it (or back it up) before leaving the page.
       </p>
     </annotation>
-    <chapter for(chapter in state.story.chapters) key=chapter.id chapter=chapter user=(!state.removed ? input.user : null) on-edit("updateChapter", chapter.id) on-remove("removeChapter", chapter.id) on-move("moveChapter", chapter) />
+    <chapter for(chapter in state.story.chapters) key=chapter.id 
+             chapter=chapter 
+             user=(!state.removed ? input.user : null)
+             hideTitle=(state.story.chapters[0] === chapter && chapter.title === state.story.name)
+             on-edit("updateChapter", chapter.id) on-remove("removeChapter", chapter.id) on-move("moveChapter", chapter) />
   </div>
 
   <create-chapter-modal storyId=state.story.id enabled=(state.modal === "chapter.add") chapter=input.chapter on-close("close") on-add("addChapter") />

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-content/components/story-tags/index.marko

@@ -1,6 +1,14 @@
 <div class="story-tags">
   <a for(tag in input.tags) href=("/story/by-tag/" + tag.kind + "/" + encodeURIComponent(tag.name)) class=["tag", "color-tag-" + tag.kind.toLowerCase()]>${tag.name}</a>
+  
+  <if(input.open)>
+    <if-permitted user=input.user permission="member">
+      <a on-click("select", "edit") class="option color-menu">Manage Tags (Open)</a>
+    </if-permitted>
+  </if>
+  <else>
     <if-permitted user=input.user author=input.author permission="story.edit">
       <a on-click("select", "edit") class="option color-menu">Manage Tags</a>
     </if-permitted>
+  </else>
 </div>

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 {

middleware/locals.js

@@ -28,6 +28,7 @@ module.exports = (req, res, next) => {
     }
   }
 
+  if (["/static/", "/hax/", "/assets/"].find(p => req.path.startsWith(p)) == null) {
     if (req.user) {
       res.locals.user = {
         loggedIn: true,
@@ -39,6 +40,7 @@ module.exports = (req, res, next) => {
         loggedIn: false,
       }
     }
+  }
 
   next()
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gisle/rpdata-frontend",
-  "version": "1.0.7",
+  "version": "1.1.0",
   "description": "RPData (www.aiterp.net) frontend/proxy",
   "main": "./index.js",
   "scripts": {
@@ -25,6 +25,9 @@
     "express-http-proxy": "^1.2.0",
     "express-session": "^1.15.6",
     "graphql-query-compress": "^1.1.0",
+    "http-proxy-middleware": "^0.19.1",
+    "ip": "^1.1.5",
+    "irc-caret-notation": "^1.0.0",
     "isomorphic-fetch": "^2.2.1",
     "jsonwebtoken": "^8.3.0",
     "lasso": "^3.2.6",
@@ -37,8 +40,12 @@
     "markdown-it-regexp": "^0.4.0",
     "marko": "^4.13.8",
     "moment": "^2.22.2",
+    "moment-timezone": "^0.5.23",
     "passport": "^0.4.0",
     "passport-auth0": "^1.0.0",
     "pluralize": "^7.0.0"
+  },
+  "devDependencies": {
+    "@types/http-proxy-middleware": "^0.19.0"
   }
 }

routes/data/changes.js

@@ -0,0 +1,15 @@
+const express = require("express")
+const router = express.Router()
+
+const {changesApi} = require("../../rpdata/api/Change")
+
+const changesTemplate = require("../../marko/page/data/changes.marko")
+
+router.get("/", async(req, res) => {
+  res.markoAsync(changesTemplate, {
+    changes: changesApi.list({limit: 2000}),
+    selected: {changes: true},
+  })
+})
+
+module.exports = router

routes/graphql.js

@@ -1,3 +1,4 @@
+const proxy = require("http-proxy-middleware")
 const express = require("express")
 const jwt = require("jsonwebtoken")
 
@@ -44,6 +45,7 @@ router.post("/", (req, res) => {
   })
 })
 
+router.use("/", proxy(config.graphqlEndpoint, {ws: true}))
 
 /**
  * @param {string} user 

routes/logs/index.js

@@ -8,19 +8,26 @@ const {channelApi} = require("../../rpdata/api/Channel")
 const listTemplate = require("../../marko/page/logs/list.marko")
 
 router.get("/", async(req, res) => {
-  const filter = {limit: 0}
+  const filter = {limit: 75}
 
   if (req.query.characters) {
     filter.characters = req.query.characters.split(",")
+    filter.limit = 0
   }
   if (req.query.channels) {
     filter.channels = req.query.channels.split(",")
+    filter.limit = 0
   }
   if (req.query.events) {
     filter.events = req.query.events.split(",")
+    filter.limit = 0
   }
   if (req.query.search) {
     filter.search = req.query.search
+    filter.limit = 0
+  }
+  if (req.query.limit) {
+    filter.limit = parseInt(req.query.limit)
   }
 
   try {

rpdata/api/Change.js

@@ -0,0 +1,86 @@
+const {query} = require("../client")
+
+class Change {
+  /**
+   * @param {string} id 
+   * @param {string} model 
+   * @param {string} op 
+   * @param {string} author 
+   * @param {Date | string | number} date
+   * @param {{model:string,id:string}[]} keys '
+   * @param {{type:string, [x:string]:any}[]} objects
+   */
+  constructor(id, model, op, author, date, keys, objects) {
+    this.id = id
+    this.model = model
+    this.op = op
+    this.author = author
+    this.date = date
+    this.keys = keys
+    this.objects = objects
+  }
+
+  static fromData(data) {
+    return new Change(data.id, data.model, data.op, data.author, data.date, data.keys, data.objects)
+  }
+}
+
+class ChangesAPI {
+  /**
+   * Call `channels(filter)` query
+   * 
+   * @param {{limit:int, keys: {model:string,id:string}[]}} filter 
+   * @returns {Promise<Change[]>}
+   */
+  list(filter = null) {
+    return query(`
+      query ListChanges($filter:ChangesFilter) {
+        changes(filter:$filter) {
+          id
+          model
+          op
+          author
+          date
+          keys {
+            model
+            id
+          }
+          objects {
+            type: __typename
+            
+            ...on Character {
+              id
+              name
+            }
+
+            ...on Chapter {
+              id
+              title
+            }
+
+            ...on Story {
+              id
+              name
+            }
+
+            ...on Post {
+              id
+              time
+              nick
+            }
+
+            ...on Comment {
+              chapterId
+              characterName
+            }
+          }
+        }
+      }
+    `, {filter}).then(({changes}) => {
+       return changes.map(d => Change.fromData(d))
+    })
+  }
+}
+
+module.exports = { Change, changesApi: new ChangesAPI }
+

rpdata/api/Chapter.js

@@ -1,4 +1,5 @@
 const {query} = require("../client")
+const {Comment} = require("./Comment")
 
 class Chapter {
   /**
@@ -9,8 +10,12 @@ class Chapter {
    * @param {string | Date} createdDate 
    * @param {string | Date} fictionalDate 
    * @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/Character.js

@@ -190,6 +190,19 @@ class ChracterAPI {
        return removeCharacter
     })
   }
+
+  unknownNicks(limit = 100) {
+    return query(`
+      query UnknownNicks($limit: Int!) {
+        unknownNicks(filter: {limit: $limit}) {
+          nick
+          score
+        }
+      }
+    `, {limit}).then(({unknownNicks}) => {
+       return unknownNicks
+    })
+  }
 }
 
 module.exports = { Character, charactersApi: new ChracterAPI }

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/Log.js

@@ -1,4 +1,4 @@
-const {query} = require("../client")
+const {query, Subscription} = require("../client")
 
 const {Character} = require("./Character")
 const {Channel} = require("./Channel")
@@ -124,6 +124,53 @@ class LogAPI {
     })
   }
 
+  /**
+   * Call `importLog(input)` mutation, returns multpile logs.
+   * 
+   * @param {{importer:"MircLike"|"ForumLog", date?:Date|string|number, channel:string, timezone:string, data:string}} input 
+   * @returns {Promise<Log[]>}
+   */
+  import(input) {
+    return query(`
+      mutation ImportLog($input: LogImportInput!) {
+        importLog(input: $input) {
+          id
+          shortId
+          date
+          title
+          eventName
+          description
+          open
+          channel {
+            name
+            logged
+            hub
+            eventName
+            locationName
+          }
+          characters {
+            id
+            nicks
+            author
+            name
+            shortName
+            description
+          }
+          posts {
+            id
+            position
+            time
+            kind
+            nick
+            text
+          }
+        }
+      }
+    `, {input}, {permissions: ["log.add"]}).then(({importLog}) => {
+      return importLog.map(d => Log.fromData(d))
+    })
+  }
+
   /**
    * Call `editLog(input)` mutation, returns the id and all editable fields.
    * 
@@ -146,7 +193,6 @@ class LogAPI {
     })
   }
 
-
   /**
    * Call `removeLog(input)` mutation, returns the id
    * 
@@ -164,6 +210,48 @@ class LogAPI {
       return editLog
     })
   }
+
+  /**
+   * Subscribe to the changes.
+   * 
+   * @param {string} logId The long logId, the short one won't do.
+   */
+  subscribeChanges(logId) {
+    return new Subscription(`
+      subscription Changes($keys: [ChangeKeyInput!]!) {
+        changes(keys: $keys) {
+          id
+          model
+          op
+          author
+          listed
+          keys {
+            model
+            id
+          }
+          date
+          objects {
+            type: __typename
+            ...on Log {
+              id
+              title
+              eventName
+              description
+              open
+            }
+            ...on Post {
+              id
+              time
+              kind
+              nick
+              text
+              position
+            }
+          }
+        }
+      }
+    `, {keys: [{model: "Log", id: logId}]})
+  }
 }
 
 module.exports = { Log, logsApi: new LogAPI }

rpdata/api/LogHeader.js

@@ -27,6 +27,15 @@ class LogHeader {
     this.open = open
     this.characters = characters.map(ch => new LogHeaderCharacter(ch.id, ch.name, ch.shortName, ch.author))
   }
+
+  /**
+   * Return all characters in that log.
+   * 
+   * @param  {...string} ids Character IDs
+   */
+  findCharacters(...ids) {
+    return this.characters.filter(c => ids.includes(c.id))
+  }
 }
 
 class LogHeaderCharacter {
@@ -89,6 +98,11 @@ const logHeaderApi = {
    * @returns {Promise<LogHeader[]>}
    */
   list(filter = {}) {
+    filter = Object.assign({}, filter)
+    if (filter.limit != null && filter.limit <= 0) {
+      delete filter.limit
+    }
+
     return query(`
       query LogHeaders($filter: LogsFilter) {
         headers: logs(filter:$filter) {

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
   }
 }
 
@@ -114,6 +114,25 @@ const storyApi = {
           createdDate
           fictionalDate
           editedDate
+          canComment
+          commentMode
+          commentsLocked
+          comments {
+            id
+            subject
+            author
+            characterName
+            character {
+              id
+              name
+              author
+              description
+            }
+            fictionalDate
+            createdDate
+            editedDate
+            source
+          }
         }
       }
     }

rpdata/client.js

@@ -1,3 +1,4 @@
+const EventEmitter = require("events")
 const fetch = require("isomorphic-fetch")
 const config = require("../config")
 const compressQuery = require("graphql-query-compress")
@@ -30,4 +31,88 @@ function query(query, variables = {}, options = {}) {
   })
 }
 
-module.exports = { query }
+class Subscription extends EventEmitter {
+  constructor(query, variables) {
+    super()
+
+    this.query = query
+    this.variables = Object.assign({}, variables)
+    this.websocket = null
+    this.verboseLogging = false
+  }
+
+  connect() {
+    const baseUrl = (window.location.protocol === 'https:' ? 'wss://' : 'ws://') + window.location.host
+    let id = 1
+
+    this.websocket = new WebSocket(baseUrl + config.graphqlEndpoint, "graphql-ws")
+    
+    this.websocket.onopen = () => {
+      this.websocket.send(JSON.stringify({type: "connection_init", payload: {}}));
+      this.websocket.send(JSON.stringify({id: (id++).toFixed(0), type: "start", payload: {
+        query: this.query,
+        variables: this.variables,
+        extensions: {},
+      }}));
+
+      console.log("WS Open")
+    }
+
+    this.websocket.onmessage = (ev) => {
+      let data = {}
+      try {
+        data = JSON.parse(ev.data)
+      } catch (err) {
+        console.warn("Error", err, ev)
+        return
+      }
+
+      if (this.verboseLogging) {
+        console.log("WS Data:", data)
+      }
+
+      switch (data.type) {
+        case "connection_ack": {
+          this.emit("connect")
+          
+          break;
+        }
+
+        case "connection_error": {
+          console.warn("WS Connection Error", data.payload.message)
+          this.websocket.close()
+
+          this.emit("error", new Error(data.payload.message))
+
+          break;
+        }
+
+        case "data": {
+          if (data.payload.errors != null && data.payload.errors.length > 0) {
+            this.emit("error", data.payload.errors)
+          } else {
+            this.emit("data", data.payload.data)
+          }
+
+          break;
+        }
+      }
+    }
+
+    this.websocket.onerror = (err) => {
+      console.warn("WS Error", err)
+    }
+
+    this.websocket.onclose = () => {
+      this.emit("disconnect")
+    }
+  }
+
+  disconnect() {
+    if (this.websocket != null) {
+      this.websocket.close();
+    }
+  }
+}
+
+module.exports = { query, Subscription }

server.js

@@ -8,6 +8,9 @@ const config = require("./config")
 // Express depedencies
 const express = require("express")
 const proxy = require("express-http-proxy")
+const proxy2 = require("http-proxy-middleware")
+const ip = require("ip")
+const dns = require("dns")
 const lasso = require("lasso")
 const lassoMiddleware = require("lasso/middleware")
 const markoExpress = require("marko/express")
@@ -25,7 +28,39 @@ lasso.configure(require("./marko-config"))
 
 // Set trusted proxy
 if (config.trustedProxy != null) {
+  if (ip.isV4Format(config.trustedProxy) || ip.isV6Format(config.trustedProxy)) {
     app.set('trust proxy', config.trustedProxy)
+
+    console.log("Trusting proxy", config.trustedProxy);
+  } else {
+    let trusted = null
+
+    setInterval(() => {
+      dns.resolve4(config.trustedProxy, (err, res) => {
+        if (err != null) {
+          if (trusted === null) {
+            console.error("Failed to resolve trustedProxy hostname")
+          }
+          
+          return
+        }
+        if (res.length === 0) {
+          if (trusted === null) {
+            console.error("No results for trustedProxy hostname")
+          }
+          
+          return
+        }
+  
+        if (trusted !== res[0]) {
+          console.log("Trusting proxy", res[0], `(${config.trustedProxy})`);
+          app.set('trust proxy', res[0])
+        
+          trusted = res[0]
+        }
+      })
+    }, 1000)
+  }
 }
 
 // Apply middleware
@@ -67,11 +102,12 @@ app.use("/story/by-author/", require("./routes/story/by-author"))
 app.use("/story/tag-list/", require("./routes/story/tag-list"))
 app.use("/story/:id(S[0-9a-z]{15})/", require("./routes/story-content"))
 app.use("/logs/", require("./routes/logs"))
-app.use("/logs/:id([0-9]{4}-[0-1][0-9]-[0-3][0-9]_[0-9]{9}_[A-Za-z0-9\,\']{2,})/", require("./routes/logs-content"))
+app.use("/logs/:id([0-9]{4}-[0-1][0-9]-[0-3][0-9]_[0-9]{9}_[A-Za-z0-9\,\'\-]{2,})/", require("./routes/logs-content"))
 app.use("/logs/:id(L[0-9]{0,7})/", require("./routes/logs-content"))
 app.use("/data/", require("./routes/data"))
 app.use("/data/characters/", require("./routes/data/characters"))
 app.use("/data/channels/", require("./routes/data/channels"))
+app.use("/data/changes/", require("./routes/data/changes"))
 
 // Entry point
 app.get("/", function(req, res) {