mirror of
https://gh.wpcy.net/https://github.com/discourse/discourse.git
synced 2026-05-16 09:01:15 +08:00
3332e9f4c3
`.annotaterb.yml` has carried `classified_sort: true` since the project
switched from `annotate` to `annotaterb` (commit 0eab7daea4, July 2025),
but annotaterb's default behaviour is to compare the existing schema
block against what it would generate and skip the rewrite when the
column list matches — even when the *ordering* of those columns differs.
The result is that models which haven't had a schema change since the
config landed never get reordered, and `classified_sort` drift
accumulates indefinitely.
`--force` makes annotaterb always rewrite, so a single `bin/rake
annotate:clean` run brings every model into the canonical format and
keeps them there. Every schema block is now grouped primary-key →
regular columns → timestamps → foreign keys (alphabetical within each
group). Pure annotation comment change — no code modifications.
Also cleans up the rake task to avoid string interpolation for `system`
calls.
53 lines
1.5 KiB
Ruby
53 lines
1.5 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
class UserArchivedMessage < ActiveRecord::Base
|
|
belongs_to :user
|
|
belongs_to :topic
|
|
|
|
def self.move_to_inbox!(user_id, topic)
|
|
topic_id = topic.id
|
|
|
|
if (
|
|
TopicUser.where(
|
|
user_id: user_id,
|
|
topic_id: topic_id,
|
|
notification_level: TopicUser.notification_levels[:muted],
|
|
).exists?
|
|
)
|
|
return
|
|
end
|
|
|
|
UserArchivedMessage.where(user_id: user_id, topic_id: topic_id).destroy_all
|
|
trigger(:move_to_inbox, user_id, topic_id)
|
|
MessageBus.publish("/topic/#{topic_id}", { type: "move_to_inbox" }, user_ids: [user_id])
|
|
end
|
|
|
|
def self.archive!(user_id, topic)
|
|
topic_id = topic.id
|
|
UserArchivedMessage.where(user_id: user_id, topic_id: topic_id).destroy_all
|
|
UserArchivedMessage.create!(user_id: user_id, topic_id: topic_id)
|
|
trigger(:archive_message, user_id, topic_id)
|
|
MessageBus.publish("/topic/#{topic_id}", { type: "archived" }, user_ids: [user_id])
|
|
end
|
|
|
|
def self.trigger(event, user_id, topic_id)
|
|
user = User.find_by(id: user_id)
|
|
topic = Topic.find_by(id: topic_id)
|
|
DiscourseEvent.trigger(event, user: user, topic: topic) if user && topic
|
|
end
|
|
end
|
|
|
|
# == Schema Information
|
|
#
|
|
# Table name: user_archived_messages
|
|
#
|
|
# id :integer not null, primary key
|
|
# created_at :datetime not null
|
|
# updated_at :datetime not null
|
|
# topic_id :integer not null
|
|
# user_id :integer not null
|
|
#
|
|
# Indexes
|
|
#
|
|
# index_user_archived_messages_on_user_id_and_topic_id (user_id,topic_id) UNIQUE
|
|
#
|
