Interim checking towards protocol handling

src/libtomahawk/network/servent.cpp

@@ -123,15 +123,17 @@ Servent::startListening( QHostAddress ha, bool upnp, int port )
 
 
 QString
-Servent::createConnectionKey( const QString& name )
+Servent::createConnectionKey( const QString& name, const QString &nodeid, const QString &key )
 {
     Q_ASSERT( this->thread() == QThread::currentThread() );
 
-    QString key = uuid();
+    QString _key = ( key.isEmpty() ? uuid() : key );
     ControlConnection* cc = new ControlConnection( this );
     cc->setName( name.isEmpty() ? QString( "KEY(%1)" ).arg( key ) : name );
-    registerOffer( key, cc );
+    if( !nodeid.isEmpty() )
-    return key;
+        cc->setId( nodeid );
+    registerOffer( _key, cc );
+    return _key;
 }
 
 

src/libtomahawk/network/servent.h

@@ -78,7 +78,7 @@ public:
     int port() const { return m_port; }
 
     // creates new token that allows a controlconnection to be set up
-    QString createConnectionKey( const QString& name = "" );
+    QString createConnectionKey( const QString& name = "", const QString &nodeid = "", const QString &key = "" );
 
     void registerOffer( const QString& key, Connection* conn );
 

src/sip/twitter/twitter.cpp

@@ -2,6 +2,7 @@
 
 #include <QtPlugin>
 #include <QRegExp>
+#include <QStringList>
 
 #include <qtweetaccountverifycredentials.h>
 #include <qtweetuser.h>
@@ -9,6 +10,8 @@
 
 #include <utils/tomahawkutils.h>
 #include <tomahawksettings.h>
+#include <database/database.h>
+#include <network/servent.h>
 
 
 TwitterPlugin::TwitterPlugin()
@@ -52,9 +55,10 @@ TwitterPlugin::connectPlugin( bool /*startup*/ )
     m_cachedPeers = settings->twitterCachedPeers();
     QList<QString> peerlist = m_cachedPeers.keys();
     qStableSort( peerlist.begin(), peerlist.end() );
-    foreach( QString key, peerlist )
+    foreach( QString screenName, peerlist )
     {
-        qDebug() << "TwitterPlugin found cached peer with host " << m_cachedPeers[key].toHash()["host"].toString() << " and port " << m_cachedPeers[key].toHash()["port"].toString();
+        QHash< QString, QVariant > cachedPeer = m_cachedPeers[screenName].toHash();
+        QMetaObject::invokeMethod( this, "registerOffer", Q_ARG( QString, screenName ), QGenericArgument( "QHash< QString, QVariant >", (const void*)&cachedPeer ) );
     }
     
     if ( settings->twitterOAuthToken().isEmpty() || settings->twitterOAuthTokenSecret().isEmpty() )
@@ -72,10 +76,6 @@ TwitterPlugin::connectPlugin( bool /*startup*/ )
     QTweetAccountVerifyCredentials *credVerifier = new QTweetAccountVerifyCredentials( m_twitterAuth.data(), this );
     connect( credVerifier, SIGNAL( parsedUser(const QTweetUser &) ), SLOT( connectAuthVerifyReply(const QTweetUser &) ) );
     credVerifier->verify();
-    /*
-    QObject::connect( m_zeroconf, SIGNAL( tomahawkHostFound( const QString&, int, const QString&, const QString& ) ),
-                                    SLOT( lanHostFound( const QString&, int, const QString&, const QString& ) ) );
-    */
 
     return true;
 }
@@ -110,9 +110,11 @@ TwitterPlugin::connectAuthVerifyReply( const QTweetUser &user )
             m_friendsTimeline = QWeakPointer<QTweetFriendsTimeline>( new QTweetFriendsTimeline( m_twitterAuth.data(), this ) );
             m_mentions = QWeakPointer<QTweetMentions>( new QTweetMentions( m_twitterAuth.data(), this ) );
             m_directMessages = QWeakPointer<QTweetDirectMessages>( new QTweetDirectMessages( m_twitterAuth.data(), this ) );
+            m_directMessageNew = QWeakPointer<QTweetDirectMessageNew>( new QTweetDirectMessageNew( m_twitterAuth.data(), this ) );
             connect( m_friendsTimeline.data(), SIGNAL( parsedStatuses(const QList< QTweetStatus > &) ), SLOT( friendsTimelineStatuses(const QList<QTweetStatus> &) ) );
             connect( m_mentions.data(), SIGNAL( parsedStatuses(const QList< QTweetStatus > &) ), SLOT( mentionsStatuses(const QList<QTweetStatus> &) ) );
-            connect( m_directMessages.data(), SIGNAL( parsedStatuses(const QList< QTweetDMStatus > &) ), SLOT( mentionsStatuses(const QList<QTweetDMStatus> &) ) );
+            connect( m_directMessages.data(), SIGNAL( parsedStatuses(const QList< QTweetDMStatus > &) ), SLOT( directMessages(const QList<QTweetDMStatus> &) ) );
+            connect( m_directMessageNew.data(), SIGNAL( parsedStatuses(const QList< QTweetDMStatus > &) ), SLOT( directMessageNew(const QList<QTweetDMStatus> &) ) );
             QMetaObject::invokeMethod( this, "checkTimerFired", Qt::AutoConnection );
         }
         else
@@ -147,6 +149,7 @@ TwitterPlugin::friendsTimelineStatuses( const QList< QTweetStatus > &statuses )
 {
     qDebug() << Q_FUNC_INFO;
     QRegExp regex( QString( "^(@[a-zA-Z0-9]+ )?Got Tomahawk\\?(.*)$" ) );
+    bool peersChanged = false;
     foreach( QTweetStatus status, statuses )
     {
         if ( status.id() > m_cachedFriendsSinceId )
@@ -155,16 +158,21 @@ TwitterPlugin::friendsTimelineStatuses( const QList< QTweetStatus > &statuses )
         {
             qDebug() << "TwitterPlugin found an exact tweet from friend " << status.user().screenName();
             QHash<QString, QVariant> peerData;
-            if ( ! m_cachedPeers.contains( status.user().screenName() ) )
+            if ( !m_cachedPeers.contains( status.user().screenName() ) )
             {
                 QHash< QString, QVariant > peerData;
-                peerData["sentuid"] = QVariant::fromValue< QString >( uuid() );
+                QString okey = QUuid::createUuid().toString().split( '-' ).last();
-                m_cachedPeers[status.user().screenName()] = QVariant::fromValue< QHash< QString, QVariant > >( peerData );
+                okey.chop( 1 );
+                peerData["okey"] = QVariant::fromValue< QString >( okey );
+                QMetaObject::invokeMethod( this, "sendOffer", Q_ARG( QString, status.user().screenName() ), QGenericArgument( "QHash< QString, QVariant >", (const void*)&peerData ) );
+                peersChanged = true;
             }
         }
     }
     
     TomahawkSettings::instance()->setTwitterCachedFriendsSinceId( m_cachedFriendsSinceId );
+    if ( peersChanged )
+        TomahawkSettings::instance()->setTwitterCachedPeers( m_cachedPeers );
     
     m_finishedFriends = true;
     QMetaObject::invokeMethod( this, "pollDirectMessages", Qt::AutoConnection );
@@ -175,6 +183,7 @@ TwitterPlugin::mentionsStatuses( const QList< QTweetStatus > &statuses )
 {
     qDebug() << Q_FUNC_INFO;
     QRegExp regex( QString( "^(@[a-zA-Z0-9]+ )?Got Tomahawk\\?(.*)$" ) );
+    bool peersChanged = false;
     foreach( QTweetStatus status, statuses )
     {
         if ( status.id() > m_cachedMentionsSinceId )
@@ -182,16 +191,21 @@ TwitterPlugin::mentionsStatuses( const QList< QTweetStatus > &statuses )
         if ( regex.exactMatch( status.text() ) )
         {
             qDebug() << "TwitterPlugin found an exact matching mention from user " << status.user().screenName();
-            if ( ! m_cachedPeers.contains( status.user().screenName() ) )
+            if ( !m_cachedPeers.contains( status.user().screenName() ) )
             {
                 QHash< QString, QVariant > peerData;
-                peerData["sentuid"] = QVariant::fromValue< QString >( uuid() );
+                QString okey = QUuid::createUuid().toString().split( '-' ).last();
-                m_cachedPeers[status.user().screenName()] = QVariant::fromValue< QHash< QString, QVariant > >( peerData );
+                okey.chop( 1 );
+                peerData["okey"] = QVariant::fromValue< QString >( okey );
+                QMetaObject::invokeMethod( this, "sendOffer", Q_ARG( QString, status.user().screenName() ), QGenericArgument( "QHash< QString, QVariant >", (const void*)&peerData ) );
+                peersChanged = true;
             }
         }
     }
     
     TomahawkSettings::instance()->setTwitterCachedMentionsSinceId( m_cachedMentionsSinceId );
+    if ( peersChanged )
+        TomahawkSettings::instance()->setTwitterCachedPeers( m_cachedPeers );
     
     m_finishedMentions = true;
     QMetaObject::invokeMethod( this, "pollDirectMessages", Qt::AutoConnection );
@@ -220,36 +234,98 @@ void
 TwitterPlugin::directMessages( const QList< QTweetDMStatus > &messages )
 {
     qDebug() << Q_FUNC_INFO;
-    QRegExp regex( QString( "^(@[a-zA-Z0-9]+ )?Got Tomahawk\\?(.*)$" ) );
+    
+    bool peersChanged = false;
+    
     foreach( QTweetDMStatus status, messages )
     {
         if ( status.id() > m_cachedDirectMessagesSinceId )
             m_cachedDirectMessagesSinceId = status.id();
-        if ( regex.exactMatch( status.text() ) )
+        QStringList splitList = status.text().split(':');
-        {
+        if ( splitList.length() < 5 )
-            qDebug() << "TwitterPlugin found an exact matching mention from user " << status.sender().screenName();
+            continue;
-            if ( ! m_cachedPeers.contains( status.sender().screenName() ) )
+        if ( splitList[0] != "TOMAHAWKPEERSTART" )
-            {
+            continue;
-                QHash< QString, QVariant > peerData;
+        if ( !splitList[1].startsWith( "Host=" ) || !splitList[2].startsWith( "Port=" ) || !splitList[3].startsWith( "Node=" ) || !splitList[4].startsWith( "PKey=" ) )
-                peerData["sentuid"] = QVariant::fromValue< QString >( uuid() );
+            continue;
-                m_cachedPeers[status.sender().screenName()] = QVariant::fromValue< QHash< QString, QVariant > >( peerData );
+        int port = splitList[2].mid( 5 ).toInt();
-            }
+        if ( port == 0 )
-        }
+            continue;
+        QString host = splitList[1].mid( 5 );
+        QString node = splitList[3].mid( 5 );
+        QString pkey = splitList[4].mid( 5 );
+        qDebug() << "TwitterPlugin found a peerstart message from " << status.senderScreenName() << " with host " << host << " and port " << port << " and node " << node << " and pkey " << pkey;
+        
+        QHash< QString, QVariant > peerData;
+        if ( m_cachedPeers.contains( status.senderScreenName() ) )
+            peerData = m_cachedPeers[status.senderScreenName()].toHash();        
+        
+        peerData["host"] = QVariant::fromValue< QString >( host );
+        peerData["port"] = QVariant::fromValue< int >( port );
+        peerData["node"] = QVariant::fromValue< QString >( node );
+        peerData["pkey"] = QVariant::fromValue< QString >( pkey );
+        m_cachedPeers[status.senderScreenName()] = QVariant::fromValue< QHash< QString, QVariant > >( peerData );
+        peersChanged = true;
+        
+        QMetaObject::invokeMethod( this, "registerOffer", Q_ARG( QString, status.senderScreenName() ), QGenericArgument( "QHash< QString, QVariant >", (const void*)&peerData ) );
     }
     
     TomahawkSettings::instance()->setTwitterCachedDirectMessagesSinceId( m_cachedDirectMessagesSinceId );
-    
+    if ( peersChanged )
+        TomahawkSettings::instance()->setTwitterCachedPeers( m_cachedPeers );
 }
 
 void
-TwitterPlugin::lanHostFound( const QString& host, int port, const QString& name, const QString& nodeid )
+TwitterPlugin::makeConnection( const QString &screenName, const QHash< QString, QVariant > &peerdata )
 {
-    /*
+    qDebug() << Q_FUNC_INFO;
-    qDebug() << "Found LAN host:" << host << port << nodeid;
+    if ( !peerdata.contains( "node" ) || !peerdata.contains( "host" ) || !peerdata.contains( "port" ) || !peerdata.contains( "pkey" ) )
-
+    {
-    if ( !Servent::instance()->connectedToSession( nodeid ) )
+        qDebug() << "Could not find node and/or host and/or port and/or pkey for peer " << screenName;
-        Servent::instance()->connectToPeer( host, port, "whitelist", name, nodeid );
+        return;
-    */
+    }
+    if ( !Servent::instance()->connectedToSession( peerdata["node"].toString() ) )
+        Servent::instance()->connectToPeer( peerdata["host"].toString(),
+                                            peerdata["port"].toString().toInt(),
+                                            peerdata["pkey"].toString(),
+                                            QString( '@' + peerdata["screenname"].toString() ),
+                                            peerdata["node"].toString() );
 }
 
+void
+TwitterPlugin::registerOffer( const QString &screenName, const QHash< QString, QVariant > &peerdata )
+{
+    qDebug() << Q_FUNC_INFO;
+    if ( !peerdata.contains( "node" ) || !peerdata.contains( "okey" ) )
+    {
+        qDebug() << "Could not find node and/or okey for peer " << screenName;
+        return;
+    }
+    qDebug() << "TwitterPlugin registering offer to " << QString( '@' + screenName ) << " with node " << peerdata["node"].toString() << " and offeredkey " << peerdata["okey"].toString();
+    Servent::instance()->createConnectionKey( QString( '@' + screenName ), peerdata["node"].toString(), peerdata["okey"].toString() );
+    if ( peerdata.contains( "node" ) && peerdata.contains( "host" ) && peerdata.contains( "port" ) && peerdata.contains( "pkey" ) )
+        QMetaObject::invokeMethod( this, "makeConnection", Q_ARG( QString, screenName ), QGenericArgument( "QHash< QString, QVariant >", (const void*)&peerdata ) );
+}
+
+void
+TwitterPlugin::sendOffer( const QString &screenName, const QHash< QString, QVariant > &peerdata )
+{
+    qDebug() << Q_FUNC_INFO;
+    QString offerString = QString( "TOMAHAWKPEER:Host=%1:Port=%2:Node=%3:PKey=%4" ).arg( Servent::instance()->externalAddress() )
+                                                                                   .arg( Servent::instance()->externalPort() )
+                                                                                   .arg( Database::instance()->dbid() )
+                                                                                   .arg( peerdata["okey"].toString() );
+    qDebug() << "Sending message to " << screenName << ": " << offerString;
+    if( !m_directMessageNew.isNull() )
+        m_directMessageNew.data()->post( screenName, offerString );
+}
+
+void
+TwitterPlugin::directMessageNew(const QTweetDMStatus& message)
+{
+    qDebug() << Q_FUNC_INFO;
+    qDebug() << "Message sent to " << message.recipientScreenName() << " containing: " << message.text();
+}
+
+
 Q_EXPORT_PLUGIN2( sip, TwitterPlugin )

src/sip/twitter/twitter.h

@@ -8,6 +8,7 @@
 #include <qtweetnetbase.h>
 #include <qtweetfriendstimeline.h>
 #include <qtweetdirectmessages.h>
+#include <qtweetdirectmessagenew.h>
 #include <qtweetmentions.h>
 #include <qtweetdmstatus.h>
 
@@ -48,19 +49,23 @@ public slots:
     }
 
 private slots:
-    void lanHostFound( const QString& host, int port, const QString& name, const QString& nodeid );
     void connectAuthVerifyReply( const QTweetUser &user );
     void checkTimerFired();
     void friendsTimelineStatuses( const QList< QTweetStatus > &statuses );
     void mentionsStatuses( const QList< QTweetStatus > &statuses );
     void pollDirectMessages();
     void directMessages( const QList< QTweetDMStatus > &messages );
+    void directMessageNew( const QTweetDMStatus &message );
+    void registerOffer( const QString &screenName, const QHash< QString, QVariant > &peerdata );
+    void sendOffer( const QString &screenName, const QHash< QString, QVariant > &peerdata );
+    void makeConnection( const QString &screenName, const QHash< QString, QVariant > &peerdata );
 
 private:
     QWeakPointer< TomahawkOAuthTwitter > m_twitterAuth;
     QWeakPointer< QTweetFriendsTimeline > m_friendsTimeline;
     QWeakPointer< QTweetMentions > m_mentions;
     QWeakPointer< QTweetDirectMessages > m_directMessages;
+    QWeakPointer< QTweetDirectMessageNew > m_directMessageNew;
     bool m_isAuthed;
     QTimer m_checkTimer;
     qint64 m_cachedFriendsSinceId;