Skip to content
This repository has been archived by the owner on Feb 22, 2023. It is now read-only.

Update Terms of Service #678

Merged
merged 10 commits into from
May 5, 2022
Merged

Update Terms of Service #678

merged 10 commits into from
May 5, 2022

Conversation

AetherUnbound
Copy link
Contributor

Description

Follow up from #662

This PR updates the Terms of Service document for the Openverse API. The current version of the document is hosted here: https://api.openverse.engineering/terms_of_service.html and can be found in code here: https://github.com/WordPress/openverse-api/blob/v2.4.3/api/terms_of_service.html

The new ToS will be located along with the rest of our API dev documentation here: https://wordpress.github.io/openverse-api/terms_of_service.html (URL won't work until this is merged).

⚠️ ToS changes ⚠️

This PR also includes changes to our ToS wording. A rough difference view between the two can be found here: https://www.diffchecker.com/gc9T5FrF

Most notably, the following has changed:

  • References to "CC Catalog" and "CC API` have been changed to reference Openverse.
  • References to the "Creative Commons Master Terms of Use" have been removed. As far as I could tell, WordPress Foundation did not have an equivalent.
  • Replaced reference to "Openverse Trademark Policy" (likely was "Creative Commons Trademark Policy) with references to WordPress Foundation's Trademark Policy
  • Various spacing changes

Testing Instructions

  1. just sphinx-make
  2. just sphinx-serve
  3. Change Line 17 in swagger.py to be tos_url = "http://0.0.0.0:3001/terms_of_service.html"
  4. Visit http://localhost:8000 and click the "Terms of Service" link
  5. Verify that you are indeed redirected to the locally served sphinx documentation

Checklist

  • My pull request has a descriptive title (not a vague title like Update index.md).
  • My pull request targets the default branch of the repository (main) or a parent feature branch.
  • My commit messages follow best practices.
  • My code follows the established code style of the repository.
  • I added or updated tests for the changes I made (if applicable).
  • I added or updated documentation (if applicable).
  • I tried running the project locally and verified that there are no visible errors.

Developer Certificate of Origin

Developer Certificate of Origin
Developer Certificate of Origin
Version 1.1

Copyright (C) 2004, 2006 The Linux Foundation and its contributors.
1 Letterman Drive
Suite D4700
San Francisco, CA, 94129

Everyone is permitted to copy and distribute verbatim copies of this
license document, but changing it is not allowed.


Developer's Certificate of Origin 1.1

By making a contribution to this project, I certify that:

(a) The contribution was created in whole or in part by me and I
    have the right to submit it under the open source license
    indicated in the file; or

(b) The contribution is based upon previous work that, to the best
    of my knowledge, is covered under an appropriate open source
    license and I have the right under that license to submit that
    work with modifications, whether created in whole or in part
    by me, under the same open source license (unless I am
    permitted to submit under a different license), as indicated
    in the file; or

(c) The contribution was provided directly to me by some other
    person who certified (a), (b) or (c) and I have not modified
    it.

(d) I understand and agree that this project and the contribution
    are public and that a record of the contribution (including all
    personal information I submit with it, including my sign-off) is
    maintained indefinitely and may be redistributed consistent with
    this project or the open source license(s) involved.

@AetherUnbound AetherUnbound requested a review from a team as a code owner May 4, 2022 20:53
@AetherUnbound AetherUnbound added ✨ goal: improvement Improvement to an existing user-facing feature 📄 aspect: text Concerns the textual material in the repository 🟧 priority: high Stalls work on the project or its dependents labels May 4, 2022
Copy link
Member

@zackkrida zackkrida left a comment

Choose a reason for hiding this comment

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

I'm happy to approve this now; regardless of any potential concerns, it's certainly more accurate than the current, live document, which seems like a win.

Copy link
Contributor

@sarayourfriend sarayourfriend left a comment

Choose a reason for hiding this comment

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

Just some nit-picky things. Agreed with Zack though, it doesn't seem like we need to necessarily wait to get it live considering the existing one is wrong... but IANAL so 🧂 😬

In connection with your use of the Openverse API:

- You must adhere to all rate limits, registration requirements, and comply with all requirements in the Openverse API documentation;
- You must not scrape the content in the Openverse Catalog;
Copy link
Contributor

Choose a reason for hiding this comment

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

Why is this?

Copy link
Member

@zackkrida zackkrida May 4, 2022

Choose a reason for hiding this comment

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

  • You must not scrape the content in the Openverse Catalog

I'm also not sure what this line means; is it trying to discourage making a bulk copy of all the data supplied by the API?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I am honestly not sure. The "catalog" itself isn't even public. I'm happy to delete this line 🤷🏼‍♀️

api/docs/terms_of_service.md Outdated Show resolved Hide resolved
api/docs/terms_of_service.md Outdated Show resolved Hide resolved
api/docs/terms_of_service.md Outdated Show resolved Hide resolved
api/docs/terms_of_service.md Outdated Show resolved Hide resolved
Co-authored-by: sarayourfriend <[email protected]>
Co-authored-by: Zack Krida <[email protected]>
Copy link
Contributor

@sarayourfriend sarayourfriend left a comment

Choose a reason for hiding this comment

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

LGTM! I feel safe merging this like Zack suggested, nothing seems too risky and the existing one is bogus. We can update it once we get feedback from WPF folks.

LICENSE Outdated
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2018 Creative Commons
Copyright (c) 2022 WordPress Foundation
Copy link
Contributor

Choose a reason for hiding this comment

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

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Incredible, thank you!

api/docs/terms_of_service.md Outdated Show resolved Hide resolved
AetherUnbound and others added 2 commits May 5, 2022 10:01
@AetherUnbound AetherUnbound merged commit 55c2f0c into main May 5, 2022
@AetherUnbound AetherUnbound deleted the feature/docker-deployment branch May 5, 2022 17:44
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
📄 aspect: text Concerns the textual material in the repository ✨ goal: improvement Improvement to an existing user-facing feature 🟧 priority: high Stalls work on the project or its dependents
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants