Merge tag 'v4.10.0' into dev

# Conflicts:
#	README.md
#	Telegram/Resources/winrc/Telegram.rc
#	Telegram/Resources/winrc/Updater.rc
#	Telegram/SourceFiles/apiwrap.cpp
#	Telegram/SourceFiles/core/version.h
#	Telegram/SourceFiles/data/data_stories.cpp
#	Telegram/SourceFiles/platform/win/windows_app_user_model_id.cpp
#	Telegram/lib_ui
#	snap/snapcraft.yaml
This commit is contained in:
ZavaruKitsu
2023-09-23 10:58:57 +03:00
353 changed files with 7144 additions and 3482 deletions
+2 -3
View File
@@ -132,18 +132,17 @@ void UserData::setPrivateForwardName(const QString &name) {
}
bool UserData::hasActiveStories() const {
return flags() & UserDataFlag::HasActiveStories;
return flags() & Flag::HasActiveStories;
}
bool UserData::hasUnreadStories() const {
return flags() & UserDataFlag::HasUnreadStories;
return flags() & Flag::HasUnreadStories;
}
void UserData::setStoriesState(StoriesState state) {
Expects(state != StoriesState::Unknown);
const auto was = flags();
using Flag = UserDataFlag;
switch (state) {
case StoriesState::None:
_flags.remove(Flag::HasActiveStories | Flag::HasUnreadStories);