Merge branch 'release/v3.3.0'

Author: rareMaxim

Delphinus.Info.json

@@ -12,7 +12,7 @@
 	"dependencies": [],
 	"author": "M.E.Sysoev",
 	"description": "Telegram Bot API for Delphi",
-	"version": "3.1.1",
+	"version": "3.3.0",
 	"first_version": "2.3.1",
 	"project_url": "https://github.com/ms301/TelegAPI",
 	"homepage_url": "https://t.me/telegaPiBotTest",

Demo/Console/ConsoleBot.dproj

@@ -13,11 +13,6 @@
     <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
         <Base>true</Base>
     </PropertyGroup>
-    <PropertyGroup Condition="('$(Platform)'=='Android' and '$(Base)'=='true') or '$(Base_Android)'!=''">
-        <Base>true</Base>
-        <CfgParent>Base</CfgParent>
-        <Base_Android>true</Base_Android>
-    </PropertyGroup>
     <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Base)'=='true') or '$(Base_Win32)'!=''">
         <Base>true</Base>
         <CfgParent>Base</CfgParent>
@@ -53,17 +48,6 @@
         <VerInfo_Keys>CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
         <VerInfo_Locale>1049</VerInfo_Locale>
     </PropertyGroup>
-    <PropertyGroup Condition="'$(Base_Android)'!=''">
-        <Android_LauncherIcon144>$(BDS)\bin\Artwork\Android\FM_LauncherIcon_144x144.png</Android_LauncherIcon144>
-        <Android_LauncherIcon36>$(BDS)\bin\Artwork\Android\FM_LauncherIcon_36x36.png</Android_LauncherIcon36>
-        <Android_LauncherIcon48>$(BDS)\bin\Artwork\Android\FM_LauncherIcon_48x48.png</Android_LauncherIcon48>
-        <Android_LauncherIcon72>$(BDS)\bin\Artwork\Android\FM_LauncherIcon_72x72.png</Android_LauncherIcon72>
-        <Android_LauncherIcon96>$(BDS)\bin\Artwork\Android\FM_LauncherIcon_96x96.png</Android_LauncherIcon96>
-        <Android_SplashImage426>$(BDS)\bin\Artwork\Android\FM_SplashImage_426x320.png</Android_SplashImage426>
-        <Android_SplashImage470>$(BDS)\bin\Artwork\Android\FM_SplashImage_470x320.png</Android_SplashImage470>
-        <Android_SplashImage640>$(BDS)\bin\Artwork\Android\FM_SplashImage_640x480.png</Android_SplashImage640>
-        <Android_SplashImage960>$(BDS)\bin\Artwork\Android\FM_SplashImage_960x720.png</Android_SplashImage960>
-    </PropertyGroup>
     <PropertyGroup Condition="'$(Base_Win32)'!=''">
         <BT_BuildType>Debug</BT_BuildType>
         <DCC_ConsoleTarget>true</DCC_ConsoleTarget>
@@ -572,7 +556,6 @@
                 <ProjectRoot Platform="iOSSimulator" Name="$(PROJECTNAME).app"/>
             </Deployment>
             <Platforms>
-                <Platform value="Android">False</Platform>
                 <Platform value="Win32">True</Platform>
             </Platforms>
         </BorlandProject>

Demo/EchoBot/EchoBot.Main.fmx

@@ -2,43 +2,63 @@ object Main: TMain
   Left = 0
   Top = 0
   Caption = 'Form1'
-  ClientHeight = 319
-  ClientWidth = 577
+  ClientHeight = 409
+  ClientWidth = 453
   FormFactor.Width = 320
   FormFactor.Height = 480
   FormFactor.Devices = [Desktop]
-  OnCreate = FormCreate
   OnClose = FormClose
   DesignerMasterStyle = 0
-  object mmo1: TMemo
+  object mmoLog: TMemo
     Touch.InteractiveGestures = [Pan, LongTap, DoubleTap]
     DataDetectorTypes = []
     Align = Client
-    Size.Width = 577.000000000000000000
-    Size.Height = 297.000000000000000000
+    Size.Width = 453.000000000000000000
+    Size.Height = 376.000000000000000000
     Size.PlatformDefault = False
     TabOrder = 2
-    Viewport.Width = 573.000000000000000000
-    Viewport.Height = 293.000000000000000000
+    Viewport.Width = 449.000000000000000000
+    Viewport.Height = 372.000000000000000000
   end
-  object edt1: TEdit
-    Touch.InteractiveGestures = [LongTap, DoubleTap]
+  object Layout1: TLayout
     Align = Top
-    TabOrder = 4
-    Text = 'C:\Users\maks4\Desktop\1.json'
-    Size.Width = 577.000000000000000000
-    Size.Height = 22.000000000000000000
+    Padding.Left = 5.000000000000000000
+    Padding.Top = 5.000000000000000000
+    Padding.Right = 5.000000000000000000
+    Padding.Bottom = 5.000000000000000000
+    Size.Width = 453.000000000000000000
+    Size.Height = 33.000000000000000000
     Size.PlatformDefault = False
-    TextPrompt = 'Debug. FilePath to JSON response'
-    object btn1: TEditButton
-      CanFocus = False
-      Cursor = crArrow
-      Size.Width = 76.000000000000000000
-      Size.Height = 18.000000000000000000
+    TabOrder = 4
+    object lblToken: TLabel
+      Align = Left
+      Position.X = 5.000000000000000000
+      Position.Y = 5.000000000000000000
+      Size.Width = 44.000000000000000000
+      Size.Height = 23.000000000000000000
+      Size.PlatformDefault = False
+      Text = 'Token: '
+    end
+    object edtToken: TEdit
+      Touch.InteractiveGestures = [LongTap, DoubleTap]
+      Align = Client
+      TabOrder = 1
+      Margins.Right = 5.000000000000000000
+      Size.Width = 346.000000000000000000
+      Size.Height = 23.000000000000000000
+      Size.PlatformDefault = False
+      TextPrompt = 'Token from @BotFather'
+    end
+    object swtchToken: TSwitch
+      Align = Right
+      IsChecked = False
+      Position.X = 400.000000000000000000
+      Position.Y = 5.000000000000000000
+      Size.Width = 48.000000000000000000
+      Size.Height = 23.000000000000000000
       Size.PlatformDefault = False
-      TabOrder = 0
-      Text = 'Apply'
-      OnClick = btn1Click
+      TabOrder = 2
+      OnSwitch = swtchTokenSwitch
     end
   end
   object tgBot: TTelegramBot

Demo/EchoBot/EchoBot.Main.pas

@@ -7,50 +7,50 @@ interface
   System.Types,
   System.UITypes,
   System.Classes,
-  System.Variants,
   FMX.Types,
-  FMX.Controls,
   FMX.Forms,
-  FMX.Graphics,
   FMX.Dialogs,
-  FMX.Controls.Presentation,
   FMX.Memo,
-  FMX.ScrollBox,
   TelegAPI.Bot,
   TelegAPI.Types,
   TelegAPI.Exceptions,
+  FMX.Edit,
   FMX.StdCtrls,
-  FMX.Edit;
+  FMX.Controls,
+  FMX.Controls.Presentation,
+  FMX.ScrollBox,
+  FMX.Layouts;
 
 type
   TMain = class(TForm)
     tgBot: TTelegramBot;
-    mmo1: TMemo;
-    edt1: TEdit;
-    btn1: TEditButton;
-    procedure FormCreate(Sender: TObject);
+    mmoLog: TMemo;
+    Layout1: TLayout;
+    lblToken: TLabel;
+    edtToken: TEdit;
+    swtchToken: TSwitch;
     procedure tgBotInlineResultChosen(ASender: TObject; AChosenInlineResult: TtgChosenInlineResult);
     procedure tgBotInlineQuery(ASender: TObject; AInlineQuery: TtgInlineQuery);
-    procedure tgBotMessage(ASender: TObject; AMessage: TtgMessage);
+    procedure tgBotMessage(ASender: TObject; AMessage: TTgMessage);
     procedure tgBotCallbackQuery(ASender: TObject; ACallbackQuery: TtgCallbackQuery);
     procedure tgBotReceiveError(ASender: TObject; AApiRequestException: EApiRequestException);
     procedure tgBotConnect(Sender: TObject);
     procedure tgBotDisconnect(Sender: TObject);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure tgBotReceiveGeneralError(ASender: TObject; AException: Exception);
-    procedure btn1Click(Sender: TObject);
+    procedure swtchTokenSwitch(Sender: TObject);
   private
     { Private declarations }
     procedure WriteLine(const AValue: string);
-    procedure SendInline(Msg: TtgMessage);
-    procedure SendKeyboard(Msg: TtgMessage);
-    procedure SendPhoto(Msg: TtgMessage);
-    procedure SendRequest(Msg: TtgMessage);
-    procedure SendQuest(Msg: TtgMessage);
+    procedure SendInline(Msg: TTgMessage);
+    procedure SendKeyboard(Msg: TTgMessage);
+    procedure SendPhoto(Msg: TTgMessage);
+    procedure SendRequest(Msg: TTgMessage);
+    procedure SendQuest(Msg: TTgMessage);
     // parsing
-    procedure ParseTextMessage(Msg: TtgMessage);
-    procedure ParsePhotoMessage(Msg: TtgMessage);
-    procedure ParseLocationMessage(Msg: TtgMessage);
+    procedure ParseTextMessage(Msg: TTgMessage);
+    procedure ParsePhotoMessage(Msg: TTgMessage);
+    procedure ParseLocationMessage(Msg: TTgMessage);
   public
     { Public declarations }
   end;
@@ -69,35 +69,17 @@ implementation
   TelegAPI.Types.InputMessageContents;
 {$R *.fmx}
 
-procedure TMain.btn1Click(Sender: TObject);
-var
-  LJson: string;
-  LReturn: TArray<TtgUpdate>;
-begin
-  LJson := TFile.ReadAllText(edt1.Text, TEncoding.UTF8);
-  LReturn := tgBot.ApiTest<TArray<TtgUpdate>>(LJson);
-end;
-
 procedure TMain.FormClose(Sender: TObject; var Action: TCloseAction);
 begin
   tgBot.IsReceiving := False;
 end;
 
-procedure TMain.FormCreate(Sender: TObject);
-begin
-  ReportMemoryLeaksOnShutdown := True;
-  tgBot.Token := {$I ..\token.inc};
-  if not tgBot.IsValidToken then
-    raise ELoginCredentialError.Create('invalid token format');
-  tgBot.IsReceiving := True;
-end;
-
-procedure TMain.ParseLocationMessage(Msg: TtgMessage);
+procedure TMain.ParseLocationMessage(Msg: TTgMessage);
 begin
   WriteLine('Location: ' + Msg.Location.Longitude.ToString + ' ' + Msg.Location.Latitude.ToString);
 end;
 
-procedure TMain.ParsePhotoMessage(Msg: TtgMessage);
+procedure TMain.ParsePhotoMessage(Msg: TTgMessage);
 var
   LFile: TtgFile;
 begin
@@ -111,7 +93,7 @@ procedure TMain.ParsePhotoMessage(Msg: TtgMessage);
   end;
 end;
 
-procedure TMain.ParseTextMessage(Msg: TtgMessage);
+procedure TMain.ParseTextMessage(Msg: TTgMessage);
 var
   usage: string;
 begin
@@ -147,7 +129,7 @@ procedure TMain.ParseTextMessage(Msg: TtgMessage);
   end;
 end;
 
-procedure TMain.SendRequest(Msg: TtgMessage);
+procedure TMain.SendRequest(Msg: TTgMessage);
 var
   kb: IReplyMarkup;
 begin
@@ -157,13 +139,23 @@ procedure TMain.SendRequest(Msg: TtgMessage);
   tgBot.SendMessage(Msg.Chat.Id, 'Who or Where are you?', TtgParseMode.default, False, False, 0, kb).Free;
 end;
 
-procedure TMain.SendPhoto(Msg: TtgMessage);
+procedure TMain.swtchTokenSwitch(Sender: TObject);
+begin
+  tgBot.Token := edtToken.Text;
+  if not tgBot.IsValidToken then
+    raise ELoginCredentialError.Create('invalid token format');
+  tgBot.IsReceiving := swtchToken.IsChecked;
+end;
+
+procedure TMain.SendPhoto(Msg: TTgMessage);
 const
   PATH_PHOTO = 'C:\Users\Public\Pictures\Sample Pictures\Tulips.jpg';
 var
   LFile: TtgFileToSend;
 begin
   tgBot.SendChatAction(Msg.Chat.Id, TtgSendChatAction.UploadPhoto);
+  if not TFile.Exists(PATH_PHOTO) then
+    WriteLine('Change path to photo in metod: TMain.SendPhoto');
   LFile := TtgFileToSend.Create(PATH_PHOTO);
   try
     tgBot.SendPhoto(Msg.Chat.ID, LFile, 'Nice Picture').Free;
@@ -186,7 +178,7 @@ procedure TMain.SendInline;
   tgBot.SendMessage(Msg.Chat.Id, 'Choose', TtgParseMode.default, False, False, 0, keyboard).Free;
 end;
 
-procedure TMain.SendKeyboard(Msg: TtgMessage);
+procedure TMain.SendKeyboard(Msg: TTgMessage);
 var
   keyboard: IReplyMarkup;
 begin
@@ -258,7 +250,7 @@ procedure TMain.tgBotInlineQuery(ASender: TObject; AInlineQuery: TtgInlineQuery)
   tgBot.AnswerInlineQuery(AInlineQuery.Id, results, 0, True);
 end;
 
-procedure TMain.SendQuest(Msg: TtgMessage);
+procedure TMain.SendQuest(Msg: TTgMessage);
 var
   keyboard: IReplyMarkup;
 begin
@@ -275,7 +267,7 @@ procedure TMain.tgBotInlineResultChosen(ASender: TObject; AChosenInlineResult: T
   WriteLine('Received choosen inline result: ' + AChosenInlineResult.ResultId);
 end;
 
-procedure TMain.tgBotMessage(ASender: TObject; AMessage: TtgMessage);
+procedure TMain.tgBotMessage(ASender: TObject; AMessage: TTgMessage);
 begin
   case AMessage.&Type of
     TtgMessageType.TextMessage:
@@ -289,15 +281,7 @@ procedure TMain.tgBotMessage(ASender: TObject; AMessage: TtgMessage);
 
 procedure TMain.tgBotReceiveError(ASender: TObject; AApiRequestException: EApiRequestException);
 begin
-  case AApiRequestException.ErrorCode of
-    401:
-      begin
-        tgBot.IsReceiving := False;
-        ShowMessage(AApiRequestException.Message);
-      end;
-  end;
   WriteLine(AApiRequestException.ToString);
-  AApiRequestException.Free;
 end;
 
 procedure TMain.tgBotReceiveGeneralError(ASender: TObject; AException: Exception);
@@ -307,8 +291,16 @@ procedure TMain.tgBotReceiveGeneralError(ASender: TObject; AException: Exception
 
 procedure TMain.WriteLine(const AValue: string);
 begin
-  mmo1.Lines.Insert(0, AValue);
+  mmoLog.Lines.Add(AValue);
+  mmoLog.ScrollBy(0, mmoLog.ContentBounds.Bottom, False);
 end;
 
+initialization
+  ReportMemoryLeaksOnShutdown := True;
+
+finalization
+  if ReportMemoryLeaksOnShutdown then
+    CheckSynchronize();
+
 end.
 

Install/TelegaPiBot.dpk

@@ -42,7 +42,8 @@ contains
   TelegaPi.Types.InlineQueryResults in '..\Source\TelegaPi.Types.InlineQueryResults.pas',
   TelegaPi.Types.Enums in '..\Source\TelegaPi.Types.Enums.pas',
   TelegaPi.Exceptions in '..\Source\TelegaPi.Exceptions.pas',
-  TelegAPI.Bot.Console in '..\Source\TelegAPI.Bot.Console.pas';
+  TelegAPI.Bot.Console in '..\Source\TelegAPI.Bot.Console.pas',
+  TelegAPI.Utils.Params in '..\Source\TelegAPI.Utils.Params.pas';
 
 end.