Merge remote-tracking branch 'upstream-main/dev' into dev

# Conflicts:
#	Telegram/Resources/winrc/Telegram.rc
#	Telegram/Resources/winrc/Updater.rc
#	Telegram/SourceFiles/core/version.h
#	Telegram/lib_ui
#	snap/snapcraft.yaml
This commit is contained in:
ZavaruKitsu
2023-09-27 20:38:30 +03:00
36 changed files with 233 additions and 198 deletions
@@ -506,7 +506,7 @@ void SessionNavigation::showPeerByLinkResolved(
info.messageId,
callback);
}
} else if (peer->isUser() && info.storyId) {
} else if (info.storyId) {
const auto storyId = FullStoryId{ peer->id, info.storyId };
peer->owner().stories().resolve(storyId, crl::guard(this, [=] {
if (peer->owner().stories().lookup(storyId)) {