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

Sync with upstream #112

Merged
merged 378 commits into from
Nov 18, 2024
Merged

Sync with upstream #112

merged 378 commits into from
Nov 18, 2024

Conversation

nips-ja-sync[bot]
Copy link

@nips-ja-sync nips-ja-sync bot commented Apr 28, 2024

No description provided.

54.md Outdated
`e` tag: optional version of the article in which this modifications is based
`e` tag with `source` marker: the ID of the event that should be merged. This event id MUST be of a `kind:30818` as defined in this NIP.

The destination-pubkey (the pubkey being requested to merge something into their article can create [[NIP-25]] reactions that tag the `kind:818` event with `+` or `-`
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚫 [textlint] <eslint.rules.ja-technical-writing/no-unmatched-pair> reported by reviewdog 🐶
Not found pair character for (.

You should close this sentence with ).
This pair mark is called round bracket(). (ja-technical-writing/no-unmatched-pair)

ArmanTheParman and others added 10 commits June 16, 2024 19:20
This is not a correction but a suggestion...

When I first read it, it wasn't clear that metadata is specifically for a user and not inclusive of other things (eg not metadata about a photo).

Adding this one extra word here would have helped me understand that immediately.
Changed Metadata to User's Metadata, to reduce ambiguity.
Changed metadata to user's metadata
* Update 01.md

A few small changes that can potentially help a broader audience (non-developers) follow the meaning.

* monospace hex

Co-authored-by: Asai Toshiya <[email protected]>

---------

Co-authored-by: fiatjaf_ <[email protected]>
Co-authored-by: Asai Toshiya <[email protected]>
46.md Outdated Show resolved Hide resolved
@s3-odara
Copy link
Contributor

どの差分を追ってるのかわからなくなりそう

@Hakkadaikon
Copy link
Contributor

@s3-odara
レビュー終わりました (指摘4件)

指摘①、②: kind0の呼び名

目次の説明ではメタデータになっていたので、metadata, user's metadata -> メタデータ にしてもよいかなと
修正有無は任せます
※修正するとしたら、他の箇所にも水平展開が必要

指摘③

json -> jsoncの単純な指摘

指摘④

コンフリクトマーカーがついたまま

@s3-odara
Copy link
Contributor

ありがとうございます。

1,2については上流でmetadataからuser metadataへの変更があったので何らかの意図でuser matadataへ変更してるものだと解釈しました。

3も上流の変更です。

4についてはどこにコンフリクトマーカーが残っているかわかりますか?

@Hakkadaikon
Copy link
Contributor

Hakkadaikon commented Nov 17, 2024

指摘④のコンフリクトマーカーはここです。
NIP-65 25L

#112 (comment)

@s3-odara
Copy link
Contributor

コンフリクトマーカーは修正しました。

metadata, user's metadataについてはuser's metadataが本家に残ってるのがおそらくミスなので、本家の方でuser metadataに統一するPRを出したほうがいいかもしれないです。

@Hakkadaikon Hakkadaikon self-requested a review November 17, 2024 16:44
Copy link
Contributor

@Hakkadaikon Hakkadaikon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

指摘修正されていること & 一部の統一されていない表現が上位のものであることを確認しました。承認します。

05.md Outdated Show resolved Hide resolved
05.md Show resolved Hide resolved
25.md Outdated Show resolved Hide resolved
65.md Outdated Show resolved Hide resolved
@s3-odara
Copy link
Contributor

ああ、レビューコメント今見えました。
approveかrequire changeしないとコメントが見えないのかも

@Hakkadaikon
Copy link
Contributor

指摘③で言及したjson -> jsoncについては
本家にPRを出しました (jsとなっている箇所も合わせて修正済)
nostr-protocol/nips#1584

@Hakkadaikon Hakkadaikon merged commit d90fc24 into main Nov 18, 2024
1 check passed
@Hakkadaikon Hakkadaikon deleted the sync branch November 18, 2024 11:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.