elabs 4.0.0 → 5.0.0

data/app/controllers/elabs/admin/admin_application_controller.rb

@@ -6,7 +6,7 @@ module Elabs
 
       before_action :authenticate_admin!
 
-      layout 'elabs/layouts/admin_application'
+      layout 'elabs/layouts/application_admin'
 
       private
 

data/app/controllers/elabs/admin/announcements_controller.rb

@@ -0,0 +1,71 @@
+module Elabs
+  module Admin
+    class AnnouncementsController < AdminApplicationController
+      before_action :set_announcement, only: %i[edit update destroy]
+
+      # GET /announcements
+      def index
+        @announcements = Announcement.all
+      end
+
+      # GET /announcements/new
+      def new
+        @announcement = Announcement.new
+      end
+
+      # GET /announcements/1/edit
+      def edit; end
+
+      # POST /announcements
+      def create
+        @announcement      = Announcement.new(announcement_params)
+        @announcement.user = current_user
+
+        respond_to do |format|
+          if @announcement.save
+            format.html { redirect_to admin_announcements_url, notice: _('Announcement was successfully created.') }
+            format.json { render '_announcement', status: :created, locals: { announcement: @announcement } }
+          else
+            format.html { render :new }
+            format.json { render json: @announcement.errors, status: :unprocessable_entity }
+          end
+        end
+      end
+
+      # PATCH/PUT /announcements/1
+      def update
+        respond_to do |format|
+          if @announcement.update(announcement_params)
+            format.html { redirect_to admin_announcements_url, notice: _('Announcement was successfully updated.') }
+            format.json { render '_announcement', status: :ok, locals: { announcement: @announcement } }
+
+          else
+            format.html { render :edit }
+            format.json { render json: @announcement.errors, status: :unprocessable_entity }
+          end
+        end
+      end
+
+      # DELETE /announcements/1
+      def destroy
+        @announcement.destroy
+        respond_to do |format|
+          format.html { redirect_to admin_announcements_url, notice: _('Announcement was successfully destroyed.') }
+          format.json { head :no_content }
+        end
+      end
+
+      private
+
+      # Use callbacks to share common setup or constraints between actions.
+      def set_announcement
+        @announcement = Announcement.find(params[:id])
+      end
+
+      # Only allow a trusted parameter "white list" through.
+      def announcement_params
+        params.require(:announcement).permit(:start_at, :end_at, :content, :level, :target)
+      end
+    end
+  end
+end

data/app/controllers/elabs/concerns/elabs_controller.rb

@@ -9,8 +9,11 @@ module Elabs
 
       included do
         helper Elabs::ApplicationHelper
+        helper Elabs::IconsHelper
         helper Elabs::ContentFiltersHelper
         helper Elabs::NotificationHelper
+        helper Elabs::ContentRendererHelper
+        helper Elabs::ShortcodesHelper
 
         layout 'elabs/layouts/application'
       end

data/app/controllers/elabs/content_application_controller.rb

@@ -7,7 +7,10 @@ module Elabs
 
     # POST /comments
     # POST /comments.json
+    # rubocop:disable Metrics/AbcSize
     def create_comment
+      return if trap_dumb_bot_in 'body', _('Comment was successfully created. Thank you Bishop.')
+
       build_comment
 
       respond_to do |format|
@@ -21,6 +24,7 @@ module Elabs
         end
       end
     end
+    # rubocop:enable Metrics/AbcSize
 
     private
 

data/app/controllers/elabs/elabs_public_controller.rb

@@ -96,5 +96,20 @@ module Elabs
       # and slug fields that are not present in params
       slug_parameters.reject { |field| %w[tag_slug project_slug].include?(field) || !params.include?(field) }
     end
+
+    def trap_dumb_bot_in(field, notice)
+      return false unless Elabs.trap_dumb_bots?
+
+      if params[field].present?
+        respond_to do |format|
+          format.html { redirect_to request.referer, notice: notice }
+          format.json { render json: { message: 'ok' }, status: :created }
+        end
+
+        return true
+      end
+
+      false
+    end
   end
 end

data/app/controllers/elabs/languages_controller.rb

@@ -9,11 +9,7 @@ module Elabs
     # GET /languages.json
     def index
       languages = scope_request Language.page(params[:page]).per(self.class::MAX_ITEMS_PER_PAGE)
-      @languages = if params['with_content_only'] && params['with_content_only'] == 'false'
-                     languages
-                   else
-                     languages.with_content_only
-                   end
+      @languages = languages.with_content_only
     end
 
     # GET /languages/1

data/app/controllers/elabs/member/comments_controller.rb

@@ -0,0 +1,42 @@
+module Elabs
+  module Member
+    class CommentsController < MemberApplicationController
+      before_action :set_comment, only: %i[archive destroy]
+
+      def archive
+        respond_to do |format|
+          if @comment.archive!
+            format.html { redirect_to @comment.content, notice: _('Comment was successfully archived.') }
+            format.json { render json: @comment, status: :ok }
+          else
+            format.html { redirect_to @comment.content, notice: _('An error occurred during process') }
+            format.json { render json: @comment.errors, status: :unprocessable_entity }
+          end
+        end
+      end
+
+      def destroy
+        content = @comment.content
+        @comment.destroy
+        respond_to do |format|
+          format.html { redirect_to content, notice: _('Comment was successfully destroyed.') }
+          format.json { head :no_content }
+        end
+      end
+
+      private
+
+      def set_comment
+        id = params.key?('comment_id') ? params['comment_id'] : params['id']
+        comment = Elabs::Comment.find(id)
+
+        if comment.content.user.id == current_user.id
+          @comment = comment
+          return
+        end
+
+        throw ActiveRecord::RecordNotFound
+      end
+    end
+  end
+end

data/app/controllers/elabs/member/member_application_controller.rb

@@ -6,7 +6,7 @@ module Elabs
 
       before_action :authenticate_user!
 
-      layout 'elabs/layouts/member_application'
+      layout 'elabs/layouts/application_member'
     end
   end
 end

data/app/controllers/elabs/reports_controller.rb

@@ -4,6 +4,8 @@ module Elabs
     # POST /reports.json
     # rubocop:disable Metrics/AbcSize
     def create
+      return if trap_dumb_bot_in 'body', _('Report was successfully created. Thank you Bishop.')
+
       report = complete_report_with_user
 
       respond_to do |format|

data/app/helpers/elabs/acts_helper.rb

@@ -13,8 +13,13 @@ module Elabs
     end
 
     def act_notice_string(act, include_link = true)
-      string = format('%<type>s #%<id>i', type: act.content_type.demodulize, id: act.content_id)
-      string = link_to string, act.content unless %w[unpublish destroy lock].include?(act.event) || !include_link
+      type   = act.content_type.demodulize
+      title  = act.content.title_to_display
+      string = if %w[unpublish destroy lock].include?(act.event) || !include_link
+                 format('%<type>s "%<title>s"', type: type, title: title)
+               else
+                 format('%<type>s "%<link>s"', type: type, link: link_to(title, act.content))
+               end
 
       format(_('%<string>s has been %<event>s'), string: string, event: act_action(act.event)).html_safe
     end

data/app/helpers/elabs/application_helper.rb

@@ -8,56 +8,6 @@ module Elabs
       session[:show_nsfw]
     end
 
-    def show_item?(entity)
-      (entity.sfw? || show_nsfw?) && !entity.locked?
-    end
-
-    def user_is_author_of(entity)
-      current_user&.id && entity.user_id == current_user.id
-    end
-
-    def icon_text(icon, text, icon_options = [], reverse = false)
-      format(
-        reverse ? _('%<text>s %<icon>s') : _('%<icon>s %<text>s'),
-        icon: icon(icon, icon_options), text: text
-      ).html_safe
-    end
-
-    def boolean_icon_tag(value, true_icon = 'check', false_icon = 'times', false_class = '', true_class = '')
-      icon_class = [
-        "fas fa-#{value ? true_icon : false_icon} fa-fw #{value ? true_class : false_class}"
-      ]
-      content_tag(:i, nil, class: icon_class)
-    end
-
-    def colored_good_or_bad_icon_tag(value, true_icon = 'check', false_icon = 'times', false_is_good = false)
-      if false_is_good
-        false_class = 'is-success'
-        true_class  = 'is-danger'
-      else
-        false_class = 'is-danger'
-        true_class  = 'is-success'
-      end
-      boolean_icon_tag value, true_icon, false_icon, false_class, true_class
-    end
-
-    def icon(name, classes = [], base = 'fas')
-      icon_class = ["#{base} fa-#{name}"]
-      icon_class += classes.map do |c|
-        if %w[2x 3x 4x fw pulse spin].include? c
-          "fa-#{c}"
-        else
-          c
-        end
-      end
-
-      content_tag(:i, nil, class: icon_class)
-    end
-
-    def license_icon(license, classes = ['fw'])
-      icon license.icon, classes, 'fab'
-    end
-
     def page_title(title, namespace = nil)
       out = [Elabs.site_name]
       out.push(namespace) if namespace
@@ -77,5 +27,13 @@ module Elabs
         self.formats = old_formats
       end
     end
+
+    def singular_type_name(entity)
+      entity.class.name.demodulize.tableize.singularize
+    end
+
+    def model_from_entity(type)
+      "Elabs::#{type.classify}".constantize
+    end
   end
 end

data/app/helpers/elabs/content_filters_helper.rb

@@ -6,10 +6,10 @@ module Elabs
       options               = { param_name => direction }
       options['sfw_status'] = params['sfw_status'] if params['sfw_status']
 
-      icon = direction == :asc ? 'sort-up' : 'sort-down'
+      link_icon = determine_sort_icon param_name, direction
 
       link_to options, class: 'filter-link' do
-        icon_text icon, title, ['fw'], true
+        icon_text link_icon, content_tag('span', title, class: 'link'), %w[fw icon], true
       end
     end
 
@@ -24,39 +24,23 @@ module Elabs
     end
 
     def sfw_only_link
-      icon = params['sfw_status'] && params['sfw_status'] == 'sfw_only' ? 'dot-circle' : 'circle'
+      link_icon = params['sfw_status'] && params['sfw_status'] == 'sfw_only' ? 'dot-circle' : 'circle'
       link_to request.params.merge(sfw_status: 'sfw_only'), class: 'filter-link' do
-        icon_text(icon, _('Only SFW'), ['fw'], true)
+        icon_text link_icon, content_tag('span', _('Only SFW'), class: 'link'), %w[fw icon]
       end
     end
 
     def nsfw_only_link
-      icon = params['sfw_status'] && params['sfw_status'] == 'nsfw_only' ? 'dot-circle' : 'circle'
+      link_icon = params['sfw_status'] && params['sfw_status'] == 'nsfw_only' ? 'dot-circle' : 'circle'
       link_to request.params.merge(sfw_status: 'nsfw_only'), class: 'filter-link' do
-        icon_text(icon, _('Only NSFW'), ['fw'], true)
+        icon_text link_icon, content_tag('span', _('Only NSFW'), class: 'link'), %w[fw icon]
       end
     end
 
     def all_sfw_status_link
-      icon = params['sfw_status'] && %w[sfw_only nsfw_only].include?(params['sfw_status']) ? 'circle' : 'dot-circle'
+      link_icon = params['sfw_status'] && %w[sfw_only nsfw_only].include?(params['sfw_status']) ? 'circle' : 'dot-circle'
       link_to request.params.merge(sfw_status: 'all'), class: 'filter-link' do
-        icon_text(icon, _('Show all'), ['fw'], true)
-      end
-    end
-
-    def with_content_filter_links
-      out = []
-
-      out.push all_filter_link
-      out.push with_content_only_filter_link
-
-      raw out.join('')
-    end
-
-    def with_content_only_filter_link
-      icon = !params['with_content_only'] || params['with_content_only'] == 'true' ? 'dot-circle' : 'circle'
-      link_to request.params.merge(with_content_only: 'true'), class: 'filter-link' do
-        icon_text(icon, _('With content only'), ['fw'], true)
+        icon_text link_icon, content_tag('span', _('Show all'), class: 'link'), %w[fw icon]
       end
     end
 
@@ -93,5 +77,14 @@ module Elabs
          projects
          uploads].include?(controller_name) && action_name == 'index'
     end
+
+    private
+
+    def determine_sort_icon(field, direction)
+      return 'sort-up' if params[field] && direction == :asc
+      return 'sort-down' if params[field] && direction == :desc
+
+      'minus'
+    end
   end
 end

data/app/helpers/elabs/content_helper.rb

@@ -1,45 +1,18 @@
 module Elabs
   module ContentHelper
-    def show_online_link(entity)
-      options = {
-        title: _('View online'),
-        class: 'btn btn--small btn--show'
-      }
-      if entity.respond_to?(:publicly_visible?) && !entity.publicly_visible?
-        options[:disabled] = true
-        return content_tag 'a', icon('eye', ['fw']), options
-      end
-      link_to entity, options do
-        icon('eye', ['fw'])
-      end
-    end
-
-    def namespace_show_link(namespace, singular_model, entity)
-      link_to send("#{namespace}_#{singular_model}_path", entity),
-              title: _('View online'),
-              class: 'btn btn--small btn--show' do
-        icon('eye', ['fw'])
-      end
+    def show_item?(entity)
+      (entity.sfw? || show_nsfw?) && !entity.locked?
     end
 
-    def namespace_edit_link(namespace, singular_model, entity)
-      link_to send("edit_#{namespace}_#{singular_model}_path", entity),
-              title: _('Edit'),
-              class: 'btn btn--small btn--edit' do
-        icon('pencil-alt', ['fw'])
-      end
+    def user_is_author_of(entity)
+      current_user&.id && entity.user_id == current_user.id
     end
 
-    def namespace_destroy_link(namespace, singular_model, entity, confirm = true)
-      link_params = {
-        title:  _('Destroy'),
-        method: :delete,
-        class:  'btn btn--small btn--destroy'
-      }
-      link_params[:data] = { confirm: _('Are you sure?') } if confirm
-      link_to send("#{namespace}_#{singular_model}_path".to_sym, entity), link_params do
-        icon('trash', ['fw'])
+    def first_type_with_content(entity)
+      %i[albums articles notes projects uploads].each do |type|
+        return type.to_s if entity.respond_to?(type) && entity["#{type}_count"].positive?
       end
+      'albums'
     end
   end
 end

data/app/helpers/elabs/content_renderer_helper.rb

@@ -1,123 +1,15 @@
 module Elabs
   module ContentRendererHelper
-    SHORT_CODES = {
-      /\[album:(\d+)\]/                                          => [:shortcode_album, { size: :inline }],
-      /\[article:(\d+)\]/                                        => [:shortcode_article, { size: :inline }],
-      /\[note:(\d+)\]/                                           => [:shortcode_note, { size: :inline }],
-      /\[project:(\d+)\]/                                        => [:shortcode_project, { size: :inline }],
-      /\[upload:(\d+)\]/                                         => [:shortcode_upload, { size: :inline }],
-      /\[user:(\d+)\]/                                           => [:shortcode_user, { size: :inline }],
-      /\[album-card:(\d+)\]/                                     => [:shortcode_album, { size: :large }],
-      /\[article-card:(\d+)\]/                                   => [:shortcode_article, { size: :large }],
-      /\[note-card:(\d+)\]/                                      => [:shortcode_note, { size: :large }],
-      /\[project-card:(\d+)\]/                                   => [:shortcode_project, { size: :large }],
-      /\[upload-card:(\d+)\]/                                    => [:shortcode_upload, { size: :large }],
-      /\[user-card:(\d+)\]/                                      => [:shortcode_user, { size: :large }],
-      %r{\[github-repo:([a-zA-Z0-9\-_]+/[a-zA-Z0-9\-_]+)\]}      => [:shortcode_github_repo_inline, { size: :inline }],
-      %r{\[github-repo-card:([a-zA-Z0-9\-_]+/[a-zA-Z0-9\-_]+)\]} => [:shortcode_github_repo, {}],
-      /\[github-user-card:([a-zA-Z0-9\-_]+)\]/                   => [:shortcode_github_user, {}],
-      %r{\[gitlab-repo:(https://.*)\]}                           => [:shortcode_gitlab_repo_inline, { size: :inline }],
-      %r{\[gitlab-repo-card:(https://.*)\]}                      => [:shortcode_gitlab_repo, {}],
-      %r{\[gitlab-user-card:(https://.*)\]}                      => [:shortcode_gitlab_user, {}],
-      %r{\[gitlab-group-card:(https://.*)\]}                     => [:shortcode_gitlab_group, {}]
-    }.freeze
-
     def markdown(text, reference_entity = nil, show_short_codes = true)
-      process_short_codes CommonMarker.render_html(text, [:SAFE], [:table]).html_safe,
+      return '' if text.nil?
+
+      process_short_codes CommonMarker.render_html(text, [:DEFAULT], [:table]).html_safe,
                           reference_entity,
                           show_short_codes
     end
 
     def render_entity_content(entity, field, show_short_codes = true)
-      markdown entity[field], entity, show_short_codes
-    end
-
-    def process_short_codes(text, original_entity = nil, display = true)
-      SHORT_CODES.each do |key, method|
-        text.gsub! key do |match|
-          if display || (method[1][:size] && method[1][:size] == :inline)
-            send(method[0], original_entity, match.sub(key, '\1'), method[1])
-          else
-            render(partial: 'elabs/layouts/shortcode_open_to_see') unless display
-          end
-        end
-      end
-      text.html_safe
-    end
-
-    private
-
-    def shortcode_album(original_entity, id, options = {})
-      shortcode_content 'album', original_entity, id, options
-    end
-
-    def shortcode_article(original_entity, id, options = {})
-      shortcode_content 'article', original_entity, id, options
-    end
-
-    def shortcode_note(original_entity, id, options = {})
-      shortcode_content 'note', original_entity, id, options
-    end
-
-    def shortcode_project(original_entity, id, options = {})
-      shortcode_content 'project', original_entity, id, options
-    end
-
-    def shortcode_upload(original_entity, id, options = {})
-      shortcode_content 'upload', original_entity, id, options
-    end
-
-    def shortcode_user(original_entity, id, options = {})
-      shortcode_content 'user', original_entity, id, options
-    end
-
-    def shortcode_content(type, original_entity, id, options = { size: :large })
-      model       = "Elabs::#{type.classify}".constantize
-      widget_size = case options[:size]
-                    when :inline
-                      '_inline'
-                    else
-                      ''
-                    end
-      return render "elabs/layouts/shortcode_infinite_loop#{widget_size}", format: :html if original_entity && original_entity.id == id.to_i && original_entity.class == model
-
-      entity = model.find_by(id: id)
-      return render "elabs/layouts/shortcode_missing_content#{widget_size}", format: :html unless entity
-
-      render partial: "elabs/#{type.pluralize}/#{type}#{widget_size}", locals: { type.to_sym => entity }, format: :html
-    end
-
-    def shortcode_github_repo(_original_entity, repo_url, _options = {})
-      render partial: 'elabs/layouts/widgets/github_repo_card', locals: { repo_url: repo_url }
-    end
-
-    def shortcode_github_repo_inline(_original_entity, repo_url, _options = {})
-      url_matches = %r{([a-zA-Z0-9\-_]+)/([a-zA-Z0-9\-_]+)}.match repo_url
-      render partial: 'elabs/layouts/widgets/github_repo_inline', locals: { url_matches: url_matches }
-    end
-
-    def shortcode_github_user(_original_entity, user_name, _options = {})
-      render partial: 'elabs/layouts/widgets/github_user_card', locals: { user_name: user_name }
-    end
-
-    def shortcode_gitlab_repo(_original_entity, repo_url, _options = {})
-      url_matches = %r{(?:https://)?([a-z0-9\-_\.]+)/(.+)}.match repo_url
-      render partial: 'elabs/layouts/widgets/gitlab_repo_card', locals: { url_matches: url_matches }
-    end
-
-    def shortcode_gitlab_repo_inline(_original_entity, repo_url, _options = {})
-      url_matches = %r{(.*)/([a-zA-Z0-9\-_]+)/([a-zA-Z0-9\-_]+)}.match repo_url
-      render partial: 'elabs/layouts/widgets/gitlab_repo_inline', locals: { url_matches: url_matches }
-    end
-
-    def shortcode_gitlab_user(_original_entity, user_url, _options = {})
-      url_matches = %r{(?:https://)?([a-z0-9\-_\.]*)/([a-zA-Z0-9\-_]+)}.match user_url
-      render partial: 'elabs/layouts/widgets/gitlab_user_card', locals: { url_matches: url_matches }
-    end
-
-    def shortcode_gitlab_group(_original_entity, group_url, _options = {})
-      url_matches = %r{(?:https://)?([a-z0-9\-_\.]*)/([a-zA-Z0-9\-_]+)}.match group_url
-      render partial: 'elabs/layouts/widgets/gitlab_group_card', locals: { url_matches: url_matches }
+      markdown entity.send(field), entity, show_short_codes
     end
   end
 end