tdlight-team/tdlight
tdlight-team/tdlight
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Improve field names of GroupCallParticipantOrder.

Browse Source
This commit is contained in:
levlam 2021-07-12 18:29:55 +03:00
parent 46aa876259
commit 401e5ee3fa
2 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
td/telegram/GroupCallParticipantOrder.cpp
View File

@ -31,13 +31,13 @@ string GroupCallParticipantOrder::get_group_call_participant_order_object() cons
if (!is_valid()) {
return string();
}
return PSTRING() << (has_video ? '1' : '0') << lpad0(to_string(active_date), 10)
<< lpad0(to_string(raise_hand_rating), 19) << lpad0(to_string(joined_date), 10);
return PSTRING() << (has_video_ ? '1' : '0') << lpad0(to_string(active_date_), 10)
<< lpad0(to_string(raise_hand_rating_), 19) << lpad0(to_string(joined_date_), 10);
}
bool operator==(const GroupCallParticipantOrder &lhs, const GroupCallParticipantOrder &rhs) {
return lhs.has_video == rhs.has_video && lhs.active_date == rhs.active_date && lhs.joined_date == rhs.joined_date &&
lhs.raise_hand_rating == rhs.raise_hand_rating;
return lhs.has_video_ == rhs.has_video_ && lhs.active_date_ == rhs.active_date_ &&
lhs.joined_date_ == rhs.joined_date_ && lhs.raise_hand_rating_ == rhs.raise_hand_rating_;
}
bool operator!=(const GroupCallParticipantOrder &lhs, const GroupCallParticipantOrder &rhs) {
@ -45,10 +45,10 @@ bool operator!=(const GroupCallParticipantOrder &lhs, const GroupCallParticipant
}
bool operator<(const GroupCallParticipantOrder &lhs, const GroupCallParticipantOrder &rhs) {
auto lhs_has_video = static_cast<int32>(lhs.has_video);
auto rhs_has_video = static_cast<int32>(rhs.has_video);
return std::tie(lhs_has_video, lhs.active_date, lhs.raise_hand_rating, lhs.joined_date) <
std::tie(rhs_has_video, rhs.active_date, rhs.raise_hand_rating, rhs.joined_date);
auto lhs_has_video_ = static_cast<int32>(lhs.has_video_);
auto rhs_has_video_ = static_cast<int32>(rhs.has_video_);
return std::tie(lhs_has_video_, lhs.active_date_, lhs.raise_hand_rating_, lhs.joined_date_) <
std::tie(rhs_has_video_, rhs.active_date_, rhs.raise_hand_rating_, rhs.joined_date_);
}
bool operator<=(const GroupCallParticipantOrder &lhs, const GroupCallParticipantOrder &rhs) {
@ -65,9 +65,9 @@ bool operator>=(const GroupCallParticipantOrder &lhs, const GroupCallParticipant
StringBuilder &operator<<(StringBuilder &string_builder,
const GroupCallParticipantOrder &group_call_participant_order) {
return string_builder << group_call_participant_order.has_video << '/' << group_call_participant_order.active_date
<< '/' << group_call_participant_order.raise_hand_rating << '/'
<< group_call_participant_order.joined_date;
return string_builder << group_call_participant_order.has_video_ << '/' << group_call_participant_order.active_date_
<< '/' << group_call_participant_order.raise_hand_rating_ << '/'
<< group_call_participant_order.joined_date_;
}
} // namespace td

13
td/telegram/GroupCallParticipantOrder.h
View File

@ -12,10 +12,10 @@
namespace td {
class GroupCallParticipantOrder {
bool has_video = false;
int32 active_date = 0;
int32 joined_date = 0;
int64 raise_hand_rating = 0;
bool has_video_ = false;
int32 active_date_ = 0;
int32 joined_date_ = 0;
int64 raise_hand_rating_ = 0;
friend StringBuilder &operator<<(StringBuilder &string_builder,
const GroupCallParticipantOrder &group_call_participant_order);
@ -28,7 +28,10 @@ class GroupCallParticipantOrder {
GroupCallParticipantOrder() = default;
GroupCallParticipantOrder(bool has_video, int32 active_date, int64 raise_hand_rating, int32 joined_date)
: has_video(has_video), active_date(active_date), joined_date(joined_date), raise_hand_rating(raise_hand_rating) {
: has_video_(has_video)
, active_date_(active_date)
, joined_date_(joined_date)
, raise_hand_rating_(raise_hand_rating) {
}
static GroupCallParticipantOrder min();