tan
/
Spectral
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Switch to release branch.

This commit is contained in:
Black Hat 2018-07-08 20:54:06 +08:00
parent d83d00f967
commit d6b5cba61f
6 changed files with 275 additions and 242 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
matrix/libqmatrixclient

@ -1 +1 @@
Subproject commit c4acd8ece12622164caf396c06bd0f22ab3589f7 Subproject commit fe4bedeb349ed867feba7cb3c996a97f726d2083

182
matrix/messageeventmodel.cpp
View File

@ -31,15 +31,16 @@ void MessageEventModel::setRoom(QMatrixClient::Room* room)
return; return;
beginResetModel(); beginResetModel();
if(m_currentRoom) if( m_currentRoom )
{ {
m_currentRoom->disconnect(this); m_currentRoom->disconnect( this );
qDebug() << "Disconnected from" << m_currentRoom->id(); qDebug() << "Disconnected from" << m_currentRoom->id();
} }
m_currentRoom = room; m_currentRoom = room;
if(room) if( room )
{ {
lastReadEventId = room->readMarkerEventId();
using namespace QMatrixClient; using namespace QMatrixClient;
connect(m_currentRoom, &Room::aboutToAddNewMessages, this, connect(m_currentRoom, &Room::aboutToAddNewMessages, this,
[=](RoomEventsRange events) [=](RoomEventsRange events)
@ -49,11 +50,21 @@ void MessageEventModel::setRoom(QMatrixClient::Room* room)
connect(m_currentRoom, &Room::aboutToAddHistoricalMessages, this, connect(m_currentRoom, &Room::aboutToAddHistoricalMessages, this,
[=](RoomEventsRange events) [=](RoomEventsRange events)
{ {
if (rowCount() > 0)
nextNewerRow = rowCount() - 1;
beginInsertRows(QModelIndex(), rowCount(), beginInsertRows(QModelIndex(), rowCount(),
rowCount() + int(events.size()) - 1); rowCount() + int(events.size()) - 1);
}); });
connect(m_currentRoom, &Room::addedMessages, connect(m_currentRoom, &Room::addedMessages, this,
this, &MessageEventModel::endInsertRows); [=] {
if (nextNewerRow > -1)
{
const auto idx = index(nextNewerRow);
emit dataChanged(idx, idx);
nextNewerRow = -1;
}
endInsertRows();
});
connect(m_currentRoom, &Room::readMarkerMoved, this, [this] { connect(m_currentRoom, &Room::readMarkerMoved, this, [this] {
refreshEventRoles( refreshEventRoles(
std::exchange(lastReadEventId, std::exchange(lastReadEventId,
@ -75,8 +86,8 @@ void MessageEventModel::setRoom(QMatrixClient::Room* room)
this, &MessageEventModel::refreshEvent); this, &MessageEventModel::refreshEvent);
qDebug() << "Connected to room" << room->id() qDebug() << "Connected to room" << room->id()
<< "as" << room->localUser()->id(); << "as" << room->localUser()->id();
} } else
lastReadEventId = room ? room->readMarkerEventId() : ""; lastReadEventId.clear();
endResetModel(); endResetModel();
emit roomChanged(); emit roomChanged();
} }
@ -167,62 +178,65 @@ QVariant MessageEventModel::data(const QModelIndex& index, int role) const
auto reason = ti->redactedBecause()->reason(); auto reason = ti->redactedBecause()->reason();
if (reason.isEmpty()) if (reason.isEmpty())
return tr("Redacted"); return tr("Redacted");
else
return tr("Redacted: %1") return tr("Redacted: %1")
.arg(ti->redactedBecause()->reason()); .arg(ti->redactedBecause()->reason());
} }
return visit(*ti if( ti->type() == EventType::RoomMessage )
, [this] (const RoomMessageEvent& e) -> QVariant { {
using namespace MessageEventContent; using namespace MessageEventContent;
if (e.hasTextContent() && e.mimeType().name() != "text/plain") auto* e = ti.viewAs<RoomMessageEvent>();
return static_cast<const TextContent*>(e.content())->body; if (e->hasTextContent() && e->mimeType().name() != "text/plain")
if (e.hasFileContent()) return static_cast<const TextContent*>(e->content())->body;
if (e->hasFileContent())
{ {
auto fileCaption = e.content()->fileInfo()->originalName; auto fileCaption = e->content()->fileInfo()->originalName;
if (fileCaption.isEmpty()) if (fileCaption.isEmpty())
fileCaption = m_currentRoom->prettyPrint(e.plainBody()); fileCaption = m_currentRoom->prettyPrint(e->plainBody());
if (fileCaption.isEmpty()) if (fileCaption.isEmpty())
return tr("a file"); return tr("a file");
} }
return m_currentRoom->prettyPrint(e.plainBody()); return m_currentRoom->prettyPrint(e->plainBody());
} }
, [this] (const RoomMemberEvent& e) -> QVariant { if( ti->type() == EventType::RoomMember )
{
auto* e = ti.viewAs<RoomMemberEvent>();
// FIXME: Rewind to the name that was at the time of this event // FIXME: Rewind to the name that was at the time of this event
QString subjectName = m_currentRoom->roomMembername(e.userId()); QString subjectName = m_currentRoom->roomMembername(e->userId());
// The below code assumes senderName output in AuthorRole // The below code assumes senderName output in AuthorRole
switch( e.membership() ) switch( e->membership() )
{ {
case MembershipType::Invite: case MembershipType::Invite:
if (e.repeatsState()) if (e->repeatsState())
return tr("reinvited %1 to the room").arg(subjectName); return tr("reinvited %1 to the room").arg(subjectName);
FALLTHROUGH; // [[fallthrough]]
case MembershipType::Join: case MembershipType::Join:
{ {
if (e.repeatsState()) if (e->repeatsState())
return tr("joined the room (repeated)"); return tr("joined the room (repeated)");
if (!e.prevContent() || if (!e->prev_content() ||
e.membership() != e.prevContent()->membership) e->membership() != e->prev_content()->membership)
{ {
return e.membership() == MembershipType::Invite return e->membership() == MembershipType::Invite
? tr("invited %1 to the room").arg(subjectName) ? tr("invited %1 to the room").arg(subjectName)
: tr("joined the room"); : tr("joined the room");
} }
QString text {}; QString text {};
if (e.displayName() != e.prevContent()->displayName) if (e->displayName() != e->prev_content()->displayName)
{ {
if (e.displayName().isEmpty()) if (e->displayName().isEmpty())
text = tr("cleared the display name"); text = tr("cleared the display name");
else else
text = tr("changed the display name to %1") text = tr("changed the display name to %1")
.arg(e.displayName()); .arg(e->displayName());
} }
if (e.avatarUrl() != e.prevContent()->avatarUrl) if (e->avatarUrl() != e->prev_content()->avatarUrl)
{ {
if (!text.isEmpty()) if (!text.isEmpty())
text += " and "; text += " and ";
if (e.avatarUrl().isEmpty()) if (e->avatarUrl().isEmpty())
text += tr("cleared the avatar"); text += tr("cleared the avatar");
else else
text += tr("updated the avatar"); text += tr("updated the avatar");
@ -230,53 +244,67 @@ QVariant MessageEventModel::data(const QModelIndex& index, int role) const
return text; return text;
} }
case MembershipType::Leave: case MembershipType::Leave:
if (e.prevContent() && if (e->prev_content() &&
e.prevContent()->membership == MembershipType::Ban) e->prev_content()->membership == MembershipType::Ban)
{ {
return (e.senderId() != e.userId()) if (e->senderId() != e->userId())
? tr("unbanned %1").arg(subjectName) return tr("unbanned %1").arg(subjectName);
: tr("self-unbanned"); else
return tr("self-unbanned");
} }
return (e.senderId() != e.userId()) if (e->senderId() != e->userId())
? tr("has put %1 out of the room").arg(subjectName) return tr("has put %1 out of the room").arg(subjectName);
: tr("left the room"); else
return tr("left the room");
case MembershipType::Ban: case MembershipType::Ban:
return (e.senderId() != e.userId()) if (e->senderId() != e->userId())
? tr("banned %1 from the room").arg(subjectName) return tr("banned %1 from the room").arg(subjectName);
: tr("self-banned from the room"); else
return tr("self-banned from the room");
case MembershipType::Knock: case MembershipType::Knock:
return tr("knocked"); return tr("knocked");
default: case MembershipType::Undefined:
;
}
return tr("made something unknown"); return tr("made something unknown");
} }
, [] (const RoomAliasesEvent& e) -> QVariant {
return tr("set aliases to: %1").arg(e.aliases().join(", "));
} }
, [] (const RoomCanonicalAliasEvent& e) -> QVariant { if( ti->type() == EventType::RoomAliases )
return (e.alias().isEmpty()) {
? tr("cleared the room main alias") auto* e = ti.viewAs<RoomAliasesEvent>();
: tr("set the room main alias to: %1").arg(e.alias()); return tr("set aliases to: %1").arg(e->aliases().join(", "));
} }
, [] (const RoomNameEvent& e) -> QVariant { if( ti->type() == EventType::RoomCanonicalAlias )
return (e.name().isEmpty()) {
? tr("cleared the room name") auto* e = ti.viewAs<RoomCanonicalAliasEvent>();
: tr("set the room name to: %1").arg(e.name()); if (e->alias().isEmpty())
return tr("cleared the room main alias");
else
return tr("set the room main alias to: %1").arg(e->alias());
} }
, [] (const RoomTopicEvent& e) -> QVariant { if( ti->type() == EventType::RoomName )
return (e.topic().isEmpty()) {
? tr("cleared the topic") auto* e = ti.viewAs<RoomNameEvent>();
: tr("set the topic to: %1").arg(e.topic()); if (e->name().isEmpty())
return tr("cleared the room name");
else
return tr("set the room name to: %1").arg(e->name());
} }
, [] (const RoomAvatarEvent&) -> QVariant { if( ti->type() == EventType::RoomTopic )
{
auto* e = ti.viewAs<RoomTopicEvent>();
if (e->topic().isEmpty())
return tr("cleared the topic");
else
return tr("set the topic to: %1").arg(e->topic());
}
if( ti->type() == EventType::RoomAvatar )
{
return tr("changed the room avatar"); return tr("changed the room avatar");
} }
, [] (const EncryptionEvent&) -> QVariant { if( ti->type() == EventType::RoomEncryption )
{
return tr("activated End-to-End Encryption"); return tr("activated End-to-End Encryption");
} }
, tr("Unknown Event") return tr("Unknown Event");
);
} }
if( role == Qt::ToolTipRole ) if( role == Qt::ToolTipRole )
@ -289,9 +317,9 @@ QVariant MessageEventModel::data(const QModelIndex& index, int role) const
if (ti->isStateEvent()) if (ti->isStateEvent())
return "state"; return "state";
if (auto e = ti.viewAs<RoomMessageEvent>()) if (ti->type() == EventType::RoomMessage)
{ {
switch (e->msgtype()) switch (ti.viewAs<RoomMessageEvent>()->msgtype())
{ {
case MessageEventType::Emote: case MessageEventType::Emote:
return "emote"; return "emote";
@ -307,12 +335,10 @@ QVariant MessageEventModel::data(const QModelIndex& index, int role) const
return "message"; return "message";
} }
} }
return "other"; return "other";
} }
if (role == EventResolvedTypeRole)
return EventTypeRegistry::getMatrixType(ti->type());
if( role == TimeRole ) if( role == TimeRole )
return makeMessageTimestamp(timelineIt); return makeMessageTimestamp(timelineIt);
@ -328,7 +354,7 @@ QVariant MessageEventModel::data(const QModelIndex& index, int role) const
if (role == ContentTypeRole) if (role == ContentTypeRole)
{ {
if (is<RoomMessageEvent>(*ti)) if (ti->type() == EventType::RoomMessage)
{ {
const auto& contentType = const auto& contentType =
ti.viewAs<RoomMessageEvent>()->mimeType().name(); ti.viewAs<RoomMessageEvent>()->mimeType().name();
@ -342,12 +368,14 @@ QVariant MessageEventModel::data(const QModelIndex& index, int role) const
if (ti->isRedacted()) if (ti->isRedacted())
{ {
auto reason = ti->redactedBecause()->reason(); auto reason = ti->redactedBecause()->reason();
return (reason.isEmpty()) if (reason.isEmpty())
? tr("Redacted") return tr("Redacted");
: tr("Redacted: %1").arg(ti->redactedBecause()->reason()); else
return tr("Redacted: %1")
.arg(ti->redactedBecause()->reason());
} }
if (is<RoomMessageEvent>(*ti)) if( ti->type() == EventType::RoomMessage )
{ {
using namespace MessageEventContent; using namespace MessageEventContent;
@ -365,16 +393,12 @@ QVariant MessageEventModel::data(const QModelIndex& index, int role) const
} }
} }
if( role == HighlightRole )
return QVariant();
if( role == ReadMarkerRole ) if( role == ReadMarkerRole )
return ti->id() == lastReadEventId; return ti->id() == lastReadEventId;
if( role == SpecialMarksRole ) if( role == SpecialMarksRole )
{ {
if (auto e = ti.viewAs<StateEventBase>()) if (ti->isStateEvent() && ti.viewAs<StateEventBase>()->repeatsState())
if (e->repeatsState())
return "hidden"; return "hidden";
return ti->isRedacted() ? "redacted" : ""; return ti->isRedacted() ? "redacted" : "";
} }
@ -384,7 +408,7 @@ QVariant MessageEventModel::data(const QModelIndex& index, int role) const
if( role == LongOperationRole ) if( role == LongOperationRole )
{ {
if (is<RoomMessageEvent>(*ti) && if (ti->type() == EventType::RoomMessage &&
ti.viewAs<RoomMessageEvent>()->hasFileContent()) ti.viewAs<RoomMessageEvent>()->hasFileContent())
{ {
auto info = m_currentRoom->fileTransferInfo(ti->id()); auto info = m_currentRoom->fileTransferInfo(ti->id());
@ -424,5 +448,5 @@ QHash<int, QByteArray> MessageEventModel::roleNames() const
roles[SpecialMarksRole] = "marks"; roles[SpecialMarksRole] = "marks";
roles[LongOperationRole] = "progressInfo"; roles[LongOperationRole] = "progressInfo";
roles[EventResolvedTypeRole] = "eventResolvedType"; roles[EventResolvedTypeRole] = "eventResolvedType";
return roles; return roles;
} }

1
matrix/messageeventmodel.h
View File

@ -44,6 +44,7 @@ class MessageEventModel: public QAbstractListModel
private: private:
QMatrixClient::Room* m_currentRoom = nullptr; QMatrixClient::Room* m_currentRoom = nullptr;
QString lastReadEventId; QString lastReadEventId;
int nextNewerRow = -1;
QDateTime makeMessageTimestamp(QMatrixClient::Room::rev_iter_t baseIt) const; QDateTime makeMessageTimestamp(QMatrixClient::Room::rev_iter_t baseIt) const;
QString makeDateString(QMatrixClient::Room::rev_iter_t baseIt) const; QString makeDateString(QMatrixClient::Room::rev_iter_t baseIt) const;

2
qml/Room.qml
View File

@ -1,4 +1,4 @@
import QtQuick 2.10 import QtQuick 2.11
import QtQuick.Controls 2.3 import QtQuick.Controls 2.3
import QtQuick.Layouts 1.3 import QtQuick.Layouts 1.3
import Matrique 0.1 import Matrique 0.1

2
qml/form/ListForm.qml
View File

@ -180,6 +180,8 @@ Item {
} }
highlightMoveDuration: 250 highlightMoveDuration: 250
currentIndex: -1
ScrollBar.vertical: ScrollBar { id: scrollBar } ScrollBar.vertical: ScrollBar { id: scrollBar }
model: delegateModel model: delegateModel

14
qml/form/RoomForm.qml
View File

@ -16,7 +16,7 @@ Item {
background: Item { background: Item {
anchors.fill: parent anchors.fill: parent
visible: currentRoom === null visible: currentRoom == null
Pane { Pane {
anchors.fill: parent anchors.fill: parent
} }
@ -32,7 +32,7 @@ Item {
anchors.fill: parent anchors.fill: parent
spacing: 0 spacing: 0
visible: currentRoom !== null visible: currentRoom != null
Pane { Pane {
z: 10 z: 10
@ -61,7 +61,7 @@ Item {
Label { Label {
Layout.fillWidth: true Layout.fillWidth: true
text: currentRoom !== null ? currentRoom.displayName : "" text: currentRoom != null ? currentRoom.displayName : ""
font.pointSize: 16 font.pointSize: 16
elide: Text.ElideRight elide: Text.ElideRight
wrapMode: Text.NoWrap wrapMode: Text.NoWrap
@ -69,7 +69,7 @@ Item {
Label { Label {
Layout.fillWidth: true Layout.fillWidth: true
text: currentRoom !== null ? currentRoom.topic : "" text: currentRoom != null ? currentRoom.topic : ""
elide: Text.ElideRight elide: Text.ElideRight
wrapMode: Text.NoWrap wrapMode: Text.NoWrap
} }
@ -91,6 +91,8 @@ Item {
model: MessageEventModel{ model: MessageEventModel{
id: messageEventModel id: messageEventModel
room: currentRoom room: currentRoom
onModelReset: currentRoom.getPreviousContent(50)
} }
delegate: Row { delegate: Row {
readonly property bool sentByMe: author === currentRoom.localUser readonly property bool sentByMe: author === currentRoom.localUser
@ -127,6 +129,10 @@ Item {
} }
ScrollBar.vertical: ScrollBar { /*anchors.left: messageListView.right*/ } ScrollBar.vertical: ScrollBar { /*anchors.left: messageListView.right*/ }
onAtYBeginningChanged: {
if(currentRoom && atYBeginning) currentRoom.getPreviousContent(50)
}
} }
Pane { Pane {