stv0g/telegram-purple
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix redundant message when users are leaving chats

Browse source 
Do not display an extended reason when a user leaves on its own. Such a message makes only sense when a user is removed by somebody else.
This commit is contained in:
mjentsch 2015-11-29 14:41:31 +01:00
parent 202772ed78
commit b3d09c1565
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
tgp-msg.c
View file

@ -106,11 +106,12 @@ static char *format_service_msg (struct tgl_state *TLS, struct tgl_message *M) {
if (conv) {
char *alias = peer->print_name;
const char *aliasLeft = tgp_blist_peer_get_purple_name (TLS, TGL_MK_USER (M->action.user));
txt = g_strdup_printf (_("%2$s deleted user %1$s."), alias, txt_user);
g_return_val_if_fail (aliasLeft, txt);
if (tgl_get_peer_id (M->from_id) != tgl_get_peer_id (peer->id)) {
txt = g_strdup_printf (_("%2$s deleted user %1$s."), alias, txt_user);
}
g_return_val_if_fail (aliasLeft, NULL);
purple_conv_chat_remove_user (purple_conversation_get_chat_data (conv), aliasLeft, txt);
if (M->action.user == tgl_get_peer_id (TLS->our_id)) {
purple_conv_chat_left (purple_conversation_get_chat_data (conv));
@ -122,7 +123,9 @@ static char *format_service_msg (struct tgl_state *TLS, struct tgl_message *M) {
}
char *alias = peer->print_name;
txt = g_strdup_printf (_("%2$s deleted user %1$s."), alias, txt_user);
if (tgl_get_peer_id (M->from_id) != tgl_get_peer_id (peer->id)) {
txt = g_strdup_printf (_("%2$s deleted user %1$s."), alias, txt_user);
}
}
break;
}