Merge branch 'master' into development
This commit is contained in:
commit
6b7f2ca273
49
README.md
49
README.md
@ -1,6 +1,6 @@
|
|||||||
# .NET Telegram Bot Framework - Context based addon
|
# .NET Telegram Bot Framework - Context based addon
|
||||||
|
|
||||||
[](https://www.nuget.org/packages/TelegramBotBase/)
|
[](https://www.nuget.org/packages/TelegramBotBase/)
|
||||||
[](https://www.t.me/tgbotbase)
|
[](https://www.t.me/tgbotbase)
|
||||||
|
|
||||||
[](https://raw.githubusercontent.com/MajMcCloud/TelegramBotFramework/master/LICENCE.md)
|
[](https://raw.githubusercontent.com/MajMcCloud/TelegramBotFramework/master/LICENCE.md)
|
||||||
@ -723,6 +723,7 @@ The current available languages for controls are:
|
|||||||
- English
|
- English
|
||||||
- German
|
- German
|
||||||
- Persian
|
- Persian
|
||||||
|
- Russian
|
||||||
|
|
||||||
You can add other languages easily by creating a subclass of the [TelegramBotBase/Localizations/Localization.cs](TelegramBotBase/Localizations/Localization.cs) class.
|
You can add other languages easily by creating a subclass of the [TelegramBotBase/Localizations/Localization.cs](TelegramBotBase/Localizations/Localization.cs) class.
|
||||||
|
|
||||||
@ -1039,6 +1040,8 @@ again at 1 (due to `PopAsync` or `PopToRootAsync` calls) it will replace the con
|
|||||||
you
|
you
|
||||||
have given to the constructor at the beginning.*
|
have given to the constructor at the beginning.*
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
## Extensions
|
## Extensions
|
||||||
|
|
||||||
### TelegramBotBase.Extensions.Images
|
### TelegramBotBase.Extensions.Images
|
||||||
@ -1048,7 +1051,28 @@ Extends the base package with some additional image methods like SendPhoto (usin
|
|||||||
[](https://www.nuget.org/packages/TelegramBotBase.Extensions.Images/)
|
[](https://www.nuget.org/packages/TelegramBotBase.Extensions.Images/)
|
||||||
[](https://www.nuget.org/packages/TelegramBotBase.Extensions.Images)
|
[](https://www.nuget.org/packages/TelegramBotBase.Extensions.Images)
|
||||||
|
|
||||||
[https://www.nuget.org/packages/TelegramBotBase.Extensions.Images/](https://www.nuget.org/packages/TelegramBotBase.Extensions.Images/)
|
Source code: [TelegramBotBase.Extensions.Images/](/TelegramBotBase.Extensions.Images/)
|
||||||
|
|
||||||
|
Nuget package: [https://www.nuget.org/packages/TelegramBotBase.Extensions.Images/](https://www.nuget.org/packages/TelegramBotBase.Extensions.Images/)
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
### TelegramBotBase.Extensions.Images.IronSoftware
|
||||||
|
|
||||||
|
Extends the base package with some additional image methods like SendPhoto (using Bitmap)
|
||||||
|
|
||||||
|
Important: This extension uses the IronSoftware drawing library.
|
||||||
|
|
||||||
|
[](https://www.nuget.org/packages/TelegramBotBase.Extensions.Images.IronSoftware/)
|
||||||
|
[](https://www.nuget.org/packages/TelegramBotBase.Extensions.Images.IronSoftware)
|
||||||
|
|
||||||
|
[https://www.nuget.org/packages/TelegramBotBase.Extensions.Images.IronSoftware/](https://www.nuget.org/packages/TelegramBotBase.Extensions.Images.IronSoftware/)
|
||||||
|
|
||||||
|
Source code: [TelegramBotBase.Extensions.Images.IronSoftware/](TelegramBotBase.Extensions.Images.IronSoftware/)
|
||||||
|
|
||||||
|
Nuget package: [https://www.nuget.org/packages/TelegramBotBase.Extensions.IronSoftware/](https://www.nuget.org/packages/TelegramBotBase.Extensions.IronSoftware/)
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
Project: [open source](TelegramBotBase.Extensions.Images/)
|
Project: [open source](TelegramBotBase.Extensions.Images/)
|
||||||
|
|
||||||
@ -1072,7 +1096,26 @@ A session serializer for Microsoft SQL Server.
|
|||||||
[](https://www.nuget.org/packages/TelegramBotBase.Extensions.Serializer.Database.MSSQL/)
|
[](https://www.nuget.org/packages/TelegramBotBase.Extensions.Serializer.Database.MSSQL/)
|
||||||
[](https://www.nuget.org/packages/TelegramBotBase.Extensions.Serializer.Database.MSSQL)
|
[](https://www.nuget.org/packages/TelegramBotBase.Extensions.Serializer.Database.MSSQL)
|
||||||
|
|
||||||
[https://www.nuget.org/packages/TelegramBotBase.Extensions.Serializer.Database.MSSQL/](https://www.nuget.org/packages/TelegramBotBase.Extensions.Serializer.Database.MSSQL/)
|
Source code: [TelegramBotBase.Extensions.Serializer.Database.MSSQL/](/TelegramBotBase.Extensions.Serializer.Database.MSSQL/)
|
||||||
|
|
||||||
|
Nuget package: [https://www.nuget.org/packages/TelegramBotBase.Extensions.Serializer.Database.MSSQL/](https://www.nuget.org/packages/TelegramBotBase.Extensions.Serializer.Database.MSSQL/)
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
### TelegramBotBase.Extensions.Serializer.Database.PostgreSql
|
||||||
|
|
||||||
|
A session serializer for PostgreSql Server.
|
||||||
|
|
||||||
|
[](https://www.nuget.org/packages/TelegramBotBase.Extensions.Serializer.Database.PostgreSql/)
|
||||||
|
[](https://www.nuget.org/packages/TelegramBotBase.Extensions.Serializer.Database.PostgreSql)
|
||||||
|
|
||||||
|
Source code: [TelegramBotBase.Extensions.Serializer.Database.PostgreSql/](/TelegramBotBase.Extensions.Serializer.Database.PostgreSql/)
|
||||||
|
|
||||||
|
Nuget package: [https://www.nuget.org/packages/TelegramBotBase.Extensions.Serializer.Database.PostgreSql/](https://www.nuget.org/packages/TelegramBotBase.Extensions.Serializer.Database.PostgreSql/)
|
||||||
|
|
||||||
|
Credits: [@Kataane](https://github.com/Kataane)
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
Project: [open source](TelegramBotBase.Extensions.Serializer.Database.MSSQL/)
|
Project: [open source](TelegramBotBase.Extensions.Serializer.Database.MSSQL/)
|
||||||
|
|
||||||
|
|||||||
@ -0,0 +1,92 @@
|
|||||||
|
using System;
|
||||||
|
using TelegramBotBase.Builder;
|
||||||
|
using TelegramBotBase.Builder.Interfaces;
|
||||||
|
|
||||||
|
namespace TelegramBotBase.Extensions.Serializer.Database.PostgreSql
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Provides extension methods for configuring the use of PostgreSQL Server Database for session serialization.
|
||||||
|
/// </summary>
|
||||||
|
public static class BotBaseBuilderExtensions
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Uses an PostgreSQL Server Database to save and restore sessions.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="builder">The session serialization stage builder.</param>
|
||||||
|
/// <param name="connectionString">The connection string to the PostgreSQL database.</param>
|
||||||
|
/// <param name="fallbackForm">The fallback form type.</param>
|
||||||
|
/// <param name="tablePrefix">The prefix for database table names (default is "tgb_").</param>
|
||||||
|
/// <returns>The language selection stage builder.</returns>
|
||||||
|
public static ILanguageSelectionStage UsePostgreSqlDatabase(
|
||||||
|
this ISessionSerializationStage builder,
|
||||||
|
string connectionString, Type fallbackForm = null,
|
||||||
|
string tablePrefix = "tgb_")
|
||||||
|
{
|
||||||
|
var serializer = new PostgreSqlSerializer(connectionString, tablePrefix, fallbackForm);
|
||||||
|
|
||||||
|
builder.UseSerialization(serializer);
|
||||||
|
|
||||||
|
return builder as BotBaseBuilder;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Uses an PostgreSQL Server Database to save and restore sessions.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="builder">The session serialization stage builder.</param>
|
||||||
|
/// <param name="hostOrIp">The host or IP address of the PostgreSQL server.</param>
|
||||||
|
/// <param name="port">The port number for the PostgreSQL server.</param>
|
||||||
|
/// <param name="databaseName">The name of the PostgreSQL database.</param>
|
||||||
|
/// <param name="userId">The user ID for connecting to the PostgreSQL server.</param>
|
||||||
|
/// <param name="password">The password for connecting to the PostgreSQL server.</param>
|
||||||
|
/// <param name="fallbackForm">The fallback form type.</param>
|
||||||
|
/// <param name="tablePrefix">The prefix for database table names (default is "tgb_").</param>
|
||||||
|
/// <returns>The language selection stage builder.</returns>
|
||||||
|
public static ILanguageSelectionStage UsePostgreSqlDatabase(
|
||||||
|
this ISessionSerializationStage builder,
|
||||||
|
string hostOrIp, int port,
|
||||||
|
string databaseName, string userId,
|
||||||
|
string password, Type fallbackForm = null,
|
||||||
|
string tablePrefix = "tgb_")
|
||||||
|
{
|
||||||
|
var connectionString = $"Host={hostOrIp};Port={port};Database={databaseName};Username={userId};Password={password}";
|
||||||
|
|
||||||
|
var serializer = new PostgreSqlSerializer(connectionString, tablePrefix, fallbackForm);
|
||||||
|
|
||||||
|
builder.UseSerialization(serializer);
|
||||||
|
|
||||||
|
return builder as BotBaseBuilder;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Uses an PostgreSQL Server Database with Windows Authentication to save and restore sessions.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="builder">The session serialization stage builder.</param>
|
||||||
|
/// <param name="hostOrIp">The host or IP address of the PostgreSQL server.</param>
|
||||||
|
/// <param name="port">The port number for the PostgreSQL server.</param>
|
||||||
|
/// <param name="databaseName">The name of the PostgreSQL database.</param>
|
||||||
|
/// <param name="integratedSecurity">A flag indicating whether to use Windows Authentication (true) or not (false).</param>
|
||||||
|
/// <param name="fallbackForm">The fallback form type.</param>
|
||||||
|
/// <param name="tablePrefix">The prefix for database table names (default is "tgb_").</param>
|
||||||
|
/// <returns>The language selection stage builder.</returns>
|
||||||
|
public static ILanguageSelectionStage UsePostgreSqlDatabase(
|
||||||
|
this ISessionSerializationStage builder,
|
||||||
|
string hostOrIp, int port,
|
||||||
|
string databaseName, bool integratedSecurity = true,
|
||||||
|
Type fallbackForm = null, string tablePrefix = "tgb_")
|
||||||
|
{
|
||||||
|
if (!integratedSecurity)
|
||||||
|
{
|
||||||
|
throw new ArgumentOutOfRangeException();
|
||||||
|
}
|
||||||
|
|
||||||
|
var connectionString = $"Host={hostOrIp};Port={port};Database={databaseName};Integrated Security=true;";
|
||||||
|
|
||||||
|
var serializer = new PostgreSqlSerializer(connectionString, tablePrefix, fallbackForm);
|
||||||
|
|
||||||
|
builder.UseSerialization(serializer);
|
||||||
|
|
||||||
|
return builder as BotBaseBuilder;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,252 @@
|
|||||||
|
using Npgsql;
|
||||||
|
using System;
|
||||||
|
using System.Data;
|
||||||
|
using NpgsqlTypes;
|
||||||
|
using TelegramBotBase.Args;
|
||||||
|
using TelegramBotBase.Base;
|
||||||
|
using TelegramBotBase.Form;
|
||||||
|
using TelegramBotBase.Interfaces;
|
||||||
|
|
||||||
|
namespace TelegramBotBase.Extensions.Serializer.Database.PostgreSql
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Represents a PostgreSQL implementation of the <see cref="IStateMachine"/> for saving and loading form states.
|
||||||
|
/// </summary>
|
||||||
|
public class PostgreSqlSerializer : IStateMachine
|
||||||
|
{
|
||||||
|
private readonly string insertIntoSessionSql;
|
||||||
|
private readonly string insertIntoSessionsDataSql;
|
||||||
|
private readonly string selectAllDevicesSessionsSql;
|
||||||
|
private readonly string selectAllDevicesSessionsDataSql;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Initializes a new instance of the <see cref="PostgreSqlSerializer"/> class.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="connectionString">The connection string to the PostgreSQL database.</param>
|
||||||
|
/// <param name="tablePrefix">The prefix for database table names (default is "tgb_").</param>
|
||||||
|
/// <param name="fallbackStateForm">The fallback state form type.</param>
|
||||||
|
/// <exception cref="ArgumentNullException">Thrown when <paramref name="connectionString"/> is null.</exception>
|
||||||
|
/// <exception cref="ArgumentException">Thrown when <paramref name="fallbackStateForm"/> is not a subclass of <see cref="FormBase"/>.</exception>
|
||||||
|
public PostgreSqlSerializer(string connectionString, string tablePrefix = "tgb_", Type fallbackStateForm = null)
|
||||||
|
{
|
||||||
|
ConnectionString = connectionString ?? throw new ArgumentNullException(nameof(connectionString));
|
||||||
|
|
||||||
|
TablePrefix = tablePrefix;
|
||||||
|
|
||||||
|
FallbackStateForm = fallbackStateForm;
|
||||||
|
|
||||||
|
if (FallbackStateForm != null && !FallbackStateForm.IsSubclassOf(typeof(FormBase)))
|
||||||
|
{
|
||||||
|
throw new ArgumentException($"{nameof(FallbackStateForm)} is not a subclass of {nameof(FormBase)}");
|
||||||
|
}
|
||||||
|
|
||||||
|
insertIntoSessionSql = "INSERT INTO " + TablePrefix +
|
||||||
|
"devices_sessions (deviceId, deviceTitle, \"FormUri\", \"QualifiedName\") VALUES (@deviceId, @deviceTitle, @FormUri, @QualifiedName)";
|
||||||
|
insertIntoSessionsDataSql = "INSERT INTO " + TablePrefix + "devices_sessions_data (deviceId, key, value, type) VALUES (@deviceId, @key, @value, @type)";
|
||||||
|
|
||||||
|
selectAllDevicesSessionsSql = "SELECT * FROM " + TablePrefix + "devices_sessions";
|
||||||
|
selectAllDevicesSessionsDataSql = "SELECT * FROM " + TablePrefix + "devices_sessions_data WHERE deviceId = @deviceId";
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gets the connection string to the PostgreSQL database.
|
||||||
|
/// </summary>
|
||||||
|
public string ConnectionString { get; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gets or sets the table name prefix for database tables.
|
||||||
|
/// </summary>
|
||||||
|
public string TablePrefix { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gets or sets the fallback state form type.
|
||||||
|
/// </summary>
|
||||||
|
public Type FallbackStateForm { get; set; }
|
||||||
|
|
||||||
|
/// <inheritdoc/>
|
||||||
|
/// <summary>
|
||||||
|
/// Saves form states to the PostgreSQL database.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="e">The <see cref="SaveStatesEventArgs"/> containing the states to be saved.</param>
|
||||||
|
public void SaveFormStates(SaveStatesEventArgs e)
|
||||||
|
{
|
||||||
|
var container = e.States;
|
||||||
|
|
||||||
|
//Cleanup old Session data
|
||||||
|
Cleanup();
|
||||||
|
|
||||||
|
using (var connection = new NpgsqlConnection(ConnectionString))
|
||||||
|
{
|
||||||
|
connection.Open();
|
||||||
|
|
||||||
|
//Store session data in database
|
||||||
|
foreach (var state in container.States)
|
||||||
|
{
|
||||||
|
using (var sessionCommand = connection.CreateCommand())
|
||||||
|
{
|
||||||
|
sessionCommand.CommandText = insertIntoSessionSql;
|
||||||
|
|
||||||
|
sessionCommand.Parameters.Add(new NpgsqlParameter("@deviceId", NpgsqlDbType.Bigint){Value = state.DeviceId });
|
||||||
|
sessionCommand.Parameters.Add(new NpgsqlParameter("@deviceTitle", DbType.StringFixedLength){Value = state.ChatTitle ?? string.Empty});
|
||||||
|
sessionCommand.Parameters.Add(new NpgsqlParameter("@FormUri", DbType.StringFixedLength) {Value = state.FormUri});
|
||||||
|
sessionCommand.Parameters.Add(new NpgsqlParameter("@QualifiedName", DbType.StringFixedLength){Value = state.QualifiedName });
|
||||||
|
|
||||||
|
sessionCommand.ExecuteNonQuery();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
using (var connection = new NpgsqlConnection(ConnectionString))
|
||||||
|
{
|
||||||
|
connection.Open();
|
||||||
|
|
||||||
|
foreach (var state in container.States)
|
||||||
|
{
|
||||||
|
SaveSessionsData(state, connection);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <inheritdoc/>
|
||||||
|
/// <summary>
|
||||||
|
/// Loads form states from the PostgreSQL database.
|
||||||
|
/// </summary>
|
||||||
|
/// <returns>A <see cref="StateContainer"/> containing the loaded form states.</returns>
|
||||||
|
public StateContainer LoadFormStates()
|
||||||
|
{
|
||||||
|
var stateContainer = new StateContainer();
|
||||||
|
|
||||||
|
using (var connection = new NpgsqlConnection(ConnectionString))
|
||||||
|
{
|
||||||
|
connection.Open();
|
||||||
|
|
||||||
|
using (var sessionCommand = connection.CreateCommand())
|
||||||
|
{
|
||||||
|
sessionCommand.CommandText = selectAllDevicesSessionsSql;
|
||||||
|
|
||||||
|
var sessionTable = new DataTable();
|
||||||
|
using (var dataAdapter = new NpgsqlDataAdapter(sessionCommand))
|
||||||
|
{
|
||||||
|
dataAdapter.Fill(sessionTable);
|
||||||
|
|
||||||
|
foreach (DataRow row in sessionTable.Rows)
|
||||||
|
{
|
||||||
|
var stateEntry = new StateEntry
|
||||||
|
{
|
||||||
|
DeviceId = (long)row["deviceId"],
|
||||||
|
ChatTitle = row["deviceTitle"].ToString(),
|
||||||
|
FormUri = row["FormUri"].ToString(),
|
||||||
|
QualifiedName = row["QualifiedName"].ToString()
|
||||||
|
};
|
||||||
|
|
||||||
|
stateContainer.States.Add(stateEntry);
|
||||||
|
|
||||||
|
if (stateEntry.DeviceId > 0)
|
||||||
|
{
|
||||||
|
stateContainer.ChatIds.Add(stateEntry.DeviceId);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
stateContainer.GroupIds.Add(stateEntry.DeviceId);
|
||||||
|
}
|
||||||
|
|
||||||
|
LoadDataTable(connection, row, stateEntry);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return stateContainer;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Cleans up old session data in the PostgreSQL database.
|
||||||
|
/// </summary>
|
||||||
|
private void Cleanup()
|
||||||
|
{
|
||||||
|
using (var connection = new NpgsqlConnection(ConnectionString))
|
||||||
|
{
|
||||||
|
connection.Open();
|
||||||
|
|
||||||
|
using (var clearCommand = connection.CreateCommand())
|
||||||
|
{
|
||||||
|
clearCommand.CommandText = $"DELETE FROM {TablePrefix}devices_sessions_data";
|
||||||
|
clearCommand.ExecuteNonQuery();
|
||||||
|
}
|
||||||
|
|
||||||
|
using (var clearCommand = connection.CreateCommand())
|
||||||
|
{
|
||||||
|
clearCommand.CommandText = $"DELETE FROM {TablePrefix}devices_sessions";
|
||||||
|
clearCommand.ExecuteNonQuery();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Saves session data to the PostgreSQL database.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="state">The state entry containing session data to be saved.</param>
|
||||||
|
/// <param name="connection">The NpgsqlConnection used for the database interaction.</param>
|
||||||
|
private void SaveSessionsData(StateEntry state, NpgsqlConnection connection)
|
||||||
|
{
|
||||||
|
foreach (var data in state.Values)
|
||||||
|
{
|
||||||
|
using (var dataCommand = connection.CreateCommand())
|
||||||
|
{
|
||||||
|
dataCommand.CommandText = insertIntoSessionsDataSql;
|
||||||
|
|
||||||
|
dataCommand.Parameters.Add(new NpgsqlParameter("@deviceId", NpgsqlDbType.Bigint) { Value = state.DeviceId });
|
||||||
|
dataCommand.Parameters.Add(new NpgsqlParameter("@key", DbType.StringFixedLength) { Value = data.Key });
|
||||||
|
|
||||||
|
var type = data.Value.GetType();
|
||||||
|
|
||||||
|
if (type.IsPrimitive || type == typeof(string))
|
||||||
|
{
|
||||||
|
dataCommand.Parameters.Add(new NpgsqlParameter("@value", NpgsqlDbType.Text) { Value = data.Value });
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
var json = System.Text.Json.JsonSerializer.Serialize(data.Value);
|
||||||
|
dataCommand.Parameters.Add(new NpgsqlParameter("@value", NpgsqlDbType.Text) { Value = json });
|
||||||
|
}
|
||||||
|
|
||||||
|
dataCommand.Parameters.Add(new NpgsqlParameter("@type", DbType.StringFixedLength) { Value = type.AssemblyQualifiedName });
|
||||||
|
|
||||||
|
dataCommand.ExecuteNonQuery();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Loads session data from the PostgreSQL database.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="connection">The NpgsqlConnection used for the database interaction.</param>
|
||||||
|
/// <param name="row">The DataRow representing a session entry in the main sessions table.</param>
|
||||||
|
/// <param name="stateEntry">The StateEntry object to which session data will be loaded.</param>
|
||||||
|
private void LoadDataTable(NpgsqlConnection connection, DataRow row, StateEntry stateEntry)
|
||||||
|
{
|
||||||
|
using (var sessionCommand = connection.CreateCommand())
|
||||||
|
{
|
||||||
|
sessionCommand.CommandText = selectAllDevicesSessionsDataSql;
|
||||||
|
sessionCommand.Parameters.Add(new NpgsqlParameter("@deviceId", row["deviceId"]));
|
||||||
|
|
||||||
|
var dataCommandTable = new DataTable();
|
||||||
|
using (var npgSqlDataAdapter = new NpgsqlDataAdapter(sessionCommand))
|
||||||
|
{
|
||||||
|
npgSqlDataAdapter.Fill(dataCommandTable);
|
||||||
|
|
||||||
|
foreach (DataRow dataRow in dataCommandTable.Rows)
|
||||||
|
{
|
||||||
|
var key = dataRow["key"].ToString();
|
||||||
|
var type = Type.GetType(dataRow["type"].ToString());
|
||||||
|
|
||||||
|
var value = System.Text.Json.JsonSerializer.Deserialize(dataRow["value"].ToString(), type);
|
||||||
|
|
||||||
|
stateEntry.Values.Add(key, value);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,27 @@
|
|||||||
|
# TelegramBotBase.Extensions.Serializer.Database.PostgreSQL
|
||||||
|
|
||||||
|
[](https://www.nuget.org/packages/TelegramBotBase.Extensions.Serializer.Database.PostgreSQL/)
|
||||||
|
[](https://www.t.me/tgbotbase)
|
||||||
|
|
||||||
|
[](https://raw.githubusercontent.com/MajMcCloud/TelegramBotFramework/master/LICENCE.md)
|
||||||
|
[](https://www.nuget.org/packages/TelegramBotBase.Extensions.Serializer.Database.PostgreSQL)
|
||||||
|
|
||||||
|
## How to use
|
||||||
|
|
||||||
|
```csharp
|
||||||
|
using TelegramBotBase.Extensions.Serializer.Database.PostgreSQL;
|
||||||
|
|
||||||
|
|
||||||
|
var bot = BotBaseBuilder
|
||||||
|
.Create()
|
||||||
|
.WithAPIKey(APIKey)
|
||||||
|
.DefaultMessageLoop()
|
||||||
|
.WithStartForm<Start>()
|
||||||
|
.NoProxy()
|
||||||
|
.OnlyStart()
|
||||||
|
.UsePostgreSqlDatabase("localhost", "8181", "telegram_bot")
|
||||||
|
.UseEnglish()
|
||||||
|
.Build();
|
||||||
|
|
||||||
|
bot.Start();
|
||||||
|
```
|
||||||
@ -0,0 +1,28 @@
|
|||||||
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
|
|
||||||
|
<PropertyGroup>
|
||||||
|
<TargetFrameworks>netstandard2.0;netcoreapp3.1;net6</TargetFrameworks>
|
||||||
|
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
|
||||||
|
<RepositoryUrl>https://github.com/MajMcCloud/TelegramBotFramework</RepositoryUrl>
|
||||||
|
<PackageProjectUrl>https://github.com/MajMcCloud/TelegramBotFramework</PackageProjectUrl>
|
||||||
|
<Copyright>MIT</Copyright>
|
||||||
|
<IncludeSymbols>true</IncludeSymbols>
|
||||||
|
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
|
||||||
|
<AssemblyVersion>1.0.1</AssemblyVersion>
|
||||||
|
<FileVersion>1.0.1</FileVersion>
|
||||||
|
<Version>1.0.1</Version>
|
||||||
|
<Description>
|
||||||
|
A session serializer for PostgreSQL Server.
|
||||||
|
</Description>
|
||||||
|
</PropertyGroup>
|
||||||
|
|
||||||
|
<ItemGroup>
|
||||||
|
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
|
||||||
|
<PrivateAssets>all</PrivateAssets>
|
||||||
|
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||||
|
</PackageReference>
|
||||||
|
<PackageReference Include="TelegramBotBase" Version="6.0.0" />
|
||||||
|
<PackageReference Include="Npgsql" Version="8.0.1" />
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
|
</Project>
|
||||||
@ -0,0 +1,25 @@
|
|||||||
|
-- Enable uuid-ossp extension
|
||||||
|
CREATE EXTENSION IF NOT EXISTS "uuid-ossp";
|
||||||
|
|
||||||
|
-- Create table tgb_devices_sessions
|
||||||
|
CREATE TABLE tgb_devices_sessions (
|
||||||
|
deviceId bigint NOT NULL,
|
||||||
|
deviceTitle character varying(512) NOT NULL,
|
||||||
|
"FormUri" character varying(512) NOT NULL,
|
||||||
|
"QualifiedName" character varying(512) NOT NULL,
|
||||||
|
CONSTRAINT PK_tgb_devices_sessions_1 PRIMARY KEY (deviceId)
|
||||||
|
);
|
||||||
|
|
||||||
|
-- Create table tgb_devices_sessions_data
|
||||||
|
CREATE TABLE tgb_devices_sessions_data (
|
||||||
|
Id uuid DEFAULT uuid_generate_v4() NOT NULL,
|
||||||
|
deviceId bigint NOT NULL,
|
||||||
|
key character varying(512) NOT NULL,
|
||||||
|
"value" text NOT NULL,
|
||||||
|
"type" character varying(512) NOT NULL,
|
||||||
|
CONSTRAINT PK_tgb_devices_session_data PRIMARY KEY (Id)
|
||||||
|
);
|
||||||
|
|
||||||
|
-- Add default constraint for Id column in tgb_devices_sessions_data
|
||||||
|
ALTER TABLE tgb_devices_sessions_data
|
||||||
|
ALTER COLUMN Id SET DEFAULT uuid_generate_v4();
|
||||||
@ -398,30 +398,42 @@ public class BotBaseBuilder : IAPIKeySelectionStage, IMessageLoopSelectionStage,
|
|||||||
|
|
||||||
#region "Step 7 (Language)"
|
#region "Step 7 (Language)"
|
||||||
|
|
||||||
public IThreadingStage DefaultLanguage()
|
/// <inheritdoc cref="ILanguageSelectionStage.DefaultLanguage"/>
|
||||||
|
public IBuildingStage DefaultLanguage()
|
||||||
{
|
{
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public IThreadingStage UseEnglish()
|
/// <inheritdoc cref="ILanguageSelectionStage.UseEnglish"/>
|
||||||
|
public IBuildingStage UseEnglish()
|
||||||
{
|
{
|
||||||
Default.Language = new English();
|
Default.Language = new English();
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public IThreadingStage UseGerman()
|
/// <inheritdoc cref="ILanguageSelectionStage.UseGerman"/>
|
||||||
|
public IBuildingStage UseGerman()
|
||||||
{
|
{
|
||||||
Default.Language = new German();
|
Default.Language = new German();
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public IThreadingStage UsePersian()
|
/// <inheritdoc cref="ILanguageSelectionStage.UsePersian"/>
|
||||||
|
public IBuildingStage UsePersian()
|
||||||
{
|
{
|
||||||
Default.Language = new Persian();
|
Default.Language = new Persian();
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public IThreadingStage Custom(Localization language)
|
/// <inheritdoc cref="ILanguageSelectionStage.UseRussian"/>
|
||||||
|
public IBuildingStage UseRussian()
|
||||||
|
{
|
||||||
|
Default.Language = new Russian();
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <inheritdoc cref="ILanguageSelectionStage.Custom"/>
|
||||||
|
public IBuildingStage Custom(Localization language)
|
||||||
{
|
{
|
||||||
Default.Language = language;
|
Default.Language = language;
|
||||||
return this;
|
return this;
|
||||||
|
|||||||
@ -2,35 +2,44 @@
|
|||||||
|
|
||||||
namespace TelegramBotBase.Builder.Interfaces;
|
namespace TelegramBotBase.Builder.Interfaces;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Represents the language selection stage in the localization process.
|
||||||
|
/// </summary>
|
||||||
public interface ILanguageSelectionStage
|
public interface ILanguageSelectionStage
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Selects the default language for control usage. (English)
|
/// Selects the default language for control usage. (English)
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <returns></returns>
|
/// <returns>The next stage in the building process.</returns>
|
||||||
IThreadingStage DefaultLanguage();
|
IBuildingStage DefaultLanguage();
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Selects english as the default language for control labels.
|
/// Selects english as the default language for control labels.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <returns></returns>
|
/// <returns>The next stage in the building process.</returns>
|
||||||
IThreadingStage UseEnglish();
|
IBuildingStage UseEnglish();
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Selects german as the default language for control labels.
|
/// Selects german as the default language for control labels.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <returns></returns>
|
/// <returns>The next stage in the building process.</returns>
|
||||||
IThreadingStage UseGerman();
|
IBuildingStage UseGerman();
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Selects persian as the default language for control labels.
|
/// Selects persian as the default language for control labels.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <returns></returns>
|
/// <returns>The next stage in the building process.</returns>
|
||||||
IThreadingStage UsePersian();
|
IBuildingStage UsePersian();
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Selects russian as the default language for control labels.
|
||||||
|
/// </summary>
|
||||||
|
/// <returns>The next stage in the building process.</returns>
|
||||||
|
IBuildingStage UseRussian();
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Selects a custom language as the default language for control labels.
|
/// Selects a custom language as the default language for control labels.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <returns></returns>
|
/// <returns>The next stage in the building process.</returns>
|
||||||
IThreadingStage Custom(Localization language);
|
IBuildingStage Custom(Localization language);
|
||||||
}
|
}
|
||||||
@ -426,8 +426,6 @@ public class ButtonGrid : ControlBase
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
await result.ConfirmAction(ConfirmationText ?? "");
|
|
||||||
|
|
||||||
ButtonRow match = null;
|
ButtonRow match = null;
|
||||||
var index = -1;
|
var index = -1;
|
||||||
|
|
||||||
@ -462,6 +460,8 @@ public class ButtonGrid : ControlBase
|
|||||||
check:
|
check:
|
||||||
if (match != null)
|
if (match != null)
|
||||||
{
|
{
|
||||||
|
await result.ConfirmAction(ConfirmationText ?? "");
|
||||||
|
|
||||||
await OnButtonClicked(new ButtonClickedEventArgs(match.GetButtonMatch(result.RawData, false), index,
|
await OnButtonClicked(new ButtonClickedEventArgs(match.GetButtonMatch(result.RawData, false), index,
|
||||||
match));
|
match));
|
||||||
|
|
||||||
|
|||||||
@ -29,8 +29,6 @@ public class TaggedButtonGrid : MultiView
|
|||||||
|
|
||||||
public string BackLabel = Default.Language["ButtonGrid_Back"];
|
public string BackLabel = Default.Language["ButtonGrid_Back"];
|
||||||
|
|
||||||
public string CheckAllLabel = Default.Language["ButtonGrid_CheckAll"];
|
|
||||||
|
|
||||||
public string NextPageLabel = Default.Language["ButtonGrid_NextPage"];
|
public string NextPageLabel = Default.Language["ButtonGrid_NextPage"];
|
||||||
|
|
||||||
public string NoItemsLabel = Default.Language["ButtonGrid_NoItems"];
|
public string NoItemsLabel = Default.Language["ButtonGrid_NoItems"];
|
||||||
@ -39,11 +37,17 @@ public class TaggedButtonGrid : MultiView
|
|||||||
|
|
||||||
public string SearchLabel = Default.Language["ButtonGrid_SearchFeature"];
|
public string SearchLabel = Default.Language["ButtonGrid_SearchFeature"];
|
||||||
|
|
||||||
public string UncheckAllLabel = Default.Language["ButtonGrid_UncheckAll"];
|
public string TotalTagsLabel = Default.Language["TaggedButtonGrid_TotalTags"];
|
||||||
|
|
||||||
|
public string CheckedTagsLabel = Default.Language["TaggedButtonGrid_CheckedTags"];
|
||||||
|
|
||||||
|
public string CheckAllLabel = Default.Language["TaggedButtonGrid_CheckAll"];
|
||||||
|
|
||||||
|
public string UncheckAllLabel = Default.Language["TaggedButtonGrid_UncheckAll"];
|
||||||
|
|
||||||
public string SearchIcon = Default.Language["ButtonGrid_SearchIcon"];
|
public string SearchIcon = Default.Language["ButtonGrid_SearchIcon"];
|
||||||
|
|
||||||
public string TagIcon = Default.Language["ButtonGrid_TagIcon"];
|
public string TagIcon = Default.Language["TaggedButtonGrid_TagIcon"];
|
||||||
|
|
||||||
public TaggedButtonGrid()
|
public TaggedButtonGrid()
|
||||||
{
|
{
|
||||||
@ -379,14 +383,6 @@ public class TaggedButtonGrid : MultiView
|
|||||||
index = br.Item2;
|
index = br.Item2;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
//var button = HeadLayoutButtonRow?. .FirstOrDefault(a => a.Text.Trim() == result.MessageText)
|
|
||||||
// ?? SubHeadLayoutButtonRow?.FirstOrDefault(a => a.Text.Trim() == result.MessageText);
|
|
||||||
|
|
||||||
// bf.ToList().FirstOrDefault(a => a.Text.Trim() == result.MessageText)
|
|
||||||
|
|
||||||
//var index = bf.FindRowByButton(button);
|
|
||||||
|
|
||||||
check:
|
check:
|
||||||
|
|
||||||
|
|
||||||
@ -490,10 +486,16 @@ public class TaggedButtonGrid : MultiView
|
|||||||
if (result.MessageText == CheckAllLabel)
|
if (result.MessageText == CheckAllLabel)
|
||||||
{
|
{
|
||||||
CheckAllTags();
|
CheckAllTags();
|
||||||
|
Updated();
|
||||||
|
result.Handled = true;
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
else if (result.MessageText == UncheckAllLabel)
|
else if (result.MessageText == UncheckAllLabel)
|
||||||
{
|
{
|
||||||
UncheckAllTags();
|
UncheckAllTags();
|
||||||
|
Updated();
|
||||||
|
result.Handled = true;
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
var i = result.MessageText.LastIndexOf(" ");
|
var i = result.MessageText.LastIndexOf(" ");
|
||||||
@ -569,15 +571,6 @@ public class TaggedButtonGrid : MultiView
|
|||||||
index = br.Item2;
|
index = br.Item2;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
//var bf = DataSource.ButtonForm;
|
|
||||||
|
|
||||||
//var button = HeadLayoutButtonRow?.FirstOrDefault(a => a.Value == result.RawData)
|
|
||||||
// ?? SubHeadLayoutButtonRow?.FirstOrDefault(a => a.Value == result.RawData)
|
|
||||||
// ?? bf.ToList().FirstOrDefault(a => a.Value == result.RawData);
|
|
||||||
|
|
||||||
//var index = bf.FindRowByButton(button);
|
|
||||||
|
|
||||||
check:
|
check:
|
||||||
if (match != null)
|
if (match != null)
|
||||||
{
|
{
|
||||||
@ -619,23 +612,48 @@ public class TaggedButtonGrid : MultiView
|
|||||||
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
|
||||||
|
default:
|
||||||
|
|
||||||
|
if (SelectedViewIndex != 1)
|
||||||
|
return;
|
||||||
|
|
||||||
|
|
||||||
|
switch (result.RawData)
|
||||||
|
{
|
||||||
case "$back$":
|
case "$back$":
|
||||||
|
|
||||||
SelectedViewIndex = 0;
|
SelectedViewIndex = 0;
|
||||||
Updated();
|
Updated();
|
||||||
|
|
||||||
break;
|
return;
|
||||||
|
|
||||||
case "$checkall$":
|
case "$checkall$":
|
||||||
|
|
||||||
CheckAllTags();
|
CheckAllTags();
|
||||||
|
|
||||||
break;
|
return;
|
||||||
|
|
||||||
case "$uncheckall$":
|
case "$uncheckall$":
|
||||||
|
|
||||||
UncheckAllTags();
|
UncheckAllTags();
|
||||||
|
|
||||||
|
return;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
if (SelectedTags.Contains(result.RawData))
|
||||||
|
{
|
||||||
|
SelectedTags.Remove(result.RawData);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
SelectedTags.Add(result.RawData);
|
||||||
|
}
|
||||||
|
|
||||||
|
Updated();
|
||||||
|
|
||||||
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -723,8 +741,10 @@ public class TaggedButtonGrid : MultiView
|
|||||||
|
|
||||||
if (EnableCheckAllTools)
|
if (EnableCheckAllTools)
|
||||||
{
|
{
|
||||||
TagsSubHeadLayoutButtonRow = new ButtonRow(new ButtonBase(CheckAllLabel, "$checkall$"),
|
TagsSubHeadLayoutButtonRow = new ButtonRow(new ButtonBase(string.Format(TotalTagsLabel, Tags.Count), "$total$"),
|
||||||
new ButtonBase(UncheckAllLabel, "$uncheckall$"));
|
new ButtonBase(CheckAllLabel, "$checkall$"),
|
||||||
|
new ButtonBase(UncheckAllLabel, "$uncheckall$"),
|
||||||
|
new ButtonBase(string.Format(CheckedTagsLabel, SelectedTags.Count), "checked$"));
|
||||||
bf.AddButtonRow(TagsSubHeadLayoutButtonRow);
|
bf.AddButtonRow(TagsSubHeadLayoutButtonRow);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -756,10 +776,6 @@ public class TaggedButtonGrid : MultiView
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
//if (bf.Count == 0)
|
|
||||||
// return;
|
|
||||||
|
|
||||||
|
|
||||||
var rkm = (ReplyKeyboardMarkup)bf;
|
var rkm = (ReplyKeyboardMarkup)bf;
|
||||||
rkm.ResizeKeyboard = ResizeKeyboard;
|
rkm.ResizeKeyboard = ResizeKeyboard;
|
||||||
rkm.OneTimeKeyboard = OneTimeKeyboard;
|
rkm.OneTimeKeyboard = OneTimeKeyboard;
|
||||||
@ -881,21 +897,20 @@ public class TaggedButtonGrid : MultiView
|
|||||||
{
|
{
|
||||||
Message m = null;
|
Message m = null;
|
||||||
|
|
||||||
var form = DataSource.PickItems(CurrentPageIndex * ItemRowsPerPage, ItemRowsPerPage,
|
ButtonForm form = null;
|
||||||
EnableSearch ? SearchQuery : null);
|
|
||||||
|
|
||||||
//if (this.EnableSearch && this.SearchQuery != null && this.SearchQuery != "")
|
|
||||||
//{
|
|
||||||
// form = form.FilterDuplicate(this.SearchQuery, true);
|
|
||||||
//}
|
|
||||||
//else
|
|
||||||
//{
|
|
||||||
// form = form.Duplicate();
|
|
||||||
//}
|
|
||||||
|
|
||||||
if (Tags != null && SelectedTags != null)
|
if (Tags != null && SelectedTags != null)
|
||||||
{
|
{
|
||||||
|
form = DataSource.PickAllItems(EnableSearch ? SearchQuery : null); //CurrentPageIndex * ItemRowsPerPage, ItemRowsPerPage,
|
||||||
|
|
||||||
form = form.TagDuplicate(SelectedTags);
|
form = form.TagDuplicate(SelectedTags);
|
||||||
|
|
||||||
|
form = new ButtonForm(form.ToRowList().Skip(CurrentPageIndex * ItemRowsPerPage).Take(ItemRowsPerPage));
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
form = DataSource.PickItems(CurrentPageIndex * ItemRowsPerPage, ItemRowsPerPage,
|
||||||
|
EnableSearch ? SearchQuery : null);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (EnablePaging)
|
if (EnablePaging)
|
||||||
|
|||||||
@ -23,6 +23,11 @@ public class ButtonForm
|
|||||||
DependencyControl = control;
|
DependencyControl = control;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public ButtonForm(IEnumerable<ButtonRow> rows)
|
||||||
|
{
|
||||||
|
_buttons = rows.ToList();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
public IReplyMarkup Markup { get; set; }
|
public IReplyMarkup Markup { get; set; }
|
||||||
|
|
||||||
@ -149,6 +154,11 @@ public class ButtonForm
|
|||||||
.Aggregate((a, b) => a.Union(b).ToList());
|
.Aggregate((a, b) => a.Union(b).ToList());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public List<ButtonRow> ToRowList()
|
||||||
|
{
|
||||||
|
return _buttons;
|
||||||
|
}
|
||||||
|
|
||||||
public InlineKeyboardButton[][] ToInlineButtonArray()
|
public InlineKeyboardButton[][] ToInlineButtonArray()
|
||||||
{
|
{
|
||||||
var ikb = _buttons.Select(a => a.ToArray().Select(b => b.ToInlineButton(this)).ToArray()).ToArray();
|
var ikb = _buttons.Select(a => a.ToArray().Select(b => b.ToInlineButton(this)).ToArray()).ToArray();
|
||||||
|
|||||||
@ -12,8 +12,10 @@ public sealed class English : Localization
|
|||||||
Values["ButtonGrid_CurrentPage"] = "Page {0} of {1}";
|
Values["ButtonGrid_CurrentPage"] = "Page {0} of {1}";
|
||||||
Values["ButtonGrid_SearchFeature"] = "💡 Send a message to filter the list. Click the 🔍 to reset the filter.";
|
Values["ButtonGrid_SearchFeature"] = "💡 Send a message to filter the list. Click the 🔍 to reset the filter.";
|
||||||
Values["ButtonGrid_Back"] = "Back";
|
Values["ButtonGrid_Back"] = "Back";
|
||||||
Values["ButtonGrid_CheckAll"] = "Check all";
|
Values["TaggedButtonGrid_TotalTags"] = "Total: {0}";
|
||||||
Values["ButtonGrid_UncheckAll"] = "Uncheck all";
|
Values["TaggedButtonGrid_CheckedTags"] = "Checked: {0}";
|
||||||
|
Values["TaggedButtonGrid_CheckAll"] = "Check all";
|
||||||
|
Values["TaggedButtonGrid_UncheckAll"] = "Uncheck all";
|
||||||
Values["CalendarPicker_Title"] = "Pick date";
|
Values["CalendarPicker_Title"] = "Pick date";
|
||||||
Values["CalendarPicker_PreviousPage"] = "◀️";
|
Values["CalendarPicker_PreviousPage"] = "◀️";
|
||||||
Values["CalendarPicker_NextPage"] = "▶️";
|
Values["CalendarPicker_NextPage"] = "▶️";
|
||||||
@ -31,6 +33,6 @@ public sealed class English : Localization
|
|||||||
Values["PromptDialog_Back"] = "Back";
|
Values["PromptDialog_Back"] = "Back";
|
||||||
Values["ToggleButton_Changed"] = "Setting changed";
|
Values["ToggleButton_Changed"] = "Setting changed";
|
||||||
Values["ButtonGrid_SearchIcon"] = "🔍";
|
Values["ButtonGrid_SearchIcon"] = "🔍";
|
||||||
Values["ButtonGrid_TagIcon"] = "📁";
|
Values["TaggedButtonGrid_TagIcon"] = "📁";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -10,11 +10,12 @@ public sealed class German : Localization
|
|||||||
Values["ButtonGrid_PreviousPage"] = "◀️";
|
Values["ButtonGrid_PreviousPage"] = "◀️";
|
||||||
Values["ButtonGrid_NextPage"] = "▶️";
|
Values["ButtonGrid_NextPage"] = "▶️";
|
||||||
Values["ButtonGrid_CurrentPage"] = "Seite {0} von {1}";
|
Values["ButtonGrid_CurrentPage"] = "Seite {0} von {1}";
|
||||||
Values["ButtonGrid_SearchFeature"] =
|
Values["ButtonGrid_SearchFeature"] = "💡 Sende eine Nachricht um die Liste zu filtern. Klicke die 🔍 um den Filter zurückzusetzen.";
|
||||||
"💡 Sende eine Nachricht um die Liste zu filtern. Klicke die 🔍 um den Filter zurückzusetzen.";
|
|
||||||
Values["ButtonGrid_Back"] = "Zurück";
|
Values["ButtonGrid_Back"] = "Zurück";
|
||||||
Values["ButtonGrid_CheckAll"] = "Alle auswählen";
|
Values["TaggedButtonGrid_TotalTags"] = "Gesamt: {0}";
|
||||||
Values["ButtonGrid_UncheckAll"] = "Keine auswählen";
|
Values["TaggedButtonGrid_CheckedTags"] = "Ausgewählt: {0}";
|
||||||
|
Values["TaggedButtonGrid_CheckAll"] = "Alle auswählen";
|
||||||
|
Values["TaggedButtonGrid_UncheckAll"] = "Keine auswählen";
|
||||||
Values["CalendarPicker_Title"] = "Datum auswählen";
|
Values["CalendarPicker_Title"] = "Datum auswählen";
|
||||||
Values["CalendarPicker_PreviousPage"] = "◀️";
|
Values["CalendarPicker_PreviousPage"] = "◀️";
|
||||||
Values["CalendarPicker_NextPage"] = "▶️";
|
Values["CalendarPicker_NextPage"] = "▶️";
|
||||||
@ -31,5 +32,7 @@ public sealed class German : Localization
|
|||||||
Values["MultiToggleButton_Changed"] = "Ausgewählt";
|
Values["MultiToggleButton_Changed"] = "Ausgewählt";
|
||||||
Values["PromptDialog_Back"] = "Zurück";
|
Values["PromptDialog_Back"] = "Zurück";
|
||||||
Values["ToggleButton_Changed"] = "Einstellung geändert";
|
Values["ToggleButton_Changed"] = "Einstellung geändert";
|
||||||
|
Values["ButtonGrid_SearchIcon"] = "🔍";
|
||||||
|
Values["TaggedButtonGrid_TagIcon"] = "📁";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -1,5 +1,5 @@
|
|||||||
namespace TelegramBotBase.Localizations
|
namespace TelegramBotBase.Localizations;
|
||||||
{
|
|
||||||
public sealed class Persian : Localization
|
public sealed class Persian : Localization
|
||||||
{
|
{
|
||||||
public Persian()
|
public Persian()
|
||||||
@ -12,8 +12,10 @@
|
|||||||
Values["ButtonGrid_CurrentPage"] = "صفحه ی {0} از {1}";
|
Values["ButtonGrid_CurrentPage"] = "صفحه ی {0} از {1}";
|
||||||
Values["ButtonGrid_SearchFeature"] = "💡 برای فیلتر کردن لیست پیام ارسال کنید. برای بازنشانی فیلتر روی 🔍 کلیک کنید.";
|
Values["ButtonGrid_SearchFeature"] = "💡 برای فیلتر کردن لیست پیام ارسال کنید. برای بازنشانی فیلتر روی 🔍 کلیک کنید.";
|
||||||
Values["ButtonGrid_Back"] = "بازگشت";
|
Values["ButtonGrid_Back"] = "بازگشت";
|
||||||
Values["ButtonGrid_CheckAll"] = "بررسی کردن همه";
|
Values["TaggedButtonGrid_TotalTags"] = "Total: {0}";
|
||||||
Values["ButtonGrid_UncheckAll"] = "بررسی نکردن همه";
|
Values["TaggedButtonGrid_CheckedTags"] = "Checked: {0}";
|
||||||
|
Values["TaggedButtonGrid_CheckAll"] = "بررسی کردن همه";
|
||||||
|
Values["TaggedButtonGrid_UncheckAll"] = "بررسی نکردن همه";
|
||||||
Values["CalendarPicker_Title"] = "تاریخ را انتخاب کنید";
|
Values["CalendarPicker_Title"] = "تاریخ را انتخاب کنید";
|
||||||
Values["CalendarPicker_PreviousPage"] = "◀️";
|
Values["CalendarPicker_PreviousPage"] = "◀️";
|
||||||
Values["CalendarPicker_NextPage"] = "▶️";
|
Values["CalendarPicker_NextPage"] = "▶️";
|
||||||
@ -31,7 +33,7 @@
|
|||||||
Values["PromptDialog_Back"] = "بازگشت";
|
Values["PromptDialog_Back"] = "بازگشت";
|
||||||
Values["ToggleButton_Changed"] = "تنظیمات تغییر کرد";
|
Values["ToggleButton_Changed"] = "تنظیمات تغییر کرد";
|
||||||
Values["ButtonGrid_SearchIcon"] = "🔍";
|
Values["ButtonGrid_SearchIcon"] = "🔍";
|
||||||
Values["ButtonGrid_TagIcon"] = "📁";
|
Values["TaggedButtonGrid_TagIcon"] = "📁";
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
38
TelegramBotBase/Localizations/Russian.cs
Normal file
38
TelegramBotBase/Localizations/Russian.cs
Normal file
@ -0,0 +1,38 @@
|
|||||||
|
namespace TelegramBotBase.Localizations;
|
||||||
|
|
||||||
|
public sealed class Russian : Localization
|
||||||
|
{
|
||||||
|
public Russian()
|
||||||
|
{
|
||||||
|
Values["Language"] = "Русский (Russian)";
|
||||||
|
Values["ButtonGrid_Title"] = "Меню";
|
||||||
|
Values["ButtonGrid_NoItems"] = "Нет доступных элементов.";
|
||||||
|
Values["ButtonGrid_PreviousPage"] = "◀️";
|
||||||
|
Values["ButtonGrid_NextPage"] = "▶️";
|
||||||
|
Values["ButtonGrid_CurrentPage"] = "Страница {0} из {1}";
|
||||||
|
Values["ButtonGrid_SearchFeature"] = "💡 Отправьте сообщение, чтобы отфильтровать список. Нажмите на 🔍, чтобы сбросить фильтр.";
|
||||||
|
Values["ButtonGrid_Back"] = "Назад";
|
||||||
|
Values["TaggedButtonGrid_TotalTags"] = "Всего: {0}";
|
||||||
|
Values["TaggedButtonGrid_CheckedTags"] = "Отмечено: {0}";
|
||||||
|
Values["TaggedButtonGrid_CheckAll"] = "Выделить все";
|
||||||
|
Values["TaggedButtonGrid_UncheckAll"] = "Отменить выбор";
|
||||||
|
Values["CalendarPicker_Title"] = "Календарь / Выберите дату";
|
||||||
|
Values["CalendarPicker_PreviousPage"] = "◀️";
|
||||||
|
Values["CalendarPicker_NextPage"] = "▶️";
|
||||||
|
Values["TreeView_Title"] = "Выберите пункт";
|
||||||
|
Values["TreeView_LevelUp"] = "🔼 Обратно";
|
||||||
|
Values["ToggleButton_On"] = "Вкл";
|
||||||
|
Values["ToggleButton_Off"] = "Выкл";
|
||||||
|
Values["ToggleButton_OnIcon"] = "⚫";
|
||||||
|
Values["ToggleButton_OffIcon"] = "⚪";
|
||||||
|
Values["ToggleButton_Title"] = "Переключить";
|
||||||
|
Values["ToggleButton_Changed"] = "Выбрано";
|
||||||
|
Values["MultiToggleButton_SelectedIcon"] = "✅";
|
||||||
|
Values["MultiToggleButton_Title"] = "Множественный выбор";
|
||||||
|
Values["MultiToggleButton_Changed"] = "Выбрано";
|
||||||
|
Values["PromptDialog_Back"] = "Назад";
|
||||||
|
Values["ToggleButton_Changed"] = "Настройки изменены";
|
||||||
|
Values["ButtonGrid_SearchIcon"] = "🔍";
|
||||||
|
Values["TaggedButtonGrid_TagIcon"] = "📁";
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -34,6 +34,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "InlineAndReplyCombination",
|
|||||||
EndProject
|
EndProject
|
||||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DependencyInjection", "Examples\DependencyInjection\DependencyInjection.csproj", "{689B16BC-200E-4C68-BB2E-8B209070849B}"
|
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DependencyInjection", "Examples\DependencyInjection\DependencyInjection.csproj", "{689B16BC-200E-4C68-BB2E-8B209070849B}"
|
||||||
EndProject
|
EndProject
|
||||||
|
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TelegramBotBase.Extensions.Serializer.Database.PostgreSql", "TelegramBotBase.Extensions.Serializer.Database.PostgreSql\TelegramBotBase.Extensions.Serializer.Database.PostgreSql.csproj", "{7C55D9FF-7DC1-41D0-809C-469EBFA20992}"
|
||||||
|
EndProject
|
||||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TelegramBotBase.Extensions.Images.IronSoftware", "TelegramBotBase.Extensions.Images.IronSoftware\TelegramBotBase.Extensions.Images.IronSoftware.csproj", "{DC521A4C-7446-46F7-845B-AAF10EDCF8C6}"
|
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TelegramBotBase.Extensions.Images.IronSoftware", "TelegramBotBase.Extensions.Images.IronSoftware\TelegramBotBase.Extensions.Images.IronSoftware.csproj", "{DC521A4C-7446-46F7-845B-AAF10EDCF8C6}"
|
||||||
EndProject
|
EndProject
|
||||||
Global
|
Global
|
||||||
@ -86,6 +88,10 @@ Global
|
|||||||
{689B16BC-200E-4C68-BB2E-8B209070849B}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
{689B16BC-200E-4C68-BB2E-8B209070849B}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
{689B16BC-200E-4C68-BB2E-8B209070849B}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
{689B16BC-200E-4C68-BB2E-8B209070849B}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
{689B16BC-200E-4C68-BB2E-8B209070849B}.Release|Any CPU.Build.0 = Release|Any CPU
|
{689B16BC-200E-4C68-BB2E-8B209070849B}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
|
{7C55D9FF-7DC1-41D0-809C-469EBFA20992}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{7C55D9FF-7DC1-41D0-809C-469EBFA20992}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{7C55D9FF-7DC1-41D0-809C-469EBFA20992}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
|
{7C55D9FF-7DC1-41D0-809C-469EBFA20992}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
{DC521A4C-7446-46F7-845B-AAF10EDCF8C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
{DC521A4C-7446-46F7-845B-AAF10EDCF8C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
{DC521A4C-7446-46F7-845B-AAF10EDCF8C6}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
{DC521A4C-7446-46F7-845B-AAF10EDCF8C6}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
{DC521A4C-7446-46F7-845B-AAF10EDCF8C6}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
{DC521A4C-7446-46F7-845B-AAF10EDCF8C6}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
@ -104,6 +110,7 @@ Global
|
|||||||
{52EA3201-02E8-46F5-87C4-B4752C8A815C} = {BFA71E3F-31C0-4FC1-A320-4DCF704768C5}
|
{52EA3201-02E8-46F5-87C4-B4752C8A815C} = {BFA71E3F-31C0-4FC1-A320-4DCF704768C5}
|
||||||
{067E8EBE-F90A-4AFF-A0FF-20578216486E} = {BFA71E3F-31C0-4FC1-A320-4DCF704768C5}
|
{067E8EBE-F90A-4AFF-A0FF-20578216486E} = {BFA71E3F-31C0-4FC1-A320-4DCF704768C5}
|
||||||
{689B16BC-200E-4C68-BB2E-8B209070849B} = {BFA71E3F-31C0-4FC1-A320-4DCF704768C5}
|
{689B16BC-200E-4C68-BB2E-8B209070849B} = {BFA71E3F-31C0-4FC1-A320-4DCF704768C5}
|
||||||
|
{7C55D9FF-7DC1-41D0-809C-469EBFA20992} = {E3193182-6FDA-4FA3-AD26-A487291E7681}
|
||||||
{DC521A4C-7446-46F7-845B-AAF10EDCF8C6} = {E3193182-6FDA-4FA3-AD26-A487291E7681}
|
{DC521A4C-7446-46F7-845B-AAF10EDCF8C6} = {E3193182-6FDA-4FA3-AD26-A487291E7681}
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
GlobalSection(ExtensibilityGlobals) = postSolution
|
GlobalSection(ExtensibilityGlobals) = postSolution
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user