diff --git a/app/services/discourse_rewind/rewind/action/fbff.rb b/app/services/discourse_rewind/rewind/action/.fbff.rb similarity index 100% rename from app/services/discourse_rewind/rewind/action/fbff.rb rename to app/services/discourse_rewind/rewind/action/.fbff.rb diff --git a/app/services/discourse_rewind/rewind/action/reactions.rb b/app/services/discourse_rewind/rewind/action/reactions.rb index b94b4bb..ad70308 100644 --- a/app/services/discourse_rewind/rewind/action/reactions.rb +++ b/app/services/discourse_rewind/rewind/action/reactions.rb @@ -42,7 +42,7 @@ module DiscourseRewind end def enabled? - SiteSetting.discourse_reaction_enabled || SiteSetting.chat_enabled + SiteSetting.discourse_reactions_enabled || SiteSetting.chat_enabled end def sort_and_limit(reactions) diff --git a/app/services/discourse_rewind/rewind/action/reading_time.rb b/app/services/discourse_rewind/rewind/action/reading_time.rb index c5d1fd9..e5e0bb8 100644 --- a/app/services/discourse_rewind/rewind/action/reading_time.rb +++ b/app/services/discourse_rewind/rewind/action/reading_time.rb @@ -10,7 +10,7 @@ module DiscourseRewind { data: { reading_time: reading_time, - books: best_book_fit(reading_time), + book: best_book_fit(reading_time), }, identifier: "reading-time", } @@ -44,11 +44,13 @@ module DiscourseRewind def best_book_fit(reading_time) reading_time_rest = reading_time books = [] + while reading_time_rest > 0 books << popular_book_reading_time.min_by { |_, v| (v - reading_time_rest).abs }.first reading_time_rest -= popular_book_reading_time[books.last] end - books.group_by(&:itself).transform_values(&:count) + + books.group_by(&:itself).transform_values(&:count).max_by { |_, count| count }.first end end end diff --git a/assets/javascripts/discourse/components/reports/best-topics copy.gjs b/assets/javascripts/discourse/components/reports/best-topics copy.gjs new file mode 100644 index 0000000..dc578ed --- /dev/null +++ b/assets/javascripts/discourse/components/reports/best-topics copy.gjs @@ -0,0 +1,46 @@ +import Component from "@glimmer/component"; +import { concat } from "@ember/helper"; +import { htmlSafe } from "@ember/template"; +import emoji from "discourse/helpers/emoji"; + +export default class BestTopics extends Component { + rank(idx) { + return idx + 1; + } + + emojiName(rank) { + if (rank + 1 === 1) { + return "1st_place_medal"; + } else if (rank + 1 === 2) { + return "2nd_place_medal"; + } else if (rank + 1 === 3) { + return "3rd_place_medal"; + } else { + return "medal"; + } + } + + +} diff --git a/assets/javascripts/discourse/components/reports/reactions.gjs b/assets/javascripts/discourse/components/reports/reactions.gjs index 2e75fce..0d90ef9 100644 --- a/assets/javascripts/discourse/components/reports/reactions.gjs +++ b/assets/javascripts/discourse/components/reports/reactions.gjs @@ -31,6 +31,7 @@ export default class Reactions extends Component { }