mirror of
https://github.com/ErnyTech-Archive/JTDLib
synced 2024-09-10 16:26:27 +02:00
Implemented the methods to customize tdlib parameters
Now the EasyClient constructor does not directly start TDLib, you must always use the create() method (e.g. "var client = new BotClient("791655237:AAEs1bgsn9kL8jnj-aXSOEaGgZaTS_iXjkI").create();") Now can be specified the name and lastname (only for UserClient) of the user to be used during registration through the UserClien constructor
This commit is contained in:
parent
ab1016125d
commit
552db21bb4
@ -22,7 +22,7 @@ import it.ernytech.tdlib.TdApi;
|
||||
/**
|
||||
* Interface for easy interaction with TDLib for bot.
|
||||
*/
|
||||
public class BotClient extends EasyClient {
|
||||
public class BotClient extends EasyClient<BotClient> {
|
||||
|
||||
/**
|
||||
* Creates a new BotClient
|
||||
@ -32,3 +32,4 @@ public class BotClient extends EasyClient {
|
||||
super(easyClient -> easyClient.sendRaw(new TdApi.CheckAuthenticationBotToken(botToken)));
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -33,15 +33,39 @@ import java.util.concurrent.atomic.AtomicReference;
|
||||
/**
|
||||
* Interface for easy interaction with TDLib for bot, used to implement other clients such as BotClient and UserClient.
|
||||
*/
|
||||
public class EasyClient {
|
||||
public class EasyClient<T extends EasyClient> {
|
||||
private AuthorizationHandler authorizationHandler;
|
||||
private ClientActor clientActor;
|
||||
private ConcurrentHashMap<Long, TdCallback> handlers = new ConcurrentHashMap<>();
|
||||
private AtomicLong requestId = new AtomicLong(1);
|
||||
private ExecutorService executors = Executors.newFixedThreadPool(10);
|
||||
protected volatile boolean haveAuthorization = false;
|
||||
protected String firstName;
|
||||
protected String lastName;
|
||||
private volatile boolean haveClosed = false;
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
private final T thisAsT = (T) this;
|
||||
|
||||
// tdlib parameters
|
||||
private TdApi.TdlibParameters parameters;
|
||||
private boolean useTestDc = false;
|
||||
private String databaseDirectory = "jtdlib-database";
|
||||
private String filesDirectory = "jtdlib-files";
|
||||
private boolean useFileDatabase = true;
|
||||
private boolean useChatInfoDatabase = true;
|
||||
private boolean useMessageDatabase = true;
|
||||
private static boolean useSecretChats = false; // JTDLib NEVER can use secret chats, so this parameter can't be edited by user
|
||||
private int apiId = 376588;
|
||||
private String apiHash = "2143fdfc2bbba3ec723228d2f81336c9";
|
||||
private String systemLanguageCode = "en";
|
||||
private String deviceModel = "JTDLib";
|
||||
private String systemVersion = "JTDLib";
|
||||
private String applicationVersion = "1.0";
|
||||
private boolean enableStorageOptimizer = false;
|
||||
private boolean ignoreFileNames = false;
|
||||
|
||||
|
||||
/**
|
||||
* Creates a new EasyClient.
|
||||
* @param authorizationHandler Callback to be implemented in the client to manage the authorization.
|
||||
@ -49,19 +73,118 @@ public class EasyClient {
|
||||
public EasyClient(AuthorizationHandler authorizationHandler) {
|
||||
this.authorizationHandler = authorizationHandler;
|
||||
this.handlers.put(0L, new TdCallback(response -> {}, error -> {}, () -> {}));
|
||||
open();
|
||||
}
|
||||
|
||||
public EasyClient(AuthorizationHandler authorizationHandler, boolean logoutAtShutdown) {
|
||||
this.authorizationHandler = authorizationHandler;
|
||||
this.handlers.put(0L, new TdCallback(response -> {}, error -> {}, () -> {}));
|
||||
open();
|
||||
|
||||
if (logoutAtShutdown) {
|
||||
Runtime.getRuntime().addShutdownHook(new Thread(this::close));
|
||||
}
|
||||
}
|
||||
|
||||
public T useTestDc(boolean useTestDc) {
|
||||
this.useTestDc = useTestDc;
|
||||
return thisAsT;
|
||||
}
|
||||
|
||||
public T databaseDirectory(String databaseDirectory) {
|
||||
this.databaseDirectory = databaseDirectory;
|
||||
return thisAsT;
|
||||
}
|
||||
|
||||
public T filesDirectory(String filesDirectory) {
|
||||
this.filesDirectory = filesDirectory;
|
||||
return thisAsT;
|
||||
}
|
||||
|
||||
public T useChatInfoDatabase(boolean useChatInfoDatabase) {
|
||||
this.useChatInfoDatabase = useChatInfoDatabase;
|
||||
return thisAsT;
|
||||
}
|
||||
|
||||
public T useMessageDatabase (boolean useMessageDatabase ) {
|
||||
this.useMessageDatabase = useMessageDatabase ;
|
||||
return thisAsT;
|
||||
}
|
||||
|
||||
public EasyClient apiId (int apiId) {
|
||||
this.apiId = apiId;
|
||||
return thisAsT;
|
||||
}
|
||||
|
||||
public T apiHash (String apiHash) {
|
||||
this.apiHash = apiHash;
|
||||
return thisAsT;
|
||||
}
|
||||
|
||||
public T systemLanguageCode (String systemLanguageCode) {
|
||||
this.systemLanguageCode = systemLanguageCode;
|
||||
return thisAsT;
|
||||
}
|
||||
|
||||
public T deviceModel (String deviceModel) {
|
||||
this.deviceModel = deviceModel;
|
||||
return thisAsT;
|
||||
}
|
||||
|
||||
public T systemVersion (String systemVersion) {
|
||||
this.systemVersion = systemVersion;
|
||||
return thisAsT;
|
||||
}
|
||||
|
||||
public T applicationVersion (String applicationVersion) {
|
||||
this.applicationVersion = applicationVersion;
|
||||
return thisAsT;
|
||||
}
|
||||
|
||||
public T enableStorageOptimizer (boolean enableStorageOptimizer) {
|
||||
this.enableStorageOptimizer = enableStorageOptimizer;
|
||||
return thisAsT;
|
||||
}
|
||||
|
||||
public T ignoreFileNames (boolean ignoreFileNames) {
|
||||
this.ignoreFileNames = ignoreFileNames;
|
||||
return thisAsT;
|
||||
}
|
||||
|
||||
public T parameters (TdApi.TdlibParameters parameters) {
|
||||
this.parameters = parameters;
|
||||
return thisAsT;
|
||||
}
|
||||
|
||||
public T create() {
|
||||
if (this.parameters == null) {
|
||||
this.parameters = new TdApi.TdlibParameters();
|
||||
this.parameters.useTestDc = this.useTestDc;
|
||||
this.parameters.databaseDirectory = this.databaseDirectory;
|
||||
this.parameters.filesDirectory = this.filesDirectory;
|
||||
this.parameters.useFileDatabase = this.useFileDatabase;
|
||||
this.parameters.useChatInfoDatabase = this.useChatInfoDatabase;
|
||||
this.parameters.useMessageDatabase = this.useMessageDatabase;
|
||||
this.parameters.useSecretChats = this.useSecretChats;
|
||||
this.parameters.apiId = this.apiId;
|
||||
this.parameters.apiHash = this.apiHash;
|
||||
this.parameters.systemLanguageCode = this.systemLanguageCode;
|
||||
this.parameters.deviceModel = this.deviceModel;
|
||||
this.parameters.systemVersion = this.systemVersion;
|
||||
this.parameters.applicationVersion = this.applicationVersion;
|
||||
this.parameters.enableStorageOptimizer = this.enableStorageOptimizer;
|
||||
this.parameters.ignoreFileNames = this.ignoreFileNames;
|
||||
}
|
||||
|
||||
Log.setVerbosityLevel(1);
|
||||
inizializeClient();
|
||||
return thisAsT;
|
||||
}
|
||||
|
||||
public void close() {
|
||||
send(new TdApi.LogOut());
|
||||
this.executors.shutdown();
|
||||
this.haveClosed = true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Send a request to tdlib without waiting for the result.
|
||||
* @param function TDLib API function representing a request to TDLib.
|
||||
@ -185,17 +308,6 @@ public class EasyClient {
|
||||
this.handlers.put(0L, new TdCallback(receiveCallback, errorCallback, closeCallback));
|
||||
}
|
||||
|
||||
public void close() {
|
||||
send(new TdApi.LogOut());
|
||||
this.executors.shutdown();
|
||||
this.haveClosed = true;
|
||||
}
|
||||
|
||||
public void open() {
|
||||
Log.setVerbosityLevel(1);
|
||||
inizializeClient();
|
||||
}
|
||||
|
||||
/**
|
||||
* Destroys the client and TDLib instance.
|
||||
*/
|
||||
@ -278,18 +390,7 @@ public class EasyClient {
|
||||
protected void authorizationHandler(TdApi.AuthorizationState authorizationState) {
|
||||
switch (authorizationState.getConstructor()) {
|
||||
case TdApi.AuthorizationStateWaitTdlibParameters.CONSTRUCTOR : {
|
||||
var parameters = new TdApi.TdlibParameters();
|
||||
parameters.databaseDirectory = "tdlib";
|
||||
parameters.useMessageDatabase = false;
|
||||
parameters.useSecretChats = false;
|
||||
parameters.apiId = 94575;
|
||||
parameters.apiHash = "a3406de8d171bb422bb6ddf3bbd800e2";
|
||||
parameters.systemLanguageCode = "en";
|
||||
parameters.deviceModel = "TDBOT";
|
||||
parameters.systemVersion = "TDBOT";
|
||||
parameters.applicationVersion = "1.0";
|
||||
parameters.enableStorageOptimizer = true;
|
||||
sendRaw(new TdApi.SetTdlibParameters(parameters));
|
||||
sendRaw(new TdApi.SetTdlibParameters(this.parameters));
|
||||
break;
|
||||
}
|
||||
|
||||
@ -304,21 +405,22 @@ public class EasyClient {
|
||||
}
|
||||
|
||||
case TdApi.AuthorizationStateWaitCode.CONSTRUCTOR: {
|
||||
var scanner = new Scanner(System.in);
|
||||
System.out.print("Insert your code: ");
|
||||
TdApi.AuthorizationStateWaitCode authorizationStateWaitCode = (TdApi.AuthorizationStateWaitCode) authorizationState;
|
||||
TdApi.CheckAuthenticationCode authCodeReply = new TdApi.CheckAuthenticationCode();
|
||||
System.out.print("Insert your code: ");
|
||||
authCodeReply.code = scanner.nextLine();
|
||||
if (!authorizationStateWaitCode.isRegistered) {
|
||||
System.out.print("Insert your first name: ");
|
||||
authCodeReply.firstName = scanner.nextLine();
|
||||
System.out.print("Insert your last name: ");
|
||||
authCodeReply.lastName = scanner.nextLine();
|
||||
}
|
||||
sendRaw(authCodeReply);
|
||||
System.out.println();
|
||||
break;
|
||||
var scanner = new Scanner(System.in);
|
||||
TdApi.AuthorizationStateWaitCode authorizationStateWaitCode = (TdApi.AuthorizationStateWaitCode) authorizationState;
|
||||
TdApi.CheckAuthenticationCode authCodeReply = new TdApi.CheckAuthenticationCode();
|
||||
System.out.print("Insert your code: ");
|
||||
authCodeReply.code = scanner.nextLine();
|
||||
|
||||
if (!authorizationStateWaitCode.isRegistered) {
|
||||
authCodeReply.firstName = this.firstName;
|
||||
if (this.lastName != null) {
|
||||
authCodeReply.lastName = this.lastName;
|
||||
}
|
||||
}
|
||||
|
||||
sendRaw(authCodeReply);
|
||||
System.out.println();
|
||||
break;
|
||||
}
|
||||
|
||||
case TdApi.AuthorizationStateWaitPassword.CONSTRUCTOR: {
|
||||
@ -359,3 +461,4 @@ public class EasyClient {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -22,7 +22,7 @@ import it.ernytech.tdlib.TdApi;
|
||||
/**
|
||||
* Interface for easy interaction with TDLib for user.
|
||||
*/
|
||||
public class UserClient extends EasyClient {
|
||||
public class UserClient extends EasyClient<UserClient> {
|
||||
|
||||
/**
|
||||
* Creates a new UserClient.
|
||||
@ -31,4 +31,15 @@ public class UserClient extends EasyClient {
|
||||
public UserClient(long phoneNumber) {
|
||||
super(easyClient -> easyClient.sendRaw(new TdApi.SetAuthenticationPhoneNumber(String.valueOf(phoneNumber), false, false)));
|
||||
}
|
||||
}
|
||||
|
||||
public UserClient(long phoneNumber, String firstName) {
|
||||
super(easyClient -> easyClient.sendRaw(new TdApi.SetAuthenticationPhoneNumber(String.valueOf(phoneNumber), false, false)));
|
||||
this.firstName = firstName;
|
||||
}
|
||||
|
||||
public UserClient(long phoneNumber, String firstName, String lastName) {
|
||||
super(easyClient -> easyClient.sendRaw(new TdApi.SetAuthenticationPhoneNumber(String.valueOf(phoneNumber), false, false)));
|
||||
this.firstName = firstName;
|
||||
this.lastName = lastName;
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user