aboutsummaryrefslogtreecommitdiff
path: root/net-im
diff options
context:
space:
mode:
authorJoseph Mingrone <jrm@FreeBSD.org>2017-06-15 20:18:38 +0000
committerJoseph Mingrone <jrm@FreeBSD.org>2017-06-15 20:18:38 +0000
commitb462126dc549f15468670f3c25a9bf1bc93ea169 (patch)
tree26d3156efc5b54620e1f4aee8cc19ac15da30905 /net-im
parente17de1b501dff5d4a7c01f5d7e322a9294817120 (diff)
downloadports-b462126dc549f15468670f3c25a9bf1bc93ea169.tar.gz
ports-b462126dc549f15468670f3c25a9bf1bc93ea169.zip
Notes
Diffstat (limited to 'net-im')
-rw-r--r--net-im/mastodon/Makefile44
-rw-r--r--net-im/mastodon/distinfo6
-rw-r--r--net-im/mastodon/files/patch-Gemfile16
-rw-r--r--net-im/mastodon/pkg-plist281
4 files changed, 215 insertions, 132 deletions
diff --git a/net-im/mastodon/Makefile b/net-im/mastodon/Makefile
index 6ffedc792d55..53780596d928 100644
--- a/net-im/mastodon/Makefile
+++ b/net-im/mastodon/Makefile
@@ -2,7 +2,7 @@
PORTNAME= mastodon
DISTVERSIONPREFIX= v
-DISTVERSION= 1.4.1
+DISTVERSION= 1.4.3
CATEGORIES= net-im www
MAINTAINER= jrm@FreeBSD.org
@@ -19,23 +19,23 @@ RUN_DEPENDS= ffmpeg>0:multimedia/ffmpeg \
RUN_DEPENDS+= rubygem-pkg-config>=1.2.0:devel/rubygem-pkg-config
RUN_DEPENDS+= rubygem-puma>0:www/rubygem-puma \
- rubygem-rails50>0:www/rubygem-rails50 \
+ rubygem-rails5>0:www/rubygem-rails5 \
rubygem-uglifier>0:www/rubygem-uglifier
-RUN_DEPENDS+= rubygem-hamlit-rails-rails50>0:www/rubygem-hamlit-rails-rails50 \
+RUN_DEPENDS+= rubygem-hamlit-rails-rails5>0:www/rubygem-hamlit-rails-rails5 \
rubygem-pg>0:databases/rubygem-pg \
- rubygem-pghero-rails50>0:databases/rubygem-pghero-rails50 \
- rubygem-dotenv-rails-rails50>0:misc/rubygem-dotenv-rails-rails50 \
+ rubygem-pghero-rails5>0:databases/rubygem-pghero-rails5 \
+ rubygem-dotenv-rails-rails5>0:misc/rubygem-dotenv-rails-rails5
RUN_DEPENDS+= rubygem-aws-sdk>0:devel/rubygem-aws-sdk \
- rubygem-paperclip-rails50>0:devel/rubygem-paperclip-rails50 \
- rubygem-paperclip-av-transcoder-rails50>0:multimedia/rubygem-paperclip-av-transcoder-rails50
+ rubygem-paperclip-rails5>0:devel/rubygem-paperclip-rails5 \
+ rubygem-paperclip-av-transcoder>0:multimedia/rubygem-paperclip-av-transcoder
RUN_DEPENDS+= rubygem-addressable>0:www/rubygem-addressable \
rubygem-cld3>0:textproc/rubygem-cld3 \
- rubygem-devise-rails50>0:devel/rubygem-devise-rails50 \
- rubygem-devise-two-factor-rails50>0:security/rubygem-devise-two-factor-rails50 \
- rubygem-doorkeeper-rails50>0:security/rubygem-doorkeeper-rails50 \
+ rubygem-devise-rails5>0:devel/rubygem-devise-rails5 \
+ rubygem-devise-two-factor-rails5>0:security/rubygem-devise-two-factor-rails5 \
+ rubygem-doorkeeper-rails5>0:security/rubygem-doorkeeper-rails5 \
rubygem-fast_blank>0:devel/rubygem-fast_blank \
rubygem-goldfinger>0:www/rubygem-goldfinger \
rubygem-hiredis>0:databases/rubygem-hiredis \
@@ -44,35 +44,37 @@ RUN_DEPENDS+= rubygem-addressable>0:www/rubygem-addressable \
rubygem-http>0:www/rubygem-http \
rubygem-http_accept_language>0:devel/rubygem-http_accept_language \
rubygem-httplog>0:sysutils/rubygem-httplog \
- rubygem-kaminari-rails50>0:www/rubygem-kaminari-rails50 \
+ rubygem-kaminari-rails5>0:www/rubygem-kaminari-rails5 \
rubygem-link_header>0:www/rubygem-link_header \
rubygem-nokogiri>0:textproc/rubygem-nokogiri \
rubygem-oj>0:devel/rubygem-oj \
rubygem-ostatus2>0:www/rubygem-ostatus2 \
rubygem-ox>0:textproc/rubygem-ox \
- rubygem-rabl-rails50>0:devel/rubygem-rabl-rails50 \
+ rubygem-pundit>0:security/rubygem-pundit \
+ rubygem-rabl>0:devel/rubygem-rabl \
rubygem-rack-attack>0:www/rubygem-rack-attack \
rubygem-rack-cors>0:www/rubygem-rack-cors \
rubygem-rack-timeout>0:www/rubygem-rack-timeout \
- rubygem-rails-i18n-rails50>0:devel/rubygem-rails-i18n-rails50 \
- rubygem-rails-settings-cached-rails50>0:www/rubygem-rails-settings-cached-rails50 \
+ rubygem-rails-i18n>0:devel/rubygem-rails-i18n \
+ rubygem-rails-settings-cached-rails5>0:www/rubygem-rails-settings-cached-rails5 \
rubygem-redis>0:databases/rubygem-redis \
rubygem-rqrcode>0:www/rubygem-rqrcode \
rubygem-ruby-oembed>0:www/rubygem-ruby-oembed \
- textproc/rubygem-sanitize>0:textproc/rubygem-sanitize \
+ rubygem-sanitize>0:textproc/rubygem-sanitize \
rubygem-sidekiq>0:devel/rubygem-sidekiq \
rubygem-sidekiq-scheduler>0:devel/rubygem-sidekiq-scheduler \
rubygem-sidekiq-unique-jobs>0:devel/rubygem-sidekiq-unique-jobs \
- rubygem-simple-navigation-rails50>0:devel/rubygem-simple-navigation-rails50 \
- rubygem-simple_form-rails50>0:devel/rubygem-simple_form-rails50 \
- rubygem-sprockets-rails-rails50>0:devel/rubygem-sprockets-rails-rails50 \
+ rubygem-sidekiq-bulk-rails5>0:devel/rubygem-sidekiq-bulk-rails5 \
+ rubygem-simple-navigation>0:devel/rubygem-simple-navigation \
+ rubygem-simple_form-rails5>0:devel/rubygem-simple_form-rails5 \
+ rubygem-sprockets-rails-rails5>0:devel/rubygem-sprockets-rails-rails5 \
rubygem-statsd-instrument>0:devel/rubygem-statsd-instrument \
rubygem-twitter-text>0:textproc/rubygem-twitter-text \
rubygem-tzinfo-data>0:devel/rubygem-tzinfo-data \
- rubygem-webpacker-rails50>0:devel/rubygem-webpacker-rails50
+ rubygem-webpacker1-rails5>0:devel/rubygem-webpacker1-rails5
-RUN_DEPENDS+= rubygem-lograge-rails50>0:www/rubygem-lograge-rails50 \
- rubygem-redis-rails-rails50>0:www/rubygem-redis-rails-rails50
+RUN_DEPENDS+= rubygem-lograge-rails5>0:www/rubygem-lograge-rails5 \
+ rubygem-redis-rails-rails5>0:www/rubygem-redis-rails-rails5
USES= gnome pgsql shebangfix
USE_GITHUB= yes
diff --git a/net-im/mastodon/distinfo b/net-im/mastodon/distinfo
index 3c6f614a7d66..e276016fc545 100644
--- a/net-im/mastodon/distinfo
+++ b/net-im/mastodon/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1496009326
-SHA256 (tootsuite-mastodon-v1.4.1_GH0.tar.gz) = f4cef6e56c4eb84e5c20189c003093862341f7a2192e84c478589a4444868ea1
-SIZE (tootsuite-mastodon-v1.4.1_GH0.tar.gz) = 10144469
+TIMESTAMP = 1497556435
+SHA256 (tootsuite-mastodon-v1.4.3_GH0.tar.gz) = e8dbca4b985d8b401c7e0f16be4e157520980c01cd2cb11179e7487d80b5fee5
+SIZE (tootsuite-mastodon-v1.4.3_GH0.tar.gz) = 10179914
diff --git a/net-im/mastodon/files/patch-Gemfile b/net-im/mastodon/files/patch-Gemfile
index 321ab87a1df9..3497366a7732 100644
--- a/net-im/mastodon/files/patch-Gemfile
+++ b/net-im/mastodon/files/patch-Gemfile
@@ -1,17 +1,19 @@
---- Gemfile.orig 2017-05-28 21:16:17 UTC
+--- Gemfile.orig 2017-06-15 14:16:31 UTC
+++ Gemfile
@@ -19,7 +19,6 @@ gem 'paperclip', '~> 5.1'
gem 'paperclip-av-transcoder', '~> 0.6'
gem 'addressable', '~> 2.5'
--gem 'bootsnap', '~> 0.3'
+-gem 'bootsnap'
gem 'cld3', '~> 3.1'
gem 'devise', '~> 4.2'
gem 'devise-two-factor', '~> 3.0'
-@@ -59,44 +58,6 @@ gem 'twitter-text', '~> 1.14'
+@@ -59,46 +58,7 @@ gem 'sprockets-rails', '~> 3.2', require
+ gem 'statsd-instrument', '~> 2.1'
+ gem 'twitter-text', '~> 1.14'
gem 'tzinfo-data', '~> 1.2017'
gem 'webpacker', '~> 1.2'
-
+-
-group :development, :test do
- gem 'fabrication', '~> 2.16'
- gem 'fuubar', '~> 2.2'
@@ -22,6 +24,7 @@
-
-group :test do
- gem 'capybara', '~> 2.14'
+- gem 'climate_control', '~> 0.2'
- gem 'faker', '~> 1.7'
- gem 'microformats2', '~> 3.0'
- gem 'rails-controller-testing', '~> 1.0'
@@ -39,7 +42,7 @@
- gem 'bullet', '~> 5.5'
- gem 'letter_opener', '~> 1.4'
- gem 'letter_opener_web', '~> 1.3'
-- gem 'rubocop', '~> 0.48', require: false
+- gem 'rubocop', require: false
- gem 'brakeman', '~> 3.6', require: false
- gem 'bundler-audit', '~> 0.5', require: false
- gem 'scss_lint', '~> 0.53', require: false
@@ -49,7 +52,6 @@
- gem 'capistrano-rbenv', '~> 2.1'
- gem 'capistrano-yarn', '~> 2.0'
-end
--
+
group :production do
gem 'lograge', '~> 0.5'
- gem 'redis-rails', '~> 5.0'
diff --git a/net-im/mastodon/pkg-plist b/net-im/mastodon/pkg-plist
index dd626959e186..224157707417 100644
--- a/net-im/mastodon/pkg-plist
+++ b/net-im/mastodon/pkg-plist
@@ -101,7 +101,6 @@ etc/periodic/daily/900.mastodon
@dir %%WWWDIR%%/app/views/admin/accounts
@dir %%WWWDIR%%/app/views/admin/domain_blocks
@dir %%WWWDIR%%/app/views/admin/instances
-@dir %%WWWDIR%%/app/views/admin/pubsubhubbub
@dir %%WWWDIR%%/app/views/admin/reports
@dir %%WWWDIR%%/app/views/admin/settings
@dir %%WWWDIR%%/app/views/api
@@ -125,7 +124,6 @@ etc/periodic/daily/900.mastodon
@dir %%WWWDIR%%/app/views/api/v1/search
@dir %%WWWDIR%%/app/views/api/v1/statuses
@dir %%WWWDIR%%/app/views/api/v1/timelines
-@dir %%WWWDIR%%/app/views/api/v1/timelines/base
@dir %%WWWDIR%%/app/views/application
@dir %%WWWDIR%%/app/views/auth
@dir %%WWWDIR%%/app/views/auth/confirmations
@@ -301,21 +299,28 @@ etc/periodic/daily/900.mastodon
%%WWWDIR%%/app/controllers/admin/confirmations_controller.rb
%%WWWDIR%%/app/controllers/admin/domain_blocks_controller.rb
%%WWWDIR%%/app/controllers/admin/instances_controller.rb
-%%WWWDIR%%/app/controllers/admin/pubsubhubbub_controller.rb
%%WWWDIR%%/app/controllers/admin/reported_statuses_controller.rb
%%WWWDIR%%/app/controllers/admin/reports_controller.rb
%%WWWDIR%%/app/controllers/admin/resets_controller.rb
%%WWWDIR%%/app/controllers/admin/settings_controller.rb
%%WWWDIR%%/app/controllers/admin/silences_controller.rb
+%%WWWDIR%%/app/controllers/admin/subscriptions_controller.rb
%%WWWDIR%%/app/controllers/admin/suspensions_controller.rb
%%WWWDIR%%/app/controllers/admin/two_factor_authentications_controller.rb
%%WWWDIR%%/app/controllers/api/activitypub/activities_controller.rb
%%WWWDIR%%/app/controllers/api/activitypub/notes_controller.rb
%%WWWDIR%%/app/controllers/api/activitypub/outbox_controller.rb
+%%WWWDIR%%/app/controllers/api/base_controller.rb
%%WWWDIR%%/app/controllers/api/oembed_controller.rb
%%WWWDIR%%/app/controllers/api/push_controller.rb
%%WWWDIR%%/app/controllers/api/salmon_controller.rb
%%WWWDIR%%/app/controllers/api/subscriptions_controller.rb
+%%WWWDIR%%/app/controllers/api/v1/accounts/credentials_controller.rb
+%%WWWDIR%%/app/controllers/api/v1/accounts/follower_accounts_controller.rb
+%%WWWDIR%%/app/controllers/api/v1/accounts/following_accounts_controller.rb
+%%WWWDIR%%/app/controllers/api/v1/accounts/relationships_controller.rb
+%%WWWDIR%%/app/controllers/api/v1/accounts/search_controller.rb
+%%WWWDIR%%/app/controllers/api/v1/accounts/statuses_controller.rb
%%WWWDIR%%/app/controllers/api/v1/accounts_controller.rb
%%WWWDIR%%/app/controllers/api/v1/apps_controller.rb
%%WWWDIR%%/app/controllers/api/v1/blocks_controller.rb
@@ -329,13 +334,17 @@ etc/periodic/daily/900.mastodon
%%WWWDIR%%/app/controllers/api/v1/notifications_controller.rb
%%WWWDIR%%/app/controllers/api/v1/reports_controller.rb
%%WWWDIR%%/app/controllers/api/v1/search_controller.rb
+%%WWWDIR%%/app/controllers/api/v1/statuses/favourited_by_accounts_controller.rb
+%%WWWDIR%%/app/controllers/api/v1/statuses/favourites_controller.rb
+%%WWWDIR%%/app/controllers/api/v1/statuses/mutes_controller.rb
+%%WWWDIR%%/app/controllers/api/v1/statuses/reblogged_by_accounts_controller.rb
+%%WWWDIR%%/app/controllers/api/v1/statuses/reblogs_controller.rb
%%WWWDIR%%/app/controllers/api/v1/statuses_controller.rb
-%%WWWDIR%%/app/controllers/api/v1/timelines/base_controller.rb
+%%WWWDIR%%/app/controllers/api/v1/streaming_controller.rb
%%WWWDIR%%/app/controllers/api/v1/timelines/home_controller.rb
%%WWWDIR%%/app/controllers/api/v1/timelines/public_controller.rb
%%WWWDIR%%/app/controllers/api/v1/timelines/tag_controller.rb
%%WWWDIR%%/app/controllers/api/web/settings_controller.rb
-%%WWWDIR%%/app/controllers/api_controller.rb
%%WWWDIR%%/app/controllers/application_controller.rb
%%WWWDIR%%/app/controllers/auth/confirmations_controller.rb
%%WWWDIR%%/app/controllers/auth/passwords_controller.rb
@@ -343,17 +352,20 @@ etc/periodic/daily/900.mastodon
%%WWWDIR%%/app/controllers/auth/sessions_controller.rb
%%WWWDIR%%/app/controllers/authorize_follows_controller.rb
%%WWWDIR%%/app/controllers/concerns/account_controller_concern.rb
+%%WWWDIR%%/app/controllers/concerns/authorization.rb
+%%WWWDIR%%/app/controllers/concerns/export_controller_concern.rb
%%WWWDIR%%/app/controllers/concerns/localized.rb
%%WWWDIR%%/app/controllers/concerns/obfuscate_filename.rb
+%%WWWDIR%%/app/controllers/concerns/rate_limit_headers.rb
%%WWWDIR%%/app/controllers/concerns/user_tracking_concern.rb
%%WWWDIR%%/app/controllers/follower_accounts_controller.rb
%%WWWDIR%%/app/controllers/following_accounts_controller.rb
%%WWWDIR%%/app/controllers/home_controller.rb
+%%WWWDIR%%/app/controllers/manifests_controller.rb
%%WWWDIR%%/app/controllers/media_controller.rb
%%WWWDIR%%/app/controllers/oauth/authorizations_controller.rb
%%WWWDIR%%/app/controllers/oauth/authorized_applications_controller.rb
%%WWWDIR%%/app/controllers/remote_follow_controller.rb
-%%WWWDIR%%/app/controllers/settings/exports/base_controller.rb
%%WWWDIR%%/app/controllers/settings/exports/blocked_accounts_controller.rb
%%WWWDIR%%/app/controllers/settings/exports/following_accounts_controller.rb
%%WWWDIR%%/app/controllers/settings/exports/muted_accounts_controller.rb
@@ -380,7 +392,6 @@ etc/periodic/daily/900.mastodon
%%WWWDIR%%/app/helpers/routing_helper.rb
%%WWWDIR%%/app/helpers/settings_helper.rb
%%WWWDIR%%/app/helpers/stream_entries_helper.rb
-%%WWWDIR%%/app/helpers/style_helper.rb
%%WWWDIR%%/app/javascript/fonts/montserrat/Montserrat-Regular.ttf
%%WWWDIR%%/app/javascript/fonts/montserrat/Montserrat-Regular.woff
%%WWWDIR%%/app/javascript/fonts/montserrat/Montserrat-Regular.woff2
@@ -421,6 +432,7 @@ etc/periodic/daily/900.mastodon
%%WWWDIR%%/app/javascript/mastodon/actions/alerts.js
%%WWWDIR%%/app/javascript/mastodon/actions/blocks.js
%%WWWDIR%%/app/javascript/mastodon/actions/cards.js
+%%WWWDIR%%/app/javascript/mastodon/actions/columns.js
%%WWWDIR%%/app/javascript/mastodon/actions/compose.js
%%WWWDIR%%/app/javascript/mastodon/actions/domain_blocks.js
%%WWWDIR%%/app/javascript/mastodon/actions/favourites.js
@@ -444,9 +456,11 @@ etc/periodic/daily/900.mastodon
%%WWWDIR%%/app/javascript/mastodon/components/avatar_overlay.js
%%WWWDIR%%/app/javascript/mastodon/components/button.js
%%WWWDIR%%/app/javascript/mastodon/components/collapsable.js
+%%WWWDIR%%/app/javascript/mastodon/components/column.js
%%WWWDIR%%/app/javascript/mastodon/components/column_back_button.js
%%WWWDIR%%/app/javascript/mastodon/components/column_back_button_slim.js
%%WWWDIR%%/app/javascript/mastodon/components/column_collapsable.js
+%%WWWDIR%%/app/javascript/mastodon/components/column_header.js
%%WWWDIR%%/app/javascript/mastodon/components/display_name.js
%%WWWDIR%%/app/javascript/mastodon/components/dropdown_menu.js
%%WWWDIR%%/app/javascript/mastodon/components/extended_video_player.js
@@ -457,6 +471,7 @@ etc/periodic/daily/900.mastodon
%%WWWDIR%%/app/javascript/mastodon/components/missing_indicator.js
%%WWWDIR%%/app/javascript/mastodon/components/permalink.js
%%WWWDIR%%/app/javascript/mastodon/components/relative_timestamp.js
+%%WWWDIR%%/app/javascript/mastodon/components/setting_text.js
%%WWWDIR%%/app/javascript/mastodon/components/status.js
%%WWWDIR%%/app/javascript/mastodon/components/status_action_bar.js
%%WWWDIR%%/app/javascript/mastodon/components/status_content.js
@@ -475,6 +490,8 @@ etc/periodic/daily/900.mastodon
%%WWWDIR%%/app/javascript/mastodon/features/account_timeline/containers/header_container.js
%%WWWDIR%%/app/javascript/mastodon/features/account_timeline/index.js
%%WWWDIR%%/app/javascript/mastodon/features/blocks/index.js
+%%WWWDIR%%/app/javascript/mastodon/features/community_timeline/components/column_settings.js
+%%WWWDIR%%/app/javascript/mastodon/features/community_timeline/containers/column_settings_container.js
%%WWWDIR%%/app/javascript/mastodon/features/community_timeline/index.js
%%WWWDIR%%/app/javascript/mastodon/features/compose/components/autosuggest_account.js
%%WWWDIR%%/app/javascript/mastodon/features/compose/components/character_counter.js
@@ -516,7 +533,6 @@ etc/periodic/daily/900.mastodon
%%WWWDIR%%/app/javascript/mastodon/features/getting_started/index.js
%%WWWDIR%%/app/javascript/mastodon/features/hashtag_timeline/index.js
%%WWWDIR%%/app/javascript/mastodon/features/home_timeline/components/column_settings.js
-%%WWWDIR%%/app/javascript/mastodon/features/home_timeline/components/setting_text.js
%%WWWDIR%%/app/javascript/mastodon/features/home_timeline/containers/column_settings_container.js
%%WWWDIR%%/app/javascript/mastodon/features/home_timeline/index.js
%%WWWDIR%%/app/javascript/mastodon/features/mutes/index.js
@@ -527,6 +543,7 @@ etc/periodic/daily/900.mastodon
%%WWWDIR%%/app/javascript/mastodon/features/notifications/containers/column_settings_container.js
%%WWWDIR%%/app/javascript/mastodon/features/notifications/containers/notification_container.js
%%WWWDIR%%/app/javascript/mastodon/features/notifications/index.js
+%%WWWDIR%%/app/javascript/mastodon/features/public_timeline/containers/column_settings_container.js
%%WWWDIR%%/app/javascript/mastodon/features/public_timeline/index.js
%%WWWDIR%%/app/javascript/mastodon/features/reblogs/index.js
%%WWWDIR%%/app/javascript/mastodon/features/report/components/status_check_box.js
@@ -544,19 +561,24 @@ etc/periodic/daily/900.mastodon
%%WWWDIR%%/app/javascript/mastodon/features/ui/components/column_subheading.js
%%WWWDIR%%/app/javascript/mastodon/features/ui/components/columns_area.js
%%WWWDIR%%/app/javascript/mastodon/features/ui/components/confirmation_modal.js
+%%WWWDIR%%/app/javascript/mastodon/features/ui/components/image_loader.js
%%WWWDIR%%/app/javascript/mastodon/features/ui/components/media_modal.js
%%WWWDIR%%/app/javascript/mastodon/features/ui/components/modal_root.js
%%WWWDIR%%/app/javascript/mastodon/features/ui/components/onboarding_modal.js
%%WWWDIR%%/app/javascript/mastodon/features/ui/components/tabs_bar.js
%%WWWDIR%%/app/javascript/mastodon/features/ui/components/upload_area.js
%%WWWDIR%%/app/javascript/mastodon/features/ui/components/video_modal.js
+%%WWWDIR%%/app/javascript/mastodon/features/ui/containers/columns_area_container.js
%%WWWDIR%%/app/javascript/mastodon/features/ui/containers/loading_bar_container.js
%%WWWDIR%%/app/javascript/mastodon/features/ui/containers/modal_container.js
%%WWWDIR%%/app/javascript/mastodon/features/ui/containers/notifications_container.js
%%WWWDIR%%/app/javascript/mastodon/features/ui/containers/status_list_container.js
%%WWWDIR%%/app/javascript/mastodon/features/ui/index.js
+%%WWWDIR%%/app/javascript/mastodon/features/ui/util/intersection_observer_wrapper.js
+%%WWWDIR%%/app/javascript/mastodon/features/ui/util/schedule_idle_task.js
%%WWWDIR%%/app/javascript/mastodon/is_mobile.js
%%WWWDIR%%/app/javascript/mastodon/link_header.js
+%%WWWDIR%%/app/javascript/mastodon/load_polyfills.js
%%WWWDIR%%/app/javascript/mastodon/locales/ar.json
%%WWWDIR%%/app/javascript/mastodon/locales/bg.json
%%WWWDIR%%/app/javascript/mastodon/locales/ca.json
@@ -585,6 +607,7 @@ etc/periodic/daily/900.mastodon
%%WWWDIR%%/app/javascript/mastodon/locales/pt-BR.json
%%WWWDIR%%/app/javascript/mastodon/locales/pt.json
%%WWWDIR%%/app/javascript/mastodon/locales/ru.json
+%%WWWDIR%%/app/javascript/mastodon/locales/th.json
%%WWWDIR%%/app/javascript/mastodon/locales/tr.json
%%WWWDIR%%/app/javascript/mastodon/locales/uk.json
%%WWWDIR%%/app/javascript/mastodon/locales/whitelist_ar.json
@@ -611,12 +634,15 @@ etc/periodic/daily/900.mastodon
%%WWWDIR%%/app/javascript/mastodon/locales/whitelist_pt-BR.json
%%WWWDIR%%/app/javascript/mastodon/locales/whitelist_pt.json
%%WWWDIR%%/app/javascript/mastodon/locales/whitelist_ru.json
+%%WWWDIR%%/app/javascript/mastodon/locales/whitelist_th.json
%%WWWDIR%%/app/javascript/mastodon/locales/whitelist_tr.json
%%WWWDIR%%/app/javascript/mastodon/locales/whitelist_uk.json
%%WWWDIR%%/app/javascript/mastodon/locales/whitelist_zh-CN.json
%%WWWDIR%%/app/javascript/mastodon/locales/whitelist_zh-HK.json
+%%WWWDIR%%/app/javascript/mastodon/locales/whitelist_zh-TW.json
%%WWWDIR%%/app/javascript/mastodon/locales/zh-CN.json
%%WWWDIR%%/app/javascript/mastodon/locales/zh-HK.json
+%%WWWDIR%%/app/javascript/mastodon/locales/zh-TW.json
%%WWWDIR%%/app/javascript/mastodon/main.js
%%WWWDIR%%/app/javascript/mastodon/middleware/errors.js
%%WWWDIR%%/app/javascript/mastodon/middleware/loading_bar.js
@@ -627,6 +653,7 @@ etc/periodic/daily/900.mastodon
%%WWWDIR%%/app/javascript/mastodon/reducers/alerts.js
%%WWWDIR%%/app/javascript/mastodon/reducers/cards.js
%%WWWDIR%%/app/javascript/mastodon/reducers/compose.js
+%%WWWDIR%%/app/javascript/mastodon/reducers/contexts.js
%%WWWDIR%%/app/javascript/mastodon/reducers/index.js
%%WWWDIR%%/app/javascript/mastodon/reducers/media_attachments.js
%%WWWDIR%%/app/javascript/mastodon/reducers/meta.js
@@ -641,6 +668,7 @@ etc/periodic/daily/900.mastodon
%%WWWDIR%%/app/javascript/mastodon/reducers/timelines.js
%%WWWDIR%%/app/javascript/mastodon/reducers/user_lists.js
%%WWWDIR%%/app/javascript/mastodon/rtl.js
+%%WWWDIR%%/app/javascript/mastodon/scroll.js
%%WWWDIR%%/app/javascript/mastodon/selectors/index.js
%%WWWDIR%%/app/javascript/mastodon/store/configureStore.js
%%WWWDIR%%/app/javascript/mastodon/stream.js
@@ -684,6 +712,8 @@ etc/periodic/daily/900.mastodon
%%WWWDIR%%/app/lib/sanitize_config.rb
%%WWWDIR%%/app/lib/settings/extend.rb
%%WWWDIR%%/app/lib/settings/scoped_settings.rb
+%%WWWDIR%%/app/lib/status_filter.rb
+%%WWWDIR%%/app/lib/stream_entry_finder.rb
%%WWWDIR%%/app/lib/tag_manager.rb
%%WWWDIR%%/app/lib/user_settings_decorator.rb
%%WWWDIR%%/app/lib/webfinger_resource.rb
@@ -696,14 +726,15 @@ etc/periodic/daily/900.mastodon
%%WWWDIR%%/app/models/application_record.rb
%%WWWDIR%%/app/models/block.rb
%%WWWDIR%%/app/models/concerns/account_avatar.rb
+%%WWWDIR%%/app/models/concerns/account_finder_concern.rb
%%WWWDIR%%/app/models/concerns/account_header.rb
%%WWWDIR%%/app/models/concerns/account_interactions.rb
%%WWWDIR%%/app/models/concerns/attachmentable.rb
%%WWWDIR%%/app/models/concerns/cacheable.rb
%%WWWDIR%%/app/models/concerns/paginable.rb
%%WWWDIR%%/app/models/concerns/remotable.rb
+%%WWWDIR%%/app/models/concerns/status_threading_concern.rb
%%WWWDIR%%/app/models/concerns/streamable.rb
-%%WWWDIR%%/app/models/concerns/targetable.rb
%%WWWDIR%%/app/models/conversation.rb
%%WWWDIR%%/app/models/conversation_mute.rb
%%WWWDIR%%/app/models/domain_block.rb
@@ -714,12 +745,14 @@ etc/periodic/daily/900.mastodon
%%WWWDIR%%/app/models/follow_request.rb
%%WWWDIR%%/app/models/form/two_factor_confirmation.rb
%%WWWDIR%%/app/models/import.rb
+%%WWWDIR%%/app/models/instance.rb
%%WWWDIR%%/app/models/media_attachment.rb
%%WWWDIR%%/app/models/mention.rb
%%WWWDIR%%/app/models/mute.rb
%%WWWDIR%%/app/models/notification.rb
%%WWWDIR%%/app/models/preview_card.rb
%%WWWDIR%%/app/models/remote_follow.rb
+%%WWWDIR%%/app/models/remote_profile.rb
%%WWWDIR%%/app/models/report.rb
%%WWWDIR%%/app/models/report_filter.rb
%%WWWDIR%%/app/models/setting.rb
@@ -730,6 +763,7 @@ etc/periodic/daily/900.mastodon
%%WWWDIR%%/app/models/user.rb
%%WWWDIR%%/app/models/web.rb
%%WWWDIR%%/app/models/web/setting.rb
+%%WWWDIR%%/app/policies/status_policy.rb
%%WWWDIR%%/app/presenters/instance_presenter.rb
%%WWWDIR%%/app/services/account_search_service.rb
%%WWWDIR%%/app/services/after_block_service.rb
@@ -774,9 +808,9 @@ etc/periodic/daily/900.mastodon
%%WWWDIR%%/app/services/unsubscribe_service.rb
%%WWWDIR%%/app/services/update_remote_profile_service.rb
%%WWWDIR%%/app/services/verify_salmon_service.rb
-%%WWWDIR%%/app/services/warm_cache_service.rb
-%%WWWDIR%%/app/validators/email_validator.rb
+%%WWWDIR%%/app/validators/blacklisted_email_validator.rb
%%WWWDIR%%/app/validators/status_length_validator.rb
+%%WWWDIR%%/app/validators/unreserved_username_validator.rb
%%WWWDIR%%/app/validators/url_validator.rb
%%WWWDIR%%/app/views/about/_contact.html.haml
%%WWWDIR%%/app/views/about/_links.html.haml
@@ -813,12 +847,12 @@ etc/periodic/daily/900.mastodon
%%WWWDIR%%/app/views/admin/domain_blocks/show.html.haml
%%WWWDIR%%/app/views/admin/instances/_instance.html.haml
%%WWWDIR%%/app/views/admin/instances/index.html.haml
-%%WWWDIR%%/app/views/admin/pubsubhubbub/_subscription.html.haml
-%%WWWDIR%%/app/views/admin/pubsubhubbub/index.html.haml
%%WWWDIR%%/app/views/admin/reports/_report.html.haml
%%WWWDIR%%/app/views/admin/reports/index.html.haml
%%WWWDIR%%/app/views/admin/reports/show.html.haml
%%WWWDIR%%/app/views/admin/settings/edit.html.haml
+%%WWWDIR%%/app/views/admin/subscriptions/_subscription.html.haml
+%%WWWDIR%%/app/views/admin/subscriptions/index.html.haml
%%WWWDIR%%/app/views/api/activitypub/activities/_show_status.activitystreams2.rabl
%%WWWDIR%%/app/views/api/activitypub/activities/show_status_announce.activitystreams2.rabl
%%WWWDIR%%/app/views/api/activitypub/activities/show_status_create.activitystreams2.rabl
@@ -828,9 +862,9 @@ etc/periodic/daily/900.mastodon
%%WWWDIR%%/app/views/api/oembed/show.json.rabl
%%WWWDIR%%/app/views/api/v1/accounts/index.rabl
%%WWWDIR%%/app/views/api/v1/accounts/relationship.rabl
-%%WWWDIR%%/app/views/api/v1/accounts/relationships.rabl
+%%WWWDIR%%/app/views/api/v1/accounts/relationships/index.rabl
%%WWWDIR%%/app/views/api/v1/accounts/show.rabl
-%%WWWDIR%%/app/views/api/v1/accounts/statuses.rabl
+%%WWWDIR%%/app/views/api/v1/accounts/statuses/index.rabl
%%WWWDIR%%/app/views/api/v1/apps/create.rabl
%%WWWDIR%%/app/views/api/v1/apps/show.rabl
%%WWWDIR%%/app/views/api/v1/blocks/index.rabl
@@ -854,7 +888,7 @@ etc/periodic/daily/900.mastodon
%%WWWDIR%%/app/views/api/v1/statuses/context.rabl
%%WWWDIR%%/app/views/api/v1/statuses/index.rabl
%%WWWDIR%%/app/views/api/v1/statuses/show.rabl
-%%WWWDIR%%/app/views/api/v1/timelines/base/show.rabl
+%%WWWDIR%%/app/views/api/v1/timelines/show.rabl
%%WWWDIR%%/app/views/application/_flashes.html.haml
%%WWWDIR%%/app/views/auth/confirmations/new.html.haml
%%WWWDIR%%/app/views/auth/passwords/edit.html.haml
@@ -885,6 +919,7 @@ etc/periodic/daily/900.mastodon
%%WWWDIR%%/app/views/layouts/error.html.haml
%%WWWDIR%%/app/views/layouts/mailer.text.erb
%%WWWDIR%%/app/views/layouts/public.html.haml
+%%WWWDIR%%/app/views/manifests/show.json.rabl
%%WWWDIR%%/app/views/notification_mailer/_status.text.erb
%%WWWDIR%%/app/views/notification_mailer/digest.text.erb
%%WWWDIR%%/app/views/notification_mailer/favourite.text.erb
@@ -1083,7 +1118,6 @@ etc/periodic/daily/900.mastodon
%%WWWDIR%%/config/initializers/instrumentation.rb
%%WWWDIR%%/config/initializers/kaminari_config.rb
%%WWWDIR%%/config/initializers/mime_types.rb
-%%WWWDIR%%/config/initializers/new_framework_defaults.rb
%%WWWDIR%%/config/initializers/oembed.rb
%%WWWDIR%%/config/initializers/open_uri_redirection.rb
%%WWWDIR%%/config/initializers/ostatus.rb
@@ -1245,8 +1279,6 @@ etc/periodic/daily/900.mastodon
%%WWWDIR%%/config/webpack/generateLocalePacks.js
%%WWWDIR%%/config/webpack/loaders/assets.js
%%WWWDIR%%/config/webpack/loaders/babel.js
-%%WWWDIR%%/config/webpack/loaders/coffee.js
-%%WWWDIR%%/config/webpack/loaders/erb.js
%%WWWDIR%%/config/webpack/loaders/mark.js
%%WWWDIR%%/config/webpack/loaders/sass.js
%%WWWDIR%%/config/webpack/paths.yml
@@ -1254,17 +1286,17 @@ etc/periodic/daily/900.mastodon
%%WWWDIR%%/config/webpack/shared.js
%%WWWDIR%%/config/webpack/test.js
%%WWWDIR%%/config/webpack/translationRunner.js
-%%WWWDIR%%/db/migrate/20160223162837_add_metadata_to_statuses.rb
-%%WWWDIR%%/db/migrate/20160223164502_make_uris_nullable_in_statuses.rb
-%%WWWDIR%%/db/migrate/20160223165723_add_url_to_statuses.rb
-%%WWWDIR%%/db/migrate/20160223165855_add_url_to_accounts.rb
-%%WWWDIR%%/db/migrate/20160223171800_create_favourites.rb
%%WWWDIR%%/db/migrate/20160220174730_create_accounts.rb
%%WWWDIR%%/db/migrate/20160220211917_create_statuses.rb
%%WWWDIR%%/db/migrate/20160221003140_create_users.rb
%%WWWDIR%%/db/migrate/20160221003621_create_follows.rb
%%WWWDIR%%/db/migrate/20160222122600_create_stream_entries.rb
%%WWWDIR%%/db/migrate/20160222143943_add_profile_fields_to_accounts.rb
+%%WWWDIR%%/db/migrate/20160223162837_add_metadata_to_statuses.rb
+%%WWWDIR%%/db/migrate/20160223164502_make_uris_nullable_in_statuses.rb
+%%WWWDIR%%/db/migrate/20160223165723_add_url_to_statuses.rb
+%%WWWDIR%%/db/migrate/20160223165855_add_url_to_accounts.rb
+%%WWWDIR%%/db/migrate/20160223171800_create_favourites.rb
%%WWWDIR%%/db/migrate/20160224223247_create_mentions.rb
%%WWWDIR%%/db/migrate/20160227230233_add_attachment_avatar_to_accounts.rb
%%WWWDIR%%/db/migrate/20160305115639_add_devise_to_users.rb
@@ -1284,12 +1316,12 @@ etc/periodic/daily/900.mastodon
%%WWWDIR%%/db/migrate/20161006213403_rails_settings_migration.rb
%%WWWDIR%%/db/migrate/20161009120834_create_domain_blocks.rb
%%WWWDIR%%/db/migrate/20161027172456_add_silenced_to_accounts.rb
-%%WWWDIR%%/db/migrate/20161123093447_add_sensitive_to_statuses.rb
%%WWWDIR%%/db/migrate/20161104173623_create_tags.rb
%%WWWDIR%%/db/migrate/20161105130633_create_statuses_tags_join_table.rb
%%WWWDIR%%/db/migrate/20161116162355_add_locale_to_users.rb
%%WWWDIR%%/db/migrate/20161119211120_create_notifications.rb
%%WWWDIR%%/db/migrate/20161122163057_remove_unneeded_indexes.rb
+%%WWWDIR%%/db/migrate/20161123093447_add_sensitive_to_statuses.rb
%%WWWDIR%%/db/migrate/20161128103007_create_subscriptions.rb
%%WWWDIR%%/db/migrate/20161130142058_add_last_successful_delivery_at_to_subscriptions.rb
%%WWWDIR%%/db/migrate/20161130185319_add_visibility_to_statuses.rb
@@ -1299,14 +1331,14 @@ etc/periodic/daily/900.mastodon
%%WWWDIR%%/db/migrate/20161221152630_add_hidden_to_stream_entries.rb
%%WWWDIR%%/db/migrate/20161222201034_add_locked_to_accounts.rb
%%WWWDIR%%/db/migrate/20161222204147_create_follow_requests.rb
-%%WWWDIR%%/db/migrate/20170123162658_add_severity_to_domain_blocks.rb
-%%WWWDIR%%/db/migrate/20170123203248_add_reject_media_to_domain_blocks.rb
%%WWWDIR%%/db/migrate/20170105224407_add_shortcode_to_media_attachments.rb
%%WWWDIR%%/db/migrate/20170109120109_create_web_settings.rb
%%WWWDIR%%/db/migrate/20170112154826_migrate_settings.rb
%%WWWDIR%%/db/migrate/20170114194937_add_application_to_statuses.rb
%%WWWDIR%%/db/migrate/20170114203041_add_website_to_oauth_application.rb
%%WWWDIR%%/db/migrate/20170119214911_create_preview_cards.rb
+%%WWWDIR%%/db/migrate/20170123162658_add_severity_to_domain_blocks.rb
+%%WWWDIR%%/db/migrate/20170123203248_add_reject_media_to_domain_blocks.rb
%%WWWDIR%%/db/migrate/20170125145934_add_spoiler_text_to_statuses.rb
%%WWWDIR%%/db/migrate/20170127165745_add_devise_two_factor_to_users.rb
%%WWWDIR%%/db/migrate/20170129000348_create_devices.rb
@@ -1325,7 +1357,6 @@ etc/periodic/daily/900.mastodon
%%WWWDIR%%/db/migrate/20170330021336_add_counter_caches.rb
%%WWWDIR%%/db/migrate/20170330163835_create_imports.rb
%%WWWDIR%%/db/migrate/20170330164118_add_attachment_data_to_imports.rb
-%%WWWDIR%%/db/migrate/20170423005413_add_allowed_languages_to_user.rb
%%WWWDIR%%/db/migrate/20170403172249_add_action_taken_by_account_id_to_reports.rb
%%WWWDIR%%/db/migrate/20170405112956_add_index_on_mentions_status_id.rb
%%WWWDIR%%/db/migrate/20170406215816_add_notifications_and_favourites_indices.rb
@@ -1333,6 +1364,7 @@ etc/periodic/daily/900.mastodon
%%WWWDIR%%/db/migrate/20170414080609_add_devise_two_factor_backupable_to_users.rb
%%WWWDIR%%/db/migrate/20170414132105_add_language_to_statuses.rb
%%WWWDIR%%/db/migrate/20170418160728_add_indexes_to_reports_for_accounts.rb
+%%WWWDIR%%/db/migrate/20170423005413_add_allowed_languages_to_user.rb
%%WWWDIR%%/db/migrate/20170424003227_create_account_domain_blocks.rb
%%WWWDIR%%/db/migrate/20170424112722_add_status_id_index_to_statuses_tags.rb
%%WWWDIR%%/db/migrate/20170425131920_add_media_attachment_meta.rb
@@ -1343,6 +1375,10 @@ etc/periodic/daily/900.mastodon
%%WWWDIR%%/db/migrate/20170508230434_create_conversation_mutes.rb
%%WWWDIR%%/db/migrate/20170516072309_add_index_accounts_on_uri.rb
%%WWWDIR%%/db/migrate/20170520145338_change_language_filter_to_opt_out.rb
+%%WWWDIR%%/db/migrate/20170601210557_add_index_on_media_attachments_account_id.rb
+%%WWWDIR%%/db/migrate/20170604144747_add_foreign_keys_for_accounts.rb
+%%WWWDIR%%/db/migrate/20170606113804_change_tag_search_index_to_btree.rb
+%%WWWDIR%%/db/migrate/20170609145826_remove_default_language_from_statuses.rb
%%WWWDIR%%/db/schema.rb
%%WWWDIR%%/db/seeds.rb
%%WWWDIR%%/docker-compose.yml
@@ -1389,42 +1425,6 @@ etc/periodic/daily/900.mastodon
%%WWWDIR%%/public/apple-touch-icon.png
%%WWWDIR%%/public/avatars/original/missing.png
%%WWWDIR%%/public/browserconfig.xml
-%%WWWDIR%%/public/emoji/231a.png
-%%WWWDIR%%/public/emoji/231a.svg
-%%WWWDIR%%/public/emoji/231b.png
-%%WWWDIR%%/public/emoji/231b.svg
-%%WWWDIR%%/public/emoji/2328.png
-%%WWWDIR%%/public/emoji/2328.svg
-%%WWWDIR%%/public/emoji/23cf.png
-%%WWWDIR%%/public/emoji/23cf.svg
-%%WWWDIR%%/public/emoji/23e9.png
-%%WWWDIR%%/public/emoji/23e9.svg
-%%WWWDIR%%/public/emoji/23ea.png
-%%WWWDIR%%/public/emoji/23ea.svg
-%%WWWDIR%%/public/emoji/23eb.png
-%%WWWDIR%%/public/emoji/23eb.svg
-%%WWWDIR%%/public/emoji/23ec.png
-%%WWWDIR%%/public/emoji/23ec.svg
-%%WWWDIR%%/public/emoji/23ed.png
-%%WWWDIR%%/public/emoji/23ed.svg
-%%WWWDIR%%/public/emoji/23ee.png
-%%WWWDIR%%/public/emoji/23ee.svg
-%%WWWDIR%%/public/emoji/23ef.png
-%%WWWDIR%%/public/emoji/23ef.svg
-%%WWWDIR%%/public/emoji/23f0.png
-%%WWWDIR%%/public/emoji/23f0.svg
-%%WWWDIR%%/public/emoji/23f1.png
-%%WWWDIR%%/public/emoji/23f1.svg
-%%WWWDIR%%/public/emoji/23f2.png
-%%WWWDIR%%/public/emoji/23f2.svg
-%%WWWDIR%%/public/emoji/23f3.png
-%%WWWDIR%%/public/emoji/23f3.svg
-%%WWWDIR%%/public/emoji/23f8.png
-%%WWWDIR%%/public/emoji/23f8.svg
-%%WWWDIR%%/public/emoji/23f9.png
-%%WWWDIR%%/public/emoji/23f9.svg
-%%WWWDIR%%/public/emoji/23fa.png
-%%WWWDIR%%/public/emoji/23fa.svg
%%WWWDIR%%/public/emoji/0023-20e3.png
%%WWWDIR%%/public/emoji/0023-20e3.svg
%%WWWDIR%%/public/emoji/0023.png
@@ -1477,24 +1477,6 @@ etc/periodic/daily/900.mastodon
%%WWWDIR%%/public/emoji/00a9.svg
%%WWWDIR%%/public/emoji/00ae.png
%%WWWDIR%%/public/emoji/00ae.svg
-%%WWWDIR%%/public/emoji/1f232.png
-%%WWWDIR%%/public/emoji/1f232.svg
-%%WWWDIR%%/public/emoji/1f233.png
-%%WWWDIR%%/public/emoji/1f233.svg
-%%WWWDIR%%/public/emoji/1f234.png
-%%WWWDIR%%/public/emoji/1f234.svg
-%%WWWDIR%%/public/emoji/1f235.png
-%%WWWDIR%%/public/emoji/1f235.svg
-%%WWWDIR%%/public/emoji/1f236.png
-%%WWWDIR%%/public/emoji/1f236.svg
-%%WWWDIR%%/public/emoji/1f237.png
-%%WWWDIR%%/public/emoji/1f237.svg
-%%WWWDIR%%/public/emoji/1f238.png
-%%WWWDIR%%/public/emoji/1f238.svg
-%%WWWDIR%%/public/emoji/1f239.png
-%%WWWDIR%%/public/emoji/1f239.svg
-%%WWWDIR%%/public/emoji/1f23a.png
-%%WWWDIR%%/public/emoji/1f23a.svg
%%WWWDIR%%/public/emoji/1f004.png
%%WWWDIR%%/public/emoji/1f004.svg
%%WWWDIR%%/public/emoji/1f0cf.png
@@ -2103,6 +2085,24 @@ etc/periodic/daily/900.mastodon
%%WWWDIR%%/public/emoji/1f21a.svg
%%WWWDIR%%/public/emoji/1f22f.png
%%WWWDIR%%/public/emoji/1f22f.svg
+%%WWWDIR%%/public/emoji/1f232.png
+%%WWWDIR%%/public/emoji/1f232.svg
+%%WWWDIR%%/public/emoji/1f233.png
+%%WWWDIR%%/public/emoji/1f233.svg
+%%WWWDIR%%/public/emoji/1f234.png
+%%WWWDIR%%/public/emoji/1f234.svg
+%%WWWDIR%%/public/emoji/1f235.png
+%%WWWDIR%%/public/emoji/1f235.svg
+%%WWWDIR%%/public/emoji/1f236.png
+%%WWWDIR%%/public/emoji/1f236.svg
+%%WWWDIR%%/public/emoji/1f237.png
+%%WWWDIR%%/public/emoji/1f237.svg
+%%WWWDIR%%/public/emoji/1f238.png
+%%WWWDIR%%/public/emoji/1f238.svg
+%%WWWDIR%%/public/emoji/1f239.png
+%%WWWDIR%%/public/emoji/1f239.svg
+%%WWWDIR%%/public/emoji/1f23a.png
+%%WWWDIR%%/public/emoji/1f23a.svg
%%WWWDIR%%/public/emoji/1f250.png
%%WWWDIR%%/public/emoji/1f250.svg
%%WWWDIR%%/public/emoji/1f251.png
@@ -2661,8 +2661,6 @@ etc/periodic/daily/900.mastodon
%%WWWDIR%%/public/emoji/1f3fe.svg
%%WWWDIR%%/public/emoji/1f3ff.png
%%WWWDIR%%/public/emoji/1f3ff.svg
-%%WWWDIR%%/public/emoji/1f423.png
-%%WWWDIR%%/public/emoji/1f423.svg
%%WWWDIR%%/public/emoji/1f400.png
%%WWWDIR%%/public/emoji/1f400.svg
%%WWWDIR%%/public/emoji/1f401.png
@@ -2733,6 +2731,8 @@ etc/periodic/daily/900.mastodon
%%WWWDIR%%/public/emoji/1f421.svg
%%WWWDIR%%/public/emoji/1f422.png
%%WWWDIR%%/public/emoji/1f422.svg
+%%WWWDIR%%/public/emoji/1f423.png
+%%WWWDIR%%/public/emoji/1f423.svg
%%WWWDIR%%/public/emoji/1f424.png
%%WWWDIR%%/public/emoji/1f424.svg
%%WWWDIR%%/public/emoji/1f425.png
@@ -3559,8 +3559,6 @@ etc/periodic/daily/900.mastodon
%%WWWDIR%%/public/emoji/1f4fd.svg
%%WWWDIR%%/public/emoji/1f4ff.png
%%WWWDIR%%/public/emoji/1f4ff.svg
-%%WWWDIR%%/public/emoji/1f523.png
-%%WWWDIR%%/public/emoji/1f523.svg
%%WWWDIR%%/public/emoji/1f500.png
%%WWWDIR%%/public/emoji/1f500.svg
%%WWWDIR%%/public/emoji/1f501.png
@@ -3631,6 +3629,8 @@ etc/periodic/daily/900.mastodon
%%WWWDIR%%/public/emoji/1f521.svg
%%WWWDIR%%/public/emoji/1f522.png
%%WWWDIR%%/public/emoji/1f522.svg
+%%WWWDIR%%/public/emoji/1f523.png
+%%WWWDIR%%/public/emoji/1f523.svg
%%WWWDIR%%/public/emoji/1f524.png
%%WWWDIR%%/public/emoji/1f524.svg
%%WWWDIR%%/public/emoji/1f525.png
@@ -3881,8 +3881,6 @@ etc/periodic/daily/900.mastodon
%%WWWDIR%%/public/emoji/1f5fe.svg
%%WWWDIR%%/public/emoji/1f5ff.png
%%WWWDIR%%/public/emoji/1f5ff.svg
-%%WWWDIR%%/public/emoji/1f623.png
-%%WWWDIR%%/public/emoji/1f623.svg
%%WWWDIR%%/public/emoji/1f600.png
%%WWWDIR%%/public/emoji/1f600.svg
%%WWWDIR%%/public/emoji/1f601.png
@@ -3953,6 +3951,8 @@ etc/periodic/daily/900.mastodon
%%WWWDIR%%/public/emoji/1f621.svg
%%WWWDIR%%/public/emoji/1f622.png
%%WWWDIR%%/public/emoji/1f622.svg
+%%WWWDIR%%/public/emoji/1f623.png
+%%WWWDIR%%/public/emoji/1f623.svg
%%WWWDIR%%/public/emoji/1f624.png
%%WWWDIR%%/public/emoji/1f624.svg
%%WWWDIR%%/public/emoji/1f625.png
@@ -4355,8 +4355,6 @@ etc/periodic/daily/900.mastodon
%%WWWDIR%%/public/emoji/1f6f5.svg
%%WWWDIR%%/public/emoji/1f6f6.png
%%WWWDIR%%/public/emoji/1f6f6.svg
-%%WWWDIR%%/public/emoji/1f923.png
-%%WWWDIR%%/public/emoji/1f923.svg
%%WWWDIR%%/public/emoji/1f910.png
%%WWWDIR%%/public/emoji/1f910.svg
%%WWWDIR%%/public/emoji/1f911.png
@@ -4463,6 +4461,8 @@ etc/periodic/daily/900.mastodon
%%WWWDIR%%/public/emoji/1f921.svg
%%WWWDIR%%/public/emoji/1f922.png
%%WWWDIR%%/public/emoji/1f922.svg
+%%WWWDIR%%/public/emoji/1f923.png
+%%WWWDIR%%/public/emoji/1f923.svg
%%WWWDIR%%/public/emoji/1f924.png
%%WWWDIR%%/public/emoji/1f924.svg
%%WWWDIR%%/public/emoji/1f925.png
@@ -4729,6 +4729,42 @@ etc/periodic/daily/900.mastodon
%%WWWDIR%%/public/emoji/21a9.svg
%%WWWDIR%%/public/emoji/21aa.png
%%WWWDIR%%/public/emoji/21aa.svg
+%%WWWDIR%%/public/emoji/231a.png
+%%WWWDIR%%/public/emoji/231a.svg
+%%WWWDIR%%/public/emoji/231b.png
+%%WWWDIR%%/public/emoji/231b.svg
+%%WWWDIR%%/public/emoji/2328.png
+%%WWWDIR%%/public/emoji/2328.svg
+%%WWWDIR%%/public/emoji/23cf.png
+%%WWWDIR%%/public/emoji/23cf.svg
+%%WWWDIR%%/public/emoji/23e9.png
+%%WWWDIR%%/public/emoji/23e9.svg
+%%WWWDIR%%/public/emoji/23ea.png
+%%WWWDIR%%/public/emoji/23ea.svg
+%%WWWDIR%%/public/emoji/23eb.png
+%%WWWDIR%%/public/emoji/23eb.svg
+%%WWWDIR%%/public/emoji/23ec.png
+%%WWWDIR%%/public/emoji/23ec.svg
+%%WWWDIR%%/public/emoji/23ed.png
+%%WWWDIR%%/public/emoji/23ed.svg
+%%WWWDIR%%/public/emoji/23ee.png
+%%WWWDIR%%/public/emoji/23ee.svg
+%%WWWDIR%%/public/emoji/23ef.png
+%%WWWDIR%%/public/emoji/23ef.svg
+%%WWWDIR%%/public/emoji/23f0.png
+%%WWWDIR%%/public/emoji/23f0.svg
+%%WWWDIR%%/public/emoji/23f1.png
+%%WWWDIR%%/public/emoji/23f1.svg
+%%WWWDIR%%/public/emoji/23f2.png
+%%WWWDIR%%/public/emoji/23f2.svg
+%%WWWDIR%%/public/emoji/23f3.png
+%%WWWDIR%%/public/emoji/23f3.svg
+%%WWWDIR%%/public/emoji/23f8.png
+%%WWWDIR%%/public/emoji/23f8.svg
+%%WWWDIR%%/public/emoji/23f9.png
+%%WWWDIR%%/public/emoji/23f9.svg
+%%WWWDIR%%/public/emoji/23fa.png
+%%WWWDIR%%/public/emoji/23fa.svg
%%WWWDIR%%/public/emoji/24c2.png
%%WWWDIR%%/public/emoji/24c2.svg
%%WWWDIR%%/public/emoji/25aa.png
@@ -4747,8 +4783,6 @@ etc/periodic/daily/900.mastodon
%%WWWDIR%%/public/emoji/25fd.svg
%%WWWDIR%%/public/emoji/25fe.png
%%WWWDIR%%/public/emoji/25fe.svg
-%%WWWDIR%%/public/emoji/2623.png
-%%WWWDIR%%/public/emoji/2623.svg
%%WWWDIR%%/public/emoji/2600.png
%%WWWDIR%%/public/emoji/2600.svg
%%WWWDIR%%/public/emoji/2601.png
@@ -4785,6 +4819,8 @@ etc/periodic/daily/900.mastodon
%%WWWDIR%%/public/emoji/2620.svg
%%WWWDIR%%/public/emoji/2622.png
%%WWWDIR%%/public/emoji/2622.svg
+%%WWWDIR%%/public/emoji/2623.png
+%%WWWDIR%%/public/emoji/2623.svg
%%WWWDIR%%/public/emoji/2626.png
%%WWWDIR%%/public/emoji/2626.svg
%%WWWDIR%%/public/emoji/262a.png
@@ -5056,7 +5092,6 @@ etc/periodic/daily/900.mastodon
%%WWWDIR%%/public/favicon-dev.ico
%%WWWDIR%%/public/favicon.ico
%%WWWDIR%%/public/headers/original/missing.png
-%%WWWDIR%%/public/manifest.json
%%WWWDIR%%/public/mask-icon.svg
%%WWWDIR%%/public/mstile-150x150.png
%%WWWDIR%%/public/oops.png
@@ -5073,21 +5108,28 @@ etc/periodic/daily/900.mastodon
%%WWWDIR%%/spec/controllers/admin/confirmations_controller_spec.rb
%%WWWDIR%%/spec/controllers/admin/domain_blocks_controller_spec.rb
%%WWWDIR%%/spec/controllers/admin/instances_controller_spec.rb
-%%WWWDIR%%/spec/controllers/admin/pubsubhubbub_controller_spec.rb
%%WWWDIR%%/spec/controllers/admin/reported_statuses_controller_spec.rb
%%WWWDIR%%/spec/controllers/admin/reports_controller_spec.rb
%%WWWDIR%%/spec/controllers/admin/resets_controller_spec.rb
%%WWWDIR%%/spec/controllers/admin/settings_controller_spec.rb
%%WWWDIR%%/spec/controllers/admin/silences_controller_spec.rb
+%%WWWDIR%%/spec/controllers/admin/subscriptions_controller_spec.rb
%%WWWDIR%%/spec/controllers/admin/suspensions_controller_spec.rb
%%WWWDIR%%/spec/controllers/admin/two_factor_authentications_controller_spec.rb
%%WWWDIR%%/spec/controllers/api/activitypub/activities_controller_spec.rb
%%WWWDIR%%/spec/controllers/api/activitypub/notes_controller_spec.rb
%%WWWDIR%%/spec/controllers/api/activitypub/outbox_controller_spec.rb
+%%WWWDIR%%/spec/controllers/api/base_controller_spec.rb
%%WWWDIR%%/spec/controllers/api/oembed_controller_spec.rb
%%WWWDIR%%/spec/controllers/api/push_controller_spec.rb
%%WWWDIR%%/spec/controllers/api/salmon_controller_spec.rb
%%WWWDIR%%/spec/controllers/api/subscriptions_controller_spec.rb
+%%WWWDIR%%/spec/controllers/api/v1/accounts/credentials_controller_spec.rb
+%%WWWDIR%%/spec/controllers/api/v1/accounts/follower_accounts_controller_spec.rb
+%%WWWDIR%%/spec/controllers/api/v1/accounts/following_accounts_controller_spec.rb
+%%WWWDIR%%/spec/controllers/api/v1/accounts/relationships_controller_spec.rb
+%%WWWDIR%%/spec/controllers/api/v1/accounts/search_controller_spec.rb
+%%WWWDIR%%/spec/controllers/api/v1/accounts/statuses_controller_spec.rb
%%WWWDIR%%/spec/controllers/api/v1/accounts_controller_spec.rb
%%WWWDIR%%/spec/controllers/api/v1/apps_controller_spec.rb
%%WWWDIR%%/spec/controllers/api/v1/blocks_controller_spec.rb
@@ -5101,15 +5143,28 @@ etc/periodic/daily/900.mastodon
%%WWWDIR%%/spec/controllers/api/v1/notifications_controller_spec.rb
%%WWWDIR%%/spec/controllers/api/v1/reports_controller_spec.rb
%%WWWDIR%%/spec/controllers/api/v1/search_controller_spec.rb
+%%WWWDIR%%/spec/controllers/api/v1/statuses/favourited_by_accounts_controller_spec.rb
+%%WWWDIR%%/spec/controllers/api/v1/statuses/favourites_controller_spec.rb
+%%WWWDIR%%/spec/controllers/api/v1/statuses/mutes_controller_spec.rb
+%%WWWDIR%%/spec/controllers/api/v1/statuses/reblogged_by_accounts_controller_spec.rb
+%%WWWDIR%%/spec/controllers/api/v1/statuses/reblogs_controller_spec.rb
%%WWWDIR%%/spec/controllers/api/v1/statuses_controller_spec.rb
+%%WWWDIR%%/spec/controllers/api/v1/streaming_controller_spec.rb
%%WWWDIR%%/spec/controllers/api/v1/timelines/home_controller_spec.rb
%%WWWDIR%%/spec/controllers/api/v1/timelines/public_controller_spec.rb
%%WWWDIR%%/spec/controllers/api/v1/timelines/tag_controller_spec.rb
%%WWWDIR%%/spec/controllers/api/web/settings_controller_spec.rb
%%WWWDIR%%/spec/controllers/application_controller_spec.rb
+%%WWWDIR%%/spec/controllers/auth/confirmations_controller_spec.rb
+%%WWWDIR%%/spec/controllers/auth/passwords_controller_spec.rb
%%WWWDIR%%/spec/controllers/auth/registrations_controller_spec.rb
%%WWWDIR%%/spec/controllers/auth/sessions_controller_spec.rb
%%WWWDIR%%/spec/controllers/authorize_follows_controller_spec.rb
+%%WWWDIR%%/spec/controllers/concerns/account_controller_concern_spec.rb
+%%WWWDIR%%/spec/controllers/concerns/export_controller_concern_spec.rb
+%%WWWDIR%%/spec/controllers/concerns/localized_spec.rb
+%%WWWDIR%%/spec/controllers/concerns/obfuscate_filename_spec.rb
+%%WWWDIR%%/spec/controllers/concerns/rate_limit_headers_spec.rb
%%WWWDIR%%/spec/controllers/concerns/user_tracking_concern_spec.rb
%%WWWDIR%%/spec/controllers/follower_accounts_controller_spec.rb
%%WWWDIR%%/spec/controllers/following_accounts_controller_spec.rb
@@ -5174,30 +5229,44 @@ etc/periodic/daily/900.mastodon
%%WWWDIR%%/spec/fixtures/requests/localdomain-feed.txt
%%WWWDIR%%/spec/fixtures/requests/localdomain-hostmeta.txt
%%WWWDIR%%/spec/fixtures/requests/localdomain-webfinger.txt
+%%WWWDIR%%/spec/fixtures/requests/oembed_invalid_xml.html
+%%WWWDIR%%/spec/fixtures/requests/oembed_json.html
+%%WWWDIR%%/spec/fixtures/requests/oembed_json_xml.html
+%%WWWDIR%%/spec/fixtures/requests/oembed_undiscoverable.html
+%%WWWDIR%%/spec/fixtures/requests/oembed_xml.html
%%WWWDIR%%/spec/fixtures/requests/redirected.host-meta.txt
%%WWWDIR%%/spec/fixtures/requests/webfinger-hacker1.txt
%%WWWDIR%%/spec/fixtures/requests/webfinger-hacker2.txt
%%WWWDIR%%/spec/fixtures/requests/webfinger.txt
%%WWWDIR%%/spec/fixtures/salmon/mention.xml
%%WWWDIR%%/spec/fixtures/xml/mastodon.atom
+%%WWWDIR%%/spec/helpers/activitystreams2_builder_helper_spec.rb
%%WWWDIR%%/spec/helpers/admin/filter_helper_spec.rb
%%WWWDIR%%/spec/helpers/application_helper_spec.rb
+%%WWWDIR%%/spec/helpers/flashes_helper_spec.rb
%%WWWDIR%%/spec/helpers/home_helper_spec.rb
+%%WWWDIR%%/spec/helpers/http_helper_spec.rb
%%WWWDIR%%/spec/helpers/instance_helper_spec.rb
%%WWWDIR%%/spec/helpers/routing_helper.rb
%%WWWDIR%%/spec/helpers/settings_helper_spec.rb
%%WWWDIR%%/spec/helpers/stream_entries_helper_spec.rb
-%%WWWDIR%%/spec/javascript/components/avatar.test.jsx
-%%WWWDIR%%/spec/javascript/components/button.test.jsx
-%%WWWDIR%%/spec/javascript/components/display_name.test.jsx
-%%WWWDIR%%/spec/javascript/components/dropdown_menu.test.jsx
-%%WWWDIR%%/spec/javascript/components/features/ui/components/column.test.jsx
-%%WWWDIR%%/spec/javascript/components/loading_indicator.test.jsx
+%%WWWDIR%%/spec/javascript/components/avatar.test.js
+%%WWWDIR%%/spec/javascript/components/button.test.js
+%%WWWDIR%%/spec/javascript/components/display_name.test.js
+%%WWWDIR%%/spec/javascript/components/dropdown_menu.test.js
+%%WWWDIR%%/spec/javascript/components/features/ui/components/column.test.js
+%%WWWDIR%%/spec/javascript/components/loading_indicator.test.js
%%WWWDIR%%/spec/javascript/setup.js
%%WWWDIR%%/spec/lib/atom_serializer_spec.rb
+%%WWWDIR%%/spec/lib/extractor_spec.rb
%%WWWDIR%%/spec/lib/feed_manager_spec.rb
%%WWWDIR%%/spec/lib/formatter_spec.rb
+%%WWWDIR%%/spec/lib/hash_object_spec.rb
+%%WWWDIR%%/spec/lib/inline_rabl_scope_spec.rb
%%WWWDIR%%/spec/lib/language_detector_spec.rb
+%%WWWDIR%%/spec/lib/provider_discovery_spec.rb
+%%WWWDIR%%/spec/lib/status_filter_spec.rb
+%%WWWDIR%%/spec/lib/stream_entry_finder_spec.rb
%%WWWDIR%%/spec/lib/tag_manager_spec.rb
%%WWWDIR%%/spec/lib/user_settings_decorator_spec.rb
%%WWWDIR%%/spec/lib/webfinger_resource_spec.rb
@@ -5207,6 +5276,8 @@ etc/periodic/daily/900.mastodon
%%WWWDIR%%/spec/models/account_filter_spec.rb
%%WWWDIR%%/spec/models/account_spec.rb
%%WWWDIR%%/spec/models/block_spec.rb
+%%WWWDIR%%/spec/models/concerns/account_finder_concern_spec.rb
+%%WWWDIR%%/spec/models/concerns/status_threading_concern_spec.rb
%%WWWDIR%%/spec/models/conversation_mute_spec.rb
%%WWWDIR%%/spec/models/conversation_spec.rb
%%WWWDIR%%/spec/models/domain_block_spec.rb
@@ -5229,6 +5300,7 @@ etc/periodic/daily/900.mastodon
%%WWWDIR%%/spec/models/tag_spec.rb
%%WWWDIR%%/spec/models/user_spec.rb
%%WWWDIR%%/spec/models/web/setting_spec.rb
+%%WWWDIR%%/spec/policies/status_policy_spec.rb
%%WWWDIR%%/spec/presenters/instance_presenter_spec.rb
%%WWWDIR%%/spec/rails_helper.rb
%%WWWDIR%%/spec/requests/account_show_page_spec.rb
@@ -5238,7 +5310,7 @@ etc/periodic/daily/900.mastodon
%%WWWDIR%%/spec/requests/localization_spec.rb
%%WWWDIR%%/spec/requests/webfinger_request_spec.rb
%%WWWDIR%%/spec/routing/accounts_routing_spec.rb
-%%WWWDIR%%/spec/routing/api_timelines_spec.rb
+%%WWWDIR%%/spec/routing/api_routing_spec.rb
%%WWWDIR%%/spec/routing/well_known_routes_spec.rb
%%WWWDIR%%/spec/services/account_search_service_spec.rb
%%WWWDIR%%/spec/services/after_block_service_spec.rb
@@ -5266,6 +5338,7 @@ etc/periodic/daily/900.mastodon
%%WWWDIR%%/spec/services/pubsubhubbub/unsubscribe_service_spec.rb
%%WWWDIR%%/spec/services/reblog_service_spec.rb
%%WWWDIR%%/spec/services/reject_follow_service_spec.rb
+%%WWWDIR%%/spec/services/remove_status_service_spec.rb
%%WWWDIR%%/spec/services/search_service_spec.rb
%%WWWDIR%%/spec/services/send_interaction_service_spec.rb
%%WWWDIR%%/spec/services/subscribe_service_spec.rb
@@ -5277,6 +5350,8 @@ etc/periodic/daily/900.mastodon
%%WWWDIR%%/spec/services/unsubscribe_service_spec.rb
%%WWWDIR%%/spec/services/update_remote_profile_service_spec.rb
%%WWWDIR%%/spec/spec_helper.rb
+%%WWWDIR%%/spec/support/examples/lib/settings/scoped_settings.rb
+%%WWWDIR%%/spec/support/examples/lib/settings/settings_extended.rb
%%WWWDIR%%/spec/support/matchers/model/model_have_error_on_field.rb
%%WWWDIR%%/spec/views/about/_contact.html.haml_spec.rb
%%WWWDIR%%/spec/views/about/_links.html.haml_spec.rb
@@ -5295,10 +5370,12 @@ etc/periodic/daily/900.mastodon
%%WWWDIR%%/spec/workers/scheduler/media_cleanup_scheduler_spec.rb
%%WWWDIR%%/spec/workers/scheduler/subscriptions_scheduler_spec.rb
%%WWWDIR%%/storybook/config.js
+%%WWWDIR%%/storybook/initial_state.js
%%WWWDIR%%/storybook/stories/autosuggest_textarea.story.js
%%WWWDIR%%/storybook/stories/button.story.js
%%WWWDIR%%/storybook/stories/character_counter.story.js
%%WWWDIR%%/storybook/stories/loading_indicator.story.js
+%%WWWDIR%%/storybook/stories/onboarding_modal.story.js
%%WWWDIR%%/storybook/storybook.scss
%%WWWDIR%%/storybook/webpack.config.js
%%WWWDIR%%/streaming/.babelrc
@@ -5316,3 +5393,5 @@ etc/periodic/daily/900.mastodon
%%WWWDIR%%/bin/webpack
%%WWWDIR%%/bin/webpack-dev-server
%%WWWDIR%%/bin/yarn
+@owner root
+@group wheel