[SCM] ktp-text-ui packaging branch, master, updated. debian/15.12.1-1-1918-gdf4b0ec

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=a5e6ef2

The following commit has been merged in the master branch:
commit a5e6ef211eded5665f4e9c24bcda07c296878dd8
Author: Lasath Fernando <kde at lasath.org>
Date:   Mon Feb 25 16:01:05 2013 -0500

    Update Youtube filter
    
    Makes it work with all the changes to MessageProcessor and it also
    addresses the security issues pointed out by Nikita Skovoroda in
    https://git.reviewboard.kde.org/r/106083/
---
 filters/CMakeLists.txt                             |  2 +-
 filters/youtube/CMakeLists.txt                     |  3 +--
 .../ktptextui_message_filter_youtube.desktop       |  5 +++--
 filters/youtube/youtube-filter.cpp                 | 26 ++++++++++++----------
 filters/youtube/youtube-filter.h                   | 10 +++------
 5 files changed, 22 insertions(+), 24 deletions(-)

diff --git a/filters/CMakeLists.txt b/filters/CMakeLists.txt
index 77155e0..ac25a17 100644
--- a/filters/CMakeLists.txt
+++ b/filters/CMakeLists.txt
@@ -4,6 +4,7 @@ add_subdirectory(formatting)
 add_subdirectory(images)
 #Commented out until https://bugs.kde.org/show_bug.cgi?id=304740
 # add_subdirectory(searchexpansion)
+add_subdirectory(youtube)
 
 
 IF (EXISTS "${KDE4_DBUS_INTERFACES_DIR}/org.kde.KSpeech.xml")
@@ -15,4 +16,3 @@ if(HAS_KTTS)
 endif(HAS_KTTS)
 
 macro_log_feature(HAS_KTTS "KTTSD" "KDE Text to Speech Deamon" "" FALSE "" "Needed for optional tts message plugin")
-add_subdirectory(youtube)
diff --git a/filters/youtube/CMakeLists.txt b/filters/youtube/CMakeLists.txt
index 69f73ec..3d4eb5a 100644
--- a/filters/youtube/CMakeLists.txt
+++ b/filters/youtube/CMakeLists.txt
@@ -9,10 +9,9 @@ kde4_add_plugin (ktptextui_message_filter_youtube
 target_link_libraries (ktptextui_message_filter_youtube
     ktpchat
     ${QT_LIBRARIES}
-    ${KDE4_KDEUI_LIBS}
     ${KDE4_KIO_LIBS}
     ${TELEPATHY_QT4_LIBRARIES}
-    ${KDE4_KEMOTICONS_LIBS}
+    ${KTP_LIBRARIES}
 )
 
 # Install:
diff --git a/filters/youtube/ktptextui_message_filter_youtube.desktop b/filters/youtube/ktptextui_message_filter_youtube.desktop
index b2ed0d9..5061902 100644
--- a/filters/youtube/ktptextui_message_filter_youtube.desktop
+++ b/filters/youtube/ktptextui_message_filter_youtube.desktop
@@ -9,7 +9,8 @@ X-KDE-Library=ktptextui_message_filter_youtube
 X-KDE-PluginInfo-Author=Lasath Fernando
 X-KDE-PluginInfo-Email=kde at lasath.org
 X-KDE-PluginInfo-Name=youtube
-X-KDE-PluginInfo-Version=0.4
-X-KDE-PluginInfo-Website=http://community.kde.org/Real-Time_Communication_and_Collaboration
+X-KDE-PluginInfo-Version=0.5
+X-KDE-PluginInfo-Website=http://community.kde.org/KTp
 X-KDE-PluginInfo-License=GPL
 X-KDE-PluginInfo-EnabledByDefault=true
+X-KTp-PluginInfo-Version=2
\ No newline at end of file
diff --git a/filters/youtube/youtube-filter.cpp b/filters/youtube/youtube-filter.cpp
index 43af3ba..74729a3 100644
--- a/filters/youtube/youtube-filter.cpp
+++ b/filters/youtube/youtube-filter.cpp
@@ -23,24 +23,19 @@
 #include <KUrl>
 #include <KUriFilter>
 
-class YoutubeFilter::Private
-{
-public:
-};
-
 YoutubeFilter::YoutubeFilter(QObject *parent, const QVariantList &) :
-    AbstractMessageFilter(parent), d(new Private)
+    AbstractMessageFilter(parent)
 {
 }
 
 YoutubeFilter::~YoutubeFilter()
 {
-    delete d;
 }
 
-void YoutubeFilter::filterMessage(Message &message)
+void YoutubeFilter::filterMessage(KTp::Message &message, const KTp::MessageContext&)
 {
-    QString html = QLatin1String(
+    static const QString html = QLatin1String(
+        "<br />
"
         "<iframe class=\"youtube-player\" "
             "type=\"text/html\""
             "style=\"max-width:100%;max-height:100%\""
@@ -49,13 +44,20 @@ void YoutubeFilter::filterMessage(Message &message)
         "</iframe>"
     );
 
+    static const QRegExp validId(QLatin1String("[a-zA-Z0-9_-]+"));
+
     Q_FOREACH (QVariant var, message.property("Urls").toList()) {
         KUrl url = qvariant_cast<KUrl>(var);
-        if (url.host() == QLatin1String("www.youtube.com")) {
+        if (url.host() == QLatin1String("www.youtube.com") ||
+                url.host() == QLatin1String("youtube.com")) {
             kDebug() << "found youtube url :" << url.url();
-            kDebug() << "v =" << url.queryItemValue(QLatin1String("v"));
 
-            message.appendMessagePart(html.arg(url.queryItemValue(QLatin1String("v"))));
+            QString v = url.queryItemValue(QLatin1String("v"));
+            kDebug() << "v =" << v;
+
+            if (v.contains(validId)){
+                message.appendMessagePart(html.arg(url.queryItemValue(QLatin1String("v"))));
+            }
         }
     }
 }
diff --git a/filters/youtube/youtube-filter.h b/filters/youtube/youtube-filter.h
index 0dadfed..dbea04a 100644
--- a/filters/youtube/youtube-filter.h
+++ b/filters/youtube/youtube-filter.h
@@ -19,20 +19,16 @@
 #ifndef YOUTUBE_FILTER_H
 #define YOUTUBE_FILTER_H
 
-#include <KTp/AbstractMessageFilter>
+#include <KTp/abstract-message-filter.h>
 
-class YoutubeFilter : public AbstractMessageFilter
+class YoutubeFilter : public KTp::AbstractMessageFilter
 {
     Q_OBJECT
 
 public:
     YoutubeFilter(QObject *parent, const QVariantList &);
     virtual ~YoutubeFilter();
-    virtual void filterMessage(Message &message);
-
-private:
-    class Private;
-    Private *d;
+    virtual void filterMessage(KTp::Message &message, const KTp::MessageContext &context);
 };
 
 #endif // YOUTUBE_FILTER_H

-- 
ktp-text-ui packaging