1 files changed, 7 insertions, 10 deletions
diff --git a/src/Message.cpp b/src/Message.cpp
index ca50821..1408423 100644
--- a/src/Message.cpp
+++ b/src/Message.cpp
@@ -1,18 +1,15 @@
 #include "../include/Message.hpp"
 #include "../include/ResourceCache.hpp"
 #include "../include/Settings.hpp"
-#include "../include/ColorScheme.hpp"
-
-using namespace std;
+#include <dchat/Room.hpp>
 
 namespace dchat
 {
-    Message::Message(User *_user, const std::string &_text, u64 _timestampSeconds, bool plainText) : 
-        user(_user),
-        text(sf::String::fromUtf8(_text.begin(), _text.end()), ResourceCache::getFont("fonts/Nunito-Regular.ttf"), 18 * Settings::getScaling(), 0.0f, plainText),
-        timestampSeconds(_timestampSeconds),
-        type(Type::REGULAR)
+    Message::Message(std::shared_ptr<RoomMessage> _roomMessage, bool plainText) :
+        roomMessage(_roomMessage),
+        text(_roomMessage->text, ResourceCache::getFont("fonts/Nunito-Regular.ttf"), 18.0f * Settings::getScaling(), 0, plainText),
+        onlineUser(true)
     {
-        text.setFillColor(ColorScheme::getTextRegularColor());
+
     }
-}
+}
+\ No newline at end of file