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

Tidy cmd_tiny

Browse Source
This commit is contained in:
James Booth 2015-03-16 23:03:31 +00:00
parent 848baa95a2
commit 311b64a379
1 changed files with 48 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/command/commands.c
View File

@ -3125,21 +3125,27 @@ gboolean
cmd_tiny(gchar **args, struct cmd_help_t help) cmd_tiny(gchar **args, struct cmd_help_t help)
{ {
char *url = args[0]; char *url = args[0];
win_type_t win_type = ui_current_win_type(); ProfWin *current = wins_get_current();
if (current->type != WIN_CHAT && current->type != WIN_MUC && current->type != WIN_PRIVATE) {
cons_show("/tiny can only be used in chat windows");
return TRUE;
}
if (!tinyurl_valid(url)) { if (!tinyurl_valid(url)) {
GString *error = g_string_new("/tiny, badly formed URL: "); win_vprint(current, '-', NULL, 0, THEME_ERROR, "", "/tiny, badly formed URL: %s", url);
g_string_append(error, url); return TRUE;
cons_show_error(error->str);
if (win_type != WIN_CONSOLE) {
ui_current_error_line(error->str);
} }
g_string_free(error, TRUE);
} else if (win_type != WIN_CONSOLE) {
char *tiny = tinyurl_get(url);
if (tiny != NULL) { char *tiny = tinyurl_get(url);
if (win_type == WIN_CHAT) { if (!tiny) {
win_print(current, '-', NULL, 0, THEME_ERROR, "", "Couldn't create tinyurl.");
return TRUE;
}
switch (current->type){
case WIN_CHAT:
{
ProfChatWin *chatwin = wins_get_current_chat(); ProfChatWin *chatwin = wins_get_current_chat();
#ifdef HAVE_LIBOTR #ifdef HAVE_LIBOTR
if (otr_is_secure(chatwin->barejid)) { if (otr_is_secure(chatwin->barejid)) {
@ -3150,21 +3156,26 @@ cmd_tiny(gchar **args, struct cmd_help_t help)
#else #else
_send_chat_message(chatwin->barejid, tiny); _send_chat_message(chatwin->barejid, tiny);
#endif #endif
} else if (win_type == WIN_PRIVATE) { break;
}
case WIN_PRIVATE:
{
ProfPrivateWin *privatewin = wins_get_current_private(); ProfPrivateWin *privatewin = wins_get_current_private();
message_send_private(privatewin->fulljid, tiny); message_send_private(privatewin->fulljid, tiny);
ui_outgoing_private_msg(privatewin->fulljid, tiny); ui_outgoing_private_msg(privatewin->fulljid, tiny);
} else if (win_type == WIN_MUC) { break;
}
case WIN_MUC:
{
ProfMucWin *mucwin = wins_get_current_muc(); ProfMucWin *mucwin = wins_get_current_muc();
message_send_groupchat(mucwin->roomjid, tiny); message_send_groupchat(mucwin->roomjid, tiny);
break;
} }
default:
break;
}
free(tiny); free(tiny);
} else {
cons_show_error("Couldn't get tinyurl.");
}
} else {
cons_show("/tiny can only be used in chat windows");
}
return TRUE; return TRUE;
} }