From 7f325dbd0482214d90b63386fc31913762f91c55 Mon Sep 17 00:00:00 2001 From: levlam Date: Mon, 29 Apr 2019 00:13:36 +0300 Subject: [PATCH] Add note about correct OpenSSL version for Node.js on Linux. GitOrigin-RevId: 64647e21f5ba3e985c7dd50ea055a5cdb031b6cf --- build.html | 3 +++ example/web/tdweb/README.md | 1 - td/generate/scheme/td_api.tl | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/build.html b/build.html index 5abfd12e..32234fda 100644 --- a/build.html +++ b/build.html @@ -491,6 +491,9 @@ function onOptionsChanged() { var compiler = use_clang ? 'clang++ >= 3.4' : 'g++ >= 4.9.2'; pre_text.push('Install Git, ' + compiler + ', make, CMake >= 3.0.2, OpenSSL, zlib, gperf, PHP' + jdk + ' using your package manager.'); } + if (os_linux && os.includes('Node.js')) { + pre_text.push('Note that for Node.js ≤ 9.11.2 you must build TDLib with OpenSSL 1.0.* and for Node.js ≥ 10 with OpenSSL 1.1.* instead, so you may need to modify the following commands to install a proper OpenSSL version.'); + } if (os_freebsd) { pre_text.push('Note that following instruction is for FreeBSD 11.'); pre_text.push('Note that following calls to pkg needs to be run as root.'); diff --git a/example/web/tdweb/README.md b/example/web/tdweb/README.md index 96caaad0..c1269caf 100644 --- a/example/web/tdweb/README.md +++ b/example/web/tdweb/README.md @@ -17,4 +17,3 @@ which shouldn't be used in the JSON interface. The object type name is stored in Fields of Bool type are stored as Boolean, fields of int32, int53 and double types are stored as Number, fields of int64 and string types are stored as String, fields of bytes type are base64 encoded and then stored as String, fields of vector type are stored as Array. You can also add a field '@extra' to any query to TDLib and the response will contain field '@extra' with exactly the same value. - diff --git a/td/generate/scheme/td_api.tl b/td/generate/scheme/td_api.tl index 66f771a3..c758b8ef 100644 --- a/td/generate/scheme/td_api.tl +++ b/td/generate/scheme/td_api.tl @@ -1956,7 +1956,7 @@ pushMessageContentContactRegistered = PushMessageContent; //@description A document message (a general file) @document Message content; may be null @is_pinned True, if the message is a pinned message with the specified content pushMessageContentDocument document:document is_pinned:Bool = PushMessageContent; -//@description A message with a game @title Game title @is_pinned True, if the message is a pinned message with the specified content +//@description A message with a game @title Game title, empty for pinned game message @is_pinned True, if the message is a pinned message with the specified content pushMessageContentGame title:string is_pinned:Bool = PushMessageContent; //@description A new high score was achieved in a game @title Game title, empty for pinned message @score New score, 0 for pinned message @is_pinned True, if the message is a pinned message with the specified content