my ( $message, $from ) = @_;
return unless $from !~ m/\Q($nick|$room)\E/; # FIXME: skip our messages
warn "#Q<< ",dump( $from, $message );
- my ( undef, $channel, $user ) = split(/ /,$from,3);
- $con->send_msg( 'PRIVMSG', $room => join(' ',$channel, $user, $message) );
+ my ( undef, $gw, $user ) = split(/ /,$from,3);
+ $con->send_msg( 'PRIVMSG', $room => "<$user> $message" );
});
$con->reg_cb (
warn "XXX send to $to\n";
next if $from =~ m/\Q$to\E/; # FIXME
warn "# $jid [$from] -> [$to] | $message\n";
- my $body = "<$user\@$gw> | $message"; # FIXME
+ $user =~ s{!.+}{};
+ $gw =~ s{^.+\/#}{#};
+ my $body = "<$user$gw> $message"; # FIXME
$cl->send_message( $body, $to => $jid, defined $muc_rooms->{$to} ? 'groupchat' : 'chat' );
}
});