jschat 0.2.9 → 0.3.0

data/lib/jschat/http/jschat.rb

@@ -189,8 +189,12 @@ helpers do
     session[:jschat_id] = @bridge.cookie
   end
 
+  def cookie_expiration
+    Time.now.utc + 94608000
+  end
+
   def save_last_room(room)
-    response.set_cookie 'last-room', room
+    response.set_cookie 'last-room', { :value => room, :path => '/', :expires => cookie_expiration }
   end
 
   def last_room
@@ -198,7 +202,7 @@ helpers do
   end
 
   def save_nickname(name)
-    response.set_cookie 'jschat-name', name
+    response.set_cookie 'jschat-name', { :value => name, :path => '/', :expires => cookie_expiration }
   end
 
   def messages_js(messages)
@@ -212,7 +216,7 @@ helpers do
   end
 
   def clear_cookies
-    response.set_cookie 'last-room', nil
+    response.set_cookie 'last-room', { :value => nil, :path => '/' }
     session[:jschat_id] = nil
     session[:request_token] = nil
     session[:request_token_secret] = nil
@@ -287,7 +291,12 @@ end
 
 post '/change-name' do
   load_bridge
-  [@bridge.change('user', { 'name' => params['name'] })].to_json
+  result = @bridge.change('user', { 'name' => params['name'] })
+  if result['notice']
+    save_twitter_user({ 'name' => params['name'] }) if twitter_user?
+    save_nickname params['name']
+  end
+  [result].to_json
 end
 
 get '/messages' do
@@ -414,6 +423,11 @@ get '/twitter_auth' do
     # TODO: Make this cope if someone has the same name
     room = '#jschat'
     user = load_twitter_user
+
+    if user['name'] and nickname != user['name']
+      @bridge.change('user', { 'name' => user['name'] })
+    end
+
     save_nickname user['name']
     session[:jschat_id] = user['jschat_id'] if user['jschat_id'] and !user['jschat_id'].empty?
     save_twitter_user('twitter_name' => @twitter.info['screen_name'], 'jschat_id' => session[:jschat_id])

data/lib/jschat/http/public/javascripts/app/controllers/chat_controller.js

@@ -113,7 +113,7 @@ JsChat.ChatController = Class.create({
           if (message.match(/^\//)) {
             Display.add_message('Error: Command not found.  Use /help display commands.', 'error');
           } else {
-            Display.message({ 'message': message.escapeHTML(), 'user': $('name').innerHTML }, new Date());
+            Display.message({ 'message': message.escapeHTML(), 'user': JsChat.user.name }, new Date());
             new Ajax.Request('/message', {
               method: 'post',
               parameters: { 'message': message, 'to': PageHelper.currentRoom() }

data/lib/jschat/http/public/javascripts/app/controllers/signon_controller.js

@@ -1,7 +1,7 @@
 JsChat.SignOnController = Class.create({
   initialize: function() {
     this.retries = 0;
-    setTimeout(function() { $('name').activate() }, 500);
+    setTimeout(function() { $('name').activate(); }, 500);
     $('sign-on').observe('submit', this.submitEvent.bindAsEventListener(this));
   },
 

data/lib/jschat/http/public/javascripts/app/helpers/page_helper.js

@@ -17,7 +17,7 @@ var PageHelper = {
   },
 
   nickname: function() {
-    return Cookie.find('jschat-name');
+    return JsChat.user.name;
   },
 
   title: function() {

data/lib/jschat/http/public/javascripts/app/helpers/text_helper.js

@@ -72,11 +72,11 @@ var TextHelper = {
         if (link.match(/href="/)) {
           result += link;
         } else {
-          if (LinkHelper.youtube_url(link)) {
+          if (LinkHelper.youtube_url(link) && !JsChat.user.hideImages) {
             result += link.replace(link, LinkHelper.youtube(link));
-          } else if (LinkHelper.vimeo_url(link)) {
+          } else if (LinkHelper.vimeo_url(link)  && !JsChat.user.hideImages) {
             result += link.replace(link, LinkHelper.vimeo(link));
-          } else if (LinkHelper.image_url(link)) {
+          } else if (LinkHelper.image_url(link)  && !JsChat.user.hideImages) {
             result += link.replace(link, LinkHelper.image(link));
           } else if (LinkHelper.url(link)) {
             result += link.replace(link, LinkHelper.link(link));

data/lib/jschat/http/public/javascripts/app/models/user.js

@@ -0,0 +1,15 @@
+User = function() {
+  this.name = Cookie.find('jschat-name');
+  this.hideImages = Cookie.find('jschat-hideImages') === '1' ? true : false;
+};
+
+User.prototype.setName = function(name) {
+  Cookie.create('jschat-name', name, 28, '/');
+  this.name = name;
+  $('name').innerHTML = name;
+};
+
+User.prototype.setHideImages = function(hideImages) {
+  this.hideImages = hideImages;
+  Cookie.create('jschat-hideImages', (hideImages ? '1' : '0'), 28, '/');
+};

data/lib/jschat/http/public/javascripts/app/protocol/display.js

@@ -14,7 +14,7 @@ var Display = {
   },
 
   message: function(message, time) {
-    var name = $('name').innerHTML;
+    var name = JsChat.user.name;
     var user_class = name == message['user'] ? 'user active' : 'user';
     var text = '<span class="\#{user_class}">\#{user}</span> <span class="\#{message_class}">\#{message}</span>';
 
@@ -60,7 +60,6 @@ var Display = {
     this.scrollMessagesToTop();
     /* This is assumed to be the point at which displaying /lastlog completes */
     $('loading').hide();
-    Cookie.create('jschat-name', $('name').innerHTML, 28, '/');
   },
 
   scrollMessagesToTop: function() {

data/lib/jschat/http/public/javascripts/app/ui/commands.js

@@ -14,6 +14,7 @@ var UserCommands = {
     help.push(['/lastlog', 'Shows recent activity']);
     help.push(['/names', 'Refreshes the names list']);
     help.push(['/name new_name', 'Changes your name']);
+    help.push(['/toggle images', 'Toggles showing of images and videos']);
     help.push(['/quit', 'Quit']);
     help.push(['/emotes', 'Shows available emotes']);
     $A(help).each(function(options) {
@@ -43,10 +44,8 @@ var UserCommands = {
       method: 'post',
       parameters: { name: name },
       onSuccess: function(response) {
-        this.displayMessages(response.responseText, function() {
-          $('name').innerHTML = name;
-          Cookie.create('jschat-name', name, 28, '/');
-        });
+        this.displayMessages(response.responseText);
+        JsChat.user.setName(name);
       }.bind(this),
       onFailure: function() {
         Display.add_message("Server error: couldn't access: #{url}".interpolate({ url: url }), 'server');
@@ -58,6 +57,11 @@ var UserCommands = {
     JsChat.Request.get('/names', function(t) { this.displayMessages(t.responseText); }.bind(this));
   },
 
+  '/toggle images': function() {
+    JsChat.user.setHideImages(!JsChat.user.hideImages);
+    Display.add_message("Hide images set to #{hide}".interpolate({ hide: JsChat.user.hideImages }), 'server');
+  },
+
   '/(join)\\s+(.*)': function() {
     var room = arguments[0][2];
     this.validateAndJoinRoom(room);

data/lib/jschat/http/public/javascripts/init.js

@@ -1,13 +1,15 @@
 var JsChat = {};
 
 document.observe('dom:loaded', function() {
+  JsChat.user = new User();
+
   if ($('post_message')) {
     var chatController = new JsChat.ChatController();
   }
 
   if ($('sign-on')) {
-    if (Cookie.find('jschat-name')) {
-      $('name').value = Cookie.find('jschat-name');
+    if (JsChat.user.name) {
+      $('name').value = JsChat.user.name;
     }
 
     if ($('room') && window.location.hash) {

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 9
-  version: 0.2.9
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Alex R. Young
@@ -170,6 +170,7 @@ files:
 - lib/jschat/http/public/javascripts/app/helpers/text_helper.js
 - lib/jschat/http/public/javascripts/app/lib/split.js
 - lib/jschat/http/public/javascripts/app/models/cookie.js
+- lib/jschat/http/public/javascripts/app/models/user.js
 - lib/jschat/http/public/javascripts/app/protocol/change.js
 - lib/jschat/http/public/javascripts/app/protocol/chat_request.js
 - lib/jschat/http/public/javascripts/app/protocol/display.js