<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -78,7 +78,7 @@ message User {
   optional string security_token = 10;
   optional int32 token_expiry = 11;
   optional int32 fan_notify = 15;
-  optional int32 comment_notify = 16;
+  optional int32 event_comment_notify = 16;
   optional string tagline = 19;
   optional int32 last_closed_site_announcement_at = 20;
   optional int64 nucleus_id = 22;
@@ -94,6 +94,7 @@ message User {
   optional bool global_optin = 39;
   optional bool third_party_optin = 40;
   optional int32 name_public = 44;
+  optional int32 user_comment_notify = 45;
 }
 
 message Users {
@@ -301,55 +302,31 @@ message Game_Client_Datas {
 }
 
 message Game_Client_Data {
-  required string game_id = 1;
-  optional string short_name = 3;
-  optional string launcher_dir_key = 4;
-  optional string launcher_exe = 5;
-  optional string launcher_password_args = 6;
-  optional string launcher_network_args = 7;
-  optional string launch = 8;
-  optional string install_hint = 9;
-  optional string match_exe = 10;
-  optional string launcher_dir_default = 11;
-  optional string launcher_url = 12;
-  optional string external = 13;
-  optional string process_window_title = 14;
-  optional string launcher_dir_append = 15;
-  optional string launcher_dir_trunc_at = 16;
-  optional string detect_dir_key = 17;
-  optional string detect_dir_default = 18;
-  optional string launcher_dir_shortcut = 19;
-  optional string detect_dir_trunc_at = 20;
-  optional string ingame_renderer = 21;
-  optional string detect_exe = 22;
-  optional string long_name = 23;
-  optional string in_game_flags = 24;
-  optional Box_Art box_art = 25;
-  optional string skud_id = 26;
-}
-
-message Client_Stats_Reports {
-    repeated Client_Stats_Report client_stats_reports = 1;
-}
-
-message Client_Stats_Report {
-    optional int32 session_start = 1;
-    optional int32 session_end = 2;
-    optional string user_id = 3;
-    optional int32 games_launched = 4;
-    optional int32 games_rated = 5;
-    optional int32 ims_sent = 6;
-    optional int32 help_hits = 7;
-    optional int32 autostart = 8;
-    repeated Client_Stats_IGO_Session igo_sessions = 9;
-    repeated Client_Stats_Game_State game_states = 10;
-    repeated string downloads = 11;
-}
-
-message Client_Stats_IGO_Session {
-    optional int32 session_start = 1;
-    optional int32 session_end = 2;
-    optional int32 browser_launches = 5;
+	required string game_id = 1;
+	optional string short_name = 3;
+	optional string launcher_dir_key = 4;
+	optional string launcher_exe = 5;
+	optional string launcher_password_args = 6;
+	optional string launcher_network_args = 7;
+	optional string launch = 8;
+	optional string install_hint = 9;
+	optional string match_exe = 10;
+	optional string launcher_dir_default = 11;
+	optional string launcher_url = 12;
+	optional string external = 13;
+	optional string process_window_title = 14;
+	optional string launcher_dir_append = 15;
+	optional string launcher_dir_trunc_at = 16;
+	optional string detect_dir_key = 17;
+	optional string detect_dir_default = 18;
+	optional string launcher_dir_shortcut = 19;
+	optional string detect_dir_trunc_at = 20;
+	optional string ingame_renderer = 21;
+	optional string detect_exe = 22;
+	optional string long_name = 23;
+	optional string in_game_flags = 24;
+	optional Box_Art box_art = 25;
+	optional string skud_id = 26;
 }
 
 message Client_Stats_Game_State {
@@ -364,7 +341,7 @@ message Game_Session_vFeed {
   optional string user_id = 3;
   optional int32 session_start = 4;
   optional int32 last_activity = 5;
-  repeated Event_vFeed event_vfeeds = 6;
+  repeated Event_vFeed events = 6;
   optional string gamername = 7;
   optional string avatar_url = 8;
   optional string game_name = 9;
@@ -373,7 +350,7 @@ message Game_Session_vFeed {
 }
 
 message Game_Sessions_vFeed {
-  repeated Game_Session_vFeed game_session_vfeed = 1;
+  repeated Game_Session_vFeed game_session = 1;
 }
 
 message Game_Session {
@@ -539,6 +516,10 @@ message Item {
 }
 
 message Client_Session_Stats {
+	repeated Client_Session_Stat client_session_stats = 1;
+}
+
+message Client_Session_Stat {
 	optional int32 started_at = 1;
 	optional int32 ended_at = 2;
 	optional string user_id = 3;
@@ -548,14 +529,26 @@ message Client_Session_Stats {
 	optional int32 game_hidden = 7;
 	optional int32 messages = 8;
 	optional int32 total_games = 9;
+	optional string id = 10;
+    optional int32 games_rated = 11;
+    optional int32 help_hits = 12;
+    optional int32 autostart = 13;
+    repeated Client_IGO_Stat client_igo_stats = 14;
+    repeated Client_Download_Stat client_download_stats = 15;
 }
 
-message Client_IGO_Stats {
+message Client_IGO_Stat {
 	optional int32 started_at = 1;
 	optional int32 ended_at = 2;
-	optional string game_session_id = 3;
-	optional string user_id = 4;
-	optional string game_id = 5;
+	optional string game_id = 3;
+	optional string client_stats_id = 4;
+	optional int32 browser_launches = 5;
+}
+
+message Client_Download_Stat {
+	optional string client_stats_id = 1;
+	optional string skud_id = 2;
+	optional string content_id = 3;
 }
 
 message Lobby_Game_Server {
@@ -634,6 +627,9 @@ message Facebook_Application {
     optional string secret = 5;
     optional int32 created_at = 6;
     optional int32 updated_at = 7;
+    optional string param = 8;
+    optional string module = 9;
+	optional string identity_providers = 10;
 }
 
 message Facebook_Applications {
@@ -668,3 +664,9 @@ message Common_Game {
 message Common_Games {
 	repeated Common_Game games = 1;
 }
+
+message Application_Login_Stat {
+    optional string user_id = 1;
+    optional string application_id = 2;
+    optional int32 created_at = 3;
+}</diff>
      <filename>lib/proto/rupture.proto</filename>
    </modified>
    <modified>
      <diff>@@ -5,7 +5,7 @@ module Rupture
     time :logged_in_at, :created_at, :updated_at, :token_expiry, :deleted_at,
          :last_closed_site_announcement_at
 
-    boolean :fan_notify, :comment_notify, :message_notify
+    boolean :fan_notify, :event_comment_notify, :user_comment_notify, :message_notify
     
     
     def follow(user_id_to_follow)</diff>
      <filename>lib/rupture/user.rb</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>800d0526d9f8db39c626d8b91dc9bbc0edcd749f</id>
    </parent>
  </parents>
  <author>
    <name>Dan Dofter</name>
    <email>dan@dofter.com</email>
  </author>
  <url>http://github.com/rupture/rupture/commit/2d96415de10a50f868054f61abca5f0d5c1a71e7</url>
  <id>2d96415de10a50f868054f61abca5f0d5c1a71e7</id>
  <committed-date>2009-11-04T16:15:03-08:00</committed-date>
  <authored-date>2009-11-04T16:15:03-08:00</authored-date>
  <message>added support for new user notification prefs</message>
  <tree>e8d5ca14633bacb79cd6e180801f464b09e1fcb3</tree>
  <committer>
    <name>Dan Dofter</name>
    <email>dan@dofter.com</email>
  </committer>
</commit>
