Enhance: Fedibird形式の絵文字情報連合に対応 #604
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
이 PR에 의한 api.json 차이 차이점은 여기에서 볼 수 있음--- base
+++ head
@@ -7295,6 +7295,48 @@
"items": {
"type": "string"
}
+ },
+ "copyPermission": {
+ "type": [
+ "string",
+ "null"
+ ],
+ "enum": [
+ "allow",
+ "deny",
+ "conditional",
+ null
+ ],
+ "default": "allow",
+ "description": "この絵文字を外部サーバーへコピーすることの許可"
+ },
+ "usageInfo": {
+ "type": [
+ "string",
+ "null"
+ ],
+ "description": "使用する際の説明"
+ },
+ "author": {
+ "type": [
+ "string",
+ "null"
+ ],
+ "description": "作者情報"
+ },
+ "description": {
+ "type": [
+ "string",
+ "null"
+ ],
+ "description": "絵文字の説明"
+ },
+ "isBasedOn": {
+ "type": [
+ "string",
+ "null"
+ ],
+ "description": "もとになったもののURLなど"
}
},
"required": [
@@ -7505,6 +7547,48 @@
"items": {
"type": "string"
}
+ },
+ "copyPermission": {
+ "type": [
+ "string",
+ "null"
+ ],
+ "enum": [
+ "allow",
+ "deny",
+ "conditional",
+ null
+ ],
+ "default": "allow",
+ "description": "この絵文字を外部サーバーへコピーすることの許可"
+ },
+ "usageInfo": {
+ "type": [
+ "string",
+ "null"
+ ],
+ "description": "使用する際の説明"
+ },
+ "author": {
+ "type": [
+ "string",
+ "null"
+ ],
+ "description": "作者情報"
+ },
+ "description": {
+ "type": [
+ "string",
+ "null"
+ ],
+ "description": "絵文字の説明"
+ },
+ "isBasedOn": {
+ "type": [
+ "string",
+ "null"
+ ],
+ "description": "もとになったもののURLなど"
}
},
"required": [
@@ -7679,6 +7763,9 @@
"emojiId": {
"type": "string",
"format": "misskey:id"
+ },
+ "usageInfoReaded": {
+ "type": "boolean"
}
},
"required": [
@@ -7734,6 +7821,24 @@
}
}
},
+ "NOT_ALLOWED": {
+ "value": {
+ "error": {
+ "message": "Copy is not allowed this emoji.",
+ "code": "NOT_ALLOWED",
+ "id": "1beadfcc-3882-f3c9-ee57-ded45e4741e4"
+ }
+ }
+ },
+ "SEE_USAGEINFOMATION_OR_LICENSE": {
+ "value": {
+ "error": {
+ "message": "see Usage information or license.",
+ "code": "SEE_USAGEINFOMATION_OR_LICENSE",
+ "id": "28d9031e-ddbc-5ba3-c435-fcb5259e8408"
+ }
+ }
+ },
"INVALID_PARAM": {
"value": {
"error": {
@@ -8386,6 +8491,47 @@
},
"url": {
"type": "string"
+ },
+ "copyPermission": {
+ "type": [
+ "string",
+ "null"
+ ],
+ "enum": [
+ "allow",
+ "deny",
+ "conditional",
+ null
+ ],
+ "description": "この絵文字を外部サーバーへコピーすることの許可"
+ },
+ "usageInfo": {
+ "type": [
+ "string",
+ "null"
+ ],
+ "description": "使用する際の説明"
+ },
+ "author": {
+ "type": [
+ "string",
+ "null"
+ ],
+ "description": "作者情報"
+ },
+ "description": {
+ "type": [
+ "string",
+ "null"
+ ],
+ "description": "絵文字の説明"
+ },
+ "isBasedOn": {
+ "type": [
+ "string",
+ "null"
+ ],
+ "description": "もとになったもののURLなど"
}
},
"required": [
@@ -8394,7 +8540,12 @@
"name",
"category",
"host",
- "url"
+ "url",
+ "copyPermission",
+ "usageInfo",
+ "author",
+ "description",
+ "isBasedOn"
]
}
}
@@ -8597,6 +8748,47 @@
},
"url": {
"type": "string"
+ },
+ "copyPermission": {
+ "type": [
+ "string",
+ "null"
+ ],
+ "enum": [
+ "allow",
+ "deny",
+ "conditional",
+ null
+ ],
+ "description": "この絵文字を外部サーバーへコピーすることの許可"
+ },
+ "usageInfo": {
+ "type": [
+ "string",
+ "null"
+ ],
+ "description": "使用する際の説明"
+ },
+ "author": {
+ "type": [
+ "string",
+ "null"
+ ],
+ "description": "作者情報"
+ },
+ "description": {
+ "type": [
+ "string",
+ "null"
+ ],
+ "description": "絵文字の説明"
+ },
+ "isBasedOn": {
+ "type": [
+ "string",
+ "null"
+ ],
+ "description": "もとになったもののURLなど"
}
},
"required": [
@@ -8605,7 +8797,12 @@
"name",
"category",
"host",
- "url"
+ "url",
+ "copyPermission",
+ "usageInfo",
+ "author",
+ "description",
+ "isBasedOn"
]
}
}
@@ -9381,6 +9578,9 @@
},
"host": {
"type": "string"
+ },
+ "usageInfoReaded": {
+ "type": "boolean"
}
},
"required": [
@@ -9446,6 +9646,24 @@
}
}
},
+ "NOT_ALLOWED": {
+ "value": {
+ "error": {
+ "message": "Copy is not allowed this emoji.",
+ "code": "NOT_ALLOWED",
+ "id": "1beadfcc-3882-f3c9-ee57-ded45e4741e4"
+ }
+ }
+ },
+ "SEE_USAGEINFOMATION_OR_LICENSE": {
+ "value": {
+ "error": {
+ "message": "see Usage information or license.",
+ "code": "SEE_USAGEINFOMATION_OR_LICENSE",
+ "id": "28d9031e-ddbc-5ba3-c435-fcb5259e8408"
+ }
+ }
+ },
"INVALID_PARAM": {
"value": {
"error": {
@@ -9612,6 +9830,47 @@
"items": {
"type": "string"
}
+ },
+ "copyPermission": {
+ "type": [
+ "string",
+ "null"
+ ],
+ "enum": [
+ "allow",
+ "deny",
+ "conditional",
+ null
+ ],
+ "description": "この絵文字を外部サーバーへコピーすることの許可"
+ },
+ "usageInfo": {
+ "type": [
+ "string",
+ "null"
+ ],
+ "description": "使用する際の説明"
+ },
+ "author": {
+ "type": [
+ "string",
+ "null"
+ ],
+ "description": "作者情報"
+ },
+ "description": {
+ "type": [
+ "string",
+ "null"
+ ],
+ "description": "絵文字の説明"
+ },
+ "isBasedOn": {
+ "type": [
+ "string",
+ "null"
+ ],
+ "description": "もとになったもののURLなど"
}
},
"anyOf": [
@@ -88957,6 +89216,42 @@
"type": "string",
"format": "id"
}
+ },
+ "copyPermission": {
+ "type": [
+ "string",
+ "null"
+ ],
+ "enum": [
+ "allow",
+ "deny",
+ "conditional",
+ null
+ ]
+ },
+ "usageInfo": {
+ "type": [
+ "string",
+ "null"
+ ]
+ },
+ "author": {
+ "type": [
+ "string",
+ "null"
+ ]
+ },
+ "description": {
+ "type": [
+ "string",
+ "null"
+ ]
+ },
+ "isBasedOn": {
+ "type": [
+ "string",
+ "null"
+ ]
}
},
"required": [
@@ -88969,7 +89264,12 @@
"license",
"isSensitive",
"localOnly",
- "roleIdsThatCanBeUsedThisEmojiAsReaction"
+ "roleIdsThatCanBeUsedThisEmojiAsReaction",
+ "copyPermission",
+ "usageInfo",
+ "author",
+ "description",
+ "isBasedOn"
]
},
"Flash": { |
penginn-net
changed the title
|
れでーふぉーれびゅー |
penginn-net
changed the title
kozakura913
requested changes
Dec 30, 2024
packages/backend/migration/1735299834220-EmojiInfoFederation.js
Outdated
Show resolved
Hide resolved
packages/backend/migration/1735299834220-EmojiInfoFederation.js
Outdated
Show resolved
Hide resolved
|
あとApRenderService/ApInboxServiceで扱うなら連合テストの追加も欲しい |
extractApEmojiが呼ばれてるからinboxで受け取ってない？ |
|
辿れてなかった |
|
なんか通った |
|
isBasedOn追加する |
penginn-net
force-pushed
the
enh-emojifederation
branch
from
45f1edb to
e421755
Compare
kozakura913
requested changes
Jan 5, 2025
kozakura913
approved these changes
Jan 10, 2025
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What
Enhance: Fedibird形式の絵文字情報連合に対応
Why
Resolve #544
Additional info (optional)
misskey-dev/misskey#10859 (comment)
Checklist