From 0930e69c7d3ac1a0692bcfeffbed47426d40ac20 Mon Sep 17 00:00:00 2001 From: Giuseppe Marino Date: Fri, 10 Jan 2025 00:33:16 +0100 Subject: [PATCH] add is_premium to getChat --- .gitignore | 1 + .vscode/settings.json | 80 +++++++++++++++++++++++++++++++++++++ hc.patch | 22 ++++++++++ telegram-bot-api/Client.cpp | 4 ++ 4 files changed, 107 insertions(+) create mode 100644 .vscode/settings.json create mode 100644 hc.patch diff --git a/.gitignore b/.gitignore index 2f59bba..f8c111a 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ bin/ vcpkg/ /.idea/ .cache/* +.history/* \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..380d05d --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,80 @@ +{ + "C_Cpp.errorSquiggles": "disabled", + "files.associations": { + "cmath": "cpp", + "cstdarg": "cpp", + "cstddef": "cpp", + "cstdio": "cpp", + "cstdlib": "cpp", + "cstring": "cpp", + "ctime": "cpp", + "cwchar": "cpp", + "array": "cpp", + "atomic": "cpp", + "bit": "cpp", + "*.tcc": "cpp", + "bitset": "cpp", + "cctype": "cpp", + "charconv": "cpp", + "chrono": "cpp", + "cinttypes": "cpp", + "clocale": "cpp", + "compare": "cpp", + "complex": "cpp", + "concepts": "cpp", + "condition_variable": "cpp", + "cstdint": "cpp", + "cwctype": "cpp", + "deque": "cpp", + "list": "cpp", + "map": "cpp", + "set": "cpp", + "string": "cpp", + "unordered_map": "cpp", + "unordered_set": "cpp", + "vector": "cpp", + "exception": "cpp", + "algorithm": "cpp", + "functional": "cpp", + "iterator": "cpp", + "memory": "cpp", + "memory_resource": "cpp", + "optional": "cpp", + "random": "cpp", + "ratio": "cpp", + "string_view": "cpp", + "tuple": "cpp", + "type_traits": "cpp", + "utility": "cpp", + "format": "cpp", + "fstream": "cpp", + "initializer_list": "cpp", + "iosfwd": "cpp", + "iostream": "cpp", + "istream": "cpp", + "limits": "cpp", + "mutex": "cpp", + "new": "cpp", + "numbers": "cpp", + "ostream": "cpp", + "print": "cpp", + "semaphore": "cpp", + "span": "cpp", + "sstream": "cpp", + "stdexcept": "cpp", + "stop_token": "cpp", + "streambuf": "cpp", + "system_error": "cpp", + "text_encoding": "cpp", + "thread": "cpp", + "typeinfo": "cpp", + "variant": "cpp", + "__bit_reference": "cpp", + "__split_buffer": "cpp", + "__threading_support": "cpp", + "__verbose_abort": "cpp", + "ios": "cpp", + "locale": "cpp", + "queue": "cpp" + } +} \ No newline at end of file diff --git a/hc.patch b/hc.patch new file mode 100644 index 0000000..96e3b14 --- /dev/null +++ b/hc.patch @@ -0,0 +1,22 @@ +diff --git a/Dockerfile b/Dockerfile +index 9c0de671..ce4fec1e 100644 +--- a/Dockerfile ++++ b/Dockerfile +@@ -19,7 +19,7 @@ FROM alpine:3.12 + ENV TELEGRAM_WORK_DIR="/var/lib/telegram-bot-api" \ + TELEGRAM_TEMP_DIR="/tmp/telegram-bot-api" + +-RUN apk add --no-cache --update openssl libstdc++ curl ++RUN apk add --no-cache --update openssl libstdc++ + COPY --from=build /usr/src/telegram-bot-api/bin/telegram-bot-api /usr/local/bin/telegram-bot-api + COPY docker-entrypoint.sh /docker-entrypoint.sh + RUN addgroup -g 101 -S telegram-bot-api \ +@@ -30,6 +30,6 @@ RUN addgroup -g 101 -S telegram-bot-api \ + && chmod 700 ${TELEGRAM_TEMP_DIR} + USER telegram-bot-api:telegram-bot-api + +-HEALTHCHECK CMD curl -f http://localhost:8082/ || exit 1 ++HEALTHCHECK CMD nc -z localhost 8081 || exit 1 + EXPOSE 8081/tcp 8082/tcp + ENTRYPOINT ["/docker-entrypoint.sh"] + diff --git a/telegram-bot-api/Client.cpp b/telegram-bot-api/Client.cpp index fde4cbc..12dbed9 100644 --- a/telegram-bot-api/Client.cpp +++ b/telegram-bot-api/Client.cpp @@ -1061,6 +1061,10 @@ class Client::JsonChat final : public td::Jsonable { } json_store_user_status(object, user_info->status.get()); + + if (user_info->is_premium) { + object("is_premium", td::JsonTrue()); + } // end custom properties impl if (is_full_) {