Lomanic/bibliogram
1
0
Fork 0
mirror of https://git.sr.ht/~cadence/bibliogram synced 2024-11-22 08:07:30 +00:00
Code Issues Releases Wiki Activity

Slightly improve blocked detection

Browse Source
This commit is contained in:
Cadence Ember 2020-05-20 03:54:22 +12:00
parent ca1c965021
commit 8c8808e1dc
No known key found for this signature in database
GPG Key ID: 128B99B1B74A6412
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/lib/structures/AssistantSwitcher.js
View File

@ -16,6 +16,12 @@ class AssistantSwitcher {
return this.assistants.filter(assistant => assistant.available()).sort((a, b) => (a.lastRequest - b.lastRequest)) return this.assistants.filter(assistant => assistant.available()).sort((a, b) => (a.lastRequest - b.lastRequest))
} }
displaySomeUnblocked() {
return this.assistants.some(assistant =>
[constants.symbols.assistant_statuses.NONE, constants.symbols.assistant_statuses.OK].includes(assistant.lastRequestStatus)
)
}
requestUser(username) { requestUser(username) {
return new Promise(async (resolve, reject) => { return new Promise(async (resolve, reject) => {
const assistants = this.getAvailableAssistants() const assistants = this.getAvailableAssistants()

4
src/site/api/routes.js
View File

@ -1,6 +1,6 @@
const constants = require("../../lib/constants") const constants = require("../../lib/constants")
const switcher = require("../../lib/utils/torswitcher") const switcher = require("../../lib/utils/torswitcher")
const {fetchUser, getOrFetchShortcode, userRequestCache, history} = require("../../lib/collectors") const {fetchUser, getOrFetchShortcode, userRequestCache, history, assistantSwitcher} = require("../../lib/collectors")
const {render, redirect, getStaticURL} = require("pinski/plugins") const {render, redirect, getStaticURL} = require("pinski/plugins")
const {pugCache} = require("../passthrough") const {pugCache} = require("../passthrough")
const {getSettings} = require("./utils/getsettings") const {getSettings} = require("./utils/getsettings")
@ -17,7 +17,7 @@ module.exports = [
return render(200, "pug/home.pug", { return render(200, "pug/home.pug", {
settings, settings,
rssEnabled: constants.feeds.enabled, rssEnabled: constants.feeds.enabled,
allUnblocked: history.testNoneBlocked(), allUnblocked: history.testNoneBlocked() || assistantSwitcher.displaySomeUnblocked(),
torAvailable: switcher.canUseTor(), torAvailable: switcher.canUseTor(),
hasPrivacyPolicy: constants.has_privacy_policy hasPrivacyPolicy: constants.has_privacy_policy
}) })

5
src/site/pug/home.pug
View File

@ -41,7 +41,10 @@ html
li: a(href="/privacy") Privacy policy li: a(href="/privacy") Privacy policy
else else
li Owner has not written a privacy policy li Owner has not written a privacy policy
li Instance is #{allUnblocked ? "not blocked" : "blocked"} if allUnblocked
li Instance is not blocked
else
li: a(href="https://github.com/cloudrac3r/bibliogram/wiki/Rate-limits#working-around") Instance is partially blocked
li RSS feeds are #{rssEnabled ? "enabled" : "disabled"} li RSS feeds are #{rssEnabled ? "enabled" : "disabled"}
h2 External links h2 External links