decidim-meetings 0.28.4 → 0.28.6

data/config/locales/uk.yml

@@ -49,6 +49,12 @@ uk:
         other: Зареєстрованих
   decidim:
     admin:
+      filters:
+        meetings:
+          category_id_eq:
+            label: Категорія
+          scope_id_eq:
+            label: Обсяг
       meeting_copies:
         create:
           error: При спробі створити копію цієї зустрічі сталася помилка.
@@ -67,6 +73,7 @@ uk:
             comments_enabled: Коментарі увімкнено
             default_registration_terms: Умови реєстрації за умовчанням
             resources_permissions_enabled: Права на дії можна встановити для кожної зустрічі
+            scope_id: Обсяг
           step:
             announcement: Оголошення
             comments_blocked: Коментарі вимкнено
@@ -114,7 +121,6 @@ uk:
         attachment_collections: Теки
         attachments: Вкладені файли
         close: Закрити
-        confirm_destroy: Ви впевнені, що хочете видалити цю зустріч?
         destroy: Видалити
         edit: Редагувати
         preview: Попередній перегляд
@@ -196,8 +202,6 @@ uk:
         registrations:
           edit:
             save: Зберегти
-            validate: Підтвердити
-            validate_registration_code: Підтвердити реєстраційний код
           form:
             available_slots_help: Залиште це число нульовим, якщо у вас не обмежена кількість місць.
             invites: Запрошення
@@ -205,9 +209,6 @@ uk:
           update:
             invalid: При спробі зберегти налаштування реєстрації сталася помилка.
             success: Налаштування реєстрації на зустріч успішно збережено.
-          validate_registration_code:
-            invalid: Цей реєстраційний код неналежний.
-            success: Реєстраційний код успішно підтверджено.
       admin_log:
         invite:
           create: "%{user_name} запросив %{attendee_name} приєднатися до зустрічі %{resource_name} у просторі %{space_name}"
@@ -234,6 +235,8 @@ uk:
           category: Категорія
           date: Дата
           search: Шукати
+        meeting:
+          close_meeting: Закрити зустріч
         meetings:
           upcoming_meetings_warning: Наразі нема запланованих зустрічей, але тут ви можете знайти перелік усіх попередніх зустрічей.
         registration_confirm:
@@ -282,6 +285,9 @@ uk:
       types:
         private_meeting: Приватна зустріч
         transparent: Прозора
+    metrics:
+      meetings:
+        title: Зустрічі
     participatory_spaces:
       highlighted_meetings:
         past_meetings: Минулі зустрічі

data/config/locales/zh-CN.yml

@@ -43,6 +43,12 @@ zh-CN:
         other: 注册
   decidim:
     admin:
+      filters:
+        meetings:
+          category_id_eq:
+            label: 类别
+          scope_id_eq:
+            label: 范围
       meeting_copies:
         create:
           error: 重复这次会议时出现问题。
@@ -132,7 +138,6 @@ zh-CN:
         attachment_collections: 文件夹
         attachments: 附件
         close: 关闭
-        confirm_destroy: 您确定要删除这个会议吗？
         destroy: 删除
         edit: 编辑
         invalid_destroy:
@@ -222,8 +227,6 @@ zh-CN:
         registrations:
           edit:
             save: 保存
-            validate: Validate
-            validate_registration_code: 验证注册码
           form:
             available_slots_help: 如果您有无限空位可用，则将其留给0。
             invites: 邀请
@@ -236,9 +239,6 @@ zh-CN:
           update:
             invalid: 保存注册设置时出现问题。
             success: 会议注册设置保存成功。
-          validate_registration_code:
-            invalid: 此注册码无效。
-            success: 注册码已成功验证。
       admin_log:
         invite:
           create: "%{user_name} 邀請了 %{attendee_name} 在 %{space_name} 空间加入 %{resource_name} 次会议"
@@ -253,6 +253,9 @@ zh-CN:
           value_types:
             organizer_presenter:
               not_found: '在数据库中找不到组织者 (ID: %{id})'
+      application_helper:
+        filter_category_values:
+          all: 所有的
       calendar_modal:
         calendar_url: 日历 URL
         export_calendar: 导出日历
@@ -299,12 +302,13 @@ zh-CN:
           select_a_category: 请选择一个类别
         index:
           new_meeting: 新会议
+        meeting:
+          close_meeting: 关闭会议
         meetings:
           upcoming_meetings_warning: 目前没有排定的会议，但在这里你可以找到过去所有会议的清单。
         new:
           back: 后退
           create: 创建
-          title: 创建您的会议
         registration_confirm:
           cancel: 取消
           confirm: 确认

data/config/locales/zh-TW.yml

@@ -210,7 +210,6 @@ zh-TW:
         attachment_collections: 資料夾
         attachments: 附件
         close: 關閉
-        confirm_destroy: 你確定要刪除此會議？
         destroy: 刪除
         edit: 編輯
         invalid_destroy:
@@ -342,8 +341,6 @@ zh-TW:
         registrations:
           edit:
             save: 儲存
-            validate: 驗證
-            validate_registration_code: 驗證註冊碼
           form:
             available_slots_help: 如果您有無限的可用名額，請將其設置為0。
             invites: 邀請
@@ -358,9 +355,6 @@ zh-TW:
           update:
             invalid: 儲存註冊設定時出現問題。
             success: 會議註冊設定已成功保存。
-          validate_registration_code:
-            invalid: 此註冊碼無效。
-            success: 註冊碼已成功驗證。
       admin_log:
         invite:
           create: "%{user_name} 邀請 %{attendee_name} 參加在 %{space_name} 空間舉行的 %{resource_name} 會議。"
@@ -494,13 +488,15 @@ zh-TW:
           see_all: 查看所有會議
           see_all_withdrawn: 查看所有撤回的會議
           text_banner: 您正在查看已被其作者撤回的會議列表。 %{go_back_link}。
+        meeting:
+          close_meeting: 關閉會議
+          edit_meeting: 編輯會議
         meetings:
           no_meetings_warning: 沒有符合搜尋條件的會議或者目前沒有任何已排定的會議。
           upcoming_meetings_warning: 目前沒有安排的會議，但您可以在這裡找到所有過去的會議列表。
         new:
           back: 返回
           create: 建立
-          title: 新增您的會議
         registration_confirm:
           cancel: 取消
           confirm: 確認

data/decidim-meetings.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.version = Decidim::Meetings.version
   s.authors = ["Josep Jaume Rey Peroy", "Marc Riera Casals", "Oriol Gual Oliva"]
   s.email = ["josepjaume@gmail.com", "mrc2407@gmail.com", "oriolgual@gmail.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",

data/lib/decidim/api/meeting_type.rb

@@ -74,6 +74,18 @@ module Decidim
       field :type_of_meeting, GraphQL::Types::String, "The type of the meeting (online or in-person)", null: false
       field :online_meeting_url, GraphQL::Types::String, "The URL of the meeting (when the type is online)", null: false
       field :iframe_embed_type, GraphQL::Types::String, "The type of displaying of the online meeting URL", null: true
+
+      def self.authorized?(object, context)
+        context[:meeting] = object
+
+        chain = [
+          allowed_to?(:read, :meeting, object, context),
+          object.published?,
+          object.current_user_can_visit_meeting?(context[:current_user])
+        ].all?
+
+        super && chain
+      end
     end
   end
 end

data/lib/decidim/api/meetings_type.rb

@@ -2,9 +2,7 @@
 
 module Decidim
   module Meetings
-    class MeetingsType < Decidim::Api::Types::BaseObject
-      implements Decidim::Core::ComponentInterface
-
+    class MeetingsType < Decidim::Core::ComponentType
       graphql_name "Meetings"
       description "A meetings component of a participatory space."
 

data/lib/decidim/meetings/engine.rb

@@ -46,6 +46,8 @@ module Decidim
       end
 
       initializer "decidim_meetings.register_icons" do
+        Decidim.icons.register(name: "headphone-line", icon: "headphone-line", category: "system", description: "", engine: :meetings)
+        Decidim.icons.register(name: "video-line", icon: "video-line", category: "system", description: "", engine: :meetings)
         Decidim.icons.register(name: "Decidim::Meetings::Meeting", icon: "map-pin-line", description: "Meeting", category: "activity", engine: :meetings)
         Decidim.icons.register(name: "in_person", icon: "community-line", description: "In person", category: "meetings", engine: :meetings)
         Decidim.icons.register(name: "online", icon: "webcam-line", description: "Online", category: "meetings", engine: :meetings)
@@ -75,7 +77,12 @@ module Decidim
 
       initializer "decidim_meetings.content_security_handlers" do |_app|
         Decidim.configure do |config|
-          config.content_security_policies_extra.deep_merge!({ "frame-src" => %w(player.twitch.tv meet.jit.si) })
+          if config.content_security_policies_extra["frame-src"].respond_to?(:<<)
+            config.content_security_policies_extra["frame-src"] << "player.twitch.tv"
+            config.content_security_policies_extra["frame-src"] << "meet.jit.si"
+          else
+            config.content_security_policies_extra["frame-src"] = %w(player.twitch.tv meet.jit.si)
+          end
         end
       end
 

data/lib/decidim/meetings/meeting_serializer.rb

@@ -25,6 +25,9 @@ module Decidim
             id: meeting.scope.try(:id),
             name: meeting.scope.try(:name)
           },
+          author: {
+            **author_fields
+          },
           participatory_space: {
             id: meeting.participatory_space.id,
             url: Decidim::ResourceLocatorPresenter.new(meeting.participatory_space).url
@@ -55,6 +58,40 @@ module Decidim
       attr_reader :meeting
       alias resource meeting
 
+      def author_fields
+        {
+          id: meeting.author.id,
+          name: author_name(meeting.author),
+          url: author_url(meeting.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
+
+      def profile_url(author)
+        return "" if author.respond_to?(:deleted?) && author.deleted?
+
+        Decidim::Core::Engine.routes.url_helpers.profile_url(author.nickname, host:)
+      end
+
+      def root_url
+        Decidim::Core::Engine.routes.url_helpers.root_url(host:)
+      end
+
+      def host
+        resource.organization.host
+      end
+
       def component
         meeting.component
       end

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

@@ -64,6 +64,12 @@ FactoryBot.define do
       type_of_meeting { :in_person }
     end
 
+    trait :hidden do
+      after :create do |meeting, evaluator|
+        create(:moderation, hidden_at: Time.current, reportable: meeting, skip_injection: evaluator.skip_injection)
+      end
+    end
+
     trait :online do
       type_of_meeting { :online }
       online_meeting_url { "https://decidim.org" }

data/lib/decidim/meetings/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-meetings version.
   module Meetings
     def self.version
-      "0.28.4"
+      "0.28.6"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-meetings
 version: !ruby/object:Gem::Version
-  version: 0.28.4
+  version: 0.28.6
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-02 00:00:00.000000000 Z
+date: 2025-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-core
@@ -18,28 +18,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.4
+        version: 0.28.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.4
+        version: 0.28.6
 - !ruby/object:Gem::Dependency
   name: decidim-forms
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.4
+        version: 0.28.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.4
+        version: 0.28.6
 - !ruby/object:Gem::Dependency
   name: icalendar
   requirement: !ruby/object:Gem::Requirement
@@ -60,56 +60,56 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.4
+        version: 0.28.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.4
+        version: 0.28.6
 - !ruby/object:Gem::Dependency
   name: decidim-assemblies
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.4
+        version: 0.28.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.4
+        version: 0.28.6
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.4
+        version: 0.28.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.4
+        version: 0.28.6
 - !ruby/object:Gem::Dependency
   name: decidim-participatory_processes
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.4
+        version: 0.28.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.4
+        version: 0.28.6
 description: A meetings component for decidim's participatory spaces.
 email:
 - josepjaume@gmail.com
@@ -379,6 +379,9 @@ files:
 - config/locales/ar.yml
 - config/locales/bg-BG.yml
 - config/locales/bg.yml
+- config/locales/bn-BD.yml
+- config/locales/bs-BA.yml
+- config/locales/ca-IT.yml
 - config/locales/ca.yml
 - config/locales/cs-CZ.yml
 - config/locales/cs.yml
@@ -545,7 +548,7 @@ files:
 - lib/tasks/decidim_meetings.rake
 homepage: https://decidim.org
 licenses:
-- AGPL-3.0
+- AGPL-3.0-or-later
 metadata:
   bug_tracker_uri: https://github.com/decidim/decidim/issues
   documentation_uri: https://docs.decidim.org/