- NetworkConnection *s = qobject_cast<NetworkConnection*>(this->sender());
- Q_ASSERT(s);
- BufferInfo buf;
- if((flags & Message::PrivMsg) && !(flags & Message::Self)) {
- buf = Core::bufferInfo(user(), s->networkName(), nickFromMask(sender));
- } else {
- buf = Core::bufferInfo(user(), s->networkName(), target);
- }
- Message msg(buf, type, text, sender, flags);
+ NetworkConnection *netCon = qobject_cast<NetworkConnection*>(this->sender());
+ Q_ASSERT(netCon);
+
+ BufferInfo bufferInfo = Core::bufferInfo(user(), netCon->networkId(), target);
+ Message msg(bufferInfo, type, text, sender, flags);