Merge pull request #39 from hoytech/master

pull[bot] · web-flow · commit bf64d96ed15e · 2026-03-01T06:56:09.000Z
[pull] master from hoytech:master
diff --git a/CHANGES b/CHANGES
@@ -13,6 +13,9 @@ NEXT
   * Improvement to config file inline docs (n7ekb)
   * Added a new deployment script: `scripts/idempotent-vps-deploy.sh` (chr15m)
   * Better error reporting/handling when strfry.conf is malformed.
+  * Print ANSI strfry logo when strfry is run with no arguments.
+    Artwork thanks to Zen GT.
+  * Serve a strfry logo for /favicon.ico
 
 1.0.4
   * New config: maxReqFilterSize. This allows REQs with many more filters (jb55)
diff --git a/golpe b/golpe
@@ -1 +1 @@
-Subproject commit 198d8883d863c0bfb9415af3e3449c652fcc5625
+Subproject commit cb65fc443eb190b880abe66705eb076842f34e6c
diff --git a/src/apps/relay/Favicon.h b/src/apps/relay/Favicon.h
diff --git a/src/apps/relay/RelayWebsocket.cpp b/src/apps/relay/RelayWebsocket.cpp
@@ -2,16 +2,18 @@
 
 #include "StrfryTemplates.h"
 #include "app_git_version.h"
+#include "Favicon.h"
 
 
 
-static std::string preGenerateHttpResponse(const std::string &contentType, const std::string &content) {
+static std::string preGenerateHttpResponse(const std::string &contentType, const std::string &content, const std::string &extraHeaders = "") {
     std::string output = "HTTP/1.1 200 OK\r\n";
     output += std::string("Content-Type: ") + contentType + "\r\n";
     output += "Access-Control-Allow-Origin: *\r\n";
     output += "Connection: keep-alive\r\n";
     output += "Server: strfry\r\n";
     output += std::string("Content-Length: ") + std::to_string(content.size()) + "\r\n";
+    output += extraHeaders;
     output += "\r\n";
     output += content;
     return output;
@@ -174,6 +176,8 @@ void RelayServer::runWebsocket(ThreadPool<MsgWebsocket>::Thread &thr) {
         return std::string_view(rendered); // memory only valid until next call
     };
 
+    std::string faviconResponse = preGenerateHttpResponse("image/x-icon", favicon(), "Cache-Control: public, max-age=31536000\r\n");
+
 
     {
         int extensionOptions = 0;
@@ -202,6 +206,8 @@ void RelayServer::runWebsocket(ThreadPool<MsgWebsocket>::Thread &thr) {
         } else if (url == "/nodeinfo/2.1") {
             auto nodeInfo = getNodeInfo21HttpResponse();
             res->write(nodeInfo.data(), nodeInfo.size());
+        } else if (url == "/favicon.ico") {
+            res->write(faviconResponse.data(), faviconResponse.size());
         } else if (req.getHeader("accept").toStringView() == "application/nostr+json") {
             auto info = getServerInfoHttpResponse();
             res->write(info.data(), info.size());
diff --git a/src/apps/relay/cmd_relay.cpp b/src/apps/relay/cmd_relay.cpp
@@ -76,8 +76,12 @@ void RelayServer::run() {
     configFileChangeWatcher.setDebounce(100);
 
     configFileChangeWatcher.run([&](){
-        loadConfig(configFile);
-        checkConfig();
+        try {
+            loadConfig(configFile);
+            checkConfig();
+        } catch (std::exception &e) {
+            LE << "Error parsing config file, continuing with previous config: " << e.what();
+        }
     });
 
 
diff --git a/src/tmpls/landing.tmpl b/src/tmpls/landing.tmpl
@@ -102,6 +102,7 @@
                 padding: 8px 5px 8px 5px;
             }
         </style>
+        <link rel="icon" href="/favicon.ico" type="image/x-icon">
     </head>
 
     <body>

Original file line number	Diff line number	Diff line change
`@@ -102,6 +102,7 @@`
`102`	`102`	`padding: 8px 5px 8px 5px;`
`103`	`103`	`}`
`104`	`104`	`</style>`
	`105`	`+ <link rel="icon" href="/favicon.ico" type="image/x-icon">`
`105`	`106`	`</head>`
`106`	`107`
`107`	`108`	`<body>`