summary refs log tree commit diff
diff options
context:
space:
mode:
authorJune McEnroe <june@causal.agency>2019-12-25 15:46:41 -0500
committerJune McEnroe <june@causal.agency>2019-12-25 15:46:41 -0500
commited99ecc2fe913fa047bc6e87cc363b60010befab (patch)
tree984c5c5912d4b1dea0046c46dffd0529b2746533
parentHandle SIGINT and SIGTERM (diff)
downloadlitterbox-ed99ecc2fe913fa047bc6e87cc363b60010befab.tar.gz
litterbox-ed99ecc2fe913fa047bc6e87cc363b60010befab.zip
Insert existing topics into the database
Not sure how to handle the 333 reply that contains the user who set the
topic and the timestamp of when it was set, since they're two separate
messages that aren't really easily correlated since there's no guarantee
that you're even going to get a 333 at all.
-rw-r--r--database.h6
-rw-r--r--litterbox.c26
2 files changed, 32 insertions, 0 deletions
diff --git a/database.h b/database.h
index 8d8c985..3d88757 100644
--- a/database.h
+++ b/database.h
@@ -218,6 +218,12 @@ static const char *InitSQL = SQL(
 		UNIQUE (network, name)
 	);
 
+	CREATE TABLE topics (
+		context INTEGER NOT NULL REFERENCES contexts,
+		time DATETIME NOT NULL,
+		topic TEXT
+	);
+
 	CREATE TABLE names (
 		name INTEGER PRIMARY KEY,
 		nick TEXT NOT NULL,
diff --git a/litterbox.c b/litterbox.c
index 181227a..964a6ea 100644
--- a/litterbox.c
+++ b/litterbox.c
@@ -29,6 +29,7 @@
 
 static struct {
 	sqlite3_stmt *context;
+	sqlite3_stmt *topic;
 	sqlite3_stmt *event;
 	sqlite3_stmt *events;
 } insert;
@@ -49,6 +50,13 @@ static void prepare(void) {
 	);
 	dbPersist(&insert.context, InsertContext);
 
+	const char *InsertTopic = SQL(
+		INSERT INTO topics (context, time, topic)
+		SELECT context, coalesce(datetime(:time), datetime('now')), :topic
+		FROM contexts WHERE network = :network AND name = :context;
+	);
+	dbPersist(&insert.topic, InsertTopic);
+
 	const char *InsertEvent = SQL(
 		INSERT INTO events (time, type, context, name, target, message)
 		SELECT
@@ -81,6 +89,7 @@ static void prepare(void) {
 
 static void bindNetwork(const char *network) {
 	dbBindTextCopy(insert.context, ":network", network);
+	dbBindTextCopy(insert.topic, ":network", network);
 	dbBindTextCopy(insert.event, ":network", network);
 	dbBindTextCopy(insert.events, ":network", network);
 }
@@ -91,6 +100,15 @@ static void insertContext(const char *context, bool query) {
 	dbRun(insert.context);
 }
 
+static void insertTopic(
+	const char *context, const char *time, const char *topic
+) {
+	dbBindText(insert.topic, ":context", context);
+	dbBindText(insert.topic, ":time", time);
+	dbBindText(insert.topic, ":topic", topic);
+	dbRun(insert.topic);
+}
+
 static void insertEvent(
 	const char *time, enum Type type, const char *context,
 	const char *nick, const char *user, const char *host,
@@ -316,6 +334,12 @@ static void handlePrivmsg(struct Message *msg) {
 	);
 }
 
+static void handleReplyTopic(struct Message *msg) {
+	require(msg, false, 2);
+	if (!strcmp(msg->cmd, "331")) msg->params[2] = NULL;
+	insertTopic(msg->params[1], msg->time, msg->params[2]);
+}
+
 static void handleReplyNames(struct Message *msg) {
 	require(msg, false, 3);
 	char *names = msg->params[3];
@@ -411,6 +435,8 @@ static const struct {
 } Handlers[] = {
 	{ "001", false, handleReplyWelcome },
 	{ "005", false, handleReplyISupport },
+	{ "331", true, handleReplyTopic },
+	{ "332", true, handleReplyTopic },
 	{ "353", true, handleReplyNames },
 	{ "CAP", false, handleCap },
 	{ "JOIN", true, handleJoin },
=enroll&id=0b429a7ccc372a3d52445ab248d1299e9abd58db&follow=1'>Define ui.c BUF_LEN with enumJune McEnroe 2018-08-07Hack clang into checking uiFmt format stringsJune McEnroe 2018-08-07Handle PART and QUIT without messagesJune McEnroe 2018-08-07Make safe filling the who bufferJune McEnroe 2018-08-07Add reverse and reset IRC formatting codesJune McEnroe 2018-08-06Rewrite line editing again, add formattingJune McEnroe 2018-08-06Fix allocation size in vaswprintfJune McEnroe This is so embarrassing. It only started crashing once it had strings that were long enough, and then it took me so long to notice this mistake. I was worried I was still doing va_list wrong somehow. 2018-08-06Implement word wrappingJune McEnroe 2018-08-06Use wchar_t strings for all of UIJune McEnroe vaswprintf is a nightmare. 2018-08-06Rename line editing functionsJune McEnroe 2018-08-05Initialize all possible color pairsJune McEnroe This is actually possible with use_default_colors! 2018-08-05Refactor color initializationJune McEnroe 2018-08-05Add ^L redrawJune McEnroe 2018-08-05Use 16 colors if availableJune McEnroe Fall back to using bold if there are only 8 colors. This also allowed bright background colors in 16-color terminals. I must port this system to torus. I'll be able to remove the awful termcap patch hack. 2018-08-05Limit parsed colors to number of mIRC colorsJune McEnroe Oh boy that's embarrassing. 2018-08-04Show source link on exitJune McEnroe 2018-08-04Implement line editing, scrollingJune McEnroe Don't really have a way to implement the M-* keys, and currently missing C-w. 2018-08-04Handle /topicJune McEnroe