You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@esme.apache.org by rh...@apache.org on 2011/01/21 09:12:31 UTC
svn commit: r1061675 - in
/esme/trunk/server/src/main/scala/org/apache/esme/model: User.scala
UserAuth.scala
Author: rhirsch
Date: Fri Jan 21 08:12:31 2011
New Revision: 1061675
URL: http://svn.apache.org/viewvc?rev=1061675&view=rev
Log:
[ESME-32] Login message not generated
Patch From Eric J. Christeson
Modified:
esme/trunk/server/src/main/scala/org/apache/esme/model/User.scala
esme/trunk/server/src/main/scala/org/apache/esme/model/UserAuth.scala
Modified: esme/trunk/server/src/main/scala/org/apache/esme/model/User.scala
URL: http://svn.apache.org/viewvc/esme/trunk/server/src/main/scala/org/apache/esme/model/User.scala?rev=1061675&r1=1061674&r2=1061675&view=diff
==============================================================================
--- esme/trunk/server/src/main/scala/org/apache/esme/model/User.scala (original)
+++ esme/trunk/server/src/main/scala/org/apache/esme/model/User.scala Fri Jan 21 08:12:31 2011
@@ -157,6 +157,17 @@ object User extends User with KeyedMetaM
curUser.remove()
curUserId(Full(who.id.toString))
onLogIn.foreach(_(who))
+
+ Message.create.author(who.id).
+ when(Helpers.timeNow.getTime).
+ source("login").
+ setTextAndTags(S.?("base_user_msg_login", who.nickname), Nil, Empty).
+ foreach{ msg =>
+ if (msg.save) {
+ Distributor ! Distributor.AddMessageToMailbox(who.id, msg, LoginReason(who.id))
+ }
+ }
+
Stats incr "usersLoggedIn"
}
Modified: esme/trunk/server/src/main/scala/org/apache/esme/model/UserAuth.scala
URL: http://svn.apache.org/viewvc/esme/trunk/server/src/main/scala/org/apache/esme/model/UserAuth.scala?rev=1061675&r1=1061674&r2=1061675&view=diff
==============================================================================
--- esme/trunk/server/src/main/scala/org/apache/esme/model/UserAuth.scala (original)
+++ esme/trunk/server/src/main/scala/org/apache/esme/model/UserAuth.scala Fri Jan 21 08:12:31 2011
@@ -211,16 +211,6 @@ object OpenIDAuthModule extends AuthModu
User.logUserIn(user)
S.notice(S.?("base_user_msg_welcome",user.niceName))
- Message.create.author(user.id).
- when(Helpers.timeNow.getTime).
- source("login").
- setTextAndTags(S.?("base_user_msg_login", user.nickname), Nil, Empty).
- foreach{ msg =>
- if (msg.save) {
- Distributor ! Distributor.AddMessageToMailbox(user.id, msg, LoginReason(user.id))
- }
- }
-
RedirectResponse(from, S responseCookies :_*)
case (Full(id), _) =>