elabs 2.0.0 → 3.0.0

data/app/models/elabs/concerns/notifiable_entity.rb

@@ -0,0 +1,46 @@
+module Elabs
+  module Concerns
+    module NotifiableEntity
+      extend ActiveSupport::Concern
+
+      included do
+        before_save :create_notification?, if: :changed_by_someone_else
+        after_save :create_notification, if: :changed_by_someone_else
+
+        after_destroy :create_destroy_notifications, if: :changed_by_someone_else
+      end
+
+      private
+
+      def create_notification?
+        @action = if changed.include?('locked')
+                    current_lock_action
+                  else
+                    :nothing
+                  end
+      end
+
+      def create_notification
+        return if @action == :nothing
+
+        Notification.create(
+          content:     self,
+          event:       @action,
+          user:        user,
+          source_user: changed_by
+        )
+      end
+
+      # TODO: check if used ? (dependent: destroy may do the trick.)
+      def create_destroy_notifications
+        Elabs::Notification.where(content: self).destroy_all
+        Elabs::Notification.create(
+          content:     self,
+          event:       :delete,
+          user:        user,
+          source_user: changed_by
+        )
+      end
+    end
+  end
+end

data/app/models/elabs/notification.rb

@@ -0,0 +1,10 @@
+module Elabs
+  class Notification < ApplicationRecord
+    self.table_name = 'notifications'
+    belongs_to :content, polymorphic: true
+    belongs_to :user
+    belongs_to :source_user, class_name: 'Elabs::User', optional: true
+
+    scope :for_user, ->(id) { where(user_id: id) }
+  end
+end

data/app/models/elabs/preference.rb

@@ -5,5 +5,7 @@ module Elabs
     validates :locale, inclusion: { in: %w[en fr] }, allow_blank: true
 
     belongs_to :user
+    belongs_to :writing_language, class_name: 'Elabs::Language', optional: true
+    belongs_to :writing_license, class_name: 'Elabs::License', optional: true
   end
 end

data/app/models/elabs/report.rb

@@ -7,5 +7,15 @@ module Elabs
     validates :name, presence: true, unless: :user
 
     belongs_to :user, optional: true
+
+    after_save :notify_admins
+
+    def notify_admins
+      User.admins.each do |admin|
+        Elabs::Notification.create! content: self,
+                                    event:   :report,
+                                    user:    admin
+      end
+    end
   end
 end

data/app/models/elabs/user.rb

@@ -4,6 +4,7 @@ module Elabs
 
     validates :username, presence: true, uniqueness: true
     validates :role, presence: false
+    validate :avatar_format if Elabs.use_avatars
 
     # Username should:
     # - not start with '-', '_' or '.'
@@ -11,20 +12,39 @@ module Elabs
     # - not contain successive '.', '-' or '_'
     validates_format_of :username, with: /\A(?![_.-])(?!.*[_.]{2})[a-zA-Z0-9._-]+[^_\-.]\z/
 
-    has_many :albums,   dependent: :destroy
-    has_many :articles, dependent: :destroy
-    has_many :notes,    dependent: :destroy
-    has_many :projects, dependent: :destroy
-    has_many :uploads,  dependent: :destroy
-    has_many :reports,  dependent: :destroy
+    has_many :albums,         dependent: :destroy
+    has_many :articles,       dependent: :destroy
+    has_many :notes,          dependent: :destroy
+    has_many :projects,       dependent: :destroy
+    has_many :uploads,        dependent: :destroy
+    has_many :reports,        dependent: :destroy
+    has_many :notifications,  dependent: :destroy
     has_one  :preference, dependent: :delete
 
+    has_one_attached :avatar if Elabs.use_avatars
+
+    scope :admins, -> { where(role: 'admin') }
+
     def admin?
       role == 'admin'
     end
 
+    def display_name
+      real_name.present? ? real_name : "@#{username}"
+    end
+
     after_create do
       Preference.create! user: self, show_nsfw: false
     end
+
+    private
+
+    def avatar_format
+      return unless avatar.attached? # && file.blob
+      return if %w[image/png image/jpeg].include? avatar.blob.content_type
+
+      avatar.purge_later
+      errors.add(:avatar, _('needs to be a "png" or "jpg" image'))
+    end
   end
 end

data/app/views/elabs/acts/_act.json.jbuilder

@@ -1,2 +1,7 @@
-json.extract! act, :id, :content_id, :content_type, :event, :user_id, :created_at, :updated_at
-json.url act_url(act, format: :json)
+json.extract! act, :id,
+              :content_id,
+              :content_type,
+              :event,
+              :created_at,
+              :updated_at,
+              :content

data/app/views/elabs/acts/index.json.jbuilder

@@ -1 +1 @@
-json.array! @acts, partial: 'acts/act', as: :act
+json.array! @acts, partial: 'act', as: :act

data/app/views/elabs/admin/albums/_album.json.jbuilder

@@ -1,2 +1,15 @@
-json.extract! album, :id, :name, :description, :sfw, :published, :locked, :hidden_in_history, :user_id, :language, :license_id, :created_at, :updated_at
-json.url album_url(album, format: :json)
+json.extract! album,
+              :id,
+              :name,
+              :description,
+              :sfw,
+              :published,
+              :locked,
+              :hidden_in_history,
+              :uploads_count,
+              :user_id,
+              :license_id,
+              :language_id,
+              :published_at,
+              :created_at,
+              :updated_at

data/app/views/elabs/admin/albums/index.html.haml

@@ -25,7 +25,7 @@
         %td.is-icon= boolean_icon_tag album.published
         %td.is-icon= boolean_icon_tag album.locked, 'lock', 'unlock'
         %td.is-icon= boolean_icon_tag album.hidden_in_history
-        %td= album.published_at
+        %td= short_date album.published_at
         %td= album.user.username
         %td= album.license.name
         %td= album.language.name

data/app/views/elabs/admin/albums/index.json.jbuilder

@@ -1 +1 @@
-json.array! @albums, partial: 'albums/album', as: :album
+json.array! @albums, partial: 'album', as: :album

data/app/views/elabs/admin/articles/_article.json.jbuilder

@@ -1,2 +1,15 @@
-json.extract! article, :id, :title, :excerpt, :content, :sfw, :published, :locked, :published_at, :hidden_in_history, :user_id, :license_id, :language_id, :created_at, :updated_at
-json.url article_url(article, format: :json)
+json.extract! article,
+              :id,
+              :title,
+              :excerpt,
+              :content,
+              :sfw,
+              :published,
+              :locked,
+              :hidden_in_history,
+              :user_id,
+              :license_id,
+              :language_id,
+              :published_at,
+              :created_at,
+              :updated_at

data/app/views/elabs/admin/articles/index.html.haml

@@ -24,7 +24,7 @@
         %td.is-icon= boolean_icon_tag article.published
         %td.is-icon= boolean_icon_tag article.locked, 'lock', 'unlock'
         %td.is-icon= boolean_icon_tag article.hidden_in_history
-        %td= article.published_at
+        %td= short_date article.published_at
         %td= article.user.username
         %td= article.license.name
         %td= article.language.name

data/app/views/elabs/admin/articles/index.json.jbuilder

@@ -1 +1 @@
-json.array! @articles, partial: 'articles/article', as: :article
+json.array! @articles, partial: 'article', as: :article

data/app/views/elabs/admin/languages/_language.json.jbuilder

@@ -1,2 +1,9 @@
-json.extract! language, :id, :iso639_1, :name
-json.url language_url(language, format: :json)
+json.extract! language,
+              :id,
+              :iso639_1,
+              :name,
+              :albums_count,
+              :articles_count,
+              :notes_count,
+              :projects_count,
+              :uploads_count

data/app/views/elabs/admin/languages/index.html.haml

@@ -27,7 +27,7 @@
         %td.is-counter= language.uploads_count
         %td.actions
           .btn-group
-            = admin_show_online_link language
+            = show_online_link language
             = admin_edit_link 'language', language
             = admin_destroy_link 'language', language
 

data/app/views/elabs/admin/languages/index.json.jbuilder

@@ -1 +1 @@
-json.array! @languages, partial: 'admin/languages/language', as: :language
+json.array! @languages, partial: 'language', as: :language

data/app/views/elabs/admin/licenses/_license.json.jbuilder

@@ -1,2 +1,10 @@
-json.extract! license, :id, :name, :url, :tldr_url, :icon, :created_at, :updated_at
-json.url license_url(license, format: :json)
+json.extract! license, :id,
+              :name,
+              :url,
+              :tldr_url,
+              :icon,
+              :albums_count,
+              :articles_count,
+              :notes_count,
+              :projects_count,
+              :uploads_count

data/app/views/elabs/admin/licenses/index.html.haml

@@ -37,6 +37,6 @@
         %td.is-counter= license.uploads_count
         %td.actions
           .btn-group
-            = admin_show_online_link license
+            = show_online_link license
             = admin_edit_link 'license', license
             = admin_destroy_link 'license', license

data/app/views/elabs/admin/licenses/index.json.jbuilder

@@ -1 +1 @@
-json.array! @licenses, partial: 'licenses/license', as: :license
+json.array! @licenses, partial: 'license', as: :license

data/app/views/elabs/admin/notes/_note.json.jbuilder

@@ -1,2 +1,13 @@
-json.extract! note, :id, :content, :sfw, :hidden_in_history, :user_id, :license_id, :language_id, :created_at, :updated_at
-json.url note_url(note, format: :json)
+json.extract! note,
+              :id,
+              :content,
+              :sfw,
+              :published,
+              :locked,
+              :hidden_in_history,
+              :user_id,
+              :license_id,
+              :language_id,
+              :published_at,
+              :created_at,
+              :updated_at

data/app/views/elabs/admin/notes/index.html.haml

@@ -24,7 +24,7 @@
         %td.is-icon= boolean_icon_tag note.published
         %td.is-icon= boolean_icon_tag note.locked
         %td.is-icon= boolean_icon_tag note.hidden_in_history
-        %td= note.published_at
+        %td= short_date note.published_at
         %td= note.user.username
         %td= note.license.name
         %td= note.language.name

data/app/views/elabs/admin/notes/index.json.jbuilder

@@ -1 +1 @@
-json.array! @notes, partial: 'notes/note', as: :note
+json.array! @notes, partial: 'note', as: :note

data/app/views/elabs/admin/projects/_project.json.jbuilder

@@ -1,2 +1,20 @@
-json.extract! project, :id, :name, :short_description, :description, :main_url, :sfw, :published, :locked, :hidden_in_history, :license_id, :language_id, :user_id, :created_at, :updated_at
-json.url project_url(project, format: :json)
+json.extract! project,
+              :id,
+              :name,
+              :short_description,
+              :description,
+              :main_url,
+              :sfw,
+              :published,
+              :locked,
+              :hidden_in_history,
+              :albums_count,
+              :articles_count,
+              :notes_count,
+              :uploads_count,
+              :user_id,
+              :license_id,
+              :language_id,
+              :published_at,
+              :created_at,
+              :updated_at

data/app/views/elabs/admin/projects/index.html.haml

@@ -27,7 +27,7 @@
         %td.is-icon= boolean_icon_tag project.published
         %td.is-icon= boolean_icon_tag project.locked, 'lock', 'unlock'
         %td.is-icon= boolean_icon_tag project.hidden_in_history
-        %td= project.published_at
+        %td= short_date project.published_at
         %td= project.user.username
         %td= project.license.name
         %td= project.language.name

data/app/views/elabs/admin/projects/index.json.jbuilder

@@ -1 +1 @@
-json.array! @projects, partial: 'projects/project', as: :project
+json.array! @projects, partial: 'project', as: :project

data/app/views/elabs/admin/reports/_report.json.jbuilder

@@ -0,0 +1,10 @@
+json.extract! report,
+              :id,
+              :name,
+              :email,
+              :url,
+              :reason,
+              :allow_contact,
+              :user_id,
+              :created_at,
+              :updated_at

data/app/views/elabs/admin/reports/index.html.haml

@@ -19,7 +19,7 @@
         %td= report.email
         %td= report.user&.username
         %td.is-icon= boolean_icon_tag report.allow_contact
-        %td= report.created_at
+        %td= short_date report.created_at
         %td= link_to report.url, report.url, target: '_blank'
         %td= report.reason
         %td.actions

data/app/views/elabs/admin/reports/index.json.jbuilder

@@ -1 +1 @@
-json.array! @reports, partial: 'reports/report', as: :report
+json.array! @reports, partial: 'report', as: :report

data/app/views/elabs/admin/tags/_tag.json.jbuilder

@@ -1,2 +1,8 @@
-json.extract! tag, :id, :name
-json.url tag_url(tag, format: :json)
+json.extract! tag,
+              :id,
+              :name,
+              :albums_count,
+              :articles_count,
+              :notes_count,
+              :projects_count,
+              :uploads_count

data/app/views/elabs/admin/tags/index.html.haml

@@ -22,6 +22,6 @@
         %td.is-counter= tag.uploads_count
         %td.actions
           .btn-group
-            = admin_show_online_link tag
+            = show_online_link tag
             = admin_edit_link 'tag', tag
             = admin_destroy_link 'tag', tag

data/app/views/elabs/admin/tags/index.json.jbuilder

@@ -1 +1 @@
-json.array! @tags, partial: 'tags/tag', as: :tag
+json.array! @tags, partial: 'tag', as: :tag

data/app/views/elabs/admin/uploads/_upload.json.jbuilder

@@ -1,2 +1,17 @@
-json.extract! upload, :id, :title, :description, :sfw, :hide_in_history, :language_id, :user_id, :license_id, :created_at, :updated_at
-json.url upload_url(upload, format: :json)
+json.extract! upload, :id,
+              :title,
+              :description,
+              :sfw,
+              :published,
+              :locked,
+              :hidden_in_history,
+              :user_id,
+              :license_id,
+              :language_id,
+              :published_at,
+              :created_at,
+              :updated_at
+json.file content_type: upload.file.content_type,
+          url: main_app.url_for(upload.file),
+          filename: upload.file.filename,
+          metadata: upload.file.metadata

data/app/views/elabs/admin/uploads/index.html.haml

@@ -25,7 +25,7 @@
         %td.is-icon= boolean_icon_tag upload.published
         %td.is-icon= boolean_icon_tag upload.locked, 'lock', 'unlock'
         %td.is-icon= boolean_icon_tag upload.hidden_in_history
-        %td= upload.published_at
+        %td= short_date upload.published_at
         %td= upload.user.username
         %td= upload.license.name
         %td= upload.language.name

data/app/views/elabs/admin/uploads/index.json.jbuilder

@@ -1 +1 @@
-json.array! @uploads, partial: 'uploads/upload', as: :upload
+json.array! @uploads, partial: 'upload', as: :upload

data/app/views/elabs/admin/users/_user.json.jbuilder

@@ -0,0 +1,14 @@
+json.extract! user,
+              :id,
+              :confirmed_at,
+              :created_at,
+              :updated_at,
+              :username,
+              :real_name,
+              :biography,
+              :role,
+              :albums_count,
+              :articles_count,
+              :notes_count,
+              :projects_count,
+              :uploads_count

data/app/views/elabs/admin/users/index.html.haml

@@ -6,6 +6,8 @@
       %th= admin_order_by_link _('Username'), 'username'
       %th= admin_order_by_link _('Role'), 'role'
       %th= admin_order_by_link _('Since'), 'created_at'
+      %th= _('Active')
+      %th= _('Pass reset')
       %th= admin_order_by_link _('Album count'), 'albums_count'
       %th= admin_order_by_link _('Article count'), 'articles_count'
       %th= admin_order_by_link _('Note count'), 'notes_count'
@@ -18,7 +20,9 @@
       %tr.user
         %td= user.username
         %td= user.role
-        %td= user.created_at
+        %td= short_date user.created_at
+        %td.is-icon= boolean_icon_tag user.confirmed_at.present?
+        %td.is-icon= boolean_icon_tag user.reset_password_sent_at.present?
         %td.is-counter= user.albums_count
         %td.is-counter= user.articles_count
         %td.is-counter= user.notes_count
@@ -26,7 +30,7 @@
         %td.is-counter= user.uploads_count
         %td.actions
           .btn-group
-            = admin_show_online_link user
+            = show_online_link user
             = admin_show_link 'user', user
             = admin_destroy_link 'user', user