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

enhance(backend): 絵文字の連合でライセンス欄を相互にやり取りするように #15182

Conversation

samunohito
Copy link
Member

@samunohito samunohito commented Dec 27, 2024

What

resolve #10859
#14109 のサルベージ版です

Why

issueの通り

Additional info (optional)

  • ローカルのVM同士で実際にライセンスが連合されることを確認

    • queue inboxのログに_misskey_licenseが含まれていること
    • DBを確認してリモート絵文字のライセンス欄が入力されていること
    • 絵文字をインポートしてライセンス欄が↑の通りになっていること
  • related ap: purpose _misskey_license on Emoji misskey-hub-next#278

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

@samunohito samunohito marked this pull request as ready for review December 27, 2024 10:43
@github-actions github-actions bot added the packages/backend Server side specific issue/PR label Dec 27, 2024
Copy link
Contributor

github-actions bot commented Dec 27, 2024

このPRによるapi.jsonの差分
差分はありません。
Get diff files from Workflow Page

Copy link

codecov bot commented Dec 27, 2024

Codecov Report

Attention: Patch coverage is 41.66667% with 7 lines in your changes missing coverage. Please review.

Project coverage is 39.42%. Comparing base (145c6cf) to head (9234114).
Report is 1 commits behind head on develop.

Files with missing lines Patch % Lines
...ckend/src/core/activitypub/models/ApNoteService.ts 0.00% 4 Missing ⚠️
.../backend/src/core/activitypub/ApRendererService.ts 0.00% 3 Missing ⚠️
Additional details and impacted files
@@             Coverage Diff             @@
##           develop   #15182      +/-   ##
===========================================
- Coverage    39.42%   39.42%   -0.01%     
===========================================
  Files         1568     1568              
  Lines       199065   199077      +12     
  Branches      3645     3645              
===========================================
+ Hits         78484    78485       +1     
- Misses      120008   120019      +11     
  Partials       573      573              

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

@tai-cha
Copy link
Contributor

tai-cha commented Jan 14, 2025

(Conflict解消しておきました)

@mi-gh-maintainer mi-gh-maintainer bot merged commit f45fd01 into misskey-dev:develop Jan 14, 2025
12 of 18 checks passed
Copy link

Thank you 🙏

Ruruke added a commit to Ruruke/misskey that referenced this pull request Jan 14, 2025
* enhance(backend): 絵文字の連合でライセンス欄を相互にやり取りするように

Co-authored-by: Kisaragi Marine <[email protected]>
Co-authored-by: ruruke <[email protected]>

* fix CHANGELOG.md

---------

Co-authored-by: Kisaragi Marine <[email protected]>
Co-authored-by: ruruke <[email protected]>
Co-authored-by: taichan <[email protected]>
Co-authored-by: syuilo <[email protected]>
@noellabo
Copy link
Contributor

freeTextはどこから拝借した語彙ですか?
オリジナルならmisskeyで定義、既存のもので足りるならscheme.orgあたりからdescriptionか何かを借りてきては。

{
  "@context": [
    "https://www.w3.org/ns/activitystreams", 
    "http://w3id.org/identity/v1",
    "http://w3id.org/security/v1",
    {
      "misskey":"https://misskey-hub.net/ns#",
      "schema": "http://schema.org#",
      "_misskey_license": "misskey:_misskey_license",
      "freeText": {
        "@id": "misskey:freeText",
        "@type": "schema:text"
      }
    }
  ],

なお、内部にfreeTextを持たせる仕様は、将来に向けて_misskey_licenseを拡張できるようにしているのだと思いますが、ライセンス廻りの詳細なプロパティの追加はEmojiの直下に項目追加する方向で良いと思います。ついては、_misskey_licenseにfreeTextなしで直接値を持たせた方が明快でいいんじゃないかな。

こんな感じ。

"tag": [
  {
    "id": "https://misskey.noellabo.jp/emojis/very_sad",
    "type": "Emoji",
    "name": ":very_sad:",
    "updated": "2023-06-02T12:20:42.141Z",
    "icon": {
      "type": "Image",
      "mediaType": "image/png",
      "url": "https://media-misskey.noellabo.jp/files/273ea027-2919-4901-a34d-daff2c316a51.png"
    },
    "_misskey_license": null
  },
  {
    "id": "https://misskey.noellabo.jp/emojis/veryx2_sad",
    "type":"Emoji",
    "updated": "2023-09-29T13:10:44.299Z",
    "icon": {
      "type": "Image",
      "mediaType": "image/png",
      "url": "https://media-misskey.noellabo.jp/files/11a32cf8-de4c-4970-8162-fee4d0b230fa.png"
    },
    "creator": "@[email protected]",
    "copyrightNotice": "@[email protected] によって作成されたオリジナル絵文字",
    "license": "https://creativecommons.org/licenses/by/4.0/",
    "isBasedOn": "https://misskey.noellabo.jp/emojis/very_sad",
    "_misskey_license": "@[email protected] によって作成されたオリジナル絵文字。CC BY 4.0 #コピー可"
  }
]

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
Projects
Development

Successfully merging this pull request may close these issues.

カスタム絵文字ライセンスを連合してほしい
5 participants