From 536952d2839520429db7156e334030a63ef6e27e Mon Sep 17 00:00:00 2001 From: Avris Date: Tue, 7 Sep 2021 20:01:52 +0200 Subject: [PATCH] new license and terms of service --- LICENSE.md | 48 ++++++++++++++ README.md | 7 +- locale/de/translations.suml | 4 +- locale/en/translations.suml | 4 +- locale/es/translations.suml | 4 +- locale/fr/translations.suml | 4 +- locale/nl/translations.suml | 4 +- locale/no/translations.suml | 4 +- locale/pl/translations.suml | 5 +- locale/pt/translations.suml | 5 +- locale/yi/translations.suml | 4 +- locale/zh/translations.suml | 5 +- nuxt.config.js | 1 + routes/blogEntry.vue | 24 +------ routes/license.vue | 30 +++++++++ routes/terms.vue | 41 ++++++++---- src/forbidden.js | 2 + src/parseMarkdown.js | 25 ++++++++ static/img/mit.svg | 124 ------------------------------------ 19 files changed, 149 insertions(+), 196 deletions(-) create mode 100644 LICENSE.md create mode 100644 routes/license.vue create mode 100644 src/parseMarkdown.js delete mode 100644 static/img/mit.svg diff --git a/LICENSE.md b/LICENSE.md new file mode 100644 index 00000000..fbf6d841 --- /dev/null +++ b/LICENSE.md @@ -0,0 +1,48 @@ +# Opinionated Queer License v1.0 + +(OQL-1.0) + +© Copyright [Andrea Prusinowsku](https://avris.it), [Kolektyw „Rada Języka Neutralnego”](https://zaimki.pl/kolektyw-rjn) + +## Permissions + +The creators of this Work (“The Licensor”) grant permission, except as prohibited below, +to any individual, group, organization, charity, business entity or university (“The User”), +to use, copy, modify, merge, publish, and distribute the Work, including software, its source code, documentation, and non-software content, +subject to the following conditions: + +## Obligations + +The User must give appropriate credit to the Licensor, +provide a copy of this license or a link to this license, +and indicate if and what kind of changes were made. +The User may do so in any reasonable manner, +but not in any way that suggests the Licensor endorses the User or their use. + +## Prohibitions + +No individual or entity may use this Work for prejudiced or bigoted purposes, including but not limited to: +racism, xenophobia, queerphobia, queer exclusionism, homophobia, transphobia, enbyphobia, misogyny. + +No law enforcement, carceral institutions, immigration enforcement entities, military entities, or military contractors +may use the Work for any reason. + +No business entity where the ratio of pay (salaried, freelance, stocks, or other benefits) +between the highest and lowest individual in the entity is greater than 50 : 1 +may use the Work for any reason. + +Unless the User has made substantial changes in the Work, +or uses it only as a part of a new work (eg. as a library, as a part of an anthology, etc.), +they are prohibited from selling the Work. + +## Sanctions + +If the Licensor notifies the User that they have not complied with the rules of the license, +they can keep their license by complying within 30 days after the notice. +If they do not do so, their license ends immediately. + +## Warranty + +This Work is provided “as is”, without warranty of any kind, express or implied. +The Licensor will not be liable to anyone for any damages related to the Work or this license, +under any kind of legal claim as far as the law allows. diff --git a/README.md b/README.md index 108969f5..3a41fa2b 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Zaimki +# Zaimki.pl / Pronouns.page ## Build Setup @@ -19,6 +19,5 @@ $ nuxt start ``` ## Copyright - - * **Author:** Andrea [(Avris.it)](https://avris.it) - * **Licence:** [MIT](https://mit.avris.it) + +See [LICENSE](./LICENSE.md) diff --git a/locale/de/translations.suml b/locale/de/translations.suml index 4b3aba4d..6ffdcf51 100644 --- a/locale/de/translations.suml +++ b/locale/de/translations.suml @@ -469,9 +469,7 @@ crud: footer: license: > - {https://gitlab.com/Avris/Zaimki=Der Quellcode} ist unter der {https://mit.avris.it=MIT} [mit.svg] Lizenz veröffentlicht.
- Das Inhalt unter der {https://creativecommons.org/licenses/by-nc-sa/4.0=CC BY-NC-SA 4.0} - [b:creative-commons][b:creative-commons-by][b:creative-commons-nc-eu][b:creative-commons-sa]. + {https://gitlab.com/Avris/Zaimki=Der Quellcode} und das Inhalt sind unter der {/license=OQL 1.0} Lizenz veröffentlicht. links: 'Kontakt, Social Media, Support' notFound: diff --git a/locale/en/translations.suml b/locale/en/translations.suml index 43e1c17c..d1dc8b30 100644 --- a/locale/en/translations.suml +++ b/locale/en/translations.suml @@ -574,9 +574,7 @@ crud: footer: license: > - {https://gitlab.com/Avris/Zaimki=Source code} is licensed under {https://mit.avris.it=MIT} [mit.svg].
- Content is licensed under {https://creativecommons.org/licenses/by-nc-sa/4.0=CC BY-NC-SA 4.0} - [b:creative-commons][b:creative-commons-by][b:creative-commons-nc-eu][b:creative-commons-sa]. + {https://gitlab.com/Avris/Zaimki=Source code} and content are licensed under {/license=OQL 1.0}. links: 'Contact, social media, support' notFound: diff --git a/locale/es/translations.suml b/locale/es/translations.suml index 76fc97c9..51ad7669 100644 --- a/locale/es/translations.suml +++ b/locale/es/translations.suml @@ -482,9 +482,7 @@ crud: footer: license: > - {https://gitlab.com/Avris/Zaimki=El código fuente} está publicado bajo la licencia {https://mit.avris.it=MIT} [mit.svg].
- El contenido está publicado bajo la licencia {https://creativecommons.org/licenses/by-nc-sa/4.0/deed.es=CC BY-NC-SA 4.0} - [b:creative-commons][b:creative-commons-by][b:creative-commons-nc-eu][b:creative-commons-sa]. + {https://gitlab.com/Avris/Zaimki=El código fuente} y el contenido estan publicado bajo la licencia {/license=OQL 1.0}. links: 'Contacto, redes sociales, apoyo' notFound: diff --git a/locale/fr/translations.suml b/locale/fr/translations.suml index f356bbc9..1e4f8855 100644 --- a/locale/fr/translations.suml +++ b/locale/fr/translations.suml @@ -476,9 +476,7 @@ crud: footer: license: > - {https://gitlab.com/Avris/Zaimki=Source code} est sous la licence {https://mit.avris.it=MIT} [mit.svg].
- Le contenu est sous la licence {https://creativecommons.org/licenses/by-nc-sa/4.0/deed.de=CC BY-NC-SA 4.0} - [b:creative-commons][b:creative-commons-by][b:creative-commons-nc-eu][b:creative-commons-sa]. + {https://gitlab.com/Avris/Zaimki=Kod źródłowy} et le contenu sont sous licence {/license=OQL 1.0}. links: 'Contact, réseaux sociaux, soutien' notFound: diff --git a/locale/nl/translations.suml b/locale/nl/translations.suml index 10ca0f80..08dbf668 100644 --- a/locale/nl/translations.suml +++ b/locale/nl/translations.suml @@ -465,9 +465,7 @@ crud: footer: license: > - {https://gitlab.com/Avris/Zaimki=Source De broncode wordt} onder de {https://mit.avris.it=MIT}-licentie [mit.svg].
- De inhoud wordt onder de {https://creativecommons.org/licenses/by-nc-sa/4.0/deed.nl=CC BY-NC-SA 4.0}-licentie - [b:creative-commons][b:creative-commons-by][b:creative-commons-nc-eu][b:creative-commons-sa]. + {https://gitlab.com/Avris/Zaimki=De broncode} en inhoud vallen onder de {/license=OQL 1.0} licentie. links: 'Contact, sociale media, support' notFound: diff --git a/locale/no/translations.suml b/locale/no/translations.suml index b41b99d9..c40eb0cb 100644 --- a/locale/no/translations.suml +++ b/locale/no/translations.suml @@ -476,9 +476,7 @@ crud: footer: license: > - {https://gitlab.com/Avris/Zaimki=Source code} er lisensiert under {https://mit.avris.it=MIT} [mit.svg].
- Innholdet er lisensiert under {https://creativecommons.org/licenses/by-nc-sa/4.0=CC BY-NC-SA 4.0} - [b:creative-commons][b:creative-commons-by][b:creative-commons-nc-eu][b:creative-commons-sa]. + {https://gitlab.com/Avris/Zaimki=Kildekode} og Innholdet er lisensiert under {/license=OQL 1.0} lisensen. links: 'Kontakt, sosiale medier, hjelp' notFound: diff --git a/locale/pl/translations.suml b/locale/pl/translations.suml index 84dc27b7..4847c63d 100644 --- a/locale/pl/translations.suml +++ b/locale/pl/translations.suml @@ -1139,11 +1139,8 @@ crud: loginRequired: '{/konto=Zaloguj się}, aby zgłosić wpis' footer: - source: 'Kod jest {https://gitlab.com/Avris/Zaimki=udostępniony} na licencji {https://mit.avris.it=MIT}.' license: > - {https://gitlab.com/Avris/Zaimki=Kod źródłowy} jest udostępniony na licencji {https://mit.avris.it=MIT} [mit.svg].
- Treści są udostępnione na licencji {https://creativecommons.org/licenses/by-nc-sa/4.0/deed.pl=CC BY-NC-SA 4.0} - [b:creative-commons][b:creative-commons-by][b:creative-commons-nc-eu][b:creative-commons-sa]. + {https://gitlab.com/Avris/Zaimki=Kod źródłowy} oraz treści są udostępnione na licencji {/license=OQL 1.0}. links: 'Kontakt, social media, wsparcie' notFound: diff --git a/locale/pt/translations.suml b/locale/pt/translations.suml index 69980ca6..ca731b9c 100644 --- a/locale/pt/translations.suml +++ b/locale/pt/translations.suml @@ -478,11 +478,8 @@ crud: loginRequired: 'Faça {/conta=login} para participar do nosso banco de dados' footer: - source: 'O código fonte está {https://gitlab.com/Avris/Zaimki=publicado} baixo da licença {https://mit.avris.it=MIT}.' license: > - {https://gitlab.com/Avris/Zaimki=Source code} is licensed under {https://mit.avris.it=MIT} [mit.svg].
- Content is licensed under {https://creativecommons.org/licenses/by-nc-sa/4.0/deed.pt=CC BY-NC-SA 4.0} - [b:creative-commons][b:creative-commons-by][b:creative-commons-nc-eu][b:creative-commons-sa]. + {https://gitlab.com/Avris/Zaimki=O código-fonte} e o conteúdo são licenciados sob a licença {/license=OQL 1.0}. links: 'Contato, redes sociais, apoio' notFound: diff --git a/locale/yi/translations.suml b/locale/yi/translations.suml index a973d018..bdb562fe 100644 --- a/locale/yi/translations.suml +++ b/locale/yi/translations.suml @@ -489,9 +489,7 @@ crud: footer: license: > - {https://gitlab.com/Avris/Zaimki=Source code} is licensed under {https://mit.avris.it=MIT} [mit.svg].
- Content is licensed under {https://creativecommons.org/licenses/by-nc-sa/4.0/deed.yi=CC BY-NC-SA 4.0} - [b:creative-commons][b:creative-commons-by][b:creative-commons-nc-eu][b:creative-commons-sa]. + {https://gitlab.com/Avris/Zaimki=Source code} and content are licensed under {/license=OQL 1.0}. links: 'Contact, social media, support' notFound: diff --git a/locale/zh/translations.suml b/locale/zh/translations.suml index fd4ded21..1cc9ed87 100644 --- a/locale/zh/translations.suml +++ b/locale/zh/translations.suml @@ -448,11 +448,8 @@ crud: saved: '更改保存成功' footer: - source: '源代碼{https://gitlab.com/Avris/Zaimki=以}{https://mit.avris.it=MIT}許可發布。' license: > - {https://gitlab.com/Avris/Zaimki=Source code} is licensed under {https://mit.avris.it=MIT} [mit.svg].
- Content is licensed under {https://creativecommons.org/licenses/by-nc-sa/4.0/deed.zh=CC BY-NC-SA 4.0} - [b:creative-commons][b:creative-commons-by][b:creative-commons-nc-eu][b:creative-commons-sa]. + {https://gitlab.com/Avris/Zaimki=Source code} and content are licensed under {/license=OQL 1.0}. links: '通訊錄, 社交媒體, 支持' notFound: diff --git a/nuxt.config.js b/nuxt.config.js index 58a4550f..b2028db4 100644 --- a/nuxt.config.js +++ b/nuxt.config.js @@ -253,6 +253,7 @@ export default { routes.push({path: '/' + config.user.route, component: resolve(__dirname, 'routes/user.vue')}); routes.push({path: '/' + config.user.termsRoute, component: resolve(__dirname, 'routes/terms.vue')}); } + routes.push({ path: '/license', component: resolve(__dirname, 'routes/license.vue') }); routes.push({ path: '/admin', component: resolve(__dirname, 'routes/admin.vue') }); if (config.profile.enabled) { diff --git a/routes/blogEntry.vue b/routes/blogEntry.vue index 2f695379..7d25522e 100644 --- a/routes/blogEntry.vue +++ b/routes/blogEntry.vue @@ -20,31 +20,11 @@ diff --git a/routes/terms.vue b/routes/terms.vue index 168a689e..88ef45d3 100644 --- a/routes/terms.vue +++ b/routes/terms.vue @@ -5,25 +5,25 @@ terms.header -

terms.lastUpdate: 2021-01-26

+

terms.lastUpdate: 2021-09-12

These Terms of Service govern your access to and use of the Service provided on the website - pronouns.page / zaimki.pl operated by a team + pronouns.page / zaimki.pl operated by the “Neutral Language Council” collective who can be contacted via email: contact@pronouns.page.

By using the Services you agree to be bound by these Terms of Service and you consent - to us collecting and processing your data as described in our Privacy Policy. + to us collecting and processing your data as described in our Privacy Policy below.

Users and accounts

- When you create an account with us, you are responsible for safeguarding the password - that you use to access the Service, whether your password is with our Service or a third-party service. - You agree not to disclose your password to any third party. + When you create an account with us, you are responsible for safeguarding the authentication method + that you use to access the Service (that is: password to your email account and/or social media platform). + You agree not to disclose it to any third party. You must notify us immediately when you become aware of any breach of security or unauthorized use of your account.

@@ -61,30 +61,45 @@

We make every effort to store your data securely and to ensure that any non-public data we store - are not seized by or transfered to any third party, except those trusted parties described below. + are not seized by or transferred to any third party, except those trusted parties described below.

- Other than the data that you explicitly post on the Service as Content, - no additional private data is being stored or processed. + Other than the data that you explicitly post on the Service as Content + or share with us implicitly (eg. OAuth access tokens, if you use social login options), + no additional private data connected to your account is being stored or processed.

You may edit or remove any Content you have posted on the Service.

When you contact us by email we store your email address in order to answer you and to ask you follow-up questions.

-

We only use a first-party cookie to keep you logged in.

+

We only use first-party cookies and local storage to keep you logged in and save your preferences.

We use Matomo to track traffic on the website. Such data has no relation to your username, and your IP is anonymised. - You can read more about the data it stores here - and about the cookies it uses here. + You can read more about the data it stores + here + and about the cookies it uses + here. +

+ +

+ We use arc.io to cover the costs of website maintenance without introducing ads. + You can read more about them and their privacy policy + here. +

+ +

+ We use hCaptcha to filter out bots and prevent DDoS attacks. + You can read their privacy policy + here.

Logs and backups are stored for no longer than 18 months.

- Your personal data are protected by the GDPR, which means you can request + Your personal data are protected by the GDPR, which means you have the right to see, correct, update and remove the data we store about you.

diff --git a/src/forbidden.js b/src/forbidden.js index 37f89e96..035a2e18 100644 --- a/src/forbidden.js +++ b/src/forbidden.js @@ -5,7 +5,9 @@ export default [ 'xenophobia', 'homophobia', 'transphobia', + 'enbyphobia', 'queerphobia', + 'queer exclusionism', 'misogyny', 'harassment', 'impersonation', diff --git a/src/parseMarkdown.js b/src/parseMarkdown.js new file mode 100644 index 00000000..5649d438 --- /dev/null +++ b/src/parseMarkdown.js @@ -0,0 +1,25 @@ +export default async function parseMarkdown(markdown) { + try { + const content = '
' + + markdown + .replace(//g, '
') + .replace(/<\/table>/g, '
') + .replace(/]*>'); + const img = imgMatch ? imgMatch[1] : null; + + return { + content, + title, + img, + } + } catch { + return { + content: null, + }; + } +} diff --git a/static/img/mit.svg b/static/img/mit.svg deleted file mode 100644 index 26c689c8..00000000 --- a/static/img/mit.svg +++ /dev/null @@ -1,124 +0,0 @@ - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - -