Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat: アバターデコレーションを連合するように #12154

Closed

Conversation

mattyatea
Copy link
Member

@mattyatea mattyatea commented Oct 26, 2023

What

アバターデコレーションが連合されるようになりました。

Why

nyaiseの用に連合したらいいなーと感じたので

Additional info (optional)

ローカルで2つの鯖を連合させて正常に動くことを確認しました

ですが、名前が重複されて登録されているアバターデコレーションだと正常に動作しないため、そちらの修正も必要になってくるかもです

Checklist

  • Read the contribution guide
  • Test working in a local environment
  • (If needed) Add story of storybook
  • (If needed) Update CHANGELOG.md
  • (If possible) Add tests

Changelogに変更を加えるべきなのか不明だったので変更していませんが、必要があれば変更します。(まだ正式リリース前の機能だから)

Signed-off-by: mattyatea <mattyacocacora0@gmail.com>
@github-actions github-actions bot added the packages/backend Server side specific issue/PR label Oct 26, 2023
@codecov
Copy link

codecov bot commented Oct 26, 2023

Codecov Report

Attention: 112 lines in your changes are missing coverage. Please review.

Comparison is base (4d1a2ba) 78.83% compared to head (c0961ee) 78.75%.

Files Patch % Lines
...ckend/src/core/activitypub/models/ApNoteService.ts 14.28% 42 Missing ⚠️
...end/src/core/activitypub/models/ApPersonService.ts 26.82% 30 Missing ⚠️
.../backend/src/core/activitypub/ApRendererService.ts 55.88% 15 Missing ⚠️
...kend/src/queue/processors/CleanProcessorService.ts 42.85% 8 Missing ⚠️
...kend/src/server/api/endpoints/admin/update-meta.ts 70.83% 7 Missing ⚠️
packages/backend/src/core/UtilityService.ts 66.66% 2 Missing ⚠️
...ver/api/endpoints/admin/avatar-decorations/list.ts 66.66% 2 Missing ⚠️
packages/backend/src/core/activitypub/type.ts 91.66% 1 Missing ⚠️
...r/api/endpoints/admin/avatar-decorations/create.ts 50.00% 1 Missing ⚠️
...r/api/endpoints/admin/avatar-decorations/update.ts 50.00% 1 Missing ⚠️
... and 3 more
Additional details and impacted files
@@             Coverage Diff             @@
##           develop   #12154      +/-   ##
===========================================
- Coverage    78.83%   78.75%   -0.08%     
===========================================
  Files          946      946              
  Lines       102236   102436     +200     
  Branches      8263     8273      +10     
===========================================
+ Hits         80594    80676      +82     
- Misses       21642    21760     +118     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Signed-off-by: mattyatea <mattyacocacora0@gmail.com>
Signed-off-by: mattyatea <mattyacocacora0@gmail.com>
@github-actions
Copy link
Contributor

github-actions bot commented Oct 26, 2023

このPRによるapi.jsonの差分

差分はこちら
--- base
+++ head
@@ -172,6 +172,16 @@
                         "nullable": false
                       }
                     },
+                    "avatarDecorationAcceptHosts": {
+                      "type": "array",
+                      "optional": true,
+                      "nullable": false,
+                      "items": {
+                        "type": "string",
+                        "optional": false,
+                        "nullable": false
+                      }
+                    },
                     "pinnedUsers": {
                       "type": "array",
                       "optional": false,
@@ -2910,6 +2920,9 @@
                   "description": {
                     "type": "string"
                   },
+                  "localOnly": {
+                    "type": "boolean"
+                  },
                   "url": {
                     "type": "string",
                     "minLength": 1
@@ -3277,6 +3290,11 @@
                         "optional": false,
                         "nullable": false
                       },
+                      "localOnly": {
+                        "type": "boolean",
+                        "optional": false,
+                        "nullable": false
+                      },
                       "description": {
                         "type": "string",
                         "optional": false,
@@ -3304,6 +3322,7 @@
                       "createdAt",
                       "updatedAt",
                       "name",
+                      "localOnly",
                       "description",
                       "url",
                       "roleIdsThatCanBeUsedThisDecoration"
@@ -3456,6 +3475,9 @@
                   "description": {
                     "type": "string"
                   },
+                  "localOnly": {
+                    "type": "boolean"
+                  },
                   "url": {
                     "type": "string",
                     "minLength": 1
@@ -11277,6 +11299,20 @@
                       "type": "string"
                     }
                   },
+                  "silencedHosts": {
+                    "type": "array",
+                    "nullable": true,
+                    "items": {
+                      "type": "string"
+                    }
+                  },
+                  "avatarDecorationAcceptHosts": {
+                    "type": "array",
+                    "nullable": true,
+                    "items": {
+                      "type": "string"
+                    }
+                  },
                   "sensitiveWords": {
                     "type": "array",
                     "nullable": true,
@@ -11601,13 +11637,6 @@
                   },
                   "notesPerOneAd": {
                     "type": "integer"
-                  },
-                  "silencedHosts": {
-                    "type": "array",
-                    "nullable": true,
-                    "items": {
-                      "type": "string"
-                    }
                   }
                 },
                 "required": []

Get diff files from Workflow Page

@kakkokari-gtyih
Copy link
Contributor

https://misskey.systems/notes/9l3giq11u4

@mattyatea mattyatea assigned mattyatea and unassigned mattyatea Oct 26, 2023
@mattyatea mattyatea marked this pull request as draft October 26, 2023 23:10
Signed-off-by: mattyatea <mattyacocacora0@gmail.com>
@github-actions github-actions bot added packages/frontend Client side specific issue/PR packages/misskey-js labels Oct 27, 2023
Signed-off-by: mattyatea <mattyacocacora0@gmail.com>
@mattyatea
Copy link
Member Author

ちなみに承認制になってたりします👀

# Conflicts:
#	packages/misskey-js/etc/misskey-js.api.md
Signed-off-by: mattyatea <mattyacocacora0@gmail.com>
Signed-off-by: mattyatea <mattyacocacora0@gmail.com>
@mattyatea
Copy link
Member Author

Localonly追加しました

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
packages/backend Server side specific issue/PR packages/frontend Client side specific issue/PR packages/misskey-js
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants