diff --git a/app/js/controllers.js b/app/js/controllers.js index 7382d12a..5c2cf7bf 100644 --- a/app/js/controllers.js +++ b/app/js/controllers.js @@ -2657,6 +2657,7 @@ angular.module('myApp.controllers', ['myApp.i18n']) $scope.$broadcast('ui_message_send'); fwdsSend(); + resetDraft(); } delete $scope.draftMessage.sticker; } diff --git a/app/js/messages_manager.js b/app/js/messages_manager.js index 1aed2b12..e41ebfac 100644 --- a/app/js/messages_manager.js +++ b/app/js/messages_manager.js @@ -1190,12 +1190,12 @@ angular.module('myApp.services') var fwdHeader = apiMessage.fwd_from; if (fwdHeader) { - apiMessage.fwdFromID = fwdHeader.from_id ? fwdHeader.from_id : -fwdHeader.channel_id; + apiMessage.fwdFromID = fwdHeader.channel_id ? -fwdHeader.channel_id : fwdHeader.from_id; fwdHeader.date -= serverTimeOffset; } apiMessage.toID = toPeerID; - apiMessage.fromID = apiMessage.from_id || toPeerID; + apiMessage.fromID = apiMessage.pFlags.post ? toPeerID : apiMessage.from_id; if (apiMessage.via_bot_id > 0) { apiMessage.viaBotID = apiMessage.via_bot_id; diff --git a/app/partials/mobile/chat_modal.html b/app/partials/mobile/chat_modal.html index 30127ca2..3766f4fd 100644 --- a/app/partials/mobile/chat_modal.html +++ b/app/partials/mobile/chat_modal.html @@ -70,7 +70,7 @@
- +