aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFChannel <>2021-10-03 13:49:50 -0700
committerFChannel <>2021-10-03 13:49:50 -0700
commit4a1af2045365409a05849ab70a1ac6c9e6e51a93 (patch)
tree837e87cff016f2789ac6fd9bcc537631719030fc
parentcc4165f07a406cdd89e6a3864cac6a367f281513 (diff)
parentc1ba6f94d7a44f79ea1ef2513021f2a29aba9a3e (diff)
Merge branch 'master' into development
-rw-r--r--client.go2
-rw-r--r--main.go2
-rw-r--r--static/faq.html2
3 files changed, 3 insertions, 3 deletions
diff --git a/client.go b/client.go
index 8230765..dc3ed36 100644
--- a/client.go
+++ b/client.go
@@ -142,7 +142,7 @@ func IndexGet(w http.ResponseWriter, r *http.Request, db *sql.DB) {
data.BoardRemainer = make([]int, 0)
}
- data.InstanceIndex = GetCollectionFromReq("https://fchan.xyz/followers").Items
+ //data.InstanceIndex = GetCollectionFromReq("https://fchan.xyz/followers").Items
data.NewsItems = getNewsFromDB(db, 3)
data.Themes = &Themes
diff --git a/main.go b/main.go
index 922d74d..68d8a4f 100644
--- a/main.go
+++ b/main.go
@@ -2852,7 +2852,7 @@ func RouteImages(w http.ResponseWriter, media string) {
resp, err := client.Do(req)
- if err != nil || resp.StatusCode == 404 {
+ if err != nil || resp.StatusCode != 200 {
fileBytes, err := ioutil.ReadFile("./static/notfound.png")
CheckError(err, "could not get /static/notfound.png file bytes")
diff --git a/static/faq.html b/static/faq.html
index b9c6085..f4fb237 100644
--- a/static/faq.html
+++ b/static/faq.html
@@ -56,7 +56,7 @@
<p>Soon&trade;.</p>
<h4 id="version">What version is this FChannel instance?</h4>
- <p>v0.0.14-dev</p>
+ <p>v0.0.14-release</p>
</div>
<div style="width: 500px; margin:0 auto; margin-top: 50px; text-align: center;">
<a href="/">[Home]</a><a href="/static/rules.html">[Rules]</a><a href="/static/faq.html">[FAQ]</a>