explore section reworked, fixes #66

server/content/content.coffee

@@ -17,6 +17,7 @@ class @Content
 
     @projects = {}
     @tags = {}
+    @sorted_tags = []
 
     @project_count = 0
     @user_count = 0
@@ -116,6 +117,7 @@ class @Content
       if not tag?
         tag = new Tag(t)
         @tags[t] = tag
+        @sorted_tags.push tag
       tag.add project
 
     return
@@ -151,17 +153,20 @@ class @Content
     time = Date.now()
     @top_projects.sort (a,b)-> b.likes-a.likes
     @new_projects.sort (a,b)-> b.first_published-a.first_published
+    @sorted_tags.sort (a,b)-> b.uses+b.num_users*10-a.uses-a.num_users*10
 
-    return if @top_projects.length<2 or @new_projects.length<2
+    return if @top_projects.length<5
 
     now = Date.now()
-    maxLikes = Math.max(1,@top_projects[0].likes)
-    maxAge = now-@new_projects[@new_projects.length-1].first_published
+    maxLikes = Math.max(1,@top_projects[4].likes)
+
+    fade = (x)->
+      1-Math.max(0,Math.min(1,x))
 
     note = (p)->
-      hours = Math.max(0,(now-p.first_published))/1000/3600
-      agemark = Math.exp(-hours/24/7)
-      p.likes/maxLikes*50+50*agemark
+      recent = fade (now-p.first_published)/1000/3600/24/4
+      rating = p.likes/maxLikes*(.15+2*fade((now-p.first_published)/1000/3600/24/180))
+      recent+rating
 
     @hot_projects.sort (a,b)->
       note(b)-note(a)
@@ -207,6 +212,7 @@ class @Content
     if not tag?
       tag = new Tag(t)
       @tags[t] = tag
+      @sorted_tags.push tag
     tag.add project
 
   removeProjectTag:(project,t)->

server/content/content.js

@@ -27,6 +27,7 @@ this.Content = (function() {
     this.tokens = {};
     this.projects = {};
     this.tags = {};
+    this.sorted_tags = [];
     this.project_count = 0;
     this.user_count = 0;
     this.guest_count = 0;
@@ -156,6 +157,7 @@ this.Content = (function() {
       if (tag == null) {
         tag = new Tag(t);
         this.tags[t] = tag;
+        this.sorted_tags.push(tag);
       }
       tag.add(project);
     }
@@ -204,25 +206,30 @@ this.Content = (function() {
   };
 
   Content.prototype.sortPublicProjects = function() {
-    var maxAge, maxLikes, note, now, time;
+    var fade, maxLikes, note, now, time;
     time = Date.now();
     this.top_projects.sort(function(a, b) {
       return b.likes - a.likes;
     });
     this.new_projects.sort(function(a, b) {
       return b.first_published - a.first_published;
     });
-    if (this.top_projects.length < 2 || this.new_projects.length < 2) {
+    this.sorted_tags.sort(function(a, b) {
+      return b.uses + b.num_users * 10 - a.uses - a.num_users * 10;
+    });
+    if (this.top_projects.length < 5) {
       return;
     }
     now = Date.now();
-    maxLikes = Math.max(1, this.top_projects[0].likes);
-    maxAge = now - this.new_projects[this.new_projects.length - 1].first_published;
+    maxLikes = Math.max(1, this.top_projects[4].likes);
+    fade = function(x) {
+      return 1 - Math.max(0, Math.min(1, x));
+    };
     note = function(p) {
-      var agemark, hours;
-      hours = Math.max(0, now - p.first_published) / 1000 / 3600;
-      agemark = Math.exp(-hours / 24 / 7);
-      return p.likes / maxLikes * 50 + 50 * agemark;
+      var rating, recent;
+      recent = fade((now - p.first_published) / 1000 / 3600 / 24 / 4);
+      rating = p.likes / maxLikes * (.15 + 2 * fade((now - p.first_published) / 1000 / 3600 / 24 / 180));
+      return recent + rating;
     };
     this.hot_projects.sort(function(a, b) {
       return note(b) - note(a);
@@ -285,6 +292,7 @@ this.Content = (function() {
     if (tag == null) {
       tag = new Tag(t);
       this.tags[t] = tag;
+      this.sorted_tags.push(tag);
     }
     return tag.add(project);
   };

server/content/tag.coffee

@@ -2,11 +2,16 @@ class @Tag
   constructor:(@tag)->
     @targets = {}
     @uses = 0
+    @users = {}
+    @num_users = 0
 
   add:(target)->
     if not @targets[target.id]?
       @targets[target.id] = target
       @uses++
+      if target.owner? and target.owner.id? and not @users[target.owner.id]
+        @users[target.owner.id] = true
+        @num_users += 1
 
   remove:(target)->
     if @targets[target.id]?

server/content/tag.js

@@ -3,12 +3,18 @@ this.Tag = (function() {
     this.tag = tag;
     this.targets = {};
     this.uses = 0;
+    this.users = {};
+    this.num_users = 0;
   }
 
   Tag.prototype.add = function(target) {
     if (this.targets[target.id] == null) {
       this.targets[target.id] = target;
-      return this.uses++;
+      this.uses++;
+      if ((target.owner != null) && (target.owner.id != null) && !this.users[target.owner.id]) {
+        this.users[target.owner.id] = true;
+        return this.num_users += 1;
+      }
     }
   };
 

server/session/session.coffee

@@ -875,9 +875,36 @@ class @Session
         source = @content.hot_projects
 
     list = []
-    for p,i in source
-      break if list.length>=300
+    tags = if Array.isArray(data.tags) then data.tags else []
+    search = if typeof data.search == "string" then data.search else ""
+    search = search.trim()
+    offset = data.offset or 0
+
+    for i in [offset..source.length-1] by 1
+      p = source[i]
+
+      break if list.length >= 25
+      offset = i+1
+
       if p.public and not p.deleted and not p.owner.flags.censored
+        if search
+          found = false
+          found |= p.title.toLowerCase().includes(search)
+          found |= p.description.toLowerCase().includes(search)
+          found |= p.owner.nick.toLowerCase().includes(search)
+          for t in p.tags
+            found |= t.includes(search)
+
+          continue if not found
+
+        if tags.length > 0
+          found = false
+          for t in tags
+            if p.tags.indexOf(t)>=0
+              found = true
+              break
+          continue if not found
+
         list.push
           id: p.id
           title: p.title
@@ -899,9 +926,16 @@ class @Session
           libs: p.libs
           tabs: p.tabs
 
+    tags = []
+    for t in @content.sorted_tags
+      tags.push t.tag
+      break if tags.length>50
+
     @send
       name: "public_projects"
       list: list
+      tags: tags
+      offset: offset
       request_id: data.request_id
 
   getPublicProject:(msg)->

server/session/session.js

@@ -1377,7 +1377,7 @@ this.Session = (function() {
   };
 
   Session.prototype.getPublicProjects = function(data) {
-    var i, j, len1, list, p, source;
+    var found, i, j, k, l, len1, len2, len3, list, m, offset, p, ref, ref1, ref2, ref3, search, source, t, tags;
     switch (data.ranking) {
       case "new":
         source = this.content.new_projects;
@@ -1389,12 +1389,44 @@ this.Session = (function() {
         source = this.content.hot_projects;
     }
     list = [];
-    for (i = j = 0, len1 = source.length; j < len1; i = ++j) {
+    tags = Array.isArray(data.tags) ? data.tags : [];
+    search = typeof data.search === "string" ? data.search : "";
+    search = search.trim();
+    offset = data.offset || 0;
+    for (i = j = ref = offset, ref1 = source.length - 1; j <= ref1; i = j += 1) {
       p = source[i];
-      if (list.length >= 300) {
+      if (list.length >= 25) {
         break;
       }
+      offset = i + 1;
       if (p["public"] && !p.deleted && !p.owner.flags.censored) {
+        if (search) {
+          found = false;
+          found |= p.title.toLowerCase().includes(search);
+          found |= p.description.toLowerCase().includes(search);
+          found |= p.owner.nick.toLowerCase().includes(search);
+          ref2 = p.tags;
+          for (k = 0, len1 = ref2.length; k < len1; k++) {
+            t = ref2[k];
+            found |= t.includes(search);
+          }
+          if (!found) {
+            continue;
+          }
+        }
+        if (tags.length > 0) {
+          found = false;
+          for (l = 0, len2 = tags.length; l < len2; l++) {
+            t = tags[l];
+            if (p.tags.indexOf(t) >= 0) {
+              found = true;
+              break;
+            }
+          }
+          if (!found) {
+            continue;
+          }
+        }
         list.push({
           id: p.id,
           title: p.title,
@@ -1419,9 +1451,20 @@ this.Session = (function() {
         });
       }
     }
+    tags = [];
+    ref3 = this.content.sorted_tags;
+    for (m = 0, len3 = ref3.length; m < len3; m++) {
+      t = ref3[m];
+      tags.push(t.tag);
+      if (tags.length > 50) {
+        break;
+      }
+    }
     return this.send({
       name: "public_projects",
       list: list,
+      tags: tags,
+      offset: offset,
       request_id: data.request_id
     });
   };

static/js/appstate.coffee

@@ -53,18 +53,10 @@ class @AppState
         else
           s = location.pathname.split("/")
           if s[2]? and s[3]?
-            if @app.explore.projects?
-              p = @app.explore.findProject(s[2],s[3])
-              if p
-                @app.explore.openProject(p)
-                @app.appui.setMainSection "explore"
-            else
-              @app.explore.update ()=>
-                p = @app.explore.findProject(s[2],s[3])
-                if p
-                  @app.explore.openProject(p)
-                  @app.appui.setMainSection "explore"
-
+            p = @app.explore.findProject(s[2],s[3])
+            if p
+              @app.explore.openProject(p)
+              @app.appui.setMainSection "explore"
 
   initState:()->
     if location.pathname.startsWith("/login/")

static/js/appstate.js

@@ -74,22 +74,10 @@ this.AppState = (function() {
         } else {
           s = location.pathname.split("/");
           if ((s[2] != null) && (s[3] != null)) {
-            if (this.app.explore.projects != null) {
-              p = this.app.explore.findProject(s[2], s[3]);
-              if (p) {
-                this.app.explore.openProject(p);
-                return this.app.appui.setMainSection("explore");
-              }
-            } else {
-              return this.app.explore.update((function(_this) {
-                return function() {
-                  p = _this.app.explore.findProject(s[2], s[3]);
-                  if (p) {
-                    _this.app.explore.openProject(p);
-                    return _this.app.appui.setMainSection("explore");
-                  }
-                };
-              })(this));
+            p = this.app.explore.findProject(s[2], s[3]);
+            if (p) {
+              this.app.explore.openProject(p);
+              return this.app.appui.setMainSection("explore");
             }
           }
         }