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

Merge /group command into /roster

Browse Source 
Fix https://github.com/profanity-im/profanity/issues/1229
Regards https://github.com/profanity-im/profanity/issues/1116
This commit is contained in:
Michael Vetter
2019-11-25 10:40:25 +01:00
parent 548b64f6c5
commit f0a719d1e1
3 changed files with 118 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/command/cmd_funcs.c
View File

@@ -2230,7 +2230,7 @@ cmd_group(ProfWin *window, const char *const command, gchar **args)
}
// list all groups
if (args[0] == NULL) {
if (args[1] == NULL) {
GList *groups = roster_get_groups();
GList *curr = groups;
if (curr) {
@@ -2248,8 +2248,8 @@ cmd_group(ProfWin *window, const char *const command, gchar **args)
}
// show contacts in group
if (strcmp(args[0], "show") == 0) {
char *group = args[1];
if (strcmp(args[1], "show") == 0) {
char *group = args[2];
if (group == NULL) {
cons_bad_cmd_usage(command);
return TRUE;
@@ -2261,9 +2261,9 @@ cmd_group(ProfWin *window, const char *const command, gchar **args)
}
// add contact to group
if (strcmp(args[0], "add") == 0) {
char *group = args[1];
char *contact = args[2];
if (strcmp(args[1], "add") == 0) {
char *group = args[2];
char *contact = args[3];
if ((group == NULL) || (contact == NULL)) {
cons_bad_cmd_usage(command);
@@ -2292,9 +2292,9 @@ cmd_group(ProfWin *window, const char *const command, gchar **args)
}
// remove contact from group
if (strcmp(args[0], "remove") == 0) {
char *group = args[1];
char *contact = args[2];
if (strcmp(args[1], "remove") == 0) {
char *group = args[2];
char *contact = args[3];
if ((group == NULL) || (contact == NULL)) {
cons_bad_cmd_usage(command);