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

1
matrix/messageeventmodel.h
View File

@ -44,6 +44,7 @@ class MessageEventModel: public QAbstractListModel
private:
QMatrixClient::Room* m_currentRoom = nullptr;
QString lastReadEventId;
int nextNewerRow = -1;
QDateTime makeMessageTimestamp(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.Layouts 1.3
import Matrique 0.1

2
qml/form/ListForm.qml
View File

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

14
qml/form/RoomForm.qml
View File

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