Compare commits
1 Commits
master
...
work/redst
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
fb63ac5642 |
@@ -578,8 +578,8 @@ MessageComponent MessageContentModel::linkPreviewComponent(const QUrl &link)
|
|||||||
}
|
}
|
||||||
if (linkPreviewer->loaded()) {
|
if (linkPreviewer->loaded()) {
|
||||||
return MessageComponent{MessageComponentType::LinkPreview, QString(), {{"link"_ls, link}}};
|
return MessageComponent{MessageComponentType::LinkPreview, QString(), {{"link"_ls, link}}};
|
||||||
} else {
|
}
|
||||||
connect(linkPreviewer, &LinkPreviewer::loadedChanged, [this, link]() {
|
connect(linkPreviewer, &LinkPreviewer::loadedChanged, this, [this, link]() {
|
||||||
const auto linkPreviewer = dynamic_cast<NeoChatConnection *>(m_room->connection())->previewerForLink(link);
|
const auto linkPreviewer = dynamic_cast<NeoChatConnection *>(m_room->connection())->previewerForLink(link);
|
||||||
if (linkPreviewer != nullptr && linkPreviewer->loaded()) {
|
if (linkPreviewer != nullptr && linkPreviewer->loaded()) {
|
||||||
for (auto &component : m_components) {
|
for (auto &component : m_components) {
|
||||||
@@ -593,7 +593,6 @@ MessageComponent MessageContentModel::linkPreviewComponent(const QUrl &link)
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
return MessageComponent{MessageComponentType::LinkPreviewLoad, QString(), {{"link"_ls, link}}};
|
return MessageComponent{MessageComponentType::LinkPreviewLoad, QString(), {{"link"_ls, link}}};
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
QList<MessageComponent> MessageContentModel::addLinkPreviews(QList<MessageComponent> inputComponents)
|
QList<MessageComponent> MessageContentModel::addLinkPreviews(QList<MessageComponent> inputComponents)
|
||||||
|
|||||||
@@ -84,7 +84,6 @@ void MessageEventModel::setRoom(NeoChatRoom *room)
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (m_currentRoom) {
|
|
||||||
// HACK: Reset the model to a null room first to make sure QML dismantles
|
// HACK: Reset the model to a null room first to make sure QML dismantles
|
||||||
// last room's objects before the room is actually changed
|
// last room's objects before the room is actually changed
|
||||||
beginResetModel();
|
beginResetModel();
|
||||||
@@ -98,7 +97,6 @@ void MessageEventModel::setRoom(NeoChatRoom *room)
|
|||||||
m_contentModels.clear();
|
m_contentModels.clear();
|
||||||
m_reactionModels.clear();
|
m_reactionModels.clear();
|
||||||
m_readMarkerModels.clear();
|
m_readMarkerModels.clear();
|
||||||
}
|
|
||||||
|
|
||||||
beginResetModel();
|
beginResetModel();
|
||||||
m_currentRoom = room;
|
m_currentRoom = room;
|
||||||
|
|||||||
Reference in New Issue
Block a user