From 871a1817b4b0fa81f4dda23399f2523f6223e8b8 Mon Sep 17 00:00:00 2001 From: Madison Swain-Bowden Date: Thu, 28 Apr 2022 15:19:01 -0700 Subject: [PATCH 01/10] Add terms of service to included files for docker image --- api/.dockerignore | 1 + 1 file changed, 1 insertion(+) diff --git a/api/.dockerignore b/api/.dockerignore index 782533e2b..b912bba9b 100644 --- a/api/.dockerignore +++ b/api/.dockerignore @@ -4,3 +4,4 @@ !manage.py !Pipfile* !run.sh +!terms_of_service.html From 6da5201bd9fa69a5d22c26bc0bf9e5a89d2afffd Mon Sep 17 00:00:00 2001 From: Madison Swain-Bowden Date: Wed, 4 May 2022 11:49:18 -0700 Subject: [PATCH 02/10] Move TOS page into sphinx --- api/.dockerignore | 1 - api/docs/terms_of_service.md | 47 ++++++++++++++++++++++++++++++++++++ api/terms_of_service.html | 3 --- 3 files changed, 47 insertions(+), 4 deletions(-) create mode 100644 api/docs/terms_of_service.md delete mode 100644 api/terms_of_service.html diff --git a/api/.dockerignore b/api/.dockerignore index b912bba9b..782533e2b 100644 --- a/api/.dockerignore +++ b/api/.dockerignore @@ -4,4 +4,3 @@ !manage.py !Pipfile* !run.sh -!terms_of_service.html diff --git a/api/docs/terms_of_service.md b/api/docs/terms_of_service.md new file mode 100644 index 000000000..90ccaeadd --- /dev/null +++ b/api/docs/terms_of_service.md @@ -0,0 +1,47 @@ +# Openverse API Terms of Use + +_Effective as of 4 May 2022_ + +## 1. Your Agreement to the Terms + +Thank you for using the Openverse Catalog application programming interface (“Openverse API”). +BY USING THE OPENVERSE API, YOU ACKNOWLEDGE THAT YOU HAVE READ, UNDERSTOOD, AND AGREED TO BE BOUND BY THESE API TERMS OF USE (hereafter, “API Terms”). +By using the Openverse API, you also represent that you have the legal authority to accept the API Terms on behalf of yourself and any party you represent in connection with your use of the Openverse API. +If you do not agree to the API Terms, you are not authorized to use the Openverse API. + +## 2. Licensed Uses and Restrictions + +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; + - You must not use multiple machines to circumvent rate limits or otherwise take measures to bypass our technical or security measures; + - You must not operate in a way that negatively affects other users of the API or impedes WordPress's ability to provide its services; + - You must respect and comply with the terms and conditions applicable to the content and metadata accessible through the Openverse API, including by providing proper attribution to CC-licensed works and respecting the terms and conditions of platforms hosting CC-licensed works. + - You must not, and the products you develop must not encourage others to, violate any laws, regulations, or rights of any other person or entity, including intellectual property rights. + +## 3. Content and Data Available through the API + +The Openverse API aggregates metadata about openly licensed content hosted on websites managed by third parties. +Openverse does not own or control the content or data made available through the API, and does not verify its licensing status or make any representations or warranties about the content or data whatsoever. +You are responsible for independently verifying whether you have the right to use the content and data and what terms and conditions apply to your use. + +## 4. Openverse Trademark Use + +If you develop an application or other product or service using the Openverse API, you must prominently indicate that it was made using the Openverse API but is not endorsed or certified by Openverse. +You must comply with the [WordPress Foundation Trademark Policy](https://wordpressfoundation.org/trademark-policy/) for all use of the Openverse/WordPress logos and other trademarks. + +## 5. Fees + +To help ensure the sustainability of the Openverse project, Openverse reserves the right to charge fees for commercial uses of the Openverse API and/or for heavy usage that places more of a burden on WordPress's systems and technical staff. + +## 6. Changes to the Terms + +Openverse is actively developing its product vision and strategy and may limit access to, and/or change the terms that apply to, the Openverse API at any time as plans take shape. +If we make changes that we feel are material, we will make reasonable efforts to update developers who we know are actively using the Openverse API. +Your continued use of the Openverse API after new and/or revised API Terms are effective indicates that you have read, understood, and agreed to those terms. + +## 7. Termination + +Openverse may modify, suspend, or terminate the operation of, or access to, the Openverse API at any time for any reason. +Additionally, your individual access to, and use of, the Openverse API may be terminated by Openverse at any time and for any reason. diff --git a/api/terms_of_service.html b/api/terms_of_service.html deleted file mode 100644 index 22c96b45e..000000000 --- a/api/terms_of_service.html +++ /dev/null @@ -1,3 +0,0 @@ - - -

Openverse API Terms of Use

Effective as of 13 February 2019

1. Your Agreement to the Terms

Thank you for using the Openverse Catalog application programming interface (“Openverse API”). BY USING THE CC CATALOG API, YOU ACKNOWLEDGE THAT YOU HAVE READ, UNDERSTOOD, AND AGREED TO BE BOUND BY THESE API TERMS OF USE (hereafter, “API Terms”). By using the Openverse API, you also represent that you have the legal authority to accept the API Terms on behalf of yourself and any party you represent in connection with your use of the Openverse API. If you do not agree to the API Terms, you are not authorized to use the Openverse API.

2. Licensed Uses and Restrictions

In connection with your use of the Openverse API:

  1. You must adhere to all rate limits, registration requirements, and comply with all requirements in the Openverse API documentation; 
  2. You must not scrape the content in the CC Catalog;
  3. You must not use multiple machines to circumvent rate limits or otherwise take measures to bypass our technical or security measures;
  4. You must not operate in a way that negatively affects other users of the API or impedes CC’s ability to provide its services;
  5. You must respect and comply with the terms and conditions applicable to the content and metadata accessible through the Openverse API, including by providing proper attribution to CC-licensed works and respecting the terms and conditions of platforms hosting CC-licensed works.
  6. You must not, and the products you develop must not encourage others to, violate any laws, regulations, or rights of any other person or entity, including intellectual property rights.
  7. You must comply with the Openverse Master Terms of Use.

3. Content and Data Available through the API

The Openverse API aggregates metadata about CC-licensed content hosted on websites managed by third parties. Openverse does not own or control the content or data made available through the API, and does not verify its licensing status or make any representations or warranties about the content or data whatsoever. You are responsible for independently verifying whether you have the right to use the content and data and what terms and conditions apply to your use.

4. Openverse Trademark Use

If you develop an application or other product or service using the Openverse API, you must prominently indicate that it was made using the Openverse API but is not endorsed or certified by Openverse. You must comply with the Openverse Trademark Policy for all use of the Creative Commons logos and other trademarks.

5. Fees

To help ensure the sustainability of the CC Search project, Openverse reserves the right to charge fees for commercial uses of the Openverse API and/or for heavy usage that places more of a burden on CC’s systems and technical staff.  

6. Changes to the Terms

Openverse is actively developing its product vision and strategy and may limit access to, and/or change the terms that apply to, the Openverse API at any time as plans take shape. If we make changes that we feel are material, we will make reasonable efforts to update developers who we know are actively using the CC Catalog API. Your continued use of the Openverse API after new and/or revised API Terms are effective indicates that you have read, understood, and agreed to those terms.

7. Termination

Openverse may modify, suspend, or terminate the operation of, or access to, the Openverse API at any time for any reason. Additionally, your individual access to, and use of, the Openverse API may be terminated by Openverse at any time and for any reason.

8. Relationship with the Master Terms of Use

These API Terms are incorporated into the Openverse Master Terms of Use. If there is any contradiction between these API Terms and the Openverse Master Terms of Use, then these API Terms control with respect to the contradicting terms, but solely regarding your use of the CC Catalog API. In all other cases, the Openverse Master Terms of Use apply to your use of any website, information, product, or service provided by Openverse.

From 8e4a77f0dc046eb8318f624e08a58f5695a0fd86 Mon Sep 17 00:00:00 2001 From: Madison Swain-Bowden Date: Wed, 4 May 2022 12:17:22 -0700 Subject: [PATCH 03/10] Add TOS to sidebar --- api/docs/index.md | 1 + 1 file changed, 1 insertion(+) diff --git a/api/docs/index.md b/api/docs/index.md index 26ff1223b..f95808497 100644 --- a/api/docs/index.md +++ b/api/docs/index.md @@ -9,6 +9,7 @@ This documentation is focused towards developers who are building the Openverse guides/index reference/index +terms_of_service ``` ```{toctree} From cc252cc6b1f4ff8054631a48b39144174d37567e Mon Sep 17 00:00:00 2001 From: Madison Swain-Bowden Date: Wed, 4 May 2022 13:43:11 -0700 Subject: [PATCH 04/10] Update TOS page --- api/catalog/urls/swagger.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/catalog/urls/swagger.py b/api/catalog/urls/swagger.py index 48a2acdc1..86c05c94d 100644 --- a/api/catalog/urls/swagger.py +++ b/api/catalog/urls/swagger.py @@ -14,7 +14,7 @@ with open(description_path, "r") as description_file: description = description_file.read() -tos_url = "https://api.openverse.engineering/terms_of_service.html" +tos_url = "https://wordpress.github.io/openverse-api/terms_of_service.html" license_url = "https://github.com/WordPress/openverse-api/blob/HEAD/LICENSE" logo_url = "https://raw.githubusercontent.com/WordPress/openverse/HEAD/brand/logo.svg" schema_view = get_schema_view( From baa93a249485790c689cd952c9b0f96fb5b5cf15 Mon Sep 17 00:00:00 2001 From: Madison Swain-Bowden Date: Wed, 4 May 2022 13:44:07 -0700 Subject: [PATCH 05/10] Use -> Service --- api/docs/terms_of_service.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/docs/terms_of_service.md b/api/docs/terms_of_service.md index 90ccaeadd..8f0236c13 100644 --- a/api/docs/terms_of_service.md +++ b/api/docs/terms_of_service.md @@ -1,4 +1,4 @@ -# Openverse API Terms of Use +# Openverse API Terms of Service _Effective as of 4 May 2022_ From 828ffb90832ae5f1c932574c424237b9987fab09 Mon Sep 17 00:00:00 2001 From: Madison Swain-Bowden Date: Wed, 4 May 2022 15:11:56 -0700 Subject: [PATCH 06/10] Grammatic improvements Co-authored-by: sarayourfriend <24264157+sarayourfriend@users.noreply.github.com> Co-authored-by: Zack Krida --- api/docs/terms_of_service.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/api/docs/terms_of_service.md b/api/docs/terms_of_service.md index 8f0236c13..f764c2dac 100644 --- a/api/docs/terms_of_service.md +++ b/api/docs/terms_of_service.md @@ -16,9 +16,9 @@ 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; - You must not use multiple machines to circumvent rate limits or otherwise take measures to bypass our technical or security measures; - - You must not operate in a way that negatively affects other users of the API or impedes WordPress's ability to provide its services; + - You must not operate in a way that negatively affects other users of the API or impedes the WordPress Foundation's ability to provide its services; - You must respect and comply with the terms and conditions applicable to the content and metadata accessible through the Openverse API, including by providing proper attribution to CC-licensed works and respecting the terms and conditions of platforms hosting CC-licensed works. - - You must not, and the products you develop must not encourage others to, violate any laws, regulations, or rights of any other person or entity, including intellectual property rights. + - You must not, and the products you develop must not, encourage others to violate any laws, regulations, or rights of any other person or entity, including intellectual property rights. ## 3. Content and Data Available through the API @@ -33,13 +33,13 @@ You must comply with the [WordPress Foundation Trademark Policy](https://wordpre ## 5. Fees -To help ensure the sustainability of the Openverse project, Openverse reserves the right to charge fees for commercial uses of the Openverse API and/or for heavy usage that places more of a burden on WordPress's systems and technical staff. +To help ensure the sustainability of the Openverse project, Openverse reserves the right to charge fees for commercial uses of the Openverse API and/or for heavy usage that places more of a burden on the financial supporters of the WordPress Foundation and the maintainers of its systems. ## 6. Changes to the Terms Openverse is actively developing its product vision and strategy and may limit access to, and/or change the terms that apply to, the Openverse API at any time as plans take shape. If we make changes that we feel are material, we will make reasonable efforts to update developers who we know are actively using the Openverse API. -Your continued use of the Openverse API after new and/or revised API Terms are effective indicates that you have read, understood, and agreed to those terms. +Your continued use of the Openverse API after new and/or revised API Terms are effective indications that you have read, understood, and agreed to those terms. ## 7. Termination From 9e88f4e2afea45fec93d54b4f8717d542622afa6 Mon Sep 17 00:00:00 2001 From: Madison Swain-Bowden Date: Wed, 4 May 2022 16:10:42 -0700 Subject: [PATCH 07/10] Add link to CC licenses --- api/docs/terms_of_service.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/docs/terms_of_service.md b/api/docs/terms_of_service.md index f764c2dac..6e823eb78 100644 --- a/api/docs/terms_of_service.md +++ b/api/docs/terms_of_service.md @@ -17,7 +17,7 @@ In connection with your use of the Openverse API: - You must not scrape the content in the Openverse Catalog; - You must not use multiple machines to circumvent rate limits or otherwise take measures to bypass our technical or security measures; - You must not operate in a way that negatively affects other users of the API or impedes the WordPress Foundation's ability to provide its services; - - You must respect and comply with the terms and conditions applicable to the content and metadata accessible through the Openverse API, including by providing proper attribution to CC-licensed works and respecting the terms and conditions of platforms hosting CC-licensed works. + - You must respect and comply with the terms and conditions applicable to the content and metadata accessible through the Openverse API, including by providing proper attribution to [CC-licensed](https://creativecommons.org/licenses/) works and respecting the terms and conditions of platforms hosting CC-licensed works. - You must not, and the products you develop must not, encourage others to violate any laws, regulations, or rights of any other person or entity, including intellectual property rights. ## 3. Content and Data Available through the API From b3dae37c6cff7a59f6661fa1ccf2af8ea71287cf Mon Sep 17 00:00:00 2001 From: Madison Swain-Bowden Date: Wed, 4 May 2022 16:11:11 -0700 Subject: [PATCH 08/10] Update legal entity on license --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index 7aa9f4aaa..72b299e64 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2018 Creative Commons +Copyright (c) 2022 WordPress Foundation Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal From 924054f84d15422a9b6d40e15fb749cc271147ca Mon Sep 17 00:00:00 2001 From: Madison Swain-Bowden Date: Thu, 5 May 2022 10:01:00 -0700 Subject: [PATCH 09/10] Update copyright body --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index 72b299e64..0d18f19d2 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2022 WordPress Foundation +Copyright (c) 2022 the contributors Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal From 03f6a2fbdb7b67f3f728d9ec35834a1e72ad1c57 Mon Sep 17 00:00:00 2001 From: Madison Swain-Bowden Date: Thu, 5 May 2022 10:01:20 -0700 Subject: [PATCH 10/10] Update date Co-authored-by: sarayourfriend <24264157+sarayourfriend@users.noreply.github.com> --- api/docs/terms_of_service.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/docs/terms_of_service.md b/api/docs/terms_of_service.md index 6e823eb78..3fc1357c8 100644 --- a/api/docs/terms_of_service.md +++ b/api/docs/terms_of_service.md @@ -1,6 +1,6 @@ # Openverse API Terms of Service -_Effective as of 4 May 2022_ +_Effective as of 5 May 2022_ ## 1. Your Agreement to the Terms