From aede92502c4fcf759f4fa4d6965595aee645c0a8 Mon Sep 17 00:00:00 2001 From: "C. McEnroe" Date: Sun, 16 Aug 2020 15:33:47 -0400 Subject: contrib/palaver: Add no message preview flags --- contrib/palaver/notify.c | 13 +++++++++++-- contrib/palaver/pounce-palaver.1 | 10 ++++++++-- 2 files changed, 19 insertions(+), 4 deletions(-) (limited to 'contrib') diff --git a/contrib/palaver/notify.c b/contrib/palaver/notify.c index 2d2d0bb..e35dabb 100644 --- a/contrib/palaver/notify.c +++ b/contrib/palaver/notify.c @@ -527,17 +527,24 @@ static void handleReplyUnaway(struct Message *msg) { sqlite3_reset(stmts[Clear]); } +static bool noPreview; +static bool noPrivatePreview; + static void jsonBody( char *buf, size_t cap, struct Message *msg, const char *network, bool preview ) { + bool private = (msg->params[0][0] != '#'); + if (private && noPrivatePreview) preview = false; + if (noPreview) preview = false; + FILE *file = fmemopen(buf, cap, "w"); if (!file) err(EX_OSERR, "fmemopen"); fprintf(file, "{\"badge\":%d", badge); fprintf(file, ",\"sender\":"); jsonString(file, msg->nick); - if (strcmp(msg->params[0], nick)) { + if (!private) { fprintf(file, ",\"channel\":"); jsonString(file, msg->params[0]); } @@ -654,9 +661,11 @@ int main(int argc, char *argv[]) { const char *pass = NULL; const char *user = "pounce-palaver"; - for (int opt; 0 < (opt = getopt(argc, argv, "!c:d:k:p:u:vw:"));) { + for (int opt; 0 < (opt = getopt(argc, argv, "!NPc:d:k:p:u:vw:"));) { switch (opt) { break; case '!': insecure = true; + break; case 'N': noPreview = true; + break; case 'P': noPrivatePreview = true; break; case 'c': cert = optarg; break; case 'd': path = optarg; break; case 'k': priv = optarg; diff --git a/contrib/palaver/pounce-palaver.1 b/contrib/palaver/pounce-palaver.1 index 187b8ee..4f0b870 100644 --- a/contrib/palaver/pounce-palaver.1 +++ b/contrib/palaver/pounce-palaver.1 @@ -1,4 +1,4 @@ -.Dd August 11, 2020 +.Dd August 16, 2020 .Dt POUNCE-PALAVER 1 .Os . @@ -8,7 +8,7 @@ . .Sh SYNOPSIS .Nm -.Op Fl v +.Op Fl PNv .Op Fl c Ar cert .Op Fl d Ar path .Op Fl k Ar priv @@ -32,6 +32,12 @@ option must be enabled in .Pp The arguments are as follows: .Bl -tag -width Ds +.It Fl N +Never send message previews, +regardless of the app preferences. +.It Fl P +Never send message previews +for private messages. .It Fl c Ar cert Load the TLS client certificate from .Ar path . -- cgit 1.4.1 7366fc89ad469c2&follow=1'>filters/commit-links.sh (unfollow)
Commit message (Expand)Author
2022-02-13Show subject in commit page titleJune McEnroe
2022-02-13Show symlink targets in tree listingJune McEnroe
2022-02-13Disallow blame in robots.txtJune McEnroe
2022-02-13Don't link to blame for binary blobsJune McEnroe
2022-02-13Bail from blame if blob is binaryJune McEnroe
2022-02-13Remove dependency on memrchrJune McEnroe
2020-03-13Bump versionJason A. Donenfeld
2020-03-13global: use proper accessors for maybe_treeJason A. Donenfeld
2020-03-12ui-snapshot: add support for zstd compressionChristian Hesse
2020-03-12tests: add tests for xz compressed snapshotsChristian Hesse
2020-02-26ui-snapshot: add support for lzip compressionHanspeter Portner
2020-02-17git: update to v2.25.1Christian Hesse
2020-01-13tests: allow to skip git version testsChristian Hesse
2020-01-13Bump versionJason A. Donenfeld
2020-01-13git: update to v2.25.0Christian Hesse
2019-12-11tests: skip tests if strace is not functionalChristian Hesse
2019-12-10git: update to v2.24.1Christian Hesse
2019-11-22ui-repolist: do not return unsigned (negative) valueChristian Hesse
2019-11-08git: update to v2.24.0Christian Hesse
2019-10-25git: update to v2.23.0Christian Hesse
2019-10-25git: update to v2.22.0Christian Hesse
2019-06-25ui-tree: allow per repository override for enable-blameChristian Hesse
2019-06-05tests: successfully validate rc versionsChristian Hesse
2019-06-05git: update to v2.21.0Christian Hesse
2019-06-05ui-ssdiff: ban strncat()Christian Hesse
2019-06-05global: make 'char *path' const where possibleChristian Hesse
2019-05-20ui-shared: restrict to 15 levelsJason A. Donenfeld
2019-02-23ui-diff,ui-tag: don't use htmlf with non-formatted stringsChris Mayo
2019-02-23ui-ssdiff: resolve HTML5 validation errorsChris Mayo
2019-01-03filters: migrate from luacrypto to luaosslJason A. Donenfeld
2019-01-02ui-shared: fix broken sizeof in title setting and rewriteJason A. Donenfeld
2018-12-09git: update to v2.20.0Christian Hesse
2018-11-25ui-blame: set repo for sbJason A. Donenfeld
2018-11-25auth-filter: pass url with query string attachedJason A. Donenfeld
2018-11-21git: use xz compressed archive for downloadChristian Hesse
2018-10-12git: update to v2.19.1Christian Hesse
2018-09-11ui-ssdiff: ban strcat()Christian Hesse
2018-09-11ui-ssdiff: ban strncpy()Christian Hesse
2018-09-11ui-shared: ban strcat()Christian Hesse
2018-09-11ui-patch: ban sprintf()Christian Hesse
2018-09-11ui-log: ban strncpy()Christian Hesse
2018-09-11ui-log: ban strcpy()Christian Hesse
2018-09-11parsing: ban sprintf()Christian Hesse
2018-09-11parsing: ban strncpy()Christian Hesse
2018-08-28filters: generate anchor links from markdownChristian Hesse
2018-08-03Bump version.Jason A. Donenfeld
2018-08-03clone: fix directory traversalJason A. Donenfeld
2018-08-03config: record repo.snapshot-prefix in the per-repo configKonstantin Ryabitsev