diff options
| author | Fire Demon <firedemon@creature.cafe> | 2020-07-28 09:14:21 -0500 |
|---|---|---|
| committer | Fire Demon <firedemon@creature.cafe> | 2020-08-30 05:45:16 -0500 |
| commit | 8ce1fd6edb8e5dc1335cdac6c46711441220dbf7 (patch) | |
| tree | fb57253f05e1e5318839e0b99faff546a9a01315 /app | |
| parent | 625121ab53ea4a54d381fb2fe8c3c31244ad6ab7 (diff) | |
[Feature] Use unprocessed text for edits
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/status.rb | 1 | ||||
| -rw-r--r-- | app/serializers/rest/status_serializer.rb | 4 | ||||
| -rw-r--r-- | app/services/post_status_service.rb | 1 | ||||
| -rw-r--r-- | app/services/update_status_service.rb | 2 |
4 files changed, 8 insertions, 0 deletions
diff --git a/app/models/status.rb b/app/models/status.rb index c92d00935..edddffcc6 100644 --- a/app/models/status.rb +++ b/app/models/status.rb @@ -30,6 +30,7 @@ # published :boolean default(TRUE), not null # title :text # semiprivate :boolean default(FALSE), not null +# original_text :text # # rubocop:disable Metrics/ClassLength diff --git a/app/serializers/rest/status_serializer.rb b/app/serializers/rest/status_serializer.rb index 4b06ec268..96ae59c62 100644 --- a/app/serializers/rest/status_serializer.rb +++ b/app/serializers/rest/status_serializer.rb @@ -85,6 +85,10 @@ class REST::StatusSerializer < ActiveModel::Serializer Formatter.instance.format(object) end + def text + object.original_text.presence || object.text + end + def url ActivityPub::TagManager.instance.url_for(object) end diff --git a/app/services/post_status_service.rb b/app/services/post_status_service.rb index 33440a5a4..82588d254 100644 --- a/app/services/post_status_service.rb +++ b/app/services/post_status_service.rb @@ -196,6 +196,7 @@ class PostStatusService < BaseService def status_attributes { text: @text, + original_text: @text, media_attachments: @media || [], thread: @in_reply_to, poll_attributes: poll_attributes, diff --git a/app/services/update_status_service.rb b/app/services/update_status_service.rb index 18fee3e17..887384991 100644 --- a/app/services/update_status_service.rb +++ b/app/services/update_status_service.rb @@ -8,6 +8,7 @@ class UpdateStatusService < BaseService spoiler_text title text + original_text content_type language sensitive @@ -33,6 +34,7 @@ class UpdateStatusService < BaseService @tags = (tags.nil? ? @status.tags : (tags || [])).to_set @params[:text] ||= '' + @params[:original_text] = @params[:text] @params[:published] = true if @status.published? (@params[:edited] ||= 1 + @status.edited) if @params[:published].presence || @status.published? |