rnhmjoj
/
nheko
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix lint

This commit is contained in:
Nicolas Werner 2021-07-10 16:14:24 +02:00
parent c755d54243
commit b064eb34aa
No known key found for this signature in database
GPG Key ID: C8D75E610773F2D9
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/Cache.cpp
View File

@ -793,7 +793,6 @@ Cache::isInitialized()
bool res = syncStateDb_.get(txn, NEXT_BATCH_KEY, token); bool res = syncStateDb_.get(txn, NEXT_BATCH_KEY, token);
return res; return res;
} }
@ -808,7 +807,6 @@ Cache::nextBatchToken()
bool result = syncStateDb_.get(txn, NEXT_BATCH_KEY, token); bool result = syncStateDb_.get(txn, NEXT_BATCH_KEY, token);
if (result) if (result)
return std::string(token.data(), token.size()); return std::string(token.data(), token.size());
else else
@ -1187,14 +1185,14 @@ Cache::calculateRoomReadStatus(const std::string &room_id)
} }
} }
if (last_event_id.empty() || fullyReadEventId.empty()) if (last_event_id.empty() || fullyReadEventId.empty())
return true; return true;
if (last_event_id == fullyReadEventId) if (last_event_id == fullyReadEventId)
return false; return false;
last_event_id_ = std::string(last_event_id); last_event_id_ = std::string(last_event_id);
fullyReadEventId_ = std::string(fullyReadEventId); fullyReadEventId_ = std::string(fullyReadEventId);
} }
// Retrieve all read receipts for that event. // Retrieve all read receipts for that event.
@ -1527,7 +1525,6 @@ Cache::singleRoomInfo(const std::string &room_id)
tmp.join_rule = getRoomJoinRule(txn, statesdb); tmp.join_rule = getRoomJoinRule(txn, statesdb);
tmp.guest_access = getRoomGuestAccess(txn, statesdb); tmp.guest_access = getRoomGuestAccess(txn, statesdb);
return tmp; return tmp;
} catch (const json::exception &e) { } catch (const json::exception &e) {
nhlog::db()->warn("failed to parse room info: room_id ({}), {}: {}", nhlog::db()->warn("failed to parse room info: room_id ({}), {}: {}",
@ -1537,7 +1534,6 @@ Cache::singleRoomInfo(const std::string &room_id)
} }
} }
return RoomInfo(); return RoomInfo();
} }