From 1b27b1a4e235172dc602f6a7e186f9a4ce365348 Mon Sep 17 00:00:00 2001 From: Tobias Fella Date: Sat, 26 Aug 2023 02:30:56 +0200 Subject: [PATCH] Make sure we don't load link previews when they're not enabled Fixes #591 --- src/linkpreviewer.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/linkpreviewer.cpp b/src/linkpreviewer.cpp index 29e0228b1..ae731a787 100644 --- a/src/linkpreviewer.cpp +++ b/src/linkpreviewer.cpp @@ -8,6 +8,7 @@ #include #include +#include "neochatconfig.h" #include "neochatroom.h" using namespace Quotient; @@ -19,6 +20,10 @@ LinkPreviewer::LinkPreviewer(QObject *parent, NeoChatRoom *room, const QUrl &url , m_url(url) { loadUrlPreview(); + if (m_currentRoom) { + connect(m_currentRoom, &NeoChatRoom::urlPreviewEnabledChanged, this, &LinkPreviewer::loadUrlPreview); + } + connect(NeoChatConfig::self(), &NeoChatConfig::ShowLinkPreviewChanged, this, &LinkPreviewer::loadUrlPreview); } bool LinkPreviewer::loaded() const @@ -57,6 +62,9 @@ void LinkPreviewer::setUrl(QUrl url) void LinkPreviewer::loadUrlPreview() { + if (!m_currentRoom || !NeoChatConfig::showLinkPreview() || !m_currentRoom->urlPreviewEnabled()) { + return; + } if (m_url.scheme() == QStringLiteral("https")) { m_loaded = false; Q_EMIT loadedChanged();