Compare commits

...
4 Commits
Author SHA1 Message Date
gisle fe44300c0a fix date wonk
continuous-integration/drone/push Build is passing
2022-11-16 18:36:05 +01:00
gisle 2c7ba6df1d Merge branch 'master' of ssh+git://git.aiterp.net/rpdata/frontend
continuous-integration/drone/push Build is passing
2021-04-24 12:07:05 +02:00
gisle 283ffc64b2 Fix displaying of character hint posts. 2021-04-24 12:06:59 +02:00
gisle 2486c98da7 add support for trustedProxy GATEWAY to determine automatically from gateway. That's useful in docker where an nginx on the host is not always on a known ip.
continuous-integration/drone/push Build is passing
2021-04-02 15:04:28 +02:00
5 changed files with 13 additions and 3 deletions
@@ -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 = ""
}
+7 -2
View File
@@ -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))