From 54c129bf34a009f12288c64a752fe6e0115da1a8 Mon Sep 17 00:00:00 2001 From: Roxedus Date: Tue, 16 Jul 2024 00:59:20 +0000 Subject: [PATCH 1/4] rename base block --- templates/base.html | 2 +- templates/error.html | 2 +- templates/index.html | 2 +- templates/oauth_complete.html | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/templates/base.html b/templates/base.html index c9444d2..f08771e 100644 --- a/templates/base.html +++ b/templates/base.html @@ -11,7 +11,7 @@
- {% block oauth_box %} + {% block content_box %} {% endblock %}
diff --git a/templates/error.html b/templates/error.html index 6a9ca23..1a1d805 100644 --- a/templates/error.html +++ b/templates/error.html @@ -4,7 +4,7 @@ Norsk Programmering Github Oauth {% endblock %} -{% block oauth_box %} +{% block content_box %}

Whoops

{{code}}
diff --git a/templates/index.html b/templates/index.html index 003f0be..e8ddb2d 100644 --- a/templates/index.html +++ b/templates/index.html @@ -4,7 +4,7 @@ Norsk Programmering Bot Server {% endblock %} -{% block oauth_box %} +{% block content_box %}

Hei du!

Her er det ikke mye spennende, sjekk heller ut diff --git a/templates/oauth_complete.html b/templates/oauth_complete.html index 78eac35..9054391 100644 --- a/templates/oauth_complete.html +++ b/templates/oauth_complete.html @@ -7,7 +7,7 @@ -{% block oauth_box %} +{% block content_box %}

Verifisert!

{{name}} From 6c607f1945db62f8db9fda12a6c25efb3092d759 Mon Sep 17 00:00:00 2001 From: Roxedus Date: Tue, 16 Jul 2024 00:59:57 +0000 Subject: [PATCH 2/4] Add terms of service --- cogs/utils/server.py | 11 +++++++ templates/markdown.html | 19 +++++++++++ terms-of-service.md | 71 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 101 insertions(+) create mode 100644 templates/markdown.html create mode 100644 terms-of-service.md diff --git a/cogs/utils/server.py b/cogs/utils/server.py index 251da99..8948f78 100644 --- a/cogs/utils/server.py +++ b/cogs/utils/server.py @@ -7,6 +7,7 @@ import requests from flask import Flask, redirect, render_template, request +from markupsafe import Markup app = Flask(__name__, static_folder="../../static", template_folder="../../templates") @@ -27,6 +28,16 @@ def _index(): return render_template("index.html") +@app.route("/tos") +@app.route("/terms-of-service") +@app.route("/terms") +def _tos(): + with open("terms-of-service.md") as f: + file_content = f.read() + + return render_template("markdown.html", markdown=Markup(file_content)) + + @app.errorhandler(404) def _page_not_found(e): return render_template("error.html", error=e, code=404), 404 diff --git a/templates/markdown.html b/templates/markdown.html new file mode 100644 index 0000000..5780992 --- /dev/null +++ b/templates/markdown.html @@ -0,0 +1,19 @@ + + + + + + Terms of Service + + + + +
+ + + + + \ No newline at end of file diff --git a/terms-of-service.md b/terms-of-service.md new file mode 100644 index 0000000..a5c3bd3 --- /dev/null +++ b/terms-of-service.md @@ -0,0 +1,71 @@ +# Terms and Conditions + +Last updated: July 15, 2024 + +Please read these terms and conditions carefully before using Our Service. + +## Interpretation and Definitions + +### Interpretation + +The words of which the initial letter is capitalized have meanings defined under the following conditions. The following definitions shall have the same meaning regardless of whether they appear in singular or in plural. + +### Definitions + +For the purposes of these Terms and Conditions: + + + +- __Affiliate__ means an entity that controls, is controlled by or is under common control with a party, where "control" means ownership of 50% or more of the shares, equity interest or other securities entitled to vote for election of directors or other managing authority. + +- __Country__ refers to: Norway +- __Company__ (referred to as either "the Company", "We", "Us" or "Our" in this Agreement) refers to Progbott. + +- __Device__ means any device that can access the Service such as a computer, a cellphone or a digital tablet. + + + +- __Service__ refers to the Website. + + +- __Terms and Conditions__ (also referred as "Terms") mean these Terms and Conditions that form the entire agreement between You and the Company regarding the use of the Service. +- __Third-party Social Media Service__ means any services or content (including data, information, products or services) provided by a third-party that may be displayed, included or made available by the Service. +- __Website__ refers to Progbott, accessible from [https://progbot.roxedus.net](https://progbot.roxedus.net) +- __You__ means the individual accessing or using the Service, or the company, or other legal entity on behalf of which such individual is accessing or using the Service, as applicable. + +## Acknowledgment + +These are the Terms and Conditions governing the use of this Service and the agreement that operates between You and the Company. These Terms and Conditions set out the rights and obligations of all users regarding the use of the Service. + +Your access to and use of the Service is conditioned on Your acceptance of and compliance with these Terms and Conditions. These Terms and Conditions apply to all visitors, users and others who access or use the Service. + +By accessing or using the Service You agree to be bound by these Terms and Conditions. If You disagree with any part of these Terms and Conditions then You may not access the Service. + + +Your access to and use of the Service is also conditioned on Your acceptance of and compliance with the Privacy Policy of the Company. Our Privacy Policy describes Our policies and procedures on the collection, use and disclosure of Your personal information when You use the Application or the Website and tells You about Your privacy rights and how the law protects You. Please read Our Privacy Policy carefully before using Our Service. + + + + + +## Links to Other Websites + +Our Service may contain links to third-party web sites or services that are not owned or controlled by the Company. + +The Company has no control over, and assumes no responsibility for, the content, privacy policies, or practices of any third party web sites or services. You further acknowledge and agree that the Company shall not be responsible or liable, directly or indirectly, for any damage or loss caused or alleged to be caused by or in connection with the use of or reliance on any such content, goods or services available on or through any such web sites or services. + +We strongly advise You to read the terms and conditions and privacy policies of any third-party web sites or services that You visit. + + +## Changes to These Terms and Conditions + +We reserve the right, at Our sole discretion, to modify or replace these Terms at any time. If a revision is material We will make reasonable efforts to provide at least 30 days' notice prior to any new terms taking effect. What constitutes a material change will be determined at Our sole discretion. + +By continuing to access or use Our Service after those revisions become effective, You agree to be bound by the revised terms. If You do not agree to the new terms, in whole or in part, please stop using the website and the Service. + +## Contact Us + +If you have any questions about these Terms and Conditions, You can contact us: + + +- By email: progbott[at]roxedus.dev \ No newline at end of file From 505592bb09761bc2b3cd5c9bc9e356d1ccd2bb15 Mon Sep 17 00:00:00 2001 From: Roxedus Date: Tue, 16 Jul 2024 01:18:49 +0000 Subject: [PATCH 3/4] Add privacy policy --- cogs/utils/server.py | 9 ++++ privacy-policy.md | 124 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 133 insertions(+) create mode 100644 privacy-policy.md diff --git a/cogs/utils/server.py b/cogs/utils/server.py index 8948f78..01719ec 100644 --- a/cogs/utils/server.py +++ b/cogs/utils/server.py @@ -38,6 +38,15 @@ def _tos(): return render_template("markdown.html", markdown=Markup(file_content)) +@app.route("/privacy") +@app.route("/privacy-policy") +def _privacy(): + with open("privacy-policy.md") as f: + file_content = f.read() + + return render_template("markdown.html", markdown=Markup(file_content)) + + @app.errorhandler(404) def _page_not_found(e): return render_template("error.html", error=e, code=404), 404 diff --git a/privacy-policy.md b/privacy-policy.md new file mode 100644 index 0000000..1f19653 --- /dev/null +++ b/privacy-policy.md @@ -0,0 +1,124 @@ +# Privacy Policy + +Last updated: July 16, 2024 + +This Privacy Policy describes Our policies and procedures on the collection, use and disclosure of Your information when You use the Service and tells You about Your privacy rights and how the law protects You. + +We use Your Personal data to provide and improve the Service. By using the Service, You agree to the collection and use of information in accordance with this Privacy Policy. + +## Interpretation and Definitions + +### Interpretation + +The words of which the initial letter is capitalized have meanings defined under the following conditions. The following definitions shall have the same meaning regardless of whether they appear in singular or in plural. + +### Definitions + +For the purposes of this Privacy Policy: + +- __Account__ means a unique account created for You to access our Service or parts of our Service. +- __Affiliate__ means an entity that controls, is controlled by or is under common control with a party, where "control" means ownership of 50% or more of the shares, equity interest or other securities entitled to vote for election of directors or other managing authority. + + + +- __Company__ (referred to as either "the Company", "We", "Us" or "Our" in this Agreement) refers to ProgBott. + + + +- __Cookies__ are small files that are placed on Your computer, mobile device or any other device by a website, containing the details of Your browsing history on that website among its many uses. + +- __Country__ refers to: Norway + +- __Device__ means any device that can access the Service such as a computer, a cellphone or a digital tablet. + + + +- __Personal Data__ is any information that relates to an identified or identifiable individual. + + + + +- __Service__ refers to the Website. + +- __Service Provider__ means any natural or legal person who processes the data on behalf of the Company. It refers to third-party companies or individuals employed by the Company to facilitate the Service, to provide the Service on behalf of the Company, to perform services related to the Service or to assist the Company in analyzing how the Service is used. + + +- __Usage Data__ refers to data collected automatically, either generated by the use of the Service or from the Service infrastructure itself (for example, the duration of a page visit). + + +- __Website__ refers to ProgBott, accessible from [https://progbott.roxedus.net](https://progbott.roxedus.net) + +- __You__ means the individual accessing or using the Service, or the company, or other legal entity on behalf of which such individual is accessing or using the Service, as applicable. + + +## Collecting and Using Your Personal Data + +### Types of Data Collected + +#### Personal Data + +While using Our Service, We may ask You to provide Us with certain personally identifiable information that can be used to contact or identify You. Personally identifiable information may include, but is not limited to: + + +- Usage Data + +#### Usage Data + +Usage Data is collected automatically when using the Service. + +Usage Data may include information such as Your Device's Internet Protocol address (e.g. IP address), browser type, browser version, the pages of our Service that You visit, the time and date of Your visit, the time spent on those pages, unique device identifiers and other diagnostic data. + +When You access the Service by or through a mobile device, We may collect certain information automatically, including, but not limited to, the type of mobile device You use, Your mobile device unique ID, the IP address of Your mobile device, Your mobile operating system, the type of mobile Internet browser You use, unique device identifiers and other diagnostic data. + +We may also collect information that Your browser sends whenever You visit our Service or when You access the Service by or through a mobile device. + + +### Use of Your Personal Data + +The Company may use Personal Data for the following purposes: + +- __To provide and maintain our Service__, including to monitor the usage of our Service. + +### Retention of Your Personal Data + +The Company will retain Your Personal Data only for as long as is necessary for the purposes set out in this Privacy Policy. We will retain and use Your Personal Data to the extent necessary to comply with our legal obligations (for example, if we are required to retain your data to comply with applicable laws), resolve disputes, and enforce our legal agreements and policies. + +The Company will also retain Usage Data for internal analysis purposes. Usage Data is generally retained for a shorter period of time, except when this data is used to strengthen the security or to improve the functionality of Our Service, or We are legally obligated to retain this data for longer time periods. + +### Delete Your Personal Data + +You have the right to delete or request that We assist in deleting the Personal Data that We have collected about You. + +Our Service may give You the ability to delete certain information about You from within the Service. + +You may update, amend, or delete Your information at any time by signing in to Your Account, if you have one, and visiting the account settings section that allows you to manage Your personal information. You may also contact Us to request access to, correct, or delete any personal information that You have provided to Us. + +Please note, however, that We may need to retain certain information when we have a legal obligation or lawful basis to do so. + +## Children's Privacy + +Our Service does not address anyone under the age of 13. We do not knowingly collect personally identifiable information from anyone under the age of 13. If You are a parent or guardian and You are aware that Your child has provided Us with Personal Data, please contact Us. If We become aware that We have collected Personal Data from anyone under the age of 13 without verification of parental consent, We take steps to remove that information from Our servers. + +If We need to rely on consent as a legal basis for processing Your information and Your country requires consent from a parent, We may require Your parent's consent before We collect and use that information. + + +## Links to Other Websites + +Our Service may contain links to other websites that are not operated by Us. If You click on a third party link, You will be directed to that third party's site. We strongly advise You to review the Privacy Policy of every site You visit. + +We have no control over and assume no responsibility for the content, privacy policies or practices of any third party sites or services. + +## Changes to this Privacy Policy + +We may update Our Privacy Policy from time to time. We will notify You of any changes by posting the new Privacy Policy on this page. + +We will let You know via email and/or a prominent notice on Our Service, prior to the change becoming effective and update the "Last updated" date at the top of this Privacy Policy. + +You are advised to review this Privacy Policy periodically for any changes. Changes to this Privacy Policy are effective when they are posted on this page. + +## Contact Us + +If you have any questions about this Privacy Policy, You can contact us: + + +- By email: progbott@roxedus.net \ No newline at end of file From 1e4857cdd0024fd5aad8814a27c07f5fe440459a Mon Sep 17 00:00:00 2001 From: Roxedus Date: Tue, 16 Jul 2024 01:19:14 +0000 Subject: [PATCH 4/4] Bump version --- cogs/utils/Bot_version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cogs/utils/Bot_version.py b/cogs/utils/Bot_version.py index 83e7bc6..5fbd0fd 100644 --- a/cogs/utils/Bot_version.py +++ b/cogs/utils/Bot_version.py @@ -1 +1 @@ -bot_version = "0.1.16" +bot_version = "0.1.17"