Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
fe44300c0a | ||
|
|
2c7ba6df1d | ||
|
|
283ffc64b2 | ||
|
|
2486c98da7 | ||
|
|
5955e6a71e | ||
|
|
59a711f150 |
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -31,7 +31,7 @@ module.exports = class {
|
||||
|
||||
let fictionalDate = new Date(comment.fictionalDate)
|
||||
if (comment.fictionalDate && !Number.isNaN(fictionalDate.getTime()) && fictionalDate.getTime() !== 0) {
|
||||
fictionalDate = moment(fictionalDate).format("MMM D, YYYY")
|
||||
fictionalDate = moment.utc(fictionalDate).format("MMM D, YYYY")
|
||||
} else {
|
||||
fictionalDate = ""
|
||||
}
|
||||
|
||||
Generated
+7524
-24
File diff suppressed because it is too large
Load Diff
@@ -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))
|
||||
|
||||
Reference in New Issue
Block a user