devs/profanity
2
0
Fork 0
mirror of https://git.jabber.space/devs/cproof.git synced 2026-07-18 21:36:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removed regular chat message triggers

Browse Source
This commit is contained in:
James Booth
2015-11-28 23:43:02 +00:00
parent 60305de0d9
commit 2fc984e673
5 changed files with 5 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/command/command.c
View File

@@ -1063,10 +1063,6 @@ static struct cmd_t command_defs[] =
"/notify message on|off",
"/notify message current on|off",
"/notify message text on|off",
"/notify message trigger add <text>",
"/notify message trigger remove <text>",
"/notify message trigger list",
"/notify message trigger on|off",
"/notify room on|off",
"/notify room mention on|off",
"/notify room current on|off",
@@ -1089,10 +1085,6 @@ static struct cmd_t command_defs[] =
{ "message on|off", "Notifications for regular chat messages." },
{ "message current on|off", "Whether to show regular chat message notifications when the window is focussed." },
{ "message text on|off", "Show message text in regular message notifications." },
{ "message trigger add <text>", "Notify when specified text included in regular chat message." },
{ "message trigger remove <text>", "Remove regular chat notification for specified text." },
{ "message trigger list", "List all regular chat custom text notifications." },
{ "message trigger on|off", "Enable or disable all regular chat notification triggers." },
{ "room on|off", "Notifications for all chat room messages, 'mention' only notifies when your nick is mentioned." },
{ "room mention on|off", "Notifications for all chat room messages when your nick is mentioned." },
{ "room current on|off", "Whether to show all chat room messages notifications when the window is focussed." },
@@ -1113,6 +1105,8 @@ static struct cmd_t command_defs[] =
"/notify message on",
"/notify message text on",
"/notify room mention on",
"/notify room trigger add beer",
"/notify room trigger on",
"/notify room current off",
"/notify room text off",
"/notify remind 10",
@@ -1958,7 +1952,6 @@ cmd_init(void)
autocomplete_add(notify_message_ac, "off");
autocomplete_add(notify_message_ac, "current");
autocomplete_add(notify_message_ac, "text");
autocomplete_add(notify_message_ac, "trigger");
notify_room_ac = autocomplete_new();
autocomplete_add(notify_room_ac, "on");
@@ -2662,7 +2655,6 @@ cmd_reset_autocomplete(ProfWin *window)
}
bookmark_autocomplete_reset();
prefs_reset_message_trigger_ac();
prefs_reset_room_trigger_ac();
}
@@ -3178,11 +3170,6 @@ _notify_autocomplete(ProfWin *window, const char *const input)
int i = 0;
char *result = NULL;
result = autocomplete_param_with_func(input, "/notify message trigger remove", prefs_autocomplete_message_trigger);
if (result) {
return result;
}
result = autocomplete_param_with_func(input, "/notify room trigger remove", prefs_autocomplete_room_trigger);
if (result) {
return result;
@@ -3203,11 +3190,6 @@ _notify_autocomplete(ProfWin *window, const char *const input)
return result;
}
result = autocomplete_param_with_ac(input, "/notify message trigger", notify_trigger_ac, TRUE);
if (result) {
return result;
}
result = autocomplete_param_with_ac(input, "/notify room", notify_room_ac, TRUE);
if (result) {
return result;

47
src/command/commands.c
View File

@@ -4334,53 +4334,6 @@ cmd_notify(ProfWin *window, const char *const command, gchar **args)
} else {
cons_show("Usage: /notify message text on|off");
}
} else if (g_strcmp0(args[1], "trigger") == 0) {
if (g_strcmp0(args[2], "add") == 0) {
if (!args[3]) {
cons_bad_cmd_usage(command);
} else {
gboolean res = prefs_add_msg_notify_trigger(args[3]);
if (res) {
cons_show("Adding message notification trigger: %s", args[3]);
} else {
cons_show("Message notification trigger already exists: %s", args[3]);
}
}
} else if (g_strcmp0(args[2], "remove") == 0) {
if (!args[3]) {
cons_bad_cmd_usage(command);
} else {
gboolean res = prefs_remove_msg_notify_trigger(args[3]);
if (res) {
cons_show("Removing message notification trigger: %s", args[3]);
} else {
cons_show("Message notification trigger does not exist: %s", args[3]);
}
}
} else if (g_strcmp0(args[2], "list") == 0) {
GList *triggers = prefs_get_msg_notify_triggers();
GList *curr = triggers;
if (curr) {
cons_show("Message notification triggers:");
} else {
cons_show("No message notification triggers");
}
while (curr) {
cons_show(" %s", curr->data);
curr = g_list_next(curr);
}
g_list_free_full(triggers, free);
} else if (g_strcmp0(args[2], "on") == 0) {
cons_show("Enabling message notification triggers");
prefs_set_boolean(PREF_NOTIFY_MESSAGE_TRIGGER, TRUE);
} else if (g_strcmp0(args[2], "off") == 0) {
cons_show("Disabling message notification triggers");
prefs_set_boolean(PREF_NOTIFY_MESSAGE_TRIGGER, FALSE);
} else {
cons_bad_cmd_usage(command);
}
} else {
cons_show("Usage: /notify message on|off");
}
// chat room settings