decidim-blogs 0.29.1 → 0.30.0.rc1

data/config/locales/sv.yml

@@ -15,27 +15,34 @@ sv:
         one: Inlägg
         other: Inlägg
   decidim:
+    admin:
+      admin_log:
+        changeset:
+          posts: Inlägg
     blogs:
       actions:
         author_id: Skapa inlägg som
-        confirm_destroy: Vill du radera inlägget?
-        destroy: Radera
+        confirm_delete_post: Är du säker på att du vill radera inlägget?
+        deleted_posts_info: Raderade inlägg kan återställas från papperskorgen.
         edit: Redigera
         new: Nytt inlägg
         title: Åtgärder
+        view_deleted_posts: Visa raderade inlägg
       admin:
         posts:
           create:
             invalid: Det gick inte att skapa inlägget.
             success: Inlägget har skapats.
           destroy:
-            success: Inlägget har raderats.
+            success: Inlägget raderades.
           edit:
             save: Uppdatera
             title: Redigera inlägg
           index:
             not_published_yet: Ej publicerat.
             title: Inlägg
+          manage_trash:
+            title: Raderade inlägg
           new:
             create: Skapa
             title: Skapa inlägg
@@ -46,6 +53,8 @@ sv:
         post:
           create: "%{user_name} skapade blogginlägget %{resource_name} i %{space_name}"
           delete: "%{user_name} raderade blogginlägget %{resource_name} från %{space_name}"
+          restore: "%{user_name} återställde %{resource_name} blogginlägg i %{space_name}"
+          soft_delete: "%{user_name} flyttade blogginlägget %{resource_name} i %{space_name} till papperskorgen"
           update: "%{user_name} uppdaterade blogginlägget %{resource_name} i %{space_name}"
       content_blocks:
         highlighted_posts:
@@ -63,11 +72,28 @@ sv:
             published_at: Publicerad
             title: Titel
       posts:
+        edit:
+          back: Tillbaka till inlägget
+          button: Uppdatera
+          title: Redigera inlägg
+        form:
+          author_id: Författare
+          body: Text
+          title: Titel
         index:
           count:
             one: "%{count} inlägg"
             other: "%{count} inlägg"
           empty: Det finns inga inlägg ännu.
+          new_post: Nytt inlägg
+        menu_actions:
+          button_destroy: Ta bort inlägg
+          button_destroy_confirm: Är du säker på att du vill radera inlägget?
+          button_edit: Redigera inlägg
+        new:
+          back: Tillbaka till inlägg
+          button: Skapa
+          title: Skapa nytt inlägg
     components:
       blogs:
         actions:
@@ -82,6 +108,7 @@ sv:
             announcement: Meddelande
             comments_enabled: Aktivera kommentarer
             comments_max_length: Maximal kommentarslängd (ange 0 för att använda standardvärdet)
+            creation_enabled_for_participants: Deltagarna kan skapa inlägg
           step:
             announcement: Meddelande
             comments_blocked: Stäng av kommentarer
@@ -94,5 +121,33 @@ sv:
           email_outro: Du har fått det här meddelandet eftersom du följer "%{participatory_space_title}". Du kan sluta att följa det från den föregående länken.
           email_subject: Ett nytt inlägg har publicerats i %{participatory_space_title}
           notification_title: Inlägget <a href="%{resource_path}">%{resource_title}</a> har publicerats i %{participatory_space_title}
+    open_data:
+      help:
+        post_comments:
+          alignment: Positiva, negativa eller neutrala kommentarer
+          author: Namn på den som kommenterat
+          body: Kommentaren
+          commentable_id: Kommentarens unika id
+          commentable_type: Vad som kommenterades (resultat, förslag etc)
+          created_at: Datum för kommentaren
+          depth: Kommentarens plats i en hierarki av kommentarer (om den är ett svar på en annan kommentar)
+          id: Id för kommentaren
+          locale: Kommentarförfattarens språk
+          root_commentable_url: URL till innehållet som är relaterat till kommentaren
+          user_group: Namn på gruppen som kommenterat (om det var en grupp)
+        posts:
+          author: Uppgifter om författaren
+          body: Inläggets text
+          comments_count: Antalet kommentarer till inlägget
+          component: Komponenten som inlägget tillhör
+          created_at: Datum för inlägget
+          endorsements_count: Antal gilla-markeringar för inlägget
+          follows_count: Antal följare för inlägget
+          id: Unikt id för inlägget
+          participatory_space: Vilket utrymme (deltagandeprocess eller samråd) inlägget tillhör
+          published_at: Publiceringsdatum för inlägget
+          title: Titeln på inlägget
+          updated_at: Senaste datum när inlägget uppdaterades
+          url: URL för inlägget
     statistics:
       posts_count: Inlägg

data/config/locales/tr-TR.yml

@@ -17,8 +17,6 @@ tr:
   decidim:
     blogs:
       actions:
-        confirm_destroy: Bu yayını silmek istediğinize emin misiniz?
-        destroy: silmek
         edit: Düzenle
         new: Yeni posta
         title: Eylemler

data/config/locales/uk.yml

@@ -13,8 +13,6 @@ uk:
   decidim:
     blogs:
       actions:
-        confirm_destroy: Ви дійсно бажаєте видалити цей проект?
-        destroy: Видалити
         edit: Редагувати
         new: Створити новий допис
         title: Дії

data/config/locales/zh-CN.yml

@@ -10,8 +10,6 @@ zh-CN:
   decidim:
     blogs:
       actions:
-        confirm_destroy: 您确定要删除此帖子？
-        destroy: 删除
         edit: 编辑
         new: 新建帖子
         title: 行动

data/config/locales/zh-TW.yml

@@ -17,8 +17,6 @@ zh-TW:
     blogs:
       actions:
         author_id: 發佈文章
-        confirm_destroy: 您確定要刪除此文章嗎？
-        destroy: 刪除
         edit: 編輯
         new: 新貼文
         title: 操作
@@ -27,8 +25,6 @@ zh-TW:
           create:
             invalid: 建立此文章時出現問題
             success: 文章已成功建立
-          destroy:
-            success: 文章已成功刪除
           edit:
             save: 更新
             title: 编辑文章

data/db/migrate/20200827153709_add_commentable_counter_cache_to_posts.rb

@@ -4,6 +4,6 @@ class AddCommentableCounterCacheToPosts < ActiveRecord::Migration[5.2]
   def change
     add_column :decidim_blogs_posts, :comments_count, :integer, null: false, default: 0, index: true
     Decidim::Blogs::Post.reset_column_information
-    Decidim::Blogs::Post.find_each(&:update_comments_count)
+    Decidim::Blogs::Post.unscoped.find_each(&:update_comments_count)
   end
 end

data/db/migrate/20210310120514_add_followable_counter_cache_to_blogs.rb

@@ -7,7 +7,7 @@ class AddFollowableCounterCacheToBlogs < ActiveRecord::Migration[5.2]
     reversible do |dir|
       dir.up do
         Decidim::Blogs::Post.reset_column_information
-        Decidim::Blogs::Post.find_each do |record|
+        Decidim::Blogs::Post.unscoped.find_each do |record|
           record.class.reset_counters(record.id, :follows)
         end
       end

data/db/migrate/20240828103324_add_deleted_at_to_decidim_blogs_posts.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+class AddDeletedAtToDecidimBlogsPosts < ActiveRecord::Migration[7.0]
+  def change
+    add_column :decidim_blogs_posts, :deleted_at, :datetime
+    add_index :decidim_blogs_posts, :deleted_at
+  end
+end

data/decidim-blogs.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.version = Decidim::Blogs.version
   s.authors = ["Isaac Massot Gil"]
   s.email = ["isaac.mg@coditramuntana.com"]
-  s.license = "AGPL-3.0"
+  s.license = "AGPL-3.0-or-later"
   s.homepage = "https://decidim.org"
   s.metadata = {
     "bug_tracker_uri" => "https://github.com/decidim/decidim/issues",
@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
     "homepage_uri" => "https://decidim.org",
     "source_code_uri" => "https://github.com/decidim/decidim"
   }
-  s.required_ruby_version = "~> 3.2.0"
+  s.required_ruby_version = "~> 3.3.0"
 
   s.name = "decidim-blogs"
   s.summary = "Decidim blogs module"

data/lib/decidim/api/blogs_type.rb

@@ -2,20 +2,17 @@
 
 module Decidim
   module Blogs
-    class BlogsType < Decidim::Api::Types::BaseObject
-      implements Decidim::Core::ComponentInterface
-
+    class BlogsType < Decidim::Core::ComponentType
       graphql_name "Blogs"
       description "A blogs component of a participatory space."
 
-      field :posts, type: Decidim::Blogs::PostType.connection_type, description: "List all posts", connection: true, null: false do
-        argument :order, Decidim::Blogs::PostInputSort, "Provides several methods to order the results", required: false
-        argument :filter, Decidim::Blogs::PostInputFilter, "Provides several methods to filter the results", required: false
-      end
-
       field :post, type: Decidim::Blogs::PostType, description: "Finds one post", null: true do
         argument :id, GraphQL::Types::ID, "The ID of the post", required: true
       end
+      field :posts, type: Decidim::Blogs::PostType.connection_type, description: "List all posts", connection: true, null: false do
+        argument :filter, Decidim::Blogs::PostInputFilter, "Provides several methods to filter the results", required: false
+        argument :order, Decidim::Blogs::PostInputSort, "Provides several methods to order the results", required: false
+      end
 
       def posts(filter: {}, order: {})
         base_query = Decidim::Core::ComponentListBase.new(model_class: Post).call(object, { filter:, order: }, context)

data/lib/decidim/api/post_type.rb

@@ -13,10 +13,23 @@ module Decidim
 
       description "A post"
 
-      field :id, GraphQL::Types::ID, "The internal ID of this post", null: false
-      field :title, Decidim::Core::TranslatedFieldType, "The title for this post", null: true
       field :body, Decidim::Core::TranslatedFieldType, "The body of this post", null: true
+      field :id, GraphQL::Types::ID, "The internal ID of this post", null: false
       field :published_at, Decidim::Core::DateTimeType, "The time this page was published", null: false
+      field :title, Decidim::Core::TranslatedFieldType, "The title for this post", null: true
+
+      def self.authorized?(object, context)
+        context[:post] = object
+
+        chain = [
+          allowed_to?(:read, :blogpost, object, context),
+          !object.hidden?
+        ].all?
+
+        super && chain
+      rescue Decidim::PermissionAction::PermissionNotSetError
+        false
+      end
     end
   end
 end

data/lib/decidim/blogs/admin_engine.rb

@@ -11,9 +11,15 @@ module Decidim
       paths["lib/tasks"] = nil
 
       routes do
-        resources :posts do
+        resources :posts, except: [:destroy] do
           resources :attachment_collections, except: [:show]
           resources :attachments, except: [:show]
+          get :manage_trash, on: :collection
+
+          member do
+            patch :soft_delete
+            patch :restore
+          end
         end
         root to: "posts#index"
       end

data/lib/decidim/blogs/component.rb

@@ -23,6 +23,7 @@ Decidim.register_component(:blogs) do |component|
     settings.attribute :announcement, type: :text, translated: true, editor: true
     settings.attribute :comments_enabled, type: :boolean, default: true
     settings.attribute :comments_max_length, type: :integer, required: true
+    settings.attribute :creation_enabled_for_participants, type: :boolean, default: false
   end
 
   component.settings(:step) do |settings|
@@ -39,6 +40,32 @@ Decidim.register_component(:blogs) do |component|
     resource.searchable = true
   end
 
+  component.exports :posts do |exports|
+    exports.collection do |component_instance|
+      Decidim::Blogs::Post
+        .not_hidden
+        .published
+        .where(component: component_instance)
+        .includes(component: { participatory_space: :organization })
+    end
+
+    exports.include_in_open_data = true
+
+    exports.serializer Decidim::Blogs::PostSerializer
+  end
+
+  component.exports :post_comments do |exports|
+    exports.collection do |component_instance|
+      Decidim::Comments::Export.comments_for_resource(
+        Decidim::Blogs::Post, component_instance
+      ).includes(:author, :user_group, root_commentable: { component: { participatory_space: :organization } })
+    end
+
+    exports.include_in_open_data = true
+
+    exports.serializer Decidim::Comments::CommentSerializer
+  end
+
   component.seeds do |participatory_space|
     require "decidim/blogs/seeds"
 

data/lib/decidim/blogs/engine.rb

@@ -14,7 +14,7 @@ module Decidim
       isolate_namespace Decidim::Blogs
 
       routes do
-        resources :posts, only: [:index, :show]
+        resources :posts
         scope "/posts" do
           root to: "posts#index"
         end

data/lib/decidim/blogs/post_serializer.rb

@@ -0,0 +1,70 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Blogs
+    # This class serializes a Post so can be exported to CSV, JSON or other
+    # formats.
+    class PostSerializer < Decidim::Exporters::Serializer
+      include Decidim::ApplicationHelper
+      include Decidim::ResourceHelper
+
+      # Public: Initializes the serializer with a post.
+      def initialize(post)
+        @post = post
+      end
+
+      # Public: Exports a hash with the serialized data for this post.
+      def serialize
+        {
+          id: post.id,
+          author: {
+            **author_fields
+          },
+          title: post.title,
+          body: post.body,
+          created_at: post.created_at,
+          updated_at: post.updated_at,
+          published_at: post.published_at,
+          endorsements_count: post.endorsements_count,
+          comments_count: post.comments_count,
+          follows_count: post.follows_count,
+          participatory_space: {
+            id: post.participatory_space.id,
+            url: Decidim::ResourceLocatorPresenter.new(post.participatory_space).url
+          },
+          component: { id: component.id },
+          url:
+        }
+      end
+
+      private
+
+      attr_reader :post
+      alias resource post
+
+      def url
+        Decidim::ResourceLocatorPresenter.new(post).url
+      end
+
+      def author_fields
+        {
+          id: resource.author.id,
+          name: author_name(resource.author),
+          url: author_url(resource.author)
+        }
+      end
+
+      def author_name(author)
+        translated_attribute(author.name)
+      end
+
+      def author_url(author)
+        if author.respond_to?(:nickname)
+          profile_url(author) # is a Decidim::User or Decidim::UserGroup
+        else
+          root_url # is a Decidim::Organization
+        end
+      end
+    end
+  end
+end

data/lib/decidim/blogs/schema_org_blog_posting_post_serializer.rb

@@ -0,0 +1,81 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Blogs
+    class SchemaOrgBlogPostingPostSerializer < Decidim::Exporters::Serializer
+      include Decidim::TranslationsHelper
+      include Decidim::SanitizeHelper
+      include ActionView::Helpers::UrlHelper
+
+      # Public: Initializes the serializer with a post.
+      def initialize(post)
+        @post = post
+      end
+
+      # Serializes a post for the Schema.org Event type
+      #
+      # @see https://schema.org/BlogPosting
+      # @see https://developers.google.com/search/docs/appearance/structured-data/article?hl=en
+      def serialize
+        attributes = {
+          "@context": "https://schema.org",
+          "@type": "BlogPosting",
+          headline: decidim_escape_translated(post.title),
+          author:
+        }
+
+        attributes = attributes.merge(image:) if post.photos.any?
+        attributes = attributes.merge(datePublished: published) if post.published?
+        attributes
+      end
+
+      private
+
+      attr_reader :post
+      alias resource post
+
+      def author
+        case post.author.class.name
+        when "Decidim::Organization"
+          author_organization
+        when "Decidim::UserGroup"
+          author_user_group
+        when "Decidim::User"
+          author_user
+        end
+      end
+
+      def author_user_group
+        {
+          "@type": "Organization",
+          name: post.author.name,
+          url: profile_url(post.author)
+        }
+      end
+
+      def author_organization
+        {
+          "@type": "Organization",
+          name: decidim_escape_translated(post.author.name),
+          url: EngineRouter.new("decidim", router_options).root_url
+        }
+      end
+
+      def author_user
+        {
+          "@type": "Person",
+          name: decidim_escape_translated(post.author.name),
+          url: profile_url(post.author)
+        }
+      end
+
+      def router_options = { host: post.organization.host }
+
+      def image = post.photos.map(&:thumbnail_url)
+
+      def published
+        post.published_at.iso8601
+      end
+    end
+  end
+end

data/lib/decidim/blogs/test/factories.rb

@@ -30,6 +30,14 @@ FactoryBot.define do
         }
       end
     end
+
+    trait :with_creation_enabled do
+      settings do
+        {
+          creation_enabled_for_participants: true
+        }
+      end
+    end
   end
 
   factory :post, class: "Decidim::Blogs::Post" do
@@ -41,6 +49,7 @@ FactoryBot.define do
     body { generate_localized_description(:blog_body, skip_injection:) }
     component { build(:post_component, skip_injection:) }
     author { build(:user, :confirmed, skip_injection:, organization: component.organization) }
+    deleted_at { nil }
 
     trait :with_endorsements do
       after :create do |post, evaluator|
@@ -48,9 +57,15 @@ FactoryBot.define do
           create(:endorsement,
                  resource: post,
                  skip_injection: evaluator.skip_injection,
-                 author: build(:user, skip_injection: evaluator.skip_injection, organization: post.participatory_space.organization))
+                 author: build(:user, :confirmed, skip_injection: evaluator.skip_injection, organization: post.participatory_space.organization))
         end
       end
     end
+
+    trait :hidden do
+      after :create do |post, evaluator|
+        create(:moderation, hidden_at: Time.current, reportable: post, skip_injection: evaluator.skip_injection)
+      end
+    end
   end
 end

data/lib/decidim/blogs/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-pages version.
   module Blogs
     def self.version
-      "0.29.1"
+      "0.30.0.rc1"
     end
   end
 end

data/lib/decidim/blogs.rb

@@ -10,5 +10,7 @@ module Decidim
   # This namespace holds the logic of the `Blogs` component. This component
   # allows the admins to create a custom blog for a participatory process.
   module Blogs
+    autoload :PostSerializer, "decidim/blogs/post_serializer"
+    autoload :SchemaOrgBlogPostingPostSerializer, "decidim/blogs/schema_org_blog_posting_post_serializer"
   end
 end