my_forum 0.0.1.beta54 → 0.0.1.beta55

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 05f5add2d9ed60e6426fbe2fd3397d433a97240a
-  data.tar.gz: 817168a8cf5afe3a4c79dc01088ad4d9df1ef894
+  metadata.gz: d60d076b33e39482575fa28df6a0cb00abd6fd0a
+  data.tar.gz: 1cc2d2d4d6de0fd303d9efb42460fb9747e0dc17
 SHA512:
-  metadata.gz: adb0e2d983a36c3dfe32409b980892cae0e0d0bd33a615455c8c7f1561c8fe8a41b7af462e01d0e500b7d5351f79a27a04cd2c51f64f6747e4c6509e57983b34
-  data.tar.gz: 5b2be6aa9eee71f98ac0f9aac8b922afa3a542378e839b4517f60564c7d488ec9456b5eb575d67fce5e31ec5187630b2e3399705a1d94aaf72c8c42a66cf0609
+  metadata.gz: 1e1b855277fa1dec912d8e7c394579e55b65c285c1216edafe732762393a8121a7cbda0cce01ce8aae703cc345fff7dd6fb340a3a144971e26eca9497d6e05cc
+  data.tar.gz: 3a6f0d50d345965110223814ad1d4617b28048af488a241021f5dde12942b11f944e977a9ae10358aa6e0197f81090f074a4c37e1300867a562aed51fdad75d0

data/app/helpers/my_forum/forums_helper.rb

@@ -2,11 +2,11 @@ module MyForum
   module ForumsHelper
 
     def forum_status_img(forum)
-      unread = 'lada_logo_unread.jpg'
-      read = 'lada_logo.jpg'
+      unread  = 'lada_logo_unread.jpg'
+      read    = 'lada_logo.jpg'
 
-      display_as = unread
-      display_as = read unless current_user && forum.has_unread_posts?(current_user)
+      display_as = read
+      display_as = unread if forum.has_unread_posts?(current_user)
 
       image_tag(display_as, width: '66px')
     end

data/app/models/my_forum/forum.rb

@@ -4,28 +4,18 @@ module MyForum
     has_many  :topics
     has_many  :posts
 
-    # TODO: Deprecated
-    # def latest_topic_info
-    #   Topic.find_by_sql("
-    #     SELECT
-    #       my_forum_topics.name AS topic_name,
-    #       my_forum_topics.forum_id,
-    #       my_forum_topics.id,
-    #       my_forum_topics.latest_post_created_at AS post_created_at,
-    #       my_forum_topics.latest_post_login AS user_login
-    #     FROM my_forum_topics
-    #     WHERE my_forum_topics.forum_id = #{self.id}
-    #     LIMIT 1
-    #   ").first
-    # end
-
     def has_unread_posts?(current_user)
-      latest_post_ids = self.topics.where('updated_at >= ?', current_user.created_at).pluck(:latest_post_id)
-      read_log = LogReadMark.where("user_id = ? AND post_id IN (?)", current_user.id, latest_post_ids).count
+      return false unless current_user
+
+      latest_post_ids = self.topics.where('latest_post_created_at >= ?', current_user.created_at).pluck(:latest_post_id)
+      read_log = LogReadMark.where("user_id = ? AND post_id IN (?)", current_user.id, latest_post_ids).pluck(:post_id)
 
-      latest_post_ids.length != read_log
+      !(latest_post_ids - read_log).empty?
+      #latest_post_ids.length != read_log
+      #read_log >= latest_post_ids.length
     end
 
+    # Forum index page
     def topics_with_latest_post_info(page: 0, per_page: 30)
       Topic.paginate_by_sql("
         SELECT
@@ -34,7 +24,7 @@ module MyForum
           my_forum_topics.latest_post_login AS last_post_user_login
         FROM my_forum_topics
         WHERE my_forum_topics.forum_id = #{self.id} AND my_forum_topics.deleted IS FALSE
-        ORDER BY my_forum_topics.pinned, my_forum_topics.latest_post_created_at DESC
+        ORDER BY my_forum_topics.pinned DESC, my_forum_topics.latest_post_created_at DESC
       ", page: page, per_page: per_page)
     end
 

data/lib/my_forum/version.rb

@@ -1,3 +1,3 @@
 module MyForum
-  VERSION = "0.0.1.beta54"
+  VERSION = "0.0.1.beta55"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: my_forum
 version: !ruby/object:Gem::Version
-  version: 0.0.1.beta54
+  version: 0.0.1.beta55
 platform: ruby
 authors:
 - Vitaly Omelchenko