You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@esme.apache.org by es...@apache.org on 2011/04/04 20:57:18 UTC
svn commit: r1088725 - in
/esme/branches/esme-328_comet_timeline_rewrite/src/main/scala/org/apache/esme/comet:
ConversationTimeline.scala PersonalTimeline.scala PublicTimeline.scala
StreamTimeline.scala Timeline.scala UserMessagesTimeline.scala
Author: esjewett
Date: Mon Apr 4 18:57:18 2011
New Revision: 1088725
URL: http://svn.apache.org/viewvc?rev=1088725&view=rev
Log:
[ESME-328] Reply and conversation links are now working.
Modified:
esme/branches/esme-328_comet_timeline_rewrite/src/main/scala/org/apache/esme/comet/ConversationTimeline.scala
esme/branches/esme-328_comet_timeline_rewrite/src/main/scala/org/apache/esme/comet/PersonalTimeline.scala
esme/branches/esme-328_comet_timeline_rewrite/src/main/scala/org/apache/esme/comet/PublicTimeline.scala
esme/branches/esme-328_comet_timeline_rewrite/src/main/scala/org/apache/esme/comet/StreamTimeline.scala
esme/branches/esme-328_comet_timeline_rewrite/src/main/scala/org/apache/esme/comet/Timeline.scala
esme/branches/esme-328_comet_timeline_rewrite/src/main/scala/org/apache/esme/comet/UserMessagesTimeline.scala
Modified: esme/branches/esme-328_comet_timeline_rewrite/src/main/scala/org/apache/esme/comet/ConversationTimeline.scala
URL: http://svn.apache.org/viewvc/esme/branches/esme-328_comet_timeline_rewrite/src/main/scala/org/apache/esme/comet/ConversationTimeline.scala?rev=1088725&r1=1088724&r2=1088725&view=diff
==============================================================================
--- esme/branches/esme-328_comet_timeline_rewrite/src/main/scala/org/apache/esme/comet/ConversationTimeline.scala (original)
+++ esme/branches/esme-328_comet_timeline_rewrite/src/main/scala/org/apache/esme/comet/ConversationTimeline.scala Mon Apr 4 18:57:18 2011
@@ -50,9 +50,11 @@ class ConversationTimeline extends Timel
override def lifespan = Full(TimeSpan(300000))
- override def lowPriority = {
- case ConvDistributor.MessageReceived(msg, r) =>
- messages = ((msg.id.is,r,true) :: messages).take(40)
+ override def lowPriority = {
+ case ConvDistributor.MessageReceived(msg, r) =>
+ messages = ((msg.id.is,r,true) :: messages).take(40)
+
+//TODO: Adapt to new timeline format
reRender(false)
}
Modified: esme/branches/esme-328_comet_timeline_rewrite/src/main/scala/org/apache/esme/comet/PersonalTimeline.scala
URL: http://svn.apache.org/viewvc/esme/branches/esme-328_comet_timeline_rewrite/src/main/scala/org/apache/esme/comet/PersonalTimeline.scala?rev=1088725&r1=1088724&r2=1088725&view=diff
==============================================================================
--- esme/branches/esme-328_comet_timeline_rewrite/src/main/scala/org/apache/esme/comet/PersonalTimeline.scala (original)
+++ esme/branches/esme-328_comet_timeline_rewrite/src/main/scala/org/apache/esme/comet/PersonalTimeline.scala Mon Apr 4 18:57:18 2011
@@ -61,10 +61,12 @@ class PersonalTimeline extends Timeline
messages = messages.map {
case (`msgId`, r, _) => (msgId, r, true)
case x => x
- }
+ }
+// TODO: Adapt to new timeline format
reRender(false)
case Distributor.UserUpdated(_) =>
+// TODO: Adapt to new timeline format
reRender(false)
}
Modified: esme/branches/esme-328_comet_timeline_rewrite/src/main/scala/org/apache/esme/comet/PublicTimeline.scala
URL: http://svn.apache.org/viewvc/esme/branches/esme-328_comet_timeline_rewrite/src/main/scala/org/apache/esme/comet/PublicTimeline.scala?rev=1088725&r1=1088724&r2=1088725&view=diff
==============================================================================
--- esme/branches/esme-328_comet_timeline_rewrite/src/main/scala/org/apache/esme/comet/PublicTimeline.scala (original)
+++ esme/branches/esme-328_comet_timeline_rewrite/src/main/scala/org/apache/esme/comet/PublicTimeline.scala Mon Apr 4 18:57:18 2011
@@ -64,7 +64,8 @@ class PublicTimeline extends Timeline {
}
override def lowPriority = {
- case ForceRender =>
+ case ForceRender =>
+// TODO: Adapt to new timeline format
reRender(false)
case Distributor.NewMessage(msg) =>
@@ -76,7 +77,8 @@ class PublicTimeline extends Timeline {
scheduled = true
ActorPing.schedule(this, ForceRender, 30000L)
}
- }
+ }
+// TODO: Adapt to new timeline format
else reRender(false)
}
}
Modified: esme/branches/esme-328_comet_timeline_rewrite/src/main/scala/org/apache/esme/comet/StreamTimeline.scala
URL: http://svn.apache.org/viewvc/esme/branches/esme-328_comet_timeline_rewrite/src/main/scala/org/apache/esme/comet/StreamTimeline.scala?rev=1088725&r1=1088724&r2=1088725&view=diff
==============================================================================
--- esme/branches/esme-328_comet_timeline_rewrite/src/main/scala/org/apache/esme/comet/StreamTimeline.scala (original)
+++ esme/branches/esme-328_comet_timeline_rewrite/src/main/scala/org/apache/esme/comet/StreamTimeline.scala Mon Apr 4 18:57:18 2011
@@ -98,7 +98,8 @@ class StreamTimeline extends PublicTimel
}
override def lowPriority = {
- case ForceRender =>
+ case ForceRender =>
+// TODO: Adapt to new timeline format
reRender(false)
case Distributor.NewMessage(msg) =>
@@ -121,7 +122,8 @@ class StreamTimeline extends PublicTimel
scheduled = true
ActorPing.schedule(this, ForceRender, 30000L)
}
- }
+ }
+// TODO: Adapt to new timeline format
else reRender(false)
}
Modified: esme/branches/esme-328_comet_timeline_rewrite/src/main/scala/org/apache/esme/comet/Timeline.scala
URL: http://svn.apache.org/viewvc/esme/branches/esme-328_comet_timeline_rewrite/src/main/scala/org/apache/esme/comet/Timeline.scala?rev=1088725&r1=1088724&r2=1088725&view=diff
==============================================================================
--- esme/branches/esme-328_comet_timeline_rewrite/src/main/scala/org/apache/esme/comet/Timeline.scala (original)
+++ esme/branches/esme-328_comet_timeline_rewrite/src/main/scala/org/apache/esme/comet/Timeline.scala Mon Apr 4 18:57:18 2011
@@ -54,7 +54,7 @@ trait Timeline extends CometActor {
def render = {
// TODO - handle clearMessages = true.
-// TODO - Get resend, reply, and conversation working
+// TODO - Get resend working
val msgMap = Message.findMessages(messages map {_._1})
val toDisplay = for ((id, reason, resent) <- messages;
@@ -69,6 +69,15 @@ trait Timeline extends CometActor {
val messageId = "message_" + m._1.id.is.toString
val messageBody = m._1.digestedXHTML
val messagePool:String = m._1.pool.obj.map("in pool \'" + _.getName + "\'").openOr("")
+ val replyHref = "javascript:setReplyTo(" + m._1.id.is.toString + ", '"+ messageBody + "', " + m._1.pool.obj.map(_.id.is).openOr(0) + ", '" + m._1.author.obj.map(_.nickname).openOr("") + "')"
+
+ val convId = m._1.conversation.is
+ val convHref = LiftRules.context.path + "/conversation/" + convId
+ val convTransform:CssBindFunc = if(convId != 0) {
+ ".conversation [href]" #> convHref
+ } else {
+ ".conversation" #> Text("")
+ }
// TODO: Put date in the "ago" format
val messageDateStr = toInternetDate(m._1.when)
@@ -87,7 +96,9 @@ trait Timeline extends CometActor {
("#avatar [src]" #> imageUrl &
".updates-box [id]" #> messageId &
".msgbody *" #> messageBody &
- ".supp_data *" #> suppString )(messageTemplate)
+ ".supp_data *" #> suppString &
+ ".reply [href]" #> replyHref &
+ convTransform )(messageTemplate)
}
// If we need to filter out some messages on display, override this method.
Modified: esme/branches/esme-328_comet_timeline_rewrite/src/main/scala/org/apache/esme/comet/UserMessagesTimeline.scala
URL: http://svn.apache.org/viewvc/esme/branches/esme-328_comet_timeline_rewrite/src/main/scala/org/apache/esme/comet/UserMessagesTimeline.scala?rev=1088725&r1=1088724&r2=1088725&view=diff
==============================================================================
--- esme/branches/esme-328_comet_timeline_rewrite/src/main/scala/org/apache/esme/comet/UserMessagesTimeline.scala (original)
+++ esme/branches/esme-328_comet_timeline_rewrite/src/main/scala/org/apache/esme/comet/UserMessagesTimeline.scala Mon Apr 4 18:57:18 2011
@@ -58,12 +58,14 @@ class UserMessagesTimeline extends Timel
override def lowPriority = {
case UserActor.MessageReceived(msg, r) =>
if(msg.author == user) {
- messages = ( (msg.id.is,r,true) :: messages).take(40)
+ messages = ( (msg.id.is,r,true) :: messages).take(40)
+// TODO: Adapt to new timeline format
reRender(false)
}
case UserActor.Resend(msgId) =>
- messages = ( (msgId,ResendReason(user.id.is),true) :: messages).take(40)
+ messages = ( (msgId,ResendReason(user.id.is),true) :: messages).take(40)
+// TODO: Adapt to new timeline format
reRender(false)
}
}
\ No newline at end of file