diff options
author | Michael Vetter <jubalh@iodoru.org> | 2021-07-01 17:04:04 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-07-01 17:04:04 +0200 |
commit | 226cffe75be5d408e1d357337eb4ed921100f3b7 (patch) | |
tree | 6dafe92bc722af35b40c062cd3b74ead7ec6189a /src/command | |
parent | 5f9eda973508c44bd213032dc2393a1e0c48fbd0 (diff) | |
parent | 1d845c9ffb2a3575fa7edded00a7309016997a91 (diff) | |
download | profani-tty-226cffe75be5d408e1d357337eb4ed921100f3b7.tar.gz |
Merge pull request #1569 from profanity-im/feature/1434-spam-reporting
Add XEP-0377: Spam Reporting
Diffstat (limited to 'src/command')
-rw-r--r-- | src/command/cmd_ac.c | 2 | ||||
-rw-r--r-- | src/command/cmd_defs.c | 12 | ||||
-rw-r--r-- | src/command/cmd_funcs.c | 52 |
3 files changed, 51 insertions, 15 deletions
diff --git a/src/command/cmd_ac.c b/src/command/cmd_ac.c index 6b46d079..77cd1adc 100644 --- a/src/command/cmd_ac.c +++ b/src/command/cmd_ac.c @@ -951,6 +951,8 @@ cmd_ac_init(void) blocked_ac = autocomplete_new(); autocomplete_add(blocked_ac, "add"); autocomplete_add(blocked_ac, "remove"); + autocomplete_add(blocked_ac, "report-abuse"); + autocomplete_add(blocked_ac, "report-spam"); clear_ac = autocomplete_new(); autocomplete_add(clear_ac, "persist_history"); diff --git a/src/command/cmd_defs.c b/src/command/cmd_defs.c index e04ba2a1..63cb8780 100644 --- a/src/command/cmd_defs.c +++ b/src/command/cmd_defs.c @@ -420,7 +420,7 @@ static struct cmd_t command_defs[] = { }, { "/blocked", - parse_args, 0, 2, NULL, + parse_args_with_freetext, 0, 3, NULL, CMD_NOSUBFUNCS CMD_MAINFUNC(cmd_blocked) CMD_TAGS( @@ -429,15 +429,21 @@ static struct cmd_t command_defs[] = { CMD_SYN( "/blocked", "/blocked add [<jid>]", + "/blocked report-abuse [<jid>] [<message>]", + "/blocked report-spam [<jid>] [<message>]", "/blocked remove <jid>") CMD_DESC( "Manage blocked users (XEP-0191), calling with no arguments shows the current list of blocked users. " - "To blog a certain user in a MUC use the following as jid: room@conference.example.org/spammy-user") + "To blog a certain user in a MUC use the following as jid: room@conference.example.org/spammy-user" + "It is also possible to block and report (XEP-0377) a user with the report-abuse and report-spam commands.") CMD_ARGS( { "add [<jid>]", "Block the specified Jabber ID. If in a chat window and no jid is specified, the current recipient will be blocked." }, - { "remove <jid>", "Remove the specified Jabber ID from the blocked list." }) + { "remove <jid>", "Remove the specified Jabber ID from the blocked list." }, + { "report-abuse <jid> [<message>]", "Report the jid as abuse with an optional message to the service operator." }, + { "report-spam <jid> [<message>]", "Report the jid as spam with an optional message to the service operator." }) CMD_EXAMPLES( "/blocked add hel@helheim.edda", + "/blocked report-spam hel@helheim.edda Very annoying guy", "/blocked add profanity@rooms.dismail.de/spammy-user") }, diff --git a/src/command/cmd_funcs.c b/src/command/cmd_funcs.c index e1108982..9b092939 100644 --- a/src/command/cmd_funcs.c +++ b/src/command/cmd_funcs.c @@ -3008,23 +3008,29 @@ cmd_blocked(ProfWin* window, const char* const command, gchar** args) } if (!connection_supports(XMPP_FEATURE_BLOCKING)) { - cons_show("Blocking not supported by server."); + cons_show("Blocking (%s) not supported by server.", XMPP_FEATURE_BLOCKING); return TRUE; } + blocked_report br = BLOCKED_NO_REPORT; + if (g_strcmp0(args[0], "add") == 0) { char* jid = args[1]; - if (jid == NULL && (window->type == WIN_CHAT)) { - ProfChatWin* chatwin = (ProfChatWin*)window; - jid = chatwin->barejid; - } - if (jid == NULL) { - cons_bad_cmd_usage(command); - return TRUE; + // /blocked add jid or /blocked add (in window) + if (g_strv_length(args) < 3) { + if (jid == NULL && (window->type == WIN_CHAT)) { + ProfChatWin* chatwin = (ProfChatWin*)window; + jid = chatwin->barejid; + } + + if (jid == NULL) { + cons_bad_cmd_usage(command); + return TRUE; + } } - gboolean res = blocked_add(jid); + gboolean res = blocked_add(jid, br, NULL); if (!res) { cons_show("User %s already blocked.", jid); } @@ -3046,6 +3052,28 @@ cmd_blocked(ProfWin* window, const char* const command, gchar** args) return TRUE; } + if (strncmp(args[0], "report-", 7) == 0) { + if (args[1] && g_strcmp0(args[0], "report-abuse") == 0) { + br = BLOCKED_REPORT_ABUSE; + } else if (args[1] && g_strcmp0(args[0], "report-spam") == 0) { + br = BLOCKED_REPORT_SPAM; + } else { + cons_bad_cmd_usage(command); + return TRUE; + } + + if (!connection_supports(XMPP_FEATURE_SPAM_REPORTING)) { + cons_show("Spam reporting (%s) not supported by server.", XMPP_FEATURE_SPAM_REPORTING); + return TRUE; + } + + // args[3] is an optional message + gboolean res = blocked_add(args[1], br, args[3]); + if (!res) { + cons_show("User %s already blocked.", args[1]); + } + } + GList* blocked = blocked_list(); GList* curr = blocked; if (curr) { @@ -6497,7 +6525,7 @@ cmd_ping(ProfWin* window, const char* const command, gchar** args) } if (args[0] == NULL && connection_supports(XMPP_FEATURE_PING) == FALSE) { - cons_show("Server does not support ping requests."); + cons_show("Server does not support ping requests (%s).", XMPP_FEATURE_PING); return TRUE; } @@ -8102,7 +8130,7 @@ cmd_command_list(ProfWin* window, const char* const command, gchar** args) } if (connection_supports(XMPP_FEATURE_COMMANDS) == FALSE) { - cons_show("Server does not support ad hoc commands."); + cons_show("Server does not support ad hoc commands (%s).", XMPP_FEATURE_COMMANDS); return TRUE; } @@ -8158,7 +8186,7 @@ cmd_command_exec(ProfWin* window, const char* const command, gchar** args) } if (connection_supports(XMPP_FEATURE_COMMANDS) == FALSE) { - cons_show("Server does not support ad hoc commands."); + cons_show("Server does not support ad hoc commands (%s).", XMPP_FEATURE_COMMANDS); return TRUE; } |