From 8f24acd00881a4264d98cadb9a53ab9747ffb7cd Mon Sep 17 00:00:00 2001 From: Jeff Mitchell Date: Sat, 22 Oct 2011 13:59:05 -0400 Subject: [PATCH] More account updates --- src/libtomahawk/sip/SipPlugin.h | 4 +- src/sip/twitter/CMakeLists.txt | 11 +- src/sip/twitter/tomahawkoauthtwitter.cpp | 32 -- src/sip/twitter/tomahawkoauthtwitter.h | 25 -- src/sip/twitter/twitterconfigwidget.cpp | 270 ---------------- src/sip/twitter/twitterconfigwidget.h | 69 ---- src/sip/twitter/twitterconfigwidget.ui | 381 ----------------------- src/sip/twitter/twittersip.cpp | 2 - src/sip/twitter/twittersip.h | 9 +- 9 files changed, 5 insertions(+), 798 deletions(-) delete mode 100644 src/sip/twitter/tomahawkoauthtwitter.cpp delete mode 100644 src/sip/twitter/tomahawkoauthtwitter.h delete mode 100644 src/sip/twitter/twitterconfigwidget.cpp delete mode 100644 src/sip/twitter/twitterconfigwidget.h delete mode 100644 src/sip/twitter/twitterconfigwidget.ui diff --git a/src/libtomahawk/sip/SipPlugin.h b/src/libtomahawk/sip/SipPlugin.h index bb51dabc0..65ebe8209 100644 --- a/src/libtomahawk/sip/SipPlugin.h +++ b/src/libtomahawk/sip/SipPlugin.h @@ -102,8 +102,10 @@ private slots: void onPeerOnline( const QString &peerId ); void onPeerOffline( const QString &peerId ); -private: +protected: Tomahawk::Accounts::Account *m_account; + +private: QString m_cachedError; QStringList m_peersOnline; }; diff --git a/src/sip/twitter/CMakeLists.txt b/src/sip/twitter/CMakeLists.txt index 32eb308f1..cac93c6b7 100644 --- a/src/sip/twitter/CMakeLists.txt +++ b/src/sip/twitter/CMakeLists.txt @@ -8,18 +8,10 @@ add_definitions( -DSIPDLLEXPORT_PRO ) set( twitterSources twittersip.cpp - twitterconfigwidget.cpp - tomahawkoauthtwitter.cpp ) set( twitterHeaders twittersip.h - twitterconfigwidget.h - tomahawkoauthtwitter.h -) - -set( twitterUI - twitterconfigwidget.ui ) include_directories( . ${CMAKE_CURRENT_BINARY_DIR} .. @@ -29,8 +21,7 @@ include_directories( . ${CMAKE_CURRENT_BINARY_DIR} .. qt4_add_resources( RC_SRCS "resources.qrc" ) qt4_wrap_cpp( twitterMoc ${twitterHeaders} ) -qt4_wrap_ui( twitterUI_H ${twitterUI} ) -add_library( tomahawk_siptwitter SHARED ${twitterUI_H} ${twitterSources} ${twitterMoc} ${RC_SRCS} ) +add_library( tomahawk_siptwitter SHARED ${twitterSources} ${twitterMoc} ${RC_SRCS} ) IF( WIN32 ) SET( OS_SPECIFIC_LINK_LIBRARIES diff --git a/src/sip/twitter/tomahawkoauthtwitter.cpp b/src/sip/twitter/tomahawkoauthtwitter.cpp deleted file mode 100644 index 35cd98a9e..000000000 --- a/src/sip/twitter/tomahawkoauthtwitter.cpp +++ /dev/null @@ -1,32 +0,0 @@ -#include "tomahawkoauthtwitter.h" - -#include - -#include "utils/logger.h" - - -TomahawkOAuthTwitter::TomahawkOAuthTwitter( QNetworkAccessManager *nam, QObject* parent ) - : OAuthTwitter( QByteArray::fromBase64( "QzR2NFdmYTIxcmZJRGNrNEhNUjNB" ), QByteArray::fromBase64( "elhTalU2Ympydmc2VVZNSlg0SnVmcUh5amozaWV4dFkxNFNSOXVCRUFv" ), parent ) -{ - setNetworkAccessManager( nam ); -} - - -int -TomahawkOAuthTwitter::authorizationWidget() -{ - bool ok; - int i = QInputDialog::getInt(0, tr( "Twitter PIN" ), tr( "After authenticating on Twitter's web site,\nenter the displayed PIN number here:" ), 0, 0, 2147483647, 1, &ok); - if (ok) - return i; - - return 0; -} - -void -TomahawkOAuthTwitter::error() -{ - qDebug() << Q_FUNC_INFO; - setOAuthToken( QString().toLatin1() ); - setOAuthTokenSecret( QString().toLatin1() ); -} diff --git a/src/sip/twitter/tomahawkoauthtwitter.h b/src/sip/twitter/tomahawkoauthtwitter.h deleted file mode 100644 index 6b1a75465..000000000 --- a/src/sip/twitter/tomahawkoauthtwitter.h +++ /dev/null @@ -1,25 +0,0 @@ -#ifndef TOMAHAWKOAUTHTWITTER -#define TOMAHAWKOAUTHTWITTER - -#include "../sipdllmacro.h" - -#include -#include - -class SIPDLLEXPORT TomahawkOAuthTwitter : public OAuthTwitter -{ - Q_OBJECT - -public: - TomahawkOAuthTwitter( QNetworkAccessManager *nam, QObject *parent = 0 ); - - ~TomahawkOAuthTwitter() {} - -protected: - virtual int authorizationWidget(); - -private slots: - void error(); -}; - -#endif diff --git a/src/sip/twitter/twitterconfigwidget.cpp b/src/sip/twitter/twitterconfigwidget.cpp deleted file mode 100644 index 357bc038f..000000000 --- a/src/sip/twitter/twitterconfigwidget.cpp +++ /dev/null @@ -1,270 +0,0 @@ -/* === This file is part of Tomahawk Player - === - * - * Copyright 2010-2011, Christian Muehlhaeuser - * - * Tomahawk is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Tomahawk is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Tomahawk. If not, see . - */ - -#include "twitterconfigwidget.h" -#include "twittersip.h" -#include "ui_twitterconfigwidget.h" - -#include "tomahawksettings.h" -#include "utils/tomahawkutils.h" -#include "database/database.h" - -#include "tomahawkoauthtwitter.h" -#include -#include -#include - -#include - -#include "utils/logger.h" - - -TwitterConfigWidget::TwitterConfigWidget( TwitterPlugin* plugin, QWidget *parent ) : - QWidget( parent ), - ui( new Ui::TwitterConfigWidget ), - m_plugin( plugin ) -{ - ui->setupUi( this ); - - connect( ui->twitterAuthenticateButton, SIGNAL( pressed() ), - this, SLOT( authDeauthTwitter() ) ); - connect( ui->twitterTweetGotTomahawkButton, SIGNAL( pressed() ), - this, SLOT( startPostGotTomahawkStatus() ) ); - connect( ui->twitterTweetComboBox, SIGNAL( currentIndexChanged( int ) ), - this, SLOT( tweetComboBoxIndexChanged( int ) ) ); - - ui->twitterTweetComboBox->setCurrentIndex( 0 ); - ui->twitterTweetGotTomahawkButton->setText( tr( "Tweet!" ) ); - - if ( m_plugin->twitterOAuthToken().isEmpty() || m_plugin->twitterOAuthTokenSecret().isEmpty() || m_plugin->twitterScreenName().isEmpty() ) - { - ui->twitterStatusLabel->setText( tr( "Status: No saved credentials" ) ); - ui->twitterAuthenticateButton->setText( tr( "Authenticate" ) ); - ui->twitterSyncGroupBox->setVisible( false ); - - emit twitterAuthed( false ); - } - else - { - ui->twitterStatusLabel->setText( tr( "Status: Credentials saved for %1" ).arg( m_plugin->twitterScreenName() ) ); - ui->twitterAuthenticateButton->setText( tr( "De-authenticate" ) ); - ui->twitterSyncGroupBox->setVisible( true ); - ui->twitterUserTweetLineEdit->setVisible( false ); - - emit twitterAuthed( true ); - } - -} - -TwitterConfigWidget::~TwitterConfigWidget() -{ - delete ui; -} - -void -TwitterConfigWidget::authDeauthTwitter() -{ - if ( ui->twitterAuthenticateButton->text() == tr( "Authenticate" ) ) //FIXME: don't rely on UI strings here! - authenticateTwitter(); - else - deauthenticateTwitter(); -} - -void -TwitterConfigWidget::authenticateTwitter() -{ - qDebug() << Q_FUNC_INFO; - TomahawkOAuthTwitter *twitAuth = new TomahawkOAuthTwitter( TomahawkUtils::nam(), this ); - twitAuth->authorizePin(); - - m_plugin->setTwitterOAuthToken( twitAuth->oauthToken() ); - m_plugin->setTwitterOAuthTokenSecret( twitAuth->oauthTokenSecret() ); - - QTweetAccountVerifyCredentials *credVerifier = new QTweetAccountVerifyCredentials( twitAuth, this ); - connect( credVerifier, SIGNAL( parsedUser( const QTweetUser & ) ), SLOT( authenticateVerifyReply( const QTweetUser & ) ) ); - connect( credVerifier, SIGNAL( error( QTweetNetBase::ErrorCode, QString ) ), SLOT( authenticateVerifyError( QTweetNetBase::ErrorCode, QString ) ) ); - credVerifier->verify(); -} - -void -TwitterConfigWidget::authenticateVerifyReply( const QTweetUser &user ) -{ - qDebug() << Q_FUNC_INFO; - if ( user.id() == 0 ) - { - QMessageBox::critical( this, tr("Tweetin' Error"), tr("The credentials could not be verified.\nYou may wish to try re-authenticating.") ); - emit twitterAuthed( false ); - return; - } - - m_plugin->setTwitterScreenName( user.screenName() ); - m_plugin->setTwitterCachedFriendsSinceId( 0 ); - m_plugin->setTwitterCachedMentionsSinceId( 0 ); - - ui->twitterStatusLabel->setText( tr( "Status: Credentials saved for %1" ).arg( m_plugin->twitterScreenName() ) ); - ui->twitterAuthenticateButton->setText( tr( "De-authenticate" ) ); - ui->twitterSyncGroupBox->setVisible( true ); - ui->twitterTweetComboBox->setCurrentIndex( 0 ); - ui->twitterUserTweetLineEdit->setVisible( false ); - ui->twitterTweetGotTomahawkButton->setText( tr( "Tweet!" ) ); - - m_plugin->connectPlugin(); - - emit twitterAuthed( true ); - emit sizeHintChanged(); -} - -void -TwitterConfigWidget::authenticateVerifyError( QTweetNetBase::ErrorCode code, const QString &errorMsg ) -{ - qDebug() << Q_FUNC_INFO; - qDebug() << "Error validating credentials, error code is " << code << ", error message is " << errorMsg; - ui->twitterStatusLabel->setText(tr("Status: Error validating credentials")); - emit twitterAuthed( false ); - return; -} - -void -TwitterConfigWidget::deauthenticateTwitter() -{ - qDebug() << Q_FUNC_INFO; - m_plugin->setTwitterOAuthToken( QString() ); - m_plugin->setTwitterOAuthTokenSecret( QString() ); - m_plugin->setTwitterScreenName( QString() ); - - ui->twitterStatusLabel->setText(tr("Status: No saved credentials")); - ui->twitterAuthenticateButton->setText( tr( "Authenticate" ) ); - ui->twitterSyncGroupBox->setVisible( false ); - - emit twitterAuthed( false ); - emit sizeHintChanged(); -} - -void -TwitterConfigWidget::tweetComboBoxIndexChanged( int index ) -{ - Q_UNUSED( index ); - if ( ui->twitterTweetComboBox->currentText() == tr( "Global Tweet" ) ) //FIXME: use data! - ui->twitterUserTweetLineEdit->setVisible( false ); - else - ui->twitterUserTweetLineEdit->setVisible( true ); - - if ( ui->twitterTweetComboBox->currentText() == tr( "Direct Message" ) ) //FIXME: use data! - ui->twitterTweetGotTomahawkButton->setText( tr( "Send Message!" ) ); - else if ( ui->twitterTweetComboBox->currentText() == tr( "@Mention" ) ) - ui->twitterTweetGotTomahawkButton->setText( tr( "Send Mention!" ) ); - else - ui->twitterTweetGotTomahawkButton->setText( tr( "Tweet!" ) ); -} - -void -TwitterConfigWidget::startPostGotTomahawkStatus() -{ - qDebug() << Q_FUNC_INFO; - m_postGTtype = ui->twitterTweetComboBox->currentText(); - - if ( m_postGTtype != "Global Tweet" && ( ui->twitterUserTweetLineEdit->text().isEmpty() || ui->twitterUserTweetLineEdit->text() == "@" ) ) - { - QMessageBox::critical( this, tr("Tweetin' Error"), tr("You must enter a user name for this type of tweet.") ); - return; - } - - qDebug() << "Posting Got Tomahawk status"; - if ( m_plugin->twitterOAuthToken().isEmpty() || m_plugin->twitterOAuthTokenSecret().isEmpty() || m_plugin->twitterScreenName().isEmpty() ) - { - QMessageBox::critical( this, tr("Tweetin' Error"), tr("Your saved credentials could not be loaded.\nYou may wish to try re-authenticating.") ); - emit twitterAuthed( false ); - return; - } - TomahawkOAuthTwitter *twitAuth = new TomahawkOAuthTwitter( TomahawkUtils::nam(), this ); - twitAuth->setOAuthToken( m_plugin->twitterOAuthToken().toLatin1() ); - twitAuth->setOAuthTokenSecret( m_plugin->twitterOAuthTokenSecret().toLatin1() ); - QTweetAccountVerifyCredentials *credVerifier = new QTweetAccountVerifyCredentials( twitAuth, this ); - connect( credVerifier, SIGNAL( parsedUser(const QTweetUser &) ), SLOT( postGotTomahawkStatusAuthVerifyReply(const QTweetUser &) ) ); - credVerifier->verify(); -} - -void -TwitterConfigWidget::postGotTomahawkStatusAuthVerifyReply( const QTweetUser &user ) -{ - qDebug() << Q_FUNC_INFO; - if ( user.id() == 0 ) - { - QMessageBox::critical( this, tr("Tweetin' Error"), tr("Your saved credentials could not be verified.\nYou may wish to try re-authenticating.") ); - emit twitterAuthed( false ); - return; - } - m_plugin->setTwitterScreenName( user.screenName() ); - TomahawkOAuthTwitter *twitAuth = new TomahawkOAuthTwitter( TomahawkUtils::nam(), this ); - twitAuth->setOAuthToken( m_plugin->twitterOAuthToken().toLatin1() ); - twitAuth->setOAuthTokenSecret( m_plugin->twitterOAuthTokenSecret().toLatin1() ); - if ( m_postGTtype != "Direct Message" ) - { - QTweetStatusUpdate *statUpdate = new QTweetStatusUpdate( twitAuth, this ); - connect( statUpdate, SIGNAL( postedStatus(const QTweetStatus &) ), SLOT( postGotTomahawkStatusUpdateReply(const QTweetStatus &) ) ); - connect( statUpdate, SIGNAL( error(QTweetNetBase::ErrorCode, const QString&) ), SLOT( postGotTomahawkStatusUpdateError(QTweetNetBase::ErrorCode, const QString &) ) ); - QString uuid = QUuid::createUuid(); - QString message = QString( "Got Tomahawk? {" ) + Database::instance()->dbid() + QString( "} (" ) + uuid.mid( 1, 8 ) + QString( ")" ) + QString( " http://gettomahawk.com" ); - if ( m_postGTtype == "@Mention" ) - { - QString user = ui->twitterUserTweetLineEdit->text(); - if ( user.startsWith( "@" ) ) - user.remove( 0, 1 ); - message = QString( "@" ) + user + QString( " " ) + message; - } - statUpdate->post( message ); - } - else - { - QTweetDirectMessageNew *statUpdate = new QTweetDirectMessageNew( twitAuth, this ); - connect( statUpdate, SIGNAL( parsedDirectMessage(const QTweetDMStatus &)), SLOT( postGotTomahawkDirectMessageReply(const QTweetDMStatus &) ) ); - connect( statUpdate, SIGNAL( error(QTweetNetBase::ErrorCode, const QString&) ), SLOT( postGotTomahawkStatusUpdateError(QTweetNetBase::ErrorCode, const QString &) ) ); - QString uuid = QUuid::createUuid(); - QString message = QString( "Got Tomahawk? {" ) + Database::instance()->dbid() + QString( "} (" ) + uuid.mid( 1, 8 ) + QString( ")" ) + QString( " http://gettomahawk.com" ); - QString user = ui->twitterUserTweetLineEdit->text(); - if ( user.startsWith( "@" ) ) - user.remove( 0, 1 ); - statUpdate->post( user, message ); - } -} - -void -TwitterConfigWidget::postGotTomahawkStatusUpdateReply( const QTweetStatus& status ) -{ - if ( status.id() == 0 ) - QMessageBox::critical( this, tr("Tweetin' Error"), tr("There was an error posting your status -- sorry!") ); - else - QMessageBox::information( this, tr("Tweeted!"), tr("Your tweet has been posted!") ); -} - -void -TwitterConfigWidget::postGotTomahawkDirectMessageReply( const QTweetDMStatus& status ) -{ - if ( status.id() == 0 ) - QMessageBox::critical( this, tr("Tweetin' Error"), tr("There was an error posting your direct message -- sorry!") ); - else - QMessageBox::information( this, tr("Tweeted!"), tr("Your message has been posted!") ); -} - -void -TwitterConfigWidget::postGotTomahawkStatusUpdateError( QTweetNetBase::ErrorCode code, const QString& errorMsg ) -{ - qDebug() << Q_FUNC_INFO; - qDebug() << "Error posting Got Tomahawk message, error code is " << code << ", error message is " << errorMsg; - QMessageBox::critical( this, tr("Tweetin' Error"), tr("There was an error posting your status -- sorry!") ); -} diff --git a/src/sip/twitter/twitterconfigwidget.h b/src/sip/twitter/twitterconfigwidget.h deleted file mode 100644 index d06c08737..000000000 --- a/src/sip/twitter/twitterconfigwidget.h +++ /dev/null @@ -1,69 +0,0 @@ -/* === This file is part of Tomahawk Player - === - * - * Copyright 2010-2011, Christian Muehlhaeuser - * - * Tomahawk is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Tomahawk is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Tomahawk. If not, see . - */ - -#ifndef TWITTERCONFIGWIDGET_H -#define TWITTERCONFIGWIDGET_H - -#include "sip/SipPlugin.h" - -#include -#include -#include -#include - -#include - -class TwitterPlugin; - -namespace Ui { - class TwitterConfigWidget; -} - -class TwitterConfigWidget : public QWidget -{ - Q_OBJECT - -public: - explicit TwitterConfigWidget( TwitterPlugin* plugin = 0, QWidget *parent = 0 ); - ~TwitterConfigWidget(); - -signals: - void twitterAuthed( bool authed ); - - void sizeHintChanged(); -private slots: - void authDeauthTwitter(); - void startPostGotTomahawkStatus(); - void authenticateVerifyReply( const QTweetUser &user ); - void authenticateVerifyError( QTweetNetBase::ErrorCode code, const QString &errorMsg ); - void postGotTomahawkStatusAuthVerifyReply( const QTweetUser &user ); - void postGotTomahawkStatusUpdateReply( const QTweetStatus &status ); - void postGotTomahawkDirectMessageReply( const QTweetDMStatus &status ); - void postGotTomahawkStatusUpdateError( QTweetNetBase::ErrorCode, const QString &errorMsg ); - void tweetComboBoxIndexChanged( int index ); - -private: - void authenticateTwitter(); - void deauthenticateTwitter(); - - Ui::TwitterConfigWidget *ui; - TwitterPlugin *m_plugin; - QString m_postGTtype; -}; - -#endif // TWITTERCONFIGWIDGET_H diff --git a/src/sip/twitter/twitterconfigwidget.ui b/src/sip/twitter/twitterconfigwidget.ui deleted file mode 100644 index f60dbb5f8..000000000 --- a/src/sip/twitter/twitterconfigwidget.ui +++ /dev/null @@ -1,381 +0,0 @@ - - - TwitterConfigWidget - - - - 0 - 0 - 580 - 390 - - - - - 0 - 0 - - - - - 580 - 390 - - - - - - - - - Qt::Horizontal - - - - 40 - 0 - - - - - - - - - 0 - 0 - - - - - - - :/twitter-icon.png - - - - - - - - 0 - 0 - - - - - 11 - 75 - true - - - - Configure this Twitter account - - - - - - - Qt::Horizontal - - - QSizePolicy::Expanding - - - - 40 - 0 - - - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - - - 0 - 0 - - - - The Twitter plugin allows you to discover and play music from your Twitter friends running Tomahawk and post messages to your account. - - - true - - - - - - - - - - 0 - 0 - - - - Status: No saved credentials - - - Qt::AutoText - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 0 - 0 - - - - Authenticate with Twitter - - - - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - 0 - 0 - - - - Twitter Connections - - - - - - -If you only want to post tweets, you're done. - -If you want to connect Tomahawk to your friends using Twitter, select the type of tweet and press the button below to send a sync message. You must both be following each other as Direct Messages are used. Then be (very) patient -- it can take several minutes! - -You can re-send a sync message at any time simply by sending another tweet using the button. - - - true - - - - - - - Qt::Vertical - - - QSizePolicy::Expanding - - - - 20 - 40 - - - - - - - - QLayout::SetFixedSize - - - - - - 0 - 0 - - - - Select the kind of tweet you would like, then press the button to post it: - - - - - - - Qt::Vertical - - - QSizePolicy::Fixed - - - - 20 - 10 - - - - - - - - - - - 0 - 0 - - - - - Global Tweet - - - - - @Mention - - - - - Direct Message - - - - - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 10 - 20 - - - - - - - - - 0 - 0 - - - - - 250 - 0 - - - - e.g. @tomahawk - - - - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 10 - 20 - - - - - - - - - 0 - 0 - - - - Send Message - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - - - - - - - - diff --git a/src/sip/twitter/twittersip.cpp b/src/sip/twitter/twittersip.cpp index 06318b5bd..0a316f41b 100644 --- a/src/sip/twitter/twittersip.cpp +++ b/src/sip/twitter/twittersip.cpp @@ -18,8 +18,6 @@ #include "twittersip.h" -#include "twitterconfigwidget.h" - #include #include #include diff --git a/src/sip/twitter/twittersip.h b/src/sip/twitter/twittersip.h index 2674d1eb5..b3f314d29 100644 --- a/src/sip/twitter/twittersip.h +++ b/src/sip/twitter/twittersip.h @@ -35,9 +35,7 @@ #include "../sipdllmacro.h" #include "sip/SipPlugin.h" #include "accounts/account.h" -#include "tomahawkoauthtwitter.h" - -#define MYNAME "SIPTWITTER" +#include "accounts/twitter/tomahawkoauthtwitter.h" class SIPDLLEXPORT TwitterSipPlugin : public SipPlugin { @@ -124,11 +122,6 @@ private: QHash< QString, QPixmap > m_cachedAvatars; QSet m_keyCache; ConnectionState m_state; - - QWeakPointer m_configWidget; - - // for settings access - friend class TwitterConfigWidget; }; #endif