deepcrayon/lila
deepcrayon/lila
1
0
Fork 0
Code Releases Activity

disallow team ads in public chats - closes #2626

Browse source
This commit is contained in:
Thibault Duplessis 2017-02-03 15:44:07 +01:00
parent b6c65586f4
commit 9d23199d01
10 changed files with 35 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/views/analyse/replay.scala.html
View file

@ -17,7 +17,7 @@ data: @Html(J.stringify(data)),
i18n: @jsI18n(),
userId: @jsUserId,
chat: @jsOrNull(chatOption map { c =>
chat.ChatJsData.json(c.chat, name = trans.spectatorRoom.str(), timeout = c.timeout, withNote = ctx.isAuth)
chat.ChatJsData.json(c.chat, name = trans.spectatorRoom.str(), timeout = c.timeout, withNote = ctx.isAuth, public = true)
}),
explorer: {
endpoint: "@explorerEndpoint",

20
app/views/chat/chatJsData.scala
View file

@ -8,12 +8,25 @@ import lila.common.PimpedJson._
object ChatJsData {
def restricted(chat: lila.chat.Chat.Restricted, name: String, timeout: Boolean, withNote: Boolean = false, writeable: Boolean = true)(implicit ctx: Context) =
def restricted(
chat: lila.chat.Chat.Restricted,
name: String,
timeout: Boolean,
public: Boolean, // game players chat is not public
withNote: Boolean = false,
writeable: Boolean = true)(implicit ctx: Context) =
json(
chat.chat, name = name, timeout = timeout, withNote = withNote, writeable = writeable, restricted = chat.restricted
chat.chat, name = name, timeout = timeout, withNote = withNote, writeable = writeable, public = public, restricted = chat.restricted
)
def json(chat: lila.chat.AnyChat, name: String, timeout: Boolean, withNote: Boolean = false, writeable: Boolean = true, restricted: Boolean = false)(implicit ctx: Context) = Json.obj(
def json(
chat: lila.chat.AnyChat,
name: String,
timeout: Boolean,
public: Boolean, // game players chat is not public
withNote: Boolean = false,
writeable: Boolean = true,
restricted: Boolean = false)(implicit ctx: Context) = Json.obj(
"data" -> Json.obj(
"id" -> chat.id,
"name" -> name,
@ -25,6 +38,7 @@ object ChatJsData {
"i18n" -> i18n(withNote = withNote),
"writeable" -> writeable,
"noteId" -> withNote.option(chat.id take 8),
"public" -> public,
"kobold" -> ctx.troll,
"permissions" -> Json.obj(
"timeout" -> isGranted(_.ChatTimeout).option(true),

2
app/views/round/player.scala.html
View file

@ -12,7 +12,7 @@ data: @Html(J.stringify(data)),
i18n: @jsI18n(),
userId: @jsUserId,
chat: @jsOrNull(chatOption map { c =>
chat.ChatJsData.restricted(c, name = trans.chatRoom.str(), timeout = false, withNote = true)
chat.ChatJsData.restricted(c, name = trans.chatRoom.str(), timeout = false, withNote = true, public = false)
})
});
}

2
app/views/round/watcher.scala.html
View file

@ -10,7 +10,7 @@ lichess.startRound(document.getElementById('lichess'), {
data: @Html(J.stringify(data)),
i18n: @jsI18n(),
chat: @jsOrNull(chatOption map { c =>
chat.ChatJsData.json(c.chat, name = trans.spectatorRoom.str(), timeout = c.timeout, withNote = ctx.isAuth)
chat.ChatJsData.json(c.chat, name = trans.spectatorRoom.str(), timeout = c.timeout, withNote = ctx.isAuth, public = true)
})
});
});

2
app/views/simul/show.scala.html
View file

@ -15,7 +15,7 @@ i18n: @jsI18n(),
socketVersion: @socketVersion,
userId: @jsUserId,
chat: @jsOrNull(chatOption map { c =>
chat.ChatJsData.json(c.chat, name = trans.chatRoom.str(), timeout = c.timeout)
chat.ChatJsData.json(c.chat, name = trans.chatRoom.str(), timeout = c.timeout, public = true)
})
};
}

2
app/views/study/show.scala.html
View file

@ -11,7 +11,7 @@ i18n: @board.userAnalysisI18n(),
tagTypes: '@lila.study.PgnTags.typesToString',
userId: @jsUserId,
chat: @jsOrNull(chatOption map { c =>
chat.ChatJsData.json(c.chat, name = trans.chatRoom.str(), timeout = c.timeout, writeable = ctx.userId.??(s.canChat))
chat.ChatJsData.json(c.chat, name = trans.chatRoom.str(), timeout = c.timeout, writeable = ctx.userId.??(s.canChat), public = false)
}),
explorer: {
endpoint: "@explorerEndpoint",

2
app/views/tournament/show.scala.html
View file

@ -15,7 +15,7 @@ data: @Html(play.api.libs.json.Json.stringify(data)),
i18n: @jsI18n(),
userId: @jsUserId,
chat: @jsOrNull(chatOption map { c =>
chat.ChatJsData.json(c.chat, name = trans.chatRoom.str(), timeout = c.timeout)
chat.ChatJsData.json(c.chat, name = trans.chatRoom.str(), timeout = c.timeout, public = true)
})
};
}

1
ui/chat/src/ctrl.js
View file

@ -95,6 +95,7 @@ module.exports = function(opts) {
preset: preset,
post: post,
trans: trans,
public: opts.public,
setEnabled: function(v) {
vm.enabled(v);
emitEnabled();

6
ui/chat/src/discussion.js
View file

@ -64,8 +64,10 @@ function input(ctrl) {
var kbm = document.querySelector('.keyboard-move input');
if (kbm) kbm.focus();
} else {
spam.report(e.target.value);
ctrl.post(e.target.value);
var txt = e.target.value;
spam.report(txt);
if (ctrl.public && spam.hasTeamUrl(txt)) alert("Please don't advertise teams in the chat.");
else ctrl.post(txt);
e.target.value = '';
}
}

9
ui/chat/src/spam.js
View file

@ -1,6 +1,6 @@
var isSpammer = lichess.storage.make('spammer');
var regex = new RegExp([
var spamRegex = new RegExp([
'xcamweb.com',
'chess-bot',
'coolteenbitch',
@ -19,10 +19,15 @@ var regex = new RegExp([
}).join('|'));
function analyse(txt) {
return !!txt.match(regex);
return !!txt.match(spamRegex);
}
var teamUrlRegex = /lichess\.org\/team\//
module.exports = {
hasTeamUrl: function(txt) {
return !!txt.match(teamUrlRegex);
},
skip: function(txt) {
return analyse(txt) && isSpammer.get() != '1';
},