decidim-meetings 0.28.6 → 0.29.0.rc1

data/config/locales/tr-TR.yml

@@ -51,12 +51,6 @@ tr:
         other: Kayıtlar
   decidim:
     admin:
-      filters:
-        meetings:
-          category_id_eq:
-            label: Kategori
-          scope_id_eq:
-            label: kapsam
       meeting_copies:
         create:
           error: Bu toplantıyı kopyalarken bir sorun oluştu.
@@ -79,7 +73,7 @@ tr:
             enable_pads_creation: Altlık oluşturmayı etkinleştirin
             registration_code_enabled: Kayıt kodu etkinleştirildi
             resources_permissions_enabled: Her toplantı için işlem izinleri ayarlanabilir
-            scope_id: kapsam
+            scope_id: Kapsam
             scopes_enabled: Kapsamlar etkinleştirildi
             terms_and_conditions_url_for_meeting_creators: Toplantı oluşturucuları için şartlar ve koşullar URL'si
           step:
@@ -148,6 +142,7 @@ tr:
         attachment_collections: Klasörler
         attachments: Ekler
         close: Kapat
+        confirm_destroy: Bu toplantıyı silmek istediğinizden emin misiniz?
         destroy: Sil
         edit: Düzenle
         invalid_destroy:
@@ -204,12 +199,8 @@ tr:
             non_user: Mevcut olmayan katılımcı
             select_user: Katılımcı seç
           index:
-            filter:
-              all: Tümü
-              sent: Gönderilen
             invite_attendee: Katılımcı davet et
             invites: Davetler
-            search: Arama
         meeting_closes:
           edit:
             close: Kapat
@@ -246,6 +237,8 @@ tr:
         registrations:
           edit:
             save: Kaydet
+            validate: Doğrula
+            validate_registration_code: Kayıt kodunu doğrula
           form:
             available_slots_help: Mevcut sınırsız yuvaya sahipseniz 0'a bırakın.
             invites: Davetiyeler
@@ -259,6 +252,9 @@ tr:
           update:
             invalid: Kayıt ayarları kaydedilirken bir sorun oluştu.
             success: Toplantı kayıtları ayarları başarıyla kaydedildi.
+          validate_registration_code:
+            invalid: Bu kayıt kodu geçersiz.
+            success: Kayıt kodu başarıyla doğrulandı.
       admin_log:
         invite:
           create: "%{user_name}, %{attendee_name} adlı kişiyi %{space_name} alanındaki %{resource_name} toplantısına katılmaya davet etti"
@@ -273,9 +269,6 @@ tr:
           value_types:
             organizer_presenter:
               not_found: 'Organizatör veritabanında bulunamadı (ID: %{id})'
-      application_helper:
-        filter_category_values:
-          all: Tümü
       calendar:
         meeting_to_event:
           read_more: Bu toplantı hakkında daha fazlasını okuyun
@@ -342,14 +335,12 @@ tr:
           select_a_registration_type: Lütfen bir kayıt türü seçin
         index:
           new_meeting: Yeni toplantı
-        meeting:
-          close_meeting: Toplantıyı kapat
-          edit_meeting: Toplantıyı Düzenle
         meetings:
           upcoming_meetings_warning: Şu anda planlanmış bir toplantı yok, ancak burada listelenen tüm geçmiş toplantıları bulabilirsiniz.
         new:
           back: Geri
           create: Oluştur
+          title: Bir Toplantı Oluştur
         registration_confirm:
           cancel: İptal Et
           confirm: Onayla

data/config/locales/uk.yml

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

data/config/locales/zh-CN.yml

@@ -43,12 +43,6 @@ zh-CN:
         other: 注册
   decidim:
     admin:
-      filters:
-        meetings:
-          category_id_eq:
-            label: 类别
-          scope_id_eq:
-            label: 范围
       meeting_copies:
         create:
           error: 重复这次会议时出现问题。
@@ -138,6 +132,7 @@ zh-CN:
         attachment_collections: 文件夹
         attachments: 附件
         close: 关闭
+        confirm_destroy: 您确定要删除这个会议吗？
         destroy: 删除
         edit: 编辑
         invalid_destroy:
@@ -191,12 +186,8 @@ zh-CN:
             non_user: 非现有参与者
             select_user: 选择参与者
           index:
-            filter:
-              all: 所有的
-              sent: 已发送
             invite_attendee: 邀请参与者
             invites: 邀请
-            search: 搜索
         meeting_closes:
           edit:
             close: 关闭
@@ -227,6 +218,8 @@ zh-CN:
         registrations:
           edit:
             save: 保存
+            validate: Validate
+            validate_registration_code: 验证注册码
           form:
             available_slots_help: 如果您有无限空位可用，则将其留给0。
             invites: 邀请
@@ -239,6 +232,9 @@ zh-CN:
           update:
             invalid: 保存注册设置时出现问题。
             success: 会议注册设置保存成功。
+          validate_registration_code:
+            invalid: 此注册码无效。
+            success: 注册码已成功验证。
       admin_log:
         invite:
           create: "%{user_name} 邀請了 %{attendee_name} 在 %{space_name} 空间加入 %{resource_name} 次会议"
@@ -253,9 +249,6 @@ zh-CN:
           value_types:
             organizer_presenter:
               not_found: '在数据库中找不到组织者 (ID: %{id})'
-      application_helper:
-        filter_category_values:
-          all: 所有的
       calendar_modal:
         calendar_url: 日历 URL
         export_calendar: 导出日历
@@ -302,13 +295,12 @@ 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,6 +210,7 @@ zh-TW:
         attachment_collections: 資料夾
         attachments: 附件
         close: 關閉
+        confirm_destroy: 你確定要刪除此會議？
         destroy: 刪除
         edit: 編輯
         invalid_destroy:
@@ -272,13 +273,9 @@ zh-TW:
             non_user: 不存在的參與者。
             select_user: 選擇參與者
           index:
-            filter:
-              all: 全部
-              sent: 傳送
             invite_attendee: 邀請的與會者
             invites: 邀請
             registrations_disabled: 你無法邀請參加者，因為註冊已被禁用。
-            search: 搜尋
         meeting_closes:
           edit:
             close: 關閉
@@ -341,6 +338,8 @@ zh-TW:
         registrations:
           edit:
             save: 儲存
+            validate: 驗證
+            validate_registration_code: 驗證註冊碼
           form:
             available_slots_help: 如果您有無限的可用名額，請將其設置為0。
             invites: 邀請
@@ -355,6 +354,9 @@ zh-TW:
           update:
             invalid: 儲存註冊設定時出現問題。
             success: 會議註冊設定已成功保存。
+          validate_registration_code:
+            invalid: 此註冊碼無效。
+            success: 註冊碼已成功驗證。
       admin_log:
         invite:
           create: "%{user_name} 邀請 %{attendee_name} 參加在 %{space_name} 空間舉行的 %{resource_name} 會議。"
@@ -390,7 +392,6 @@ zh-TW:
           body: 會議<a href="%{meeting_path}">"%{meeting_title}"</a>等待關閉，請使用“關閉會議”按鈕添加會議報告。
           greetings: 問候,<br/>%{organization_name}<br/><a href="%{organization_url}">%{organization_url}</a>
           hello: 哈囉，%{username}！
-          subject: 您現在可以在 %{organization_name} 平台上透過報告結束您的會議。
       conference_venues: 會議場地
       content_blocks:
         upcoming_meetings:
@@ -407,7 +408,6 @@ zh-TW:
       iframe_embed_type:
         embed_in_meeting_page: 嵌入會議頁面
         none: 沒有
-        open_in_live_event_page: 在直播活動頁面開啟(附加投票選項)
         open_in_new_tab: 在新頁籤中開啟 URL
       last_activity:
         meeting_updated: '會議已更新:'
@@ -415,7 +415,6 @@ zh-TW:
       layouts:
         live_event:
           close: 關閉
-          questions: 問題
       mailer:
         invite_join_meeting_mailer:
           invite:
@@ -488,15 +487,13 @@ 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: 確認
@@ -548,12 +545,9 @@ zh-TW:
             title: 標題
       polls:
         questions:
-          closed_question:
-            question_results: 問題結果
           index:
             empty_questions: 在本次會議期間，您將收到一些問題並且您可以回答這些問題。這些問題將會在此顯示。
           index_admin:
-            admin_dashboard: 管理員儀表板
             edit: 在管理面板中編輯
             question: 問題
             received_answer: 收到回答

data/db/migrate/20240130135858_add_withdrawn_fields_on_meetings.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+class AddWithdrawnFieldsOnMeetings < ActiveRecord::Migration[6.1]
+  class CustomMeeting < Decidim::Meetings::ApplicationRecord
+    self.table_name = "decidim_meetings_meetings"
+  end
+
+  def up
+    add_column :decidim_meetings_meetings, :withdrawn_at, :datetime
+
+    CustomMeeting.where(state: "withdrawn").find_each do |meeting|
+      meeting.withdrawn_at = meeting.updated_at
+      meeting.save!
+    end
+  end
+
+  def down
+    # rubocop:disable Rails/SkipsModelValidations
+    CustomMeeting.where.not(withdrawn_at: null).update_all(state: :withdrawn)
+    # rubocop:enable Rails/SkipsModelValidations
+    remove_column :decidim_meetings_meetings, :withdrawn_at
+  end
+end

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-or-later"
+  s.license = "AGPL-3.0"
   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.1.0"
+  s.required_ruby_version = "~> 3.2.0"
 
   s.name = "decidim-meetings"
   s.summary = "Decidim meetings module"

data/lib/decidim/api/meeting_type.rb

@@ -45,6 +45,9 @@ module Decidim
         object.audio_url if object.closing_visible?
       end
 
+      field :withdrawn_at, Decidim::Core::DateTimeType, description: "The date and time this meeting was withdrawn", null: true
+      field :withdrawn, GraphQL::Types::Boolean, "Whether this meeting has been withdrawn or not", method: :withdrawn?, null: true
+
       field :created_at, Decidim::Core::DateTimeType, description: "The date and time this minutes was created", null: true
       field :updated_at, Decidim::Core::DateTimeType, description: "The date and time this minutes was updated", null: true
 
@@ -74,18 +77,6 @@ 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,7 +2,9 @@
 
 module Decidim
   module Meetings
-    class MeetingsType < Decidim::Core::ComponentType
+    class MeetingsType < Decidim::Api::Types::BaseObject
+      implements Decidim::Core::ComponentInterface
+
       graphql_name "Meetings"
       description "A meetings component of a participatory space."
 

data/lib/decidim/meetings/component.rb

@@ -19,12 +19,12 @@ Decidim.register_component(:meetings) do |component|
     resource.template = "decidim/meetings/meetings/linked_meetings"
     resource.card = "decidim/meetings/meeting"
     resource.reported_content_cell = "decidim/meetings/reported_content"
-    resource.actions = %w(join comment)
+    resource.actions = %w(join comment reply_poll)
     resource.searchable = true
   end
 
   component.register_stat :meetings_count, primary: true, priority: Decidim::StatsRegistry::MEDIUM_PRIORITY do |components, start_at, end_at|
-    meetings = Decidim::Meetings::FilteredMeetings.for(components, start_at, end_at).except_withdrawn
+    meetings = Decidim::Meetings::FilteredMeetings.for(components, start_at, end_at).not_withdrawn
     meetings.count
   end
 

data/lib/decidim/meetings/engine.rb

@@ -32,7 +32,11 @@ module Decidim
           resource :live_event, only: :show
           namespace :polls do
             resources :questions, only: [:index, :update]
-            resources :answers, only: [:index, :create]
+            resources :answers, only: [:index, :create] do
+              collection do
+                get :admin
+              end
+            end
           end
         end
         scope "/meetings" do
@@ -46,8 +50,6 @@ 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)
@@ -77,12 +79,7 @@ module Decidim
 
       initializer "decidim_meetings.content_security_handlers" do |_app|
         Decidim.configure do |config|
-          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
+          config.content_security_policies_extra.deep_merge!({ "frame-src" => %w(player.twitch.tv meet.jit.si) })
         end
       end
 

data/lib/decidim/meetings/meeting_serializer.rb

@@ -25,9 +25,6 @@ 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
@@ -49,7 +46,9 @@ module Decidim
           url:,
           related_proposals:,
           related_results:,
-          published: meeting.published_at.present?
+          published: meeting.published_at.present?,
+          withdrawn: meeting.withdrawn?,
+          withdrawn_at: meeting.withdrawn_at
         }
       end
 
@@ -58,40 +57,6 @@ 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/seeds.rb

@@ -59,6 +59,7 @@ module Decidim
       def meeting_params(component:, type:, author_type:)
         start_time = ::Faker::Date.between(from: 20.weeks.ago, to: 20.weeks.from_now)
         end_time = start_time + [rand(1..4).hours, rand(1..20).days].sample
+        registration_type = Decidim::Meetings::Meeting::REGISTRATION_TYPES.keys.sample
 
         params = {
           component:,
@@ -78,6 +79,7 @@ module Decidim
           registrations_enabled: [true, false].sample,
           available_slots: (10..50).step(10).to_a.sample,
           author: participatory_space.organization,
+          registration_type:,
           registration_terms: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
             Decidim::Faker::Localized.paragraph(sentence_count: 3)
           end,
@@ -118,6 +120,15 @@ module Decidim
                    params # :in_person
                  end
 
+        params = case registration_type
+                 when :on_different_platform
+                   params.merge(registration_url: Faker::Internet.url)
+                 when :on_this_platform
+                   params.merge(registrations_enabled: true)
+                 else
+                   params # registration_disabled
+                 end
+
         case author_type
         when :user
           params.merge(
@@ -132,7 +143,7 @@ module Decidim
             user_group:
           )
         else
-          params # oficial
+          params # official
         end
       end
 
@@ -160,10 +171,6 @@ module Decidim
           followers: resource.participatory_space.followers
         )
 
-        Decidim.traceability.perform_action!(:publish, resource, admin_user, visibility: "all") do
-          resource.publish!
-        end
-
         Decidim::Comments::Seed.comments_for(resource)
 
         resource
@@ -193,19 +200,7 @@ module Decidim
       def create_meeting_registration!(meeting:)
         r = SecureRandom.hex(4)
         email = "meeting-registered-user-#{meeting.id}-#{r}@example.org"
-        name = "#{::Faker::Name.name} #{meeting.id} #{r}"
-        user = Decidim::User.find_or_initialize_by(email:)
-
-        user.update!(
-          password: "decidim123456789",
-          name:,
-          nickname: ::Faker::Twitter.unique.screen_name,
-          organization:,
-          tos_agreement: "1",
-          confirmed_at: Time.current,
-          personal_url: ::Faker::Internet.url,
-          about: ::Faker::Lorem.paragraph(sentence_count: 2)
-        )
+        user = find_or_initialize_user_by(email:)
 
         Decidim::Meetings::Registration.create!(
           meeting:,

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

@@ -57,19 +57,13 @@ FactoryBot.define do
     end
 
     trait :withdrawn do
-      state { "withdrawn" }
+      withdrawn_at { Time.current }
     end
 
     trait :in_person 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/test/notifications_handling.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-shared_examples_for "emits an upcoming notificaton" do
+shared_examples_for "emits an upcoming notification" do
   context "when it is a future meeting" do
     let(:future_start_date) { 3.days.from_now }
 

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.6"
+      "0.29.0.rc1"
     end
   end
 end

data/lib/tasks/decidim_meetings.rake

@@ -3,7 +3,7 @@
 namespace :decidim_meetings do
   # For privacy reasons we recommend that you delete this registration form when you no longer need it.
   # By default this is 3 months after the meeting has passed
-  desc "Remove registration forms belonging to meetings that have ended more than X months ago"
+  desc "Removes registration forms belonging to meetings that have ended more than X months ago"
   task :clean_registration_forms, [:months] => :environment do |_t, args|
     args.with_defaults(months: 3)