Merge branch 'develop' of https://github.com/redouane59/twittered int…

…o develop
redouane59 · May 28, 2021 · c275301 · c275301
2 parents 03b51f0 + 8bcdf55
commit c275301
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 1 deletion.
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
   <groupId>com.github.redouane59.twitter</groupId>
   <artifactId>twittered</artifactId>
-  <version>1.24</version>
+  <version>1.25</version>
 
   <name>twittered</name>
   <description>java client for twitter API</description>

diff --git a/src/main/java/com/github/redouane59/twitter/ITwitterClientV1.java b/src/main/java/com/github/redouane59/twitter/ITwitterClientV1.java
@@ -52,6 +52,17 @@ public interface ITwitterClientV1 {
    */
   Tweet postTweet(String text, String inReplyToStatusId, String mediaIds);
 
+  /**
+   * Post a tweet calling https://api.twitter.com/1.1/statuses/update.json
+   *
+   * @param text the tweet text
+   * @param inReplyToStatusId the id of the tweet to answer.
+   * @param mediaIds the ids of the media obtained calling the uploadMedia() method, separated by commas
+   * @param attachmentUrl provide a URL as a Tweet attachment
+   * @return the created tweet
+   */
+  Tweet postTweet(String text, String inReplyToStatusId, String mediaIds, String attachmentUrl);
+
   /**
    * Delete a tweet calling https://api.twitter.com/1.1/statuses/destroy/:id.json
    *

diff --git a/src/main/java/com/github/redouane59/twitter/TwitterClient.java b/src/main/java/com/github/redouane59/twitter/TwitterClient.java
@@ -334,6 +334,11 @@ public Tweet postTweet(String text, String inReplyToStatusId) {
 
   @Override
   public Tweet postTweet(String text, String inReplyToStatusId, String mediaIds) {
+    return this.postTweet(text, inReplyToStatusId, mediaIds, null);
+  }
+
+  @Override
+  public Tweet postTweet(final String text, final String inReplyToStatusId, final String mediaIds, final String attachmentUrl) {
     String              url        = this.getUrlHelper().getPostTweetUrl();
     Map<String, String> parameters = new HashMap<>();
     parameters.put("status", text);
@@ -344,6 +349,9 @@ public Tweet postTweet(String text, String inReplyToStatusId, String mediaIds) {
     if (mediaIds != null) {
       parameters.put("media_ids", mediaIds);
     }
+    if (attachmentUrl != null) {
+      parameters.put("attachment_url", attachmentUrl);
+    }
     return this.requestHelperV1.postRequest(url, parameters, TweetV1.class).orElseThrow(NoSuchElementException::new);
   }
 

diff --git a/src/main/java/com/github/redouane59/twitter/helpers/AbstractRequestHelper.java b/src/main/java/com/github/redouane59/twitter/helpers/AbstractRequestHelper.java
@@ -111,6 +111,7 @@ public <T> Optional<T> makeRequest(OAuthRequest request, boolean signRequired, C
             LOGGER.error("Using default retry after because header format is invalid: " + retryAfterStr, e);
           }
         }
+        LOGGER.debug("Rate limit exceeded, new retry in " + 1000L * retryAfter + "s");
         Thread.sleep(1000L * retryAfter);
         return makeRequest(request, false, classType); // We have already signed if it was requested
       } else if (response.getCode() < 200 || response.getCode() > 299) {

diff --git a/src/test/java/com/github/redouane59/twitter/nrt/ITwitterClientV1Test.java b/src/test/java/com/github/redouane59/twitter/nrt/ITwitterClientV1Test.java
@@ -121,6 +121,15 @@ public void testPostAndRTandDeleteTweet() {
     assertEquals(resultPostAnswer.getId(), resultDelete2.getId());
   }
 
+  @Test
+  public void postTweetWithUrl() {
+    Tweet resultPost = twitterClient.postTweet("test", null, null, "https://twitter.com/TwitterDev/status/1392465174708187137");
+    assertNotNull(resultPost);
+    assertNotNull(resultPost.getId());
+    Tweet resultDelete = twitterClient.deleteTweet(resultPost.getId());
+    assertNotNull(resultDelete);
+  }
+
   @Test
   public void testGetFavorites() {
     int         count     = 1500;