|
|
@ -613,16 +613,20 @@ struct t_channel_member *channel__add_member(struct t_account *account,
|
|
|
|
char *jid_resource = xmpp_jid_resource(account->context, user->id);
|
|
|
|
char *jid_resource = xmpp_jid_resource(account->context, user->id);
|
|
|
|
if (weechat_strcasecmp(jid_bare, channel->id) == 0
|
|
|
|
if (weechat_strcasecmp(jid_bare, channel->id) == 0
|
|
|
|
&& channel->type == CHANNEL_TYPE_MUC)
|
|
|
|
&& channel->type == CHANNEL_TYPE_MUC)
|
|
|
|
weechat_printf_date_tags(channel->buffer, 0, "xmpp_presence,enter,log4", "%s%s entered %s",
|
|
|
|
weechat_printf_date_tags(channel->buffer, 0, "xmpp_presence,enter,log4", "%s%s %sentered%s %s",
|
|
|
|
weechat_prefix("join"),
|
|
|
|
weechat_prefix("join"),
|
|
|
|
user__as_prefix_raw(account, jid_resource),
|
|
|
|
user__as_prefix_raw(account, jid_resource),
|
|
|
|
|
|
|
|
weechat_color("irc.color.message_join"),
|
|
|
|
|
|
|
|
weechat_color("reset"),
|
|
|
|
channel->id);
|
|
|
|
channel->id);
|
|
|
|
else
|
|
|
|
else
|
|
|
|
weechat_printf_date_tags(channel->buffer, 0, "xmpp_presence,enter,log4", "%s%s (%s) entered %s",
|
|
|
|
weechat_printf_date_tags(channel->buffer, 0, "xmpp_presence,enter,log4", "%s%s (%s) %sentered%s %s",
|
|
|
|
weechat_prefix("join"),
|
|
|
|
weechat_prefix("join"),
|
|
|
|
xmpp_jid_bare(account->context, user->id),
|
|
|
|
|
|
|
|
user__as_prefix_raw(account,
|
|
|
|
user__as_prefix_raw(account,
|
|
|
|
xmpp_jid_resource(account->context, user->id)),
|
|
|
|
xmpp_jid_bare(account->context, user->id)),
|
|
|
|
|
|
|
|
xmpp_jid_resource(account->context, user->id),
|
|
|
|
|
|
|
|
weechat_color("irc.color.message_join"),
|
|
|
|
|
|
|
|
weechat_color("reset"),
|
|
|
|
channel->id);
|
|
|
|
channel->id);
|
|
|
|
|
|
|
|
|
|
|
|
return member;
|
|
|
|
return member;
|
|
|
@ -705,15 +709,19 @@ struct t_channel_member *channel__remove_member(struct t_account *account,
|
|
|
|
char *jid_resource = xmpp_jid_resource(account->context, user->id);
|
|
|
|
char *jid_resource = xmpp_jid_resource(account->context, user->id);
|
|
|
|
if (weechat_strcasecmp(jid_bare, channel->id) == 0
|
|
|
|
if (weechat_strcasecmp(jid_bare, channel->id) == 0
|
|
|
|
&& channel->type == CHANNEL_TYPE_MUC)
|
|
|
|
&& channel->type == CHANNEL_TYPE_MUC)
|
|
|
|
weechat_printf_date_tags(channel->buffer, 0, "xmpp_presence,leave,log4", "%s%s left %s",
|
|
|
|
weechat_printf_date_tags(channel->buffer, 0, "xmpp_presence,leave,log4", "%s%s %sleft%s %s",
|
|
|
|
weechat_prefix("quit"),
|
|
|
|
weechat_prefix("quit"),
|
|
|
|
jid_resource,
|
|
|
|
jid_resource,
|
|
|
|
|
|
|
|
weechat_color("irc.color.message_quit"),
|
|
|
|
|
|
|
|
weechat_color("reset"),
|
|
|
|
channel->id);
|
|
|
|
channel->id);
|
|
|
|
else
|
|
|
|
else
|
|
|
|
weechat_printf_date_tags(channel->buffer, 0, "xmpp_presence,leave,log4", "%s%s (%s) left %s",
|
|
|
|
weechat_printf_date_tags(channel->buffer, 0, "xmpp_presence,leave,log4", "%s%s (%s) %sleft%s %s",
|
|
|
|
weechat_prefix("quit"),
|
|
|
|
weechat_prefix("quit"),
|
|
|
|
xmpp_jid_bare(account->context, user->id),
|
|
|
|
xmpp_jid_bare(account->context, user->id),
|
|
|
|
xmpp_jid_resource(account->context, user->id),
|
|
|
|
xmpp_jid_resource(account->context, user->id),
|
|
|
|
|
|
|
|
weechat_color("irc.color.message_quit"),
|
|
|
|
|
|
|
|
weechat_color("reset"),
|
|
|
|
channel->id);
|
|
|
|
channel->id);
|
|
|
|
|
|
|
|
|
|
|
|
return member;
|
|
|
|
return member;
|
|
|
|