From 80f922e63542e4c26b82a74c43ead48e111302d1 Mon Sep 17 00:00:00 2001
From: Harry Zhou <zhouziqun@cool2645.com>
Date: Wed, 21 Jun 2017 22:52:11 +0800
Subject: [PATCH] Edit Message function.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1. Fix balloon tip position
2. Enable html for all message and purify html tag in SendMessageHandler
3. Remove "没有更多了"
---
 app/Http/Controllers/MessageController.php | 3 ++-
 config/purifier.php                        | 2 +-
 public/css/message.css                     | 3 +--
 resources/views/message/message.blade.php  | 4 +---
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/app/Http/Controllers/MessageController.php b/app/Http/Controllers/MessageController.php
index 0b71740..3e52f79 100644
--- a/app/Http/Controllers/MessageController.php
+++ b/app/Http/Controllers/MessageController.php
@@ -18,6 +18,7 @@ use App\Message;
 use App\User;
 use App\MessageContact;
 use App\Http\Controllers\Controller;
+use Mews\Purifier\PurifierServiceProvider;
 
 class MessageController extends Controller
 {
@@ -83,7 +84,7 @@ class MessageController extends Controller
         //Create Message
         $message = new Message;
         $user_id = $sender;
-        $message->content = $content;
+        $message->content = clean($content);
         $message->sender_id = $user_id;
         $message->receiver_id = $receiver;
         $message->save();
diff --git a/config/purifier.php b/config/purifier.php
index 7e2ba89..f93fcfa 100644
--- a/config/purifier.php
+++ b/config/purifier.php
@@ -26,7 +26,7 @@ return [
             'HTML.Doctype'             => 'HTML 4.01 Transitional',
             'HTML.Allowed'             => 'div,b,strong,i,em,u,a[href|title],ul,ol,li,p[style],br,span[style],img[width|height|alt|src]',
             'CSS.AllowedProperties'    => 'font,font-size,font-weight,font-style,font-family,text-decoration,padding-left,color,background-color,text-align',
-            'AutoFormat.AutoParagraph' => true,
+            'AutoFormat.AutoParagraph' => false,
             'AutoFormat.RemoveEmpty'   => true,
         ],
         'test'    => [
diff --git a/public/css/message.css b/public/css/message.css
index f84d4f6..6931b44 100644
--- a/public/css/message.css
+++ b/public/css/message.css
@@ -57,8 +57,7 @@
     height: 2em;
     padding-top: 0.2em;
     position: absolute;
-    top: 0.3em;
-    left: 5em;
+    left: 0em;
     z-index: 10;
 }
 
diff --git a/resources/views/message/message.blade.php b/resources/views/message/message.blade.php
index 89ff412..d9c1bee 100644
--- a/resources/views/message/message.blade.php
+++ b/resources/views/message/message.blade.php
@@ -59,15 +59,13 @@
             <p v-if="messages.length == 0" style="text-align: center">暂无消息</p>
             <div :class="{ hide: isHidden }">
                 <a href="javascript:void(0)" v-if="hasMore" v-on:click="getHistoryMessage(-1)">加载更多</a>
-                <p v-else>没有更多了</p>
                 <ul id="message-container" class="message-container">
                     <transition-group name="message-list" tag="ul">
                         <li :class="{ box: message.type !== 'history-info' }" class="msg message-list-item"
                             v-for="message in messages" v-bind:key="message.id">
                         <span v-if="message.type !== 'history-info'">
                         <img class="mavatar" :src="'/avatar/' + message.sender_id + '/64/64'"/>
-                            <p v-if="contact_id == 0" class="message-content" v-html="message.content"></p>
-                            <p v-else class="message-content">@{{ message.content }}</p>
+                            <p class="message-content" v-html="message.content"></p>
                             <br/><br/>
                         <i class="time-tag">@{{ message.created_at }}</i>
                         </span>