[arch-commits] Commit in choqok/trunk (PKGBUILD choqok-conversation.patch)

[Antonio Rojas]

    Date: Saturday, February 8, 2020 @ 11:17:06
  Author: arojas
Revision: 563985

Fix retrieving Twitter conversations

Added:
  choqok/trunk/choqok-conversation.patch
Modified:
  choqok/trunk/PKGBUILD

---------------------------+
 PKGBUILD                  |    8 +++++---
 choqok-conversation.patch |   21 +++++++++++++++++++++
 2 files changed, 26 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-02-08 11:16:53 UTC (rev 563984)
+++ PKGBUILD	2020-02-08 11:17:06 UTC (rev 563985)
@@ -6,7 +6,7 @@
 
 pkgname=choqok
 pkgver=1.7.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A micro-blogging client by the KDE community"
 url='https://choqok.kde.org/'
 license=(GPL)
@@ -15,10 +15,11 @@
 makedepends=(extra-cmake-modules telepathy-qt kdoctools)
 optdepends=('telepathy-qt: IMstatus plugin')
 source=("https://download.kde.org/stable/$pkgname/${pkgver%.*}/src/$pkgname-$pkgver.tar.xz"{,.sig}
-         choqok-retweet.patch)
+         choqok-retweet.patch choqok-conversation.patch)
 sha256sums=('26600d95f152c3e04881efb7fb3eb07b5c52fa6ffee838690f28b45defb4a47e'
             'SKIP'
-            'da3d892c3bbc5736ec19dffb72286fb90623fb24c6dfee1fba6c105fdf235453')
+            'da3d892c3bbc5736ec19dffb72286fb90623fb24c6dfee1fba6c105fdf235453'
+            '7fc1f8c5848e8c63b37651280f0ec1edec3b3685f91886a3d4f0650d19e8eba8')
 validpgpkeys=('2C7849767F14C23890B12791918F7DDFFD8D0B6E') # Andrea Scarpino <me at andreascarpino.it>
 
 prepare() {
@@ -26,6 +27,7 @@
 
   cd $pkgname-$pkgver
   patch -p1 -i ../choqok-retweet.patch # Fix retweet display https://bugs.kde.org/show_bug.cgi?id=370260
+  patch -p1 -i ../choqok-conversation.patch # Fix fetching conversations https://bugs.kde.org/show_bug.cgi?id=417193
 }
 
 build() {

Added: choqok-conversation.patch
===================================================================
--- choqok-conversation.patch	                        (rev 0)
+++ choqok-conversation.patch	2020-02-08 11:17:06 UTC (rev 563985)
@@ -0,0 +1,21 @@
+diff --git a/microblogs/twitter/twittermicroblog.cpp b/microblogs/twitter/twittermicroblog.cpp
+index 6a9f8c98..ff56e0f1 100644
+--- a/microblogs/twitter/twittermicroblog.cpp
++++ b/microblogs/twitter/twittermicroblog.cpp
+@@ -495,7 +495,6 @@ void TwitterMicroBlog::fetchPost(Choqok::Account *theAccount, Choqok::Post *post
+     QUrl url = account->apiUrl();
+     url.setPath(url.path() + QStringLiteral("/statuses/show/%1.json").arg(post->postId));
+ 
+-    QUrl tmpUrl(url);
+     QUrlQuery urlQuery;
+     urlQuery.addQueryItem(QLatin1String("tweet_mode"), QLatin1String("extended"));
+     url.setQuery(urlQuery);
+@@ -510,7 +509,7 @@ void TwitterMicroBlog::fetchPost(Choqok::Account *theAccount, Choqok::Post *post
+     }
+     job->addMetaData(QStringLiteral("customHTTPHeader"),
+                      QStringLiteral("Authorization: ") +
+-                     QLatin1String(authorizationHeader(account, tmpUrl, QNetworkAccessManager::GetOperation)));
++                     QLatin1String(authorizationHeader(account, url, QNetworkAccessManager::GetOperation)));
+     mFetchPostMap[ job ] = post;
+     mJobsAccount[ job ] = theAccount;
+     connect(job, &KIO::StoredTransferJob::result, this, &TwitterMicroBlog::slotFetchPost);