Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
01b501f9e5 | ||
|
|
9b7d182955 | ||
|
|
7c55fc03aa |
+11
-9
@@ -28,15 +28,17 @@ module.exports = (req, res, next) => {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (req.user) {
|
if (["/static/", "/hax/", "/assets/"].find(p => req.path.startsWith(p)) == null) {
|
||||||
res.locals.user = {
|
if (req.user) {
|
||||||
loggedIn: true,
|
res.locals.user = {
|
||||||
name: req.user._json.name,
|
loggedIn: true,
|
||||||
permissions: getPermissions(req.user._json.name),
|
name: req.user._json.name,
|
||||||
}
|
permissions: getPermissions(req.user._json.name),
|
||||||
} else {
|
}
|
||||||
res.locals.user = {
|
} else {
|
||||||
loggedIn: false,
|
res.locals.user = {
|
||||||
|
loggedIn: false,
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -89,6 +89,11 @@ const logHeaderApi = {
|
|||||||
* @returns {Promise<LogHeader[]>}
|
* @returns {Promise<LogHeader[]>}
|
||||||
*/
|
*/
|
||||||
list(filter = {}) {
|
list(filter = {}) {
|
||||||
|
filter = Object.assign({}, filter)
|
||||||
|
if (filter.limit != null && filter.limit <= 0) {
|
||||||
|
delete filter.limit
|
||||||
|
}
|
||||||
|
|
||||||
return query(`
|
return query(`
|
||||||
query LogHeaders($filter: LogsFilter) {
|
query LogHeaders($filter: LogsFilter) {
|
||||||
headers: logs(filter:$filter) {
|
headers: logs(filter:$filter) {
|
||||||
|
|||||||
@@ -102,7 +102,7 @@ app.use("/story/by-author/", require("./routes/story/by-author"))
|
|||||||
app.use("/story/tag-list/", require("./routes/story/tag-list"))
|
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("/story/:id(S[0-9a-z]{15})/", require("./routes/story-content"))
|
||||||
app.use("/logs/", require("./routes/logs"))
|
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("/logs/:id(L[0-9]{0,7})/", require("./routes/logs-content"))
|
||||||
app.use("/data/", require("./routes/data"))
|
app.use("/data/", require("./routes/data"))
|
||||||
app.use("/data/characters/", require("./routes/data/characters"))
|
app.use("/data/characters/", require("./routes/data/characters"))
|
||||||
|
|||||||
Reference in New Issue
Block a user