Merge branch 'master' of ssh+git://git.aiterp.net/rpdata/frontend

marko/components/content-list-item/index.marko

@@ -2,7 +2,7 @@
   <td class="icon color-highlight-primary">${input.icon}</td>
   <td class="content color-primary color-highlight-dark">
     <div class="title">
-      <a class="color-primary" href=input.link>${input.name}</a>
+      <a class="color-primary" href=input.link>${input.name || "(Untitled)"}</a>
     </div>
     <div if(input.description) class="description color-text">
       <div class="content">${input.description}</div>
@@ -20,4 +20,4 @@
       <item-meta kind="author" value=input.author />
     </div>
   </td>
-</tr>
+</tr>

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

@@ -3,7 +3,6 @@
   <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>
-  <menu-link key="files" selected=input.selected.files icon="F" href="/data/files/">Files</menu-link>
   <if-permitted user=input.user permission=["member", "character.add", "channel.add", "file.add"]>
     <menu-gap />
     <menu-header>Add</menu-header>
@@ -13,8 +12,5 @@
     <if-permitted key="channels_add" user=input.user permission="channel.add">
       <menu-link dark icon="+" on-click("emit", "open", "channel.add")>Channel</menu-link>
     </if-permitted>
-    <if-permitted key="files_add" user=input.user permission=["file.add", "member"]>
-      <menu-link dark icon="+" on-click("emit", "open", "file.add")>File</menu-link>
-    </if-permitted>
   </if-permitted>
 </menu>

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

@@ -14,6 +14,7 @@
     <option value="annotation.info" selected=(state.values.kind === "annotation.info")>Annotation - Info</option>
     <option value="annotation.warning" selected=(state.values.kind === "annotation.warning")>Annotation - Warning</option>
     <option value="annotation.error" selected=(state.values.kind === "annotation.error")>Annotation - Error</option>
+    <option value="chars" selected=(state.values.kind === "chars")>Character Hints</option>
   </select>
 
   <label>Nick</label>

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

@@ -14,6 +14,7 @@
     <option value="annotation.info" selected=(state.values.kind === "annotation.info")>Annotation - Info</option>
     <option value="annotation.warning" selected=(state.values.kind === "annotation.warning")>Annotation - Warning</option>
     <option value="annotation.error" selected=(state.values.kind === "annotation.error")>Annotation - Error</option>
+    <option value="chars" selected=(state.values.kind === "chars")>Character Hints</option>
   </select>
 
   <label>Nick</label>

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

@@ -22,6 +22,9 @@
       <irc-caret-notation class="post-content" source=state.text />
     </annotation>
   </div>
+  <div if(input.post.kind === "chars") class="post-body color-menu" >
+    <p><em>Character hint: ${input.post.text}</em></p>
+  </div>
   <div if(input.post.kind === "scene") class="post-body color-text">
     <irc-caret-notation class="post-content post-scene" source=state.text />
   </div>

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

@@ -14,6 +14,7 @@ module.exports = class {
         channelName: "",
         date: "",
         data: "",
+        sessionThresholdHours: 12,
       },
       timezones: tz.names(),
     }
@@ -58,12 +59,24 @@ module.exports = class {
         return
       }
     } else if (input.importer === "MircLike") {
-      this.state.error = "Date is required for mIRC-like logs"
+      this.state.error = "Date is required for mIRC-like logs."
       return
     } else {
       input.date = null;
     }
 
+    if (input.importer === "IRCCloudLog") {
+      const hours = parseFloat(input.sessionThresholdHours)
+      if (Number.isNaN(hours)) {
+        this.state.error = "The session change threshold must be a number."
+        return
+      }
+
+      input.sessionThresholdMs = Math.floor(hours * 3600000)
+    }
+
+    delete input.sessionThresholdHours
+
     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

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

@@ -10,6 +10,7 @@ import moment from "moment"
     <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>
+      <option value="IrcCloud" selected=(state.values.importer === "IrcCloud")>IRCCloud log export</option>
     </select>
 
     <label>Timezone</label>
@@ -25,6 +26,11 @@ import moment from "moment"
       <input key="date" class="big" placeholder="(Required)" on-change("change", "date") value=state.values.date />
     </if>
 
+    <if(state.values.importer === "IrcCloud")>
+      <label>Session Change Threshold (Hours)</label>
+      <input key="sessionThreshold" class="big" placeholder="(Required)" on-change("change", "sessionThresholdHours") value=state.values.sessionThresholdHours />
+    </if>
+
     <label>Content</label>
     <textarea key="data" placeholder="(Required)" class="tall" on-change("change", "data") value=state.values.data />
 

server.js

@@ -28,7 +28,12 @@ lasso.configure(require("./marko-config"))
 
 // Set trusted proxy
 if (config.trustedProxy != null) {
-  if (ip.isV4Format(config.trustedProxy) || ip.isV6Format(config.trustedProxy)) {
+  if (config.trustedProxy === "GATEWAY") {
+    const ip = require("child_process").execSync("/sbin/ip route|awk '/default/ { print $3 }'").toString().trim()
+    app.set('trust proxy', ip)
+
+    console.log("Trusting proxy from default gateway", ip);
+  } else if (ip.isV4Format(config.trustedProxy) || ip.isV6Format(config.trustedProxy)) {
     app.set('trust proxy', config.trustedProxy)
 
     console.log("Trusting proxy", config.trustedProxy);
@@ -128,4 +133,4 @@ app.listen(config.port, function() {
 
 // Handle shutdown signals (Docker needs this to shutdown quickly)
 process.on('SIGINT', () => process.exit(0))
-process.on('SIGTERM', () => process.exit(0))
+process.on('SIGTERM', () => process.exit(0))