Skip to content

Commit b172e9f

Browse files
committed
Merge branch 'master' into build
2 parents 05b3737 + a17f87c commit b172e9f

165 files changed

Lines changed: 7963 additions & 2208 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

CMake/iOS.cmake

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,6 @@ set (CMAKE_SYSTEM_FRAMEWORK_PATH
253253
)
254254

255255
# only search the iOS sdks, not the remainder of the host filesystem
256-
set (CMAKE_FIND_ROOT_PATH_MODE_PROGRAM ONLY)
257256
set (CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
258257
set (CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
259258

@@ -264,15 +263,13 @@ endmacro (set_xcode_property)
264263

265264
# This macro lets you find executable programs on the host system
266265
macro (find_host_package)
267-
set (CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
268266
set (CMAKE_FIND_ROOT_PATH_MODE_LIBRARY NEVER)
269267
set (CMAKE_FIND_ROOT_PATH_MODE_INCLUDE NEVER)
270268
set (IOS FALSE)
271269

272270
find_package(${ARGN})
273271

274272
set (IOS TRUE)
275-
set (CMAKE_FIND_ROOT_PATH_MODE_PROGRAM ONLY)
276273
set (CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
277274
set (CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
278275
endmacro (find_host_package)

CMakeLists.txt

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
cmake_minimum_required(VERSION 3.10 FATAL_ERROR)
22

3-
project(TDLib VERSION 1.8.64 LANGUAGES CXX C)
3+
project(TDLib VERSION 1.8.65 LANGUAGES CXX C)
44

55
if (NOT DEFINED CMAKE_MODULE_PATH)
66
set(CMAKE_MODULE_PATH "")
@@ -457,10 +457,12 @@ set(TDLIB_SOURCE_PART1
457457
td/telegram/files/FileStatsWorker.cpp
458458
td/telegram/files/FileType.cpp
459459
td/telegram/files/FileUploader.cpp
460+
td/telegram/files/FileUploadId.cpp
460461
td/telegram/files/FileUploadManager.cpp
461462
td/telegram/files/PartsManager.cpp
462463
td/telegram/files/ResourceManager.cpp
463464
td/telegram/files/ResourceState.cpp
465+
td/telegram/FormattedDate.cpp
464466
td/telegram/ForumTopic.cpp
465467
td/telegram/ForumTopicEditedData.cpp
466468
td/telegram/ForumTopicIcon.cpp
@@ -488,6 +490,7 @@ set(TDLIB_SOURCE_PART1
488490
td/telegram/InputGroupCallId.cpp
489491
td/telegram/InputInvoice.cpp
490492
td/telegram/InputMessageText.cpp
493+
td/telegram/JoinChatBotResult.cpp
491494
td/telegram/JsonValue.cpp
492495
td/telegram/KeyboardButtonStyle.cpp
493496
td/telegram/LanguagePackManager.cpp
@@ -602,6 +605,7 @@ set(TDLIB_SOURCE_PART2
602605
td/telegram/RequestedDialogType.cpp
603606
td/telegram/Requests.cpp
604607
td/telegram/RestrictionReason.cpp
608+
td/telegram/RichMessage.cpp
605609
td/telegram/SavedMessagesManager.cpp
606610
td/telegram/SavedMessagesTopicId.cpp
607611
td/telegram/ScopeNotificationSettings.cpp
@@ -681,6 +685,7 @@ set(TDLIB_SOURCE_PART2
681685
td/telegram/TranscriptionManager.cpp
682686
td/telegram/TranslationManager.cpp
683687
td/telegram/UpdatesManager.cpp
688+
td/telegram/UserId.cpp
684689
td/telegram/UserManager.cpp
685690
td/telegram/Usernames.cpp
686691
td/telegram/UserPrivacySetting.cpp
@@ -694,6 +699,9 @@ set(TDLIB_SOURCE_PART2
694699
td/telegram/WebApp.cpp
695700
td/telegram/WebAppManager.cpp
696701
td/telegram/WebAppOpenParameters.cpp
702+
td/telegram/WebBrowserManager.cpp
703+
td/telegram/WebBrowserSettings.cpp
704+
td/telegram/WebDomainException.cpp
697705
td/telegram/WebPageBlock.cpp
698706
td/telegram/WebPagesManager.cpp
699707

@@ -844,6 +852,7 @@ set(TDLIB_SOURCE_PART2
844852
td/telegram/files/ResourceManager.h
845853
td/telegram/files/ResourceState.h
846854
td/telegram/FolderId.h
855+
td/telegram/FormattedDate.h
847856
td/telegram/ForumTopic.h
848857
td/telegram/ForumTopicEditedData.h
849858
td/telegram/ForumTopicFullId.h
@@ -875,6 +884,7 @@ set(TDLIB_SOURCE_PART2
875884
td/telegram/InputGroupCallId.h
876885
td/telegram/InputInvoice.h
877886
td/telegram/InputMessageText.h
887+
td/telegram/JoinChatBotResult.h
878888
td/telegram/JsonValue.h
879889
td/telegram/KeyboardButtonStyle.h
880890
td/telegram/LabeledPricePart.h
@@ -1018,6 +1028,7 @@ set(TDLIB_SOURCE_PART2
10181028
td/telegram/RequestedDialogType.h
10191029
td/telegram/Requests.h
10201030
td/telegram/RestrictionReason.h
1031+
td/telegram/RichMessage.h
10211032
td/telegram/SavedMessagesManager.h
10221033
td/telegram/SavedMessagesTopicId.h
10231034
td/telegram/ScheduledServerMessageId.h
@@ -1126,6 +1137,9 @@ set(TDLIB_SOURCE_PART2
11261137
td/telegram/WebApp.h
11271138
td/telegram/WebAppManager.h
11281139
td/telegram/WebAppOpenParameters.h
1140+
td/telegram/WebBrowserManager.h
1141+
td/telegram/WebBrowserSettings.h
1142+
td/telegram/WebDomainException.h
11291143
td/telegram/WebPageBlock.h
11301144
td/telegram/WebPageId.h
11311145
td/telegram/WebPagesManager.h
@@ -1170,6 +1184,7 @@ set(TDLIB_SOURCE_PART2
11701184
td/telegram/files/FileLocation.hpp
11711185
td/telegram/files/FileManager.hpp
11721186
td/telegram/files/FileSourceId.hpp
1187+
td/telegram/FormattedDate.hpp
11731188
td/telegram/ForumTopic.hpp
11741189
td/telegram/ForumTopicEditedData.hpp
11751190
td/telegram/ForumTopicIcon.hpp
@@ -1213,6 +1228,7 @@ set(TDLIB_SOURCE_PART2
12131228
td/telegram/RepliedMessageInfo.hpp
12141229
td/telegram/ReplyMarkup.hpp
12151230
td/telegram/RequestedDialogType.hpp
1231+
td/telegram/RichMessage.hpp
12161232
td/telegram/ScopeNotificationSettings.hpp
12171233
td/telegram/SecureValue.hpp
12181234
td/telegram/SendCodeHelper.hpp
@@ -1248,6 +1264,8 @@ set(TDLIB_SOURCE_PART2
12481264
td/telegram/VideosManager.hpp
12491265
td/telegram/VoiceNotesManager.hpp
12501266
td/telegram/WebApp.hpp
1267+
td/telegram/WebBrowserSettings.hpp
1268+
td/telegram/WebDomainException.hpp
12511269

12521270
${TL_TD_AUTO_SOURCE}
12531271

SplitSource.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -358,6 +358,7 @@ function ($matches) use ($needed_std_headers) {
358358
'file_reference_manager[_(-](?![.]get[(][)])|FileReferenceManager|file_references[)]' => 'FileReferenceManager',
359359
'file_manager[_(-](?![.]get[(][)])|FileManager([^ ;.]| [^*])|update_file[)]' => 'files/FileManager',
360360
'FolderId' => 'FolderId',
361+
'FormattedDate' => 'FormattedDate',
361362
'ForumTopicFullId' => 'ForumTopicFullId',
362363
'ForumTopicId' => 'ForumTopicId',
363364
'forum_topic_manager[_(-](?![.]get[(][)])|ForumTopicManager' => 'ForumTopicManager',
@@ -426,6 +427,7 @@ function ($matches) use ($needed_std_headers) {
426427
'referral_program_manager[_(-](?![.]get[(][)])|ReferralProgramManager' => 'ReferralProgramManager',
427428
'ReferralProgramParameters' => 'ReferralProgramParameters',
428429
'RequestActor|RequestOnceActor' => 'RequestActor',
430+
'RichMessage' => 'RichMessage',
429431
'saved_messages_manager[_(-](?![.]get[(][)])|SavedMessagesManager' => 'SavedMessagesManager',
430432
'ScopeNotificationSettings|[a-z_]*_scope_notification_settings' => 'ScopeNotificationSettings',
431433
'SearchPostsFlood' => 'SearchPostsFlood',
@@ -495,6 +497,9 @@ function ($matches) use ($needed_std_headers) {
495497
'voice_notes_manager[_(-](?![.]get[(][)])|VoiceNotesManager' => 'VoiceNotesManager',
496498
'web_app_manager[_(-](?![.]get[(][)])|WebAppManager' => 'WebAppManager',
497499
'WebAppOpenParameters' => 'WebAppOpenParameters',
500+
'web_browser_manager[_(-](?![.]get[(][)])|WebBrowserManager' => 'WebBrowserManager',
501+
'WebBrowserSettings' => 'WebBrowserSettings',
502+
'WebDomainException' => 'WebDomainException',
498503
'WebPageId(Hash)?' => 'WebPageId',
499504
'web_pages_manager[_(-](?![.]get[(][)])|WebPagesManager' => 'WebPagesManager');
500505

benchmark/bench_actor.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ class RingBench final : public td::Benchmark {
8787
public:
8888
td::string get_description() const final {
8989
static const char *types[] = {"later", "immediate", "raw", "tail", "lambda"};
90-
static_assert(0 <= type && type < 5, "");
90+
static_assert(0 <= type && type < 5);
9191
return PSTRING() << "Ring (send_" << types[type] << ") (threads_n = " << thread_n_ << ")";
9292
}
9393

@@ -174,7 +174,7 @@ class QueryBench final : public td::Benchmark {
174174
public:
175175
td::string get_description() const final {
176176
static const char *types[] = {"callback", "immediate future", "delayed future", "dummy", "lambda", "lambda_future"};
177-
static_assert(0 <= type && type < 6, "");
177+
static_assert(0 <= type && type < 6);
178178
return PSTRING() << "QueryBench: " << types[type];
179179
}
180180

example/cpp/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.10 FATAL_ERROR)
22

33
project(TdExample VERSION 1.0 LANGUAGES CXX)
44

5-
find_package(Td 1.8.64 REQUIRED)
5+
find_package(Td 1.8.65 REQUIRED)
66

77
add_executable(tdjson_example tdjson_example.cpp)
88
target_link_libraries(tdjson_example PRIVATE Td::TdJson)

example/ios/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ do
5555
fi
5656

5757
echo "iOS platform = ${ios_platform}"
58-
other_options="-DIOS_PLATFORM=${ios_platform} -DCMAKE_TOOLCHAIN_FILE=${td_path}/CMake/iOS.cmake -DCMAKE_MAKE_PROGRAM=make"
58+
other_options="-DIOS_PLATFORM=${ios_platform} -DCMAKE_TOOLCHAIN_FILE=${td_path}/CMake/iOS.cmake"
5959
fi
6060

6161
set_cmake_options $platform

example/uwp/Telegram.Td.UWP.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2013/01/nuspec.xsd">
33
<metadata>
44
<id>Telegram.Td.UWP</id>
5-
<version>1.8.64</version>
5+
<version>1.8.65</version>
66
<title>TDLib for Universal Windows Platform</title>
77
<authors>Telegram</authors>
88
<owners>Telegram</owners>

example/uwp/extension.vsixmanifest

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011">
22
<Metadata>
3-
<Identity Id="Telegram.Td.UWP" Version="1.8.64" Language="en-US" Publisher="Telegram LLC" />
3+
<Identity Id="Telegram.Td.UWP" Version="1.8.65" Language="en-US" Publisher="Telegram LLC" />
44
<DisplayName>TDLib for Universal Windows Platform</DisplayName>
55
<Description>TDLib is a library for building Telegram clients</Description>
66
<MoreInfo>https://core.telegram.org/tdlib</MoreInfo>

example/web/tdweb/package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

example/web/tdweb/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "tdweb",
3-
"version": "1.8.64",
3+
"version": "1.8.65",
44
"description": "JavaScript interface for TDLib (Telegram library)",
55
"main": "dist/tdweb.js",
66
"repository": {

0 commit comments

Comments
 (0)