diff --git a/ruby/lib/jam_ruby/models/invited_user_observer.rb b/ruby/lib/jam_ruby/models/invited_user_observer.rb index d5cc902e2..2a421ef34 100644 --- a/ruby/lib/jam_ruby/models/invited_user_observer.rb +++ b/ruby/lib/jam_ruby/models/invited_user_observer.rb @@ -3,8 +3,17 @@ module JamRuby observe JamRuby::InvitedUser + @@log = Logging.logger[InvitedUserObserver] + def after_create(invited_user) + if invited_user.note + # lie to spammer and say it worked. drop on floor + @@log.info("dropping spammer " + invited_user.sender_id) + # make spammer think we are sending email + sleep (1) + return + end if invited_user.sender.nil? InvitedUserMailer.welcome_betauser(invited_user).deliver_now else diff --git a/web/app/assets/stylesheets/dialogs/invitationDialog.scss b/web/app/assets/stylesheets/dialogs/invitationDialog.scss index 6b15927df..66a4824e0 100644 --- a/web/app/assets/stylesheets/dialogs/invitationDialog.scss +++ b/web/app/assets/stylesheets/dialogs/invitationDialog.scss @@ -1,6 +1,6 @@ .invitation-overlay { - width:384px; - height:344px; + width:420px; + height:294px; padding:8px; background-color:#787878; position:fixed; @@ -15,12 +15,12 @@ -webkit-box-shadow: inset 2px 2px 3px 0px #888; box-shadow: inset 2px 2px 3px 0px #888; color:#666; - height:75px; - width:300px; + height: 179px; + width: 393px; } .invitation-inner { - height:300px; + height:250px; overflow:auto; background-color:#262626; } \ No newline at end of file diff --git a/web/app/controllers/api_invited_users_controller.rb b/web/app/controllers/api_invited_users_controller.rb index 089c2bf4d..9370aec74 100644 --- a/web/app/controllers/api_invited_users_controller.rb +++ b/web/app/controllers/api_invited_users_controller.rb @@ -27,7 +27,11 @@ class ApiInvitedUsersController < ApiController return end + # remove due to spammers msg = params[:note].blank? ? nil : params[:note].strip + + + @invited_users = emails.collect do |ee| iu = InvitedUser.new iu.sender = current_user @@ -58,4 +62,4 @@ class ApiInvitedUsersController < ApiController end end -end +end \ No newline at end of file diff --git a/web/app/views/dialogs/_invitationDialog.html.erb b/web/app/views/dialogs/_invitationDialog.html.erb index 85dc6fe69..e9fe77096 100644 --- a/web/app/views/dialogs/_invitationDialog.html.erb +++ b/web/app/views/dialogs/_invitationDialog.html.erb @@ -5,17 +5,16 @@
-
+

- +
-
+