gitea/nas
1
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3
22937 commits 21 branches 90 tags 309 MiB
Commit graph

79 commits

Author SHA1 Message Date
KMY
5d79bd078c Merge remote-tracking branch 'parent/main' into upstream-20240117 2025-01-17 16:29:11 +09:00
Wolfgang
77a44e61a8
Add enum validation to DomainBlock#severity (#29158) 2025-01-13 16:05:24 +00:00
KMY
ebdf1ecf49 Merge remote-tracking branch 'parent/main' into upstream-20241015 2024-10-15 07:24:37 +09:00
Matt Jankowski
d8eab3d81f
Reinforce coverage for DomainBlock model (#32473) 2024-10-14 12:51:01 +00:00
KMY
76598bd542 Merge remote-tracking branch 'parent/main' into upstream-20240319 2024-03-19 09:15:20 +09:00
Matt Jankowski
d4ed7e466c
Extract by_domain_length scope in DomainNormalizable concern (#29517) 2024-03-12 13:09:11 +00:00
KMY（雪あすか）
76b24193c4
Remove: #608 ドメインブロック「リプライを拒否」 (#624) 2024-03-01 12:03:31 +09:00
KMY
a1f88f6001 Merge remote-tracking branch 'parent/main' into upstream-20240218 2024-02-18 14:39:40 +09:00
Wolfgang Fournès
cfadb87077
Update enum syntax to use the new Rails 7.0 style (#29217) 2024-02-16 14:54:23 +00:00
KMY
a4cc73438e Merge remote-tracking branch 'parent/main' into upstream-20240122 2024-01-22 10:07:33 +09:00
KMY（雪あすか）
8793bc286e
Add: #40 拡張ドメインブロックに「トレンドに掲載しない」を追加 (#492) 2024-01-22 09:06:05 +09:00
Matt Jankowski
d0b3bc23d7
Remove unused matches_domain scopes on Account, DomainAllow, DomainBlock (#28803) 2024-01-18 16:11:04 +00:00
KMY（雪あすか）
537f49e816
Remove: #372 ドメインブロックにおいて、DBの不要なカラムを削除 (#471) 2024-01-17 12:15:18 +09:00
KMY
e65fb9fb51 Merge remote-tracking branch 'parent/main' into upstream-20240112 2024-01-12 14:48:17 +09:00
KMY（雪あすか）
407a53aa33
Remove: メディアを配送しない設定の削除 (#445) 2024-01-11 09:16:59 +09:00
KMY（雪あすか）
92a16218c9
Remove: #372 削除予定のドメインブロック項目をいったん削除 (#444) 
* Remove: #372 削除予定のドメインブロック項目をいったん削除

* Fix test
 2024-01-10 19:04:49 +09:00
KMY（雪あすか）
7694c62bc6
Add: #437 ドメインブロックで「未ログインユーザーに非公開」の設定を「非公開」にコピーするマイグレーションコード (#439) 
* Add: #437 ドメインブロックで「未ログインユーザーに非公開」の設定を「非公開」にコピーするマイグレーションコード

* Fix test for LTS

* Fix test
 2024-01-09 16:19:23 +09:00
Matt Jankowski
cd58e37b25
Remove unused DomainBlock#affected_accounts_count method (#28642) 2024-01-08 13:38:52 +00:00
Matt Jankowski
202951e6d9
Use Arel in_order_of method to generate CASE for DomainBlock.by_severity (#28617) 2024-01-08 11:15:36 +00:00
KMY（雪あすか）
ecf6f31ecd
Remove: #429 ドメインブロックの「未ログインユーザーに非公開にする」オプション (#430) 2024-01-07 16:23:19 +09:00
KMY
94c2396a34 Merge remote-tracking branch 'parent/main' into upstream-20231204 2023-12-04 12:04:52 +09:00
Matt Jankowski
f70f39dd04
Add explicit dependent: nil to associations (#28169) 2023-12-01 15:52:47 +00:00
KMY（雪あすか）
87e858a202
Add: フレンドサーバー (#61) 
* Fix mastodon version

* テーブル作成

* Wip: フレンドサーバーフォローの承認を受信

* Wip: フレンド申請拒否を受信

* Wip: フォローリクエストを受理

* Wip: 相手からのフォロー・アンフォローを受理

* 普通のフォローとフレンドサーバーのフォローを区別するテストを追加

* ドメインブロックによるフォロー拒否

* ドメインブロックしたあと、申請中のフォロリクを取り下げる処理

* スタブに条件を追加

* Wip: 相手からのDelete信号に対応

* DB定義が消えていたので修正

* Wip: ローカル公開投稿をフレンドに送信する処理など

* Wip: 未収載＋誰でもの投稿をフレンドに送る設定

* Wip: ローカル公開をそのまま送信する設定を考慮

* Fix test

* Wip: 他サーバーからのローカル公開投稿の受け入れ

* Wip: Web画面作成

* Fix test

* Wip: ローカル公開を連合TLに流す

* Wip: フレンドサーバーの削除ボタン

* Wip: メール通知や設定のテストなど

* Wip: 翻訳を作成

* Fix: 却下されたあとフォローボタンが表示されない問題

* Wip: 編集できない問題

* 有効にしていないフレンドサーバーをリストで無効表示
 2023-10-09 11:51:15 +09:00
KMY
87afb5295a Revert "#66 検索時のフォロー中アカウント一覧作成処理を改善" 
This reverts commit 22d1f52597.
 2023-10-07 21:33:52 +09:00
KMY
22d1f52597 #66 検索時のフォロー中アカウント一覧作成処理を改善 2023-10-07 18:47:32 +09:00
KMY
753ef0f8e0 Add misskey searchability support 2023-08-04 13:54:55 +09:00
KMY
f18fa97f0c Merge commit '71db616fed' into kb_migration 2023-07-14 12:43:55 +09:00
Matt Jankowski
b8b2470cf8
Fix Style/SlicingWithRange cop (#25923) 2023-07-12 10:03:06 +02:00
KMY
edb2a5dcf3 Merge commit 'f378f10404' into kb_migration 2023-06-07 11:45:52 +09:00
Nick Schonning
c66250abf1
Autofix Rubocop Regex Style rules (#23690) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2023-06-06 14:50:51 +02:00
KMY
3fa8efaf93 Add domainblocks to reject_reply_exclude_followers 2023-05-12 21:46:28 +09:00
KMY
81a7272ce7 Merge commit '3a1a6ba39e' into kb_migration_development 2023-05-01 15:08:16 +09:00
KMY
3a1a6ba39e Merge commit '15fd712464' into kb_migration 2023-05-01 15:05:34 +09:00
KMY
cb64129a14 Merge branch 'kb_migration' into kb_migration_development 2023-05-01 14:09:13 +09:00
KMY
7d3d93e9a4 Add reject public unlisted subscription configs 2023-04-30 21:36:49 +09:00
Matt Jankowski
af824db398
Fix Rails/InverseOf cop (#24732) 2023-04-30 14:06:53 +02:00
KMY
9ad92e6a09 Addo domein block extra supports 2023-04-28 13:31:02 +09:00
KMY
f2bee0a102 Show all domain blocks 2023-04-28 08:54:43 +09:00
KMY
565e60d0db Add hidden parameter to domain blocks 2023-04-28 08:52:50 +09:00
KMY
1ba30e6c75 Add hashtag,follow domain_blocks 2023-04-28 08:36:59 +09:00
KMY
4c08ce9d43 Add filter to block sending some posts 2023-04-27 18:17:39 +09:00
KMY
401847d8cc Add domain block sending params 2023-04-27 17:40:39 +09:00
KMY
6537405eab Add domain block setting reject_favourite and reject_reply 2023-04-27 12:04:10 +09:00
Nick Schonning
717683d1c3
Autofix Rubocop remaining Layout rules (#23679) 2023-02-20 06:58:28 +01:00
Nick Schonning
63e6353886
Autofix Rubocop Rails/EnumHash (#23737) 2023-02-20 05:00:36 +01:00
lenore gilbert
c373148b3d
Support for import/export of instance-level domain blocks/allows for 4.x w/ additional fixes (#20597) 
* Allow import/export of instance-level domain blocks/allows (#1754)

* Allow import/export of instance-level domain blocks/allows.
Fixes #15095

* Pacify circleci

* Address simple code review feedback

* Add headers to exported CSV

* Extract common import/export functionality to
AdminExportControllerConcern

* Add additional fields to instance-blocked domain export

* Address review feedback

* Split instance domain block/allow import/export into separate pages/controllers

* Address code review feedback

* Pacify DeepSource

* Work around Paperclip::HasAttachmentFile for Rails 6

* Fix deprecated API warning in export tests

* Remove after_commit workaround

(cherry picked from commit 94e98864e39c010635e839fea984f2b4893bef1a)

* Add confirmation page when importing blocked domains (#1773)

* Move glitch-soc-specific strings to glitch-soc-specific locale files

* Add confirmation page when importing blocked domains

(cherry picked from commit b91196f4b73fff91997b8077619ae25b6d04a59e)

* Fix authorization check in domain blocks controller

(cherry picked from commit 75279377583c6e2aa04cc8d7380c593979630b38)

* Fix error strings for domain blocks and email-domain blocks

Corrected issue with non-error message used for Mastodon:NotPermittedError in Domain Blocks
Corrected issue Domain Blocks using the Email Domain Blocks message on ActionContoller::ParameterMissing
Corrected issue with Email Domain Blocks using the not_permitted string from "custom emojii's"

* Ran i18n-tasks normalize to address test failure

* Removed unused admin.export_domain_blocks.not_permitted string

Removing unused string as indicated by Check i18n

* Fix tests

(cherry picked from commit 9094c2f52c24e1c00b594e7c11cd00e4a07eb431)

* Fix domain block export not exporting blocks with only media rejection

(cherry picked from commit 26ff48ee48a5c03a2a4b0bd03fd322529e6bd960)

* Fix various issues with domain block import

- stop using Paperclip for processing domain allow/block imports
- stop leaving temporary files
- better error handling
- assume CSV files are UTF-8-encoded

(cherry picked from commit cad824d8f501b95377e4f0a957e5a00d517a1902)

Co-authored-by: Levi Bard <taktaktaktaktaktaktaktaktaktak@gmail.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2022-11-17 11:05:09 +01:00
Eugen Rochko
1bd00036c2
Change about page to be mounted in the web UI (#19345) 2022-10-13 14:42:37 +02:00
Eugen Rochko
0396acf39e
Add audit log entries for user roles (#19040) 
* Refactor audit log schema

* Add audit log entries for user roles
 2022-08-25 20:39:40 +02:00
Claire
28329ba62f
Add /api/v1/admin/domain_blocks (#18247) 
* Add /api/v1/admin/domain_blocks

Fixes #18140

- `GET /api/v1/admin/domain_blocks` lists domain blocks
- `GET /api/v1/admin/domain_blocks/:id` shows one by ID
- `DELETE /api/v1/admin/domain_blocks/:id` deletes a given domain block
- `POST /api/v1/admin/domain_blocks` to create a new domain block:
  if it conflicts with an existing one, returns an error with
  an attribute `existing_domain_block` with the rendered domain block

* Simplify conflict handling as suggested in review
 2022-06-01 17:31:36 +02:00
Takeshi Umeda
d7fab238a8
Fix a type error in domain_block policies (#17735) 2022-03-10 04:10:20 +01:00