diff --git a/src/messagemodel.cpp b/src/messagemodel.cpp index 35dcae2b..f49c7be2 100644 --- a/src/messagemodel.cpp +++ b/src/messagemodel.cpp @@ -1,246 +1,264 @@ /* * * Copyright 2016 Riccardo Iaconelli * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as * published by the Free Software Foundation; either version 2 of * the License or (at your option) version 3 or any later version * accepted by the membership of KDE e.V. (or its successor approved * by the membership of KDE e.V.), which shall act as a proxy * defined in Section 14 of version 3 of the license. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program. If not, see . * */ #include #include #include #include #include // #include #include #include #include "messagemodel.h" #include "ruqola.h" //Message::MessageStatus Message::messageStatus() const //{ // return m_messageStatus; //} //void Message::setMessageStatus(MessageStatus m) //{ // if (m_messageStatus!= m){ // m_messageStatus = m; // emit messageStatusChanged(); // } //} Message MessageModel::fromJSon(const QJsonObject& o) { Message message; message.messageID = o["messageID"].toString(); message.roomID = o["roomID"].toString(); message.message = o["message"].toString(); message.timestamp = (qint64) o["timestamp"].toDouble(); message.username = o["username"].toString(); message.userID = o["userID"].toString(); message.updatedAt = (qint64) o["updatedAt"].toDouble(); message.editedAt = (qint64) o["editedAt"].toDouble(); message.editedByUsername = o["editedByUsername"].toString(); message.editedByUserID = o["editedByUserID"].toString(); message.url = o["url"].toString(); message.meta = o["meta"].toString(); message.headers = o["headers"].toString(); message.parsedUrl = o["parsedUrl"].toString(); message.imageUrl = o["imageUrl"].toString(); message.color = o["color"].toString(); message.alias = o["alias"].toString(); message.avatar = o["avatar"].toString(); message.groupable = o["groupable"].toBool(); message.parseUrls = o["parseUrls"].toBool(); message.systemMessage = o["systemMessage"].toBool(); message.systemMessageType = o["type"].toString(); return message; } QByteArray MessageModel::serialize(const Message& message) { QJsonDocument d; QJsonObject o; o["messageID"] = message.messageID; o["roomID"] = message.roomID; o["message"] = message.message; o["timestamp"] = message.timestamp; o["username"] = message.username; o["userID"] = message.userID; o["updatedAt"] = message.updatedAt; o["editedAt"] = message.editedAt; o["editedByUsername"] = message.editedByUsername; o["editedByUserID"] = message.editedByUserID; o["url"] = message.url; o["meta"] = message.meta; o["headers"] = message.headers; o["parsedUrl"] = message.parsedUrl; o["imageUrl"] = message.imageUrl; o["color"] = message.color; o["alias"] = message.alias; o["avatar"] = message.avatar; o["groupable"] = message.groupable; o["parseUrls"] = message.parseUrls; o["systemMessage"] = message.systemMessage; o["type"] = message.systemMessageType; d.setObject(o); return d.toBinaryData(); } MessageModel::MessageModel(const QString &roomID, QObject* parent) : QAbstractListModel(parent), m_roomID(roomID) { qDebug() << "Creating message Model"; QDir cacheDir(Ruqola::self()->cacheBasePath()+"/rooms_cache"); // load cache if (QFile::exists(cacheDir.absoluteFilePath(roomID)) && !roomID.isEmpty()) { QFile f(cacheDir.absoluteFilePath(roomID)); if (f.open(QIODevice::ReadOnly)) { QDataStream in(&f); while (!f.atEnd()) { char * byteArray; quint32 length; in.readBytes(byteArray, length); QByteArray arr = QByteArray::fromRawData(byteArray, length); Message m = MessageModel::fromJSon(QJsonDocument::fromBinaryData(arr).object()); addMessage(m); } } } } MessageModel::~MessageModel() { QDir cacheDir(Ruqola::self()->cacheBasePath()+"/rooms_cache"); qDebug() << "Caching to..." << cacheDir.path(); if (!cacheDir.exists(cacheDir.path())) { cacheDir.mkpath(cacheDir.path()); } QFile f(cacheDir.absoluteFilePath(m_roomID)); if (f.open(QIODevice::WriteOnly)) { QDataStream out(&f); foreach (const Message m, m_allMessages) { QByteArray ms = MessageModel::serialize(m); out.writeBytes(ms, ms.size()); } } } QHash MessageModel::roleNames() const { QHash roles; roles[MessageText] = "messageText"; roles[Username] = "username"; roles[Timestamp] = "timestamp"; roles[UserID] = "userID"; roles[SystemMessage] = "systemMessage"; roles[SystemMessageType] = "type"; + roles[MessageID] = "messageID"; + roles[RoomID] = "roomID"; + roles[UpdatedAt] = "updatedAt"; + roles[EditedAt] = "editedAt"; + roles[EditedByUserName] = "editedByUsername"; + roles[EditedByUserID] = "editedByUserID"; + roles[Url] = "URL"; + roles[Meta] = "meta"; + roles[Headers] = "headers"; + roles[ParsedUrl] = "parsedUrl"; + roles[ImageUrl] = "imageUrl"; + roles[Color] = "color"; + roles[Alias] = "alias"; + roles[Avatar] = "avatar"; + roles[Groupable] = "groupable"; + roles[ParseUrls] = "parseUrls"; return roles; } qint64 MessageModel::lastTimestamp() const { if (m_allMessages.size()) { qDebug() << "returning timestamp" << m_allMessages.last().timestamp; return m_allMessages.last().timestamp; } else { return 0; } } int MessageModel::rowCount(const QModelIndex& parent) const { return m_allMessages.size(); (void)parent; } void MessageModel::addMessage(const Message& message) { // Don't add empty messages if (message.message.isEmpty()) { return; } auto existingMessage = qFind(m_allMessages.begin(), m_allMessages.end(), message); bool present = (existingMessage != m_allMessages.end()); auto i = std::upper_bound(m_allMessages.begin(), m_allMessages.end(), message); int pos = i-m_allMessages.begin(); bool messageChanged = false; // if (qFind(m_allMessages.begin(), m_allMessages.end(), message) != m_allMessages.end()) { if (present){ // if (pos != m_allMessages.size()) { // we're at the end // qDebug() << "detecting a message change"; messageChanged = true; //Figure out a better way to update just the really changed message } else { beginInsertRows(QModelIndex(), pos, pos); } if (messageChanged) { m_allMessages.replace(pos-1, message); } else { m_allMessages.insert(i, message); } if (messageChanged) { emit dataChanged(createIndex(1, 1), createIndex(pos, 1)); } else { endInsertRows(); } } QVariant MessageModel::data(const QModelIndex& index, int role) const { int idx = index.row(); if (role == MessageModel::Username) { return m_allMessages.at(idx).username; } else if (role == MessageModel::MessageText) { return m_allMessages.at(idx).message; } else if (role == MessageModel::Timestamp) { return QVariant(m_allMessages.at(idx).timestamp); } else if (role == MessageModel::UserID) { return QVariant(m_allMessages.at(idx).userID); } else if (role == MessageModel::SystemMessage) { return QVariant(m_allMessages.at(idx).systemMessage); } else if (role == MessageModel::SystemMessageType) { return QVariant(m_allMessages.at(idx).systemMessageType); + } else if (role == MessageModel::Alias) { + return QVariant(m_allMessages.at(idx).alias); } else { return QVariant(""); } } // #include "messagelist.moc" diff --git a/src/qml/Desktop.qml b/src/qml/Desktop.qml index be033c57..25207f87 100644 --- a/src/qml/Desktop.qml +++ b/src/qml/Desktop.qml @@ -1,342 +1,343 @@ /* * * Copyright 2016 Riccardo Iaconelli * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as * published by the Free Software Foundation; either version 2 of * the License or (at your option) version 3 or any later version * accepted by the membership of KDE e.V. (or its successor approved * by the membership of KDE e.V.), which shall act as a proxy * defined in Section 14 of version 3 of the license. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program. If not, see . * */ // Skeleton from https://github.com/achipa/outqross_blog.git // Almost everything has been re-adapted import QtQuick 2.7 import QtQuick.Controls 1.4 import QtQuick.Controls 2.0 as QQC2 import QtQuick.Controls.Styles 1.2 import QtQuick.Window 2.2 import QtQuick.Dialogs 1.2 import QtQuick.Layouts 1.1 import Qt.labs.settings 1.0 import QtGraphicalEffects 1.0 import KDE.Ruqola.Ruqola 1.0 import KDE.Ruqola.DDPClient 1.0 import org.kde.kirigami 2.1 as Kirigami //import KDE.Ruqola.Notification 1.0 // import "Log.js" as Log // import "Data.js" as Data Kirigami.ApplicationWindow { id: appid property int margin: 11 property string statusText property string lightGreen: "#6ab141"; property string darkGreen: "#00613a"; property string selectedRoomID: ""; property QtObject selectedRoom property QtObject model width: Kirigami.Units.gridUnit * 55 height: Kirigami.Units.gridUnit * 40 title: qsTr("Ruqola") header: Kirigami.ApplicationHeader {} pageStack.initialPage: [roomsComponent, mainComponent] pageStack.visible: Ruqola.loginStatus == DDPClient.LoggedIn // Keys.onShortcutOverride: event.accepted = (event.key === StandardKey.Quit) // Shortcut { // sequence: StandardKey.Quit // context: Qt.ApplicationShortcut // onActivated: { // console.log("QUITTING (trying)"); // Qt.quit(); // } // } globalDrawer: Kirigami.GlobalDrawer { drawerOpen: false handleVisible: true resetMenuOnTriggered: true topContent: [ Text { text: qsTr("Hello, %1").arg(Ruqola.userName) } ] actions: [ Kirigami.Action { text: "Preferences" iconName: "user-available" Kirigami.Action { text: "action 1" } Kirigami.Action { text: "action 2" } Kirigami.Action { text: "action 3" } }, Kirigami.Action { text: "Log out" iconName: "system-log-out" onTriggered: { Ruqola.logOut(); appid.globalDrawer.drawerOpen = false; } }, Kirigami.Action { shortcut: "Ctrl+Q" //StandardKey.Quit text: "Quit" iconName: "application-exit" onTriggered: { Qt.quit(); } } ] } Login { id: loginTab anchors.fill: parent visible: Ruqola.loginStatus != DDPClient.LoggedIn serverURL: Ruqola.serverURL username: Ruqola.userName onAccepted: { Ruqola.password = loginTab.password; Ruqola.userName = loginTab.username; Ruqola.serverURL = loginTab.serverURL; // DDPClient.loginType = Password; Ruqola.tryLogin(); } } BusyIndicator { id: busy // indeterminate: true anchors.centerIn: parent visible: Ruqola.loginStatus == DDPClient.LoggingIn } Component { id: roomsComponent Kirigami.ScrollablePage { background: Rectangle { color: Kirigami.Theme.viewBackgroundColor } RoomsView { id: roomsList implicitWidth: Kirigami.Units.gridUnit * 10 anchors.fill: parent model: Ruqola.roomModel() selectedRoomID: appid.selectedRoomID; onRoomSelected: { if (roomID == selectedRoomID) { return; } console.log("Choosing room", roomID); appid.selectedRoomID = roomID; appid.model = Ruqola.getModelForRoom(roomID) appid.selectedRoom = Ruqola.getRoom(roomID) } onCountChanged: { // console.log("We have", roomsList.count, "rooms") } } //RoomsView } } Component { id: mainComponent Kirigami.ScrollablePage { // anchors.right: parent.right // anchors.top: parent.top // anchors.bottom: parent.bottom // anchors.left: roomsComponent.right // anchors.fill: parent id: mainWidget leftPadding: Kirigami.Units.smallSpacing rightPadding: Kirigami.Units.smallSpacing topPadding: Kirigami.Units.smallSpacing bottomPadding: Kirigami.Units.smallSpacing title: appid.selectedRoom ? "" : "#" + appid.selectedRoom.name ListView { id: activeChat model: appid.model // model: Ruqola.getModelForRoom(selectedRoomID) anchors.fill: parent onCountChanged: { positionViewAtIndex(count - 1, ListView.Beginning) } Component.onCompleted: positionViewAtIndex(count - 1, ListView.Beginning) visible : count > 0 z: -1 delegate: Message { width: parent.width i_messageText: messageText i_username: username i_systemMessage: systemMessage i_systemMessageType: type + i_timestamp: timestamp //width: parent.width } } footer: Item { anchors.bottom: parent.bottom anchors.left: parent.left anchors.right: parent.right id: input height: 40 TextField { id: messageLine anchors.left: parent.left anchors.bottom: parent.bottom anchors.top: parent.top anchors.right: emoticonsButton.left placeholderText: if (Ruqola.loginStatus != DDPClient.LoggedIn || (selectedRoomID=="")){ qsTr("Please Select a room") } else{ qsTr("Enter message") } // height: 2.7*font.pixelSize property string type: "text"; onAccepted: { if (text != "" && Ruqola.loginStatus == DDPClient.LoggedIn && !(selectedRoomID=="")) { Ruqola.sendMessage(selectedRoomID, text, type); text = ""; } } } Button { anchors.bottom: parent.bottom anchors.top: parent.top anchors.right: attachmentsButton.left width: 50 id : emoticonsButton iconName: "emoticonsButton" iconSource: "qrc:/Emoticon.png" visible: true } Button { anchors.bottom: parent.bottom anchors.top: parent.top anchors.right: parent.right width: 50 id : attachmentsButton iconName: "attachmentsButton" iconSource: "qrc:/icons/attach-button.jpg" visible: true onClicked: Ruqola.attachmentButtonClicked(); } }//Item input }// mainWidget Item } // Image { // id: receivedImage // source:" " // width: 60 // height: 80 // fillMode: Image.PreserveAspectFit //// visible: //only when an image is recieved from server // sourceSize.width: 1024 // sourceSize.height: 1024 // } onClosing: { console.log("Minimizing to systray..."); hide(); } function toggleShow() { if (visible) { hide(); } else { show(); raise(); requestActivate(); } } Component.onCompleted: { systrayIcon.activated.connect(toggleShow); systrayIcon.messageClicked.connect(toggleShow); // roomsList.model = Ruqola.roomModel(); // timer.start(); // timer.fire(); } /* Timer { id: timer interval: 1000 onTriggered: { // console.log("FIRE"); switch (Ruqola.loginStatus) { case Ruqola.NotConnected: statusText = qsTr("Not connected."); break; case Ruqola.LoggedIn: statusText = qsTr("Connected to " + Ruqola.serverURL); break; } } repeat: true }*/ // onStatusTextChanged: timer.restart(); } diff --git a/src/qml/Message.qml b/src/qml/Message.qml index 3fc5d004..c93043ba 100644 --- a/src/qml/Message.qml +++ b/src/qml/Message.qml @@ -1,101 +1,156 @@ /* * * Copyright 2016 Riccardo Iaconelli * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as * published by the Free Software Foundation; either version 2 of * the License or (at your option) version 3 or any later version * accepted by the membership of KDE e.V. (or its successor approved * by the membership of KDE e.V.), which shall act as a proxy * defined in Section 14 of version 3 of the license. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program. If not, see . * */ import QtQuick 2.0 // import "marked.js" as Markdown import "js/marked.js" as MarkDown; import QtQuick.Controls 2.2 +import org.kde.kirigami 2.1 as Kirigami Rectangle { function getTextFor(type) { // console.log(JSON.stringify(markdown)); + if (type === "uj") { return qsTr("has joined the channel"); } else if (type === "ul") { return qsTr("has left the channel"); } else if (type === "room_changed_topic") { return qsTr("changed topic to \"%1\"").arg(i_messageText) } else if (type === "au") { return qsTr("added %1 to the conversation").arg(i_messageText) } else if (type === "r") { return qsTr("changed room name to \"%1\"").arg(i_messageText) } else if (type === "room_changed_description") { return qsTr("changed room description to \"%1\"").arg(i_messageText) } else { console.log("Unkown type for message"); console.log(type); console.log(i_messageText) return qsTr("Unknown action!"); } } + +// function timestampConverter(time){ +// var ret; +// var date = new Date(time*1000);// hours part from the timestamp +// var hours = date.getHours(); // minutes part from the timestamp +// var minutes = date.getMinutes();// seconds part from the timestamp +// var seconds = date.getSeconds(); +// var day; +// var num = date.getDate(); +// var year = date.getFullYear(); // will display time in hh:mm:ss format +// var formattedTime = hours + ':' + minutes + ':' + seconds; +// var formattedDate = day + " " + num + " " + year; +// +// console.debug("Time : " + formattedTime + " " + formattedDate); +// } + property string i_messageText property string i_username property bool i_systemMessage property string i_systemMessageType + property string i_avatar + property var i_timestamp id: messageMain color: "#eeeeee" implicitHeight: textLabel.contentHeight + +// Component.onCompleted: { +// // console.log(i_timestamp) +// var date = new Date(i_timestamp); +// var hours = date.getHours(); // minutes part from the timestamp +// var minutes = date.getMinutes();// seconds part from the timestamp +// var seconds = date.getSeconds(); +// var num = date.getDate(); +// var formattedTime = hours + ':' + minutes + ':' + seconds; +// +// var iso = date.toISOString(); +// // console.log(d.format("HH")) +// // var dd = Date.fromLocaleString(Qt.locale(), d) +// console.log(date.toISOString()); +// console.log(formattedTime); +// console.log(); +// +// } // implicitWidth: 200 +// Row { +// anchors.fill: parent +// spacing: Kirigami.Units.smallSpacing +// width: 200 + Label { + id: timeLabel + text: "["+(new Date(i_timestamp)).toLocaleTimeString(Locale.ShortFormat)+"]" + + anchors.top: parent.top + anchors.bottom: parent.bottom + anchors.left: parent.left + + z:1 + } + + Label { + color: i_systemMessage? "#999" : "#555" + text: i_username + id: usernameLabel + clip: true + + horizontalAlignment: Text.AlignRight + + anchors.top: parent.top + anchors.bottom: parent.bottom + anchors.left: timeLabel.left + + width: 100 + } - Text { - color: i_systemMessage? "#999" : "#555" - text: i_username - id: usernameLabel - width: 80 - horizontalAlignment: Text.AlignRight - - anchors.top: parent.top - anchors.bottom: parent.bottom - anchors.left: parent.left - } - - Label { - color: i_systemMessage? "#999" : "#111" - id: textLabel - text: i_systemMessage? getTextFor(i_systemMessageType) : MarkDown.md2html(i_messageText) - + Label { + color: i_systemMessage? "#999" : "#111" + id: textLabel + text: i_systemMessage? getTextFor(i_systemMessageType) : MarkDown.md2html(i_messageText) - anchors.top: parent.top - anchors.bottom: parent.bottom - - anchors.left: usernameLabel.right - anchors.right: parent.right - -// width: - - wrapMode: Label.Wrap - anchors.leftMargin: 5 + anchors.top: parent.top + anchors.bottom: parent.bottom + + anchors.left: usernameLabel.right + anchors.right: parent.right + + // width: + + wrapMode: Label.Wrap -// visible: !i_systemMessage - // horizontalAlignment: Text.AlignRight - } + anchors.leftMargin: 5 + // visible: !i_systemMessage + // horizontalAlignment: Text.AlignRight + } +// } }