From 3d5183e99c851ef97107407ec0f85fe9e31240bf Mon Sep 17 00:00:00 2001
From: Daigo 3 Dango <zunda@users.noreply.github.com>
Date: Fri, 9 Jul 2021 23:29:27 +0000
Subject: [PATCH 1/6] Use ruby-2.7.4 (#16481)
Stop using older version of resolv gem as the bug has been fixed.
https://bugs.ruby-lang.org/issues/17781
---
.ruby-version | 2 +-
Dockerfile | 2 +-
Gemfile | 2 --
Gemfile.lock | 2 --
4 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/.ruby-version b/.ruby-version
index 37c2961c24..a4dd9dba4f 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-2.7.2
+2.7.4
diff --git a/Dockerfile b/Dockerfile
index 962e5a8c9b..8279e87359 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -26,7 +26,7 @@ RUN ARCH= && \
mv node-v$NODE_VER-linux-$ARCH /opt/node
# Install Ruby
-ENV RUBY_VER="2.7.2"
+ENV RUBY_VER="2.7.4"
RUN apt-get update && \
apt-get install -y --no-install-recommends build-essential \
bison libyaml-dev libgdbm-dev libreadline-dev libjemalloc-dev \
diff --git a/Gemfile b/Gemfile
index a76e69ac3b..e80312047d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -155,5 +155,3 @@ gem 'concurrent-ruby', require: false
gem 'connection_pool', require: false
gem 'xorcist', '~> 1.1'
-
-gem 'resolv', '~> 0.1.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index 96d89fbae5..6ebdd67a91 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -491,7 +491,6 @@ GEM
regexp_parser (2.1.1)
request_store (1.5.0)
rack (>= 1.4)
- resolv (0.1.0)
responders (3.0.1)
actionpack (>= 5.0)
railties (>= 5.0)
@@ -764,7 +763,6 @@ DEPENDENCIES
rdf-normalize (~> 0.4)
redis (~> 4.3)
redis-namespace (~> 1.8)
- resolv (~> 0.1.0)
rqrcode (~> 2.0)
rspec-rails (~> 5.0)
rspec-sidekiq (~> 3.1)
From 275fa4746b1b25ff3d59c09111c8129ef8e1ccda Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Sat, 10 Jul 2021 17:58:41 +0200
Subject: [PATCH 2/6] Add `configuration` attribute to `GET /api/v1/instance`
(#16485)
List various values like file size limits and supported mime types
---
app/serializers/rest/instance_serializer.rb | 29 ++++++++++++++++++++-
app/validators/status_length_validator.rb | 3 ++-
2 files changed, 30 insertions(+), 2 deletions(-)
diff --git a/app/serializers/rest/instance_serializer.rb b/app/serializers/rest/instance_serializer.rb
index d39092b56d..0dc44b6239 100644
--- a/app/serializers/rest/instance_serializer.rb
+++ b/app/serializers/rest/instance_serializer.rb
@@ -5,7 +5,8 @@ class REST::InstanceSerializer < ActiveModel::Serializer
attributes :uri, :title, :short_description, :description, :email,
:version, :urls, :stats, :thumbnail,
- :languages, :registrations, :approval_required, :invites_enabled
+ :languages, :registrations, :approval_required, :invites_enabled,
+ :configuration
has_one :contact_account, serializer: REST::AccountSerializer
@@ -53,6 +54,32 @@ class REST::InstanceSerializer < ActiveModel::Serializer
{ streaming_api: Rails.configuration.x.streaming_api_base_url }
end
+ def configuration
+ {
+ statuses: {
+ max_characters: StatusLengthValidator::MAX_CHARS,
+ max_media_attachments: 4,
+ characters_reserved_per_url: StatusLengthValidator::URL_PLACEHOLDER_CHARS,
+ },
+
+ media_attachments: {
+ supported_mime_types: MediaAttachment::IMAGE_MIME_TYPES + MediaAttachment::VIDEO_MIME_TYPES + MediaAttachment::AUDIO_MIME_TYPES,
+ image_size_limit: MediaAttachment::IMAGE_LIMIT,
+ image_matrix_limit: Attachmentable::MAX_MATRIX_LIMIT,
+ video_size_limit: MediaAttachment::VIDEO_LIMIT,
+ video_frame_rate_limit: MediaAttachment::MAX_VIDEO_FRAME_RATE,
+ video_matrix_limit: MediaAttachment::MAX_VIDEO_MATRIX_LIMIT,
+ },
+
+ polls: {
+ max_options: PollValidator::MAX_OPTIONS,
+ max_characters_per_option: PollValidator::MAX_OPTION_CHARS,
+ min_expiration: PollValidator::MIN_EXPIRATION,
+ max_expiration: PollValidator::MAX_EXPIRATION,
+ },
+ }
+ end
+
def languages
[I18n.default_locale]
end
diff --git a/app/validators/status_length_validator.rb b/app/validators/status_length_validator.rb
index d036f19256..4c258ec16e 100644
--- a/app/validators/status_length_validator.rb
+++ b/app/validators/status_length_validator.rb
@@ -2,7 +2,8 @@
class StatusLengthValidator < ActiveModel::Validator
MAX_CHARS = 500
- URL_PLACEHOLDER = "\1#{'x' * 23}"
+ URL_PLACEHOLDER_CHARS = 23
+ URL_PLACEHOLDER = "\1#{'x' * URL_PLACEHOLDER_CHARS}"
def validate(status)
return unless status.local? && !status.reblog?
From 5c112959aa226143cb95a8965c8f56095f00eb03 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 11 Jul 2021 01:08:40 +0900
Subject: [PATCH 3/6] Bump sass from 1.35.1 to 1.35.2 (#16478)
Bumps [sass](https://github.com/sass/dart-sass) from 1.35.1 to 1.35.2.
- [Release notes](https://github.com/sass/dart-sass/releases)
- [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sass/dart-sass/compare/1.35.1...1.35.2)
---
updated-dependencies:
- dependency-name: sass
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
package.json | 2 +-
yarn.lock | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/package.json b/package.json
index 517030f786..62c892af25 100644
--- a/package.json
+++ b/package.json
@@ -151,7 +151,7 @@
"requestidlecallback": "^0.3.0",
"reselect": "^4.0.0",
"rimraf": "^3.0.2",
- "sass": "^1.35.1",
+ "sass": "^1.35.2",
"sass-loader": "^10.2.0",
"stacktrace-js": "^2.0.2",
"stringz": "^2.1.0",
diff --git a/yarn.lock b/yarn.lock
index 53b0e722ab..efc86cad98 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9811,10 +9811,10 @@ sass-loader@^10.2.0:
schema-utils "^3.0.0"
semver "^7.3.2"
-sass@^1.35.1:
- version "1.35.1"
- resolved "https://registry.yarnpkg.com/sass/-/sass-1.35.1.tgz#90ecf774dfe68f07b6193077e3b42fb154b9e1cd"
- integrity sha512-oCisuQJstxMcacOPmxLNiLlj4cUyN2+8xJnG7VanRoh2GOLr9RqkvI4AxA4a6LHVg/rsu+PmxXeGhrdSF9jCiQ==
+sass@^1.35.2:
+ version "1.35.2"
+ resolved "https://registry.yarnpkg.com/sass/-/sass-1.35.2.tgz#b732314fcdaf7ef8d0f1698698adc378043cb821"
+ integrity sha512-jhO5KAR+AMxCEwIH3v+4zbB2WB0z67V1X0jbapfVwQQdjHZUGUyukpnoM6+iCMfsIUC016w9OPKQ5jrNOS9uXw==
dependencies:
chokidar ">=3.0.0 <4.0.0"
From ca8ac1a6390da16fe403276c60aec0e06d831f5b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 11 Jul 2021 01:08:54 +0900
Subject: [PATCH 4/6] Bump rubocop from 1.18.2 to 1.18.3 (#16477)
Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.18.2 to 1.18.3.
- [Release notes](https://github.com/rubocop/rubocop/releases)
- [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop/compare/v1.18.2...v1.18.3)
---
updated-dependencies:
- dependency-name: rubocop
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
Gemfile.lock | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Gemfile.lock b/Gemfile.lock
index 6ebdd67a91..3db3ea786e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -523,7 +523,7 @@ GEM
rspec-support (3.10.2)
rspec_junit_formatter (0.4.1)
rspec-core (>= 2, < 4, != 2.12.0)
- rubocop (1.18.2)
+ rubocop (1.18.3)
parallel (~> 1.10)
parser (>= 3.0.0.0)
rainbow (>= 2.2.2, < 4.0)
From 7095c80373c4a4d73b3e7b4f69bee24c4a57828d Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Sun, 11 Jul 2021 11:01:38 +0200
Subject: [PATCH 5/6] Add ability to filter reports by origin of target account
(#16487)
---
app/models/report_filter.rb | 14 ++++++++++++++
app/views/admin/reports/index.html.haml | 6 ++++++
config/locales/en.yml | 1 +
3 files changed, 21 insertions(+)
diff --git a/app/models/report_filter.rb b/app/models/report_filter.rb
index c32d4359e7..a91a6baeb2 100644
--- a/app/models/report_filter.rb
+++ b/app/models/report_filter.rb
@@ -6,6 +6,7 @@ class ReportFilter
account_id
target_account_id
by_target_domain
+ target_origin
).freeze
attr_reader :params
@@ -34,8 +35,21 @@ class ReportFilter
Report.where(account_id: value)
when :target_account_id
Report.where(target_account_id: value)
+ when :target_origin
+ target_origin_scope(value)
else
raise "Unknown filter: #{key}"
end
end
+
+ def target_origin_scope(value)
+ case value.to_sym
+ when :local
+ Report.where(target_account: Account.local)
+ when :remote
+ Report.where(target_account: Account.remote)
+ else
+ raise "Unknown value: #{value}"
+ end
+ end
end
diff --git a/app/views/admin/reports/index.html.haml b/app/views/admin/reports/index.html.haml
index 721c55f71a..6191733733 100644
--- a/app/views/admin/reports/index.html.haml
+++ b/app/views/admin/reports/index.html.haml
@@ -7,6 +7,12 @@
%ul
%li= filter_link_to t('admin.reports.unresolved'), resolved: nil
%li= filter_link_to t('admin.reports.resolved'), resolved: '1'
+ .filter-subset
+ %strong= t('admin.reports.target_origin')
+ %ul
+ %li= filter_link_to t('admin.accounts.location.all'), target_origin: nil
+ %li= filter_link_to t('admin.accounts.location.local'), target_origin: 'local'
+ %li= filter_link_to t('admin.accounts.location.remote'), target_origin: 'remote'
= form_tag admin_reports_url, method: 'GET', class: 'simple_form' do
.fields-group
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 51764a0e16..af7266d86f 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -579,6 +579,7 @@ en:
resolved: Resolved
resolved_msg: Report successfully resolved!
status: Status
+ target_origin: Origin of reported account
title: Reports
unassign: Unassign
unresolved: Unresolved
From a2ce7508c95f473a77d46a99fc1e090c0defadcc Mon Sep 17 00:00:00 2001
From: Shlee <github@shl.ee>
Date: Sun, 11 Jul 2021 18:57:31 +0800
Subject: [PATCH 6/6] Update docker-compose.yml (#16489)
---
docker-compose.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docker-compose.yml b/docker-compose.yml
index 52eea7a74f..459813b3f3 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -14,7 +14,7 @@ services:
redis:
restart: always
- image: redis:6.0-alpine
+ image: redis:6-alpine
networks:
- internal_network
healthcheck: