summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2015-01-30 13:58:52 (GMT)
committerSwift Review <review@swift.im>2015-02-05 15:44:55 (GMT)
commitccaa8342069eaa07d6cb3a4273c83f44883472fe (patch)
tree9f33e7f0820ccee4d5e0b572706ad790f41d2bd4 /Swift/Controllers/Chat/MUCController.h
parent7d2ee8a852ca25f094ab003061d330a576a4806b (diff)
downloadswift-ccaa8342069eaa07d6cb3a4273c83f44883472fe.zip
swift-ccaa8342069eaa07d6cb3a4273c83f44883472fe.tar.bz2
Correctly render MUC system messages as system messages
Messages received from a MUC bare JID in a MUC have been rendered as user messages in the past. They are now rendered as system messages. Test-Information: Tested with a MUC component that sends a bare message on login. Change-Id: I9a548ec9b81db8ba329182e08446d72c3518c7cb
Diffstat (limited to 'Swift/Controllers/Chat/MUCController.h')
-rw-r--r--Swift/Controllers/Chat/MUCController.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/Swift/Controllers/Chat/MUCController.h b/Swift/Controllers/Chat/MUCController.h
index 5f99f1e..bf15b01 100644
--- a/Swift/Controllers/Chat/MUCController.h
+++ b/Swift/Controllers/Chat/MUCController.h
@@ -74,8 +74,9 @@ namespace Swift {
bool isIncomingMessageFromMe(boost::shared_ptr<Message> message);
std::string senderDisplayNameFromMessage(const JID& from);
boost::optional<boost::posix_time::ptime> getMessageTimestamp(boost::shared_ptr<Message> message) const;
- void preHandleIncomingMessage(boost::shared_ptr<MessageEvent>);
- void postHandleIncomingMessage(boost::shared_ptr<MessageEvent>, const HighlightAction&);
+ virtual void preHandleIncomingMessage(boost::shared_ptr<MessageEvent>);
+ virtual void addMessageHandleIncomingMessage(const JID& from, const std::string& message, bool senderIsSelf, boost::shared_ptr<SecurityLabel> label, const boost::posix_time::ptime& time, const HighlightAction& highlight);
+ virtual void postHandleIncomingMessage(boost::shared_ptr<MessageEvent>, const HighlightAction&);
void cancelReplaces();
void logMessage(const std::string& message, const JID& fromJID, const JID& toJID, const boost::posix_time::ptime& timeStamp, bool isIncoming);