Moved HistoryWidget::saveEditMsgDone/Fail to lambdas.

Telegram/SourceFiles/api/api_editing.h

@@ -14,6 +14,12 @@ namespace Api {
 
 struct SendOptions;
 
+const auto kDefaultEditMessagesErrors = {
+	u"MESSAGE_ID_INVALID"_q,
+	u"CHAT_ADMIN_REQUIRED"_q,
+	u"MESSAGE_EDIT_TIME_EXPIRED"_q,
+};
+
 void RescheduleMessage(
 	not_null<HistoryItem*> item,
 	SendOptions options);

Telegram/SourceFiles/boxes/edit_caption_box.cpp

@@ -953,15 +953,9 @@ void EditCaptionBox::save() {
 	});
 
 	const auto fail = crl::guard(this, [=](const RPCError &error) {
-		const auto defaultErrors = {
-			u"MESSAGE_ID_INVALID"_q,
-			u"CHAT_ADMIN_REQUIRED"_q,
-			u"MESSAGE_EDIT_TIME_EXPIRED"_q,
-		};
-
 		_saveRequestId = 0;
 		const auto &type = error.type();
-		if (ranges::contains(defaultErrors, type)) {
+		if (ranges::contains(Api::kDefaultEditMessagesErrors, type)) {
 			_error = tr::lng_edit_error(tr::now);
 			update();
 		} else if (type == u"MESSAGE_NOT_MODIFIED"_q) {

Telegram/SourceFiles/history/history_widget.cpp

@@ -2988,8 +2988,9 @@ void HistoryWidget::saveEditMsg() {
 		TextUtilities::ConvertTextTagsToEntities(textWithTags.tags) };
 	TextUtilities::PrepareForSending(left, prepareFlags);
 
+	const auto item = session().data().message(_channel, _editMsgId);
 	if (!TextUtilities::CutPart(sending, left, MaxMessageSize)) {
-		if (const auto item = session().data().message(_channel, _editMsgId)) {
+		if (item) {
 			const auto suggestModerateActions = false;
 			Ui::show(Box<DeleteMessagesBox>(item, suggestModerateActions));
 		} else {
@@ -3002,70 +3003,55 @@ void HistoryWidget::saveEditMsg() {
 		return;
 	}
 
-	auto options = Api::SendOptions();
-	options.removeWebPageId = (webPageId == CancelledWebPageId);
-
 	const auto weak = Ui::MakeWeak(this);
 	const auto history = _history;
-	_saveEditMsgRequestId = Api::EditTextMessage(
-		session().data().message(_channel, _editMsgId),
-		sending,
-		options,
-		[history, weak](const MTPUpdates &result, mtpRequestId requestId) {
-			SaveEditMsgDone(history, result, requestId);
-			if (const auto strong = weak.data()) {
-				if (requestId == strong->_saveEditMsgRequestId) {
-					strong->_saveEditMsgRequestId = 0;
-					strong->cancelEdit();
-				}
-			}
-		},
-		[history, weak](const RPCError &error, mtpRequestId requestId) {
-			SaveEditMsgFail(history, error, requestId);
-			if (const auto strong = weak.data()) {
-				if (requestId == strong->_saveEditMsgRequestId) {
-					strong->_saveEditMsgRequestId = 0;
-				}
-				const auto &err = error.type();
-				if (err == qstr("MESSAGE_ID_INVALID")
-					|| err == qstr("CHAT_ADMIN_REQUIRED")
-					|| err == qstr("MESSAGE_EDIT_TIME_EXPIRED")) {
-					Ui::show(Box<InformBox>(tr::lng_edit_error(tr::now)));
-				} else if (err == qstr("MESSAGE_NOT_MODIFIED")) {
-					strong->cancelEdit();
-				} else if (err == qstr("MESSAGE_EMPTY")) {
-					strong->_field->selectAll();
-					strong->_field->setFocus();
-				} else {
-					Ui::show(Box<InformBox>(tr::lng_edit_error(tr::now)));
-				}
-				strong->update();
-			}
-		});
-}
 
-void HistoryWidget::SaveEditMsgDone(
+	const auto done = [=](const MTPUpdates &result, mtpRequestId requestId) {
-		not_null<History*> history,
+		crl::guard(weak, [=] {
-		const MTPUpdates &updates,
+			if (requestId == _saveEditMsgRequestId) {
-		mtpRequestId requestId) {
+				_saveEditMsgRequestId = 0;
-	history->session().api().applyUpdates(updates);
+				cancelEdit();
+			}
+		})();
 		if (auto editDraft = history->editDraft()) {
 			if (editDraft->saveRequestId == requestId) {
 				history->clearEditDraft();
 				history->session().local().writeDrafts(history);
 			}
 		}
-}
+	};
 
-void HistoryWidget::SaveEditMsgFail(
+	const auto fail = [=](const RPCError &error, mtpRequestId requestId) {
-		not_null<History*> history,
+		if (const auto editDraft = history->editDraft()) {
-		const RPCError &error,
-		mtpRequestId requestId) {
-	if (auto editDraft = history->editDraft()) {
 			if (editDraft->saveRequestId == requestId) {
 				editDraft->saveRequestId = 0;
 			}
 		}
+		crl::guard(weak, [=] {
+			if (requestId == _saveEditMsgRequestId) {
+				_saveEditMsgRequestId = 0;
+			}
+			const auto &err = error.type();
+			if (ranges::contains(Api::kDefaultEditMessagesErrors, err)) {
+				Ui::show(Box<InformBox>(tr::lng_edit_error(tr::now)));
+			} else if (err == u"MESSAGE_NOT_MODIFIED"_q) {
+				cancelEdit();
+			} else if (err == u"MESSAGE_EMPTY"_q) {
+				_field->selectAll();
+				_field->setFocus();
+			} else {
+				Ui::show(Box<InformBox>(tr::lng_edit_error(tr::now)));
+			}
+			update();
+		})();
+	};
+
+	_saveEditMsgRequestId = Api::EditTextMessage(
+		item,
+		sending,
+		{ .removeWebPageId = (webPageId == CancelledWebPageId) },
+		done,
+		fail);
 }
 
 void HistoryWidget::hideSelectorControlsAnimated() {

Telegram/SourceFiles/history/history_widget.h

@@ -525,8 +525,6 @@ private:
 	void createUnreadBarAndResize();
 
 	void saveEditMsg();
-	static void SaveEditMsgDone(not_null<History*> history, const MTPUpdates &updates, mtpRequestId requestId);
-	static void SaveEditMsgFail(not_null<History*> history, const RPCError &error, mtpRequestId requestId);
 
 	void checkPreview();
 	void requestPreview();