void/AyuGramDesktop
2
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2025-06-05 06:33:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: don't mark contents read

Browse source 
fix: crash if config is not a valid json
This commit is contained in:
ZavaruKitsu 2023-12-17 22:52:00 +03:00
parent d940dc193e
commit f06747f2a1
2 changed files with 23 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Telegram/SourceFiles/apiwrap.cpp
View file

@ -1318,6 +1318,11 @@ void ApiWrap::migrateFail(not_null<PeerData*> peer, const QString &error) {
void ApiWrap::markContentsRead( void ApiWrap::markContentsRead(
const base::flat_set<not_null<HistoryItem*>> &items) { const base::flat_set<not_null<HistoryItem*>> &items) {
const auto settings = &AyuSettings::getInstance();
if (!settings->sendReadMessages) {
return;
}
auto markedIds = QVector<MTPint>(); auto markedIds = QVector<MTPint>();
auto channelMarkedIds = base::flat_map< auto channelMarkedIds = base::flat_map<
not_null<ChannelData*>, not_null<ChannelData*>,
@ -1352,6 +1357,12 @@ void ApiWrap::markContentsRead(not_null<HistoryItem*> item) {
if (!item->markContentsRead(true) || !item->isRegular()) { if (!item->markContentsRead(true) || !item->isRegular()) {
return; return;
} }
const auto settings = &AyuSettings::getInstance();
if (!settings->sendReadMessages) {
return;
}
const auto ids = MTP_vector<MTPint>(1, MTP_int(item->id)); const auto ids = MTP_vector<MTPint>(1, MTP_int(item->id));
if (const auto channel = item->history()->peer->asChannel()) { if (const auto channel = item->history()->peer->asChannel()) {
request(MTPchannels_ReadMessageContents( request(MTPchannels_ReadMessageContents(

20
Telegram/SourceFiles/ayu/ayu_settings.cpp
View file

@ -139,15 +139,19 @@ void load()
initialize(); initialize();
json p;
file >> p;
file.close();
try { try {
settings = p.get<AyuGramSettings>(); json p;
} file >> p;
catch (...) { file.close();
LOG(("AyuGramSettings: failed to parse settings file"));
try {
settings = p.get<AyuGramSettings>();
}
catch (...) {
LOG(("AyuGramSettings: failed to parse settings file"));
}
} catch (...) {
LOG(("AyuGramSettings: failed to read settings file (not json-like)"));
} }
postinitialize(); postinitialize();
} }