ambidextrous/gemp-lotr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert: Chat messages are now part of the game.

Browse Source
This commit is contained in:
marcins78
2013-01-08 17:27:42 +00:00
parent 3accb1ffa7
commit 02b369c4a3
8 changed files with 46 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/state/EventSerializer.java
View File

@@ -19,8 +19,6 @@ public class EventSerializer {
eventElem.setAttribute("cardId", gameEvent.getCardId().toString());
if (gameEvent.getIndex() != null)
eventElem.setAttribute("index", gameEvent.getIndex().toString());
if (gameEvent.getDate() != null)
eventElem.setAttribute("date", String.valueOf(gameEvent.getDate().getTime()));
if (gameEvent.getControllerId() != null)
eventElem.setAttribute("controllerId", gameEvent.getControllerId());
if (gameEvent.getParticipantId() != null)

13
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/state/GameEvent.java
View File

@@ -7,7 +7,6 @@ import com.gempukku.lotro.game.PhysicalCard;
import com.gempukku.lotro.logic.decisions.AwaitingDecision;
import com.gempukku.lotro.logic.timing.GameStats;
import java.util.Date;
import java.util.List;
public class GameEvent {
@@ -19,11 +18,10 @@ public class GameEvent {
AT, RT,
M, W,
GS,
CAC, EP, CA, D, CH
CAC, EP, CA, D
}
private String _message;
private Date _date;
private String _side;
private Type _type;
private Zone _zone;
@@ -54,15 +52,6 @@ public class GameEvent {
return this;
}
public Date getDate() {
return _date;
}
public GameEvent date(Date date) {
_date = date;
return this;
}
public Type getType() {
return _type;
}

13
gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/LotroGameMediator.java
View File

@@ -3,7 +3,6 @@ package com.gempukku.lotro.game;
import com.gempukku.lotro.PrivateInformationException;
import com.gempukku.lotro.SubscriptionConflictException;
import com.gempukku.lotro.SubscriptionExpiredException;
import com.gempukku.lotro.chat.ChatRoom;
import com.gempukku.lotro.common.*;
import com.gempukku.lotro.communication.GameStateListener;
import com.gempukku.lotro.filters.Filters;
@@ -40,7 +39,6 @@ public class LotroGameMediator {
private ReentrantReadWriteLock.ReadLock _readLock = _lock.readLock();
private ReentrantReadWriteLock.WriteLock _writeLock = _lock.writeLock();
private int _channelNextIndex = 0;
private ChatRoom _chatRoom;
public LotroGameMediator(LotroFormat lotroFormat, LotroGameParticipant[] participants, LotroCardBlueprintLibrary library, int maxSecondsForGamePerPlayer,
boolean allowSpectators, boolean cancellable) {
@@ -62,7 +60,6 @@ public class LotroGameMediator {
_userFeedback = new DefaultUserFeedback();
_lotroGame = new DefaultLotroGame(lotroFormat, decks, _userFeedback, library);
_userFeedback.setGame(_lotroGame);
_chatRoom = new ChatRoom(false);
}
public boolean isAllowSpectators() {
@@ -79,14 +76,6 @@ public class LotroGameMediator {
_lotroGame.getGameState().sendMessage(message);
}
public void sendMessage(Player player, String message) throws PrivateInformationException {
String playerName = player.getName();
if (!player.getType().contains("a") && !_allowSpectators && !_playersPlaying.contains(playerName))
throw new PrivateInformationException();
_chatRoom.postMessage(playerName, message);
}
public void addGameStateListener(String playerId, GameStateListener listener) {
_lotroGame.addGameStateListener(playerId, listener);
}
@@ -249,7 +238,6 @@ public class LotroGameMediator {
if (currentTime > channel.getLastConsumed().getTime() + _playerDecisionTimeoutPeriod) {
_lotroGame.removeGameStateListener(channel);
_communicationChannels.remove(playerId);
_chatRoom.partChatRoom(playerId);
}
}
@@ -415,7 +403,6 @@ public class LotroGameMediator {
_communicationChannels.put(playerName, participantCommunicationChannel);
_lotroGame.addGameStateListener(playerName, participantCommunicationChannel);
_chatRoom.joinChatRoom(playerName, participantCommunicationChannel);
visitor.visitChannelNumber(number);

22
gemp-lotr/gemp-lotr-web-server/src/main/java/com/gempukku/lotro/server/GameResource.java
View File

@@ -142,26 +142,6 @@ public class GameResource extends AbstractResource {
gameMediator.cancel(resourceOwner);
}
@Path("/{gameId}/chat")
@POST
public void sendMessage(
@PathParam("gameId") String gameId,
@FormParam("message") String message,
@FormParam("participantId") String participantId,
@Context HttpServletRequest request) throws ParserConfigurationException {
Player resourceOwner = getResourceOwnerSafely(request, participantId);
LotroGameMediator gameMediator = _lotroServer.getGameById(gameId);
if (gameMediator == null)
throw new WebApplicationException(Response.Status.NOT_FOUND);
try {
gameMediator.sendMessage(resourceOwner, message);
} catch (PrivateInformationException e) {
throw new WebApplicationException(Response.Status.FORBIDDEN);
}
}
@Path("/{gameId}")
@POST
@Produces(MediaType.APPLICATION_XML)
@@ -194,7 +174,7 @@ public class GameResource extends AbstractResource {
// Use long polling
long start = System.currentTimeMillis();
while (System.currentTimeMillis() < start + _longPollingLength && !gameMediator.hasAnyNewMessages(resourceOwner, channelNumber)) {
while (System.currentTimeMillis()< start+_longPollingLength && !gameMediator.hasAnyNewMessages(resourceOwner, channelNumber)) {
try {
Thread.sleep(_longPollingInterval);
} catch (InterruptedException exp) {

93
gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-015/chat.js
View File

@@ -21,9 +21,8 @@ var ChatBoxUI = Class.extend({
lockChat:false,
stopUpdates: false,
sendMessageFunc: null,
init:function (name, div, url, showList, playerListener, showHideSystemButton, showLockButton, startChat) {
init:function (name, div, url, showList, playerListener, showHideSystemButton, showLockButton) {
var that = this;
this.hiddenClasses = new Array();
this.playerListener = playerListener;
@@ -41,37 +40,37 @@ var ChatBoxUI = Class.extend({
if (showHideSystemButton) {
this.hideSystemButton = $("<button id='showSystemMessages'>Toggle system messages</button>").button(
{icons:{
primary:"ui-icon-zoomin"
}, text:false});
{icons:{
primary:"ui-icon-zoomin"
}, text:false});
this.hideSystemButton.click(
function () {
if (that.isShowingMessageClass("systemMessage")) {
$('#showSystemMessages').button("option", "icons", {primary:'ui-icon-zoomin'});
that.hideMessageClass("systemMessage");
} else {
$('#showSystemMessages').button("option", "icons", {primary:'ui-icon-zoomout'});
that.showMessageClass("systemMessage");
}
});
function () {
if (that.isShowingMessageClass("systemMessage")) {
$('#showSystemMessages').button("option", "icons", {primary:'ui-icon-zoomin'});
that.hideMessageClass("systemMessage");
} else {
$('#showSystemMessages').button("option", "icons", {primary:'ui-icon-zoomout'});
that.showMessageClass("systemMessage");
}
});
this.hideMessageClass("systemMessage");
}
if (showLockButton) {
this.lockButton = $("<button id='lockChatButton'>Toggle lock chat</button>").button(
{icons:{
primary:"ui-icon-locked"
}, text:false});
{icons:{
primary:"ui-icon-locked"
}, text:false});
this.lockButton.click(
function () {
if (that.lockChat) {
$('#lockChatButton').button("option", "icons", {primary:'ui-icon-locked'});
that.lockChat = false;
} else {
$('#lockChatButton').button("option", "icons", {primary:'ui-icon-unlocked'});
that.lockChat = true;
}
});
function () {
if (that.lockChat) {
$('#lockChatButton').button("option", "icons", {primary:'ui-icon-locked'});
that.lockChat = false;
} else {
$('#lockChatButton').button("option", "icons", {primary:'ui-icon-unlocked'});
that.lockChat = true;
}
});
}
if (showList) {
@@ -84,12 +83,10 @@ var ChatBoxUI = Class.extend({
this.div.append(this.lockButton);
this.div.append(this.chatTalkDiv);
if (startChat) {
this.communication.startChat(this.name,
this.communication.startChat(this.name,
function (xml) {
that.processMessages(xml, true);
}, this.chatErrorMap());
}
this.chatTalkDiv.bind("keypress", function (e) {
var code = (e.keyCode ? e.keyCode : e.which);
@@ -153,19 +150,6 @@ var ChatBoxUI = Class.extend({
}
},
appendChatMessage: function(from, dateObj, text) {
var msgClass = "chatMessage";
if (from == "System")
msgClass = "systemMessage";
if (this.showTimestamps) {
var date = new Date(parseInt(dateObj));
var dateStr = this.monthNames[date.getMonth()] + " " + date.getDate() + " " + this.formatToTwoDigits(date.getHours()) + ":" + this.formatToTwoDigits(date.getMinutes()) + ":" + this.formatToTwoDigits(date.getSeconds());
this.appendMessage("<div class='timestamp'>[" + dateStr + "]</div> <b>" + from + ":</b> " + text, msgClass);
} else {
this.appendMessage("<b>" + from + ":</b> " + text, msgClass);
}
},
appendMessage:function (message, msgClass) {
if (msgClass == undefined)
msgClass = "chatMessage";
@@ -203,7 +187,16 @@ var ChatBoxUI = Class.extend({
var from = message.getAttribute("from");
var text = message.childNodes[0].nodeValue;
this.appendChatMessage(from, message.getAttribute("date"), text);
var msgClass = "chatMessage";
if (from == "System")
msgClass = "systemMessage";
if (this.showTimestamps) {
var date = new Date(parseInt(message.getAttribute("date")));
var dateStr = this.monthNames[date.getMonth()] + " " + date.getDate() + " " + this.formatToTwoDigits(date.getHours()) + ":" + this.formatToTwoDigits(date.getMinutes()) + ":" + this.formatToTwoDigits(date.getSeconds());
this.appendMessage("<div class='timestamp'>[" + dateStr + "]</div> <b>" + from + ":</b> " + text, msgClass);
} else {
this.appendMessage("<b>" + from + ":</b> " + text, msgClass);
}
}
var users = root.getElementsByTagName("user");
@@ -246,14 +239,10 @@ var ChatBoxUI = Class.extend({
},
sendMessage:function (message) {
if (this.sendMessageFunc != null) {
this.sendMessageFunc(message);
} else {
var that = this;
this.communication.sendChatMessage(this.name, message, function(xml) {
that.processMessages(xml, false);
}, this.chatErrorMap());
}
var that = this;
this.communication.sendChatMessage(this.name, message, function(xml) {
that.processMessages(xml, false);
}, this.chatErrorMap());
},
chatMalfunction: function() {
@@ -287,4 +276,4 @@ var ChatBoxUI = Class.extend({
}
};
}
});
});

14
gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-015/communication.js
View File

@@ -208,20 +208,6 @@ var GempLotrCommunication = Class.extend({
dataType:"xml"
});
},
sendGameMessage: function(message, callback, errorMap) {
$.ajax({
type:"POST",
url:this.url + "/game/" + getUrlParam("gameId")+"/chat",
cache:false,
async: false,
data:{
message: message,
participantId:getUrlParam("participantId") },
success:this.deliveryCheck(callback),
error:this.errorCheck(errorMap),
dataType:"xml"
});
},
getGameCardModifiers:function (cardId, callback, errorMap) {
$.ajax({
type:"GET",

17
gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-015/gameAnimations.js
View File

@@ -863,21 +863,6 @@ var GameAnimations = Class.extend({
});
},
chatMessage:function (element, animate) {
var that = this;
$("#main").queue(
function (next) {
var from = element.getAttribute("participantId");
var date = element.getAttribute("date");
var message = element.getAttribute("message");
if (that.game.chatBox != null)
that.game.chatBox.appendChatMessage(form, date, message);
next();
});
},
warning:function (element, animate) {
var that = this;
$("#main").queue(
@@ -948,4 +933,4 @@ var GameAnimations = Class.extend({
next();
});
}
});
});

10
gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-015/gameUi.js
View File

@@ -474,11 +474,7 @@ var GempLotrGameUI = Class.extend({
};
var chatRoomName = (this.replayMode ? null : ("Game" + getUrlParam("gameId")));
this.chatBox = new ChatBoxUI(chatRoomName, $("#chatBox"), this.communication.url, false, playerListener, false, true, false);
this.chatBox.sendMessageFunc =
function(message) {
this.comm.sendGameMessage(message, function() {}, this.gameErrorMap());
};
this.chatBox = new ChatBoxUI(chatRoomName, $("#chatBox"), this.communication.url, false, playerListener, false, true);
this.chatBox.chatUpdateInterval = 3000;
if (!this.spectatorMode && !this.replayMode) {
@@ -1057,8 +1053,6 @@ var GempLotrGameUI = Class.extend({
this.animations.cardActivated(gameEvent, animate);
} else if (eventType == "D") {
this.animations.processDecision(gameEvent, animate);
} else if (eventType == "CH") {
this.animations.chatMessage(gameEvent, animate);
}
},
@@ -2052,4 +2046,4 @@ var GempLotrGameUI = Class.extend({
} else
this.dialogResize(this.cardActionDialog, this.specialGroup);
}
});
});