summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--contexts.c29
-rw-r--r--server.h4
2 files changed, 33 insertions, 0 deletions
diff --git a/contexts.c b/contexts.c
index b486ef9..6ed9223 100644
--- a/contexts.c
+++ b/contexts.c
@@ -25,6 +25,14 @@
 bool contextsPublic;
 int contextsRecent = 500;
 
+const char *ContextsMOTDQuery = SQL(
+	SELECT motd
+	FROM motds
+	WHERE network = :network
+	ORDER BY time DESC
+	LIMIT 1;
+);
+
 const char *ContextsQuery = SQL(
 	WITH recentEvents AS (
 		SELECT time, context
@@ -112,5 +120,26 @@ enum kcgi_err contextsPage(struct kreq *req) {
 		if (error) return error;
 	}
 	if (result != SQLITE_DONE) errx(EX_SOFTWARE, "%s", sqlite3_errmsg(db));
+
+	error = khtml_closeelem(&html, 1);
+	if (error) return error;
+
+	sqlite3_reset(stmt.contextsMOTD);
+	dbBindText(stmt.contextsMOTD, ":network", scope.network);
+
+	result = sqlite3_step(stmt.contextsMOTD);
+	if (result == SQLITE_ROW) {
+		error = 0
+			|| khtml_elem(&html, KELEM_H2)
+			|| khtml_puts(&html, "MOTD")
+			|| khtml_closeelem(&html, 1)
+			|| khtml_elem(&html, KELEM_PRE)
+			|| khtml_puts(&html, sqlite3_column_text(stmt.contextsMOTD, 0))
+			|| khtml_closeelem(&html, 1);
+		if (error) return error;
+		result = sqlite3_step(stmt.contextsMOTD);
+	}
+	if (result != SQLITE_DONE) errx(EX_SOFTWARE, "%s", sqlite3_errmsg(db));
+
 	return htmlFooter(&html) || khtml_close(&html);
 }
diff --git a/server.h b/server.h
index 45008a1..eee5419 100644
--- a/server.h
+++ b/server.h
@@ -83,6 +83,7 @@ extern int contextsRecent;
 extern bool contextsPublic;
 extern const char *NetworksQuery;
 extern const char *ContextsQuery;
+extern const char *ContextsMOTDQuery;
 enum kcgi_err networksPage(struct kreq *req);
 enum kcgi_err contextsPage(struct kreq *req);
 
@@ -100,6 +101,7 @@ extern sqlite3 *db;
 extern struct Statements {
 	sqlite3_stmt *networks;
 	sqlite3_stmt *contexts;
+	sqlite3_stmt *contextsMOTD;
 	sqlite3_stmt *eventsAfter;
 	sqlite3_stmt *eventsBefore;
 	sqlite3_stmt *search;
@@ -115,6 +117,7 @@ static inline void dbPrepare(sqlite3_stmt **stmt, const char *query) {
 static inline void dbPrepareAll(void) {
 	dbPrepare(&stmt.networks, NetworksQuery);
 	dbPrepare(&stmt.contexts, ContextsQuery);
+	dbPrepare(&stmt.contextsMOTD, ContextsMOTDQuery);
 	dbPrepare(&stmt.eventsAfter, EventsAfterQuery);
 	dbPrepare(&stmt.eventsBefore, EventsBeforeQuery);
 	dbPrepare(&stmt.search, SearchQuery);
@@ -123,6 +126,7 @@ static inline void dbPrepareAll(void) {
 static inline void dbClose(void) {
 	sqlite3_finalize(stmt.networks);
 	sqlite3_finalize(stmt.contexts);
+	sqlite3_finalize(stmt.contextsMOTD);
 	sqlite3_finalize(stmt.eventsAfter);
 	sqlite3_finalize(stmt.eventsBefore);
 	sqlite3_finalize(stmt.search);
39c3d6cd88d97bf2d28ed48200a&follow=1'>Render content into atom feedJune McEnroe And fix some atom lints. 2020-11-26Update plan with different things I won't doJune McEnroe 2020-11-19Add "Come On Petunia"June McEnroe 2020-11-13Add x4 to LESSJune McEnroe 2020-11-04Remove modified sensitivity settingsJune McEnroe 2020-10-29Remove editJune McEnroe 2020-10-27Switch gr alias back to git rebaseJune McEnroe I always type out git reset and sometimes still expect gr to be rebase... Never got used to it I guess. 2020-10-27Allow cd host: to cd to same path over sshJune McEnroe 2020-10-27Use SendEnv for cd host:pathJune McEnroe Works properly for weird paths, etc. 2020-10-27Allow cd host:path over sshJune McEnroe Requires AcceptEnv SSH_CD in the remote sshd_config. 2020-10-07Use mandoc -T utf8 for text.June McEnroe Don't depend on LANG being set. 2020-09-20Add The Awakened KingdomJune McEnroe A cute extra novella. Finally finished this series. 2020-09-12Move /opt/local back, cheat port select to use system manJune McEnroe This is not really how you're supposed to use the select system, I don't think, since the mandoc package actually creates those files, but it does work. This lets me actually use the git installed by MacPorts. 2020-09-12Move /opt/local behind /usr againJune McEnroe The reason I did this with pkgsrc was because I actually don't want the man(1) from mandoc, since it won't follow MANSECT. Same applies to MacPorts. I wish I could disable its man(1) with a variant or whatever. 2020-09-12Enable toc in cgit renderings of man pagesJune McEnroe But keep it disabled for READMEs since they always use non-standard sections and the TOC is just distracting there, I think. Also add the style so its h1 is the same size as the ones inside sections... 2020-09-11Install mandoc on macOSJune McEnroe 2020-09-11Rewrite install script yet againJune McEnroe 2020-09-11Remove NetBSD from install scriptJune McEnroe I never use it. 2020-09-11Use MacPorts rather than pkgsrcJune McEnroe My system is probably such a mess now... 2020-09-11Add debian VM name to sshJune McEnroe 2020-09-11Add influencer tweetJune McEnroe 2020-09-10Add The Kingdom of GodsJune McEnroe Reading has really slowed down :( 2020-09-07Add SunglassesJune McEnroe An IRC find. 2020-09-06Add Between the BreathsJune McEnroe One of those good songs from a soundtrack of a film that probably isn't? The summary sounds a lot more interesting than the title implies, at least. 2020-09-04Open /dev/tty in nudgeJune McEnroe This makes it work even when it's run connected to a pipe, i.e. as the notify command of catgirl... 2020-09-04Add nudgeJune McEnroe 2020-09-03Build fbclock with -lzJune McEnroe I guess this got lost somewhere, long ago... 2020-08-29Add tweets from retweetsJune McEnroe