diff options
123 files changed, 151 insertions, 1942 deletions
diff --git a/Dockerfile_test b/Dockerfile_test index 656e67f..b71fbd7 100644 --- a/Dockerfile_test +++ b/Dockerfile_test @@ -1,19 +1,22 @@ -FROM debian:stretch +FROM ubuntu:18.04 MAINTAINER Oleg Morozenkov <a@reo7sp.ru> RUN apt-get -qq update && \ - apt-get -qq install -y g++ make binutils cmake libssl-dev libcurl4-openssl-dev wget build-essential python-dev autotools-dev libicu-dev libbz2-dev zlib1g-dev - -WORKDIR /usr/src/boost -RUN wget -q -O boost_1_59_0.tar.gz https://sourceforge.net/projects/boost/files/boost/1.59.0/boost_1_59_0.tar.gz/download && \ - tar xzf boost_1_59_0.tar.gz && \ - rm boost_1_59_0.tar.gz && \ - cd boost_1_59_0 && \ - ./bootstrap.sh --prefix=/usr/ --with-libraries=system,test && \ - ./b2 -j $(nproc) -d0 && \ - ./b2 install && \ - cd .. && \ - rm -r boost_1_59_0 + apt-get -qq install -y \ + autotools-dev \ + binutils \ + build-essential \ + cmake \ + g++ \ + libboost-all-dev \ + libbz2-dev \ + libcurl4-openssl-dev \ + libicu-dev \ + libssl-dev \ + make \ + python-dev \ + wget \ + zlib1g-dev WORKDIR /usr/src/tgbot-cpp @@ -1,6 +1,20 @@ The MIT License (MIT) -Copyright (c) 2015 Oleg Morozenkov +Copyright (c) 2015 Oleg Morozenkov +Copyright (c) 2015-2019 GitHub contributors https://github.com/reo7sp/tgbot-cpp/graphs/contributors +Copyright (c) 2015 ray-pixar +Copyright (c) 2015-2016 Florian Scheibner +Copyright (c) 2015 naveenvhegde +Copyright (c) 2016 Andrea Giove +Copyright (c) 2016-2017 Konstantin Kukin +Copyright (c) 2017 ymuv +Copyright (c) 2017 Maks Mazurov +Copyright (c) 2017-2019 YJBeetle +Copyright (c) 2017 Moskalenko Yurii +Copyright (c) 2017-2018 JellyBrick +Copyright (c) 2018 Egor Pugin +Copyright (c) 2018 Javier G. Sogo +Copyright (c) 2019 Marcel Alexandru Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -2,7 +2,6 @@ [](https://travis-ci.org/reo7sp/tgbot-cpp) [](https://github.com/reo7sp/tgbot-cpp/graphs/contributors) -[](http://reo7sp.github.io/tgbot-cpp) C++ library for Telegram bot API. @@ -106,4 +105,4 @@ add_definitions(-DTGBOT_CHANGE_READ_BUFFER_SIZE) # Read Buffer Size Expansion ## Licence -[The MIT License](http://opensource.org/licenses/MIT). +[The MIT License](https://github.com/reo7sp/tgbot-cpp/blob/master/LICENSE). diff --git a/include/tgbot/Api.h b/include/tgbot/Api.h index 02e68a5..8a4813d 100644 --- a/include/tgbot/Api.h +++ b/include/tgbot/Api.h @@ -1,25 +1,3 @@ -/* - * Copyright (c) 2015 Oleg Morozenkov - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - #ifndef TGBOT_CPP_API_H #define TGBOT_CPP_API_H @@ -295,12 +273,12 @@ public: int32_t replyToMessageId = 0, GenericReply::Ptr replyMarkup = std::make_shared<GenericReply>(), const std::string& parseMode = "", bool disableNotification = false) const; /** - * @brief Use this method to send animation files (GIF or H.264/MPEG-4 AVC video without sound). - * + * @brief Use this method to send animation files (GIF or H.264/MPEG-4 AVC video without sound). + * * Bots can currently send animation files of up to 50 MB in size, this limit may be changed in the future. - * + * * @param chatId Unique identifier for the target chat. - * @param animation Animation to send. Pass a file_id as String to send an animation that exists on the Telegram servers (recommended), pass an HTTP URL as a String for Telegram to get an animation from the Internet, or upload a new animation using multipart/form-data. + * @param animation Animation to send. Pass a file_id as String to send an animation that exists on the Telegram servers (recommended), pass an HTTP URL as a String for Telegram to get an animation from the Internet, or upload a new animation using multipart/form-data. * @param duration Optional. Duration of sent animation in seconds. * @param width Optional. Animation width. * @param height Optional. Animation height. @@ -556,12 +534,12 @@ public: /** * @brief Use this method to edit audio, document, photo, or video messages. - * - * + * + * * If a message is a part of a message album, then it can be edited only to a photo or a video. * Otherwise, message type can be changed arbitrarily. When inline message is edited, new file can't be uploaded. * Use previously uploaded file via its file_id or specify a URL. - * + * * @param media A JSON-serialized object for a new media content of the message. * @param chatId Optional Required if inline_message_id is not specified. Unique identifier for the target chat of the target channel. * @param messageId Optional Required if inline_message_id is not specified. Identifier of the sent message diff --git a/include/tgbot/Bot.h b/include/tgbot/Bot.h index e2d9027..98876f3 100644 --- a/include/tgbot/Bot.h +++ b/include/tgbot/Bot.h @@ -1,25 +1,3 @@ -/* - * Copyright (c) 2015 Oleg Morozenkov - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - #ifndef TGBOT_CPP_BOT_H #define TGBOT_CPP_BOT_H diff --git a/include/tgbot/EventBroadcaster.h b/include/tgbot/EventBroadcaster.h index d879ab4..7424e5d 100644 --- a/include/tgbot/EventBroadcaster.h +++ b/include/tgbot/EventBroadcaster.h @@ -1,25 +1,3 @@ -/* - * Copyright (c) 2015 Oleg Morozenkov - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - #ifndef TGBOT_EVENTBROADCASTER_H #define TGBOT_EVENTBROADCASTER_H @@ -39,7 +17,7 @@ class EventHandler; /** * @brief This class holds all event listeners. - * + * * @ingroup general */ class EventBroadcaster { diff --git a/include/tgbot/EventHandler.h b/include/tgbot/EventHandler.h index edc84dc..540544e 100644 --- a/include/tgbot/EventHandler.h +++ b/include/tgbot/EventHandler.h @@ -1,25 +1,3 @@ -/* - * Copyright (c) 2015 Oleg Morozenkov - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - #ifndef TGBOT_EVENTHANDLER_H #define TGBOT_EVENTHANDLER_H diff --git a/include/tgbot/TgException.h b/include/tgbot/TgException.h index d6ff7d7..a83c3fc 100644 --- a/include/tgbot/TgException.h +++ b/include/tgbot/TgException.h @@ -1,25 +1,3 @@ -/* - * Copyright (c) 2015 Oleg Morozenkov - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - #ifndef TGBOT_TGEXCEPTION_H #define TGBOT_TGEXCEPTION_H @@ -30,7 +8,7 @@ namespace TgBot { /** * @brief Exception type which is only thrown when Telegram refuses API request. - * + * * @ingroup general */ class TgException : public std::runtime_error { diff --git a/include/tgbot/TgTypeParser.h b/include/tgbot/TgTypeParser.h index 6cda5a7..eac3d05 100644 --- a/include/tgbot/TgTypeParser.h +++ b/include/tgbot/TgTypeParser.h @@ -1,25 +1,3 @@ -/* - * Copyright (c) 2015 Oleg Morozenkov - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - #ifndef TGBOT_CPP_TGTYPEPARSER_H #define TGBOT_CPP_TGTYPEPARSER_H diff --git a/include/tgbot/net/BoostHttpOnlySslClient.h b/include/tgbot/net/BoostHttpOnlySslClient.h index 615abdc..8103bef 100644 --- a/include/tgbot/net/BoostHttpOnlySslClient.h +++ b/include/tgbot/net/BoostHttpOnlySslClient.h @@ -1,26 +1,3 @@ -/* - * Copyright (c) 2015 Oleg Morozenkov - * Copyright (c) 2018 JellyBrick - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - #ifndef TGBOT_BOOSTHTTPCLIENT_H #define TGBOT_BOOSTHTTPCLIENT_H diff --git a/include/tgbot/net/CurlHttpClient.h b/include/tgbot/net/CurlHttpClient.h index b0ff6c3..9409d7c 100644 --- a/include/tgbot/net/CurlHttpClient.h +++ b/include/tgbot/net/CurlHttpClient.h @@ -1,25 +1,3 @@ -/* - * Copyright (c) 2018 Egor Pugin - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - #ifndef TGBOT_CURLHTTPCLIENT_H #define TGBOT_CURLHTTPCLIENT_H diff --git a/include/tgbot/net/HttpClient.h b/include/tgbot/net/HttpClient.h index 62b1875..077a6c1 100644 --- a/include/tgbot/net/HttpClient.h +++ b/include/tgbot/net/HttpClient.h @@ -1,26 +1,3 @@ - /* - * Copyright (c) 2015 Oleg Morozenkov - * Copyright (c) 2018 Egor Pugin - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - #ifndef TGBOT_HTTPCLIENT_H #define TGBOT_HTTPCLIENT_H diff --git a/include/tgbot/net/HttpParser.h b/include/tgbot/net/HttpParser.h index d4900a1..82da892 100644 --- a/include/tgbot/net/HttpParser.h +++ b/include/tgbot/net/HttpParser.h @@ -1,25 +1,3 @@ -/* - * Copyright (c) 2015 Oleg Morozenkov - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - #ifndef TGBOT_HTTPPARSER_H #define TGBOT_HTTPPARSER_H diff --git a/include/tgbot/net/HttpReqArg.h b/include/tgbot/net/HttpReqArg.h index a263224..4b6e428 100644 --- a/include/tgbot/net/HttpReqArg.h +++ b/include/tgbot/net/HttpReqArg.h @@ -1,25 +1,3 @@ -/* - * Copyright (c) 2015 Oleg Morozenkov - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - #ifndef TGBOT_HTTPPARAMETER_H #define TGBOT_HTTPPARAMETER_H @@ -34,7 +12,7 @@ namespace TgBot { /** * @brief This class represents argument in POST http requests. - * + * * @ingroup net */ class HttpReqArg { diff --git a/include/tgbot/net/HttpServer.h b/include/tgbot/net/HttpServer.h index a1c5a49..28ea5a3 100644 --- a/include/tgbot/net/HttpServer.h +++ b/include/tgbot/net/HttpServer.h @@ -1,25 +1,3 @@ -/* - * Copyright (c) 2015 Oleg Morozenkov - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - #ifndef TGBOT_HTTPSERVER_H #define TGBOT_HTTPSERVER_H @@ -35,7 +13,7 @@ namespace TgBot { /** * @brief This class handles HTTP requests from the Internet. - * + * * @ingroup net */ template<typename Protocol> diff --git a/include/tgbot/net/TgLongPoll.h b/include/tgbot/net/TgLongPoll.h index 643031e..8bf739a 100644 --- a/include/tgbot/net/TgLongPoll.h +++ b/include/tgbot/net/TgLongPoll.h @@ -1,25 +1,3 @@ -/* - * Copyright (c) 2015 Oleg Morozenkov - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - #ifndef TGBOT_TGLONGPOLL_H #define TGBOT_TGLONGPOLL_H @@ -31,7 +9,7 @@ namespace TgBot { /** * @brief This class handles long polling and updates parsing. - * + * * @ingroup net */ class TgLongPoll { diff --git a/include/tgbot/net/TgWebhookLocalServer.h b/include/tgbot/net/TgWebhookLocalServer.h index d7cb06e..2a64374 100644 --- a/include/tgbot/net/TgWebhookLocalServer.h +++ b/include/tgbot/net/TgWebhookLocalServer.h @@ -1,25 +1,3 @@ -/* - * Copyright (c) 2015 Oleg Morozenkov - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - #ifndef TGBOT_TGWEBHOOKLOCALSERVER_H #define TGBOT_TGWEBHOOKLOCALSERVER_H @@ -31,7 +9,7 @@ namespace TgBot { /** * @brief This class setups HTTP server for receiving Telegram Update objects from unix socket. - * + * * @ingroup net */ class TgWebhookLocalServer : public TgWebhookServer<boost::asio::local::stream_protocol> { diff --git a/include/tgbot/net/TgWebhookServer.h b/include/tgbot/net/TgWebhookServer.h index 953c1a9..2f3c5b8 100644 --- a/include/tgbot/net/TgWebhookServer.h +++ b/include/tgbot/net/TgWebhookServer.h @@ -1,25 +1,3 @@ -/* - * Copyright (c) 2015 Oleg Morozenkov - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - #ifndef TGBOT_TGHTTPSERVER_H #define TGBOT_TGHTTPSERVER_H diff --git a/include/tgbot/net/TgWebhookTcpServer.h b/include/tgbot/net/TgWebhookTcpServer.h index ad5a5b8..28ae8aa 100644 --- a/include/tgbot/net/TgWebhookTcpServer.h +++ b/include/tgbot/net/TgWebhookTcpServer.h @@ -1,25 +1,3 @@ -/* - * Copyright (c) 2015 Oleg Morozenkov - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - #ifndef TGBOT_TGWEBHOOKTCPSERVER_H #define TGBOT_TGWEBHOOKTCPSERVER_H diff --git a/include/tgbot/net/Url.h b/include/tgbot/net/Url.h index f9226e5..dbea837 100644 --- a/include/tgbot/net/Url.h +++ b/include/tgbot/net/Url.h @@ -1,25 +1,3 @@ -/* - * Copyright (c) 2015 Oleg Morozenkov - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - #ifndef TGBOT_CPP_URL_H #define TGBOT_CPP_URL_H @@ -29,7 +7,7 @@ namespace TgBot { /** * @brief This class parses a string with the url - * + * * @ingroup net */ class Url { diff --git a/include/tgbot/tgbot.h b/include/tgbot/tgbot.h index 0e43f18..b01cb6e 100644 --- a/include/tgbot/tgbot.h +++ b/include/tgbot/tgbot.h @@ -1,25 +1,3 @@ -/* - * Copyright (c) 2015 Oleg Morozenkov - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - #ifndef TGBOT_TGBOT_H #define TGBOT_TGBOT_H diff --git a/include/tgbot/tools/FileTools.h b/include/tgbot/tools/FileTools.h index e718a6c..d497d7c 100644 --- a/include/tgbot/tools/FileTools.h +++ b/include/tgbot/tools/FileTools.h @@ -1,7 +1,3 @@ -// -// Created by Oleg Morozenkov on 25.01.17. -// - #ifndef TGBOT_FILETOOLS_H #define TGBOT_FILETOOLS_H diff --git a/include/tgbot/tools/StringTools.h b/include/tgbot/tools/StringTools.h index 0f72045..d1bc094 100644 --- a/include/tgbot/tools/StringTools.h +++ b/include/tgbot/tools/StringTools.h @@ -1,25 +1,3 @@ -/* - * Copyright (c) 2015 Oleg Morozenkov - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - #ifndef TGBOT_CPP_STRINGTOOLS_H #define TGBOT_CPP_STRINGTOOLS_H diff --git a/include/tgbot/types/Animation.h b/include/tgbot/types/Animation.h index ddd7ca0..2e70e4c 100644 --- a/include/tgbot/types/Animation.h +++ b/include/tgbot/types/Animation.h @@ -1,26 +1,3 @@ -/* - * Copyright (c) 2015 Oleg Morozenkov - * Copyright (c) 2018 JellyBrick - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - #ifndef TGBOT_ANIMATION_H #define TGBOT_ANIMATION_H @@ -33,9 +10,9 @@ namespace TgBot { /** * @brief You can provide an animation for your game so that it looks stylish in chats (check out Lumberjack for an example). - * + * * This object represents an animation file to be displayed in the message containing a game. - * + * * @ingroup types */ class Animation { @@ -69,4 +46,4 @@ public: }; } -#endif //TGBOT_ANIMATION_H
\ No newline at end of file +#endif //TGBOT_ANIMATION_H diff --git a/include/tgbot/types/Audio.h b/include/tgbot/types/Audio.h index b77a106..bc3c8ad 100644 --- a/include/tgbot/types/Audio.h +++ b/include/tgbot/types/Audio.h @@ -1,25 +1,3 @@ -/* - * Copyright (c) 2015 Oleg Morozenkov - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - #ifndef TGBOT_CPP_AUDIO_H #define TGBOT_CPP_AUDIO_H @@ -32,7 +10,7 @@ namespace TgBot { /** * @brief This object represents an audio file (voice note). - * + * * @ingroup types */ class Audio { diff --git a/include/tgbot/types/CallbackGame.h b/include/tgbot/types/CallbackGame.h index e7f5cef..07bd28d 100644 --- a/include/tgbot/types/CallbackGame.h +++ b/include/tgbot/types/CallbackGame.h @@ -1,26 +1,3 @@ -/* - * Copyright (c) 2015 Oleg Morozenkov - * Copyright (c) 2018 JellyBrick - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - #ifndef TGBOT_CALLBACKGAME_H #define TGBOT_CALLBACKGAME_H @@ -30,7 +7,7 @@ namespace TgBot { /** * @brief A placeholder, currently holds no information. Use BotFather to set up your game. - * + * * @ingroup types */ class CallbackGame { @@ -39,4 +16,4 @@ public: }; } -#endif //TGBOT_CALLBACKGAME_H
\ No newline at end of file +#endif //TGBOT_CALLBACKGAME_H diff --git a/include/tgbot/types/CallbackQuery.h b/include/tgbot/types/CallbackQuery.h index e0d25f7..26454bc 100644 --- a/include/tgbot/types/CallbackQuery.h +++ b/include/tgbot/types/CallbackQuery.h @@ -1,7 +1,3 @@ -// -// Created by Andrea Giove on 17/04/16. -// - #ifndef TGBOT_CALLBACKQUERY_H #define TGBOT_CALLBACKQUERY_H diff --git a/include/tgbot/types/Chat.h b/include/tgbot/types/Chat.h index eb38ec7..7157a2b 100644 --- a/include/tgbot/types/Chat.h +++ b/include/tgbot/types/Chat.h @@ -1,25 +1,3 @@ -/* - * Copyright (c) 2015 Oleg Morozenkov - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - #ifndef TGBOT_CPP_CHAT_H #define TGBOT_CPP_CHAT_H diff --git a/include/tgbot/types/ChatMember.h b/include/tgbot/types/ChatMember.h index f5e5acd..700ec0d 100644 --- a/include/tgbot/types/ChatMember.h +++ b/include/tgbot/types/ChatMember.h @@ -1,8 +1,3 @@ -// -// Created by Konstantin Kukin on 26/12/16. -// Edit by JellyBrick on 27/05/18. -// - #ifndef TGBOT_CHATMEMBER_H #define TGBOT_CHATMEMBER_H diff --git a/include/tgbot/types/ChatPermissions.h b/include/tgbot/types/ChatPermissions.h index 8db32e6..cfb4559 100644 --- a/include/tgbot/types/ChatPermissions.h +++ b/include/tgbot/types/ChatPermissions.h @@ -1,25 +1,3 @@ -/* - * Copyright (c) 2019 Marcel Alexandru - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - #ifndef TGBOT_CPP_CHATPERMISSIONS_H #define TGBOT_CPP_CHATPERMISSIONS_H diff --git a/include/tgbot/types/ChatPhoto.h b/include/tgbot/types/ChatPhoto.h index d39b87a..f41d9b8 100644 --- a/include/tgbot/types/ChatPhoto.h +++ b/include/tgbot/types/ChatPhoto.h @@ -1,26 +1,3 @@ -/* - * Copyright (c) 2015 Oleg Morozenkov - * Copyright (c) 2018 JellyBrick - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - #ifndef TGBOT_CHATPHOTO_H #define TGBOT_CHATPHOTO_H @@ -49,4 +26,4 @@ public: }; } -#endif //TGBOT_CHATPHOTO_H
\ No newline at end of file +#endif //TGBOT_CHATPHOTO_H diff --git a/include/tgbot/types/ChosenInlineResult.h b/include/tgbot/types/ChosenInlineResult.h index 7d00520..d1ecf93 100644 --- a/include/tgbot/types/ChosenInlineResult.h +++ b/include/tgbot/types/ChosenInlineResult.h @@ -1,7 +1,3 @@ -// -// Created by Andrea Giove on 27/03/16. -// - #ifndef TGBOT_CHOSENINLINERESULT_H #define TGBOT_CHOSENINLINERESULT_H @@ -15,7 +11,7 @@ namespace TgBot { /** * @brief This object represents a result of an inline query that was chosen by the user and sent to their chat partner. - * + * * @ingroup types */ class ChosenInlineResult { diff --git a/include/tgbot/types/Contact.h b/include/tgbot/types/Contact.h index 9cfc477..3f6f137 100644 --- a/include/tgbot/types/Contact.h +++ b/include/tgbot/types/Contact.h @@ -1,25 +1,3 @@ -/* - * Copyright (c) 2015 Oleg Morozenkov - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - #ifndef TGBOT_CPP_CONTACT_H #define TGBOT_CPP_CONTACT_H @@ -30,7 +8,7 @@ namespace TgBot { /** * @brief This object represents a phone contact. - * + * * @ingroup types */ class Contact { diff --git a/include/tgbot/types/Document.h b/include/tgbot/types/Document.h index 09be9a5..00ba06d 100644 --- a/include/tgbot/types/Document.h +++ b/include/tgbot/types/Document.h @@ -1,25 +1,3 @@ -/* - * Copyright (c) 2015 Oleg Morozenkov - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - #ifndef TGBOT_CPP_DOCUMENT_H #define TGBOT_CPP_DOCUMENT_H @@ -32,7 +10,7 @@ namespace TgBot { /** * @brief This object represents a general file (as opposed to photos and audio files). - * + * * @ingroup types */ class Document { diff --git a/include/tgbot/types/File.h b/include/tgbot/types/File.h index c2daee7..ab8d32b 100644 --- a/include/tgbot/types/File.h +++ b/include/tgbot/types/File.h @@ -1,7 +1,3 @@ -// -// Created by Konstantin Kukin on 26/12/16. -// - #ifndef TGBOT_CPP_FILE_H #define TGBOT_CPP_FILE_H @@ -11,13 +7,13 @@ namespace TgBot { /** - * @brief This object represents a file ready to be downloaded. - * + * @brief This object represents a file ready to be downloaded. + * * The file can be downloaded via the link https://api.telegram.org/file/bot<token>/<file_path>. - * It is guaranteed that the link will be valid for at least 1 hour. + * It is guaranteed that the link will be valid for at least 1 hour. * When the link expires, a new one can be requested by calling getFile. * Maximum file size to download is 20 MB - * + * * @ingroup types */ class File { diff --git a/include/tgbot/types/ForceReply.h b/include/tgbot/types/ForceReply.h index f1bf5da..f903e33 100644 --- a/include/tgbot/types/ForceReply.h +++ b/include/tgbot/types/ForceReply.h @@ -1,25 +1,3 @@ -/* - * Copyright (c) 2015 Oleg Morozenkov - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - #ifndef TGBOT_CPP_FORCEREPLY_H #define TGBOT_CPP_FORCEREPLY_H @@ -31,12 +9,12 @@ namespace TgBot { /** * @brief Upon receiving a message with this object, Telegram clients will display a reply interface to the user (act as if the user has selected the bot‘s message and tapped ’Reply'). This can be extremely useful if you want to create user-friendly step-by-step interfaces without having to sacrifice privacy mode. - * + * * Example: A poll bot for groups runs in privacy mode (only receives commands, replies to its messages and mentions). There could be two ways to create a new poll: * Explain the user how to send a command with parameters (e.g. /newpoll question answer1 answer2). May be appealing for hardcore users but lacks modern day polish. * Guide the user through a step-by-step process. ‘Please send me your question’, ‘Cool, now let’s add the first answer option‘, ’Great. Keep adding answer options, then send /done when you‘re ready’. * The last option is definitely more attractive. And if you use ForceReply in your bot‘s questions, it will receive the user’s answers even if it only receives replies, commands and mentions — without any extra work for the user. - * + * * @ingroup types */ class ForceReply : public GenericReply { diff --git a/include/tgbot/types/Game.h b/include/tgbot/types/Game.h index acbd20a..a613b7d 100644 --- a/include/tgbot/types/Game.h +++ b/include/tgbot/types/Game.h @@ -1,26 +1,3 @@ -/* - * Copyright (c) 2015 Oleg Morozenkov - * Copyright (c) 2018 JellyBrick - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - #ifndef TGBOT_GAME_H #define TGBOT_GAME_H @@ -36,9 +13,9 @@ namespace TgBot { /** * @brief This object represents a game. - * + * * Use BotFather to create and edit games, their short names will act as unique identifiers. - * + * * @ingroup types */ class Game { @@ -79,4 +56,4 @@ public: }; } -#endif //TGBOT_GAME_H
\ No newline at end of file +#endif //TGBOT_GAME_H diff --git a/include/tgbot/types/GameHighScore.h b/include/tgbot/types/GameHighScore.h index 1b91e96..db093b2 100644 --- a/include/tgbot/types/GameHighScore.h +++ b/include/tgbot/types/GameHighScore.h @@ -1,26 +1,3 @@ -/* - * Copyright (c) 2015 Oleg Morozenkov - * Copyright (c) 2018 JellyBrick - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - #ifndef TGBOT_GAMEHIGHSCORE_H #define TGBOT_GAMEHIGHSCORE_H @@ -34,7 +11,7 @@ namespace TgBot { /** * @brief This object represents one row of the high scores table for a game. - * + * * @ingroup types */ class GameHighScore { @@ -58,4 +35,4 @@ public: }; } -#endif //TGBOT_GAMEHIGHSCORE_H
\ No newline at end of file +#endif //TGBOT_GAMEHIGHSCORE_H diff --git a/include/tgbot/types/GenericReply.h b/include/tgbot/types/GenericReply.h index 83d28ab..e86e112 100644 --- a/include/tgbot/types/GenericReply.h +++ b/include/tgbot/types/GenericReply.h @@ -1,25 +1,3 @@ -/* - * Copyright (c) 2015 Oleg Morozenkov - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - #ifndef TGBOT_CPP_GENERICREPLY_H #define TGBOT_CPP_GENERICREPLY_H diff --git a/include/tgbot/types/InlineKeyboardButton.h b/include/tgbot/types/InlineKeyboardButton.h index f274825..a987993 100644 --- a/include/tgbot/types/InlineKeyboardButton.h +++ b/include/tgbot/types/InlineKeyboardButton.h @@ -1,7 +1,3 @@ -// -// Created by Andrea Giove on 17/04/16. -// - #ifndef TGBOT_INLINEKEYBOARDBUTTON_H #define TGBOT_INLINEKEYBOARDBUTTON_H @@ -15,7 +11,7 @@ namespace TgBot { /** * @brief This object represents one button of an inline keyboard. You must use exactly one of the optional fields. - * + * * @ingroup types */ class InlineKeyboardButton { diff --git a/include/tgbot/types/InlineKeyboardMarkup.h b/include/tgbot/types/InlineKeyboardMarkup.h index e1d2994..7ace724 100644 --- a/include/tgbot/types/InlineKeyboardMarkup.h +++ b/include/tgbot/types/InlineKeyboardMarkup.h @@ -1,7 +1,3 @@ -// -// Created by Andrea Giove on 17/04/16. -// - #ifndef TGBOT_INLINEKEYBOARDMARKUP_H #define TGBOT_INLINEKEYBOARDMARKUP_H @@ -15,7 +11,7 @@ namespace TgBot { /** * @brief This object represents an inline keyboard that appears right next to the message it belongs to. - * + * * @ingroup types */ class InlineKeyboardMarkup : public GenericReply { diff --git a/include/tgbot/types/InlineQuery.h b/include/tgbot/types/InlineQuery.h index 790711a..1a5ea76 100644 --- a/include/tgbot/types/InlineQuery.h +++ b/include/tgbot/types/InlineQuery.h @@ -1,7 +1,3 @@ -// -// Created by Andrea Giove on 26/03/16. -// - #ifndef TGBOT_INLINEQUERY_H #define TGBOT_INLINEQUERY_H @@ -15,7 +11,7 @@ namespace TgBot { /** * @brief This object represents an incoming inline query. - * + * * @ingroup types */ class InlineQuery { diff --git a/include/tgbot/types/InlineQueryResult.h b/include/tgbot/types/InlineQueryResult.h index 10153a1..c5ab06b 100644 --- a/include/tgbot/types/InlineQueryResult.h +++ b/include/tgbot/types/InlineQueryResult.h @@ -1,7 +1,3 @@ -// -// Created by Andrea Giove on 26/03/16. -// - #ifndef TGBOT_INLINEQUERYRESULT_H #define TGBOT_INLINEQUERYRESULT_H @@ -15,7 +11,7 @@ namespace TgBot { /** * @brief This abstract class is base of all inline query results. - * + * * @ingroup types */ class InlineQueryResult { diff --git a/include/tgbot/types/InlineQueryResultArticle.h b/include/tgbot/types/InlineQueryResultArticle.h index bb7ddc6..1ff523d 100644 --- a/include/tgbot/types/InlineQueryResultArticle.h +++ b/include/tgbot/types/InlineQueryResultArticle.h @@ -1,7 +1,3 @@ -// -// Created by Andrea Giove on 26/03/16. -// - #ifndef TGBOT_INLINEQUERYRESULTARTICLE_H #define TGBOT_INLINEQUERYRESULTARTICLE_H @@ -14,7 +10,7 @@ namespace TgBot { /** * @brief Represents a link to an article of web page. - * + * * @ingroup types */ class InlineQueryResultArticle : public InlineQueryResult { diff --git a/include/tgbot/types/InlineQueryResultAudio.h b/include/tgbot/types/InlineQueryResultAudio.h index 016875c..0a65f7f 100644 --- a/include/tgbot/types/InlineQueryResultAudio.h +++ b/include/tgbot/types/InlineQueryResultAudio.h @@ -1,7 +1,3 @@ -// -// Created by Konstantin Kukin on 27/12/16 -// - #ifndef TGBOT_INLINEQUERYRESULTAUDIO_H #define TGBOT_INLINEQUERYRESULTAUDIO_H @@ -14,7 +10,7 @@ namespace TgBot { /** * @brief Represents a link to an mp3 audio file. - * + * * @ingroup types */ class InlineQueryResultAudio : public InlineQueryResult { diff --git a/include/tgbot/types/InlineQueryResultCachedAudio.h b/include/tgbot/types/InlineQueryResultCachedAudio.h index ba6ba4c..50d489d 100644 --- a/include/tgbot/types/InlineQueryResultCachedAudio.h +++ b/include/tgbot/types/InlineQueryResultCachedAudio.h @@ -1,7 +1,3 @@ -// -// Created by Konstantin Kukin on 27/12/16. -// - #ifndef TGBOT_INLINEQUERYRESULTCACHEDAUDIO_H #define TGBOT_INLINEQUERYRESULTCACHEDAUDIO_H @@ -13,8 +9,8 @@ namespace TgBot { /** - * @brief Represents a link to an mp3 audio file stored on the Telegram servers. - * + * @brief Represents a link to an mp3 audio file stored on the Telegram servers. + * * @ingroup types */ class InlineQueryResultCachedAudio : public InlineQueryResult { diff --git a/include/tgbot/types/InlineQueryResultCachedDocument.h b/include/tgbot/types/InlineQueryResultCachedDocument.h index 29086c3..dfdb9a6 100644 --- a/include/tgbot/types/InlineQueryResultCachedDocument.h +++ b/include/tgbot/types/InlineQueryResultCachedDocument.h @@ -1,7 +1,3 @@ -// -// Created by Konstantin Kukin on 27/12/16. -// - #ifndef TGBOT_INLINEQUERYRESULTCACHEDDOCUMENT_H #define TGBOT_INLINEQUERYRESULTCACHEDDOCUMENT_H @@ -14,7 +10,7 @@ namespace TgBot { /** * @brief Represents a link to a file stored on the Telegram servers. - * + * * @ingroup types */ class InlineQueryResultCachedDocument : public InlineQueryResult { diff --git a/include/tgbot/types/InlineQueryResultCachedGif.h b/include/tgbot/types/InlineQueryResultCachedGif.h index 85b309b..ddc433b 100644 --- a/include/tgbot/types/InlineQueryResultCachedGif.h +++ b/include/tgbot/types/InlineQueryResultCachedGif.h @@ -1,7 +1,3 @@ -// -// Created by Konstantin Kukin on 27/12/16. -// - #ifndef TGBOT_INLINEQUERYRESULTCACHEDGIF_H #define TGBOT_INLINEQUERYRESULTCACHEDGIF_H @@ -14,7 +10,7 @@ namespace TgBot { /** * @brief Represents a link to an animated GIF file stored on the Telegram servers. - * + * * @ingroup types */ class InlineQueryResultCachedGif : public InlineQueryResult { diff --git a/include/tgbot/types/InlineQueryResultCachedMpeg4Gif.h b/include/tgbot/types/InlineQueryResultCachedMpeg4Gif.h index 8f75763..195fb80 100644 --- a/include/tgbot/types/InlineQueryResultCachedMpeg4Gif.h +++ b/include/tgbot/types/InlineQueryResultCachedMpeg4Gif.h @@ -1,7 +1,3 @@ -// -// Created by Konstantin Kukin on 27/12/16. -// - #ifndef TGBOT_INLINEQUERYRESULTCACHEDMPEG4GIF_H #define TGBOT_INLINEQUERYRESULTCACHEDMPEG4GIF_H @@ -14,7 +10,7 @@ namespace TgBot { /** * @brief Represents a link to a video animation (H.264/MPEG-4 AVC video without sound) stored on the Telegram servers. - * + * * @ingroup types */ class InlineQueryResultCachedMpeg4Gif : public InlineQueryResult { diff --git a/include/tgbot/types/InlineQueryResultCachedPhoto.h b/include/tgbot/types/InlineQueryResultCachedPhoto.h index ed190f2..7f2c6e1 100644 --- a/include/tgbot/types/InlineQueryResultCachedPhoto.h +++ b/include/tgbot/types/InlineQueryResultCachedPhoto.h @@ -1,7 +1,3 @@ -// -// Created by Konstantin Kukin on 27/12/16. -// - #ifndef TGBOT_INLINEQUERYRESULTCACHEDPHOTO_H #define TGBOT_INLINEQUERYRESULTCACHEDPHOTO_H @@ -14,7 +10,7 @@ namespace TgBot { /** * @brief Represents a link to a photo stored on the Telegram servers. - * + * * @ingroup types */ class InlineQueryResultCachedPhoto : public InlineQueryResult { diff --git a/include/tgbot/types/InlineQueryResultCachedSticker.h b/include/tgbot/types/InlineQueryResultCachedSticker.h index 42474d1..d9865cc 100644 --- a/include/tgbot/types/InlineQueryResultCachedSticker.h +++ b/include/tgbot/types/InlineQueryResultCachedSticker.h @@ -1,7 +1,3 @@ -// -// Created by Konstantin Kukin on 27/12/16. -// - #ifndef TGBOT_INLINEQUERYRESULTCACHEDSTICKER_H #define TGBOT_INLINEQUERYRESULTCACHEDSTICKER_H diff --git a/include/tgbot/types/InlineQueryResultCachedVideo.h b/include/tgbot/types/InlineQueryResultCachedVideo.h index 67c9b95..a80a2c7 100644 --- a/include/tgbot/types/InlineQueryResultCachedVideo.h +++ b/include/tgbot/types/InlineQueryResultCachedVideo.h @@ -1,7 +1,3 @@ -// -// Created by Konstantin Kukin on 27/12/16. -// - #ifndef TGBOT_INLINEQUERYRESULTCACHEDVIDEO_H #define TGBOT_INLINEQUERYRESULTCACHEDVIDEO_H @@ -13,7 +9,7 @@ namespace TgBot { /** - * @brief Represents a link to a video file stored on the Telegram servers. + * @brief Represents a link to a video file stored on the Telegram servers. * * @ingroup types */ diff --git a/include/tgbot/types/InlineQueryResultCachedVoice.h b/include/tgbot/types/InlineQueryResultCachedVoice.h index 679aae6..8a9bca8 100644 --- a/include/tgbot/types/InlineQueryResultCachedVoice.h +++ b/include/tgbot/types/InlineQueryResultCachedVoice.h @@ -1,7 +1,3 @@ -// -// Created by Konstantin Kukin on 27/12/16. -// - #ifndef TGBOT_INLINEQUERYRESULTCACHEDVOICE_H #define TGBOT_INLINEQUERYRESULTCACHEDVOICE_H @@ -14,7 +10,7 @@ namespace TgBot { /** * @brief Represents a link to a voice message stored on the Telegram servers. - * + * * @ingroup types */ class InlineQueryResultCachedVoice : public InlineQueryResult { diff --git a/include/tgbot/types/InlineQueryResultContact.h b/include/tgbot/types/InlineQueryResultContact.h index 3f18a2a..1e7a285 100644 --- a/include/tgbot/types/InlineQueryResultContact.h +++ b/include/tgbot/types/InlineQueryResultContact.h @@ -1,7 +1,3 @@ -// -// Created by Konstantin Kukin on 27/12/16 -// - #ifndef TGBOT_INLINEQUERYRESULTCONTACT_H #define TGBOT_INLINEQUERYRESULTCONTACT_H @@ -14,7 +10,7 @@ namespace TgBot { /** * @brief Represents a contact with a phone number - * + * * @ingroup types */ class InlineQueryResultContact : public InlineQueryResult { diff --git a/include/tgbot/types/InlineQueryResultDocument.h b/include/tgbot/types/InlineQueryResultDocument.h index 14ea8cd..89934ff 100644 --- a/include/tgbot/types/InlineQueryResultDocument.h +++ b/include/tgbot/types/InlineQueryResultDocument.h @@ -1,7 +1,3 @@ -// -// Created by Konstantin Kukin on 27/12/16 -// - #ifndef TGBOT_INLINEQUERYRESULTDOCUMENT_H #define TGBOT_INLINEQUERYRESULTDOCUMENT_H @@ -14,7 +10,7 @@ namespace TgBot { /** * @brief Represents a link to a file. - * + * * @ingroup types */ class InlineQueryResultDocument : public InlineQueryResult { diff --git a/include/tgbot/types/InlineQueryResultGame.h b/include/tgbot/types/InlineQueryResultGame.h index 83ae8d4..76e544c 100644 --- a/include/tgbot/types/InlineQueryResultGame.h +++ b/include/tgbot/types/InlineQueryResultGame.h @@ -1,7 +1,3 @@ -// -// Created by Konstantin Kukin on 27/12/16 -// - #ifndef TGBOT_INLINEQUERYRESULTGAME_H #define TGBOT_INLINEQUERYRESULTGAME_H @@ -14,7 +10,7 @@ namespace TgBot { /** * @brief Represents a Game. - * + * * @ingroup types */ class InlineQueryResultGame : public InlineQueryResult { diff --git a/include/tgbot/types/InlineQueryResultGif.h b/include/tgbot/types/InlineQueryResultGif.h index 05f5fcf..c335ab4 100644 --- a/include/tgbot/types/InlineQueryResultGif.h +++ b/include/tgbot/types/InlineQueryResultGif.h @@ -1,7 +1,3 @@ -// -// Created by Andrea Giove on 27/03/16. -// - #ifndef TGBOT_INLINEQUERYRESULTGIF_H #define TGBOT_INLINEQUERYRESULTGIF_H @@ -14,7 +10,7 @@ namespace TgBot { /** * @brief Represents a link to an animated GIF file. - * + * * @ingroup types */ class InlineQueryResultGif : public InlineQueryResult { diff --git a/include/tgbot/types/InlineQueryResultLocation.h b/include/tgbot/types/InlineQueryResultLocation.h index f5e0d79..6d74af7 100644 --- a/include/tgbot/types/InlineQueryResultLocation.h +++ b/include/tgbot/types/InlineQueryResultLocation.h @@ -1,7 +1,3 @@ -// -// Created by Konstantin Kukin on 27/12/16 -// - #ifndef TGBOT_INLINEQUERYRESULTLOCATION_H #define TGBOT_INLINEQUERYRESULTLOCATION_H @@ -13,8 +9,8 @@ namespace TgBot { /** - * @brief Represents a location on a map. - * + * @brief Represents a location on a map. + * * @ingroup types */ class InlineQueryResultLocation : public InlineQueryResult { diff --git a/include/tgbot/types/InlineQueryResultMpeg4Gif.h b/include/tgbot/types/InlineQueryResultMpeg4Gif.h index 582ee73..1ffa380 100644 --- a/include/tgbot/types/InlineQueryResultMpeg4Gif.h +++ b/include/tgbot/types/InlineQueryResultMpeg4Gif.h @@ -1,7 +1,3 @@ -// -// Created by Andrea Giove on 27/03/16. -// - #ifndef TGBOT_INLINEQUERYRESULTMPEG4GIF_H #define TGBOT_INLINEQUERYRESULTMPEG4GIF_H @@ -9,7 +5,7 @@ namespace TgBot { /** * @brief Represents a link to a video animation (H.264/MPEG-4 AVC video without sound). - * + * * @ingroup types */ class InlineQueryResultMpeg4Gif : public InlineQueryResult { diff --git a/include/tgbot/types/InlineQueryResultPhoto.h b/include/tgbot/types/InlineQueryResultPhoto.h index 1c1ae1e..310db8e 100644 --- a/include/tgbot/types/InlineQueryResultPhoto.h +++ b/include/tgbot/types/InlineQueryResultPhoto.h @@ -1,7 +1,3 @@ -// -// Created by Andrea Giove on 26/03/16. -// - #ifndef TGBOT_INLINEQUERYRESULTPHOTO_H #define TGBOT_INLINEQUERYRESULTPHOTO_H @@ -14,7 +10,7 @@ namespace TgBot { /** * @brief Represents a link to a photo. - * + * * @ingroup types */ class InlineQueryResultPhoto : public InlineQueryResult { diff --git a/include/tgbot/types/InlineQueryResultVenue.h b/include/tgbot/types/InlineQueryResultVenue.h index 3f58e19..c20cf3d 100644 --- a/include/tgbot/types/InlineQueryResultVenue.h +++ b/include/tgbot/types/InlineQueryResultVenue.h @@ -1,7 +1,3 @@ -// -// Created by Konstantin Kukin on 27/12/16 -// - #ifndef TGBOT_INLINEQUERYRESULTVENUE_H #define TGBOT_INLINEQUERYRESULTVENUE_H @@ -13,8 +9,8 @@ namespace TgBot { /** - * @brief Represents a venue. - * + * @brief Represents a venue. + * * @ingroup types */ class InlineQueryResultVenue : public InlineQueryResult { diff --git a/include/tgbot/types/InlineQueryResultVideo.h b/include/tgbot/types/InlineQueryResultVideo.h index 270867d..bc11f9d 100644 --- a/include/tgbot/types/InlineQueryResultVideo.h +++ b/include/tgbot/types/InlineQueryResultVideo.h @@ -1,7 +1,3 @@ -// -// Created by Andrea Giove on 27/03/16. -// - #ifndef TGBOT_INLINEQUERYRESULTVIDEO_H #define TGBOT_INLINEQUERYRESULTVIDEO_H @@ -9,7 +5,7 @@ namespace TgBot { /** * @brief Represents link to a page containing an embedded video player or a video file. - * + * * @ingroup types */ class InlineQueryResultVideo : public InlineQueryResult { diff --git a/include/tgbot/types/InlineQueryResultVoice.h b/include/tgbot/types/InlineQueryResultVoice.h index ee14fef..f23e661 100644 --- a/include/tgbot/types/InlineQueryResultVoice.h +++ b/include/tgbot/types/InlineQueryResultVoice.h @@ -1,7 +1,3 @@ -// -// Created by Konstantin Kukin on 27/12/16 -// - #ifndef TGBOT_INLINEQUERYRESULTVOICE_H #define TGBOT_INLINEQUERYRESULTVOICE_H @@ -9,7 +5,7 @@ namespace TgBot { /** * @brief Represents link to a page containing an embedded video player or a video file. - * + * * @ingroup types */ class InlineQueryResultVoice : public InlineQueryResult { diff --git a/include/tgbot/types/InputContactMessageContent.h b/include/tgbot/types/InputContactMessageContent.h index 799fa64..f46b704 100644 --- a/include/tgbot/types/InputContactMessageContent.h +++ b/include/tgbot/types/InputContactMessageContent.h @@ -1,7 +1,3 @@ -// -// Created by Konstantin Kukin on 26/12/16. -// - #ifndef TGBOT_INPUTCONTACTMESSAGECONTENT_H #define TGBOT_INPUTCONTACTMESSAGECONTENT_H @@ -12,7 +8,7 @@ namespace TgBot { /** * @brief Represents the content of a contact message to be sent as the result of an inline query. - * + * * @ingroup types */ class InputContactMessageContent : public InputMessageContent { diff --git a/include/tgbot/types/InputFile.h b/include/tgbot/types/InputFile.h index 3161a84..60ee7e7 100644 --- a/include/tgbot/types/InputFile.h +++ b/include/tgbot/types/InputFile.h @@ -1,25 +1,3 @@ -/* - * Copyright (c) 2015 Oleg Morozenkov - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - #ifndef TGBOT_CPP_INPUTFILE_H #define TGBOT_CPP_INPUTFILE_H @@ -31,7 +9,7 @@ namespace TgBot { /** * @brief This object represents the contents of a file to be uploaded. - * + * * @ingroup types */ class InputFile { diff --git a/include/tgbot/types/InputLocationMessageContent.h b/include/tgbot/types/InputLocationMessageContent.h index 4a5f781..6d46c41 100644 --- a/include/tgbot/types/InputLocationMessageContent.h +++ b/include/tgbot/types/InputLocationMessageContent.h @@ -1,7 +1,3 @@ -// -// Created by Konstantin Kukin on 26/12/16. -// - #ifndef TGBOT_INPUTLOCATIONMESSAGECONTENT_H #define TGBOT_INPUTLOCATIONMESSAGECONTENT_H @@ -11,7 +7,7 @@ namespace TgBot { /** * @brief Represents the content of a location message to be sent as the result of an inline query. - * + * * @ingroup types */ class InputLocationMessageContent : public InputMessageContent { diff --git a/include/tgbot/types/InputMedia.h b/include/tgbot/types/InputMedia.h index f9e37ff..4474710 100644 --- a/include/tgbot/types/InputMedia.h +++ b/include/tgbot/types/InputMedia.h @@ -1,27 +1,3 @@ -/* - * Copyright (c) 2015 Oleg Morozenkov - * Copyright (c) 2016 Konstantin Kukin - * Copyright (c) 2018 JellyBrick - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - #ifndef TGBOT_INPUTMEDIA_H #define TGBOT_INPUTMEDIA_H @@ -31,8 +7,8 @@ namespace TgBot { /** - * @brief This object represents the content of a media message to be sent. - * + * @brief This object represents the content of a media message to be sent. + * * @ingroup types */ class InputMedia { @@ -59,7 +35,7 @@ public: /** * @brief Optional. Thumbnail of the file sent. - * + * * The thumbnail should be in JPEG format and less than 200 kB in size. A thumbnail‘s width and height should not exceed 90. Ignored if the file is not uploaded using multipart/form-data. Thumbnails can’t be reused and can be only uploaded as a new file, so you can pass “attach://<file_attach_name>” if the thumbnail was uploaded using multipart/form-data under <file_attach_name>. */ std::string thumb; @@ -73,7 +49,7 @@ public: * @brief Optional. Send Markdown or HTML, if you want Telegram apps to show bold, italic, fixed-width text or inline URLs in the media caption. */ std::string parseMode; - + /** * @brief Optional. Media width */ diff --git a/include/tgbot/types/InputMediaAnimation.h b/include/tgbot/types/InputMediaAnimation.h index 8b3b976..9256b6b 100644 --- a/include/tgbot/types/InputMediaAnimation.h +++ b/include/tgbot/types/InputMediaAnimation.h @@ -1,27 +1,3 @@ -/* - * Copyright (c) 2015 Oleg Morozenkov - * Copyright (c) 2016 Konstantin Kukin - * Copyright (c) 2018 JellyBrick - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - #ifndef TGBOT_INPUTMEDIAANIMATION_H #define TGBOT_INPUTMEDIAANIMATION_H diff --git a/include/tgbot/types/InputMediaAudio.h b/include/tgbot/types/InputMediaAudio.h index 08b21ab..df098b9 100644 --- a/include/tgbot/types/InputMediaAudio.h +++ b/include/tgbot/types/InputMediaAudio.h @@ -1,27 +1,3 @@ -/* - * Copyright (c) 2015 Oleg Morozenkov - * Copyright (c) 2016 Konstantin Kukin - * Copyright (c) 2018 JellyBrick - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - #ifndef TGBOT_INPUTMEDIAAUDIO_H #define TGBOT_INPUTMEDIAAUDIO_H diff --git a/include/tgbot/types/InputMediaDocument.h b/include/tgbot/types/InputMediaDocument.h index a00eabb..4e19f7a 100644 --- a/include/tgbot/types/InputMediaDocument.h +++ b/include/tgbot/types/InputMediaDocument.h @@ -1,27 +1,3 @@ -/* - * Copyright (c) 2015 Oleg Morozenkov - * Copyright (c) 2016 Konstantin Kukin - * Copyright (c) 2018 JellyBrick - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - #ifndef TGBOT_INPUTMEDIADOCUMENT_H #define TGBOT_INPUTMEDIADOCUMENT_H diff --git a/include/tgbot/types/InputMediaPhoto.h b/include/tgbot/types/InputMediaPhoto.h index da9fdcc..f232c5b 100644 --- a/include/tgbot/types/InputMediaPhoto.h +++ b/include/tgbot/types/InputMediaPhoto.h @@ -1,27 +1,3 @@ -/* - * Copyright (c) 2015 Oleg Morozenkov - * Copyright (c) 2016 Konstantin Kukin - * Copyright (c) 2018 JellyBrick - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - #ifndef TGBOT_INPUTMEDIAPHOTO_H #define TGBOT_INPUTMEDIAPHOTO_H diff --git a/include/tgbot/types/InputMediaVideo.h b/include/tgbot/types/InputMediaVideo.h index 4e10885..452878b 100644 --- a/include/tgbot/types/InputMediaVideo.h +++ b/include/tgbot/types/InputMediaVideo.h @@ -1,27 +1,3 @@ -/* - * Copyright (c) 2015 Oleg Morozenkov - * Copyright (c) 2016 Konstantin Kukin - * Copyright (c) 2018 JellyBrick - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - #ifndef TGBOT_INPUTMEDIAVIDEO_H #define TGBOT_INPUTMEDIAVIDEO_H diff --git a/include/tgbot/types/InputMessageContent.h b/include/tgbot/types/InputMessageContent.h index 0dfb1a6..5ecdd92 100644 --- a/include/tgbot/types/InputMessageContent.h +++ b/include/tgbot/types/InputMessageContent.h @@ -1,7 +1,3 @@ -// -// Created by Konstantin Kukin on 26/12/16. -// - #ifndef TGBOT_INPUTMESSAGECONTENT_H #define TGBOT_INPUTMESSAGECONTENT_H diff --git a/include/tgbot/types/InputTextMessageContent.h b/include/tgbot/types/InputTextMessageContent.h index 990128a..88cb718 100644 --- a/include/tgbot/types/InputTextMessageContent.h +++ b/include/tgbot/types/InputTextMessageContent.h @@ -1,7 +1,3 @@ -// -// Created by Konstantin Kukin on 26/12/16. -// - #ifndef TGBOT_INPUTTEXTMESSAGECONTENT_H #define TGBOT_INPUTTEXTMESSAGECONTENT_H @@ -12,7 +8,7 @@ namespace TgBot { /** * @brief Represents the content of a text message to be sent as the result of an inline query. - * + * * @ingroup types */ class InputTextMessageContent : public InputMessageContent { diff --git a/include/tgbot/types/InputVenueMessageContent.h b/include/tgbot/types/InputVenueMessageContent.h index 1f0bea7..360a345 100644 --- a/include/tgbot/types/InputVenueMessageContent.h +++ b/include/tgbot/types/InputVenueMessageContent.h @@ -1,8 +1,3 @@ -// -// Created by Konstantin Kukin on 26/12/16. -// - - #ifndef TGBOT_INPUTVENUEMESSAGECONTENT_H #define TGBOT_INPUTVENUEMESSAGECONTENT_H @@ -48,7 +43,7 @@ public: * @brief Optional. Foursquare identifier of the venue, if known */ std::string foursquareId; - + /** * @brief Optional. Foursquare type of the venue, if known. (For example, “arts_entertainment/default”, “arts_entertainment/aquarium” or “food/icecream”.) */ diff --git a/include/tgbot/types/Invoice.h b/include/tgbot/types/Invoice.h index a279986..933fda1 100644 --- a/include/tgbot/types/Invoice.h +++ b/include/tgbot/types/Invoice.h @@ -1,26 +1,3 @@ -/* - * Copyright (c) 2015 Oleg Morozenkov - * Copyright (c) 2017 Maks Mazurov (fox.cpp) - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - #ifndef TGBOT_INVOICE_H #define TGBOT_INVOICE_H diff --git a/include/tgbot/types/KeyboardButton.h b/include/tgbot/types/KeyboardButton.h index 668cbaa..867d014 100644 --- a/include/tgbot/types/KeyboardButton.h +++ b/include/tgbot/types/KeyboardButton.h @@ -1,7 +1,3 @@ -// -// Created by Konstantin Kukin on 26/12/16. -// - #ifndef TGBOT_CPP_KEYBOARDBUTTON_H #define TGBOT_CPP_KEYBOARDBUTTON_H @@ -12,10 +8,10 @@ namespace TgBot { /** * @brief This object represents one button of the reply keyboard. - * + * * For simple text buttons String can be used instead of this - * object to specify text of the button. Optional fields are mutually exclusive. - * + * object to specify text of the button. Optional fields are mutually exclusive. + * * @ingroup types */ class KeyboardButton { @@ -36,7 +32,7 @@ public: bool requestContact = false; /** - * @brief Optional. If True, the user's current location will be sent when the button is pressed. Available in private chats only. + * @brief Optional. If True, the user's current location will be sent when the button is pressed. Available in private chats only. */ bool requestLocation = false; }; diff --git a/include/tgbot/types/LabeledPrice.h b/include/tgbot/types/LabeledPrice.h index bf9fb28..b41d4fd 100644 --- a/include/tgbot/types/LabeledPrice.h +++ b/include/tgbot/types/LabeledPrice.h @@ -1,7 +1,3 @@ -// -// Created by Maks Mazurov (fox.cpp) on 21.05.17. -// - #ifndef TGBOT_LABELEDPRICE_H #define TGBOT_LABELEDPRICE_H diff --git a/include/tgbot/types/Location.h b/include/tgbot/types/Location.h index 7d0f369..1487762 100644 --- a/include/tgbot/types/Location.h +++ b/include/tgbot/types/Location.h @@ -1,25 +1,3 @@ -/* - * Copyright (c) 2015 Oleg Morozenkov - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - #ifndef TGBOT_CPP_LOCATION_H #define TGBOT_CPP_LOCATION_H @@ -29,7 +7,7 @@ namespace TgBot { /** * @brief This object represents a point on the map. - * + * * @ingroup types */ class Location { diff --git a/include/tgbot/types/LoginUrl.h b/include/tgbot/types/LoginUrl.h index 1627399..6b29e5d 100644 --- a/include/tgbot/types/LoginUrl.h +++ b/include/tgbot/types/LoginUrl.h @@ -1,7 +1,3 @@ -// -// Created by alexandrumarcel on 19.11.2019. -// - #ifndef TGBOT_CPP_LOGINURL_H #define TGBOT_CPP_LOGINURL_H diff --git a/include/tgbot/types/MaskPosition.h b/include/tgbot/types/MaskPosition.h index 6898d76..3bb7e0a 100644 --- a/include/tgbot/types/MaskPosition.h +++ b/include/tgbot/types/MaskPosition.h @@ -1,26 +1,3 @@ -/* - * Copyright (c) 2015 Oleg Morozenkov - * Copyright (c) 2018 JellyBrick - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - #ifndef TGBOT_MARKPOSITION_H #define TGBOT_MARKPOSITION_H @@ -31,7 +8,7 @@ namespace TgBot { /** * @brief This object describes the position on faces where a mask should be placed by default. - * + * * @ingroup types */ class MaskPosition { @@ -60,4 +37,4 @@ public: }; } -#endif //TGBOT_MARKPOSITION_H
\ No newline at end of file +#endif //TGBOT_MARKPOSITION_H diff --git a/include/tgbot/types/Message.h b/include/tgbot/types/Message.h index 9e831bc..f931c67 100644 --- a/include/tgbot/types/Message.h +++ b/include/tgbot/types/Message.h @@ -1,25 +1,3 @@ -/* - * Copyright (c) 2015 Oleg Morozenkov - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - #ifndef TGBOT_CPP_MESSAGE_H #define TGBOT_CPP_MESSAGE_H @@ -51,7 +29,7 @@ namespace TgBot { /** * @brief This object represents a message. - * + * * @ingroup types */ class Message { @@ -150,7 +128,7 @@ public: /** * @brief Optional. Message is an animation, information about the animation. - * + * * For backward compatibility, when this field is set, the document field will also be set. */ Animation::Ptr animation; diff --git a/include/tgbot/types/MessageEntity.h b/include/tgbot/types/MessageEntity.h index 530011b..ab4c489 100644 --- a/include/tgbot/types/MessageEntity.h +++ b/include/tgbot/types/MessageEntity.h @@ -1,7 +1,3 @@ -// -// Created by Andrea Giove on 17/04/16. -// - #ifndef TGBOT_MESSAGEENTITY_H #define TGBOT_MESSAGEENTITY_H @@ -13,7 +9,7 @@ namespace TgBot { /** * @brief This object represents one special entity in a text message. For example, hashtags, usernames, URLs, etc. - * + * * @ingroup types */ class MessageEntity { @@ -22,7 +18,7 @@ public: /** * @brief Type of the entity. - * + * * Can be mention (@username), hashtag, cashtag, bot_command, url, email, phone_number, bold (bold text), italic (italic text), code (monowidth string), pre (monowidth block), text_link (for clickable text URLs), text_mention (for users without usernames) */ std::string type; diff --git a/include/tgbot/types/OrderInfo.h b/include/tgbot/types/OrderInfo.h index 45c3d75..bf33acb 100644 --- a/include/tgbot/types/OrderInfo.h +++ b/include/tgbot/types/OrderInfo.h @@ -1,26 +1,3 @@ -/* - * Copyright (c) 2015 Oleg Morozenkov - * Copyright (c) 2017 Maks Mazurov (fox.cpp) - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - #ifndef TGBOT_ORDERINFO_H #define TGBOT_ORDERINFO_H @@ -32,9 +9,9 @@ namespace TgBot { /** * @brief This object represents information about an order. - * + * * https://core.telegram.org/bots/api#orderinfo - * + * * @ingroup types */ class OrderInfo { diff --git a/include/tgbot/types/PhotoSize.h b/include/tgbot/types/PhotoSize.h index 7a3cb80..04a08b6 100644 --- a/include/tgbot/types/PhotoSize.h +++ b/include/tgbot/types/PhotoSize.h @@ -1,25 +1,3 @@ -/* - * Copyright (c) 2015 Oleg Morozenkov - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - #ifndef TGBOT_CPP_PHOTOSIZE_H #define TGBOT_CPP_PHOTOSIZE_H @@ -30,7 +8,7 @@ namespace TgBot { /** * @brief This object represents one size of a photo or a file / sticker thumbnail. - * + * * @ingroup types */ class PhotoSize { diff --git a/include/tgbot/types/Poll.h b/include/tgbot/types/Poll.h index e218997..a2c2fe7 100644 --- a/include/tgbot/types/Poll.h +++ b/include/tgbot/types/Poll.h @@ -1,25 +1,3 @@ -/* - * Copyright (c) 2019 Nitan Alexandru Marcel - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - #ifndef TGBOT_POLL_H #define TGBOT_POLL_H diff --git a/include/tgbot/types/PollOption.h b/include/tgbot/types/PollOption.h index 0d87870..f7680ff 100644 --- a/include/tgbot/types/PollOption.h +++ b/include/tgbot/types/PollOption.h @@ -1,25 +1,3 @@ -/* - * Copyright (c) 2019 Nitan Alexandru Marcel - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - #include <memory> #include <string> #include <vector> diff --git a/include/tgbot/types/PreCheckoutQuery.h b/include/tgbot/types/PreCheckoutQuery.h index 7282b3b..fdd91ea 100644 --- a/include/tgbot/types/PreCheckoutQuery.h +++ b/include/tgbot/types/PreCheckoutQuery.h @@ -1,26 +1,3 @@ -/* - * Copyright (c) 2015 Oleg Morozenkov - * Copyright (c) 2017 Maks Mazurov (fox.cpp) - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - #ifndef TGBOT_PRECHECKOUTQUERY_H #define TGBOT_PRECHECKOUTQUERY_H @@ -36,7 +13,7 @@ namespace TgBot { * @brief This object contains information about an incoming pre-checkout query. * * https://core.telegram.org/bots/api#precheckoutquery - * + * * @ingroup types */ class PreCheckoutQuery { @@ -55,18 +32,18 @@ public: /** * @brief Three-letter ISO 4217 currency code. - */ + */ std::string currency; - /** + /** * @brief Total price in the smallest units of the currency (integer, - * not float/double). - * - * For example, for a price of US$ 1.45 pass + * not float/double). + * + * For example, for a price of US$ 1.45 pass * amount = 145. See the exp parameter in currencies.json, it shows * the number of digits past the decimal point for each currency (2 * for the majority of currencies). - * + * * https://core.telegram.org/bots/payments/currencies.json */ int32_t totalAmount; diff --git a/include/tgbot/types/ReplyKeyboardMarkup.h b/include/tgbot/types/ReplyKeyboardMarkup.h index f857003..567693d 100644 --- a/include/tgbot/types/ReplyKeyboardMarkup.h +++ b/include/tgbot/types/ReplyKeyboardMarkup.h @@ -1,25 +1,3 @@ -/* - * Copyright (c) 2015 Oleg Morozenkov - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - #ifndef TGBOT_CPP_REPLYKEYBOARDMARKUP_H #define TGBOT_CPP_REPLYKEYBOARDMARKUP_H @@ -34,7 +12,7 @@ namespace TgBot { /** * @brief This object represents a custom keyboard with reply options. - * + * * @ingroup types */ class ReplyKeyboardMarkup : public GenericReply { diff --git a/include/tgbot/types/ReplyKeyboardRemove.h b/include/tgbot/types/ReplyKeyboardRemove.h index 6b75b60..e43bb22 100644 --- a/include/tgbot/types/ReplyKeyboardRemove.h +++ b/include/tgbot/types/ReplyKeyboardRemove.h @@ -1,7 +1,3 @@ -// -// Created by Konstantin Kukin on 26/12/16. -// - #ifndef TGBOT_CPP_REPLYKEYBOARDREMOVE_H #define TGBOT_CPP_REPLYKEYBOARDREMOVE_H @@ -13,10 +9,10 @@ namespace TgBot { /** * @brief Upon receiving a message with this object, Telegram clients will remove the current custom keyboard and display the default letter-keyboard. - * + * * By default, custom keyboards are displayed until a new keyboard is sent by a bot. An exception is made for one-time keyboards that are hidden * immediately after the user presses a button (see ReplyKeyboardMarkup). - * + * * @ingroup types */ class ReplyKeyboardRemove : public GenericReply { diff --git a/include/tgbot/types/ResponseParameters.h b/include/tgbot/types/ResponseParameters.h index a9b73b7..c6da35f 100644 --- a/include/tgbot/types/ResponseParameters.h +++ b/include/tgbot/types/ResponseParameters.h @@ -1,7 +1,3 @@ -// -// Created by Konstantin Kukin on 26/12/16. -// - #ifndef TGBOT_RESPONSEPARAMETERS_H #define TGBOT_RESPONSEPARAMETERS_H @@ -11,7 +7,7 @@ namespace TgBot { /** * @brief Contains information about why a request was unsuccessfull. - * + * * @ingroup types */ class ResponseParameters { diff --git a/include/tgbot/types/ShippingAddress.h b/include/tgbot/types/ShippingAddress.h index 97ac33f..68efb4c 100644 --- a/include/tgbot/types/ShippingAddress.h +++ b/include/tgbot/types/ShippingAddress.h @@ -1,26 +1,3 @@ -/* - * Copyright (c) 2015 Oleg Morozenkov - * Copyright (c) 2017 Maks Mazurov (fox.cpp) - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - #ifndef TGBOT_SHIPPINGADDRESS_H #define TGBOT_SHIPPINGADDRESS_H @@ -31,9 +8,9 @@ namespace TgBot { /** * @brief This object represents a shipping address. - * + * * https://core.telegram.org/bots/api#shippingaddress - * + * * @ingroup types */ class ShippingAddress { diff --git a/include/tgbot/types/ShippingOption.h b/include/tgbot/types/ShippingOption.h index a946681..14411eb 100644 --- a/include/tgbot/types/ShippingOption.h +++ b/include/tgbot/types/ShippingOption.h @@ -1,7 +1,3 @@ -// -// Created by Maks Mazurov (fox.cpp) on 21.05.17. -// - #ifndef TGBOT_SHIPPINGOPTION_H #define TGBOT_SHIPPINGOPTION_H @@ -15,8 +11,8 @@ namespace TgBot { /** * @brief This object represents one shipping option. * - * https://core.telegram.org/bots/api#shippingoption - * + * https://core.telegram.org/bots/api#shippingoption + * * @ingroup types */ class ShippingOption { diff --git a/include/tgbot/types/ShippingQuery.h b/include/tgbot/types/ShippingQuery.h index 47c20d8..61c938b 100644 --- a/include/tgbot/types/ShippingQuery.h +++ b/include/tgbot/types/ShippingQuery.h @@ -1,26 +1,3 @@ -/* - * Copyright (c) 2015 Oleg Morozenkov - * Copyright (c) 2017 Maks Mazurov (fox.cpp) - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - #ifndef TGBOT_SHIPPINGQUERY_H #define TGBOT_SHIPPINGQUERY_H @@ -36,7 +13,7 @@ namespace TgBot { * @brief This object contains information about an incoming shipping query. * * https://core.telegram.org/bots/api#shippingquery - * + * * @ingroup types */ class ShippingQuery { diff --git a/include/tgbot/types/Sticker.h b/include/tgbot/types/Sticker.h index 68fc574..548cc26 100644 --- a/include/tgbot/types/Sticker.h +++ b/include/tgbot/types/Sticker.h @@ -1,25 +1,3 @@ -/* - * Copyright (c) 2015 Oleg Morozenkov - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - #ifndef TGBOT_CPP_STICKER_H #define TGBOT_CPP_STICKER_H @@ -33,7 +11,7 @@ namespace TgBot { /** * @brief This object represents a general file (as opposed to photos and audio files). - * + * * @ingroup types */ class Sticker { diff --git a/include/tgbot/types/StickerSet.h b/include/tgbot/types/StickerSet.h index deddf74..c9b823b 100644 --- a/include/tgbot/types/StickerSet.h +++ b/include/tgbot/types/StickerSet.h @@ -1,26 +1,3 @@ -/* - * Copyright (c) 2015 Oleg Morozenkov - * Copyright (c) 2018 JellyBrick - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - #ifndef TGBOT_STICKERSET_H #define TGBOT_STICKERSET_H @@ -34,7 +11,7 @@ namespace TgBot { /** * @brief This object represents a sticker set. - * + * * @ingroup types */ class StickerSet { @@ -68,4 +45,4 @@ public: }; } -#endif //TGBOT_STICKERSET_H
\ No newline at end of file +#endif //TGBOT_STICKERSET_H diff --git a/include/tgbot/types/SuccessfulPayment.h b/include/tgbot/types/SuccessfulPayment.h index ed96e8b..ca8ef47 100644 --- a/include/tgbot/types/SuccessfulPayment.h +++ b/include/tgbot/types/SuccessfulPayment.h @@ -1,26 +1,3 @@ -/* - * Copyright (c) 2015 Oleg Morozenkov - * Copyright (c) 2017 Maks Mazurov (fox.cpp) - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - #ifndef TGBOT_SUCCESSFULPAYMENT_H #define TGBOT_SUCCESSFULPAYMENT_H @@ -35,7 +12,7 @@ namespace TgBot { * @brief This object contains basic information about a successful payment. * * https://core.telegram.org/bots/api#successfulpayment - * + * * @ingroup types */ class SuccessfulPayment { @@ -47,15 +24,15 @@ public: */ std::string currency; - /** + /** * @brief Total price in the smallest units of the currency (integer, - * not float/double). - * - * For example, for a price of US$ 1.45 pass + * not float/double). + * + * For example, for a price of US$ 1.45 pass * amount = 145. See the exp parameter in currencies.json, it shows * the number of digits past the decimal point for each currency (2 * for the majority of currencies). - * + * * https://core.telegram.org/bots/payments/currencies.json */ int32_t totalAmount; diff --git a/include/tgbot/types/Update.h b/include/tgbot/types/Update.h index 0c0eb0e..81caab4 100644 --- a/include/tgbot/types/Update.h +++ b/include/tgbot/types/Update.h @@ -1,25 +1,3 @@ -/* - * Copyright (c) 2015 Oleg Morozenkov - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - #ifndef TGBOT_CPP_UPDATE_H #define TGBOT_CPP_UPDATE_H @@ -36,7 +14,7 @@ namespace TgBot { /** * @brief This object represents an incoming update. - * + * * @ingroup types */ class Update { diff --git a/include/tgbot/types/User.h b/include/tgbot/types/User.h index 0b1dc5b..7f5a713 100644 --- a/include/tgbot/types/User.h +++ b/include/tgbot/types/User.h @@ -1,25 +1,3 @@ -/* - * Copyright (c) 2015 Oleg Morozenkov - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - #ifndef TGBOT_CPP_USER_H #define TGBOT_CPP_USER_H @@ -30,7 +8,7 @@ namespace TgBot { /** * @brief This object represents a Telegram user or bot. - * + * * @ingroup types */ class User { diff --git a/include/tgbot/types/UserProfilePhotos.h b/include/tgbot/types/UserProfilePhotos.h index 0c21a15..9f52358 100644 --- a/include/tgbot/types/UserProfilePhotos.h +++ b/include/tgbot/types/UserProfilePhotos.h @@ -1,25 +1,3 @@ -/* - * Copyright (c) 2015 Oleg Morozenkov - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - #ifndef TGBOT_CPP_USERPROFILEPHOTOS_H #define TGBOT_CPP_USERPROFILEPHOTOS_H @@ -32,7 +10,7 @@ namespace TgBot { /** * @brief This object represent a user's profile pictures. - * + * * @ingroup types */ class UserProfilePhotos { diff --git a/include/tgbot/types/Venue.h b/include/tgbot/types/Venue.h index cc52314..3192662 100644 --- a/include/tgbot/types/Venue.h +++ b/include/tgbot/types/Venue.h @@ -1,7 +1,3 @@ -// -// Created by Andrea Giove on 17/04/16. -// - #ifndef TGBOT_VENUE_H #define TGBOT_VENUE_H @@ -14,7 +10,7 @@ namespace TgBot { /** * @brief This object represents a venue. - * + * * @ingroup types */ class Venue { diff --git a/include/tgbot/types/Video.h b/include/tgbot/types/Video.h index 21c9c35..075e7fd 100644 --- a/include/tgbot/types/Video.h +++ b/include/tgbot/types/Video.h @@ -1,25 +1,3 @@ -/* - * Copyright (c) 2015 Oleg Morozenkov - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - #ifndef TGBOT_CPP_VIDEO_H #define TGBOT_CPP_VIDEO_H @@ -32,7 +10,7 @@ namespace TgBot { /** * @brief This object represents a video file. - * + * * @ingroup types */ class Video { diff --git a/include/tgbot/types/VideoNote.h b/include/tgbot/types/VideoNote.h index 0499051..9796739 100644 --- a/include/tgbot/types/VideoNote.h +++ b/include/tgbot/types/VideoNote.h @@ -1,25 +1,3 @@ -/* - * Copyright (c) 2015 Oleg Morozenkov - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - #ifndef TGBOT_CPP_VIDEONOTE_H #define TGBOT_CPP_VIDEONOTE_H @@ -32,7 +10,7 @@ namespace TgBot { /** * @brief This object represents a video message (available in Telegram apps as of v.4.0). - * + * * @ingroup types */ class VideoNote { diff --git a/include/tgbot/types/Voice.h b/include/tgbot/types/Voice.h index d1e1198..e291476 100644 --- a/include/tgbot/types/Voice.h +++ b/include/tgbot/types/Voice.h @@ -1,7 +1,3 @@ -// -// Created by Andrea Giove on 17/04/16. -// - #ifndef TGBOT_VOICE_H #define TGBOT_VOICE_H @@ -12,7 +8,7 @@ namespace TgBot { /** * @brief This object represents a voice note. - * + * * @ingroup types */ class Voice { diff --git a/include/tgbot/types/WebhookInfo.h b/include/tgbot/types/WebhookInfo.h index 00aae2e..fc815c4 100644 --- a/include/tgbot/types/WebhookInfo.h +++ b/include/tgbot/types/WebhookInfo.h @@ -1,7 +1,3 @@ -// -// Created by Konstantin Kukin on 26/12/16. -// - #ifndef TGBOT_WEBHOOKINFO_H #define TGBOT_WEBHOOKINFO_H @@ -13,7 +9,7 @@ namespace TgBot { /** * @brief Contains information about the current status of a webhook. - * + * * @ingroup types */ class WebhookInfo { diff --git a/src/Api.cpp b/src/Api.cpp index 19681f7..8ecd725 100644 --- a/src/Api.cpp +++ b/src/Api.cpp @@ -1,25 +1,3 @@ -/* - * Copyright (c) 2015 Oleg Morozenkov - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - #include "tgbot/Api.h" #include <utility> diff --git a/src/EventHandler.cpp b/src/EventHandler.cpp index d85e0c3..505704d 100644 --- a/src/EventHandler.cpp +++ b/src/EventHandler.cpp @@ -1,7 +1,3 @@ -// -// Created by Oleg Morozenkov on 23.01.17. -// - #include "tgbot/EventHandler.h" #include <algorithm> @@ -51,4 +47,4 @@ void EventHandler::handleMessage(Message::Ptr message) const { } } -}
\ No newline at end of file +} diff --git a/src/TgException.cpp b/src/TgException.cpp index 0c118ec..6ccd3d9 100644 --- a/src/TgException.cpp +++ b/src/TgException.cpp @@ -1,25 +1,3 @@ -/* - * Copyright (c) 2015 Oleg Morozenkov - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - #include "tgbot/TgException.h" namespace TgBot { diff --git a/src/TgTypeParser.cpp b/src/TgTypeParser.cpp index 999dbc1..e002c60 100644 --- a/src/TgTypeParser.cpp +++ b/src/TgTypeParser.cpp @@ -1,25 +1,3 @@ -/* - * Copyright (c) 2015 Oleg Morozenkov - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software", "to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - #include "tgbot/TgTypeParser.h" using namespace std; @@ -806,7 +784,7 @@ string TgTypeParser::parseInputMedia(const InputMedia::Ptr& object) const { case InputMedia::TYPE::AUDIO: appendToJson(result, "type", "audio"); break; - } + } appendToJson(result, "media", object->media); appendToJson(result, "caption", object->caption); appendToJson(result, "parse_mode", object->parseMode); diff --git a/src/net/BoostHttpOnlySslClient.cpp b/src/net/BoostHttpOnlySslClient.cpp index fd69986..d0fde8e 100644 --- a/src/net/BoostHttpOnlySslClient.cpp +++ b/src/net/BoostHttpOnlySslClient.cpp @@ -1,26 +1,3 @@ -/* - * Copyright (c) 2015 Oleg Morozenkov - * Copyright (c) 2018 JellyBrick - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - #include "tgbot/net/BoostHttpOnlySslClient.h" #include <boost/asio/ssl.hpp> diff --git a/src/net/CurlHttpClient.cpp b/src/net/CurlHttpClient.cpp index 8b1aec4..01115e6 100644 --- a/src/net/CurlHttpClient.cpp +++ b/src/net/CurlHttpClient.cpp @@ -1,25 +1,3 @@ -/* - * Copyright (c) 2018 Egor Pugin - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - #ifdef HAVE_CURL #include "tgbot/net/CurlHttpClient.h" diff --git a/src/net/HttpParser.cpp b/src/net/HttpParser.cpp index c4f8215..b83ddf0 100644 --- a/src/net/HttpParser.cpp +++ b/src/net/HttpParser.cpp @@ -1,25 +1,3 @@ -/* - * Copyright (c) 2015 Oleg Morozenkov - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - #include "tgbot/net/HttpParser.h" #include <boost/algorithm/string.hpp> diff --git a/src/net/TgLongPoll.cpp b/src/net/TgLongPoll.cpp index 6af8a62..913ffdf 100644 --- a/src/net/TgLongPoll.cpp +++ b/src/net/TgLongPoll.cpp @@ -1,25 +1,3 @@ -/* - * Copyright (c) 2015 Oleg Morozenkov - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - #include "tgbot/net/TgLongPoll.h" namespace TgBot { diff --git a/src/net/Url.cpp b/src/net/Url.cpp index 1c7aae6..c767b47 100644 --- a/src/net/Url.cpp +++ b/src/net/Url.cpp @@ -1,25 +1,3 @@ -/* - * Copyright (c) 2015 Oleg Morozenkov - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - #include "tgbot/net/Url.h" #include "tgbot/tools/StringTools.h" diff --git a/src/tools/FileTools.cpp b/src/tools/FileTools.cpp index f18b85e..408c710 100644 --- a/src/tools/FileTools.cpp +++ b/src/tools/FileTools.cpp @@ -1,7 +1,3 @@ -// -// Created by Oleg Morozenkov on 25.01.17. -// - #include "tgbot/tools/FileTools.h" #include <fstream> diff --git a/src/tools/StringTools.cpp b/src/tools/StringTools.cpp index 5055d8e..2d2e24c 100644 --- a/src/tools/StringTools.cpp +++ b/src/tools/StringTools.cpp @@ -1,25 +1,3 @@ -/* - * Copyright (c) 2015 Oleg Morozenkov - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - #include "tgbot/tools/StringTools.h" #include <cstdlib> diff --git a/src/types/InlineQueryResult.cpp b/src/types/InlineQueryResult.cpp index 79debe0..3d4ea6e 100644 --- a/src/types/InlineQueryResult.cpp +++ b/src/types/InlineQueryResult.cpp @@ -1,7 +1,3 @@ -// -// Created by Andrea Giove on 27/03/16. -// - #include "tgbot/types/InlineQueryResultCachedAudio.h" #include "tgbot/types/InlineQueryResultCachedDocument.h" #include "tgbot/types/InlineQueryResultCachedGif.h" diff --git a/src/types/InputFile.cpp b/src/types/InputFile.cpp index 94a591b..e0885f0 100644 --- a/src/types/InputFile.cpp +++ b/src/types/InputFile.cpp @@ -1,7 +1,3 @@ -// -// Created by Oleg Morozenkov on 25.01.17. -// - #include "tgbot/types/InputFile.h" #include <fstream> diff --git a/test/main.cpp b/test/main.cpp index e4b12bf..c89e782 100644 --- a/test/main.cpp +++ b/test/main.cpp @@ -1,25 +1,3 @@ -/* - * Copyright (c) 2015 Oleg Morozenkov - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - #define BOOST_TEST_DYN_LINK #define BOOST_TEST_MODULE TgBot diff --git a/test/tgbot/net/HttpParser.cpp b/test/tgbot/net/HttpParser.cpp index 0d588ef..2532623 100644 --- a/test/tgbot/net/HttpParser.cpp +++ b/test/tgbot/net/HttpParser.cpp @@ -1,25 +1,3 @@ -/* - * Copyright (c) 2015 Oleg Morozenkov - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - #include <boost/test/unit_test.hpp> #include <tgbot/net/HttpParser.h> diff --git a/test/tgbot/net/Url.cpp b/test/tgbot/net/Url.cpp index 0974ab6..642dbaa 100644 --- a/test/tgbot/net/Url.cpp +++ b/test/tgbot/net/Url.cpp @@ -1,25 +1,3 @@ -/* - * Copyright (c) 2015 Oleg Morozenkov - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - #include <boost/test/unit_test.hpp> #include <tgbot/net/Url.h> diff --git a/test/tgbot/tools/StringTools.cpp b/test/tgbot/tools/StringTools.cpp index d92fc86..e236566 100644 --- a/test/tgbot/tools/StringTools.cpp +++ b/test/tgbot/tools/StringTools.cpp @@ -1,26 +1,3 @@ -/* - * - * Copyright (c) 2015 Oleg Morozenkov - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - #include <string> #include <vector> diff --git a/test/utils.h b/test/utils.h index 9225b84..e49534e 100644 --- a/test/utils.h +++ b/test/utils.h @@ -1,25 +1,3 @@ -/* - * Copyright (c) 2015 Oleg Morozenkov - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - #ifndef TGBOT_UTILS_H #define TGBOT_UTILS_H |