Reverse user and chat profile photos.

Telegram/SourceFiles/base/algorithm.h

@@ -27,6 +27,11 @@ inline Type take(Type &value) {
 	return std::exchange(value, Type {});
 }
 
+template <typename Type>
+inline Type duplicate(const Type &value) {
+	return value;
+}
+
 template <typename Type, size_t Size>
 inline constexpr size_t array_size(const Type(&)[Size]) {
 	return Size;

Telegram/SourceFiles/base/functors.h

@@ -24,19 +24,31 @@ namespace base {
 namespace functors {
 
 struct abs_helper {
-	template <typename Type,
+	template <
+		typename Type,
 		typename = decltype(0 < std::declval<Type>()),
 		typename = decltype(-std::declval<Type>())>
-		constexpr Type operator()(Type value) const {
+	constexpr Type operator()(Type value) const {
 		return (0 < value) ? value : (-value);
 	}
 };
-constexpr auto abs = abs_helper {};
+constexpr auto abs = abs_helper{};
 
-template <typename Type>
-inline auto add(Type a) {
-	return [a](auto b) { return a + b; };
+constexpr auto add = [](auto value) {
+	return [value](auto other) {
+		return value + other;
+	};
 };
 
+struct negate_helper {
+	template <
+		typename Type,
+		typename = decltype(-std::declval<Type>())>
+	constexpr Type operator()(Type value) const {
+		return -value;
+	}
+};
+constexpr auto negate = negate_helper{};
+
 } // namespace functors
 } // namespace base

Telegram/SourceFiles/base/qthelp_url.cpp

@@ -22,27 +22,27 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 
 namespace qthelp {
 
-QMap<QString, QString> url_parse_params(const QString &params, UrlParamNameTransform transform) {
-	QMap<QString, QString> result;
+QMap<QString, QString> url_parse_params(
+		const QString &params,
+		UrlParamNameTransform transform) {
+	auto result = QMap<QString, QString>();
 
-	auto transformParamName = [transform](const QString &name) {
+	const auto transformParamName = [transform](const QString &name) {
 		if (transform == UrlParamNameTransform::ToLower) {
 			return name.toLower();
 		}
 		return name;
 	};
-
-	auto paramsList = params.split('&');
-	for_const (auto &param, paramsList) {
+	for (const auto &param : params.split('&')) {
 		// Skip params without a name (starting with '=').
 		if (auto separatorPosition = param.indexOf('=')) {
-			auto paramName = param;
-			auto paramValue = QString();
-			if (separatorPosition > 0) {
-				paramName = param.mid(0, separatorPosition);
-				paramValue = url_decode(param.mid(separatorPosition + 1));
-			}
-			paramName = transformParamName(paramName);
+			const auto paramName = transformParamName(
+				(separatorPosition > 0)
+					? param.mid(0, separatorPosition)
+					: param);
+			const auto paramValue = (separatorPosition > 0)
+				? url_decode(param.mid(separatorPosition + 1))
+				: QString();
 			if (!result.contains(paramName)) {
 				result.insert(paramName, paramValue);
 			}

Telegram/SourceFiles/data/data_search_controller.cpp

@@ -154,13 +154,13 @@ SearchResult ParseSearchResult(
 	result.messageIds.reserve(messages->size());
 	for (auto &message : *messages) {
 		if (auto item = App::histories().addNewMessage(message, addType)) {
+			auto itemId = item->id;
 			if ((type == Storage::SharedMediaType::kCount)
 				|| item->sharedMediaTypes().test(type)) {
-				auto itemId = item->id;
 				result.messageIds.push_back(itemId);
-				accumulate_min(result.noSkipRange.from, itemId);
-				accumulate_max(result.noSkipRange.till, itemId);
 			}
+			accumulate_min(result.noSkipRange.from, itemId);
+			accumulate_max(result.noSkipRange.till, itemId);
 		}
 	}
 	if (messageId && result.messageIds.empty()) {

Telegram/SourceFiles/data/data_shared_media.cpp

@@ -207,11 +207,15 @@ base::optional<int> SharedMediaWithLastSlice::fullCount() const {
 		_isolatedLastPhoto | [](bool isolated) { return isolated ? 1 : 0; });
 }
 
-base::optional<int> SharedMediaWithLastSlice::skippedBefore() const {
+base::optional<int> SharedMediaWithLastSlice::skippedBeforeImpl() const {
 	return _slice.skippedBefore();
 }
 
-base::optional<int> SharedMediaWithLastSlice::skippedAfter() const {
+base::optional<int> SharedMediaWithLastSlice::skippedBefore() const {
+	return _reversed ? skippedAfterImpl() : skippedBeforeImpl();
+}
+
+base::optional<int> SharedMediaWithLastSlice::skippedAfterImpl() const {
 	return isolatedInSlice()
 		? Add(
 			_slice.skippedAfter(),
@@ -219,7 +223,11 @@ base::optional<int> SharedMediaWithLastSlice::skippedAfter() const {
 		: (lastPhotoSkip() | [](int) { return 0; });
 }
 
-base::optional<int> SharedMediaWithLastSlice::indexOf(Value value) const {
+base::optional<int> SharedMediaWithLastSlice::skippedAfter() const {
+	return _reversed ? skippedBeforeImpl() : skippedAfterImpl();
+}
+
+base::optional<int> SharedMediaWithLastSlice::indexOfImpl(Value value) const {
 	return base::get_if<FullMsgId>(&value)
 		? _slice.indexOf(*base::get_if<FullMsgId>(&value))
 		: (isolatedInSlice()
@@ -228,6 +236,13 @@ base::optional<int> SharedMediaWithLastSlice::indexOf(Value value) const {
 			: Add(_slice.size() - 1, lastPhotoSkip());
 }
 
+base::optional<int> SharedMediaWithLastSlice::indexOf(Value value) const {
+	auto result = indexOfImpl(value);
+	return _reversed
+		? (result | func::negate | func::add(size() - 1))
+		: result;
+}
+
 int SharedMediaWithLastSlice::size() const {
 	return _slice.size()
 		+ ((!isolatedInSlice() && lastPhotoSkip() == 1) ? 1 : 0);
@@ -236,6 +251,9 @@ int SharedMediaWithLastSlice::size() const {
 SharedMediaWithLastSlice::Value SharedMediaWithLastSlice::operator[](int index) const {
 	Expects(index >= 0 && index < size());
 
+	if (_reversed) {
+		index = size() - index - 1;
+	}
 	return (index < _slice.size())
 		? Value(_slice[index])
 		: Value(App::photo(_lastPhotoId));
@@ -252,6 +270,10 @@ base::optional<int> SharedMediaWithLastSlice::distance(
 	return base::none;
 }
 
+void SharedMediaWithLastSlice::reverse() {
+	_reversed = !_reversed;
+}
+
 PhotoId SharedMediaWithLastSlice::LastPeerPhotoId(PeerId peerId) {
 	if (auto peer = App::peerLoaded(peerId)) {
 		return peer->photoId;
@@ -332,3 +354,14 @@ rpl::producer<SharedMediaWithLastSlice> SharedMediaWithLastViewer(
 		});
 	};
 }
+
+rpl::producer<SharedMediaWithLastSlice> SharedMediaWithLastReversedViewer(
+		SharedMediaWithLastSlice::Key key,
+		int limitBefore,
+		int limitAfter) {
+	return SharedMediaWithLastViewer(key, limitBefore, limitAfter)
+		| rpl::map([](SharedMediaWithLastSlice &&slice) {
+			slice.reverse();
+			return std::move(slice);
+		});
+}

Telegram/SourceFiles/data/data_shared_media.h

@@ -116,6 +116,8 @@ public:
 	Value operator[](int index) const;
 	base::optional<int> distance(const Key &a, const Key &b) const;
 
+	void reverse();
+
 	static SparseIdsMergedSlice::Key ViewerKey(const Key &key) {
 		return {
 			key.peerId,
@@ -174,11 +176,16 @@ private:
 			| [](bool isolated) { return isolated ? 1 : 0; };
 	}
 
+	base::optional<int> skippedBeforeImpl() const;
+	base::optional<int> skippedAfterImpl() const;
+	base::optional<int> indexOfImpl(Value fullId) const;
+
 	Key _key;
 	SparseIdsMergedSlice _slice;
 	base::optional<SparseIdsMergedSlice> _ending;
 	PhotoId _lastPhotoId = 0;
 	base::optional<bool> _isolatedLastPhoto;
+	bool _reversed = false;
 
 };
 
@@ -186,3 +193,8 @@ rpl::producer<SharedMediaWithLastSlice> SharedMediaWithLastViewer(
 	SharedMediaWithLastSlice::Key key,
 	int limitBefore,
 	int limitAfter);
+
+rpl::producer<SharedMediaWithLastSlice> SharedMediaWithLastReversedViewer(
+	SharedMediaWithLastSlice::Key key,
+	int limitBefore,
+	int limitAfter);

Telegram/SourceFiles/data/data_user_photos.cpp

@@ -66,22 +66,27 @@ UserPhotosSlice::UserPhotosSlice(Key key)
 	{},
 	base::none,
 	base::none,
-	0) {
+	base::none) {
 }
 
 UserPhotosSlice::UserPhotosSlice(
 	Key key,
-	const std::deque<PhotoId> &ids,
+	std::deque<PhotoId> &&ids,
 	base::optional<int> fullCount,
 	base::optional<int> skippedBefore,
-	int skippedAfter)
+	base::optional<int> skippedAfter)
 : _key(key)
-, _ids(ids)
+, _ids(std::move(ids))
 , _fullCount(fullCount)
 , _skippedBefore(skippedBefore)
 , _skippedAfter(skippedAfter) {
 }
 
+void UserPhotosSlice::reverse() {
+	ranges::reverse(_ids);
+	std::swap(_skippedBefore, _skippedAfter);
+}
+
 base::optional<int> UserPhotosSlice::indexOf(PhotoId photoId) const {
 	auto it = ranges::find(_ids, photoId);
 	if (it != _ids.end()) {
@@ -109,30 +114,13 @@ base::optional<int> UserPhotosSlice::distance(const Key &a, const Key &b) const
 	return base::none;
 }
 
-QString UserPhotosSlice::debug() const {
-	auto before = _skippedBefore
-		? (*_skippedBefore
-			? ('(' + QString::number(*_skippedBefore) + ").. ")
-			: QString())
-		: QString(".. ");
-	auto after = _skippedAfter
-		? (" ..(" + QString::number(_skippedAfter) + ')')
-		: QString(" ..");
-	auto middle = (size() > 2)
-		? QString::number((*this)[0]) + " .. " + QString::number((*this)[size() - 1])
-		: (size() > 1)
-		? QString::number((*this)[0]) + ' ' + QString::number((*this)[1])
-		: ((size() > 0) ? QString::number((*this)[0]) : QString());
-	return before + middle + after;
-}
-
 UserPhotosSliceBuilder::UserPhotosSliceBuilder(
 	Key key,
 	int limitBefore,
 	int limitAfter)
-	: _key(key)
-	, _limitBefore(limitBefore)
-	, _limitAfter(limitAfter) {
+: _key(key)
+, _limitBefore(limitBefore)
+, _limitAfter(limitAfter) {
 }
 
 bool UserPhotosSliceBuilder::applyUpdate(const Storage::UserPhotosResult &update) {
@@ -209,7 +197,12 @@ void UserPhotosSliceBuilder::sliceToLimits() {
 }
 
 UserPhotosSlice UserPhotosSliceBuilder::snapshot() const {
-	return UserPhotosSlice(_key, _ids, _fullCount, _skippedBefore, _skippedAfter);
+	return UserPhotosSlice(
+		_key,
+		base::duplicate(_ids),
+		_fullCount,
+		_skippedBefore,
+		_skippedAfter);
 }
 
 rpl::producer<UserPhotosSlice> UserPhotosViewer(
@@ -249,3 +242,15 @@ rpl::producer<UserPhotosSlice> UserPhotosViewer(
 		return lifetime;
 	};
 }
+
+
+rpl::producer<UserPhotosSlice> UserPhotosReversedViewer(
+		UserPhotosSlice::Key key,
+		int limitBefore,
+		int limitAfter) {
+	return UserPhotosViewer(key, limitBefore, limitAfter)
+		| rpl::map([](UserPhotosSlice &&slice) {
+			slice.reverse();
+			return std::move(slice);
+		});
+}

Telegram/SourceFiles/data/data_user_photos.h

@@ -30,29 +30,29 @@ public:
 	UserPhotosSlice(Key key);
 	UserPhotosSlice(
 		Key key,
-		const std::deque<PhotoId> &ids,
+		std::deque<PhotoId> &&ids,
 		base::optional<int> fullCount,
 		base::optional<int> skippedBefore,
-		int skippedAfter);
+		base::optional<int> skippedAfter);
+
+	void reverse();
 
 	const Key &key() const { return _key; }
 
 	base::optional<int> fullCount() const { return _fullCount; }
 	base::optional<int> skippedBefore() const { return _skippedBefore; }
-	int skippedAfter() const { return _skippedAfter; }
+	base::optional<int> skippedAfter() const { return _skippedAfter; }
 	base::optional<int> indexOf(PhotoId msgId) const;
 	int size() const { return _ids.size(); }
 	PhotoId operator[](int index) const;
 	base::optional<int> distance(const Key &a, const Key &b) const;
 
-	QString debug() const;
-
 private:
 	Key _key;
 	std::deque<PhotoId> _ids;
 	base::optional<int> _fullCount;
 	base::optional<int> _skippedBefore;
-	int _skippedAfter = 0;
+	base::optional<int> _skippedAfter;
 
 	friend class UserPhotosSliceBuilder;
 
@@ -62,3 +62,8 @@ rpl::producer<UserPhotosSlice> UserPhotosViewer(
 	UserPhotosSlice::Key key,
 	int limitBefore,
 	int limitAfter);
+
+rpl::producer<UserPhotosSlice> UserPhotosReversedViewer(
+	UserPhotosSlice::Key key,
+	int limitBefore,
+	int limitAfter);

Telegram/SourceFiles/mediaview.cpp

@@ -1071,7 +1071,10 @@ bool MediaView::validSharedMedia() const {
 void MediaView::validateSharedMedia() {
 	if (auto key = sharedMediaKey()) {
 		_sharedMedia = std::make_unique<SharedMedia>(*key);
-		SharedMediaWithLastViewer(
+		auto viewer = (key->type == SharedMediaType::ChatPhoto)
+			? SharedMediaWithLastReversedViewer
+			: SharedMediaWithLastViewer;
+		viewer(
 			*key,
 			kIdsLimit,
 			kIdsLimit
@@ -1134,7 +1137,7 @@ bool MediaView::validUserPhotos() const {
 void MediaView::validateUserPhotos() {
 	if (auto key = userPhotosKey()) {
 		_userPhotos = std::make_unique<UserPhotos>(*key);
-		UserPhotosViewer(
+		UserPhotosReversedViewer(
 			*key,
 			kIdsLimit,
 			kIdsLimit
@@ -2811,6 +2814,7 @@ void MediaView::updateImage() {
 }
 
 void MediaView::findCurrent() {
+	using namespace rpl::mappers;
 	if (_sharedMediaData) {
 		_index = _msgid
 			? _sharedMediaData->indexOf(_msgid)

Telegram/SourceFiles/storage/storage_sparse_ids_list.cpp

@@ -76,9 +76,6 @@ int SparseIdsList::addRangeItemsAndCountNew(
 		const Range &messages,
 		MsgRange noSkipRange) {
 	Expects(noSkipRange.from <= noSkipRange.till);
-	if (messages.begin() == messages.end()) {
-		return 0;
-	}
 
 	auto uniteFrom = ranges::lower_bound(
 		_slices,