Compare commits
1 Commits
dev-998000
...
dev-29fd1b
Author | SHA1 | Date | |
---|---|---|---|
29fd1bfb62 |
2
external/solanaceae_message3
vendored
2
external/solanaceae_message3
vendored
Submodule external/solanaceae_message3 updated: f9f70a05b1...96b76dc67f
2
external/solanaceae_message_serializer
vendored
2
external/solanaceae_message_serializer
vendored
Submodule external/solanaceae_message_serializer updated: 1409485ef1...1a3fcc6757
2
external/solanaceae_tox
vendored
2
external/solanaceae_tox
vendored
Submodule external/solanaceae_tox updated: 1d724ef951...560eab1f6c
@ -457,11 +457,11 @@ float ChatGui4::render(float time_delta) {
|
|||||||
if (ImGui::TableNextColumn()) {
|
if (ImGui::TableNextColumn()) {
|
||||||
// TODO: theming for hardcoded values
|
// TODO: theming for hardcoded values
|
||||||
|
|
||||||
if (!msg_reg.all_of<Message::Components::Remote::TimestampReceived>(e)) {
|
if (!msg_reg.all_of<Message::Components::ReceivedBy>(e)) {
|
||||||
// TODO: dedup?
|
// TODO: dedup?
|
||||||
ImGui::TextDisabled("_");
|
ImGui::TextDisabled("_");
|
||||||
} else {
|
} else {
|
||||||
const auto list = msg_reg.get<Message::Components::Remote::TimestampReceived>(e).ts;
|
const auto list = msg_reg.get<Message::Components::ReceivedBy>(e).ts;
|
||||||
// wrongly assumes contacts never get removed from a group
|
// wrongly assumes contacts never get removed from a group
|
||||||
if (sub_contacts != nullptr && list.size() < sub_contacts->size()) {
|
if (sub_contacts != nullptr && list.size() < sub_contacts->size()) {
|
||||||
// if partically delivered
|
// if partically delivered
|
||||||
@ -503,8 +503,8 @@ float ChatGui4::render(float time_delta) {
|
|||||||
ImGui::SameLine();
|
ImGui::SameLine();
|
||||||
|
|
||||||
// TODO: dedup
|
// TODO: dedup
|
||||||
if (msg_reg.all_of<Message::Components::Remote::TimestampRead>(e)) {
|
if (msg_reg.all_of<Message::Components::ReadBy>(e)) {
|
||||||
const auto list = msg_reg.get<Message::Components::Remote::TimestampRead>(e).ts;
|
const auto list = msg_reg.get<Message::Components::ReadBy>(e).ts;
|
||||||
// wrongly assumes contacts never get removed from a group
|
// wrongly assumes contacts never get removed from a group
|
||||||
if (sub_contacts != nullptr && list.size() < sub_contacts->size()) {
|
if (sub_contacts != nullptr && list.size() < sub_contacts->size()) {
|
||||||
// if partially read
|
// if partially read
|
||||||
@ -1053,11 +1053,11 @@ void ChatGui4::renderMessageExtra(Message3Registry& reg, const Message3 e) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// TODO: remove?
|
// TODO: remove?
|
||||||
if (reg.all_of<Message::Components::Remote::TimestampReceived>(e)) {
|
if (reg.all_of<Message::Components::ReceivedBy>(e)) {
|
||||||
std::string synced_by_text {"receivedBy:"};
|
std::string synced_by_text {"receivedBy:"};
|
||||||
const int64_t now_ts_s = int64_t(Message::getTimeMS() / 1000u);
|
const int64_t now_ts_s = int64_t(Message::getTimeMS() / 1000u);
|
||||||
|
|
||||||
for (const auto& [c, syned_ts] : reg.get<Message::Components::Remote::TimestampReceived>(e).ts) {
|
for (const auto& [c, syned_ts] : reg.get<Message::Components::ReceivedBy>(e).ts) {
|
||||||
if (_cr.all_of<Contact::Components::TagSelfStrong>(c)) {
|
if (_cr.all_of<Contact::Components::TagSelfStrong>(c)) {
|
||||||
synced_by_text += "\n sself"; // required (except when synced externally)
|
synced_by_text += "\n sself"; // required (except when synced externally)
|
||||||
} else if (_cr.all_of<Contact::Components::TagSelfWeak>(c)) {
|
} else if (_cr.all_of<Contact::Components::TagSelfWeak>(c)) {
|
||||||
|
@ -134,7 +134,7 @@ ToxFriendFauxOfflineMessaging::dfmc_Ret ToxFriendFauxOfflineMessaging::doFriendM
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (!mr->any_of<
|
if (!mr->any_of<
|
||||||
Message::Components::Remote::TimestampReceived
|
Message::Components::ReceivedBy
|
||||||
>(msg)
|
>(msg)
|
||||||
) {
|
) {
|
||||||
continue; // skip
|
continue; // skip
|
||||||
@ -144,7 +144,7 @@ ToxFriendFauxOfflineMessaging::dfmc_Ret ToxFriendFauxOfflineMessaging::doFriendM
|
|||||||
continue; // not outbound (in private)
|
continue; // not outbound (in private)
|
||||||
}
|
}
|
||||||
|
|
||||||
const auto& ts_received = mr->get<Message::Components::Remote::TimestampReceived>(msg).ts;
|
const auto& ts_received = mr->get<Message::Components::ReceivedBy>(msg).ts;
|
||||||
// not target
|
// not target
|
||||||
if (ts_received.contains(c)) {
|
if (ts_received.contains(c)) {
|
||||||
continue;
|
continue;
|
||||||
|
Reference in New Issue
Block a user