Improve paid peer-box multi-send.

Telegram/SourceFiles/boxes/peer_list_box.cpp

@@ -873,6 +873,7 @@ void PeerListRow::paintUserpic(
 	} else if (const auto callback = generatePaintUserpicCallback(false)) {
 		callback(p, x, y, outerWidth, st.photoSize);
 	}
+	paintUserpicOverlay(p, st, x, y, outerWidth);
 }
 
 // Emulates Ui::RoundImageCheckbox::paint() in a checked state.

Telegram/SourceFiles/boxes/peer_list_box.h

@@ -95,6 +95,13 @@ public:
 	[[nodiscard]] virtual QString generateShortName();
 	[[nodiscard]] virtual auto generatePaintUserpicCallback(
 		bool forceRound) -> PaintRoundImageCallback;
+	virtual void paintUserpicOverlay(
+		Painter &p,
+		const style::PeerListItem &st,
+		int x,
+		int y,
+		int outerWidth) {
+	}
 
 	[[nodiscard]] virtual auto generateNameFirstLetters() const
 		-> const base::flat_set<QChar> &;

Telegram/SourceFiles/boxes/peer_list_controllers.cpp

@@ -311,24 +311,23 @@ void RecipientRow::setRestriction(Api::MessageMoneyRestriction restriction) {
 	_restriction->value = restriction;
 }
 
-PaintRoundImageCallback RecipientRow::generatePaintUserpicCallback(
-		bool forceRound) {
-	auto result = PeerListRow::generatePaintUserpicCallback(forceRound);
+void RecipientRow::paintUserpicOverlay(
+		Painter &p,
+		const style::PeerListItem &st,
+		int x,
+		int y,
+		int outerWidth) {
 	if (const auto &r = _restriction) {
-		return [=](Painter &p, int x, int y, int outerWidth, int size) {
-			result(p, x, y, outerWidth, size);
-			PaintRestrictionBadge(
-				p,
-				_maybeLockedSt,
-				r->value.starsPerMessage,
-				r->cache,
-				x,
-				y,
-				outerWidth,
-				size);
-		};
+		PaintRestrictionBadge(
+			p,
+			_maybeLockedSt,
+			r->value.starsPerMessage,
+			r->cache,
+			x,
+			y,
+			outerWidth,
+			st.photoSize);
 	}
-	return result;
 }
 
 bool RecipientRow::refreshLock(

Telegram/SourceFiles/boxes/peer_list_controllers.h

@@ -136,8 +136,12 @@ public:
 	[[nodiscard]] History *maybeHistory() const {
 		return _maybeHistory;
 	}
-	PaintRoundImageCallback generatePaintUserpicCallback(
-		bool forceRound) override;
+	void paintUserpicOverlay(
+		Painter &p,
+		const style::PeerListItem &st,
+		int x,
+		int y,
+		int outerWidth) override;
 
 	void preloadUserpic() override;
 

Telegram/SourceFiles/boxes/share_box.cpp

@@ -675,7 +675,7 @@ void ShareBox::submit(Api::SendOptions options) {
 		});
 
 		const auto alreadyApproved = options.starsApproved;
-		auto paid = std::vector<not_null<Data::Thread*>>();
+		auto paid = std::vector<not_null<PeerData*>>();
 		auto waiting = base::flat_set<not_null<PeerData*>>();
 		auto totalStars = 0;
 		for (const auto &thread : threads) {
@@ -685,7 +685,7 @@ void ShareBox::submit(Api::SendOptions options) {
 				waiting.emplace(peer);
 			} else if (details->stars > 0) {
 				totalStars += details->stars;
-				paid.push_back(thread);
+				paid.push_back(peer);
 			}
 		}
 		if (!waiting.empty()) {
@@ -963,7 +963,7 @@ void ShareBox::Inner::initChatRestriction(not_null<Chat*> chat) {
 		const auto restriction = Api::ResolveMessageMoneyRestrictions(
 			history->peer,
 			history);
-		if (restriction) {
+		if (restriction || restriction.known) {
 			chat->restriction = restriction;
 		}
 	}