summary refs log tree commit diff
diff options
context:
space:
mode:
authorJune McEnroe <june@causal.agency>2020-04-05 10:45:17 -0400
committerJune McEnroe <june@causal.agency>2020-04-05 10:45:17 -0400
commita8c5d13cb21ef08f7d2b5a718b5c93113dfc6448 (patch)
treedc3b606b12ebb467cd8bd464f5ee47ec463130c5
parentUpdate style (diff)
downloadlitterbox-a8c5d13cb21ef08f7d2b5a718b5c93113dfc6448.tar.gz
litterbox-a8c5d13cb21ef08f7d2b5a718b5c93113dfc6448.zip
Add Ban and Unban event types
-rw-r--r--database.h4
-rw-r--r--litterbox.c4
-rw-r--r--scoop.c18
3 files changed, 25 insertions, 1 deletions
diff --git a/database.h b/database.h
index 5893f77..c852e11 100644
--- a/database.h
+++ b/database.h
@@ -42,7 +42,9 @@ enum { DatabaseVersion = 2 };
 	X(Quit, "quit") \
 	X(Kick, "kick") \
 	X(Nick, "nick") \
-	X(Topic, "topic")
+	X(Topic, "topic") \
+	X(Ban, "ban") \
+	X(Unban, "unban")
 
 enum Type {
 #define X(id, _) id,
diff --git a/litterbox.c b/litterbox.c
index 14dd626..d0cafef 100644
--- a/litterbox.c
+++ b/litterbox.c
@@ -304,6 +304,10 @@ static void querySearch(struct Message *msg) {
 					"\3%02d%s\3 set the topic: %s\r\n",
 					color(user), nick, message
 				);
+			break; case Ban:
+				format("\3%02d%s\3 banned %s\r\n", color(user), nick, target);
+			break; case Unban:
+				format("\3%02d%s\3 unbanned %s\r\n", color(user), nick, target);
 		}
 	}
 	if (result != SQLITE_DONE) {
diff --git a/scoop.c b/scoop.c
index a1b75c7..d95a971 100644
--- a/scoop.c
+++ b/scoop.c
@@ -77,6 +77,12 @@ static void formatPlain(bool group, struct Event e) {
 		break; case Topic: {
 			printf("%s set the topic: %s\n", e.nick, e.message);
 		}
+		break; case Ban: {
+			printf("%s banned %s\n", e.nick, e.target);
+		}
+		break; case Unban: {
+			printf("%s unbanned %s\n", e.nick, e.target);
+		}
 	}
 }
 
@@ -189,6 +195,12 @@ static void formatColor(bool group, struct Event e) {
 				color(e.user), e.nick, ansi(e.message)
 			);
 		}
+		break; case Ban: {
+			printf(C "%s" O " banned %s\n", color(e.user), e.nick, e.target);
+		}
+		break; case Unban: {
+			printf(C "%s" O " unbanned %s\n", color(e.user), e.nick, e.target);
+		}
 	}
 #undef C
 #undef O
@@ -230,6 +242,12 @@ static void formatIRC(bool group, struct Event e) {
 		break; case Topic: {
 			printf("TOPIC %s :%s\r\n", e.context, e.message);
 		}
+		break; case Ban: {
+			printf("MODE %s +b %s\r\n", e.context, e.target);
+		}
+		break; case Unban: {
+			printf("MODE %s -b %s\r\n", e.context, e.target);
+		}
 	}
 }
 
f='/cgit-pink/commit/ui-shared.c?h=1.3.0&id=e23f63461f17aeb770d47d9c3134414e549d1f0e&follow=1'>ui-shared: fix broken sizeof in title setting and rewriteJason A. Donenfeld The old algorithm was totally incorrect. While we're at it, use « instead of \, since it makes more sense. Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> 2018-12-09git: update to v2.20.0Christian Hesse Update to git version v2.20.0. Required changes follow upstream commits: * 00436bf1b1c2a8fe6cf5d2c2457d419d683042f4 (archive: initialize archivers earlier) * 611e42a5980a3a9f8bb3b1b49c1abde63c7a191e (xdiff: provide a separate emit callback for hunks) Signed-off-by: Christian Hesse <mail@eworm.de> 2018-11-25ui-blame: set repo for sbJason A. Donenfeld Otherwise recent git complains and crashes with: "BUG: blame.c:1787: repo is NULL". Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> 2018-11-25auth-filter: pass url with query string attachedJason A. Donenfeld Otherwise redirections come out wrong. Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> 2018-11-21git: use xz compressed archive for downloadChristian Hesse Upstream will stop providing gz compressed source tarballs [0], so stop using them. [0] https://lists.zx2c4.com/pipermail/cgit/2018-November/004254.html Signed-off-by: Christian Hesse <mail@eworm.de> 2018-10-12git: update to v2.19.1Christian Hesse Update to git version v2.19.1. Required changes follow upstream commits: * commit: add repository argument to get_cached_commit_buffer (3ce85f7e5a41116145179f0fae2ce6d86558d099) * commit: add repository argument to lookup_commit_reference (2122f6754c93be8f02bfb5704ed96c88fc9837a8) * object: add repository argument to parse_object (109cd76dd3467bd05f8d2145b857006649741d5c) * tag: add repository argument to deref_tag (a74093da5ed601a09fa158e5ba6f6f14c1142a3e) * tag: add repository argument to lookup_tag (ce71efb713f97f476a2d2ab541a0c73f684a5db3) * tree: add repository argument to lookup_tree (f86bcc7b2ce6cad68ba1a48a528e380c6126705e) * archive.c: avoid access to the_index (b612ee202a48f129f81f8f6a5af6cf71d1a9caef) * for_each_*_object: move declarations to object-store.h (0889aae1cd18c1804ba01c1a4229e516dfb9fe9b) Signed-off-by: Christian Hesse <mail@eworm.de> 2018-09-11ui-ssdiff: ban strcat()Christian Hesse Git upstream bans strcat() with commit: banned.h: mark strcat() as banned 1b11b64b815db62f93a04242e4aed5687a448748 Signed-off-by: Christian Hesse <mail@eworm.de> 2018-09-11ui-ssdiff: ban strncpy()Christian Hesse Git upstream bans strncpy() with commit: banned.h: mark strncpy() as banned e488b7aba743d23b830d239dcc33d9ca0745a9ad Signed-off-by: Christian Hesse <mail@eworm.de> 2018-09-11ui-shared: ban strcat()Christian Hesse Git upstream bans strcat() with commit: banned.h: mark strcat() as banned 1b11b64b815db62f93a04242e4aed5687a448748 To avoid compiler warnings from gcc 8.1.x we get the hard way. Signed-off-by: Christian Hesse <mail@eworm.de> 2018-09-11ui-patch: ban sprintf()Christian Hesse Git upstream bans sprintf() with commit: banned.h: mark sprintf() as banned cc8fdaee1eeaf05d8dd55ff11f111b815f673c58 Signed-off-by: Christian Hesse <mail@eworm.de> 2018-09-11ui-log: ban strncpy()Christian Hesse Git upstream bans strncpy() with commit: banned.h: mark strncpy() as banned e488b7aba743d23b830d239dcc33d9ca0745a9ad Signed-off-by: Christian Hesse <mail@eworm.de> 2018-09-11ui-log: ban strcpy()Christian Hesse Git upstream bans strcpy() with commit: automatically ban strcpy() c8af66ab8ad7cd78557f0f9f5ef6a52fd46ee6dd Signed-off-by: Christian Hesse <mail@eworm.de> 2018-09-11parsing: ban sprintf()Christian Hesse Git upstream bans sprintf() with commit: banned.h: mark sprintf() as banned cc8fdaee1eeaf05d8dd55ff11f111b815f673c58 Signed-off-by: Christian Hesse <mail@eworm.de> 2018-09-11parsing: ban strncpy()Christian Hesse Git upstream bans strncpy() with commit: banned.h: mark strncpy() as banned e488b7aba743d23b830d239dcc33d9ca0745a9ad Signed-off-by: Christian Hesse <mail@eworm.de> 2018-08-28filters: generate anchor links from markdownChristian Hesse This makes the markdown filter generate anchor links for headings. Signed-off-by: Christian Hesse <mail@eworm.de> Tested-by: jean-christophe manciot <actionmystique@gmail.com> 2018-08-03Bump version.Jason A. Donenfeld Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> 2018-08-03clone: fix directory traversalJason A. Donenfeld This was introduced in the initial version of this code, way back when in 2008. $ curl http://127.0.0.1/cgit/repo/objects/?path=../../../../../../../../../etc/passwd root:x:0:0:root:/root:/bin/sh ... Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> Reported-by: Jann Horn <jannh@google.com> 2018-08-03config: record repo.snapshot-prefix in the per-repo configKonstantin Ryabitsev