[ekg2-commit] ekg2: jogger.c (HEAD) messages.c (HEAD) [peres]

[CVS commit]

Module name:	ekg2
Changes by:	peres	2007-05-04 15:48:18

Modified files:
	jogger.c messages.c

Log message:
Some more bot acks.

Index: jogger.c
===================================================================
RCS file: /home/cvs/ekg2/plugins/jogger/jogger.c,v
diff -d -u -r1.3 -r1.4
--- jogger.c	4 May 2007 13:25:07 -0000	1.3
+++ jogger.c	4 May 2007 13:48:18 -0000	1.4
@@ -173,8 +173,13 @@
 
 static int jogger_theme_init(void) {
 #ifndef NO_DEFAULT_THEME
+	format_add("jogger_noentry", _("%> (%1) No thread with id %2 found."), 1);
 	format_add("jogger_subscribed", _("%> (%1) The thread '%2' has been subscribed."), 1);
 	format_add("jogger_unsubscribed", _("%> (%1) The thread '%2' has been unsubscribed."), 1);
+	format_add("jogger_subscription_denied", _("%! (%1) Subscription denied because of no permission."), 1);
+	format_add("jogger_unsubscribed_earlier", _("%> (%1) The thread weren't subscribed."), 1);
+
+	format_add("jogger_published", _("%)%| (%1) Your new entry has been published as:\n\t%c%2"), 1);
 #endif
 	return 0;
 }

Index: messages.c
===================================================================
RCS file: /home/cvs/ekg2/plugins/jogger/messages.c,v
diff -d -u -r1.3 -r1.4
--- messages.c	4 May 2007 13:25:07 -0000	1.3
+++ messages.c	4 May 2007 13:48:18 -0000	1.4
@@ -47,6 +47,7 @@
 
 	"Brak uprawnień do śledzenia tego wpisu",		/* [10] */
 	"Wpis nie był śledzony",				/* [11] */
+	/* XXX: entry added */					/* [12] */
 };
 
 char *jogger_text[12];
@@ -88,7 +89,32 @@
 		return 0;
 
 	if (class == EKG_MSGCLASS_MESSAGE || class == EKG_MSGCLASS_CHAT) { /* incoming */
-			/* (un)subscription acks */
+		const char *owncf = session_get(js, "own_commentformat");
+
+		if (!xstrncmp(*msg, jogger_text[0], xstrlen(jogger_text[0]))) {
+			/* own jogger comment */
+		}
+		if (owncf && !xstrncmp(*msg, owncf, xstrlen(owncf))) {
+			/* own jogger comment (custom ack format) */
+		}
+		if (!xstrncmp(*msg, jogger_text[1], xstrlen(jogger_text[1]))) {
+			/* other jogger comment */
+		}
+		if (!xstrncmp(*msg, jogger_text[2], xstrlen(jogger_text[2]))) {
+			char *tmp;
+
+			/* XXX: [3] */
+			if ((tmp = xstrstr(*msg, jogger_text[4]))) {
+				*(tmp-1) = '\0';
+				print("jogger_noentry", session_name(js), *msg+xstrlen(jogger_text[2])+1);
+				*(tmp-1) = ' ';
+				return -1;
+			}
+		}
+		if (!xstrncmp(*msg, jogger_text[5], xstrlen(jogger_text[5]))) {
+			print("jogger_published", session_name(js), *msg+xstrlen(jogger_text[5])+1);
+			return -1;
+		}
 		if (!xstrncmp(*msg, jogger_text[7], xstrlen(jogger_text[7]))) {
 			char *tmp;
 
@@ -96,14 +122,23 @@
 				*(tmp-1) = '\0';
 				print("jogger_unsubscribed", session_name(js), *msg+xstrlen(jogger_text[7])+1);
 				*(tmp-1) = ' ';
-				return -1; /* cut off */
-			} else if ((tmp = xstrstr(*msg, jogger_text[9]))) {
+				return -1;
+			}
+			if ((tmp = xstrstr(*msg, jogger_text[9]))) {
 				*(tmp-1) = '\0';
 				print("jogger_subscribed", session_name(js), *msg+xstrlen(jogger_text[7])+1);
 				*(tmp-1) = ' ';
-				return -1; /* cut off */
+				return -1;
 			}
 		}
+		if (!xstrncmp(*msg, jogger_text[10], xstrlen(jogger_text[10]))) {
+			print("jogger_subscription_denied", session_name(js));
+			return -1;
+		}
+		if (!xstrncmp(*msg, jogger_text[11], xstrlen(jogger_text[11]))) {
+			print("jogger_unsubscribed_earlier", session_name(js));
+			return -1;
+		}
 	} else if (class == EKG_MSGCLASS_SENT || class == EKG_MSGCLASS_SENT_CHAT) { /* outgoing */
 	}