mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-09-12 05:07:06 +00:00
* Add model for custom filter keywords * Use CustomFilterKeyword internally Does not change the API * Fix /filters/edit and /filters/new * Add migration tests * Remove whole_word column from custom_filters (covered by custom_filter_keywords) * Redesign /filters Instead of a list, present a card that displays more information and handles multiple keywords per filter. * Redesign /filters/new and /filters/edit to add and remove keywords This adds a new gem dependency: cocoon, as well as a npm dependency: cocoon-js-vanilla. Those are used to easily populate and remove form fields from the user interface when manipulating multiple keyword filters at once. * Add /api/v2/filters to edit filter with multiple keywords Entities: - `Filter`: `id`, `title`, `filter_action` (either `hide` or `warn`), `context` `keywords` - `FilterKeyword`: `id`, `keyword`, `whole_word` API endpoits: - `GET /api/v2/filters` to list filters (including keywords) - `POST /api/v2/filters` to create a new filter `keywords_attributes` can also be passed to create keywords in one request - `GET /api/v2/filters/:id` to read a particular filter - `PUT /api/v2/filters/:id` to update a new filter `keywords_attributes` can also be passed to edit, delete or add keywords in one request - `DELETE /api/v2/filters/:id` to delete a particular filter - `GET /api/v2/filters/:id/keywords` to list keywords for a filter - `POST /api/v2/filters/:filter_id/keywords/:id` to add a new keyword to a filter - `GET /api/v2/filter_keywords/:id` to read a particular keyword - `PUT /api/v2/filter_keywords/:id` to edit a particular keyword - `DELETE /api/v2/filter_keywords/:id` to delete a particular keyword * Change from `irreversible` boolean to `action` enum * Remove irrelevent `irreversible_must_be_within_context` check * Fix /filters/new and /filters/edit with update for filter_action * Fix Rubocop/Codeclimate complaining about task names * Refactor FeedManager#phrase_filtered? This moves regexp building and filter caching to the `CustomFilter` class. This does not change the functional behavior yet, but this changes how the cache is built, doing per-custom_filter regexps so that filters can be matched independently, while still offering caching. * Perform server-side filtering and output result in REST API * Fix numerous filters_changed events being sent when editing multiple keywords at once * Add some tests * Use the new API in the WebUI - use client-side logic for filters we have fetched rules for. This is so that filter changes can be retroactively applied without reloading the UI. - use server-side logic for filters we haven't fetched rules for yet (e.g. network error, or initial timeline loading) * Minor optimizations and refactoring * Perform server-side filtering on the streaming server * Change the wording of filter action labels * Fix issues pointed out by linter * Change design of “Show anyway” link in accordence to review comments * Drop “irreversible” filtering behavior * Move /api/v2/filter_keywords to /api/v1/filters/keywords * Rename `filter_results` attribute to `filtered` * Rename REST::LegacyFilterSerializer to REST::V1::FilterSerializer * Fix systemChannelId value in streaming server * Simplify code by removing client-side filtering code The simplifcation comes at a cost though: filters aren't retroactively applied anymore.
185 lines
4.5 KiB
Ruby
185 lines
4.5 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
class REST::StatusSerializer < ActiveModel::Serializer
|
|
include FormattingHelper
|
|
|
|
attributes :id, :created_at, :in_reply_to_id, :in_reply_to_account_id,
|
|
:sensitive, :spoiler_text, :visibility, :language,
|
|
:uri, :url, :replies_count, :reblogs_count,
|
|
:favourites_count, :edited_at
|
|
|
|
attribute :favourited, if: :current_user?
|
|
attribute :reblogged, if: :current_user?
|
|
attribute :muted, if: :current_user?
|
|
attribute :bookmarked, if: :current_user?
|
|
attribute :pinned, if: :pinnable?
|
|
has_many :filtered, serializer: REST::FilterResultSerializer, if: :current_user?
|
|
|
|
attribute :content, unless: :source_requested?
|
|
attribute :text, if: :source_requested?
|
|
|
|
belongs_to :reblog, serializer: REST::StatusSerializer
|
|
belongs_to :application, if: :show_application?
|
|
belongs_to :account, serializer: REST::AccountSerializer
|
|
|
|
has_many :ordered_media_attachments, key: :media_attachments, serializer: REST::MediaAttachmentSerializer
|
|
has_many :ordered_mentions, key: :mentions
|
|
has_many :tags
|
|
has_many :emojis, serializer: REST::CustomEmojiSerializer
|
|
|
|
has_one :preview_card, key: :card, serializer: REST::PreviewCardSerializer
|
|
has_one :preloadable_poll, key: :poll, serializer: REST::PollSerializer
|
|
|
|
def id
|
|
object.id.to_s
|
|
end
|
|
|
|
def in_reply_to_id
|
|
object.in_reply_to_id&.to_s
|
|
end
|
|
|
|
def in_reply_to_account_id
|
|
object.in_reply_to_account_id&.to_s
|
|
end
|
|
|
|
def current_user?
|
|
!current_user.nil?
|
|
end
|
|
|
|
def show_application?
|
|
object.account.user_shows_application? || (current_user? && current_user.account_id == object.account_id)
|
|
end
|
|
|
|
def visibility
|
|
# This visibility is masked behind "private"
|
|
# to avoid API changes because there are no
|
|
# UX differences
|
|
if object.limited_visibility?
|
|
'private'
|
|
else
|
|
object.visibility
|
|
end
|
|
end
|
|
|
|
def sensitive
|
|
if current_user? && current_user.account_id == object.account_id
|
|
object.sensitive
|
|
else
|
|
object.account.sensitized? || object.sensitive
|
|
end
|
|
end
|
|
|
|
def uri
|
|
ActivityPub::TagManager.instance.uri_for(object)
|
|
end
|
|
|
|
def content
|
|
status_content_format(object)
|
|
end
|
|
|
|
def url
|
|
ActivityPub::TagManager.instance.url_for(object)
|
|
end
|
|
|
|
def favourited
|
|
if instance_options && instance_options[:relationships]
|
|
instance_options[:relationships].favourites_map[object.id] || false
|
|
else
|
|
current_user.account.favourited?(object)
|
|
end
|
|
end
|
|
|
|
def reblogged
|
|
if instance_options && instance_options[:relationships]
|
|
instance_options[:relationships].reblogs_map[object.id] || false
|
|
else
|
|
current_user.account.reblogged?(object)
|
|
end
|
|
end
|
|
|
|
def muted
|
|
if instance_options && instance_options[:relationships]
|
|
instance_options[:relationships].mutes_map[object.conversation_id] || false
|
|
else
|
|
current_user.account.muting_conversation?(object.conversation)
|
|
end
|
|
end
|
|
|
|
def bookmarked
|
|
if instance_options && instance_options[:relationships]
|
|
instance_options[:relationships].bookmarks_map[object.id] || false
|
|
else
|
|
current_user.account.bookmarked?(object)
|
|
end
|
|
end
|
|
|
|
def pinned
|
|
if instance_options && instance_options[:relationships]
|
|
instance_options[:relationships].pins_map[object.id] || false
|
|
else
|
|
current_user.account.pinned?(object)
|
|
end
|
|
end
|
|
|
|
def filtered
|
|
if instance_options && instance_options[:relationships]
|
|
instance_options[:relationships].filters_map[object.id] || []
|
|
else
|
|
current_user.account.status_matches_filters(object)
|
|
end
|
|
end
|
|
|
|
def pinnable?
|
|
current_user? &&
|
|
current_user.account_id == object.account_id &&
|
|
!object.reblog? &&
|
|
%w(public unlisted private).include?(object.visibility)
|
|
end
|
|
|
|
def source_requested?
|
|
instance_options[:source_requested]
|
|
end
|
|
|
|
def ordered_mentions
|
|
object.active_mentions.to_a.sort_by(&:id)
|
|
end
|
|
|
|
class ApplicationSerializer < ActiveModel::Serializer
|
|
attributes :name, :website
|
|
|
|
def website
|
|
object.website.presence
|
|
end
|
|
end
|
|
|
|
class MentionSerializer < ActiveModel::Serializer
|
|
attributes :id, :username, :url, :acct
|
|
|
|
def id
|
|
object.account_id.to_s
|
|
end
|
|
|
|
def username
|
|
object.account_username
|
|
end
|
|
|
|
def url
|
|
ActivityPub::TagManager.instance.url_for(object.account)
|
|
end
|
|
|
|
def acct
|
|
object.account.pretty_acct
|
|
end
|
|
end
|
|
|
|
class TagSerializer < ActiveModel::Serializer
|
|
include RoutingHelper
|
|
|
|
attributes :name, :url
|
|
|
|
def url
|
|
tag_url(object)
|
|
end
|
|
end
|
|
end
|