<% end %>
diff --git a/app/views/public/cards/show/_content.html.erb b/app/views/public/cards/show/_content.html.erb
index cbdf7603f..eb3ccd044 100644
--- a/app/views/public/cards/show/_content.html.erb
+++ b/app/views/public/cards/show/_content.html.erb
@@ -1,8 +1,8 @@
- <%= tag.span card.title, class: "card__title-link" %>
+ <%= tag.span card_html_title(card), class: "card__title-link" %>
-
+
<%= card.description %>
diff --git a/config/importmap.rb b/config/importmap.rb
index 27dbd7015..5da84683c 100644
--- a/config/importmap.rb
+++ b/config/importmap.rb
@@ -13,7 +13,6 @@ pin_all_from "app/javascript/initializers", under: "initializers"
pin_all_from "app/javascript/bridge/initializers", under: "bridge/initializers"
pin_all_from "app/javascript/bridge/helpers", under: "bridge/helpers"
pin_all_from "app/javascript/bridge/controllers/bridge", under: "controllers/bridge", to: "bridge/controllers/bridge"
-pin "marked" # @15.0.11
pin "lexxy"
pin "@rails/activestorage", to: "activestorage.esm.js"
pin "@rails/actiontext", to: "actiontext.esm.js"
diff --git a/db/migrate/20260206104338_add_card_id_to_notifications.rb b/db/migrate/20260206104338_add_card_id_to_notifications.rb
new file mode 100644
index 000000000..8d89f61a3
--- /dev/null
+++ b/db/migrate/20260206104338_add_card_id_to_notifications.rb
@@ -0,0 +1,6 @@
+class AddCardIdToNotifications < ActiveRecord::Migration[8.2]
+ def change
+ add_column :notifications, :card_id, :uuid
+ add_column :notifications, :unread_count, :integer, null: false, default: 0
+ end
+end
diff --git a/db/migrate/20260209165805_notifications_data_migration.rb b/db/migrate/20260209165805_notifications_data_migration.rb
new file mode 100644
index 000000000..d1522f780
--- /dev/null
+++ b/db/migrate/20260209165805_notifications_data_migration.rb
@@ -0,0 +1,84 @@
+class NotificationsDataMigration < ActiveRecord::Migration[8.2]
+ BATCH_SIZE = 10_000
+
+ class Notification < ActiveRecord::Base
+ self.table_name = "notifications"
+ end
+
+ def change
+ reversible do |dir|
+ dir.up do
+ populate_card_id
+ collapse_duplicates
+ end
+ end
+
+ change_column_null :notifications, :card_id, false
+ add_index :notifications, [ :user_id, :card_id ], unique: true
+ end
+
+ private
+ def populate_card_id
+ execute(<<~SQL)
+ UPDATE notifications
+ SET card_id = (
+ SELECT CASE events.eventable_type
+ WHEN 'Card' THEN events.eventable_id
+ WHEN 'Comment' THEN (SELECT comments.card_id FROM comments WHERE comments.id = events.eventable_id)
+ END
+ FROM events
+ WHERE events.id = notifications.source_id
+ )
+ WHERE notifications.card_id IS NULL
+ AND notifications.source_type = 'Event'
+ SQL
+
+ execute(<<~SQL)
+ UPDATE notifications
+ SET card_id = (
+ SELECT CASE mentions.source_type
+ WHEN 'Card' THEN mentions.source_id
+ WHEN 'Comment' THEN (SELECT comments.card_id FROM comments WHERE comments.id = mentions.source_id)
+ END
+ FROM mentions
+ WHERE mentions.id = notifications.source_id
+ )
+ WHERE notifications.card_id IS NULL
+ AND notifications.source_type = 'Mention'
+ SQL
+ end
+
+ def collapse_duplicates
+ loop do
+ duplicates = Notification.find_by_sql(<<~SQL)
+ SELECT user_id, card_id,
+ MAX(id) AS keep_id,
+ COUNT(*) AS total,
+ SUM(CASE WHEN read_at IS NULL THEN 1 ELSE 0 END) AS unread_total
+ FROM notifications
+ WHERE card_id IS NOT NULL
+ GROUP BY user_id, card_id
+ HAVING COUNT(*) > 1
+ LIMIT #{BATCH_SIZE}
+ SQL
+
+ break if duplicates.empty?
+
+ duplicates.each do |row|
+ Notification.where(user_id: row.user_id, card_id: row.card_id)
+ .where.not(id: row.keep_id)
+ .delete_all
+
+ Notification.where(id: row.keep_id)
+ .update_all(unread_count: row.unread_total.to_i)
+ end
+ end
+
+ # Set unread_count for remaining non-collapsed notifications
+ execute(<<~SQL)
+ UPDATE notifications
+ SET unread_count = CASE WHEN read_at IS NULL THEN 1 ELSE 0 END
+ WHERE unread_count = 0 AND card_id IS NOT NULL
+ SQL
+ end
+end
diff --git a/db/migrate/20260212102026_fix_notifications_ordered_index.rb b/db/migrate/20260212102026_fix_notifications_ordered_index.rb
new file mode 100644
index 000000000..f7e3cfcac
--- /dev/null
+++ b/db/migrate/20260212102026_fix_notifications_ordered_index.rb
@@ -0,0 +1,8 @@
+class FixNotificationsOrderedIndex < ActiveRecord::Migration[8.2]
+ def change
+ add_index :notifications, [ :user_id, :read_at, :updated_at ],
+ order: { read_at: :desc, updated_at: :desc },
+ name: "index_notifications_on_user_id_and_read_at_and_updated_at"
+ remove_index :notifications, name: "index_notifications_on_user_id_and_read_at_and_created_at"
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 8bc5f5c7d..a46444460 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
#
# It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema[8.2].define(version: 2026_02_11_122517) do
+ActiveRecord::Schema[8.2].define(version: 2026_02_12_102026) do
create_table "accesses", id: :uuid, charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
t.datetime "accessed_at"
t.uuid "account_id", null: false
@@ -385,17 +385,20 @@ ActiveRecord::Schema[8.2].define(version: 2026_02_11_122517) do
create_table "notifications", id: :uuid, charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
t.uuid "account_id", null: false
+ t.uuid "card_id", null: false
t.datetime "created_at", null: false
t.uuid "creator_id"
t.datetime "read_at"
t.uuid "source_id", null: false
t.string "source_type", null: false
+ t.integer "unread_count", default: 0, null: false
t.datetime "updated_at", null: false
t.uuid "user_id", null: false
t.index ["account_id"], name: "index_notifications_on_account_id"
t.index ["creator_id"], name: "index_notifications_on_creator_id"
t.index ["source_type", "source_id"], name: "index_notifications_on_source"
- t.index ["user_id", "read_at", "created_at"], name: "index_notifications_on_user_id_and_read_at_and_created_at", order: { read_at: :desc, created_at: :desc }
+ t.index ["user_id", "card_id"], name: "index_notifications_on_user_id_and_card_id", unique: true
+ t.index ["user_id", "read_at", "updated_at"], name: "index_notifications_on_user_id_and_read_at_and_updated_at", order: { read_at: :desc, updated_at: :desc }
t.index ["user_id"], name: "index_notifications_on_user_id"
end
diff --git a/db/schema_sqlite.rb b/db/schema_sqlite.rb
index 248bf97d4..4254c30f1 100644
--- a/db/schema_sqlite.rb
+++ b/db/schema_sqlite.rb
@@ -10,7 +10,7 @@
#
# It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema[8.2].define(version: 2026_02_11_122517) do
+ActiveRecord::Schema[8.2].define(version: 2026_02_12_102026) do
create_table "accesses", id: :uuid, force: :cascade do |t|
t.datetime "accessed_at"
t.uuid "account_id", null: false
@@ -385,17 +385,20 @@ ActiveRecord::Schema[8.2].define(version: 2026_02_11_122517) do
create_table "notifications", id: :uuid, force: :cascade do |t|
t.uuid "account_id", null: false
+ t.uuid "card_id", null: false
t.datetime "created_at", null: false
t.uuid "creator_id"
t.datetime "read_at"
t.uuid "source_id", null: false
t.string "source_type", limit: 255, null: false
+ t.integer "unread_count", default: 0, null: false
t.datetime "updated_at", null: false
t.uuid "user_id", null: false
t.index ["account_id"], name: "index_notifications_on_account_id"
t.index ["creator_id"], name: "index_notifications_on_creator_id"
t.index ["source_type", "source_id"], name: "index_notifications_on_source"
- t.index ["user_id", "read_at", "created_at"], name: "index_notifications_on_user_id_and_read_at_and_created_at", order: { read_at: :desc, created_at: :desc }
+ t.index ["user_id", "card_id"], name: "index_notifications_on_user_id_and_card_id", unique: true
+ t.index ["user_id", "read_at", "updated_at"], name: "index_notifications_on_user_id_and_read_at_and_updated_at", order: { read_at: :desc, updated_at: :desc }
t.index ["user_id"], name: "index_notifications_on_user_id"
end
diff --git a/saas/lib/fizzy/saas/engine.rb b/saas/lib/fizzy/saas/engine.rb
index 47b0480e1..3d20f9df8 100644
--- a/saas/lib/fizzy/saas/engine.rb
+++ b/saas/lib/fizzy/saas/engine.rb
@@ -1,6 +1,7 @@
require_relative "transaction_pinning"
require_relative "signup"
require_relative "authorization"
+require_relative "gvl_instrumentation"
require_relative "../../rails_ext/active_record_tasks_database_tasks.rb"
module Fizzy
@@ -51,6 +52,10 @@ module Fizzy
app.config.middleware.insert_after(ActiveRecord::Middleware::DatabaseSelector, TransactionPinning::Middleware)
end
+ initializer "fizzy_saas.gvl_instrumentation" do |app|
+ app.config.middleware.insert_before(Rack::Runtime, GvlInstrumentation)
+ end
+
initializer "fizzy_saas.solid_queue" do
SolidQueue.on_start do
Process.warmup
@@ -117,6 +122,9 @@ module Fizzy
config.channel_class_name = "ActionCable::Channel::Base"
end
+ require "yabeda/gvl"
+ Yabeda::GVL.install!
+
require_relative "metrics"
end
diff --git a/saas/lib/fizzy/saas/gvl_instrumentation.rb b/saas/lib/fizzy/saas/gvl_instrumentation.rb
new file mode 100644
index 000000000..2b628d4b9
--- /dev/null
+++ b/saas/lib/fizzy/saas/gvl_instrumentation.rb
@@ -0,0 +1,20 @@
+module Fizzy
+ module Saas
+ class GvlInstrumentation
+ def initialize(app)
+ @app = app
+ end
+
+ def call(env)
+ GVLTools::LocalTimer.enable
+ before = GVLTools::LocalTimer.monotonic_time
+ result = @app.call(env)
+ gvl_wait_ns = GVLTools::LocalTimer.monotonic_time - before
+ Yabeda.gvl.request_wait.measure({}, gvl_wait_ns / 1_000_000_000.0)
+ result
+ ensure
+ GVLTools::LocalTimer.disable
+ end
+ end
+ end
+end
diff --git a/saas/lib/yabeda/gvl.rb b/saas/lib/yabeda/gvl.rb
new file mode 100644
index 000000000..2c77d098b
--- /dev/null
+++ b/saas/lib/yabeda/gvl.rb
@@ -0,0 +1,30 @@
+module Yabeda
+ module GVL
+ WAIT_HISTOGRAM_BUCKETS = [ 0.001, 0.005, 0.01, 0.025, 0.05, 0.1, 0.25, 0.5, 1, 2.5, 5, 10 ]
+
+ def self.install!
+ GVLTools::GlobalTimer.enable
+ GVLTools::WaitingThreads.enable
+
+ Yabeda.configure do
+ group :gvl do
+ gauge :waiting_threads,
+ comment: "Number of threads currently waiting to acquire the GVL"
+
+ gauge :global_timer_total_seconds,
+ comment: "Total time all threads spent waiting on the GVL (seconds)"
+
+ histogram :request_wait,
+ unit: :seconds,
+ comment: "GVL wait time experienced during a single request (seconds)",
+ buckets: WAIT_HISTOGRAM_BUCKETS
+ end
+
+ collect do
+ gvl.waiting_threads.set({}, GVLTools::WaitingThreads.count)
+ gvl.global_timer_total_seconds.set({}, GVLTools::GlobalTimer.monotonic_time / 1_000_000_000.0)
+ end
+ end
+ end
+ end
+end
diff --git a/test/controllers/cards/readings_controller_test.rb b/test/controllers/cards/readings_controller_test.rb
index b7f7474c7..0c9c9aeed 100644
--- a/test/controllers/cards/readings_controller_test.rb
+++ b/test/controllers/cards/readings_controller_test.rb
@@ -8,7 +8,7 @@ class Cards::ReadingsControllerTest < ActionDispatch::IntegrationTest
test "create" do
freeze_time
- assert_changes -> { notifications(:logo_published_kevin).reload.read? }, from: false, to: true do
+ assert_changes -> { notifications(:logo_assignment_kevin).reload.read? }, from: false, to: true do
assert_changes -> { accesses(:writebook_kevin).reload.accessed_at }, from: nil, to: Time.current do
post card_reading_url(cards(:logo)), as: :turbo_stream
end
@@ -17,31 +17,20 @@ class Cards::ReadingsControllerTest < ActionDispatch::IntegrationTest
assert_response :success
end
- test "read one notification on card visit" do
- assert_changes -> { notifications(:logo_published_kevin).reload.read? }, from: false, to: true do
+ test "read notification on card visit" do
+ assert_changes -> { notifications(:logo_assignment_kevin).reload.read? }, from: false, to: true do
post card_reading_path(cards(:logo)), as: :turbo_stream
end
assert_response :success
end
- test "read multiple notifications on card visit" do
- assert_changes -> { notifications(:logo_published_kevin).reload.read? }, from: false, to: true do
- assert_changes -> { notifications(:logo_assignment_kevin).reload.read? }, from: false, to: true do
- post card_reading_path(cards(:logo)), as: :turbo_stream
- end
- end
-
- assert_response :success
- end
-
test "destroy" do
freeze_time
- notifications(:logo_published_kevin).read
notifications(:logo_assignment_kevin).read
- assert_changes -> { notifications(:logo_published_kevin).reload.read? }, from: true, to: false do
+ assert_changes -> { notifications(:logo_assignment_kevin).reload.read? }, from: true, to: false do
assert_changes -> { accesses(:writebook_kevin).reload.accessed_at }, to: Time.current do
delete card_reading_url(cards(:logo)), as: :turbo_stream
end
@@ -50,26 +39,13 @@ class Cards::ReadingsControllerTest < ActionDispatch::IntegrationTest
assert_response :success
end
- test "unread one notification on destroy" do
- notifications(:logo_published_kevin).read
+ test "unread notification on destroy" do
+ notifications(:logo_assignment_kevin).read
- assert_changes -> { notifications(:logo_published_kevin).reload.read? }, from: true, to: false do
+ assert_changes -> { notifications(:logo_assignment_kevin).reload.read? }, from: true, to: false do
delete card_reading_path(cards(:logo)), as: :turbo_stream
end
assert_response :success
end
-
- test "unread multiple notifications on destroy" do
- notifications(:logo_published_kevin).read
- notifications(:logo_assignment_kevin).read
-
- assert_changes -> { notifications(:logo_published_kevin).reload.read? }, from: true, to: false do
- assert_changes -> { notifications(:logo_assignment_kevin).reload.read? }, from: true, to: false do
- delete card_reading_path(cards(:logo)), as: :turbo_stream
- end
- end
-
- assert_response :success
- end
end
diff --git a/test/controllers/cards_controller_test.rb b/test/controllers/cards_controller_test.rb
index 8007657d4..3a97f3166 100644
--- a/test/controllers/cards_controller_test.rb
+++ b/test/controllers/cards_controller_test.rb
@@ -42,9 +42,14 @@ class CardsControllerTest < ActionDispatch::IntegrationTest
assert_redirected_to card_draft_path(card)
end
- test "show" do
- get card_path(cards(:logo))
- assert_response :success
+ test "show renders inline code in title" do
+ card = cards(:logo)
+ card.update_column :title, "Fix the `bug` in production"
+
+ get card_path(card)
+ assert_select ".card__title-link" do |element|
+ assert_equal "Fix the
bug in production", element.inner_html
+ end
end
test "edit" do
diff --git a/test/controllers/notifications/bulk_readings_controller_test.rb b/test/controllers/notifications/bulk_readings_controller_test.rb
index 3512b7b43..f889dfaac 100644
--- a/test/controllers/notifications/bulk_readings_controller_test.rb
+++ b/test/controllers/notifications/bulk_readings_controller_test.rb
@@ -6,7 +6,7 @@ class Notifications::BulkReadingsControllerTest < ActionDispatch::IntegrationTes
end
test "create marks all notifications as read" do
- assert_changes -> { notifications(:logo_published_kevin).reload.read? }, from: false, to: true do
+ assert_changes -> { notifications(:logo_assignment_kevin).reload.read? }, from: false, to: true do
assert_changes -> { notifications(:layout_commented_kevin).reload.read? }, from: false, to: true do
post bulk_reading_path
end
@@ -24,7 +24,7 @@ class Notifications::BulkReadingsControllerTest < ActionDispatch::IntegrationTes
end
test "create as JSON" do
- assert_changes -> { notifications(:logo_published_kevin).reload.read? }, from: false, to: true do
+ assert_changes -> { notifications(:logo_assignment_kevin).reload.read? }, from: false, to: true do
assert_changes -> { notifications(:layout_commented_kevin).reload.read? }, from: false, to: true do
post bulk_reading_path, as: :json
end
diff --git a/test/controllers/notifications/readings_controller_test.rb b/test/controllers/notifications/readings_controller_test.rb
index 3f2a690a9..fca29a35b 100644
--- a/test/controllers/notifications/readings_controller_test.rb
+++ b/test/controllers/notifications/readings_controller_test.rb
@@ -3,38 +3,37 @@ require "test_helper"
class Notifications::ReadingsControllerTest < ActionDispatch::IntegrationTest
setup do
sign_in_as :kevin
+ @notification = notifications(:logo_assignment_kevin)
end
test "create" do
- assert_changes -> { notifications(:logo_published_kevin).reload.read? }, from: false, to: true do
- post notification_reading_path(notifications(:logo_published_kevin), format: :turbo_stream)
+ assert_changes -> { @notification.reload.read? }, from: false, to: true do
+ post notification_reading_path(@notification, format: :turbo_stream)
assert_response :success
end
end
test "destroy" do
- notification = notifications(:logo_published_kevin)
- notification.read # Mark as read first
+ @notification.read
- assert_changes -> { notification.reload.read? }, from: true, to: false do
- delete notification_reading_path(notification, format: :turbo_stream)
+ assert_changes -> { @notification.reload.read? }, from: true, to: false do
+ delete notification_reading_path(@notification, format: :turbo_stream)
assert_response :success
end
end
test "create as JSON" do
- assert_changes -> { notifications(:logo_published_kevin).reload.read? }, from: false, to: true do
- post notification_reading_path(notifications(:logo_published_kevin)), as: :json
+ assert_changes -> { @notification.reload.read? }, from: false, to: true do
+ post notification_reading_path(@notification), as: :json
assert_response :no_content
end
end
test "destroy as JSON" do
- notification = notifications(:logo_published_kevin)
- notification.read
+ @notification.read
- assert_changes -> { notification.reload.read? }, from: true, to: false do
- delete notification_reading_path(notification), as: :json
+ assert_changes -> { @notification.reload.read? }, from: true, to: false do
+ delete notification_reading_path(@notification), as: :json
assert_response :no_content
end
end
diff --git a/test/controllers/notifications_controller_test.rb b/test/controllers/notifications_controller_test.rb
index e4e7bec38..0d0565f24 100644
--- a/test/controllers/notifications_controller_test.rb
+++ b/test/controllers/notifications_controller_test.rb
@@ -10,18 +10,17 @@ class NotificationsControllerTest < ActionDispatch::IntegrationTest
assert_response :success
assert_kind_of Array, @response.parsed_body
- assert @response.parsed_body.any? { |n| n["id"] == notifications(:logo_published_kevin).id }
+ assert @response.parsed_body.any? { |n| n["id"] == notifications(:logo_assignment_kevin).id }
end
test "index as JSON includes notification attributes" do
get notifications_path, as: :json
- notification = @response.parsed_body.find { |n| n["id"] == notifications(:logo_published_kevin).id }
+ notification = @response.parsed_body.find { |n| n["id"] == notifications(:logo_assignment_kevin).id }
- assert_not_nil notification["title"]
- assert_not_nil notification["body"]
assert_not_nil notification["created_at"]
assert_not_nil notification["card"]
assert_not_nil notification["creator"]
+ assert_not_nil notification["unread_count"]
end
end
diff --git a/test/fixtures/notifications.yml b/test/fixtures/notifications.yml
index 9fe7da317..b7ae167cd 100644
--- a/test/fixtures/notifications.yml
+++ b/test/fixtures/notifications.yml
@@ -1,15 +1,9 @@
-logo_published_kevin:
- id: <%= ActiveRecord::FixtureSet.identify("logo_published_kevin", :uuid) %>
- user: kevin_uuid
- source: logo_published_uuid (Event)
- created_at: <%= 1.week.ago %>
- creator: david_uuid
- account: 37s_uuid
-
logo_assignment_kevin:
id: <%= ActiveRecord::FixtureSet.identify("logo_assignment_kevin", :uuid) %>
user: kevin_uuid
source: logo_assignment_km_uuid (Event)
+ card: logo_uuid
+ unread_count: 2
created_at: <%= 1.week.ago %>
creator: david_uuid
account: 37s_uuid
@@ -18,22 +12,18 @@ layout_commented_kevin:
id: <%= ActiveRecord::FixtureSet.identify("layout_commented_kevin", :uuid) %>
user: kevin_uuid
source: layout_commented_uuid (Event)
+ card: layout_uuid
+ unread_count: 1
created_at: <%= 1.week.ago %>
creator: david_uuid
account: 37s_uuid
-logo_card_david_mention_by_jz:
- id: <%= ActiveRecord::FixtureSet.identify("logo_card_david_mention_by_jz_notif", :uuid) %>
- user: david_uuid
- source: logo_card_david_mention_by_jz_uuid (Mention)
- created_at: <%= 1.week.ago %>
- creator: david_uuid
- account: 37s_uuid
-
-logo_comment_david_mention_by_jz:
- id: <%= ActiveRecord::FixtureSet.identify("logo_comment_david_mention_by_jz_notif", :uuid) %>
+logo_mentioned_david:
+ id: <%= ActiveRecord::FixtureSet.identify("logo_mentioned_david", :uuid) %>
user: david_uuid
source: logo_comment_david_mention_by_jz_uuid (Mention)
+ card: logo_uuid
+ unread_count: 2
created_at: <%= 1.week.ago %>
creator: david_uuid
account: 37s_uuid
diff --git a/test/helpers/html_helper_test.rb b/test/helpers/html_helper_test.rb
index 1af507ddf..0fd6c268a 100644
--- a/test/helpers/html_helper_test.rb
+++ b/test/helpers/html_helper_test.rb
@@ -119,4 +119,29 @@ class HtmlHelperTest < ActionView::TestCase
assert_no_match(/
bug in production", card_html_title(cards(:logo).tap { _1.title = "Fix the `bug` in production" })
+ end
+
+ test "card_html_title renders multiple code spans" do
+ assert_equal "
foo and
bar", card_html_title(cards(:logo).tap { _1.title = "`foo` and `bar`" })
+ end
+
+ test "card_html_title renders code spans without surrounding spaces" do
+ assert_equal "what
aboutthis", card_html_title(cards(:logo).tap { _1.title = "what`about`this" })
+ end
+
+ test "card_html_title escapes HTML tags" do
+ assert_equal "<script>alert(1)</script>", card_html_title(cards(:logo).tap { _1.title = "" })
+ end
+
+ test "card_html_title escapes HTML inside backticks" do
+ assert_equal "
<script>", card_html_title(cards(:logo).tap { _1.title = "`")
diff --git a/test/models/notification/bundle_test.rb b/test/models/notification/bundle_test.rb
index 2a8b242af..66dd8dd77 100644
--- a/test/models/notification/bundle_test.rb
+++ b/test/models/notification/bundle_test.rb
@@ -5,6 +5,7 @@ class Notification::BundleTest < ActiveSupport::TestCase
setup do
@user = users(:david)
+ @user.notifications.destroy_all
@user.settings.bundle_email_every_few_hours!
end
@@ -25,7 +26,7 @@ class Notification::BundleTest < ActiveSupport::TestCase
end
end
- test "notifications are bundled withing the aggregation period" do
+ test "notifications are bundled within the aggregation period" do
@user.notification_bundles.destroy_all
notification_1 = assert_difference -> { @user.notification_bundles.pending.count }, 1 do
@@ -34,12 +35,12 @@ class Notification::BundleTest < ActiveSupport::TestCase
travel_to 3.hours.from_now
notification_2 = assert_no_difference -> { @user.notification_bundles.count } do
- @user.notifications.create!(source: events(:logo_published), creator: @user)
+ @user.notifications.create!(source: events(:layout_published), creator: @user)
end
travel_to 3.days.from_now
notification_3 = assert_difference -> { @user.notification_bundles.pending.count }, 1 do
- @user.notifications.create!(source: events(:logo_published), creator: @user)
+ @user.notifications.create!(source: events(:text_published), creator: @user)
end
assert_equal 2, @user.notification_bundles.count
@@ -150,10 +151,10 @@ class Notification::BundleTest < ActiveSupport::TestCase
test "out-of-order notification bundling should still work" do
first_notification = @user.notifications.create!(source: events(:logo_published), creator: @user)
- second_notification = @user.notifications.create!(source: events(:logo_published), creator: @user)
+ second_notification = @user.notifications.create!(source: events(:layout_commented), creator: @user)
@user.notification_bundles.destroy_all
- assert first_notification.created_at < second_notification.created_at
+ assert first_notification.updated_at <= second_notification.updated_at
@user.bundle(second_notification)
@user.bundle(first_notification)
diff --git a/test/models/notification_pusher_test.rb b/test/models/notification_pusher_test.rb
index 21b9e202b..53380effe 100644
--- a/test/models/notification_pusher_test.rb
+++ b/test/models/notification_pusher_test.rb
@@ -3,10 +3,7 @@ require "test_helper"
class NotificationPusherTest < ActiveSupport::TestCase
setup do
@user = users(:david)
- @notification = @user.notifications.create!(
- source: events(:logo_published),
- creator: users(:jason)
- )
+ @notification = notifications(:logo_mentioned_david)
@pusher = NotificationPusher.new(@notification)
@user.push_subscriptions.create!(
diff --git a/test/models/notification_test.rb b/test/models/notification_test.rb
index 9c8ebbe12..8d9809ba1 100644
--- a/test/models/notification_test.rb
+++ b/test/models/notification_test.rb
@@ -1,49 +1,67 @@
require "test_helper"
class NotificationTest < ActiveSupport::TestCase
- test "unread marks notification as unread" do
- notification = notifications(:logo_published_kevin)
- notification.read # Mark as read first
-
- assert_changes -> { notification.reload.read? }, from: true, to: false do
- notification.unread
- end
- end
-
- test "unread broadcasts to notifications" do
- notification = notifications(:logo_published_kevin)
- notification.read # Mark as read first
-
- assert_turbo_stream_broadcasts([ notification.user, :notifications ], count: 1) do
- perform_enqueued_jobs do
- notification.unread
- end
- end
- end
-
test "read marks notification as read" do
- notification = notifications(:logo_published_kevin)
- # Ensure it starts as unread
- notification.update!(read_at: nil)
+ notification = notifications(:logo_assignment_kevin)
+ notification.update!(read_at: nil, unread_count: 2)
assert_changes -> { notification.reload.read? }, from: false, to: true do
notification.read
end
+
+ assert_equal 0, notification.unread_count
end
- test "read broadcasts to notifications" do
- notification = notifications(:logo_published_kevin)
- # Ensure it starts as unread
- notification.update!(read_at: nil)
+ test "unread marks notification as unread" do
+ notification = notifications(:logo_assignment_kevin)
+ notification.read
+
+ assert_changes -> { notification.reload.read? }, from: true, to: false do
+ notification.unread
+ end
+
+ assert_equal 1, notification.unread_count
+ end
+
+ test "read_all marks all notifications and resets unread counts" do
+ kevin = users(:kevin)
+
+ kevin.notifications.unread.read_all
+
+ assert kevin.notifications.reload.all?(&:read?)
+ assert kevin.notifications.reload.all? { |n| n.unread_count == 0 }
+ end
+
+ test "unread_count tracks notification count per card" do
+ notification = notifications(:logo_assignment_kevin)
+ assert_equal 2, notification.unread_count
+ end
+
+ test "broadcasting on create prepends" do
+ kevin = users(:kevin)
+ layout = cards(:layout)
+
+ notifications(:layout_commented_kevin).destroy
+
+ perform_enqueued_jobs do
+ Notification.create!(user: kevin, source: events(:layout_commented), creator: users(:david))
+ end
+
+ assert_turbo_stream_broadcasts [ kevin, :notifications ]
+ end
+
+ test "broadcasting on update when read removes" do
+ notification = notifications(:layout_commented_kevin)
assert_turbo_stream_broadcasts([ notification.user, :notifications ], count: 1) do
- notification.read
+ perform_enqueued_jobs do
+ notification.read
+ end
end
end
- test "deleting notification broadcasts its removal" do
- notification = notifications(:logo_published_kevin)
- notification.update!(read_at: nil)
+ test "broadcasting on destroy removes" do
+ notification = notifications(:logo_assignment_kevin)
assert_turbo_stream_broadcasts([ notification.user, :notifications ], count: 1) do
notification.destroy
diff --git a/test/models/notifier/event_notifier_test.rb b/test/models/notifier/event_notifier_test.rb
index 82942b96c..6393ddb99 100644
--- a/test/models/notifier/event_notifier_test.rb
+++ b/test/models/notifier/event_notifier_test.rb
@@ -71,18 +71,18 @@ class Notifier::EventNotifierTest < ActiveSupport::TestCase
test "create notifications on publish for mentionees" do
users(:kevin).mentioned_by(users(:david), at: cards(:logo))
- assert_difference -> { users(:kevin).notifications.count }, +1 do
- Notifier.for(events(:logo_published)).notify
- end
+ notifications = Notifier.for(events(:logo_published)).notify
+
+ assert_includes notifications.map(&:user), users(:kevin)
end
- test "don'create notifications on publish for mentionees that are not watching" do
+ test "create notifications on publish for mentionees that are not watching" do
users(:kevin).mentioned_by(users(:david), at: cards(:logo))
cards(:logo).unwatch_by(users(:kevin))
- assert_difference -> { users(:kevin).notifications.count }, +1 do
- Notifier.for(events(:logo_published)).notify
- end
+ notifications = Notifier.for(events(:logo_published)).notify
+
+ assert_includes notifications.map(&:user), users(:kevin)
end
test "don't create notifications on comment for mentionees" do
diff --git a/test/models/user/notifiable_test.rb b/test/models/user/notifiable_test.rb
index c7bc4fabc..aabfdda2d 100644
--- a/test/models/user/notifiable_test.rb
+++ b/test/models/user/notifiable_test.rb
@@ -3,6 +3,7 @@ require "test_helper"
class User::NotifiableTest < ActiveSupport::TestCase
setup do
@user = users(:david)
+ @user.notifications.destroy_all
@user.settings.bundle_email_every_few_hours!
end
@@ -12,7 +13,7 @@ class User::NotifiableTest < ActiveSupport::TestCase
end
bundle = @user.notification_bundles.last
- assert_equal notification.created_at, bundle.starts_at
+ assert_equal notification.updated_at, bundle.starts_at
assert bundle.pending?
end
@@ -20,7 +21,7 @@ class User::NotifiableTest < ActiveSupport::TestCase
@user.notifications.create!(source: events(:logo_published), creator: @user)
assert_no_difference -> { @user.notification_bundles.count } do
- @user.notifications.create!(source: events(:logo_published), creator: @user)
+ @user.notifications.create!(source: events(:layout_published), creator: @user)
end
end
end
diff --git a/test/models/webhook/delivery_test.rb b/test/models/webhook/delivery_test.rb
index d4d95528c..8d40c4417 100644
--- a/test/models/webhook/delivery_test.rb
+++ b/test/models/webhook/delivery_test.rb
@@ -245,6 +245,102 @@ class Webhook::DeliveryTest < ActiveSupport::TestCase
assert_requested request_stub
end
+ test "basecamp webhook payload html-escapes special characters" do
+ cards(:logo).update_column(:title, %(Tom & Jerry's
"Adventure"))
+
+ webhook = Webhook.create!(
+ board: boards(:writebook),
+ name: "Basecamp",
+ url: "https://3.basecamp.com/123/integrations/webhook/buckets/456/chats/789/lines"
+ )
+ delivery = Webhook::Delivery.create!(webhook: webhook, event: events(:logo_published))
+
+ captured_body = nil
+ stub_request(:post, webhook.url)
+ .with { |request| captured_body = request.body; true }
+ .to_return(status: 200)
+
+ delivery.deliver
+
+ content = CGI.parse(captured_body)["content"].first
+
+ expected = <<~HTML.strip
+ David added "Tom & Jerry's <Great> "Adventure""
+ ↗︎
+ HTML
+ assert_equal expected, content
+ end
+
+ test "slack webhook payload html-escapes special characters" do
+ cards(:logo).update_column(:title, %(Tom & Jerry's "Adventure"))
+
+ webhook = Webhook.create!(
+ board: boards(:writebook),
+ name: "Slack",
+ url: "https://hooks.slack.com/services/T12345678/B12345678/abcdefghijklmnopqrstuvwx" # gitleaks:allow
+ )
+ delivery = Webhook::Delivery.create!(webhook: webhook, event: events(:logo_published))
+
+ captured_body = nil
+ stub_request(:post, webhook.url)
+ .with { |request| captured_body = request.body; true }
+ .to_return(status: 200)
+
+ delivery.deliver
+
+ text = JSON.parse(captured_body)["text"]
+
+ expected = <<~TEXT.strip
+ David added "Tom & Jerry's <Great> "Adventure""
+ TEXT
+ assert_equal expected, text
+ end
+
+ test "campfire webhook payload html-escapes special characters" do
+ cards(:logo).update_column(:title, %(Tom & Jerry's "Adventure"))
+
+ webhook = Webhook.create!(
+ board: boards(:writebook),
+ name: "Campfire",
+ url: "https://example.com/rooms/123/456-room-name/messages"
+ )
+ delivery = Webhook::Delivery.create!(webhook: webhook, event: events(:logo_published))
+
+ captured_body = nil
+ stub_request(:post, webhook.url)
+ .with { |request| captured_body = request.body; true }
+ .to_return(status: 200)
+
+ delivery.deliver
+
+ expected = <<~HTML.strip
+ David added "Tom & Jerry's <Great> "Adventure""
+ ↗︎
+ HTML
+ assert_equal expected, captured_body
+ end
+
+ test "generic webhook payload json-encodes special characters" do
+ cards(:logo).update_column(:title, %(Tom & Jerry's "Adventure"))
+
+ webhook = Webhook.create!(
+ board: boards(:writebook),
+ name: "Generic",
+ url: "https://example.com/webhook"
+ )
+ delivery = Webhook::Delivery.create!(webhook: webhook, event: events(:logo_published))
+
+ captured_body = nil
+ stub_request(:post, webhook.url)
+ .with { |request| captured_body = request.body; true }
+ .to_return(status: 200)
+
+ delivery.deliver
+
+ json = JSON.parse(captured_body)
+ assert_equal %(Tom & Jerry's "Adventure"), json["eventable"]["title"]
+ end
+
test "renders creator name when event creator is not current user" do
webhook = Webhook.create!(
board: boards(:writebook),
diff --git a/test/system/smoke_test.rb b/test/system/smoke_test.rb
index c307c50d2..31e8f723f 100644
--- a/test/system/smoke_test.rb
+++ b/test/system/smoke_test.rb
@@ -67,13 +67,13 @@ class SmokeTest < ApplicationSystemTestCase
test "dismissing notifications" do
sign_in_as(users(:david))
- notif = notifications(:logo_card_david_mention_by_jz)
+ notification = notifications(:logo_mentioned_david)
- assert_selector "div##{dom_id(notif)}"
+ assert_selector "div##{dom_id(notification)}"
- within_window(open_new_window) { visit card_url(notif.card) }
+ within_window(open_new_window) { visit card_url(notification.card) }
- assert_no_selector "div##{dom_id(notif)}"
+ assert_no_selector "div##{dom_id(notification)}"
end
test "dragging card to a new column" do
diff --git a/vendor/javascript/marked.js b/vendor/javascript/marked.js
deleted file mode 100644
index c881ef5ff..000000000
--- a/vendor/javascript/marked.js
+++ /dev/null
@@ -1,2583 +0,0 @@
-// marked@15.0.11 downloaded from https://cdn.jsdelivr.net/npm/marked@15.0.11/lib/marked.esm.js
-
-/**
- * marked v15.0.11 - a markdown parser
- * Copyright (c) 2011-2025, Christopher Jeffrey. (MIT Licensed)
- * https://github.com/markedjs/marked
- */
-
-/**
- * DO NOT EDIT THIS FILE
- * The code in this file is generated from files in ./src/
- */
-
-/**
- * Gets the original marked default options.
- */
-function _getDefaults() {
- return {
- async: false,
- breaks: false,
- extensions: null,
- gfm: true,
- hooks: null,
- pedantic: false,
- renderer: null,
- silent: false,
- tokenizer: null,
- walkTokens: null,
- };
-}
-let _defaults = _getDefaults();
-function changeDefaults(newDefaults) {
- _defaults = newDefaults;
-}
-
-const noopTest = { exec: () => null };
-function edit(regex, opt = '') {
- let source = typeof regex === 'string' ? regex : regex.source;
- const obj = {
- replace: (name, val) => {
- let valSource = typeof val === 'string' ? val : val.source;
- valSource = valSource.replace(other.caret, '$1');
- source = source.replace(name, valSource);
- return obj;
- },
- getRegex: () => {
- return new RegExp(source, opt);
- },
- };
- return obj;
-}
-const other = {
- codeRemoveIndent: /^(?: {1,4}| {0,3}\t)/gm,
- outputLinkReplace: /\\([\[\]])/g,
- indentCodeCompensation: /^(\s+)(?:```)/,
- beginningSpace: /^\s+/,
- endingHash: /#$/,
- startingSpaceChar: /^ /,
- endingSpaceChar: / $/,
- nonSpaceChar: /[^ ]/,
- newLineCharGlobal: /\n/g,
- tabCharGlobal: /\t/g,
- multipleSpaceGlobal: /\s+/g,
- blankLine: /^[ \t]*$/,
- doubleBlankLine: /\n[ \t]*\n[ \t]*$/,
- blockquoteStart: /^ {0,3}>/,
- blockquoteSetextReplace: /\n {0,3}((?:=+|-+) *)(?=\n|$)/g,
- blockquoteSetextReplace2: /^ {0,3}>[ \t]?/gm,
- listReplaceTabs: /^\t+/,
- listReplaceNesting: /^ {1,4}(?=( {4})*[^ ])/g,
- listIsTask: /^\[[ xX]\] /,
- listReplaceTask: /^\[[ xX]\] +/,
- anyLine: /\n.*\n/,
- hrefBrackets: /^<(.*)>$/,
- tableDelimiter: /[:|]/,
- tableAlignChars: /^\||\| *$/g,
- tableRowBlankLine: /\n[ \t]*$/,
- tableAlignRight: /^ *-+: *$/,
- tableAlignCenter: /^ *:-+: *$/,
- tableAlignLeft: /^ *:-+ *$/,
- startATag: /^/i,
- startPreScriptTag: /^<(pre|code|kbd|script)(\s|>)/i,
- endPreScriptTag: /^<\/(pre|code|kbd|script)(\s|>)/i,
- startAngleBracket: /^$/,
- pedanticHrefTitle: /^([^'"]*[^\s])\s+(['"])(.*)\2/,
- unicodeAlphaNumeric: /[\p{L}\p{N}]/u,
- escapeTest: /[&<>"']/,
- escapeReplace: /[&<>"']/g,
- escapeTestNoEncode: /[<>"']|&(?!(#\d{1,7}|#[Xx][a-fA-F0-9]{1,6}|\w+);)/,
- escapeReplaceNoEncode: /[<>"']|&(?!(#\d{1,7}|#[Xx][a-fA-F0-9]{1,6}|\w+);)/g,
- unescapeTest: /&(#(?:\d+)|(?:#x[0-9A-Fa-f]+)|(?:\w+));?/ig,
- caret: /(^|[^\[])\^/g,
- percentDecode: /%25/g,
- findPipe: /\|/g,
- splitPipe: / \|/,
- slashPipe: /\\\|/g,
- carriageReturn: /\r\n|\r/g,
- spaceLine: /^ +$/gm,
- notSpaceStart: /^\S*/,
- endingNewline: /\n$/,
- listItemRegex: (bull) => new RegExp(`^( {0,3}${bull})((?:[\t ][^\\n]*)?(?:\\n|$))`),
- nextBulletRegex: (indent) => new RegExp(`^ {0,${Math.min(3, indent - 1)}}(?:[*+-]|\\d{1,9}[.)])((?:[ \t][^\\n]*)?(?:\\n|$))`),
- hrRegex: (indent) => new RegExp(`^ {0,${Math.min(3, indent - 1)}}((?:- *){3,}|(?:_ *){3,}|(?:\\* *){3,})(?:\\n+|$)`),
- fencesBeginRegex: (indent) => new RegExp(`^ {0,${Math.min(3, indent - 1)}}(?:\`\`\`|~~~)`),
- headingBeginRegex: (indent) => new RegExp(`^ {0,${Math.min(3, indent - 1)}}#`),
- htmlBeginRegex: (indent) => new RegExp(`^ {0,${Math.min(3, indent - 1)}}<(?:[a-z].*>|!--)`, 'i'),
-};
-/**
- * Block-Level Grammar
- */
-const newline = /^(?:[ \t]*(?:\n|$))+/;
-const blockCode = /^((?: {4}| {0,3}\t)[^\n]+(?:\n(?:[ \t]*(?:\n|$))*)?)+/;
-const fences = /^ {0,3}(`{3,}(?=[^`\n]*(?:\n|$))|~{3,})([^\n]*)(?:\n|$)(?:|([\s\S]*?)(?:\n|$))(?: {0,3}\1[~`]* *(?=\n|$)|$)/;
-const hr = /^ {0,3}((?:-[\t ]*){3,}|(?:_[ \t]*){3,}|(?:\*[ \t]*){3,})(?:\n+|$)/;
-const heading = /^ {0,3}(#{1,6})(?=\s|$)(.*)(?:\n+|$)/;
-const bullet = /(?:[*+-]|\d{1,9}[.)])/;
-const lheadingCore = /^(?!bull |blockCode|fences|blockquote|heading|html|table)((?:.|\n(?!\s*?\n|bull |blockCode|fences|blockquote|heading|html|table))+?)\n {0,3}(=+|-+) *(?:\n+|$)/;
-const lheading = edit(lheadingCore)
- .replace(/bull/g, bullet) // lists can interrupt
- .replace(/blockCode/g, /(?: {4}| {0,3}\t)/) // indented code blocks can interrupt
- .replace(/fences/g, / {0,3}(?:`{3,}|~{3,})/) // fenced code blocks can interrupt
- .replace(/blockquote/g, / {0,3}>/) // blockquote can interrupt
- .replace(/heading/g, / {0,3}#{1,6}/) // ATX heading can interrupt
- .replace(/html/g, / {0,3}<[^\n>]+>\n/) // block html can interrupt
- .replace(/\|table/g, '') // table not in commonmark
- .getRegex();
-const lheadingGfm = edit(lheadingCore)
- .replace(/bull/g, bullet) // lists can interrupt
- .replace(/blockCode/g, /(?: {4}| {0,3}\t)/) // indented code blocks can interrupt
- .replace(/fences/g, / {0,3}(?:`{3,}|~{3,})/) // fenced code blocks can interrupt
- .replace(/blockquote/g, / {0,3}>/) // blockquote can interrupt
- .replace(/heading/g, / {0,3}#{1,6}/) // ATX heading can interrupt
- .replace(/html/g, / {0,3}<[^\n>]+>\n/) // block html can interrupt
- .replace(/table/g, / {0,3}\|?(?:[:\- ]*\|)+[\:\- ]*\n/) // table can interrupt
- .getRegex();
-const _paragraph = /^([^\n]+(?:\n(?!hr|heading|lheading|blockquote|fences|list|html|table| +\n)[^\n]+)*)/;
-const blockText = /^[^\n]+/;
-const _blockLabel = /(?!\s*\])(?:\\.|[^\[\]\\])+/;
-const def = edit(/^ {0,3}\[(label)\]: *(?:\n[ \t]*)?([^<\s][^\s]*|<.*?>)(?:(?: +(?:\n[ \t]*)?| *\n[ \t]*)(title))? *(?:\n+|$)/)
- .replace('label', _blockLabel)
- .replace('title', /(?:"(?:\\"?|[^"\\])*"|'[^'\n]*(?:\n[^'\n]+)*\n?'|\([^()]*\))/)
- .getRegex();
-const list = edit(/^( {0,3}bull)([ \t][^\n]+?)?(?:\n|$)/)
- .replace(/bull/g, bullet)
- .getRegex();
-const _tag = 'address|article|aside|base|basefont|blockquote|body|caption'
- + '|center|col|colgroup|dd|details|dialog|dir|div|dl|dt|fieldset|figcaption'
- + '|figure|footer|form|frame|frameset|h[1-6]|head|header|hr|html|iframe'
- + '|legend|li|link|main|menu|menuitem|meta|nav|noframes|ol|optgroup|option'
- + '|p|param|search|section|summary|table|tbody|td|tfoot|th|thead|title'
- + '|tr|track|ul';
-const _comment = /|$))/;
-const html = edit('^ {0,3}(?:' // optional indentation
- + '<(script|pre|style|textarea)[\\s>][\\s\\S]*?(?:[^\\n]*\\n+|$)' // (1)
- + '|comment[^\\n]*(\\n+|$)' // (2)
- + '|<\\?[\\s\\S]*?(?:\\?>\\n*|$)' // (3)
- + '|\\n*|$)' // (4)
- + '|\\n*|$)' // (5)
- + '|)[\\s\\S]*?(?:(?:\\n[ \t]*)+\\n|$)' // (6)
- + '|<(?!script|pre|style|textarea)([a-z][\\w-]*)(?:attribute)*? */?>(?=[ \\t]*(?:\\n|$))[\\s\\S]*?(?:(?:\\n[ \t]*)+\\n|$)' // (7) open tag
- + '|(?=[ \\t]*(?:\\n|$))[\\s\\S]*?(?:(?:\\n[ \t]*)+\\n|$)' // (7) closing tag
- + ')', 'i')
- .replace('comment', _comment)
- .replace('tag', _tag)
- .replace('attribute', / +[a-zA-Z:_][\w.:-]*(?: *= *"[^"\n]*"| *= *'[^'\n]*'| *= *[^\s"'=<>`]+)?/)
- .getRegex();
-const paragraph = edit(_paragraph)
- .replace('hr', hr)
- .replace('heading', ' {0,3}#{1,6}(?:\\s|$)')
- .replace('|lheading', '') // setext headings don't interrupt commonmark paragraphs
- .replace('|table', '')
- .replace('blockquote', ' {0,3}>')
- .replace('fences', ' {0,3}(?:`{3,}(?=[^`\\n]*\\n)|~{3,})[^\\n]*\\n')
- .replace('list', ' {0,3}(?:[*+-]|1[.)]) ') // only lists starting from 1 can interrupt
- .replace('html', ')|<(?:script|pre|style|textarea|!--)')
- .replace('tag', _tag) // pars can be interrupted by type (6) html blocks
- .getRegex();
-const blockquote = edit(/^( {0,3}> ?(paragraph|[^\n]*)(?:\n|$))+/)
- .replace('paragraph', paragraph)
- .getRegex();
-/**
- * Normal Block Grammar
- */
-const blockNormal = {
- blockquote,
- code: blockCode,
- def,
- fences,
- heading,
- hr,
- html,
- lheading,
- list,
- newline,
- paragraph,
- table: noopTest,
- text: blockText,
-};
-/**
- * GFM Block Grammar
- */
-const gfmTable = edit('^ *([^\\n ].*)\\n' // Header
- + ' {0,3}((?:\\| *)?:?-+:? *(?:\\| *:?-+:? *)*(?:\\| *)?)' // Align
- + '(?:\\n((?:(?! *\\n|hr|heading|blockquote|code|fences|list|html).*(?:\\n|$))*)\\n*|$)') // Cells
- .replace('hr', hr)
- .replace('heading', ' {0,3}#{1,6}(?:\\s|$)')
- .replace('blockquote', ' {0,3}>')
- .replace('code', '(?: {4}| {0,3}\t)[^\\n]')
- .replace('fences', ' {0,3}(?:`{3,}(?=[^`\\n]*\\n)|~{3,})[^\\n]*\\n')
- .replace('list', ' {0,3}(?:[*+-]|1[.)]) ') // only lists starting from 1 can interrupt
- .replace('html', ')|<(?:script|pre|style|textarea|!--)')
- .replace('tag', _tag) // tables can be interrupted by type (6) html blocks
- .getRegex();
-const blockGfm = {
- ...blockNormal,
- lheading: lheadingGfm,
- table: gfmTable,
- paragraph: edit(_paragraph)
- .replace('hr', hr)
- .replace('heading', ' {0,3}#{1,6}(?:\\s|$)')
- .replace('|lheading', '') // setext headings don't interrupt commonmark paragraphs
- .replace('table', gfmTable) // interrupt paragraphs with table
- .replace('blockquote', ' {0,3}>')
- .replace('fences', ' {0,3}(?:`{3,}(?=[^`\\n]*\\n)|~{3,})[^\\n]*\\n')
- .replace('list', ' {0,3}(?:[*+-]|1[.)]) ') // only lists starting from 1 can interrupt
- .replace('html', ')|<(?:script|pre|style|textarea|!--)')
- .replace('tag', _tag) // pars can be interrupted by type (6) html blocks
- .getRegex(),
-};
-/**
- * Pedantic grammar (original John Gruber's loose markdown specification)
- */
-const blockPedantic = {
- ...blockNormal,
- html: edit('^ *(?:comment *(?:\\n|\\s*$)'
- + '|<(tag)[\\s\\S]+? *(?:\\n{2,}|\\s*$)' // closed tag
- + '|'
- + (escaped ? code : escape(code, true))
- + ''
- + (escaped ? code : escape(code, true))
- + '\n${body} \n`;
- }
- html({ text }) {
- return text;
- }
- heading({ tokens, depth }) {
- return `${this.parser.parseInline(tokens)} \n`;
- }
- hr(token) {
- return '${itemBody} \n`;
- }
- checkbox({ checked }) {
- return '${this.parser.parseInline(tokens)}
\n`;
- }
- table(token) {
- let header = '';
- // header
- let cell = '';
- for (let j = 0; j < token.header.length; j++) {
- cell += this.tablecell(token.header[j]);
- }
- header += this.tablerow({ text: cell });
- let body = '';
- for (let j = 0; j < token.rows.length; j++) {
- const row = token.rows[j];
- cell = '';
- for (let k = 0; k < row.length; k++) {
- cell += this.tablecell(row[k]);
- }
- body += this.tablerow({ text: cell });
- }
- if (body)
- body = `${body} `;
- return ' \n'
- + '\n'
- + header
- + ' \n'
- + body
- + '
\n';
- }
- tablerow({ text }) {
- return `\n${text} \n`;
- }
- tablecell(token) {
- const content = this.parser.parseInline(token.tokens);
- const type = token.header ? 'th' : 'td';
- const tag = token.align
- ? `<${type} align="${token.align}">`
- : `<${type}>`;
- return tag + content + `\n`;
- }
- /**
- * span level renderer
- */
- strong({ tokens }) {
- return `${this.parser.parseInline(tokens)} `;
- }
- em({ tokens }) {
- return `${this.parser.parseInline(tokens)} `;
- }
- codespan({ text }) {
- return `${escape(text, true)}`;
- }
- br(token) {
- return '${this.parser.parseInline(tokens)}`;
- }
- link({ href, title, tokens }) {
- const text = this.parser.parseInline(tokens);
- const cleanHref = cleanUrl(href);
- if (cleanHref === null) {
- return text;
- }
- href = cleanHref;
- let out = '';
- return out;
- }
- image({ href, title, text, tokens }) {
- if (tokens) {
- text = this.parser.parseInline(tokens, this.parser.textRenderer);
- }
- const cleanHref = cleanUrl(href);
- if (cleanHref === null) {
- return escape(text);
- }
- href = cleanHref;
- let out = `An error occurred:
'
- + escape(e.message + '', true)
- + ' ';
- if (async) {
- return Promise.resolve(msg);
- }
- return msg;
- }
- if (async) {
- return Promise.reject(e);
- }
- throw e;
- };
- }
-}
-
-const markedInstance = new Marked();
-function marked(src, opt) {
- return markedInstance.parse(src, opt);
-}
-/**
- * Sets the default options.
- *
- * @param options Hash of options
- */
-marked.options =
- marked.setOptions = function (options) {
- markedInstance.setOptions(options);
- marked.defaults = markedInstance.defaults;
- changeDefaults(marked.defaults);
- return marked;
- };
-/**
- * Gets the original marked default options.
- */
-marked.getDefaults = _getDefaults;
-marked.defaults = _defaults;
-/**
- * Use Extension
- */
-marked.use = function (...args) {
- markedInstance.use(...args);
- marked.defaults = markedInstance.defaults;
- changeDefaults(marked.defaults);
- return marked;
-};
-/**
- * Run callback for every token
- */
-marked.walkTokens = function (tokens, callback) {
- return markedInstance.walkTokens(tokens, callback);
-};
-/**
- * Compiles markdown to HTML without enclosing `p` tag.
- *
- * @param src String of markdown source to be compiled
- * @param options Hash of options
- * @return String of compiled HTML
- */
-marked.parseInline = markedInstance.parseInline;
-/**
- * Expose
- */
-marked.Parser = _Parser;
-marked.parser = _Parser.parse;
-marked.Renderer = _Renderer;
-marked.TextRenderer = _TextRenderer;
-marked.Lexer = _Lexer;
-marked.lexer = _Lexer.lex;
-marked.Tokenizer = _Tokenizer;
-marked.Hooks = _Hooks;
-marked.parse = marked;
-const options = marked.options;
-const setOptions = marked.setOptions;
-const use = marked.use;
-const walkTokens = marked.walkTokens;
-const parseInline = marked.parseInline;
-const parse = marked;
-const parser = _Parser.parse;
-const lexer = _Lexer.lex;
-
-export { _Hooks as Hooks, _Lexer as Lexer, Marked, _Parser as Parser, _Renderer as Renderer, _TextRenderer as TextRenderer, _Tokenizer as Tokenizer, _defaults as defaults, _getDefaults as getDefaults, lexer, marked, options, parse, parseInline, parser, setOptions, use, walkTokens };
-
- <%= link_to card.title, edit_card_path(card), class: "card__title-link" %> + <%= link_to card_html_title(card), edit_card_path(card), class: "card__title-link" %>
<% unless card.description.blank? %> -- <%= card.title %> + <%= card_html_title(card) %>
- <%= card.title %> + <%= card_html_title(card) %>
<%= link_to board.name, board %>
<% board_notifications.group_by(&:card).each do |card, notifications| %> - <%= link_to "##{ card.number } #{ card.title }", card, class: "card__title" %> + <%= link_to card, class: "card__title" do %>#<%= card.number %> <%= card_html_title(card) %><% end %> <%= render partial: "notification/bundle_mailer/notification", collection: notifications, as: :notification %> <% end %> <% end %> diff --git a/app/views/notifications/_notification.html.erb b/app/views/notifications/_notification.html.erb index 02f547c4e..6bed2aa56 100644 --- a/app/views/notifications/_notification.html.erb +++ b/app/views/notifications/_notification.html.erb @@ -2,7 +2,7 @@ <%# Helper Dependency Updated: avatar_image_tag 2025-12-15 %> <%= notification_tag notification do %> <%= render "notifications/notification/header", notification: notification do %> - <%= notification_toggle_read_button(notification, url: card_reading_path(notification.card)) %> + <%= notification_toggle_read_button(notification, url: notification_reading_path(notification)) %> <% end %> <%= render "notifications/notification/body", notification: notification %> <% end %> diff --git a/app/views/notifications/_notification.json.jbuilder b/app/views/notifications/_notification.json.jbuilder index ba27c5425..d2fadfa1b 100644 --- a/app/views/notifications/_notification.json.jbuilder +++ b/app/views/notifications/_notification.json.jbuilder @@ -1,5 +1,5 @@ json.cache! notification do - json.(notification, :id) + json.(notification, :id, :unread_count) json.read notification.read? json.read_at notification.read_at&.utc json.created_at notification.created_at.utc diff --git a/app/views/notifications/_tray.html.erb b/app/views/notifications/_tray.html.erb index 1f5aae469..74d492049 100644 --- a/app/views/notifications/_tray.html.erb +++ b/app/views/notifications/_tray.html.erb @@ -8,9 +8,8 @@ data-navigable-list-reverse-navigation-value="true" data-action="keydown->navigable-list#navigate dialog:show@document->navigable-list#reset turbo-visit->navigable-list#reset keydown.esc->dialog#close:stop click@document->dialog#closeOnClickOutside"> <%= turbo_frame_tag "notifications", src: tray_notifications_path, refresh: "morph", data: { - controller: "notifications-tray frame-reloader", - notifications_tray_grouped_class: "notification--grouped", - action: "turbo:frame-render->notifications-tray#group focus@window->frame-reloader#reload" } %> + controller: "frame-reloader", + action: "focus@window->frame-reloader#reload" } %>Previously seen
- <%= tag.span card.title, class: "card__title-link" %> + <%= tag.span card_html_title(card), class: "card__title-link" %>
-bugin production", element.inner_html + end end test "edit" do diff --git a/test/controllers/notifications/bulk_readings_controller_test.rb b/test/controllers/notifications/bulk_readings_controller_test.rb index 3512b7b43..f889dfaac 100644 --- a/test/controllers/notifications/bulk_readings_controller_test.rb +++ b/test/controllers/notifications/bulk_readings_controller_test.rb @@ -6,7 +6,7 @@ class Notifications::BulkReadingsControllerTest < ActionDispatch::IntegrationTes end test "create marks all notifications as read" do - assert_changes -> { notifications(:logo_published_kevin).reload.read? }, from: false, to: true do + assert_changes -> { notifications(:logo_assignment_kevin).reload.read? }, from: false, to: true do assert_changes -> { notifications(:layout_commented_kevin).reload.read? }, from: false, to: true do post bulk_reading_path end @@ -24,7 +24,7 @@ class Notifications::BulkReadingsControllerTest < ActionDispatch::IntegrationTes end test "create as JSON" do - assert_changes -> { notifications(:logo_published_kevin).reload.read? }, from: false, to: true do + assert_changes -> { notifications(:logo_assignment_kevin).reload.read? }, from: false, to: true do assert_changes -> { notifications(:layout_commented_kevin).reload.read? }, from: false, to: true do post bulk_reading_path, as: :json end diff --git a/test/controllers/notifications/readings_controller_test.rb b/test/controllers/notifications/readings_controller_test.rb index 3f2a690a9..fca29a35b 100644 --- a/test/controllers/notifications/readings_controller_test.rb +++ b/test/controllers/notifications/readings_controller_test.rb @@ -3,38 +3,37 @@ require "test_helper" class Notifications::ReadingsControllerTest < ActionDispatch::IntegrationTest setup do sign_in_as :kevin + @notification = notifications(:logo_assignment_kevin) end test "create" do - assert_changes -> { notifications(:logo_published_kevin).reload.read? }, from: false, to: true do - post notification_reading_path(notifications(:logo_published_kevin), format: :turbo_stream) + assert_changes -> { @notification.reload.read? }, from: false, to: true do + post notification_reading_path(@notification, format: :turbo_stream) assert_response :success end end test "destroy" do - notification = notifications(:logo_published_kevin) - notification.read # Mark as read first + @notification.read - assert_changes -> { notification.reload.read? }, from: true, to: false do - delete notification_reading_path(notification, format: :turbo_stream) + assert_changes -> { @notification.reload.read? }, from: true, to: false do + delete notification_reading_path(@notification, format: :turbo_stream) assert_response :success end end test "create as JSON" do - assert_changes -> { notifications(:logo_published_kevin).reload.read? }, from: false, to: true do - post notification_reading_path(notifications(:logo_published_kevin)), as: :json + assert_changes -> { @notification.reload.read? }, from: false, to: true do + post notification_reading_path(@notification), as: :json assert_response :no_content end end test "destroy as JSON" do - notification = notifications(:logo_published_kevin) - notification.read + @notification.read - assert_changes -> { notification.reload.read? }, from: true, to: false do - delete notification_reading_path(notification), as: :json + assert_changes -> { @notification.reload.read? }, from: true, to: false do + delete notification_reading_path(@notification), as: :json assert_response :no_content end end diff --git a/test/controllers/notifications_controller_test.rb b/test/controllers/notifications_controller_test.rb index e4e7bec38..0d0565f24 100644 --- a/test/controllers/notifications_controller_test.rb +++ b/test/controllers/notifications_controller_test.rb @@ -10,18 +10,17 @@ class NotificationsControllerTest < ActionDispatch::IntegrationTest assert_response :success assert_kind_of Array, @response.parsed_body - assert @response.parsed_body.any? { |n| n["id"] == notifications(:logo_published_kevin).id } + assert @response.parsed_body.any? { |n| n["id"] == notifications(:logo_assignment_kevin).id } end test "index as JSON includes notification attributes" do get notifications_path, as: :json - notification = @response.parsed_body.find { |n| n["id"] == notifications(:logo_published_kevin).id } + notification = @response.parsed_body.find { |n| n["id"] == notifications(:logo_assignment_kevin).id } - assert_not_nil notification["title"] - assert_not_nil notification["body"] assert_not_nil notification["created_at"] assert_not_nil notification["card"] assert_not_nil notification["creator"] + assert_not_nil notification["unread_count"] end end diff --git a/test/fixtures/notifications.yml b/test/fixtures/notifications.yml index 9fe7da317..b7ae167cd 100644 --- a/test/fixtures/notifications.yml +++ b/test/fixtures/notifications.yml @@ -1,15 +1,9 @@ -logo_published_kevin: - id: <%= ActiveRecord::FixtureSet.identify("logo_published_kevin", :uuid) %> - user: kevin_uuid - source: logo_published_uuid (Event) - created_at: <%= 1.week.ago %> - creator: david_uuid - account: 37s_uuid - logo_assignment_kevin: id: <%= ActiveRecord::FixtureSet.identify("logo_assignment_kevin", :uuid) %> user: kevin_uuid source: logo_assignment_km_uuid (Event) + card: logo_uuid + unread_count: 2 created_at: <%= 1.week.ago %> creator: david_uuid account: 37s_uuid @@ -18,22 +12,18 @@ layout_commented_kevin: id: <%= ActiveRecord::FixtureSet.identify("layout_commented_kevin", :uuid) %> user: kevin_uuid source: layout_commented_uuid (Event) + card: layout_uuid + unread_count: 1 created_at: <%= 1.week.ago %> creator: david_uuid account: 37s_uuid -logo_card_david_mention_by_jz: - id: <%= ActiveRecord::FixtureSet.identify("logo_card_david_mention_by_jz_notif", :uuid) %> - user: david_uuid - source: logo_card_david_mention_by_jz_uuid (Mention) - created_at: <%= 1.week.ago %> - creator: david_uuid - account: 37s_uuid - -logo_comment_david_mention_by_jz: - id: <%= ActiveRecord::FixtureSet.identify("logo_comment_david_mention_by_jz_notif", :uuid) %> +logo_mentioned_david: + id: <%= ActiveRecord::FixtureSet.identify("logo_mentioned_david", :uuid) %> user: david_uuid source: logo_comment_david_mention_by_jz_uuid (Mention) + card: logo_uuid + unread_count: 2 created_at: <%= 1.week.ago %> creator: david_uuid account: 37s_uuid diff --git a/test/helpers/html_helper_test.rb b/test/helpers/html_helper_test.rb index 1af507ddf..0fd6c268a 100644 --- a/test/helpers/html_helper_test.rb +++ b/test/helpers/html_helper_test.rb @@ -119,4 +119,29 @@ class HtmlHelperTest < ActionView::TestCase assert_no_match(/fooandbar", card_html_title(cards(:logo).tap { _1.title = "`foo` and `bar`" }) + end + + test "card_html_title renders code spans without surrounding spaces" do + assert_equal "whataboutthis", card_html_title(cards(:logo).tap { _1.title = "what`about`this" }) + end + + test "card_html_title escapes HTML tags" do + assert_equal "<script>alert(1)</script>", card_html_title(cards(:logo).tap { _1.title = "" }) + end + + test "card_html_title escapes HTML inside backticks" do + assert_equal "<script>", card_html_title(cards(:logo).tap { _1.title = "`") diff --git a/test/models/notification/bundle_test.rb b/test/models/notification/bundle_test.rb index 2a8b242af..66dd8dd77 100644 --- a/test/models/notification/bundle_test.rb +++ b/test/models/notification/bundle_test.rb @@ -5,6 +5,7 @@ class Notification::BundleTest < ActiveSupport::TestCase setup do @user = users(:david) + @user.notifications.destroy_all @user.settings.bundle_email_every_few_hours! end @@ -25,7 +26,7 @@ class Notification::BundleTest < ActiveSupport::TestCase end end - test "notifications are bundled withing the aggregation period" do + test "notifications are bundled within the aggregation period" do @user.notification_bundles.destroy_all notification_1 = assert_difference -> { @user.notification_bundles.pending.count }, 1 do @@ -34,12 +35,12 @@ class Notification::BundleTest < ActiveSupport::TestCase travel_to 3.hours.from_now notification_2 = assert_no_difference -> { @user.notification_bundles.count } do - @user.notifications.create!(source: events(:logo_published), creator: @user) + @user.notifications.create!(source: events(:layout_published), creator: @user) end travel_to 3.days.from_now notification_3 = assert_difference -> { @user.notification_bundles.pending.count }, 1 do - @user.notifications.create!(source: events(:logo_published), creator: @user) + @user.notifications.create!(source: events(:text_published), creator: @user) end assert_equal 2, @user.notification_bundles.count @@ -150,10 +151,10 @@ class Notification::BundleTest < ActiveSupport::TestCase test "out-of-order notification bundling should still work" do first_notification = @user.notifications.create!(source: events(:logo_published), creator: @user) - second_notification = @user.notifications.create!(source: events(:logo_published), creator: @user) + second_notification = @user.notifications.create!(source: events(:layout_commented), creator: @user) @user.notification_bundles.destroy_all - assert first_notification.created_at < second_notification.created_at + assert first_notification.updated_at <= second_notification.updated_at @user.bundle(second_notification) @user.bundle(first_notification) diff --git a/test/models/notification_pusher_test.rb b/test/models/notification_pusher_test.rb index 21b9e202b..53380effe 100644 --- a/test/models/notification_pusher_test.rb +++ b/test/models/notification_pusher_test.rb @@ -3,10 +3,7 @@ require "test_helper" class NotificationPusherTest < ActiveSupport::TestCase setup do @user = users(:david) - @notification = @user.notifications.create!( - source: events(:logo_published), - creator: users(:jason) - ) + @notification = notifications(:logo_mentioned_david) @pusher = NotificationPusher.new(@notification) @user.push_subscriptions.create!( diff --git a/test/models/notification_test.rb b/test/models/notification_test.rb index 9c8ebbe12..8d9809ba1 100644 --- a/test/models/notification_test.rb +++ b/test/models/notification_test.rb @@ -1,49 +1,67 @@ require "test_helper" class NotificationTest < ActiveSupport::TestCase - test "unread marks notification as unread" do - notification = notifications(:logo_published_kevin) - notification.read # Mark as read first - - assert_changes -> { notification.reload.read? }, from: true, to: false do - notification.unread - end - end - - test "unread broadcasts to notifications" do - notification = notifications(:logo_published_kevin) - notification.read # Mark as read first - - assert_turbo_stream_broadcasts([ notification.user, :notifications ], count: 1) do - perform_enqueued_jobs do - notification.unread - end - end - end - test "read marks notification as read" do - notification = notifications(:logo_published_kevin) - # Ensure it starts as unread - notification.update!(read_at: nil) + notification = notifications(:logo_assignment_kevin) + notification.update!(read_at: nil, unread_count: 2) assert_changes -> { notification.reload.read? }, from: false, to: true do notification.read end + + assert_equal 0, notification.unread_count end - test "read broadcasts to notifications" do - notification = notifications(:logo_published_kevin) - # Ensure it starts as unread - notification.update!(read_at: nil) + test "unread marks notification as unread" do + notification = notifications(:logo_assignment_kevin) + notification.read + + assert_changes -> { notification.reload.read? }, from: true, to: false do + notification.unread + end + + assert_equal 1, notification.unread_count + end + + test "read_all marks all notifications and resets unread counts" do + kevin = users(:kevin) + + kevin.notifications.unread.read_all + + assert kevin.notifications.reload.all?(&:read?) + assert kevin.notifications.reload.all? { |n| n.unread_count == 0 } + end + + test "unread_count tracks notification count per card" do + notification = notifications(:logo_assignment_kevin) + assert_equal 2, notification.unread_count + end + + test "broadcasting on create prepends" do + kevin = users(:kevin) + layout = cards(:layout) + + notifications(:layout_commented_kevin).destroy + + perform_enqueued_jobs do + Notification.create!(user: kevin, source: events(:layout_commented), creator: users(:david)) + end + + assert_turbo_stream_broadcasts [ kevin, :notifications ] + end + + test "broadcasting on update when read removes" do + notification = notifications(:layout_commented_kevin) assert_turbo_stream_broadcasts([ notification.user, :notifications ], count: 1) do - notification.read + perform_enqueued_jobs do + notification.read + end end end - test "deleting notification broadcasts its removal" do - notification = notifications(:logo_published_kevin) - notification.update!(read_at: nil) + test "broadcasting on destroy removes" do + notification = notifications(:logo_assignment_kevin) assert_turbo_stream_broadcasts([ notification.user, :notifications ], count: 1) do notification.destroy diff --git a/test/models/notifier/event_notifier_test.rb b/test/models/notifier/event_notifier_test.rb index 82942b96c..6393ddb99 100644 --- a/test/models/notifier/event_notifier_test.rb +++ b/test/models/notifier/event_notifier_test.rb @@ -71,18 +71,18 @@ class Notifier::EventNotifierTest < ActiveSupport::TestCase test "create notifications on publish for mentionees" do users(:kevin).mentioned_by(users(:david), at: cards(:logo)) - assert_difference -> { users(:kevin).notifications.count }, +1 do - Notifier.for(events(:logo_published)).notify - end + notifications = Notifier.for(events(:logo_published)).notify + + assert_includes notifications.map(&:user), users(:kevin) end - test "don'create notifications on publish for mentionees that are not watching" do + test "create notifications on publish for mentionees that are not watching" do users(:kevin).mentioned_by(users(:david), at: cards(:logo)) cards(:logo).unwatch_by(users(:kevin)) - assert_difference -> { users(:kevin).notifications.count }, +1 do - Notifier.for(events(:logo_published)).notify - end + notifications = Notifier.for(events(:logo_published)).notify + + assert_includes notifications.map(&:user), users(:kevin) end test "don't create notifications on comment for mentionees" do diff --git a/test/models/user/notifiable_test.rb b/test/models/user/notifiable_test.rb index c7bc4fabc..aabfdda2d 100644 --- a/test/models/user/notifiable_test.rb +++ b/test/models/user/notifiable_test.rb @@ -3,6 +3,7 @@ require "test_helper" class User::NotifiableTest < ActiveSupport::TestCase setup do @user = users(:david) + @user.notifications.destroy_all @user.settings.bundle_email_every_few_hours! end @@ -12,7 +13,7 @@ class User::NotifiableTest < ActiveSupport::TestCase end bundle = @user.notification_bundles.last - assert_equal notification.created_at, bundle.starts_at + assert_equal notification.updated_at, bundle.starts_at assert bundle.pending? end @@ -20,7 +21,7 @@ class User::NotifiableTest < ActiveSupport::TestCase @user.notifications.create!(source: events(:logo_published), creator: @user) assert_no_difference -> { @user.notification_bundles.count } do - @user.notifications.create!(source: events(:logo_published), creator: @user) + @user.notifications.create!(source: events(:layout_published), creator: @user) end end end diff --git a/test/models/webhook/delivery_test.rb b/test/models/webhook/delivery_test.rb index d4d95528c..8d40c4417 100644 --- a/test/models/webhook/delivery_test.rb +++ b/test/models/webhook/delivery_test.rb @@ -245,6 +245,102 @@ class Webhook::DeliveryTest < ActiveSupport::TestCase assert_requested request_stub end + test "basecamp webhook payload html-escapes special characters" do + cards(:logo).update_column(:title, %(Tom & Jerry's\n'; - } - list(token) { - const ordered = token.ordered; - const start = token.start; - let body = ''; - for (let j = 0; j < token.items.length; j++) { - const item = token.items[j]; - body += this.listitem(item); - } - const type = ordered ? 'ol' : 'ul'; - const startAttr = (ordered && start !== 1) ? (' start="' + start + '"') : ''; - return '<' + type + startAttr + '>\n' + body + '\n'; - } - listitem(item) { - let itemBody = ''; - if (item.task) { - const checkbox = this.checkbox({ checked: !!item.checked }); - if (item.loose) { - if (item.tokens[0]?.type === 'paragraph') { - item.tokens[0].text = checkbox + ' ' + item.tokens[0].text; - if (item.tokens[0].tokens && item.tokens[0].tokens.length > 0 && item.tokens[0].tokens[0].type === 'text') { - item.tokens[0].tokens[0].text = checkbox + ' ' + escape(item.tokens[0].tokens[0].text); - item.tokens[0].tokens[0].escaped = true; - } - } - else { - item.tokens.unshift({ - type: 'text', - raw: checkbox + ' ', - text: checkbox + ' ', - escaped: true, - }); - } - } - else { - itemBody += checkbox + ' '; - } - } - itemBody += this.parser.parse(item.tokens, !!item.loose); - return `
${this.parser.parseInline(tokens)}
\n`; - } - table(token) { - let header = ''; - // header - let cell = ''; - for (let j = 0; j < token.header.length; j++) { - cell += this.tablecell(token.header[j]); - } - header += this.tablerow({ text: cell }); - let body = ''; - for (let j = 0; j < token.rows.length; j++) { - const row = token.rows[j]; - cell = ''; - for (let k = 0; k < row.length; k++) { - cell += this.tablecell(row[k]); - } - body += this.tablerow({ text: cell }); - } - if (body) - body = `${body}`; - return '${escape(text, true)}`; - } - br(token) { - return ''; - } - del({ tokens }) { - return `
${this.parser.parseInline(tokens)}`; - } - link({ href, title, tokens }) { - const text = this.parser.parseInline(tokens); - const cleanHref = cleanUrl(href); - if (cleanHref === null) { - return text; - } - href = cleanHref; - let out = ''; - return out; - } - image({ href, title, text, tokens }) { - if (tokens) { - text = this.parser.parseInline(tokens, this.parser.textRenderer); - } - const cleanHref = cleanUrl(href); - if (cleanHref === null) { - return escape(text); - } - href = cleanHref; - let out = `An error occurred:
'; - if (async) { - return Promise.resolve(msg); - } - return msg; - } - if (async) { - return Promise.reject(e); - } - throw e; - }; - } -} - -const markedInstance = new Marked(); -function marked(src, opt) { - return markedInstance.parse(src, opt); -} -/** - * Sets the default options. - * - * @param options Hash of options - */ -marked.options = - marked.setOptions = function (options) { - markedInstance.setOptions(options); - marked.defaults = markedInstance.defaults; - changeDefaults(marked.defaults); - return marked; - }; -/** - * Gets the original marked default options. - */ -marked.getDefaults = _getDefaults; -marked.defaults = _defaults; -/** - * Use Extension - */ -marked.use = function (...args) { - markedInstance.use(...args); - marked.defaults = markedInstance.defaults; - changeDefaults(marked.defaults); - return marked; -}; -/** - * Run callback for every token - */ -marked.walkTokens = function (tokens, callback) { - return markedInstance.walkTokens(tokens, callback); -}; -/** - * Compiles markdown to HTML without enclosing `p` tag. - * - * @param src String of markdown source to be compiled - * @param options Hash of options - * @return String of compiled HTML - */ -marked.parseInline = markedInstance.parseInline; -/** - * Expose - */ -marked.Parser = _Parser; -marked.parser = _Parser.parse; -marked.Renderer = _Renderer; -marked.TextRenderer = _TextRenderer; -marked.Lexer = _Lexer; -marked.lexer = _Lexer.lex; -marked.Tokenizer = _Tokenizer; -marked.Hooks = _Hooks; -marked.parse = marked; -const options = marked.options; -const setOptions = marked.setOptions; -const use = marked.use; -const walkTokens = marked.walkTokens; -const parseInline = marked.parseInline; -const parse = marked; -const parser = _Parser.parse; -const lexer = _Lexer.lex; - -export { _Hooks as Hooks, _Lexer as Lexer, Marked, _Parser as Parser, _Renderer as Renderer, _TextRenderer as TextRenderer, _Tokenizer as Tokenizer, _defaults as defaults, _getDefaults as getDefaults, lexer, marked, options, parse, parseInline, parser, setOptions, use, walkTokens }; -