Skip to content
This repository has been archived by the owner on Aug 16, 2024. It is now read-only.

Remove 'Announcement' field from group_config #120

Merged
merged 3 commits into from
Sep 27, 2021
Merged

Remove 'Announcement' field from group_config #120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9ad3cdc
Remove 'Announcement' field from group_config
Numendacil Sep 27, 2021
c8bca4d
small typo fix
Numendacil Sep 27, 2021
1d98ad3
small typo fix
Numendacil Sep 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions include/mirai/defs/group_config.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ namespace Cyan
/**
* @brief 群公告
*/
string Announcement;
// string Announcement;

/**
* @brief 是否允许坦白说
Expand All @@ -46,7 +46,7 @@ namespace Cyan
virtual bool Set(const json& j) override
{
Name = j["name"].get<string>();
Announcement = j["announcement"].get<string>();
// Announcement = j["announcement"].get<string>();
ConfessTalk = j["confessTalk"].get<bool>();
AllowMemberInvite = j["allowMemberInvite"].get<bool>();
AutoApprove = j["autoApprove"].get<bool>();
Expand All @@ -58,7 +58,7 @@ namespace Cyan
{
json j = json::object();
j["name"] = Name;
j["announcement"] = Announcement;
// j["announcement"] = Announcement;
j["confessTalk"] = ConfessTalk;
j["allowMemberInvite"] = AllowMemberInvite;
j["autoApprove"] = AutoApprove;
Expand Down
2 changes: 1 addition & 1 deletion include/mirai/mirai_bot.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ namespace Cyan
* @param withDownloadInfo 获取下载信息(需要较长时间)
* @return GroupFile
*/
GroupFile GetGroupFilById(const GID_t& gid, const string& groupFileId, bool withDownloadInfo = false);
GroupFile GetGroupFileById(const GID_t& gid, const string& groupFileId, bool withDownloadInfo = false);

/**
* @brief 创建群文件夹
Expand Down
2 changes: 1 addition & 1 deletion src/mirai_bot.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -692,7 +692,7 @@ namespace Cyan
return result;
}

GroupFile MiraiBot::GetGroupFilById(const GID_t& gid, const string& groupFileId, bool withDownloadInfo)
GroupFile MiraiBot::GetGroupFileById(const GID_t& gid, const string& groupFileId, bool withDownloadInfo)
{
stringstream api_url;
api_url
Expand Down