diff options
| author | Joseph Donofry <joedonofry@gmail.com> | 2021-08-10 19:29:58 -0400 |
|---|---|---|
| committer | Joseph Donofry <joedonofry@gmail.com> | 2021-08-10 19:29:58 -0400 |
| commit | c91e771d538d99c9353b779ac4dd0d93a77cca6b (patch) | |
| tree | a0b583cf945b5cd09622ccb68b9fc8ad0e369794 /src/CacheStructs.h | |
| parent | Merge remote-tracking branch 'nheko-im/master' into video_player_enhancements (diff) | |
| parent | Protect against replay attacks (diff) | |
| download | nheko-c91e771d538d99c9353b779ac4dd0d93a77cca6b.tar.xz | |
Merge origin/master and fix conflicts
Diffstat (limited to 'src/CacheStructs.h')
| -rw-r--r-- | src/CacheStructs.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/CacheStructs.h b/src/CacheStructs.h index f274d70f..4a5c5c76 100644 --- a/src/CacheStructs.h +++ b/src/CacheStructs.h @@ -113,6 +113,7 @@ struct RoomSearchResult struct ImagePackInfo { - std::string packname; - std::map<std::string, mtx::events::msc2545::PackImage> images; + mtx::events::msc2545::ImagePack pack; + std::string source_room; + std::string state_key; }; |