diff --git a/packages/missgram/include/missgram.hpp b/packages/missgram/include/missgram.hpp index 32472284..d5c72ff2 100644 --- a/packages/missgram/include/missgram.hpp +++ b/packages/missgram/include/missgram.hpp @@ -2,17 +2,17 @@ namespace missgram { - void db_write(std::string misskey_note, int telegram_message_id); - std::optional db_read(std::string misskey_note); + void db_write(std::string misskey_note, std::int32_t telegram_message_id); + std::optional db_read(std::string misskey_note); - std::optional tg_send(std::string text, std::optional replyId = {}); + std::optional tg_send(std::string text, std::optional replyId = {}); struct Config { std::string Secret; std::string TelegramBotToken; - int TelegramChatId; - int ServerPort; + std::int64_t TelegramChatId; + std::int16_t ServerPort; std::string dbPassword; } inline config; } diff --git a/packages/missgram/src/db.cpp b/packages/missgram/src/db.cpp index ed4c9277..e7323878 100644 --- a/packages/missgram/src/db.cpp +++ b/packages/missgram/src/db.cpp @@ -1,16 +1,16 @@ # include # include -struct Record { std::string misskey_note; int telegram_message_id; }; +struct Record { std::string misskey_note; std::int32_t telegram_message_id; }; -void missgram::db_write(std::string misskey_note, int telegram_message_id) +void missgram::db_write(std::string misskey_note, std::int32_t telegram_message_id) { auto&& conn = sqlgen::postgres::connect ({.user = "missgram", .password = config.dbPassword, .host = "127.0.0.1", .dbname = "missgram"}); sqlgen::write(conn, Record{misskey_note, telegram_message_id}); } -std::optional missgram::db_read(std::string misskey_note) +std::optional missgram::db_read(std::string misskey_note) { using namespace sqlgen::literals; auto&& conn = sqlgen::postgres::connect diff --git a/packages/missgram/src/tg.cpp b/packages/missgram/src/tg.cpp index c39d2fa9..fdad9013 100644 --- a/packages/missgram/src/tg.cpp +++ b/packages/missgram/src/tg.cpp @@ -1,7 +1,7 @@ # include # include -std::optional missgram::tg_send(std::string text, std::optional replyId) +std::optional missgram::tg_send(std::string text, std::optional replyId) { using namespace biu::literals; @@ -25,5 +25,5 @@ std::optional missgram::tg_send(std::string text, std::optional replyI } // 返回消息 ID - if (message) return message->messageId; + if (message) return message->messageId; else return {}; }