From 951b4fa2ebd40672e7d21aee971531c55b0f0b17 Mon Sep 17 00:00:00 2001 From: "PC1\\PTyTb" Date: Thu, 11 Sep 2025 08:37:27 +0300 Subject: [PATCH] =?UTF-8?q?=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B8=D0=BC=D0=B5=D0=BD=20=D0=BC?= =?UTF-8?q?=D0=BE=D0=B4=D1=83=D0=BB=D0=B5=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Services/uAPIDA.pas | 2 +- Services/uChatAPI.pas | 2 +- Services/uCustomEmoties.pas | 2 +- Services/uGigaChat.pas | 2 +- Services/uKandinskyAPI.pas | 2 +- Services/uTTWAPI.pas | 2 +- Services/uTTWEventSub.pas | 2 +- Services/uTWAuth.pas | 2 +- Services/uWSDA.pas | 2 +- TTW_Bot_app.dpr | 2 +- compile.bat | 3 +++ forms/uCreateChat.pas | 2 +- forms/uCreateGame.pas | 2 +- forms/uCreateNotify.pas | 2 +- forms/uGeneral.pas | 8 ++++---- frames/fAutoActions.pas | 2 +- frames/fCommands.pas | 2 +- frames/fContruct.pas | 2 +- frames/fEvents.pas | 2 +- frames/fRevards.pas | 2 +- frames/fSettings.pas | 4 ++-- frames/fTTS.pas | 2 +- utils/uKeyEvent.pas | 2 +- utils/uPlayerThread.pas | 4 ++-- utils/uRegExpr.pas | 6 +++--- utils/uSoundManager.pas | 2 +- utils/uTTS.pas | 2 +- utils/uWebServerChat.pas | 2 +- utils/uWebServerEvents.pas | 4 ++-- utils/uWebServerGames.pas | 2 +- utils/uWebServerKandinsky.pas | 2 +- 31 files changed, 41 insertions(+), 38 deletions(-) create mode 100644 compile.bat diff --git a/Services/uAPIDA.pas b/Services/uAPIDA.pas index 16f476e..a4fc52d 100644 --- a/Services/uAPIDA.pas +++ b/Services/uAPIDA.pas @@ -3,7 +3,7 @@ unit uAPIDA; interface uses - Classes, SysUtils, System.JSON, IdHTTP, IdSSLOpenSSL, flog; + system.Classes, system.SysUtils, System.JSON, IdHTTP, IdSSLOpenSSL, flog; type TAPIClient = class(TObject) diff --git a/Services/uChatAPI.pas b/Services/uChatAPI.pas index be6761d..0293118 100644 --- a/Services/uChatAPI.pas +++ b/Services/uChatAPI.pas @@ -3,7 +3,7 @@ unit uChatAPI; interface uses - Classes, SysUtils, IdHTTP, System.JSON, IdSSLOpenSSL, IdGlobal; + system.Classes, system.SysUtils, IdHTTP, System.JSON, IdSSLOpenSSL, IdGlobal; type TMessage = procedure(s: string) of object; diff --git a/Services/uCustomEmoties.pas b/Services/uCustomEmoties.pas index fbfecff..97a73a6 100644 --- a/Services/uCustomEmoties.pas +++ b/Services/uCustomEmoties.pas @@ -3,7 +3,7 @@ unit uCustomEmoties; interface uses - Classes, System.Generics.Collections, System.JSON, uRecords, IdHTTP, IdSSLOpenSSL, + System.Classes, System.Generics.Collections, System.JSON, uRecords, IdHTTP, IdSSLOpenSSL, System.Net.HttpClient, System.SysUtils; type diff --git a/Services/uGigaChat.pas b/Services/uGigaChat.pas index 6e7b4c2..9f53c9d 100644 --- a/Services/uGigaChat.pas +++ b/Services/uGigaChat.pas @@ -3,7 +3,7 @@ unit uGigaChat; interface uses - uChatAPI, SysUtils, IdHTTP, System.JSON, IdSSLOpenSSL, IdGlobal, classes; + uChatAPI, system.SysUtils, IdHTTP, System.JSON, IdSSLOpenSSL, IdGlobal, system.classes; type TGigaChat = class(TChatAPI) diff --git a/Services/uKandinskyAPI.pas b/Services/uKandinskyAPI.pas index 57b0417..8797d4c 100644 --- a/Services/uKandinskyAPI.pas +++ b/Services/uKandinskyAPI.pas @@ -4,7 +4,7 @@ interface uses System.SysUtils, System.Classes, System.JSON, System.Net.HttpClient, - System.Net.URLClient, System.NetConsts, StrUtils, System.Net.Mime, + System.Net.URLClient, System.NetConsts, system.StrUtils, System.Net.Mime, System.NetEncoding, System.Threading; type diff --git a/Services/uTTWAPI.pas b/Services/uTTWAPI.pas index bfe7d20..d021885 100644 --- a/Services/uTTWAPI.pas +++ b/Services/uTTWAPI.pas @@ -4,7 +4,7 @@ interface uses System.Classes, System.SysUtils, IdHTTP, IdSSLOpenSSL, System.JSON, FMX.Forms, - IdMultipartFormData, DateUtils, uDataBase, System.Generics.Collections, + IdMultipartFormData, System.DateUtils, uDataBase, System.Generics.Collections, uRecords; type diff --git a/Services/uTTWEventSub.pas b/Services/uTTWEventSub.pas index 8e0b5a5..7d79267 100644 --- a/Services/uTTWEventSub.pas +++ b/Services/uTTWEventSub.pas @@ -4,7 +4,7 @@ interface uses System.SysUtils, System.JSON, System.Types, System.UITypes, System.Classes, - WinInet, ComObj, IdException, + Winapi.WinInet, System.Win.ComObj, IdException, ipwcore, ipwtypes, ipwwsclient, ipwping, idhttp, IdSSLOpenSSL, uRecords, fmx.Types, System.Net.HttpClient, System.Net.HttpClientComponent; diff --git a/Services/uTWAuth.pas b/Services/uTWAuth.pas index 9163a86..679e617 100644 --- a/Services/uTWAuth.pas +++ b/Services/uTWAuth.pas @@ -4,7 +4,7 @@ interface uses System.SysUtils, System.Classes, IdContext, IdCustomHTTPServer, IdHTTPServer, - IdComponent, ShellAPI, System.Threading, Windows; + IdComponent, winapi.ShellAPI, System.Threading, winapi.Windows; type TmyEvent = procedure(txt: string) of object; diff --git a/Services/uWSDA.pas b/Services/uWSDA.pas index a187ec8..75994ff 100644 --- a/Services/uWSDA.pas +++ b/Services/uWSDA.pas @@ -3,7 +3,7 @@ unit uWSDA; interface uses - Classes, SysUtils, System.JSON, ipwwsclient, StrUtils, uAPIDA; + system.Classes, system.SysUtils, System.JSON, ipwwsclient, system.StrUtils, uAPIDA; type TOnDonateEvent = procedure(aNick, aMessage, aSum: string) of object; diff --git a/TTW_Bot_app.dpr b/TTW_Bot_app.dpr index 01d7132..6339b1a 100644 --- a/TTW_Bot_app.dpr +++ b/TTW_Bot_app.dpr @@ -2,7 +2,7 @@ program TTW_Bot_app; uses System.StartUpCopy, - SysUtils, + System.SysUtils, FMX.Forms, Web.WebReq, IdHTTPWebBrokerBridge, diff --git a/compile.bat b/compile.bat new file mode 100644 index 0000000..6513829 --- /dev/null +++ b/compile.bat @@ -0,0 +1,3 @@ +@echo off +dcc32 -B -Q -U"C:\Program Files (x86)\Embarcadero\Studio\23.0\lib\win32\release" -U"C:\Users\PTyTb\Documents\lib\IPWorks 2024 Delphi Edition\pas" -U"C:\Users\PTyTb\Documents\lib\BassSimple\BassSimple" -E"C:\Users\PTyTb\Desktop\www\ttw_fmx_v10\Win32\Release" -N"C:\Users\PTyTb\Desktop\www\ttw_fmx_v10\Win32\Release" TTW_Bot_app.dpr +pause \ No newline at end of file diff --git a/forms/uCreateChat.pas b/forms/uCreateChat.pas index a076027..e8e0a39 100644 --- a/forms/uCreateChat.pas +++ b/forms/uCreateChat.pas @@ -7,7 +7,7 @@ uses System.Variants, FMX.ListBox, FMX.Colors, FMX.SpinBox, FMX.Types, FMX.Controls, FMX.Forms, FMX.Graphics, FMX.Dialogs, fColorSettings, fFontSettings, FMX.Controls.Presentation, FMX.StdCtrls, - FMX.Edit, FMX.EditBox, StrUtils, uRecords; + FMX.Edit, FMX.EditBox, System.StrUtils, uRecords; type TfCreateChat = class(TForm) diff --git a/forms/uCreateGame.pas b/forms/uCreateGame.pas index ef4fa48..477ea63 100644 --- a/forms/uCreateGame.pas +++ b/forms/uCreateGame.pas @@ -8,7 +8,7 @@ uses FMX.Types, FMX.Controls, FMX.Forms, FMX.Graphics, FMX.Dialogs, FMX.Edit, FMX.EditBox, FMX.SpinBox, FMX.ListBox, FMX.StdCtrls, FMX.Controls.Presentation, - System.Generics.Collections, IOUtils; + System.Generics.Collections, System.IOUtils; type TfCreateGame = class(TForm) diff --git a/forms/uCreateNotify.pas b/forms/uCreateNotify.pas index 8cbd4e9..e61fafd 100644 --- a/forms/uCreateNotify.pas +++ b/forms/uCreateNotify.pas @@ -4,7 +4,7 @@ interface uses System.SysUtils, System.Types, System.UITypes, System.Classes, - System.Variants, fOBS, System.RegularExpressions, Math, + System.Variants, fOBS, System.RegularExpressions, System.Math, FMX.Types, FMX.Controls, FMX.Forms, FMX.Graphics, FMX.Dialogs, fFontSettings, fColorSettings, FMX.StdCtrls, FMX.Edit, FMX.Controls.Presentation, FMX.ListBox, FMX.EditBox, FMX.SpinBox, FMX.Colors, uRecords; diff --git a/forms/uGeneral.pas b/forms/uGeneral.pas index 3a678e9..8959bb1 100644 --- a/forms/uGeneral.pas +++ b/forms/uGeneral.pas @@ -17,17 +17,17 @@ unit uGeneral; interface uses - System.SysUtils, System.Types, System.UITypes, System.Classes, DateUtils, + System.SysUtils, System.Types, System.UITypes, System.Classes, System.DateUtils, System.Variants, uTTWIRC, uTTWEventSub, uTTWAPI, uSoundManager, uKeyEvent, FMX.Types, FMX.Controls, FMX.Forms, FMX.Graphics, FMX.Dialogs, FMX.TabControl, FMX.Controls.Presentation, FMX.StdCtrls, System.ImageList, FMX.ImgList, - FMX.Styles, ShellAPI, StrUtils, IdComponent, uRegExpr, uCustomEmoties, + FMX.Styles, winapi.ShellAPI, system.StrUtils, IdComponent, uRegExpr, uCustomEmoties, fSettings, fAI, fNotify, fAutoActions, FMX.ListBox, fLog, fEvents, System.Generics.Collections, utts, uGigaChat, uChatAPI, uMyTimer, uRecords, System.IOUtils, fCommands, uDataBase, FMX.Edit, FMX.Colors, FMX.SpinBox, - windows, System.Skia, FMX.Skia, uCreateChat, uCreateNotify, fOBS, fTTS, + winapi.windows, System.Skia, FMX.Skia, uCreateChat, uCreateNotify, fOBS, fTTS, fPlayerWeb, uWebServerKandinsky, FMX.Memo.Types, FMX.ScrollBox, FMX.Memo, - fRevards, json; + fRevards, system.json; type TTTW_Bot = class(TForm) diff --git a/frames/fAutoActions.pas b/frames/fAutoActions.pas index 7aa3658..b1d3cf8 100644 --- a/frames/fAutoActions.pas +++ b/frames/fAutoActions.pas @@ -6,7 +6,7 @@ uses System.SysUtils, System.Types, System.UITypes, System.Classes, System.Variants, uRegExpr, FMX.Types, FMX.Graphics, FMX.Controls, FMX.Forms, FMX.Dialogs, FMX.StdCtrls, - System.Rtti, FMX.Grid.Style, FMX.Grid, FMX.ScrollBox, FMX.Edit, StrUtils, + System.Rtti, FMX.Grid.Style, FMX.Grid, FMX.ScrollBox, FMX.Edit, System.StrUtils, FMX.Controls.Presentation, uMyTimer, uRecords, System.Generics.Collections; type diff --git a/frames/fCommands.pas b/frames/fCommands.pas index 8ef9c48..3b9c478 100644 --- a/frames/fCommands.pas +++ b/frames/fCommands.pas @@ -4,7 +4,7 @@ interface uses System.SysUtils, System.Types, System.UITypes, System.Classes, - System.Variants, StrUtils, + System.Variants, System.StrUtils, FMX.Types, FMX.Graphics, FMX.Controls, FMX.Forms, FMX.Dialogs, FMX.StdCtrls, System.Rtti, FMX.Grid.Style, FMX.Memo.Types, FMX.Grid, FMX.Layouts, uRecords, FMX.ListBox, FMX.Memo, FMX.Edit, FMX.Controls.Presentation, FMX.ScrollBox, diff --git a/frames/fContruct.pas b/frames/fContruct.pas index a1c34d0..c6689c3 100644 --- a/frames/fContruct.pas +++ b/frames/fContruct.pas @@ -6,7 +6,7 @@ uses System.SysUtils, System.Types, System.UITypes, System.Classes, System.Variants, FMX.Types, FMX.Graphics, FMX.Controls, FMX.Forms, FMX.Dialogs, FMX.StdCtrls, FMX.Memo.Types, FMX.ListBox, FMX.ScrollBox, FMX.Memo, FMX.Edit, - FMX.Controls.Presentation, StrUtils; + FMX.Controls.Presentation, System.StrUtils; type TfrContruct = class(TFrame) diff --git a/frames/fEvents.pas b/frames/fEvents.pas index 1bf0380..6a463fa 100644 --- a/frames/fEvents.pas +++ b/frames/fEvents.pas @@ -4,7 +4,7 @@ interface uses System.SysUtils, System.Types, System.UITypes, System.Classes, - System.Variants, System.Generics.Collections, ShellAPI, uSoundManager, + System.Variants, System.Generics.Collections, winapi.ShellAPI, uSoundManager, FMX.Types, FMX.Graphics, FMX.Controls, FMX.Forms, FMX.Dialogs, FMX.StdCtrls, FMX.Edit, FMX.ListBox, FMX.Controls.Presentation, System.Rtti, FMX.Grid.Style, FMX.ScrollBox, FMX.Grid, uRecords, uDataBase, FMX.Menus, uKeyEvent, diff --git a/frames/fRevards.pas b/frames/fRevards.pas index cedfd0e..adf672a 100644 --- a/frames/fRevards.pas +++ b/frames/fRevards.pas @@ -6,7 +6,7 @@ uses System.SysUtils, System.Types, System.UITypes, System.Classes, System.Variants, FMX.Types, FMX.Graphics, FMX.Controls, FMX.Forms, FMX.Dialogs, FMX.StdCtrls, - StrUtils, + System.StrUtils, System.Rtti, FMX.Grid.Style, FMX.Grid, FMX.ScrollBox, uRecords, System.Generics.Collections, FMX.Controls.Presentation, FMX.EditBox, FMX.NumberBox, FMX.Edit, diff --git a/frames/fSettings.pas b/frames/fSettings.pas index 4354e42..be1f9a0 100644 --- a/frames/fSettings.pas +++ b/frames/fSettings.pas @@ -6,9 +6,9 @@ uses System.SysUtils, System.Types, System.UITypes, System.Classes, System.Variants, uQ, FMX.Types, FMX.Graphics, FMX.Controls, FMX.Forms, FMX.Dialogs, FMX.StdCtrls, - ShellAPI, System.IOUtils, uDataBase, + winapi.ShellAPI, System.IOUtils, uDataBase, FMX.Controls.Presentation, FMX.Edit, uTWAuth, uRecords, uAPIDA, uShowText, - json, uWSDA, fLog; + System.json, uWSDA, fLog; type TfrSettings = class(TFrame) diff --git a/frames/fTTS.pas b/frames/fTTS.pas index 9fe4393..0896643 100644 --- a/frames/fTTS.pas +++ b/frames/fTTS.pas @@ -4,7 +4,7 @@ interface uses System.SysUtils, System.Types, System.UITypes, System.Classes, - System.Variants, shellapi, + System.Variants, winapi.shellapi, FMX.Types, FMX.Graphics, FMX.Controls, FMX.Forms, FMX.Dialogs, FMX.StdCtrls, FMX.Edit, FMX.ListBox, FMX.Controls.Presentation, uTTS, bass_simple; diff --git a/utils/uKeyEvent.pas b/utils/uKeyEvent.pas index e856b50..dff3d52 100644 --- a/utils/uKeyEvent.pas +++ b/utils/uKeyEvent.pas @@ -3,7 +3,7 @@ unit uKeyEvent; interface uses - System.SysUtils, System.Types, Windows, System.Classes, System.UITypes, + System.SysUtils, System.Types, winapi.Windows, System.Classes, System.UITypes, FMX.Types, FMX.Edit, FMX.Controls, FMX.Forms, FMX.Platform, FMX.ListBox; type diff --git a/utils/uPlayerThread.pas b/utils/uPlayerThread.pas index 4f255fd..19d4440 100644 --- a/utils/uPlayerThread.pas +++ b/utils/uPlayerThread.pas @@ -3,8 +3,8 @@ unit uPlayerThread; interface uses - Classes, SysUtils, SyncObjs, Generics.Collections, bass_simple, - System.IOUtils, Types; + System.Classes, System.SysUtils, System.SyncObjs, System.Generics.Collections, bass_simple, + System.IOUtils, System.Types; type TOnError = procedure(const Msg, FileName: string) of object; diff --git a/utils/uRegExpr.pas b/utils/uRegExpr.pas index 6647473..e046d69 100644 --- a/utils/uRegExpr.pas +++ b/utils/uRegExpr.pas @@ -104,8 +104,8 @@ interface {$IFDEF FPC} {$DEFINE OverMeth} {$ENDIF} uses - Classes, // TStrings in Split method - SysUtils; // Exception + system.Classes, // TStrings in Split method + system.SysUtils; // Exception type {$IFDEF UniCode} @@ -639,7 +639,7 @@ function RegExprSubExpressions (const ARegExpr : string; implementation uses - Windows; // CharUpper/Lower + winapi.Windows; // CharUpper/Lower const TRegExprVersionMajor : integer = 0; diff --git a/utils/uSoundManager.pas b/utils/uSoundManager.pas index 5708c30..8570137 100644 --- a/utils/uSoundManager.pas +++ b/utils/uSoundManager.pas @@ -2,7 +2,7 @@ unit uSoundManager; interface -uses classes, ShellAPI, bass_simple, windows, System.SysUtils; +uses System.classes, winapi.ShellAPI, bass_simple, winapi.windows, System.SysUtils; type TSongMachine = class(TObject) diff --git a/utils/uTTS.pas b/utils/uTTS.pas index 4860dd4..e8c047a 100644 --- a/utils/uTTS.pas +++ b/utils/uTTS.pas @@ -3,7 +3,7 @@ unit uTTS; interface uses - Windows, SysUtils, Classes, MMSystem; + winapi.Windows, System.SysUtils, System.Classes, winapi.MMSystem; type TPlayFinishedEvent = procedure(Sender: TObject) of object; diff --git a/utils/uWebServerChat.pas b/utils/uWebServerChat.pas index 20f2fbd..b0c8bb2 100644 --- a/utils/uWebServerChat.pas +++ b/utils/uWebServerChat.pas @@ -2,7 +2,7 @@ unit uWebServerChat; interface -uses classes, StrUtils, DateUtils, System.JSON, System.Generics.Collections, +uses System.classes, System.StrUtils, System.DateUtils, System.JSON, System.Generics.Collections, IdBaseComponent, IdComponent, IdCustomTCPServer, IdContext, IdCustomHTTPServer, uRecords, System.IOUtils, IdGlobalProtocols, IdHTTPServer, System.SysUtils; diff --git a/utils/uWebServerEvents.pas b/utils/uWebServerEvents.pas index 72c215e..4047128 100644 --- a/utils/uWebServerEvents.pas +++ b/utils/uWebServerEvents.pas @@ -3,10 +3,10 @@ unit uWebServerEvents; interface uses - Classes, StrUtils, DateUtils, System.JSON, System.Generics.Collections, + System.Classes, System.StrUtils, System.DateUtils, System.JSON, System.Generics.Collections, IdBaseComponent, IdComponent, IdCustomTCPServer, IdContext, IdCustomHTTPServer, uRecords, System.IOUtils, IdGlobalProtocols, - IdHTTPServer, System.SysUtils, SyncObjs; + IdHTTPServer, System.SysUtils, System.SyncObjs; type TTTW_Events = class(TObject) diff --git a/utils/uWebServerGames.pas b/utils/uWebServerGames.pas index e382c05..5373384 100644 --- a/utils/uWebServerGames.pas +++ b/utils/uWebServerGames.pas @@ -4,7 +4,7 @@ interface uses System.SysUtils, System.Classes, System.JSON, System.Generics.Collections, - IdHTTPServer, IdCustomHTTPServer, IdContext, IdComponent, NetEncoding, IOUtils; + IdHTTPServer, IdCustomHTTPServer, IdContext, IdComponent, System.NetEncoding, System.IOUtils; type TGameWebServer = class diff --git a/utils/uWebServerKandinsky.pas b/utils/uWebServerKandinsky.pas index ca696e1..03059a1 100644 --- a/utils/uWebServerKandinsky.pas +++ b/utils/uWebServerKandinsky.pas @@ -6,7 +6,7 @@ uses System.SysUtils, System.Types, System.UITypes, System.Classes, System.Variants, System.NetEncoding,IdContext, IdCustomHTTPServer, IdHTTPServer, IdGlobal, FMX.Types, FMX.Controls, FMX.Forms, FMX.Graphics, FMX.Dialogs, FMX.Edit, - FMX.Controls.Presentation, FMX.StdCtrls, uKandinskyAPI, FMX.Memo.Types, json, + FMX.Controls.Presentation, FMX.StdCtrls, uKandinskyAPI, FMX.Memo.Types, System.json, FMX.ScrollBox, FMX.Memo, System.IOUtils, System.SyncObjs,System.DateUtils; type