This commit is contained in:
aozhiwei 2020-06-24 15:34:34 +08:00
parent 8f80a17088
commit 09d8bbf366
3 changed files with 27 additions and 2 deletions

View File

@ -675,6 +675,9 @@ void Player::FillApplyList(const cs::MFPaging& paging, cs::SMFriendApplyList& re
int start = paging.curr_page() * paging.page_size();
for (auto& pair : apply_hash_) {
if (i >= start && i < start + paging.page_size()) {
if (pair.second->flag == 1) {
continue;
}
TypeConvert::Convert(*pair.second, *respmsg.add_apply_list());
}
++i;
@ -1157,11 +1160,11 @@ void Player::RefreshFriendData()
void Player::RemoveHandledApply()
{
std::vector<long long> handled_idxs;
for (auto& pair : apply_hash_) {
for (auto& pair : apply_hash_) {
if (GetFriendById(pair.second->base_data.account_id)) {
handled_idxs.push_back(pair.first);
}
}
}
for (long long idx : handled_idxs) {
auto itr = apply_hash_.find(idx);
if (itr != apply_hash_.end()) {
@ -1178,6 +1181,25 @@ void Player::RemoveHandledApply()
apply_hash_.erase(itr);
}
}
CombineRepeatApply();
}
void Player::CombineRepeatApply()
{
std::map<std::string, std::vector<FriendApply*>> num_hash;
for (auto& pair : apply_hash_) {
auto itr = num_hash.find(pair.second->base_data.account_id);
if (itr != num_hash.end()) {
itr->second.push_back(pair.second);
} else {
num_hash[pair.second->base_data.account_id] = std::vector<FriendApply*>({pair.second});
}
}
for (auto& pair : num_hash) {
for (size_t i = 0; i + 1 < pair.second.size(); ++i) {
pair.second[i]->flag = 1;
}
}
}
void Player::QueryUserOnline(std::vector<std::string> account_ids)
@ -1247,3 +1269,4 @@ void Player::QueryUserFromDB()
}
}
}

View File

@ -135,6 +135,7 @@ private:
void ClearApplyBySenderId(const std::string& sender_id);
void RefreshFriendData();
void RemoveHandledApply();
void CombineRepeatApply();
void QueryUserOnline(std::vector<std::string> account_ids);
void QueryUserFromDB();

View File

@ -51,6 +51,7 @@ struct FriendApply
long long applyid = 0;
std::string target_id;
BaseUserData base_data;
int flag = 0;
};
struct Event