procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Add SharedMediaSliceMerged for migrated histories.

This commit is contained in:
John Preston 2017-08-27 14:59:08 +03:00
parent 2363a6bd44
commit 449986456e
9 changed files with 398 additions and 373 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Telegram/SourceFiles/app.cpp
View File

@ -46,6 +46,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
#include "numbers.h" #include "numbers.h"
#include "observer_peer.h" #include "observer_peer.h"
#include "auth_session.h" #include "auth_session.h"
#include "storage/storage_facade.h"
#include "storage/storage_shared_media.h"
#include "window/themes/window_theme.h" #include "window/themes/window_theme.h"
#include "window/notifications_manager.h" #include "window/notifications_manager.h"
#include "platform/platform_notifications_manager.h" #include "platform/platform_notifications_manager.h"
@ -1029,6 +1031,13 @@ namespace {
existing->setViewsCount(m.has_views() ? m.vviews.v : -1); existing->setViewsCount(m.has_views() ? m.vviews.v : -1);
existing->addToOverview(AddToOverviewNew); existing->addToOverview(AddToOverviewNew);
if (auto sharedMediaTypes = existing->sharedMediaTypes()) {
Auth().storage().add(Storage::SharedMediaAddNew(
peerId,
sharedMediaTypes,
existing->id));
}
if (!existing->detached()) { if (!existing->detached()) {
App::checkSavedGif(existing); App::checkSavedGif(existing);
return true; return true;

251
Telegram/SourceFiles/history/history_shared_media.cpp
View File

@ -62,6 +62,42 @@ History *GetMigratedHistory(
} // namespace } // namespace
base::optional<Storage::SharedMediaType> SharedMediaOverviewType(
Storage::SharedMediaType type) {
if (SharedMediaTypeToOverview(type) != OverviewCount) {
return type;
}
return base::none;
}
void SharedMediaShowOverview(
Storage::SharedMediaType type,
not_null<History*> history) {
if (SharedMediaOverviewType(type)) {
Ui::showPeerOverview(history, SharedMediaTypeToOverview(type));
}
}
QString SharedMediaSlice::debug() const {
auto before = _skippedBefore
? (*_skippedBefore
? ('(' + QString::number(*_skippedBefore) + ").. ")
: QString())
: QString(".. ");
auto after = _skippedAfter
? (*_skippedAfter
? (" ..(" + QString::number(*_skippedAfter) + ')')
: QString())
: 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((*this)[0]) : QString());
return before + middle + after;
}
SharedMediaViewer::SharedMediaViewer( SharedMediaViewer::SharedMediaViewer(
Key key, Key key,
int limitBefore, int limitBefore,
@ -70,22 +106,8 @@ SharedMediaViewer::SharedMediaViewer(
, _limitBefore(limitBefore) , _limitBefore(limitBefore)
, _limitAfter(limitAfter) , _limitAfter(limitAfter)
, _data(_key) { , _data(_key) {
} Expects(IsServerMsgId(key.messageId) || (key.messageId == 0));
Expects((key.messageId != 0) || (limitBefore == 0 && limitAfter == 0));
base::optional<Storage::SharedMediaType> SharedMediaOverviewType(
Storage::SharedMediaType type) {
if (SharedMediaTypeToOverview(type) != OverviewCount) {
return type;
}
return base::none;
}
void SharedMediaShowOverview(
Storage::SharedMediaType type,
not_null<History*> history) {
if (SharedMediaOverviewType(type)) {
Ui::showPeerOverview(history, SharedMediaTypeToOverview(type));
}
} }
void SharedMediaViewer::start() { void SharedMediaViewer::start() {
@ -125,10 +147,15 @@ void SharedMediaViewer::mergeSliceData(
base::optional<int> skippedBefore, base::optional<int> skippedBefore,
base::optional<int> skippedAfter) { base::optional<int> skippedAfter) {
if (messageIds.empty()) { if (messageIds.empty()) {
if (count && *_data._fullCount != *count) { if (count && _data._fullCount != count) {
_data._fullCount = count; _data._fullCount = count;
if (*_data._fullCount <= _data.size()) {
_data._fullCount = _data.size();
_data._skippedBefore = _data._skippedAfter = 0;
}
updated.notify(_data); updated.notify(_data);
} }
sliceToLimits();
return; return;
} }
if (count) { if (count) {
@ -285,125 +312,71 @@ void SharedMediaViewer::requestMessages(RequestDirection direction) {
requestAroundData.second); requestAroundData.second);
} }
// SharedMediaViewerMerged::SharedMediaViewerMerged(
//base::optional<int> SharedMediaViewerMerged::Data::fullCount() const { Key key,
// if (_historyCount && _migratedCount) { int limitBefore,
// return (*_historyCount + *_migratedCount); int limitAfter)
// } : _key(key)
// return base::none; , _limitBefore(limitBefore)
//} , _limitAfter(limitAfter)
//base::optional<int> SharedMediaViewerMerged::Data::skippedBefore() const { , _part(PartKey(_key), _limitBefore, _limitAfter)
// if (_ids.empty()) { , _migrated(MigratedViewer(_key, _limitBefore, _limitAfter))
// return base::none; , _data(_key, SharedMediaSlice(PartKey(_key)), MigratedSlice(_key)) {
// } else if (!IsServerMsgId(_ids.front())) { Expects(IsServerMsgId(key.universalId)
// return _migratedSkippedBefore; || (key.universalId == 0)
// } else if (_historySkippedBefore && _migratedCount) { || (IsServerMsgId(-key.universalId) && key.migratedPeerId != 0));
// return *_historySkippedBefore + *_migratedCount; Expects((key.universalId != 0) || (limitBefore == 0 && limitAfter == 0));
// } }
// return base::none;
//} SharedMediaSlice::Key SharedMediaViewerMerged::PartKey(const Key &key) {
// return {
//base::optional<int> SharedMediaViewerMerged::Data::skippedAfter() const { key.peerId,
// if (_ids.empty()) { key.type,
// return base::none; (key.universalId < 0) ? 1 : key.universalId
// } else if (IsServerMsgId(_ids.back())) { };
// return _historySkippedAfter; }
// } else if (_migratedSkippedAfter && _historyCount) {
// return *_migratedSkippedAfter + *_historyCount; SharedMediaSlice::Key SharedMediaViewerMerged::MigratedKey(const Key &key) {
// } return {
// return base::none; key.migratedPeerId,
//} key.type,
// (key.universalId <= 0) ? (-key.universalId) : (ServerMaxMsgId - 1)
//SharedMediaViewerMerged::SharedMediaViewerMerged( };
// Type type, }
// not_null<History*> history,
// MsgId aroundId, std::unique_ptr<SharedMediaViewer> SharedMediaViewerMerged::MigratedViewer(
// int limitBefore, const Key &key,
// int limitAfter) int limitBefore,
//: _type(type) int limitAfter) {
//, _history(GetActualHistory(history)) return key.migratedPeerId
//, _migrated(GetMigratedHistory(history, _history)) ? std::make_unique<SharedMediaViewer>(
//, _universalAroundId((_history == _migrated) ? -aroundId : aroundId) MigratedKey(key),
//, _limitBefore(limitBefore) limitBefore,
//, _limitAfter(limitAfter) limitAfter)
//, _data(_history, _migrated) { : nullptr;
//} }
//
//bool SharedMediaViewerMerged::hasOverview() const { base::optional<SharedMediaSlice> SharedMediaViewerMerged::MigratedSlice(
// return SharedMediaTypeToOverview(_type) != OverviewCount; const Key &key) {
//} if (!key.migratedPeerId) {
// return base::none;
//void SharedMediaViewerMerged::showOverview() const { }
// if (hasOverview()) { return SharedMediaSlice(MigratedKey(key));
// Ui::showPeerOverview(_history, SharedMediaTypeToOverview(_type)); }
// }
//} void SharedMediaViewerMerged::start() {
// subscribe(_part.updated, [this](const SharedMediaSlice &update) {
//bool SharedMediaViewerMerged::moveTo(const SharedMediaViewerMerged &other) { _data = SharedMediaSliceMerged(_key, update, _data._migrated);
// if (_history != other._history || _type != other._type) { updated.notify(_data);
// return false; });
// } if (_migrated) {
// _universalAroundId = other._universalAroundId; subscribe(_migrated->updated, [this](const SharedMediaSlice &update) {
// if (!containsAroundId()) { _data = SharedMediaSliceMerged(_key, _data._part, update);
// clearAfterMove(); updated.notify(_data);
// } });
// load(); }
// return true; _part.start();
//} if (_migrated) {
// _migrated->start();
//bool SharedMediaViewerMerged::containsAroundId() const { }
// if (_data._ids.empty()) { }
// return false;
// }
// auto min = _data._ids.front();
// auto max = _data._ids.back();
// if (IsServerMsgId(_universalAroundId)) {
// return (!IsServerMsgId(min) || min <= aroundId())
// && (IsServerMsgId(max) && max >= aroundId());
// }
// return (!IsServerMsgId(min) && -min <= aroundId())
// && (IsServerMsgId(max) || -max >= aroundId());
//}
//
//bool SharedMediaViewerMerged::amAroundMigrated() const {
// return !IsServerMsgId(_universalAroundId);
//}
//
//not_null<History*> SharedMediaViewerMerged::aroundHistory() const {
// return amAroundMigrated() ? _migrated : _history;
//}
//
//MsgId SharedMediaViewerMerged::aroundId() const {
// return amAroundMigrated() ? -_universalAroundId : _universalAroundId;
//}
//
//void SharedMediaViewerMerged::clearAfterMove() {
// _data = Data(_history, _migrated, _data._historyCount, _data._migratedCount);
//}
//
//void SharedMediaViewerMerged::load() {
// auto weak = base::make_weak_unique(this);
// auto peer = aroundHistory()->peer;
// Auth().storage().query(Storage::SharedMediaQuery(
// peer->id,
// _type,
// aroundId(),
// _limitBefore,
// _limitAfter), [weak, peer](Storage::SharedMediaResult &&result) {
// if (weak) {
// weak->applyStoredResult(peer, std::move(result));
// }
// });
//}
//
//void SharedMediaViewerMerged::applyStoredResult(
// not_null<PeerData*> peer,
// Storage::SharedMediaResult &&result) {
// if (aroundHistory()->peer != peer) {
// return;
// }
// auto aroundMigrated = amAroundMigrated();
// if (result.count) {
// (aroundMigrated ? _data._migratedCount : _data._historyCount) = result.count;
// }
//}

388
Telegram/SourceFiles/history/history_shared_media.h
View File

@ -42,6 +42,10 @@ public:
, _fullCount(fullCount) { , _fullCount(fullCount) {
} }
const Key &key() const {
return _key;
}
base::optional<int> fullCount() const { base::optional<int> fullCount() const {
return _fullCount; return _fullCount;
} }
@ -62,19 +66,10 @@ public:
return _ids.size(); return _ids.size();
} }
using iterator = base::flat_set<MsgId>::const_iterator; MsgId operator[](int index) const {
Expects(index >= 0 && index < size());
iterator begin() const { return *(_ids.begin() + index);
return _ids.begin();
}
iterator end() const {
return _ids.end();
}
iterator cbegin() const {
return begin();
}
iterator cend() const {
return end();
} }
base::optional<int> distance(const Key &a, const Key &b) const { base::optional<int> distance(const Key &a, const Key &b) const {
@ -84,14 +79,16 @@ public:
|| b.peerId != _key.peerId) { || b.peerId != _key.peerId) {
return base::none; return base::none;
} }
auto i = _ids.find(a.messageId); if (auto i = indexOf(a.messageId)) {
auto j = _ids.find(b.messageId); if (auto j = indexOf(b.messageId)) {
if (i == _ids.end() || j == _ids.end()) { return *j - *i;
return base::none; }
} }
return j - i; return base::none;
} }
QString debug() const;
private: private:
Key _key; Key _key;
base::flat_set<MsgId> _ids; base::flat_set<MsgId> _ids;
@ -115,6 +112,8 @@ public:
Key key, Key key,
int limitBefore, int limitBefore,
int limitAfter); int limitAfter);
SharedMediaViewer(const SharedMediaViewer &other) = delete;
SharedMediaViewer(SharedMediaViewer &&other) = default;
void start(); void start();
@ -144,7 +143,6 @@ private:
base::optional<int> skippedBefore = base::none, base::optional<int> skippedBefore = base::none,
base::optional<int> skippedAfter = base::none); base::optional<int> skippedAfter = base::none);
Key _key; Key _key;
int _limitBefore = 0; int _limitBefore = 0;
int _limitAfter = 0; int _limitAfter = 0;
@ -153,164 +151,196 @@ private:
SharedMediaSlice _data; SharedMediaSlice _data;
}; };
//
//class SharedMediaSliceMerged : class SharedMediaViewerMerged;
// private MTP::Sender, class SharedMediaSliceMerged {
// private base::Subscriber, public:
// public base::enable_weak_from_this { using Type = Storage::SharedMediaType;
//public: using UniversalMsgId = MsgId;
// class Data; struct Key {
// Key(
//private: PeerId peerId,
// friend class Data; PeerId migratedPeerId,
// using UniversalMsgId = MsgId; Type type,
// UniversalMsgId universalId)
//public: : peerId(peerId)
// using Type = Storage::SharedMediaType; , migratedPeerId(migratedPeerId)
// , type(type)
// SharedMediaSliceMerged( , universalId(universalId) {
// Type type, }
// not_null<History*> history,
// MsgId aroundId, bool operator==(const Key &other) const {
// int limitBefore, return (peerId == other.peerId)
// int limitAfter); && (migratedPeerId == other.migratedPeerId)
// && (type == other.type)
// bool hasOverview() const; && (universalId == other.universalId);
// void showOverview() const; }
// bool moveTo(const SharedMediaSliceMerged &other);
// PeerId peerId = 0;
// void load(); PeerId migratedPeerId = 0;
// Type type = Type::kCount;
// class Data { UniversalMsgId universalId = 0;
// public:
// base::optional<int> fullCount() const; };
// base::optional<int> skippedBefore() const; SharedMediaSliceMerged(
// base::optional<int> skippedAfter() const; Key key,
// int size() const { SharedMediaSlice part,
// return _ids.size(); base::optional<SharedMediaSlice> migrated)
// } : _key(key)
// , _part(part)
// class iterator { , _migrated(migrated) {
// public: }
// FullMsgId operator*() const {
// auto id = _data->_ids[_index]; base::optional<int> fullCount() const {
// Assert(IsServerMsgId(id) return Add(
// || (_data->_migrated != nullptr && IsServerMsgId(-id))); _part.fullCount(),
// return IsServerMsgId(id) _migrated ? _migrated->fullCount() : 0);
// ? FullMsgId(_data->_history->channelId(), id) }
// : FullMsgId(_data->_migrated->channelId(), -id); base::optional<int> skippedBefore() const {
// } return Add(
// iterator &operator--() { isolatedInMigrated() ? 0 : _part.skippedBefore(),
// --_index; _migrated
// return *this; ? (isolatedInPart()
// } ? _migrated->fullCount()
// iterator operator--(int) { : _migrated->skippedBefore())
// auto result = *this; : 0
// --*this; );
// return result; }
// } base::optional<int> skippedAfter() const {
// iterator &operator++() { return Add(
// ++_index; isolatedInMigrated() ? _part.fullCount() : _part.skippedAfter(),
// return *this; isolatedInPart() ? 0 : _migrated->skippedAfter()
// } );
// iterator operator++(int) { }
// auto result = *this; base::optional<int> indexOf(FullMsgId fullId) const {
// ++*this; return isFromPart(fullId)
// return result; ? (_part.indexOf(fullId.msg) | func::add(migratedSize()))
// } : isolatedInPart()
// iterator &operator+=(int offset) { ? base::none
// _index += offset; : isFromMigrated(fullId)
// return *this; ? _migrated->indexOf(fullId.msg)
// } : base::none;
// iterator operator+(int offset) const { }
// auto result = *this; int size() const {
// return result += offset; return (isolatedInPart() ? 0 : migratedSize())
// } + (isolatedInMigrated() ? 0 : _part.size());
// bool operator==(iterator other) const { }
// return (_data == other._data) && (_index == other._index);
// } FullMsgId operator[](int index) const {
// bool operator!=(iterator other) const { Expects(index >= 0 && index < size());
// return !(*this == other);
// } if (auto size = migratedSize()) {
// bool operator<(iterator other) const { if (index < size) {
// return (_data < other._data) return ComputeId(*_migrated, index);
// || (_data == other._data && _index < other._index); }
// } index -= size;
// }
// private: return ComputeId(_part, index);
// friend class Data; }
//
// iterator(not_null<const Data*> data, int index) base::optional<int> distance(const Key &a, const Key &b) const {
// : _data(data) if (a.type != _key.type
// , _index(index) { || b.type != _key.type
// } || a.peerId != _key.peerId
// || b.peerId != _key.peerId
// not_null<const Data*> _data; || a.migratedPeerId != _key.migratedPeerId
// int _index = 0; || b.migratedPeerId != _key.migratedPeerId) {
// return base::none;
// }; }
// if (auto i = indexOf(ComputeId(a))) {
// iterator begin() const { if (auto j = indexOf(ComputeId(b))) {
// return iterator(this, 0); return *j - *i;
// } }
// iterator end() const { }
// iterator(this, _ids.size()); return base::none;
// } }
// iterator cbegin() const {
// return begin(); QString debug() const {
// } return (_migrated ? (_migrated->debug() + '|') : QString()) + _part.debug();
// iterator cend() const { }
// return end();
// } private:
// static bool IsFromSlice(const SharedMediaSlice &slice, FullMsgId fullId) {
// private: auto peer = slice.key().peerId;
// friend class iterator; return peerIsChannel(peer)
// friend class SharedMediaSliceMerged; ? (peer == peerFromChannel(fullId.channel))
// : !fullId.channel;
// Data( }
// not_null<History*> history, static FullMsgId ComputeId(PeerId peerId, MsgId msgId) {
// History *migrated, return FullMsgId(
// base::optional<int> historyCount = base::none, peerIsChannel(peerId) ? peerToBareInt(peerId) : 0,
// base::optional<int> migratedCount = base::none) msgId);
// : _history(history) }
// , _migrated(migrated) static FullMsgId ComputeId(const SharedMediaSlice &slice, int index) {
// , _historyCount(historyCount) return ComputeId(slice.key().peerId, slice[index]);
// , _migratedCount(migratedCount) { };
// if (!_migrated) { static FullMsgId ComputeId(const Key &key) {
// _migratedCount = 0; return (key.universalId > 0)
// } ? ComputeId(key.peerId, key.universalId)
// } : ComputeId(key.migratedPeerId, -key.universalId);
// }
// not_null<History*> _history; static base::optional<int> Add(
// History *_migrated = nullptr; const base::optional<int> &a,
// std::vector<UniversalMsgId> _ids; const base::optional<int> &b) {
// base::optional<int> _historyCount; return (a && b) ? base::make_optional(*a + *b) : base::none;
// base::optional<int> _historySkippedBefore; }
// base::optional<int> _historySkippedAfter;
// base::optional<int> _migratedCount; bool isFromPart(FullMsgId fullId) const {
// base::optional<int> _migratedSkippedBefore; return IsFromSlice(_part, fullId);
// base::optional<int> _migratedSkippedAfter; }
// bool isFromMigrated(FullMsgId fullId) const {
// }; return _migrated ? IsFromSlice(*_migrated, fullId) : false;
// base::Observable<Data> updated; }
// int migratedSize() const {
//private: return isolatedInPart() ? 0 : _migrated->size();
// bool amAroundMigrated() const; }
// not_null<History*> aroundHistory() const; bool isolatedInPart() const {
// MsgId aroundId() const; return IsServerMsgId(_key.universalId)
// && (!_migrated || _part.skippedBefore() != 0);
// void applyStoredResult( }
// not_null<PeerData*> peer, bool isolatedInMigrated() const {
// Storage::SharedMediaResult &&result); return IsServerMsgId(-_key.universalId)
// bool containsAroundId() const; && (_migrated->skippedAfter() != 0);
// void clearAfterMove(); }
//
// Type _type = Type::kCount; Key _key;
// not_null<History*> _history; SharedMediaSlice _part;
// History *_migrated = nullptr; base::optional<SharedMediaSlice> _migrated;
// UniversalMsgId _universalAroundId = 0;
// int _limitBefore = 0; friend class SharedMediaViewerMerged;
// int _limitAfter = 0;
// Data _data; };
//
//}; class SharedMediaViewerMerged : private base::Subscriber {
public:
using Type = SharedMediaSliceMerged::Type;
using Key = SharedMediaSliceMerged::Key;
SharedMediaViewerMerged(
Key key,
int limitBefore,
int limitAfter);
SharedMediaViewerMerged(const SharedMediaViewerMerged &other) = delete;
SharedMediaViewerMerged(SharedMediaViewerMerged &&other) = default;
void start();
base::Observable<SharedMediaSliceMerged> updated;
private:
static SharedMediaSlice::Key PartKey(const Key &key);
static SharedMediaSlice::Key MigratedKey(const Key &key);
static std::unique_ptr<SharedMediaViewer> MigratedViewer(
const Key &key,
int limitBefore,
int limitAfter);
static base::optional<SharedMediaSlice> MigratedSlice(const Key &key);
Key _key;
int _limitBefore = 0;
int _limitAfter = 0;
SharedMediaViewer _part;
std::unique_ptr<SharedMediaViewer> _migrated;
SharedMediaSliceMerged _data;
};

97
Telegram/SourceFiles/mediaview.cpp
View File

@ -68,13 +68,13 @@ constexpr auto kIdsPreloadAfter = 28;
} // namespace } // namespace
struct MediaView::SharedMedia { struct MediaView::SharedMedia {
SharedMedia(SharedMediaViewer::Key key) SharedMedia(SharedMediaViewerMerged::Key key)
: key(key) : key(key)
, slice(key, kIdsLimit, kIdsLimit) { , slice(key, kIdsLimit, kIdsLimit) {
} }
SharedMediaViewer::Key key; SharedMediaViewerMerged::Key key;
SharedMediaViewer slice; SharedMediaViewerMerged slice;
}; };
MediaView::MediaView() : TWidget(nullptr) MediaView::MediaView() : TWidget(nullptr)
@ -192,7 +192,7 @@ void MediaView::moveToScreen() {
_saveMsg.moveTo((width() - _saveMsg.width()) / 2, (height() - _saveMsg.height()) / 2); _saveMsg.moveTo((width() - _saveMsg.width()) / 2, (height() - _saveMsg.height()) / 2);
} }
void MediaView::handleSharedMediaUpdate(const SharedMediaSlice &update) { void MediaView::handleSharedMediaUpdate(const SharedMediaSliceMerged &update) {
if (isHidden() || (!_photo && !_doc) || !_sharedMedia) { if (isHidden() || (!_photo && !_doc) || !_sharedMedia) {
_index = _fullIndex = _fullCount = base::none; _index = _fullIndex = _fullCount = base::none;
return; return;
@ -275,9 +275,9 @@ void MediaView::documentUpdated(DocumentData *doc) {
} }
void MediaView::changingMsgId(not_null<HistoryItem*> row, MsgId newId) { void MediaView::changingMsgId(not_null<HistoryItem*> row, MsgId newId) {
if (row->id == _msgid) { if (row->fullId() == _msgid) {
_msgid = newId; _msgid = FullMsgId(_msgid.channel, newId);
validateSharedMedia(); refreshSharedMedia();
} }
} }
@ -367,7 +367,7 @@ void MediaView::updateControls() {
d = date(_photo->date); d = date(_photo->date);
} else if (_doc) { } else if (_doc) {
d = date(_doc->date); d = date(_doc->date);
} else if (HistoryItem *item = App::histItemById(_msgmigrated ? 0 : _channel, _msgid)) { } else if (auto item = App::histItemById(_msgid)) {
d = item->date; d = item->date;
} }
if (d.date() == dNow.date()) { if (d.date() == dNow.date()) {
@ -409,7 +409,7 @@ void MediaView::updateActions() {
if (_doc && _doc->loading()) { if (_doc && _doc->loading()) {
_actions.push_back({ lang(lng_cancel), SLOT(onSaveCancel()) }); _actions.push_back({ lang(lng_cancel), SLOT(onSaveCancel()) });
} }
if (_msgid > 0 && _msgid < ServerMaxMsgId) { if (IsServerMsgId(_msgid.msg)) {
_actions.push_back({ lang(lng_context_to_msg), SLOT(onToMessage()) }); _actions.push_back({ lang(lng_context_to_msg), SLOT(onToMessage()) });
} }
if (_doc && !_doc->filepath(DocumentData::FilePathResolveChecked).isEmpty()) { if (_doc && !_doc->filepath(DocumentData::FilePathResolveChecked).isEmpty()) {
@ -535,12 +535,12 @@ void MediaView::step_radial(TimeMs ms, bool timer) {
_autoplayVideoDocument = _doc; _autoplayVideoDocument = _doc;
} }
if (!_doc->data().isEmpty() && (_doc->isAnimation() || _doc->isVideo())) { if (!_doc->data().isEmpty() && (_doc->isAnimation() || _doc->isVideo())) {
displayDocument(_doc, App::histItemById(_msgmigrated ? 0 : _channel, _msgid)); displayDocument(_doc, App::histItemById(_msgid));
} else { } else {
auto &location = _doc->location(true); auto &location = _doc->location(true);
if (location.accessEnable()) { if (location.accessEnable()) {
if (_doc->isAnimation() || _doc->isVideo() || _doc->isTheme() || QImageReader(location.name()).canRead()) { if (_doc->isAnimation() || _doc->isVideo() || _doc->isTheme() || QImageReader(location.name()).canRead()) {
displayDocument(_doc, App::histItemById(_msgmigrated ? 0 : _channel, _msgid)); displayDocument(_doc, App::histItemById(_msgid));
} }
location.accessDisable(); location.accessDisable();
} }
@ -731,7 +731,7 @@ void MediaView::onScreenResized(int screen) {
} }
if (!ignore) { if (!ignore) {
moveToScreen(); moveToScreen();
auto item = (_msgid ? App::histItemById(_msgmigrated ? 0 : _channel, _msgid) : nullptr); auto item = (_msgid ? App::histItemById(_msgid) : nullptr);
if (_photo) { if (_photo) {
displayPhoto(_photo, item); displayPhoto(_photo, item);
} else if (_doc) { } else if (_doc) {
@ -741,7 +741,7 @@ void MediaView::onScreenResized(int screen) {
} }
void MediaView::onToMessage() { void MediaView::onToMessage() {
if (auto item = _msgid ? App::histItemById(_msgmigrated ? 0 : _channel, _msgid) : 0) { if (auto item = _msgid ? App::histItemById(_msgid) : 0) {
close(); close();
Ui::showPeerHistoryAtItem(item); Ui::showPeerHistoryAtItem(item);
} }
@ -830,7 +830,7 @@ void MediaView::clipCallback(Media::Clip::Notification notification) {
switch (notification) { switch (notification) {
case NotificationReinit: { case NotificationReinit: {
if (auto item = App::histItemById(_msgmigrated ? 0 : _channel, _msgid)) { if (auto item = App::histItemById(_msgid)) {
if (_gif->state() == State::Error) { if (_gif->state() == State::Error) {
stopGif(); stopGif();
updateControls(); updateControls();
@ -944,8 +944,10 @@ void MediaView::onShowInFolder() {
} }
void MediaView::onForward() { void MediaView::onForward() {
auto item = App::histItemById(_msgmigrated ? 0 : _channel, _msgid); auto item = App::histItemById(_msgid);
if (!_msgid || !item || item->id < 0 || item->serviceMsg()) return; if (!item || !IsServerMsgId(item->id) || item->serviceMsg()) {
return;
}
close(); close();
if (auto main = App::main()) { if (auto main = App::main()) {
@ -970,7 +972,7 @@ void MediaView::onDelete() {
if (deletingPeerPhoto()) { if (deletingPeerPhoto()) {
App::main()->deletePhotoLayer(_photo); App::main()->deletePhotoLayer(_photo);
} else if (auto item = App::histItemById(_msgmigrated ? 0 : _channel, _msgid)) { } else if (auto item = App::histItemById(_msgid)) {
App::contextItem(item); App::contextItem(item);
App::main()->deleteLayer(); App::main()->deleteLayer();
} }
@ -1004,8 +1006,7 @@ void MediaView::onCopy() {
base::optional<MediaView::SharedMediaType> MediaView::sharedMediaType() const { base::optional<MediaView::SharedMediaType> MediaView::sharedMediaType() const {
using Type = SharedMediaType; using Type = SharedMediaType;
auto channelId = _msgmigrated ? NoChannel : _channel; if (auto item = App::histItemById(_msgid)) {
if (auto item = App::histItemById(channelId, _msgid)) {
if (_photo) { if (_photo) {
if (item->toHistoryMessage()) { if (item->toHistoryMessage()) {
return Type::Photo; return Type::Photo;
@ -1024,8 +1025,15 @@ base::optional<MediaView::SharedMediaType> MediaView::sharedMediaType() const {
} }
base::optional<MediaView::SharedMediaKey> MediaView::sharedMediaKey() const { base::optional<MediaView::SharedMediaKey> MediaView::sharedMediaKey() const {
if (!IsServerMsgId(_msgid.msg)) {
return base::none;
}
auto keyForType = [this](SharedMediaType type) -> SharedMediaKey { auto keyForType = [this](SharedMediaType type) -> SharedMediaKey {
return { (_msgmigrated ? _migrated : _history)->peer->id, type, _msgid }; return {
_history->peer->id,
_migrated ? _migrated->peer->id : 0,
type,
(_msgid.channel == _history->channelId()) ? _msgid.msg : -_msgid.msg };
}; };
return return
sharedMediaType() sharedMediaType()
@ -1038,7 +1046,7 @@ bool MediaView::validSharedMedia() const {
return false; return false;
} }
auto countDistanceInData = [](const auto &a, const auto &b) { auto countDistanceInData = [](const auto &a, const auto &b) {
return [&](const SharedMediaSlice &data) { return [&](const SharedMediaSliceMerged &data) {
return data.distance(a, b); return data.distance(a, b);
}; };
}; };
@ -1046,7 +1054,7 @@ bool MediaView::validSharedMedia() const {
auto distance = (key == _sharedMedia->key) ? 0 : auto distance = (key == _sharedMedia->key) ? 0 :
_sharedMediaData _sharedMediaData
| countDistanceInData(*key, _sharedMedia->key) | countDistanceInData(*key, _sharedMedia->key)
| base::abs; | func::abs;
if (distance) { if (distance) {
return (*distance < kIdsPreloadAfter); return (*distance < kIdsPreloadAfter);
} }
@ -1057,7 +1065,7 @@ bool MediaView::validSharedMedia() const {
void MediaView::validateSharedMedia() { void MediaView::validateSharedMedia() {
if (auto key = sharedMediaKey()) { if (auto key = sharedMediaKey()) {
_sharedMedia = std::make_unique<SharedMedia>(*key); _sharedMedia = std::make_unique<SharedMedia>(*key);
subscribe(_sharedMedia->slice.updated, [this](const SharedMediaSlice &data) { subscribe(_sharedMedia->slice.updated, [this](const SharedMediaSliceMerged &data) {
handleSharedMediaUpdate(data); handleSharedMediaUpdate(data);
}); });
_sharedMedia->slice.start(); _sharedMedia->slice.start();
@ -1103,14 +1111,12 @@ void MediaView::showPhoto(not_null<PhotoData*> photo, HistoryItem *context) {
} }
if (!_animOpacities.isEmpty()) _animOpacities.clear(); if (!_animOpacities.isEmpty()) _animOpacities.clear();
_msgid = context ? context->id : 0; _msgid = context ? context->fullId() : FullMsgId();
_msgmigrated = context ? (context->history() == _migrated) : false;
_channel = _history ? _history->channelId() : NoChannel;
_canForward = context ? context->canForward() : false; _canForward = context ? context->canForward() : false;
_canDelete = context ? context->canDelete() : false; _canDelete = context ? context->canDelete() : false;
_photo = photo; _photo = photo;
validateSharedMedia(); refreshSharedMedia();
if (_history) { if (_history) {
if (context && !context->toHistoryMessage()) { if (context && !context->toHistoryMessage()) {
if (!_history->peer->isUser()) { if (!_history->peer->isUser()) {
@ -1140,13 +1146,11 @@ void MediaView::showPhoto(not_null<PhotoData*> photo, PeerData *context) {
} }
if (!_animOpacities.isEmpty()) _animOpacities.clear(); if (!_animOpacities.isEmpty()) _animOpacities.clear();
_msgid = 0; _msgid = {};
_msgmigrated = false;
_channel = NoChannel;
_canForward = _canDelete = false; _canForward = _canDelete = false;
_photo = photo; _photo = photo;
validateSharedMedia(); refreshSharedMedia();
if (_user) { if (_user) {
//if (_user->photos.isEmpty() && _user->photosCount < 0 && _user->photoId && _user->photoId != UnknownPeerPhotoId) { //if (_user->photos.isEmpty() && _user->photosCount < 0 && _user->photoId && _user->photoId != UnknownPeerPhotoId) {
// _fullIndex = 0; // _fullIndex = 0;
@ -1217,9 +1221,7 @@ void MediaView::showDocument(not_null<DocumentData*> document, HistoryItem *cont
} }
if (!_animOpacities.isEmpty()) _animOpacities.clear(); if (!_animOpacities.isEmpty()) _animOpacities.clear();
_msgid = context ? context->id : 0; _msgid = context ? context->fullId() : FullMsgId();
_msgmigrated = context ? (context->history() == _migrated) : false;
_channel = _history ? _history->channelId() : NoChannel;
_canForward = context ? context->canForward() : false; _canForward = context ? context->canForward() : false;
_canDelete = context ? context->canDelete() : false; _canDelete = context ? context->canDelete() : false;
@ -1239,7 +1241,7 @@ void MediaView::displayPhoto(not_null<PhotoData*> photo, HistoryItem *item) {
_photo = photo; _photo = photo;
_radial.stop(); _radial.stop();
validateSharedMedia(); refreshSharedMedia();
_photoRadialRect = QRect(QPoint((width() - st::radialSize.width()) / 2, (height() - st::radialSize.height()) / 2), st::radialSize); _photoRadialRect = QRect(QPoint((width() - st::radialSize.width()) / 2, (height() - st::radialSize.height()) / 2), st::radialSize);
@ -1299,7 +1301,7 @@ void MediaView::destroyThemePreview() {
} }
void MediaView::displayDocument(DocumentData *doc, HistoryItem *item) { // empty messages shown as docs: doc can be NULL void MediaView::displayDocument(DocumentData *doc, HistoryItem *item) { // empty messages shown as docs: doc can be NULL
auto documentChanged = (!doc || doc != _doc || (item && (item->id != _msgid || (item->history() != (_msgmigrated ? _migrated : _history))))); auto documentChanged = (!doc || doc != _doc || (item && item->fullId() != _msgid));
if (documentChanged || (!doc->isAnimation() && !doc->isVideo())) { if (documentChanged || (!doc->isAnimation() && !doc->isVideo())) {
_fullScreenVideo = false; _fullScreenVideo = false;
_current = QPixmap(); _current = QPixmap();
@ -1314,7 +1316,7 @@ void MediaView::displayDocument(DocumentData *doc, HistoryItem *item) { // empty
_photo = nullptr; _photo = nullptr;
_radial.stop(); _radial.stop();
validateSharedMedia(); refreshSharedMedia();
if (_autoplayVideoDocument && _doc != _autoplayVideoDocument) { if (_autoplayVideoDocument && _doc != _autoplayVideoDocument) {
_autoplayVideoDocument = nullptr; _autoplayVideoDocument = nullptr;
@ -1521,7 +1523,7 @@ void MediaView::createClipReader() {
_current = _doc->thumb->pixNoCache(_doc->thumb->width(), _doc->thumb->height(), videoThumbOptions(), st::mediaviewFileIconSize, st::mediaviewFileIconSize); _current = _doc->thumb->pixNoCache(_doc->thumb->width(), _doc->thumb->height(), videoThumbOptions(), st::mediaviewFileIconSize, st::mediaviewFileIconSize);
} }
auto mode = (_doc->isVideo() || _doc->isRoundVideo()) ? Media::Clip::Reader::Mode::Video : Media::Clip::Reader::Mode::Gif; auto mode = (_doc->isVideo() || _doc->isRoundVideo()) ? Media::Clip::Reader::Mode::Video : Media::Clip::Reader::Mode::Gif;
_gif = Media::Clip::MakeReader(_doc, FullMsgId(_channel, _msgid), [this](Media::Clip::Notification notification) { _gif = Media::Clip::MakeReader(_doc, _msgid, [this](Media::Clip::Notification notification) {
clipCallback(notification); clipCallback(notification);
}, mode); }, mode);
@ -1611,7 +1613,7 @@ void MediaView::setClipControllerGeometry() {
void MediaView::onVideoPauseResume() { void MediaView::onVideoPauseResume() {
if (!_gif) return; if (!_gif) return;
if (auto item = App::histItemById(_msgmigrated ? 0 : _channel, _msgid)) { if (auto item = App::histItemById(_msgid)) {
if (_gif->state() == Media::Clip::State::Error) { if (_gif->state() == Media::Clip::State::Error) {
displayDocument(_doc, item); displayDocument(_doc, item);
} else if (_gif->state() == Media::Clip::State::Finished) { } else if (_gif->state() == Media::Clip::State::Finished) {
@ -1637,7 +1639,7 @@ void MediaView::restartVideoAtSeekPosition(TimeMs positionMs) {
auto rounding = (_doc && _doc->isRoundVideo()) ? ImageRoundRadius::Ellipse : ImageRoundRadius::None; auto rounding = (_doc && _doc->isRoundVideo()) ? ImageRoundRadius::Ellipse : ImageRoundRadius::None;
_current = _gif->current(_gif->width() / cIntRetinaFactor(), _gif->height() / cIntRetinaFactor(), _gif->width() / cIntRetinaFactor(), _gif->height() / cIntRetinaFactor(), rounding, ImageRoundCorner::All, getms()); _current = _gif->current(_gif->width() / cIntRetinaFactor(), _gif->height() / cIntRetinaFactor(), _gif->width() / cIntRetinaFactor(), _gif->height() / cIntRetinaFactor(), rounding, ImageRoundCorner::All, getms());
} }
_gif = Media::Clip::MakeReader(_doc, FullMsgId(_channel, _msgid), [this](Media::Clip::Notification notification) { _gif = Media::Clip::MakeReader(_doc, _msgid, [this](Media::Clip::Notification notification) {
clipCallback(notification); clipCallback(notification);
}, Media::Clip::Reader::Mode::Video, positionMs); }, Media::Clip::Reader::Mode::Video, positionMs);
@ -2215,11 +2217,9 @@ bool MediaView::moveToNext(int32 delta) {
if (newIndex < 0 || newIndex >= _sharedMediaData->size()) { if (newIndex < 0 || newIndex >= _sharedMediaData->size()) {
return false; return false;
} }
if (auto item = App::histItemById(_history->channelId(), *(_sharedMediaData->begin() + newIndex))) { if (auto item = App::histItemById((*_sharedMediaData)[newIndex])) {
_index = newIndex; _index = newIndex;
_msgid = item->id; _msgid = item->fullId();
_msgmigrated = (item->history() == _migrated);
_channel = _history ? _history->channelId() : NoChannel;
_canForward = item->canForward(); _canForward = item->canForward();
_canDelete = item->canDelete(); _canDelete = item->canDelete();
stopGif(); stopGif();
@ -2338,7 +2338,7 @@ void MediaView::preloadData(int32 delta) {
auto forgetIndex = *_index - delta * 2; auto forgetIndex = *_index - delta * 2;
if (forgetIndex >= 0 && forgetIndex < _sharedMediaData->size()) { if (forgetIndex >= 0 && forgetIndex < _sharedMediaData->size()) {
if (auto item = App::histItemById(_history->channelId(), *(_sharedMediaData->begin() + forgetIndex))) { if (auto item = App::histItemById((*_sharedMediaData)[forgetIndex])) {
if (auto media = item->getMedia()) { if (auto media = item->getMedia()) {
switch (media->type()) { switch (media->type()) {
case MediaTypePhoto: static_cast<HistoryPhoto*>(media)->photo()->forget(); break; case MediaTypePhoto: static_cast<HistoryPhoto*>(media)->photo()->forget(); break;
@ -2353,7 +2353,7 @@ void MediaView::preloadData(int32 delta) {
for (auto index = from; index != till; ++index) { for (auto index = from; index != till; ++index) {
if (index >= 0 && index < _sharedMediaData->size()) { if (index >= 0 && index < _sharedMediaData->size()) {
if (auto item = App::histItemById(_history->channelId(), *(_sharedMediaData->begin() + index))) { if (auto item = App::histItemById((*_sharedMediaData)[index])) {
if (auto media = item->getMedia()) { if (auto media = item->getMedia()) {
switch (media->type()) { switch (media->type()) {
case MediaTypePhoto: static_cast<HistoryPhoto*>(media)->photo()->download(); break; case MediaTypePhoto: static_cast<HistoryPhoto*>(media)->photo()->download(); break;
@ -2568,7 +2568,7 @@ void MediaView::updateOver(QPoint pos) {
updateOverState(OverRightNav); updateOverState(OverRightNav);
} else if (_nameNav.contains(pos)) { } else if (_nameNav.contains(pos)) {
updateOverState(OverName); updateOverState(OverName);
} else if ((_msgid > 0 && _msgid < ServerMaxMsgId) && _dateNav.contains(pos)) { } else if (IsServerMsgId(_msgid.msg) && _dateNav.contains(pos)) {
updateOverState(OverDate); updateOverState(OverDate);
} else if (_headerHasLink && _headerNav.contains(pos)) { } else if (_headerHasLink && _headerNav.contains(pos)) {
updateOverState(OverHeader); updateOverState(OverHeader);
@ -2985,7 +2985,8 @@ void MediaView::updateHeader() {
_headerText = _doc->name.isEmpty() ? lang(lng_mediaview_doc_image) : _doc->name; _headerText = _doc->name.isEmpty() ? lang(lng_mediaview_doc_image) : _doc->name;
} else if (_user) { } else if (_user) {
_headerText = lang(lng_mediaview_profile_photo); _headerText = lang(lng_mediaview_profile_photo);
} else if ((_channel && !_history->isMegagroup()) || (_peer && _peer->isChannel() && !_peer->isMegagroup())) { } else if ((_history && _history->channelId() && !_history->isMegagroup())
|| (_peer && _peer->isChannel() && !_peer->isMegagroup())) {
_headerText = lang(lng_mediaview_channel_photo); _headerText = lang(lng_mediaview_channel_photo);
} else if (_peer) { } else if (_peer) {
_headerText = lang(lng_mediaview_group_photo); _headerText = lang(lng_mediaview_group_photo);

12
Telegram/SourceFiles/mediaview.h
View File

@ -156,15 +156,15 @@ private:
void updateMixerVideoVolume() const; void updateMixerVideoVolume() const;
struct SharedMedia; struct SharedMedia;
using SharedMediaType = SharedMediaViewer::Type; using SharedMediaType = SharedMediaViewerMerged::Type;
using SharedMediaKey = SharedMediaViewer::Key; using SharedMediaKey = SharedMediaViewerMerged::Key;
base::optional<SharedMediaType> sharedMediaType() const; base::optional<SharedMediaType> sharedMediaType() const;
base::optional<SharedMediaKey> sharedMediaKey() const; base::optional<SharedMediaKey> sharedMediaKey() const;
void validateSharedMedia(); void validateSharedMedia();
bool validSharedMedia() const; bool validSharedMedia() const;
std::unique_ptr<SharedMedia> createSharedMedia() const; std::unique_ptr<SharedMedia> createSharedMedia() const;
void refreshSharedMedia(); void refreshSharedMedia();
void handleSharedMediaUpdate(const SharedMediaSlice &update); void handleSharedMediaUpdate(const SharedMediaSliceMerged &update);
void refreshNavVisibility(); void refreshNavVisibility();
void dropdownHidden(); void dropdownHidden();
@ -244,7 +244,7 @@ private:
PhotoData *_photo = nullptr; PhotoData *_photo = nullptr;
DocumentData *_doc = nullptr; DocumentData *_doc = nullptr;
std::unique_ptr<SharedMedia> _sharedMedia; std::unique_ptr<SharedMedia> _sharedMedia;
base::optional<SharedMediaSlice> _sharedMediaData; base::optional<SharedMediaSliceMerged> _sharedMediaData;
QRect _closeNav, _closeNavIcon; QRect _closeNav, _closeNavIcon;
QRect _leftNav, _leftNavIcon, _rightNav, _rightNavIcon; QRect _leftNav, _leftNavIcon, _rightNav, _rightNavIcon;
@ -326,9 +326,7 @@ private:
base::optional<int> _index; // Index in current _sharedMedia data. base::optional<int> _index; // Index in current _sharedMedia data.
base::optional<int> _fullIndex; // Index in full shared media. base::optional<int> _fullIndex; // Index in full shared media.
base::optional<int> _fullCount; base::optional<int> _fullCount;
MsgId _msgid = 0; // msgId of current photo or file FullMsgId _msgid;
bool _msgmigrated = false; // msgId is from _migrated history
ChannelId _channel = NoChannel;
bool _canForward = false; bool _canForward = false;
bool _canDelete = false; bool _canDelete = false;

3
Telegram/SourceFiles/stdafx.h
View File

@ -74,6 +74,9 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
#include "base/variant.h" #include "base/variant.h"
#include "base/optional.h" #include "base/optional.h"
#include "base/algorithm.h" #include "base/algorithm.h"
#include "base/functors.h"
namespace func = base::functors;
#include "base/flat_set.h" #include "base/flat_set.h"
#include "base/flat_map.h" #include "base/flat_map.h"

7
Telegram/SourceFiles/storage/storage_shared_media.cpp
View File

@ -316,6 +316,13 @@ void SharedMedia::query(
if (peerIt != _lists.end()) { if (peerIt != _lists.end()) {
auto index = static_cast<int>(query.key.type); auto index = static_cast<int>(query.key.type);
peerIt->second[index].query(query, std::move(callback)); peerIt->second[index].query(query, std::move(callback));
} else {
base::TaskQueue::Main().Put(
[
callback = std::move(callback)
]() mutable {
callback(SharedMediaResult());
});
} }
} }

3
Telegram/SourceFiles/structs.h
View File

@ -89,6 +89,9 @@ struct FullMsgId {
FullMsgId() = default; FullMsgId() = default;
FullMsgId(ChannelId channel, MsgId msg) : channel(channel), msg(msg) { FullMsgId(ChannelId channel, MsgId msg) : channel(channel), msg(msg) {
} }
explicit operator bool() const {
return msg != 0;
}
ChannelId channel = NoChannel; ChannelId channel = NoChannel;
MsgId msg = 0; MsgId msg = 0;
}; };

1
Telegram/gyp/telegram_sources.txt
View File

@ -5,6 +5,7 @@
<(src_loc)/base/enum_mask.h <(src_loc)/base/enum_mask.h
<(src_loc)/base/flat_map.h <(src_loc)/base/flat_map.h
<(src_loc)/base/flat_set.h <(src_loc)/base/flat_set.h
<(src_loc)/base/functors.h
<(src_loc)/base/lambda.h <(src_loc)/base/lambda.h
<(src_loc)/base/lambda_guard.h <(src_loc)/base/lambda_guard.h
<(src_loc)/base/index_based_iterator.h <(src_loc)/base/index_based_iterator.h