Merge pull request #1221 from florianorben/disallow_edit_bot_msg_arrow_up

Dont edit reply messages of outgoing webhooks by pressing up-arrow in chat input box

1 files changed, 5 insertions, 4 deletions

diff --git a/web/react/stores/post_store.jsx b/web/react/stores/post_store.jsx
index a58fdde3a..8f4e30e7c 100644
--- a/web/react/stores/post_store.jsx
+++ b/web/react/stores/post_store.jsx
@@ -172,14 +172,15 @@ class PostStoreClass extends EventEmitter {
         var lastPost = null;
 
         for (i; i < len; i++) {
-            if (postList.posts[postList.order[i]].user_id === userId) {
+            let post = postList.posts[postList.order[i]];
+            if (post.user_id === userId && (post.props && !post.props.from_webhook || !post.props)) {
                 if (rootId) {
-                    if (postList.posts[postList.order[i]].root_id === rootId || postList.posts[postList.order[i]].id === rootId) {
-                        lastPost = postList.posts[postList.order[i]];
+                    if (post.root_id === rootId || post.id === rootId) {
+                        lastPost = post;
                         break;
                     }
                 } else {
-                    lastPost = postList.posts[postList.order[i]];
+                    lastPost = post;
                     break;
                 }
             }