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

Fixed /tiny for room and private chat

Browse Source
This commit is contained in:
James Booth
2013-01-15 21:58:41 +00:00
parent 3ea95346c9
commit efdd3e55db
1 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/command.c
View File

@@ -324,7 +324,6 @@ static struct cmd_t main_commands[] =
{ "/tiny url", { "/tiny url",
"---------", "---------",
"Send the url as a tiny url.", "Send the url as a tiny url.",
"This command can only be called when in a chat window, not from the console.",
"", "",
"Example : /tiny http://www.google.com", "Example : /tiny http://www.google.com",
NULL } } }, NULL } } },
@@ -1662,24 +1661,35 @@ _cmd_tiny(gchar **args, struct cmd_help_t help)
GString *error = g_string_new("/tiny, badly formed URL: "); GString *error = g_string_new("/tiny, badly formed URL: ");
g_string_append(error, url); g_string_append(error, url);
cons_bad_show(error->str); cons_bad_show(error->str);
if (win_current_is_chat()) { if (!win_current_is_console()) {
win_current_bad_show(error->str); win_current_bad_show(error->str);
} }
g_string_free(error, TRUE); g_string_free(error, TRUE);
} else if (win_current_is_chat()) { } else if (!win_current_is_console()) {
char *tiny = tinyurl_get(url); char *tiny = tinyurl_get(url);
if (tiny != NULL) { if (tiny != NULL) {
char *recipient = win_current_get_recipient(); if (win_current_is_chat()) {
jabber_send(tiny, recipient); char *recipient = win_current_get_recipient();
jabber_send(tiny, recipient);
if (prefs_get_chlog()) { if (prefs_get_chlog()) {
const char *jid = jabber_get_jid(); const char *jid = jabber_get_jid();
chat_log_chat(jid, recipient, tiny, PROF_OUT_LOG, NULL); chat_log_chat(jid, recipient, tiny, PROF_OUT_LOG, NULL);
}
win_show_outgoing_msg("me", recipient, tiny);
free(recipient);
} else if (win_current_is_private()) {
char *recipient = win_current_get_recipient();
jabber_send(tiny, recipient);
win_show_outgoing_msg("me", recipient, tiny);
free(recipient);
} else { // groupchat
char *recipient = win_current_get_recipient();
jabber_send_groupchat(tiny, recipient);
free(recipient);
} }
win_show_outgoing_msg("me", recipient, tiny);
free(recipient);
free(tiny); free(tiny);
} else { } else {
cons_bad_show("Couldn't get tinyurl."); cons_bad_show("Couldn't get tinyurl.");