From 6bdc5144b011ea488a1e970d803bcce1452d00d6 Mon Sep 17 00:00:00 2001
From: Igor Zhukov <igor.beatle@gmail.com>
Date: Tue, 7 Jun 2016 21:50:02 +0300
Subject: [PATCH] Minor bugfixes

Fixed reply with sticker
Label for mobile group modal
Channel authors hidden for now (Close #1123)
---
 app/js/controllers.js               | 1 +
 app/js/messages_manager.js          | 4 ++--
 app/partials/mobile/chat_modal.html | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

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 @@
       <a class="mobile_modal_action" ng-click="returnToGroup()" my-i18n="group_modal_return"></a>
     </div>
     <div class="mobile_modal_action_wrap" ng-if="chatFull.chat._ == 'chatForbidden'">
-      <a class="mobile_modal_action" ng-click="flushHistory()" my-i18n="group_modal_return"></a>
+      <a class="mobile_modal_action" ng-click="flushHistory()" my-i18n="group_modal_delete_group"></a>
     </div>
     <div class="mobile_modal_action_wrap" ng-if="hasRights('edit_photo') &amp;&amp; !photo.updating">
       <span class="mobile_modal_action mobile_modal_upload_action">