aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00
Code

Merge branch 'master' into osx-functional

Browse Source
This commit is contained in:
James Booth 2015-10-29 22:45:56 +00:00
commit 0d79993554
4 changed files with 99 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/command/command.c
View File

@ -110,6 +110,7 @@ static char* _help_autocomplete(ProfWin *window, const char *const input);
static char* _wins_autocomplete(ProfWin *window, const char *const input);
static char* _tls_autocomplete(ProfWin *window, const char *const input);
static char* _script_autocomplete(ProfWin *window, const char *const input);
static char* _subject_autocomplete(ProfWin *window, const char *const input);
GHashTable *commands = NULL;
@ -561,11 +562,17 @@ static struct cmd_t command_defs[] =
CMD_TAG_GROUPCHAT)
CMD_SYN(
"/subject set <subject>",
"/subject edit <subject>",
"/subject prepend <text>",
"/subject append <text>",
"/subject clear")
CMD_DESC(
"Set or clear room subject.")
"Set, modify, or clear room subject.")
CMD_ARGS(
{ "set <subject>", "Set the room subject." },
{ "edit <subject>", "Edit the current room subject, tab autocompletion will display the subject to edit." },
{ "prepend <text>", "Prepend text to the current room subject, use double quotes if a trailing space is needed." },
{ "append <text>", "Append text to the current room subject, use double quotes if a preceeding space is needed." },
{ "clear", "Clear the room subject." })
CMD_NOEXAMPLES
},
@ -2135,6 +2142,9 @@ cmd_init(void)
subject_ac = autocomplete_new();
autocomplete_add(subject_ac, "set");
autocomplete_add(subject_ac, "edit");
autocomplete_add(subject_ac, "prepend");
autocomplete_add(subject_ac, "append");
autocomplete_add(subject_ac, "clear");
form_ac = autocomplete_new();
@ -2694,8 +2704,8 @@ _cmd_complete_parameters(ProfWin *window, const char *const input)
}
}
gchar *cmds[] = { "/prefs", "/disco", "/close", "/subject", "/room" };
Autocomplete completers[] = { prefs_ac, disco_ac, close_ac, subject_ac, room_ac };
gchar *cmds[] = { "/prefs", "/disco", "/close", "/room" };
Autocomplete completers[] = { prefs_ac, disco_ac, close_ac, room_ac };
for (i = 0; i < ARRAY_SIZE(cmds); i++) {
result = autocomplete_param_with_ac(input, cmds[i], completers[i], TRUE);
@ -2737,6 +2747,7 @@ _cmd_complete_parameters(ProfWin *window, const char *const input)
g_hash_table_insert(ac_funcs, "/wins", _wins_autocomplete);
g_hash_table_insert(ac_funcs, "/tls", _tls_autocomplete);
g_hash_table_insert(ac_funcs, "/script", _script_autocomplete);
g_hash_table_insert(ac_funcs, "/subject", _subject_autocomplete);
int len = strlen(input);
char parsed[len+1];
@ -3932,6 +3943,44 @@ _join_autocomplete(ProfWin *window, const char *const input)
return NULL;
}
static char*
_subject_autocomplete(ProfWin *window, const char *const input)
{
char *result = NULL;
if (window->type == WIN_MUC) {
if ((g_strcmp0(input, "/subject e") == 0)
|| (g_strcmp0(input, "/subject ed") == 0)
|| (g_strcmp0(input, "/subject edi") == 0)
|| (g_strcmp0(input, "/subject edit") == 0)
|| (g_strcmp0(input, "/subject edit ") == 0)
|| (g_strcmp0(input, "/subject edit \"") == 0)) {
ProfMucWin *mucwin = (ProfMucWin*)window;
assert(mucwin->memcheck == PROFMUCWIN_MEMCHECK);
char *subject = muc_subject(mucwin->roomjid);
if (subject) {
GString *result_str = g_string_new("/subject edit \"");
g_string_append(result_str, subject);
g_string_append(result_str, "\"");
result = result_str->str;
g_string_free(result_str, FALSE);
}
}
}
if (result) {
return result;
}
result = autocomplete_param_with_ac(input, "/subject", subject_ac, TRUE);
if (result) {
return result;
}
return NULL;
}
static char*
_account_autocomplete(ProfWin *window, const char *const input)
{

43
src/command/commands.c
View File

@ -2851,6 +2851,49 @@ cmd_subject(ProfWin *window, const char *const command, gchar **args)
return TRUE;
}
if (g_strcmp0(args[0], "edit") == 0) {
if (args[1]) {
message_send_groupchat_subject(mucwin->roomjid, args[1]);
} else {
cons_bad_cmd_usage(command);
}
return TRUE;
}
if (g_strcmp0(args[0], "prepend") == 0) {
if (args[1]) {
char *old_subject = muc_subject(mucwin->roomjid);
if (old_subject) {
GString *new_subject = g_string_new(args[1]);
g_string_append(new_subject, old_subject);
message_send_groupchat_subject(mucwin->roomjid, new_subject->str);
g_string_free(new_subject, TRUE);
} else {
win_vprint(window, '!', 0, NULL, NO_EOL, THEME_ROOMINFO, "", "Room does not have a subject, use /subject set <subject>");
}
} else {
cons_bad_cmd_usage(command);
}
return TRUE;
}
if (g_strcmp0(args[0], "append") == 0) {
if (args[1]) {
char *old_subject = muc_subject(mucwin->roomjid);
if (old_subject) {
GString *new_subject = g_string_new(old_subject);
g_string_append(new_subject, args[1]);
message_send_groupchat_subject(mucwin->roomjid, new_subject->str);
g_string_free(new_subject, TRUE);
} else {
win_vprint(window, '!', 0, NULL, NO_EOL, THEME_ROOMINFO, "", "Room does not have a subject, use /subject set <subject>");
}
} else {
cons_bad_cmd_usage(command);
}
return TRUE;
}
if (g_strcmp0(args[0], "clear") == 0) {
message_send_groupchat_subject(mucwin->roomjid, NULL);
return TRUE;

2
src/ui/core.c
View File

@ -1578,7 +1578,7 @@ ui_room_subject(const char *const roomjid, const char *const nick, const char *c
}
} else {
if (nick) {
win_vprint(window, '!', 0, NULL, 0, THEME_ROOMINFO, "", "*%s has cleared the room subject: ", nick);
win_vprint(window, '!', 0, NULL, 0, THEME_ROOMINFO, "", "*%s has cleared the room subject.", nick);
} else {
win_vprint(window, '!', 0, NULL, 0, THEME_ROOMINFO, "", "Room subject cleared");
}

2
themes/complex
View File

@ -9,7 +9,7 @@ time.muc=%d/%m/%y %H:%M:%S
time.mucconfig=%d/%m/%y %H:%M:%S
time.private=%d/%m/%y %H:%M:%S
time.xmlconsole=%d/%m/%y %H:%M:%S
time.statusbar=$H:$M:%S
time.statusbar=%H:%M:%S
resource.title=true
resource.message=true
statuses.console=all