devs/cproof
1
2
Fork 1
Code Issues 43 Pull Requests 6 Actions Packages Projects 1 Releases Wiki Activity

Reorder /blocked commands

Browse Source 
Instead of `/blocked add [<jid>] [report-abuse|report-spam [<message>]`
have:
* /blocked add [<jid>] [<message>] (like before)
* /blocked report-abuse [<jid>] [<message>]
* /blocked report-spam [<jid>] [<message>]
This commit is contained in:
Michael Vetter
2021-07-01 10:53:11 +02:00
parent 2f533c5da4
commit 1d845c9ffb
3 changed files with 37 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/command/cmd_funcs.c
View File

@@ -3012,10 +3012,10 @@ cmd_blocked(ProfWin* window, const char* const command, gchar** args)
return TRUE;
}
blocked_report br = BLOCKED_NO_REPORT;
if (g_strcmp0(args[0], "add") == 0) {
char* jid = args[1];
char* msg = NULL;
blocked_report br = BLOCKED_NO_REPORT;
// /blocked add jid or /blocked add (in window)
if (g_strv_length(args) < 3) {
@@ -3028,27 +3028,9 @@ cmd_blocked(ProfWin* window, const char* const command, gchar** args)
cons_bad_cmd_usage(command);
return TRUE;
}
} else {
if (args[2] && g_strcmp0(args[2], "report-abuse") == 0) {
br = BLOCKED_REPORT_ABUSE;
} else if (args[2] && g_strcmp0(args[2], "report-abuse") == 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;
}
msg = args[3];
}
// args[3] is optional message
gboolean res = blocked_add(jid, br, msg);
gboolean res = blocked_add(jid, br, NULL);
if (!res) {
cons_show("User %s already blocked.", jid);
}
@@ -3070,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) {