diff --git a/api/jreleaser-resource-bundle/src/main/resources/org/jreleaser/bundle/Messages.properties b/api/jreleaser-resource-bundle/src/main/resources/org/jreleaser/bundle/Messages.properties index 6bda08179..8ca80f8a7 100644 --- a/api/jreleaser-resource-bundle/src/main/resources/org/jreleaser/bundle/Messages.properties +++ b/api/jreleaser-resource-bundle/src/main/resources/org/jreleaser/bundle/Messages.properties @@ -424,9 +424,9 @@ validation_slack_token = slack.token or slack.webhook must be validation_extension_gav_directory = Cannot define both gav and directory for {} default.discussion.title = {{projectNameCapitalized}} {{projectVersion}} released! -default.release.message = 🚀 {{projectNameCapitalized}} {{projectVersion}} has been released! {{releaseNotesUrl}} -default.category.feature = 🚀 Features -default.category.bug.fix = 🐛 Bug Fixes +default.release.message = ? {{projectNameCapitalized}} {{projectVersion}} has been released! {{releaseNotesUrl}} +default.category.feature = ? Features +default.category.bug.fix = ? Bug Fixes ERROR_path_does_not_exist = Path does not exist {} ERROR_unexpected_error_reading_template = Unexpected error reading template {} diff --git a/api/jreleaser-resource-bundle/src/main/resources/org/jreleaser/bundle/Messages_ru.properties b/api/jreleaser-resource-bundle/src/main/resources/org/jreleaser/bundle/Messages_ru.properties index dcac55609..6108ec843 100644 --- a/api/jreleaser-resource-bundle/src/main/resources/org/jreleaser/bundle/Messages_ru.properties +++ b/api/jreleaser-resource-bundle/src/main/resources/org/jreleaser/bundle/Messages_ru.properties @@ -427,8 +427,6 @@ sdkman.release.announce.major = Объявление основного рели sdkman.release.announce.minor = Объявление о незначительном релизе кандидата '{}' twitter.tweet = твиттер: {} twitter.tweet.size = статус составляет {} символов -mastodon.toot = tooting: {} -mastodon.toot.size = status este {} lung de caractere ERROR_unexpected_json_format = Неожиданное сообщение об ошибке форматирования как JSON mail.message.send = Отправка объявления по электронной почте s3.bucket.check = проверка, существует ли сегмент {} diff --git a/core/jreleaser-model-impl/src/main/java/org/jreleaser/model/internal/announce/MastodonAnnouncer.java b/core/jreleaser-model-impl/src/main/java/org/jreleaser/model/internal/announce/MastodonAnnouncer.java index b4e2aec2d..d226a5718 100644 --- a/core/jreleaser-model-impl/src/main/java/org/jreleaser/model/internal/announce/MastodonAnnouncer.java +++ b/core/jreleaser-model-impl/src/main/java/org/jreleaser/model/internal/announce/MastodonAnnouncer.java @@ -44,13 +44,10 @@ * @since 0.4.0 */ public final class MastodonAnnouncer extends AbstractAnnouncer { + private final List statuses = new ArrayList<>(); private String host; private String accessToken; - private String status; - - private final List statuses = new ArrayList<>(); - private String statusTemplate; private final org.jreleaser.model.api.announce.MastodonAnnouncer immutable = new org.jreleaser.model.api.announce.MastodonAnnouncer() { @@ -191,15 +188,6 @@ public void setStatuses(List statuses) { this.statuses.addAll(statuses); } - @Override - protected void asMap(boolean full, Map props) { - props.put("host", host); - props.put("accessToken", isNotBlank(accessToken) ? HIDE : UNSET); - props.put("status", status); - props.put("statuses", statuses); - props.put("statusTemplate", statusTemplate); - } - public String getStatusTemplate() { return statusTemplate; } @@ -215,4 +203,13 @@ public String getStatus() { public void setStatus(String status) { this.status = status; } + + @Override + protected void asMap(boolean full, Map props) { + props.put("host", host); + props.put("accessToken", isNotBlank(accessToken) ? HIDE : UNSET); + props.put("status", status); + props.put("statuses", statuses); + props.put("statusTemplate", statusTemplate); + } } diff --git a/sdks/jreleaser-mastodon-java-sdk/src/main/java/org/jreleaser/sdk/mastodon/MastodonAnnouncer.java b/sdks/jreleaser-mastodon-java-sdk/src/main/java/org/jreleaser/sdk/mastodon/MastodonAnnouncer.java index 7866cb3a5..615f9b288 100644 --- a/sdks/jreleaser-mastodon-java-sdk/src/main/java/org/jreleaser/sdk/mastodon/MastodonAnnouncer.java +++ b/sdks/jreleaser-mastodon-java-sdk/src/main/java/org/jreleaser/sdk/mastodon/MastodonAnnouncer.java @@ -97,8 +97,6 @@ public void announce() throws AnnounceException { statuses.set(i, status); } - context.getLogger().debug("statuses: {}", statuses); - try { MastodonSdk sdk = MastodonSdk.builder(context.getLogger()) .host(mastodon.getHost()) @@ -107,7 +105,7 @@ public void announce() throws AnnounceException { .readTimeout(mastodon.getReadTimeout()) .dryrun(context.isDryrun()) .build(); - sdk.status(statuses); + sdk.toot(statuses); } catch (MastodonException e) { throw new AnnounceException(e); } diff --git a/sdks/jreleaser-mastodon-java-sdk/src/main/java/org/jreleaser/sdk/mastodon/MastodonSdk.java b/sdks/jreleaser-mastodon-java-sdk/src/main/java/org/jreleaser/sdk/mastodon/MastodonSdk.java index cd193e8d7..b5ab4fca8 100644 --- a/sdks/jreleaser-mastodon-java-sdk/src/main/java/org/jreleaser/sdk/mastodon/MastodonSdk.java +++ b/sdks/jreleaser-mastodon-java-sdk/src/main/java/org/jreleaser/sdk/mastodon/MastodonSdk.java @@ -68,14 +68,11 @@ private MastodonSdk(JReleaserLogger logger, this.logger.debug(RB.$("workflow.dryrun"), dryrun); } - public void status(List statuses) throws MastodonException { + public void toot(List statuses) throws MastodonException { wrap(() -> { - Status payload = Status.of(statuses.get(0), null); - Status status = api.status(payload); - + Status status = api.status(Status.of(statuses.get(0))); for (int i = 1; i < statuses.size(); i++) { - payload = Status.of(statuses.get(i), status.getId()); - api.status(payload); + status = api.status(Status.of(statuses.get(i), status.getId())); } }); } diff --git a/sdks/jreleaser-mastodon-java-sdk/src/main/java/org/jreleaser/sdk/mastodon/api/Status.java b/sdks/jreleaser-mastodon-java-sdk/src/main/java/org/jreleaser/sdk/mastodon/api/Status.java index e6d1aa3cc..e7030f6eb 100644 --- a/sdks/jreleaser-mastodon-java-sdk/src/main/java/org/jreleaser/sdk/mastodon/api/Status.java +++ b/sdks/jreleaser-mastodon-java-sdk/src/main/java/org/jreleaser/sdk/mastodon/api/Status.java @@ -25,9 +25,7 @@ */ public class Status { private String id; - private String status; - private String in_reply_to_id; public String getStatus() { @@ -47,6 +45,10 @@ public String toString() { ']'; } + public static Status of(String status) { + return of(status, null); + } + public static Status of(String status, String inReplyToId) { Status o = new Status(); o.status = requireNonBlank(status, "'status' must not be blank").trim(); diff --git a/sdks/jreleaser-mastodon-java-sdk/src/test/java/org/jreleaser/sdk/mastodon/MastodonSdkTest.java b/sdks/jreleaser-mastodon-java-sdk/src/test/java/org/jreleaser/sdk/mastodon/MastodonSdkTest.java index 7ab01867e..6d25f3a94 100644 --- a/sdks/jreleaser-mastodon-java-sdk/src/test/java/org/jreleaser/sdk/mastodon/MastodonSdkTest.java +++ b/sdks/jreleaser-mastodon-java-sdk/src/test/java/org/jreleaser/sdk/mastodon/MastodonSdkTest.java @@ -53,7 +53,7 @@ public void testUpdateStatus() throws MastodonException { .build(); // when: - command.status(Collections.singletonList("success")); + command.toot(Collections.singletonList("success")); // then: RequestPatternBuilder builder = postRequestedFor(urlEqualTo(API_V_1_STATUSES)); @@ -71,7 +71,7 @@ public void testUpdateStatuses() throws MastodonException { .build(); // when: - command.status(Arrays.asList("success1", "success2")); + command.toot(Arrays.asList("success1", "success2")); // then: RequestPatternBuilder builder = postRequestedFor(urlEqualTo(API_V_1_STATUSES)); diff --git a/sdks/jreleaser-twitter-java-sdk/src/main/java/org/jreleaser/sdk/twitter/Twitter.java b/sdks/jreleaser-twitter-java-sdk/src/main/java/org/jreleaser/sdk/twitter/Twitter.java index e4d0ef087..27ca2ac91 100644 --- a/sdks/jreleaser-twitter-java-sdk/src/main/java/org/jreleaser/sdk/twitter/Twitter.java +++ b/sdks/jreleaser-twitter-java-sdk/src/main/java/org/jreleaser/sdk/twitter/Twitter.java @@ -73,8 +73,7 @@ public Twitter(JReleaserLogger logger, public void updateStatus(List statuses) throws TwitterException { wrap(() -> { - String message = statuses.get(0); - Status status = twitter.updateStatus(message); + Status status = twitter.updateStatus(statuses.get(0)); for (int i = 1; i < statuses.size(); i++) { status = twitter.updateStatus(new StatusUpdate(statuses.get(i)) .inReplyToStatusId(status.getId())); diff --git a/sdks/jreleaser-twitter-java-sdk/src/main/java/org/jreleaser/sdk/twitter/TwitterAnnouncer.java b/sdks/jreleaser-twitter-java-sdk/src/main/java/org/jreleaser/sdk/twitter/TwitterAnnouncer.java index e617b8258..8eaeb1dcf 100644 --- a/sdks/jreleaser-twitter-java-sdk/src/main/java/org/jreleaser/sdk/twitter/TwitterAnnouncer.java +++ b/sdks/jreleaser-twitter-java-sdk/src/main/java/org/jreleaser/sdk/twitter/TwitterAnnouncer.java @@ -67,7 +67,6 @@ public boolean isEnabled() { @Override public void announce() throws AnnounceException { - List statuses = new ArrayList<>(); if (isNotBlank(twitter.getStatusTemplate())) {