From 379c74118717c7e5a9fd4f55530a520c4487dc07 Mon Sep 17 00:00:00 2001
From: iFish <iccfish@qq.com>
Date: Tue, 16 Dec 2014 23:31:53 +0800
Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E5=88=86=E5=90=B8=E6=80=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Web12306/index.html                | 10 +++------
 Web12306/js/ui/chat/roomsession.js | 33 +++++++++++++++++++++++++++++-
 Web12306/js/ui/index.js            |  2 +-
 3 files changed, 36 insertions(+), 9 deletions(-)

diff --git a/Web12306/index.html b/Web12306/index.html
index 3516fb0..ae0998c 100644
--- a/Web12306/index.html
+++ b/Web12306/index.html
@@ -905,7 +905,7 @@
 					</p>
 					<p>
 						<strong>提示：</strong>
-						提示没有足够的票时，请尽量更换车次或席别<!--，或<a href="http://www.chubao.cn/s/qiangpiao/index.html" style="color:blue;text-decoration:underline;" target="_blank">使用电话订票</a> -->。
+						提示没有足够的票时，请尽量更换车次或席别，或<a href="http://www.chubao.cn/s/qiangpiao/index.html" style="color:blue;text-decoration:underline;" target="_blank">使用电话订票</a>。
 					</p>
 				</div>
 				<footer>
@@ -1107,16 +1107,12 @@
 					</section>
 					<section class="chat-item chat-item-warning">
 						<i class="fa fa-exclamation-triangle"></i>
-						<strong>系统提醒：</strong>12306对过路站限售，请尽量避免选择过路车尤其是直达/特快的过路车。放票时间12306频繁出错，请耐心重试。无法提交订单是因为票不够，请重试。放票是分批、随机的，请多试试。
+						<strong>系统提醒：</strong>12306对过路站限售，请尽量避免选择过路车尤其是直达/特快的过路车。放票时间12306频繁出错以及强制退出登录，请耐心重试。无法提交订单是因为票不够，请重试。放票是分批、随机的，请多试试。
 						<br />
 						<strong>遇到问题反馈渠道：</strong>
 						<br />
 						<a href="http://bbs.liebao.cn/forum-2-1.html" target="_blank">猎豹论坛</a> | <a href="http://weibo.com/liebaocn" target="_blank">猎豹官微</a> | <a href="http://www.fishlee.net/about/" target="_blank">订票求助</a> | <a href="http://weibo.com/imcfish" target="_blank">木鱼微博</a>
 					</section>
-					<section class="chat-item chat-item-warning">
-						<i class="fa fa-exclamation-triangle"></i>
-						<strong>系统信息：</strong>聊天室将会从2014年9月22日起关闭。希望保持交流的票友同学请尽量加入 <a href="http://www.fishlee.net/about/" target="_blank">助手QQ群</a>。希望各位都能买到自己想要的车票！
-					</section>
 				</script>
 				<script type="text/x-dot-template" id="chat_connect_server">
 					<section class="chat-item chat-state chat-state-{{!it.state}}">
@@ -1126,7 +1122,7 @@
 					</section>
 				</script>
 				<script type="text/x-dot-template" id="chat_msg_item">
-					<section class="chat-item {{=it.self?'chat-item-self':'chat-item-receive'}} {{=it.tome?'chat-item-target':''}} {{=it.secret?'chat-item-private':''}} {{=it.sys?'chat-item-system':''}}">
+					<section class="chat-item {{=it.self?'chat-item-self':'chat-item-receive'}} {{=it.tome?'chat-item-target':''}} {{=it.secret?'chat-item-private':''}} {{=it.sys?'chat-item-system':''}}" style="{{=it.from.exStyle}}">
 						<header>
 							<span>
 								{{?it.self}}
diff --git a/Web12306/js/ui/chat/roomsession.js b/Web12306/js/ui/chat/roomsession.js
index 11bc7ac..7ea1263 100644
--- a/Web12306/js/ui/chat/roomsession.js
+++ b/Web12306/js/ui/chat/roomsession.js
@@ -13,6 +13,29 @@
 		user = sessMgr.current;
 	});
 
+	var checkIllegal = function (str) {
+		if (_.some([
+			[/1[\d\s]{10}/i],
+			[/求/, /联系/, /\d+/],
+			[/[三3③叁].*?[六陆⑥6].*?[0零〇oO]/],
+			[/[求]/, /黄.*?牛/],
+			[/联.*?系.*?我/],
+			[/[\d①②③④⑤⑥⑦⑧⑨零一二三四五六七八九〇\s]{7,}/]
+		], function (array) {
+			return _.all(array, function (exp) { return exp.test(str); });
+		}))
+			return "为保护您的隐私以及正常的秩序，请勿泄露您的个人隐私以及禁止出现的信息。";
+
+		if (_.some([
+			[/[求转购].*?\d+\s*张/]
+		], function(array) {
+			return _.all(array, function(exp) { return exp.test(str); });
+		}))
+			return "很抱歉，本平台谢绝任何加价代购、倒卖、求购类信息。";
+
+		return null;
+	};
+
 	var RoomSession = function () {
 		EventObject.apply(this);
 		var that = this;
@@ -110,6 +133,12 @@
 			chatListContainer.empty();
 		};
 		this.sendMsg = function (msg, media) {
+			var errormsg = checkIllegal(msg.text);
+			if (errormsg) {
+				alert(errormsg);
+				return;
+			}
+
 			var data = {
 				items: [msg],
 				media: media || [],
@@ -164,8 +193,10 @@
 			}
 			data.self = data.from.username == sessMgr.current.username;
 			//咩哈哈哈哈
-			if (data.from.username === "iccfish" || data.from.username === "imfish")
+			if (data.from.username === "iccfish" || data.from.username === "imfish") {
 				data.from.realname = "木魚";
+				data.from.exStyle = "font-weight:bold;";
+			}
 
 			data.sys = data.from.username || false;
 			data.tome = false;
diff --git a/Web12306/js/ui/index.js b/Web12306/js/ui/index.js
index 02917ee..42c1956 100644
--- a/Web12306/js/ui/index.js
+++ b/Web12306/js/ui/index.js
@@ -293,7 +293,7 @@
 	})();
 
 	//聊天系统
-	//require("./chat/chatframe.js");
+	require("./chat/chatframe.js");
 
 	//统计报告
 	port.track(param.trackTypes.OPEN_PAGE_INDEX);