HistoryMedia always holds a pointer to its parent HistoryItem.

Using local cached data when sending media inline bot results.

Telegram/SourceFiles/app.cpp

@@ -2336,7 +2336,7 @@ namespace {
 			GifItems gifs = ::gifItems;
 			for (GifItems::const_iterator i = gifs.cbegin(), e = gifs.cend(); i != e; ++i) {
 				if (HistoryMedia *media = i.value()->getMedia()) {
-					media->stopInline(i.value());
+					media->stopInline();
 				}
 			}
 		}

Telegram/SourceFiles/history.h

@@ -1004,14 +1004,14 @@ public:
 	HistoryMedia *data() const {
 		return _p;
 	}
-	void reset(HistoryItem *host, HistoryMedia *p = nullptr);
+	void reset(HistoryMedia *p = nullptr);
+	void clear() {
+		reset();
+	}
 	bool isNull() const {
 		return data() == nullptr;
 	}
 
-	void clear(HistoryItem *host) {
-		reset(host);
-	}
 	HistoryMedia *operator->() const {
 		return data();
 	}
@@ -1023,7 +1023,7 @@ public:
 		return !isNull();
 	}
 	~HistoryMediaPtr() {
-		t_assert(isNull());
+		clear();
 	}
 
 private:
@@ -1192,14 +1192,14 @@ public:
 	virtual bool needCheck() const {
 		return out() || (id < 0 && history()->peer->isSelf());
 	}
-	virtual bool hasPoint(int32 x, int32 y) const {
+	virtual bool hasPoint(int x, int y) const {
 		return false;
 	}
-	virtual void getState(ClickHandlerPtr &lnk, HistoryCursorState &state, int32 x, int32 y) const {
+	virtual void getState(ClickHandlerPtr &lnk, HistoryCursorState &state, int x, int y) const {
 		lnk.clear();
 		state = HistoryDefaultCursorState;
 	}
-	virtual void getSymbol(uint16 &symbol, bool &after, bool &upon, int32 x, int32 y) const { // from text
+	virtual void getSymbol(uint16 &symbol, bool &after, bool &upon, int x, int y) const { // from text
 		upon = hasPoint(x, y);
 		symbol = upon ? 0xFFFF : 0;
 		after = false;
@@ -1318,7 +1318,7 @@ public:
 	virtual int timeWidth() const {
 		return 0;
 	}
-	virtual bool pointInTime(int32 right, int32 bottom, int32 x, int32 y, InfoDisplayType type) const {
+	virtual bool pointInTime(int32 right, int32 bottom, int x, int y, InfoDisplayType type) const {
 		return false;
 	}
 
@@ -1582,30 +1582,29 @@ private:
 
 class HistoryMedia : public HistoryElem {
 public:
-
+	HistoryMedia(HistoryItem *parent) : _parent(parent) {
-	HistoryMedia() : _width(0) {
-	}
-	HistoryMedia(const HistoryMedia &other) : _width(0) {
 	}
+	HistoryMedia(const HistoryMedia &other) = delete;
+	HistoryMedia &operator=(const HistoryMedia &other) = delete;
 
 	virtual HistoryMediaType type() const = 0;
 	virtual const QString inDialogsText() const = 0;
 	virtual const QString inHistoryText() const = 0;
 
-	bool hasPoint(int x, int y, const HistoryItem *parent) const {
+	bool hasPoint(int x, int y) const {
 		return (x >= 0 && y >= 0 && x < _width && y < _height);
 	}
 
 	virtual bool isDisplayed() const {
 		return true;
 	}
-	virtual void initDimensions(const HistoryItem *parent) = 0;
+	virtual void initDimensions() = 0;
-	virtual int resizeGetHeight(int width, const HistoryItem *parent) {
+	virtual int resizeGetHeight(int width) {
 		_width = qMin(width, _maxw);
 		return _height;
 	}
-	virtual void draw(Painter &p, const HistoryItem *parent, const QRect &r, bool selected, uint64 ms) const = 0;
+	virtual void draw(Painter &p, const QRect &r, bool selected, uint64 ms) const = 0;
-	virtual void getState(ClickHandlerPtr &lnk, HistoryCursorState &state, int x, int y, const HistoryItem *parent) const = 0;
+	virtual void getState(ClickHandlerPtr &lnk, HistoryCursorState &state, int x, int y) const = 0;
 
 	// if we are in selecting items mode perhaps we want to
 	// toggle selection instead of activating the pressed link
@@ -1619,15 +1618,15 @@ public:
 	// if we press and drag this link should we drag the item
 	virtual bool dragItemByHandler(const ClickHandlerPtr &p) const = 0;
 
-	virtual void clickHandlerActiveChanged(HistoryItem *parent, const ClickHandlerPtr &p, bool active) {
+	virtual void clickHandlerActiveChanged(const ClickHandlerPtr &p, bool active) {
 	}
-	virtual void clickHandlerPressedChanged(HistoryItem *parent, const ClickHandlerPtr &p, bool pressed) {
+	virtual void clickHandlerPressedChanged(const ClickHandlerPtr &p, bool pressed) {
 	}
 
 	virtual bool uploading() const {
 		return false;
 	}
-	virtual HistoryMedia *clone() const = 0;
+	virtual HistoryMedia *clone(HistoryItem *newParent) const = 0;
 
 	virtual DocumentData *getDocument() {
 		return nullptr;
@@ -1636,22 +1635,28 @@ public:
 		return nullptr;
 	}
 
-	bool playInline(HistoryItem *item/*, bool autoplay = false*/) {
+	bool playInline(/*bool autoplay = false*/) {
-		return playInline(item, false);
+		return playInline(false);
 	}
-	virtual bool playInline(HistoryItem *item, bool autoplay) {
+	virtual bool playInline(bool autoplay) {
 		return false;
 	}
-	virtual void stopInline(HistoryItem *item) {
+	virtual void stopInline() {
 	}
 
-	virtual void attachToItem(HistoryItem *item) {
+	virtual void attachToParent() {
 	}
 
-	virtual void detachFromItem(HistoryItem *item) {
+	virtual void detachFromParent() {
 	}
 
-	virtual void updateFrom(const MTPMessageMedia &media, HistoryItem *parent) {
+	virtual void updateSentMedia(const MTPMessageMedia &media) {
+	}
+
+	// After sending an inline result we may want to completely recreate
+	// the media (all media that was generated on client side, for example)
+	virtual bool needReSetInlineResultMedia(const MTPMessageMedia &media) {
+		return true;
 	}
 
 	virtual bool animating() const {
@@ -1667,7 +1672,7 @@ public:
 	virtual QString getCaption() const {
 		return QString();
 	}
-	virtual bool needsBubble(const HistoryItem *parent) const = 0;
+	virtual bool needsBubble() const = 0;
 	virtual bool customInfoLayout() const = 0;
 	virtual QMargins bubbleMargins() const {
 		return QMargins();
@@ -1684,8 +1689,8 @@ public:
 	}
 
 protected:
-
+	HistoryItem *_parent;
-	int _width;
+	int _width = 0;
 
 };
 
@@ -1704,8 +1709,7 @@ inline MediaOverviewType mediaToOverviewType(HistoryMedia *media) {
 
 class HistoryFileMedia : public HistoryMedia {
 public:
-
+	using HistoryMedia::HistoryMedia;
-	HistoryFileMedia();
 
 	bool toggleSelectionByHandlerClick(const ClickHandlerPtr &p) const override {
 		return p == _openl || p == _savel || p == _cancell;
@@ -1714,13 +1718,12 @@ public:
 		return p == _openl || p == _savel || p == _cancell;
 	}
 
-	void clickHandlerActiveChanged(HistoryItem *parent, const ClickHandlerPtr &p, bool active) override;
+	void clickHandlerActiveChanged(const ClickHandlerPtr &p, bool active) override;
-	void clickHandlerPressedChanged(HistoryItem *parent, const ClickHandlerPtr &p, bool pressed) override;
+	void clickHandlerPressedChanged(const ClickHandlerPtr &p, bool pressed) override;
 
 	~HistoryFileMedia();
 
 protected:
-
 	ClickHandlerPtr _openl, _savel, _cancell;
 	void setLinks(ClickHandlerPtr &&openl, ClickHandlerPtr &&savel, ClickHandlerPtr &&cancell);
 	void setDocumentLinks(DocumentData *document, bool inlinegif = false) {
@@ -1751,10 +1754,10 @@ protected:
 	// duration = -1 - no duration, duration = -2 - "GIF" duration
 	void setStatusSize(int32 newSize, int32 fullSize, int32 duration, qint64 realDuration) const;
 
-	void step_thumbOver(const HistoryItem *parent, float64 ms, bool timer);
+	void step_thumbOver(float64 ms, bool timer);
-	void step_radial(const HistoryItem *parent, uint64 ms, bool timer);
+	void step_radial(uint64 ms, bool timer);
 
-	void ensureAnimation(const HistoryItem *parent) const;
+	void ensureAnimation() const;
 	void checkAnimationFinished();
 
 	bool isRadialAnimation(uint64 ms) const {
@@ -1784,33 +1787,29 @@ protected:
 
 		RadialAnimation radial;
 	};
-	mutable AnimationData *_animation;
+	mutable AnimationData *_animation = nullptr;
-
-private:
-
-	HistoryFileMedia(const HistoryFileMedia &other);
 
 };
 
 class HistoryPhoto : public HistoryFileMedia {
 public:
+	HistoryPhoto(HistoryItem *parent, PhotoData *photo, const QString &caption);
+	HistoryPhoto(HistoryItem *parent, PeerData *chat, const MTPDphoto &photo, int width);
+	HistoryPhoto(HistoryItem *parent, const HistoryPhoto &other);
 
-	HistoryPhoto(PhotoData *photo, const QString &caption, const HistoryItem *parent);
-	HistoryPhoto(PeerData *chat, const MTPDphoto &photo, int32 width = 0);
-	HistoryPhoto(const HistoryPhoto &other);
 	void init();
 	HistoryMediaType type() const override {
 		return MediaTypePhoto;
 	}
-	HistoryMedia *clone() const override {
+	HistoryPhoto *clone(HistoryItem *newParent) const override {
-		return new HistoryPhoto(*this);
+		return new HistoryPhoto(newParent, *this);
 	}
 
-	void initDimensions(const HistoryItem *parent) override;
+	void initDimensions() override;
-	int resizeGetHeight(int width, const HistoryItem *parent) override;
+	int resizeGetHeight(int width) override;
 
-	void draw(Painter &p, const HistoryItem *parent, const QRect &r, bool selected, uint64 ms) const override;
+	void draw(Painter &p, const QRect &r, bool selected, uint64 ms) const override;
-	void getState(ClickHandlerPtr &lnk, HistoryCursorState &state, int x, int y, const HistoryItem *parent) const override;
+	void getState(ClickHandlerPtr &lnk, HistoryCursorState &state, int x, int y) const override;
 
 	const QString inDialogsText() const override;
 	const QString inHistoryText() const override;
@@ -1819,10 +1818,11 @@ public:
 		return _data;
 	}
 
-	void updateFrom(const MTPMessageMedia &media, HistoryItem *parent) override;
+	void updateSentMedia(const MTPMessageMedia &media) override;
+	bool needReSetInlineResultMedia(const MTPMessageMedia &media) override;
 
-	void attachToItem(HistoryItem *item) override;
+	void attachToParent() override;
-	void detachFromItem(HistoryItem *item) override;
+	void detachFromParent() override;
 
 	bool hasReplyPreview() const override {
 		return !_data->thumb->isNull();
@@ -1832,8 +1832,14 @@ public:
 	QString getCaption() const override {
 		return _caption.original();
 	}
-	bool needsBubble(const HistoryItem *parent) const override {
+	bool needsBubble() const override {
-		return !_caption.isEmpty() || parent->Has<HistoryMessageForwarded>() || parent->Has<HistoryMessageReply>() || parent->viaBot();
+		if (!_caption.isEmpty()) {
+			return true;
+		}
+		if (_parent->viaBot()) {
+			return true;
+		}
+		return (_parent->Has<HistoryMessageForwarded>() || _parent->Has<HistoryMessageReply>());
 	}
 	bool customInfoLayout() const override {
 		return _caption.isEmpty();
@@ -1843,7 +1849,6 @@ public:
 	}
 
 protected:
-
 	float64 dataProgress() const override {
 		return _data->progress();
 	}
@@ -1864,21 +1869,20 @@ private:
 
 class HistoryVideo : public HistoryFileMedia {
 public:
-
+	HistoryVideo(HistoryItem *parent, DocumentData *document, const QString &caption);
-	HistoryVideo(DocumentData *document, const QString &caption, const HistoryItem *parent);
+	HistoryVideo(HistoryItem *parent, const HistoryVideo &other);
-	HistoryVideo(const HistoryVideo &other);
 	HistoryMediaType type() const override {
 		return MediaTypeVideo;
 	}
-	HistoryMedia *clone() const override {
+	HistoryVideo *clone(HistoryItem *newParent) const override {
-		return new HistoryVideo(*this);
+		return new HistoryVideo(newParent, *this);
 	}
 
-	void initDimensions(const HistoryItem *parent) override;
+	void initDimensions() override;
-	int resizeGetHeight(int width, const HistoryItem *parent) override;
+	int resizeGetHeight(int width) override;
 
-	void draw(Painter &p, const HistoryItem *parent, const QRect &r, bool selected, uint64 ms) const override;
+	void draw(Painter &p, const QRect &r, bool selected, uint64 ms) const override;
-	void getState(ClickHandlerPtr &lnk, HistoryCursorState &state, int x, int y, const HistoryItem *parent) const override;
+	void getState(ClickHandlerPtr &lnk, HistoryCursorState &state, int x, int y) const override;
 
 	const QString inDialogsText() const override;
 	const QString inHistoryText() const override;
@@ -1891,8 +1895,10 @@ public:
 		return _data->uploading();
 	}
 
-	void attachToItem(HistoryItem *item) override;
+	void attachToParent() override;
-	void detachFromItem(HistoryItem *item) override;
+	void detachFromParent() override;
+
+	bool needReSetInlineResultMedia(const MTPMessageMedia &media) override;
 
 	bool hasReplyPreview() const override {
 		return !_data->thumb->isNull();
@@ -1902,8 +1908,14 @@ public:
 	QString getCaption() const override {
 		return _caption.original();
 	}
-	bool needsBubble(const HistoryItem *parent) const override {
+	bool needsBubble() const override {
-		return !_caption.isEmpty() || parent->Has<HistoryMessageForwarded>() || parent->Has<HistoryMessageReply>() || parent->viaBot();
+		if (!_caption.isEmpty()) {
+			return true;
+		}
+		if (_parent->viaBot()) {
+			return true;
+		}
+		return (_parent->Has<HistoryMessageForwarded>() || _parent->Has<HistoryMessageReply>());
 	}
 	bool customInfoLayout() const override {
 		return _caption.isEmpty();
@@ -1913,7 +1925,6 @@ public:
 	}
 
 protected:
-
 	float64 dataProgress() const override {
 		return _data->progress();
 	}
@@ -1930,7 +1941,7 @@ private:
 	Text _caption;
 
 	void setStatusSize(int32 newSize) const;
-	void updateStatusText(const HistoryItem *parent) const;
+	void updateStatusText() const;
 
 };
 
@@ -1971,21 +1982,20 @@ struct HistoryDocumentVoice : public BaseComponent<HistoryDocumentVoice> {
 
 class HistoryDocument : public HistoryFileMedia, public Composer {
 public:
-
+	HistoryDocument(HistoryItem *parent, DocumentData *document, const QString &caption);
-	HistoryDocument(DocumentData *document, const QString &caption, const HistoryItem *parent);
+	HistoryDocument(HistoryItem *parent, const HistoryDocument &other);
-	HistoryDocument(const HistoryDocument &other);
 	HistoryMediaType type() const override {
 		return _data->voice() ? MediaTypeVoiceFile : (_data->song() ? MediaTypeMusicFile : MediaTypeFile);
 	}
-	HistoryMedia *clone() const override {
+	HistoryDocument *clone(HistoryItem *newParent) const override {
-		return new HistoryDocument(*this);
+		return new HistoryDocument(newParent, *this);
 	}
 
-	void initDimensions(const HistoryItem *parent) override;
+	void initDimensions() override;
-	int resizeGetHeight(int width, const HistoryItem *parent) override;
+	int resizeGetHeight(int width) override;
 
-	void draw(Painter &p, const HistoryItem *parent, const QRect &r, bool selected, uint64 ms) const override;
+	void draw(Painter &p, const QRect &r, bool selected, uint64 ms) const override;
-	void getState(ClickHandlerPtr &lnk, HistoryCursorState &state, int32 x, int32 y, const HistoryItem *parent) const override;
+	void getState(ClickHandlerPtr &lnk, HistoryCursorState &state, int x, int y) const override;
 
 	const QString inDialogsText() const override;
 	const QString inHistoryText() const override;
@@ -1998,10 +2008,11 @@ public:
 		return _data;
 	}
 
-	void attachToItem(HistoryItem *item) override;
+	void attachToParent() override;
-	void detachFromItem(HistoryItem *item) override;
+	void detachFromParent() override;
 
-	void updateFrom(const MTPMessageMedia &media, HistoryItem *parent) override;
+	void updateSentMedia(const MTPMessageMedia &media) override;
+	bool needReSetInlineResultMedia(const MTPMessageMedia &media) override;
 
 	bool hasReplyPreview() const override {
 		return !_data->thumb->isNull();
@@ -2014,7 +2025,7 @@ public:
 		}
 		return QString();
 	}
-	bool needsBubble(const HistoryItem *parent) const override {
+	bool needsBubble() const override {
 		return true;
 	}
 	bool customInfoLayout() const override {
@@ -2030,7 +2041,6 @@ public:
 	void step_voiceProgress(float64 ms, bool timer);
 
 protected:
-
 	float64 dataProgress() const override {
 		return _data->progress();
 	}
@@ -2042,33 +2052,30 @@ protected:
 	}
 
 private:
-
 	void createComponents(bool caption);
-	const HistoryItem *_parent;
 	DocumentData *_data;
 
 	void setStatusSize(int32 newSize, qint64 realDuration = 0) const;
-	bool updateStatusText(const HistoryItem *parent) const; // returns showPause
+	bool updateStatusText() const; // returns showPause
 
 };
 
 class HistoryGif : public HistoryFileMedia {
 public:
-
+	HistoryGif(HistoryItem *parent, DocumentData *document, const QString &caption);
-	HistoryGif(DocumentData *document, const QString &caption, const HistoryItem *parent);
+	HistoryGif(HistoryItem *parent, const HistoryGif &other);
-	HistoryGif(const HistoryGif &other);
 	HistoryMediaType type() const override {
 		return MediaTypeGif;
 	}
-	HistoryMedia *clone() const override {
+	HistoryGif *clone(HistoryItem *newParent) const override {
-		return new HistoryGif(*this);
+		return new HistoryGif(newParent, *this);
 	}
 
-	void initDimensions(const HistoryItem *parent) override;
+	void initDimensions() override;
-	int resizeGetHeight(int width, const HistoryItem *parent) override;
+	int resizeGetHeight(int width) override;
 
-	void draw(Painter &p, const HistoryItem *parent, const QRect &r, bool selected, uint64 ms) const override;
+	void draw(Painter &p, const QRect &r, bool selected, uint64 ms) const override;
-	void getState(ClickHandlerPtr &lnk, HistoryCursorState &state, int x, int y, const HistoryItem *parent) const override;
+	void getState(ClickHandlerPtr &lnk, HistoryCursorState &state, int x, int y) const override;
 
 	const QString inDialogsText() const override;
 	const QString inHistoryText() const override;
@@ -2084,13 +2091,14 @@ public:
 		return gif();
 	}
 
-	bool playInline(HistoryItem *item, bool autoplay) override;
+	bool playInline(bool autoplay) override;
-	void stopInline(HistoryItem *item) override;
+	void stopInline() override;
 
-	void attachToItem(HistoryItem *item) override;
+	void attachToParent() override;
-	void detachFromItem(HistoryItem *item) override;
+	void detachFromParent() override;
 
-	void updateFrom(const MTPMessageMedia &media, HistoryItem *parent) override;
+	void updateSentMedia(const MTPMessageMedia &media) override;
+	bool needReSetInlineResultMedia(const MTPMessageMedia &media) override;
 
 	bool hasReplyPreview() const override {
 		return !_data->thumb->isNull();
@@ -2100,8 +2108,14 @@ public:
 	QString getCaption() const override {
 		return _caption.original();
 	}
-	bool needsBubble(const HistoryItem *parent) const override {
+	bool needsBubble() const override {
-		return !_caption.isEmpty() || parent->Has<HistoryMessageForwarded>() || parent->Has<HistoryMessageReply>() || parent->viaBot();
+		if (!_caption.isEmpty()) {
+			return true;
+		}
+		if (_parent->viaBot()) {
+			return true;
+		}
+		return (_parent->Has<HistoryMessageForwarded>() || _parent->Has<HistoryMessageReply>());
 	}
 	bool customInfoLayout() const override {
 		return _caption.isEmpty();
@@ -2113,14 +2127,11 @@ public:
 	~HistoryGif();
 
 protected:
-
 	float64 dataProgress() const override;
 	bool dataFinished() const override;
 	bool dataLoaded() const override;
 
 private:
-
-	const HistoryItem *_parent;
 	DocumentData *_data;
 	int32 _thumbw, _thumbh;
 	Text _caption;
@@ -2134,26 +2145,25 @@ private:
 	}
 
 	void setStatusSize(int32 newSize) const;
-	void updateStatusText(const HistoryItem *parent) const;
+	void updateStatusText() const;
 
 };
 
 class HistorySticker : public HistoryMedia {
 public:
-
+	HistorySticker(HistoryItem *parent, DocumentData *document);
-	HistorySticker(DocumentData *document);
 	HistoryMediaType type() const override {
 		return MediaTypeSticker;
 	}
-	HistoryMedia *clone() const override {
+	HistorySticker *clone(HistoryItem *newParent) const override {
-		return new HistorySticker(*this);
+		return new HistorySticker(newParent, _data);
 	}
 
-	void initDimensions(const HistoryItem *parent) override;
+	void initDimensions() override;
-	int resizeGetHeight(int width, const HistoryItem *parent) override;
+	int resizeGetHeight(int width) override;
 
-	void draw(Painter &p, const HistoryItem *parent, const QRect &r, bool selected, uint64 ms) const override;
+	void draw(Painter &p, const QRect &r, bool selected, uint64 ms) const override;
-	void getState(ClickHandlerPtr &lnk, HistoryCursorState &state, int x, int y, const HistoryItem *parent) const override;
+	void getState(ClickHandlerPtr &lnk, HistoryCursorState &state, int x, int y) const override;
 
 	bool toggleSelectionByHandlerClick(const ClickHandlerPtr &p) const override {
 		return true;
@@ -2172,12 +2182,13 @@ public:
 		return _data;
 	}
 
-	void attachToItem(HistoryItem *item) override;
+	void attachToParent() override;
-	void detachFromItem(HistoryItem *item) override;
+	void detachFromParent() override;
 
-	void updateFrom(const MTPMessageMedia &media, HistoryItem *parent) override;
+	void updateSentMedia(const MTPMessageMedia &media) override;
+	bool needReSetInlineResultMedia(const MTPMessageMedia &media) override;
 
-	bool needsBubble(const HistoryItem *parent) const override {
+	bool needsBubble() const override {
 		return false;
 	}
 	bool customInfoLayout() const override {
@@ -2185,10 +2196,9 @@ public:
 	}
 
 private:
-
 	int additionalWidth(const HistoryMessageVia *via, const HistoryMessageReply *reply) const;
-	int additionalWidth(const HistoryItem *parent) const {
+	int additionalWidth() const {
-		return additionalWidth(parent->Get<HistoryMessageVia>(), parent->Get<HistoryMessageReply>());
+		return additionalWidth(_parent->Get<HistoryMessageVia>(), _parent->Get<HistoryMessageReply>());
 	}
 
 	int16 _pixw, _pixh;
@@ -2214,19 +2224,18 @@ protected:
 
 class HistoryContact : public HistoryMedia {
 public:
-
+	HistoryContact(HistoryItem *parent, int32 userId, const QString &first, const QString &last, const QString &phone);
-	HistoryContact(int32 userId, const QString &first, const QString &last, const QString &phone);
 	HistoryMediaType type() const override {
 		return MediaTypeContact;
 	}
-	HistoryMedia *clone() const override {
+	HistoryContact *clone(HistoryItem *newParent) const override {
-		return new HistoryContact(_userId, _fname, _lname, _phone);
+		return new HistoryContact(newParent, _userId, _fname, _lname, _phone);
 	}
 
-	void initDimensions(const HistoryItem *parent) override;
+	void initDimensions() override;
 
-	void draw(Painter &p, const HistoryItem *parent, const QRect &r, bool selected, uint64 ms) const override;
+	void draw(Painter &p, const QRect &r, bool selected, uint64 ms) const override;
-	void getState(ClickHandlerPtr &lnk, HistoryCursorState &state, int32 x, int32 y, const HistoryItem *parent) const override;
+	void getState(ClickHandlerPtr &lnk, HistoryCursorState &state, int x, int y) const override;
 
 	bool toggleSelectionByHandlerClick(const ClickHandlerPtr &p) const override {
 		return true;
@@ -2238,12 +2247,12 @@ public:
 	const QString inDialogsText() const override;
 	const QString inHistoryText() const override;
 
-	void attachToItem(HistoryItem *item) override;
+	void attachToParent() override;
-	void detachFromItem(HistoryItem *item) override;
+	void detachFromParent() override;
 
-	void updateFrom(const MTPMessageMedia &media, HistoryItem *parent) override;
+	void updateSentMedia(const MTPMessageMedia &media) override;
 
-	bool needsBubble(const HistoryItem *parent) const override {
+	bool needsBubble() const override {
 		return true;
 	}
 	bool customInfoLayout() const override {
@@ -2276,21 +2285,20 @@ private:
 
 class HistoryWebPage : public HistoryMedia {
 public:
-
+	HistoryWebPage(HistoryItem *parent, WebPageData *data);
-	HistoryWebPage(WebPageData *data);
+	HistoryWebPage(HistoryItem *parent, const HistoryWebPage &other);
-	HistoryWebPage(const HistoryWebPage &other);
 	HistoryMediaType type() const override {
 		return MediaTypeWebPage;
 	}
-	HistoryMedia *clone() const override {
+	HistoryWebPage *clone(HistoryItem *newParent) const override {
-		return new HistoryWebPage(*this);
+		return new HistoryWebPage(newParent, *this);
 	}
 
-	void initDimensions(const HistoryItem *parent) override;
+	void initDimensions() override;
-	int resizeGetHeight(int width, const HistoryItem *parent) override;
+	int resizeGetHeight(int width) override;
 
-	void draw(Painter &p, const HistoryItem *parent, const QRect &r, bool selected, uint64 ms) const override;
+	void draw(Painter &p, const QRect &r, bool selected, uint64 ms) const override;
-	void getState(ClickHandlerPtr &lnk, HistoryCursorState &state, int x, int y, const HistoryItem *parent) const override;
+	void getState(ClickHandlerPtr &lnk, HistoryCursorState &state, int x, int y) const override;
 
 	bool toggleSelectionByHandlerClick(const ClickHandlerPtr &p) const override {
 		return _attach && _attach->toggleSelectionByHandlerClick(p);
@@ -2302,8 +2310,8 @@ public:
 	const QString inDialogsText() const override;
 	const QString inHistoryText() const override;
 
-	void clickHandlerActiveChanged(HistoryItem *parent, const ClickHandlerPtr &p, bool active) override;
+	void clickHandlerActiveChanged(const ClickHandlerPtr &p, bool active) override;
-	void clickHandlerPressedChanged(HistoryItem *parent, const ClickHandlerPtr &p, bool pressed) override;
+	void clickHandlerPressedChanged(const ClickHandlerPtr &p, bool pressed) override;
 
 	bool isDisplayed() const override {
 		return !_data->pendingTill;
@@ -2314,15 +2322,15 @@ public:
 	ClipReader *getClipReader() override {
 		return _attach ? _attach->getClipReader() : 0;
 	}
-	bool playInline(HistoryItem *item, bool autoplay) override {
+	bool playInline(bool autoplay) override {
-		return _attach ? _attach->playInline(item, autoplay) : false;
+		return _attach ? _attach->playInline(autoplay) : false;
 	}
-	void stopInline(HistoryItem *item) override {
+	void stopInline() override {
-		if (_attach) _attach->stopInline(item);
+		if (_attach) _attach->stopInline();
 	}
 
-	void attachToItem(HistoryItem *item) override;
+	void attachToParent() override;
-	void detachFromItem(HistoryItem *item) override;
+	void detachFromParent() override;
 
 	bool hasReplyPreview() const override {
 		return (_data->photo && !_data->photo->thumb->isNull()) || (_data->document && !_data->document->thumb->isNull());
@@ -2333,7 +2341,7 @@ public:
 		return _data;
 	}
 
-	bool needsBubble(const HistoryItem *parent) const override {
+	bool needsBubble() const override {
 		return true;
 	}
 	bool customInfoLayout() const override {
@@ -2408,20 +2416,20 @@ private:
 
 class HistoryLocation : public HistoryMedia {
 public:
-
+	HistoryLocation(HistoryItem *parent, const LocationCoords &coords, const QString &title = QString(), const QString &description = QString());
-	HistoryLocation(const LocationCoords &coords, const QString &title = QString(), const QString &description = QString());
+	HistoryLocation(HistoryItem *parent, const HistoryLocation &other);
 	HistoryMediaType type() const override {
 		return MediaTypeLocation;
 	}
-	HistoryMedia *clone() const override {
+	HistoryLocation *clone(HistoryItem *newParent) const override {
-		return new HistoryLocation(*this);
+		return new HistoryLocation(newParent, *this);
 	}
 
-	void initDimensions(const HistoryItem *parent) override;
+	void initDimensions() override;
-	int resizeGetHeight(int32 width, const HistoryItem *parent) override;
+	int resizeGetHeight(int32 width) override;
 
-	void draw(Painter &p, const HistoryItem *parent, const QRect &r, bool selected, uint64 ms) const override;
+	void draw(Painter &p, const QRect &r, bool selected, uint64 ms) const override;
-	void getState(ClickHandlerPtr &lnk, HistoryCursorState &state, int32 x, int32 y, const HistoryItem *parent) const override;
+	void getState(ClickHandlerPtr &lnk, HistoryCursorState &state, int x, int y) const override;
 
 	bool toggleSelectionByHandlerClick(const ClickHandlerPtr &p) const override {
 		return p == _link;
@@ -2433,8 +2441,14 @@ public:
 	const QString inDialogsText() const override;
 	const QString inHistoryText() const override;
 
-	bool needsBubble(const HistoryItem *parent) const override {
+	bool needsBubble() const override {
-		return !_title.isEmpty() || !_description.isEmpty() || parent->Has<HistoryMessageForwarded>() || parent->Has<HistoryMessageReply>() || parent->viaBot();
+		if (!_title.isEmpty() || !_description.isEmpty()) {
+			return true;
+		}
+		if (_parent->viaBot()) {
+			return true;
+		}
+		return (_parent->Has<HistoryMessageForwarded>() || _parent->Has<HistoryMessageReply>());
 	}
 	bool customInfoLayout() const override {
 		return true;
@@ -2494,7 +2508,7 @@ public:
 		return _text.isEmpty();
 	}
 	bool drawBubble() const {
-		return _media ? (!emptyText() || _media->needsBubble(this)) : true;
+		return _media ? (!emptyText() || _media->needsBubble()) : true;
 	}
 	bool hasBubble() const override {
 		return drawBubble();
@@ -2518,23 +2532,23 @@ public:
 
 	void destroy() override;
 
-	bool hasPoint(int32 x, int32 y) const override;
+	bool hasPoint(int x, int y) const override;
-	bool pointInTime(int32 right, int32 bottom, int32 x, int32 y, InfoDisplayType type) const override;
+	bool pointInTime(int32 right, int32 bottom, int x, int y, InfoDisplayType type) const override;
 
-	void getState(ClickHandlerPtr &lnk, HistoryCursorState &state, int32 x, int32 y) const override;
+	void getState(ClickHandlerPtr &lnk, HistoryCursorState &state, int x, int y) const override;
 
-	void getSymbol(uint16 &symbol, bool &after, bool &upon, int32 x, int32 y) const override;
+	void getSymbol(uint16 &symbol, bool &after, bool &upon, int x, int y) const override;
 	uint32 adjustSelection(uint16 from, uint16 to, TextSelectType type) const override {
 		return _text.adjustSelection(from, to, type);
 	}
 
 	// ClickHandlerHost interface
 	void clickHandlerActiveChanged(const ClickHandlerPtr &p, bool active) override {
-		if (_media) _media->clickHandlerActiveChanged(this, p, active);
+		if (_media) _media->clickHandlerActiveChanged(p, active);
 		HistoryItem::clickHandlerActiveChanged(p, active);
 	}
 	void clickHandlerPressedChanged(const ClickHandlerPtr &p, bool pressed) override {
-		if (_media) _media->clickHandlerActiveChanged(this, p, pressed);
+		if (_media) _media->clickHandlerActiveChanged(p, pressed);
 		HistoryItem::clickHandlerPressedChanged(p, pressed);
 	}
 
@@ -2738,19 +2752,19 @@ public:
 	void countPositionAndSize(int32 &left, int32 &width) const;
 
 	void draw(Painter &p, const QRect &r, uint32 selection, uint64 ms) const override;
-	bool hasPoint(int32 x, int32 y) const override;
+	bool hasPoint(int x, int y) const override;
-	void getState(ClickHandlerPtr &lnk, HistoryCursorState &state, int32 x, int32 y) const override;
+	void getState(ClickHandlerPtr &lnk, HistoryCursorState &state, int x, int y) const override;
-	void getSymbol(uint16 &symbol, bool &after, bool &upon, int32 x, int32 y) const override;
+	void getSymbol(uint16 &symbol, bool &after, bool &upon, int x, int y) const override;
 	uint32 adjustSelection(uint16 from, uint16 to, TextSelectType type) const override {
 		return _text.adjustSelection(from, to, type);
 	}
 
 	void clickHandlerActiveChanged(const ClickHandlerPtr &p, bool active) override {
-		if (_media) _media->clickHandlerActiveChanged(this, p, active);
+		if (_media) _media->clickHandlerActiveChanged(p, active);
 		HistoryItem::clickHandlerActiveChanged(p, active);
 	}
 	void clickHandlerPressedChanged(const ClickHandlerPtr &p, bool pressed) override {
-		if (_media) _media->clickHandlerPressedChanged(this, p, pressed);
+		if (_media) _media->clickHandlerPressedChanged(p, pressed);
 		HistoryItem::clickHandlerPressedChanged(p, pressed);
 	}
 
@@ -2798,8 +2812,8 @@ public:
 		return _create(history, newItem, date);
 	}
 
-	void getState(ClickHandlerPtr &lnk, HistoryCursorState &state, int32 x, int32 y) const;
+	void getState(ClickHandlerPtr &lnk, HistoryCursorState &state, int x, int y) const;
-	void getSymbol(uint16 &symbol, bool &after, bool &upon, int32 x, int32 y) const {
+	void getSymbol(uint16 &symbol, bool &after, bool &upon, int x, int y) const {
 		symbol = 0xFFFF;
 		after = false;
 		upon = false;
@@ -2852,8 +2866,8 @@ public:
 	}
 
 	void draw(Painter &p, const QRect &r, uint32 selection, uint64 ms) const;
-	void getState(ClickHandlerPtr &lnk, HistoryCursorState &state, int32 x, int32 y) const;
+	void getState(ClickHandlerPtr &lnk, HistoryCursorState &state, int x, int y) const;
-	void getSymbol(uint16 &symbol, bool &after, bool &upon, int32 x, int32 y) const {
+	void getSymbol(uint16 &symbol, bool &after, bool &upon, int x, int y) const {
 		symbol = 0xFFFF;
 		after = false;
 		upon = false;

Telegram/SourceFiles/inline_bots/inline_bot_result.cpp

@@ -310,12 +310,14 @@ void Result::createPhoto() {
 	if (_photo) return;
 
 	if (_thumb_url.isEmpty()) {
-		QSize thumb = shrinkToKeepAspect(_width, _height, 100, 100);
+		QSize thumbsize = shrinkToKeepAspect(_width, _height, 100, 100);
-		_thumb = ImagePtr(thumb.width(), thumb.height());
+		_thumb = ImagePtr(thumbsize.width(), thumbsize.height());
 	} else {
-		_thumb = ImagePtr(_thumb_url, QSize(100, 100));
+		_thumb = ImagePtr(_thumb_url, QSize(320, 320));
 	}
-	ImagePtr medium = ImagePtr(_content_url, QSize(320, 320));
+//	ImagePtr medium = ImagePtr(_content_url, QSize(320, 320));
+	QSize mediumsize = shrinkToKeepAspect(_width, _height, 320, 320);
+	ImagePtr medium = ImagePtr(mediumsize.width(), mediumsize.height());
 
 	uint64 photoId = rand_value<uint64>();
 	_photo = App::photoSet(photoId, 0, 0, unixtime(), _thumb, medium, ImagePtr(_width, _height));

Telegram/SourceFiles/localstorage.cpp

@@ -2747,13 +2747,15 @@ namespace Local {
 		return _stickerImagesMap.constFind(location) != _stickerImagesMap.cend();
 	}
 
-	void copyStickerImage(const StorageKey &oldLocation, const StorageKey &newLocation) {
+	bool copyStickerImage(const StorageKey &oldLocation, const StorageKey &newLocation) {
 		auto i = _stickerImagesMap.constFind(oldLocation);
-		if (i != _stickerImagesMap.cend()) {
+		if (i == _stickerImagesMap.cend()) {
-			_stickerImagesMap.insert(newLocation, i.value());
+			return false;
-			_mapChanged = true;
-			_writeMap();
 		}
+		_stickerImagesMap.insert(newLocation, i.value());
+		_mapChanged = true;
+		_writeMap();
+		return true;
 	}
 
 	int32 hasStickers() {
@@ -2815,13 +2817,15 @@ namespace Local {
 		return _localLoader->addTask(new AudioLoadTask(j->first, location, loader));
 	}
 
-	void copyAudio(const StorageKey &oldLocation, const StorageKey &newLocation) {
+	bool copyAudio(const StorageKey &oldLocation, const StorageKey &newLocation) {
 		auto i = _audiosMap.constFind(oldLocation);
-		if (i != _audiosMap.cend()) {
+		if (i == _audiosMap.cend()) {
-			_audiosMap.insert(newLocation, i.value());
+			return false;
-			_mapChanged = true;
-			_writeMap();
 		}
+		_audiosMap.insert(newLocation, i.value());
+		_mapChanged = true;
+		_writeMap();
+		return true;
 	}
 
 	int32 hasAudios() {

Telegram/SourceFiles/localstorage.h

@@ -129,13 +129,13 @@ namespace Local {
 	void writeStickerImage(const StorageKey &location, const QByteArray &data, bool overwrite = true);
 	TaskId startStickerImageLoad(const StorageKey &location, mtpFileLoader *loader);
 	bool willStickerImageLoad(const StorageKey &location);
-	void copyStickerImage(const StorageKey &oldLocation, const StorageKey &newLocation);
+	bool copyStickerImage(const StorageKey &oldLocation, const StorageKey &newLocation);
 	int32 hasStickers();
 	qint64 storageStickersSize();
 
 	void writeAudio(const StorageKey &location, const QByteArray &data, bool overwrite = true);
 	TaskId startAudioLoad(const StorageKey &location, mtpFileLoader *loader);
-	void copyAudio(const StorageKey &oldLocation, const StorageKey &newLocation);
+	bool copyAudio(const StorageKey &oldLocation, const StorageKey &newLocation);
 	int32 hasAudios();
 	qint64 storageAudiosSize();
 

Telegram/SourceFiles/mainwidget.cpp

@@ -1835,7 +1835,7 @@ void MainWidget::ui_showPeerHistoryAsync(quint64 peerId, qint32 showAtMsgId) {
 void MainWidget::ui_autoplayMediaInlineAsync(qint32 channelId, qint32 msgId) {
 	if (HistoryItem *item = App::histItemById(channelId, msgId)) {
 		if (HistoryMedia *media = item->getMedia()) {
-			media->playInline(item, true);
+			media->playInline(true);
 		}
 	}
 }

Telegram/SourceFiles/mtproto/file_download.cpp

@@ -80,21 +80,21 @@ FileLoader::FileLoader(const QString &toFile, int32 size, LocationType locationT
 , _localTaskId(0) {
 }
 
-QByteArray FileLoader::imageFormat() const {
+QByteArray FileLoader::imageFormat(const QSize &shrinkBox) const {
 	if (_imageFormat.isEmpty() && _locationType == UnknownFileLocation) {
-		readImage();
+		readImage(shrinkBox);
 	}
 	return _imageFormat;
 }
 
-QPixmap FileLoader::imagePixmap() const {
+QPixmap FileLoader::imagePixmap(const QSize &shrinkBox) const {
 	if (_imagePixmap.isNull() && _locationType == UnknownFileLocation) {
-		readImage();
+		readImage(shrinkBox);
 	}
 	return _imagePixmap;
 }
 
-void FileLoader::readImage() const {
+void FileLoader::readImage(const QSize &shrinkBox) const {
 	QByteArray format;
 	switch (_type) {
 	case mtpc_storage_fileGif: format = "GIF"; break;
@@ -102,8 +102,12 @@ void FileLoader::readImage() const {
 	case mtpc_storage_filePng: format = "PNG"; break;
 	default: format = QByteArray(); break;
 	}
-	_imagePixmap = QPixmap::fromImage(App::readImage(_data, &format, false), Qt::ColorOnly);
+	QImage image = App::readImage(_data, &format, false);
-	if (!_imagePixmap.isNull()) {
+	if (!image.isNull()) {
+		if (!shrinkBox.isEmpty() && (image.width() > shrinkBox.width() || image.height() > shrinkBox.height())) {
+			image = image.scaled(shrinkBox, Qt::KeepAspectRatio, Qt::SmoothTransformation);
+		}
+		_imagePixmap = QPixmap::fromImage(image, Qt::ColorOnly);
 		_imageFormat = format;
 	}
 }

Telegram/SourceFiles/mtproto/file_download.h

@@ -120,8 +120,8 @@ public:
 	const QByteArray &bytes() const {
 		return _data;
 	}
-	QByteArray imageFormat() const;
+	QByteArray imageFormat(const QSize &shrinkBox = QSize()) const;
-	QPixmap imagePixmap() const;
+	QPixmap imagePixmap(const QSize &shrinkBox = QSize()) const;
 	QString fileName() const {
 		return _fname;
 	}
@@ -176,6 +176,7 @@ signals:
 	void failed(FileLoader *loader, bool started);
 
 protected:
+	void readImage(const QSize &shrinkBox) const;
 
 	FileLoader *_prev, *_next;
 	int32 _priority;
@@ -210,7 +211,6 @@ protected:
 	TaskId _localTaskId;
 	mutable QByteArray _imageFormat;
 	mutable QPixmap _imagePixmap;
-	void readImage() const;
 
 };
 

Telegram/SourceFiles/structs.cpp

@@ -1441,6 +1441,27 @@ void DocumentData::setContentUrl(const QString &url) {
 	_url = url;
 }
 
+void DocumentData::collectLocalData(DocumentData *local) {
+	if (local == this) return;
+
+	if (!local->_data.isEmpty()) {
+		_data = local->_data;
+		if (voice()) {
+			if (!Local::copyAudio(local->mediaKey(), mediaKey())) {
+				Local::writeAudio(mediaKey(), _data);
+			}
+		} else {
+			if (!Local::copyStickerImage(local->mediaKey(), mediaKey())) {
+				Local::writeStickerImage(mediaKey(), _data);
+			}
+		}
+	}
+	if (!local->_location.isEmpty()) {
+		_location = local->_location;
+		Local::writeFileLocation(mediaKey(), _location);
+	}
+}
+
 DocumentData::~DocumentData() {
 	if (loading()) {
 		_loader->deleteLater();

Telegram/SourceFiles/structs.h

@@ -1101,6 +1101,12 @@ public:
 		return MTP_inputDocumentEmpty();
 	}
 
+	// When we have some client-side generated document
+	// (for example for displaying an external inline bot result)
+	// and it has downloaded data, we can collect that data from it
+	// to (this) received from the server "same" document.
+	void collectLocalData(DocumentData *local);
+
 	~DocumentData();
 
 	DocumentId id;

Telegram/SourceFiles/ui/images.cpp

@@ -687,7 +687,7 @@ int64 imageCacheSize() {
 void RemoteImage::doCheckload() const {
 	if (!amLoading() || !_loader->done()) return;
 
-	QPixmap data = _loader->imagePixmap();
+	QPixmap data = _loader->imagePixmap(shrinkBox());
 	if (data.isNull()) {
 		_loader->deleteLater();
 		_loader->stop();
@@ -699,7 +699,7 @@ void RemoteImage::doCheckload() const {
 		globalAcquiredSize -= int64(_data.width()) * _data.height() * 4;
 	}
 
-	_format = _loader->imageFormat();
+	_format = _loader->imageFormat(shrinkBox());
 	_data = data;
 	_saved = _loader->bytes();
 	const_cast<RemoteImage*>(this)->setInformation(_saved.size(), _data.width(), _data.height());
@@ -709,7 +709,7 @@ void RemoteImage::doCheckload() const {
 
 	_loader->deleteLater();
 	_loader->stop();
-	_loader = 0;
+	_loader = nullptr;
 
 	_forgot = false;
 }
@@ -738,7 +738,7 @@ void RemoteImage::setData(QByteArray &bytes, const QByteArray &bytesFormat) {
 	if (amLoading()) {
 		_loader->deleteLater();
 		_loader->stop();
-		_loader = 0;
+		_loader = nullptr;
 	}
 	_saved = bytes;
 	_format = fmt;
@@ -827,13 +827,13 @@ int32 RemoteImage::loadOffset() const {
 }
 
 StorageImage::StorageImage(const StorageImageLocation &location, int32 size)
-	: _location(location)
+: _location(location)
-	, _size(size) {
+, _size(size) {
 }
 
 StorageImage::StorageImage(const StorageImageLocation &location, QByteArray &bytes)
-	: _location(location)
+: _location(location)
-	, _size(bytes.size()) {
+, _size(bytes.size()) {
 	setData(bytes);
 	if (!_location.isNull()) {
 		Local::writeImage(storageKey(_location), StorageImageSaved(mtpToStorageType(mtpc_storage_filePartial), bytes));
@@ -954,14 +954,8 @@ int32 WebImage::countHeight() const {
 
 void WebImage::setInformation(int32 size, int32 width, int32 height) {
 	_size = size;
-	if (!_box.isEmpty()) {
+	_width = width;
-		QSize final = shrinkToKeepAspect(width, height, _box.width(), _box.height());
+	_height = height;
-		_width = final.width();
-		_height = final.height();
-	} else {
-		_width = width;
-		_height = height;
-	}
 }
 
 FileLoader *WebImage::createLoader(LoadFromCloudSetting fromCloud, bool autoLoading) {

Telegram/SourceFiles/ui/images.h

@@ -268,12 +268,17 @@ public:
 	void load(bool loadFirst = false, bool prior = true);
 	void loadEvenCancelled(bool loadFirst = false, bool prior = true);
 
-	virtual void setInformation(int32 size, int32 width, int32 height) = 0;
-	virtual FileLoader *createLoader(LoadFromCloudSetting fromCloud, bool autoLoading) = 0;
-
 	~RemoteImage();
 
 protected:
+	// If after loading the image we need to shrink it to fit into a
+	// specific size, you can return this size here.
+	virtual QSize shrinkBox() const {
+		return QSize();
+	}
+	virtual void setInformation(int32 size, int32 width, int32 height) = 0;
+	virtual FileLoader *createLoader(LoadFromCloudSetting fromCloud, bool autoLoading) = 0;
+
 	void checkload() const {
 		doCheckload();
 	}
@@ -294,14 +299,14 @@ public:
 	StorageImage(const StorageImageLocation &location, int32 size = 0);
 	StorageImage(const StorageImageLocation &location, QByteArray &bytes);
 
-	void setInformation(int32 size, int32 width, int32 height) override;
-	FileLoader *createLoader(LoadFromCloudSetting fromCloud, bool autoLoading) override;
-
 	const StorageImageLocation &location() const override {
 		return _location;
 	}
 
 protected:
+	void setInformation(int32 size, int32 width, int32 height) override;
+	FileLoader *createLoader(LoadFromCloudSetting fromCloud, bool autoLoading) override;
+
 	StorageImageLocation _location;
 	int32 _size;
 
@@ -349,11 +354,14 @@ public:
 	// If !box.isEmpty() then resize the image to fit in this box.
 	WebImage(const QString &url, QSize box = QSize());
 
+protected:
+
+	QSize shrinkBox() const override {
+		return _box;
+	}
 	void setInformation(int32 size, int32 width, int32 height) override;
 	FileLoader *createLoader(LoadFromCloudSetting fromCloud, bool autoLoading) override;
 
-protected:
-
 	int32 countWidth() const override;
 	int32 countHeight() const override;