From b59e23b03ef1aa69e2f1d50bef6267c547a60e70 Mon Sep 17 00:00:00 2001 From: Andrea Cavalli Date: Sun, 18 Apr 2021 23:29:10 +0200 Subject: [PATCH] Bugfix --- .../java/it/tdlight/tdlibsession/td/ResponseError.java | 2 ++ .../tdlibsession/td/WrappedReactorTelegramClient.java | 10 +--------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/src/main/java/it/tdlight/tdlibsession/td/ResponseError.java b/src/main/java/it/tdlight/tdlibsession/td/ResponseError.java index 2c27152..e82cd23 100644 --- a/src/main/java/it/tdlight/tdlibsession/td/ResponseError.java +++ b/src/main/java/it/tdlight/tdlibsession/td/ResponseError.java @@ -44,6 +44,7 @@ public class ResponseError extends IOException { this.code = 500; this.message = cause.getMessage(); this.cause = cause; + this.initCause(cause); } public ResponseError(@NotNull String tag, @NotNull String botName, @NotNull Throwable cause) { @@ -53,6 +54,7 @@ public class ResponseError extends IOException { this.code = 500; this.message = cause.getMessage(); this.cause = cause; + this.initCause(cause); } public static ResponseError newResponseError(@NotNull Function function, @NotNull String botName, @NotNull TdApi.Error cause) { diff --git a/src/main/java/it/tdlight/tdlibsession/td/WrappedReactorTelegramClient.java b/src/main/java/it/tdlight/tdlibsession/td/WrappedReactorTelegramClient.java index e73cc48..e2319fd 100644 --- a/src/main/java/it/tdlight/tdlibsession/td/WrappedReactorTelegramClient.java +++ b/src/main/java/it/tdlight/tdlibsession/td/WrappedReactorTelegramClient.java @@ -2,7 +2,6 @@ package it.tdlight.tdlibsession.td; import it.tdlight.common.ReactiveTelegramClient; import it.tdlight.jni.TdApi; -import it.tdlight.jni.TdApi.Error; import it.tdlight.utils.MonoUtils; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; @@ -47,14 +46,7 @@ public class WrappedReactorTelegramClient implements ReactorTelegramClient { */ @Override public Mono send(TdApi.Function query) { - return Flux.from(reactiveTelegramClient.send(query)).single().handle((item, sink) -> { - if (item.getConstructor() == Error.CONSTRUCTOR) { - var error = ((TdApi.Error) item); - sink.error(new TdError(error.code, error.message)); - } else { - sink.next(item); - } - }); + return Mono.from(reactiveTelegramClient.send(query)).single(); } /**