From 0a767cf5f5f348403a6d4c787e10abb65c098508 Mon Sep 17 00:00:00 2001 From: Thib Date: Fri, 28 Jul 2023 15:57:12 +0200 Subject: [PATCH 01/27] Base structure for the instance picker --- content/public-instances/index.md | 7 + content/public-instances/logos/matrix.org.svg | 13 ++ sass/_public-instances.scss | 66 +++++++++ sass/style.scss | 1 + static/js/public-instances.js | 18 +++ templates/public-instances.html | 132 ++++++++++++++++++ 6 files changed, 237 insertions(+) create mode 100644 content/public-instances/index.md create mode 100644 content/public-instances/logos/matrix.org.svg create mode 100644 sass/_public-instances.scss create mode 100644 static/js/public-instances.js create mode 100644 templates/public-instances.html diff --git a/content/public-instances/index.md b/content/public-instances/index.md new file mode 100644 index 0000000000..450ae3d405 --- /dev/null +++ b/content/public-instances/index.md @@ -0,0 +1,7 @@ ++++ +title = "Matrix Server List" +template = "public-instances.html" +extra.summary = """ +Find a server to securely host your Matrix account. +""" ++++ diff --git a/content/public-instances/logos/matrix.org.svg b/content/public-instances/logos/matrix.org.svg new file mode 100644 index 0000000000..37375707b0 --- /dev/null +++ b/content/public-instances/logos/matrix.org.svg @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/sass/_public-instances.scss b/sass/_public-instances.scss new file mode 100644 index 0000000000..68093fdf4e --- /dev/null +++ b/sass/_public-instances.scss @@ -0,0 +1,66 @@ +.public-instances { + + .total-and-filters { + display: flex; + flex-direction: row; + justify-content: space-between; + flex-wrap: wrap; + + .filters { + margin-inline: 0; + } + + .total { + font-weight: 700; + } + } + + #all-instances { + .project-card { + + color: var(--color-text); + text-align: center; + text-decoration: none; + + &:hover { + color: var(--color-text); + } + + p { + line-height: 140%; + } + + .image-container { + border-radius: 100%; + overflow: hidden; + + img { + display: block; + width: 60px; + height: 60px; + } + } + + ul.details { + padding: 0; + display: flex; + gap: .2rem; + flex-wrap: wrap; + justify-content: center; + + li { + list-style: none; + background: #E9E9E9; + border-radius: 16px; + padding: .375rem .625rem; + + font-style: normal; + font-weight: 400; + font-size: 1rem; + line-height: 120%; + color: #000000; + } + } + } + } +} diff --git a/sass/style.scss b/sass/style.scss index 7dd3f92308..941faa6672 100644 --- a/sass/style.scss +++ b/sass/style.scss @@ -20,3 +20,4 @@ @import '_try-matrix'; @import '_support'; @import '_howitworks'; +@import '_public-instances'; diff --git a/static/js/public-instances.js b/static/js/public-instances.js new file mode 100644 index 0000000000..3a4ceb1895 --- /dev/null +++ b/static/js/public-instances.js @@ -0,0 +1,18 @@ +import { AllOfFilter, AnyOfFilter, refreshCardsView } from "./projects.js"; + +document.addEventListener('DOMContentLoaded', (event) => { + + var filters = []; + let structureFilter = new AnyOfFilter("filter-structure", "all-instances", filters); + let signupFilter = new AnyOfFilter("filter-signup", "all-instances", filters); + let locationFilter = new AnyOfFilter("filter-location", "all-instances", filters); + filters.push( + structureFilter, + signupFilter, + locationFilter, + ); + refreshCardsView("all-instances", filters); + for (const filter of filters) { + filter.refreshActiveState(); + } +}) diff --git a/templates/public-instances.html b/templates/public-instances.html new file mode 100644 index 0000000000..4adef82872 --- /dev/null +++ b/templates/public-instances.html @@ -0,0 +1,132 @@ +{% extends "page.html" %} +{% block head_extra %} + + +{% endblock head_extra %} +{% block content %} +
+
+

{{ page.title }}

+

{{ page.extra.summary }}

+
+
+ +
+ +
+
All servers (90)
+
+
+ +
+
+ + +
+
+ + +
+
+ + +
+
Select -
+
+
+
+ +
+
+ + +
+
+ + +
+
Select -
+
+
+
+ +
+
+ + +
+
+ + +
+
Select -
+
+
+
+
+ +
+ +
+{% endblock content %} From bca957345a14bf2559b639d7df78b565cb90d188 Mon Sep 17 00:00:00 2001 From: Thib Date: Wed, 2 Aug 2023 16:24:48 +0200 Subject: [PATCH 02/27] Render the list dynamically from files --- .../public-instances/{index.md => _index.md} | 0 content/public-instances/matrix-org.md | 11 + .../{logos/matrix.org.svg => matrix-org.svg} | 0 templates/macros/public_instances.html | 514 ++++++++++++++++++ templates/public-instances.html | 65 +-- 5 files changed, 542 insertions(+), 48 deletions(-) rename content/public-instances/{index.md => _index.md} (100%) create mode 100644 content/public-instances/matrix-org.md rename content/public-instances/{logos/matrix.org.svg => matrix-org.svg} (100%) create mode 100644 templates/macros/public_instances.html diff --git a/content/public-instances/index.md b/content/public-instances/_index.md similarity index 100% rename from content/public-instances/index.md rename to content/public-instances/_index.md diff --git a/content/public-instances/matrix-org.md b/content/public-instances/matrix-org.md new file mode 100644 index 0000000000..986d737071 --- /dev/null +++ b/content/public-instances/matrix-org.md @@ -0,0 +1,11 @@ ++++ +title = "Matrix.org" +[extra] +location = "GB" +registration = "unfiltered" +structure = "non-profit" +software = "Synapse 1.89" +terms_of_service = "https://matrix.org/legal/terms-and-conditions/" ++++ + +The largest open network for secure, decentralised communications. diff --git a/content/public-instances/logos/matrix.org.svg b/content/public-instances/matrix-org.svg similarity index 100% rename from content/public-instances/logos/matrix.org.svg rename to content/public-instances/matrix-org.svg diff --git a/templates/macros/public_instances.html b/templates/macros/public_instances.html new file mode 100644 index 0000000000..b7ec010daa --- /dev/null +++ b/templates/macros/public_instances.html @@ -0,0 +1,514 @@ +{% macro registration_label(type) %} +{% if type == "unfiltered" %} +Unfiltered +{% elif type == "conditional" %} +Conditional +{% endif %} +{% endmacro %} + +{% macro country_name(code) %} +{% if code | upper == "AD" %} +Andorra +{% elif code | upper == "AE" %} +United Arab Emirates +{% elif code | upper == "AF" %} +Afghanistan +{% elif code | upper == "AG" %} +Antigua and Barbuda +{% elif code | upper == "AI" %} +Anguilla +{% elif code | upper == "AL" %} +Albania +{% elif code | upper == "AM" %} +Armenia +{% elif code | upper == "AO" %} +Angola +{% elif code | upper == "AQ" %} +Antarctica +{% elif code | upper == "AR" %} +Argentina +{% elif code | upper == "AS" %} +American Samoa +{% elif code | upper == "AT" %} +Austria +{% elif code | upper == "AU" %} +Australia +{% elif code | upper == "AW" %} +Aruba +{% elif code | upper == "AZ" %} +Azerbaijan +{% elif code | upper == "BA" %} +Bosnia and Herzegovina +{% elif code | upper == "BB" %} +Barbados +{% elif code | upper == "BD" %} +Bangladesh +{% elif code | upper == "BE" %} +Belgium +{% elif code | upper == "BF" %} +Burkina Faso +{% elif code | upper == "BG" %} +Bulgaria +{% elif code | upper == "BH" %} +Bahrain +{% elif code | upper == "BI" %} +Burundi +{% elif code | upper == "BJ" %} +Benin +{% elif code | upper == "BL" %} +Saint Barthélemy +{% elif code | upper == "BM" %} +Bermuda +{% elif code | upper == "BN" %} +Brunei +{% elif code | upper == "BO" %} +Bolivia +{% elif code | upper == "BQ" %} +Caribbean Netherlands +{% elif code | upper == "BR" %} +Brazil +{% elif code | upper == "BS" %} +The Bahamas +{% elif code | upper == "BT" %} +Bhutan +{% elif code | upper == "BV" %} +Bouvet Island +{% elif code | upper == "BW" %} +Botswana +{% elif code | upper == "BY" %} +Belarus +{% elif code | upper == "BZ" %} +Belize +{% elif code | upper == "CA" %} +Canada +{% elif code | upper == "CC" %} +Cocos (Keeling) Islands +{% elif code | upper == "CD" %} +Democratic Republic of the Congo +{% elif code | upper == "CF" %} +Central African Republic +{% elif code | upper == "CG" %} +Republic of the Congo +{% elif code | upper == "CH" %} +Switzerland +{% elif code | upper == "CK" %} +Cook Islands +{% elif code | upper == "CL" %} +Chile +{% elif code | upper == "CM" %} +Cameroon +{% elif code | upper == "CN" %} +China +{% elif code | upper == "CO" %} +Colombia +{% elif code | upper == "CR" %} +Costa Rica +{% elif code | upper == "CU" %} +Cuba +{% elif code | upper == "CV" %} +Cape Verde +{% elif code | upper == "CW" %} +Curaçao +{% elif code | upper == "CX" %} +Christmas Island +{% elif code | upper == "CY" %} +Cyprus +{% elif code | upper == "CZ" %} +Czech Republic +{% elif code | upper == "DE" %} +Germany +{% elif code | upper == "DJ" %} +Djibouti +{% elif code | upper == "DK" %} +Denmark +{% elif code | upper == "DM" %} +Dominica +{% elif code | upper == "DO" %} +Dominican Republic +{% elif code | upper == "DZ" %} +Algeria +{% elif code | upper == "EC" %} +Ecuador +{% elif code | upper == "EE" %} +Estonia +{% elif code | upper == "EG" %} +Egypt +{% elif code | upper == "EH" %} +Western Sahara +{% elif code | upper == "ER" %} +Eritrea +{% elif code | upper == "ES" %} +Spain +{% elif code | upper == "ET" %} +Ethiopia +{% elif code | upper == "FI" %} +Finland +{% elif code | upper == "FJ" %} +Fiji +{% elif code | upper == "FK" %} +Falkland Islands +{% elif code | upper == "FM" %} +Federated States of Micronesia +{% elif code | upper == "FO" %} +Faroe Islands +{% elif code | upper == "FR" %} +France +{% elif code | upper == "GA" %} +Gabon +{% elif code | upper == "GB" %} +United Kingdom +{% elif code | upper == "GD" %} +Grenada +{% elif code | upper == "GE" %} +Georgia +{% elif code | upper == "GF" %} +French Guiana +{% elif code | upper == "GG" %} +Bailiwick of Guernsey +{% elif code | upper == "GH" %} +Ghana +{% elif code | upper == "GI" %} +Gibraltar +{% elif code | upper == "GL" %} +Greenland +{% elif code | upper == "GM" %} +Gambia +{% elif code | upper == "GN" %} +Guinea +{% elif code | upper == "GP" %} +Guadeloupe +{% elif code | upper == "GQ" %} +Equatorial Guinea +{% elif code | upper == "GR" %} +Greece +{% elif code | upper == "GS" %} +South Georgia and the South Sandwich Islands +{% elif code | upper == "GT" %} +Guatemala +{% elif code | upper == "GU" %} +Guam +{% elif code | upper == "GW" %} +Guinea-Bissau +{% elif code | upper == "GY" %} +Guyana +{% elif code | upper == "HK" %} +Hong Kong +{% elif code | upper == "HM" %} +Heard Island and McDonald Islands +{% elif code | upper == "HN" %} +Honduras +{% elif code | upper == "HR" %} +Croatia +{% elif code | upper == "HT" %} +Haiti +{% elif code | upper == "HU" %} +Hungary +{% elif code | upper == "ID" %} +Indonesia +{% elif code | upper == "IE" %} +Republic of Ireland +{% elif code | upper == "IL" %} +Israel +{% elif code | upper == "IM" %} +Isle of Man +{% elif code | upper == "IN" %} +India +{% elif code | upper == "IO" %} +British Indian Ocean Territory +{% elif code | upper == "IQ" %} +Iraq +{% elif code | upper == "IR" %} +Iran +{% elif code | upper == "IS" %} +Iceland +{% elif code | upper == "IT" %} +Italy +{% elif code | upper == "JE" %} +Jersey +{% elif code | upper == "JM" %} +Jamaica +{% elif code | upper == "JO" %} +Jordan +{% elif code | upper == "JP" %} +Japan +{% elif code | upper == "KE" %} +Kenya +{% elif code | upper == "KG" %} +Kyrgyzstan +{% elif code | upper == "KH" %} +Cambodia +{% elif code | upper == "KI" %} +Kiribati +{% elif code | upper == "KM" %} +Comoros +{% elif code | upper == "KN" %} +Saint Kitts and Nevis +{% elif code | upper == "KP" %} +North Korea +{% elif code | upper == "KR" %} +South Korea +{% elif code | upper == "KW" %} +Kuwait +{% elif code | upper == "KY" %} +Cayman Islands +{% elif code | upper == "KZ" %} +Kazakhstan +{% elif code | upper == "LA" %} +Laos +{% elif code | upper == "LB" %} +Lebanon +{% elif code | upper == "LC" %} +Saint Lucia +{% elif code | upper == "LI" %} +Liechtenstein +{% elif code | upper == "LK" %} +Sri Lanka +{% elif code | upper == "LR" %} +Liberia +{% elif code | upper == "LS" %} +Lesotho +{% elif code | upper == "LT" %} +Lithuania +{% elif code | upper == "LU" %} +Luxembourg +{% elif code | upper == "LV" %} +Latvia +{% elif code | upper == "LY" %} +Libya +{% elif code | upper == "MA" %} +Morocco +{% elif code | upper == "MC" %} +Monaco +{% elif code | upper == "MD" %} +Moldova +{% elif code | upper == "ME" %} +Montenegro +{% elif code | upper == "MF" %} +Collectivity of Saint Martin +{% elif code | upper == "MG" %} +Madagascar +{% elif code | upper == "MH" %} +Marshall Islands +{% elif code | upper == "MK" %} +North Macedonia +{% elif code | upper == "ML" %} +Mali +{% elif code | upper == "MM" %} +Myanmar +{% elif code | upper == "MN" %} +Mongolia +{% elif code | upper == "MO" %} +Macau +{% elif code | upper == "MP" %} +Northern Mariana Islands +{% elif code | upper == "MQ" %} +Martinique +{% elif code | upper == "MR" %} +Mauritania +{% elif code | upper == "MS" %} +Montserrat +{% elif code | upper == "MT" %} +Malta +{% elif code | upper == "MU" %} +Mauritius +{% elif code | upper == "MV" %} +Maldives +{% elif code | upper == "MW" %} +Malawi +{% elif code | upper == "MX" %} +Mexico +{% elif code | upper == "MY" %} +Malaysia +{% elif code | upper == "MZ" %} +Mozambique +{% elif code | upper == "NA" %} +Namibia +{% elif code | upper == "NC" %} +New Caledonia +{% elif code | upper == "NE" %} +Niger +{% elif code | upper == "NF" %} +Norfolk Island +{% elif code | upper == "NG" %} +Nigeria +{% elif code | upper == "NI" %} +Nicaragua +{% elif code | upper == "NL" %} +Kingdom of the Netherlands +{% elif code | upper == "NO" %} +Norway +{% elif code | upper == "NP" %} +Nepal +{% elif code | upper == "NR" %} +Nauru +{% elif code | upper == "NU" %} +Niue +{% elif code | upper == "NZ" %} +New Zealand +{% elif code | upper == "OM" %} +Oman +{% elif code | upper == "PA" %} +Panama +{% elif code | upper == "PE" %} +Peru +{% elif code | upper == "PF" %} +French Polynesia +{% elif code | upper == "PG" %} +Papua New Guinea +{% elif code | upper == "PH" %} +Philippines +{% elif code | upper == "PK" %} +Pakistan +{% elif code | upper == "PL" %} +Poland +{% elif code | upper == "PM" %} +Saint Pierre and Miquelon +{% elif code | upper == "PN" %} +Pitcairn Islands +{% elif code | upper == "PR" %} +Puerto Rico +{% elif code | upper == "PT" %} +Portugal +{% elif code | upper == "PW" %} +Palau +{% elif code | upper == "PY" %} +Paraguay +{% elif code | upper == "QA" %} +Qatar +{% elif code | upper == "RO" %} +Romania +{% elif code | upper == "RS" %} +Serbia +{% elif code | upper == "RU" %} +Russia +{% elif code | upper == "RW" %} +Rwanda +{% elif code | upper == "SA" %} +Saudi Arabia +{% elif code | upper == "SB" %} +Solomon Islands +{% elif code | upper == "SC" %} +Seychelles +{% elif code | upper == "SD" %} +Sudan +{% elif code | upper == "SE" %} +Sweden +{% elif code | upper == "SG" %} +Singapore +{% elif code | upper == "SH" %} +Saint Helena, Ascension and Tristan da Cunha +{% elif code | upper == "SI" %} +Slovenia +{% elif code | upper == "SJ" %} +Svalbard and Jan Mayen +{% elif code | upper == "SK" %} +Slovakia +{% elif code | upper == "SL" %} +Sierra Leone +{% elif code | upper == "SM" %} +San Marino +{% elif code | upper == "SN" %} +Senegal +{% elif code | upper == "SO" %} +Somalia +{% elif code | upper == "SR" %} +Suriname +{% elif code | upper == "SS" %} +South Sudan +{% elif code | upper == "ST" %} +São Tomé and Príncipe +{% elif code | upper == "SV" %} +El Salvador +{% elif code | upper == "SX" %} +Sint Maarten +{% elif code | upper == "SY" %} +Syria +{% elif code | upper == "SZ" %} +Eswatini +{% elif code | upper == "TC" %} +Turks and Caicos Islands +{% elif code | upper == "TD" %} +Chad +{% elif code | upper == "TF" %} +French Southern and Antarctic Lands +{% elif code | upper == "TG" %} +Togo +{% elif code | upper == "TH" %} +Thailand +{% elif code | upper == "TJ" %} +Tajikistan +{% elif code | upper == "TK" %} +Tokelau +{% elif code | upper == "TL" %} +East Timor +{% elif code | upper == "TM" %} +Turkmenistan +{% elif code | upper == "TN" %} +Tunisia +{% elif code | upper == "TO" %} +Tonga +{% elif code | upper == "TR" %} +Türkiye +{% elif code | upper == "TT" %} +Trinidad and Tobago +{% elif code | upper == "TV" %} +Tuvalu +{% elif code | upper == "TW" %} +Taiwan +{% elif code | upper == "TZ" %} +Tanzania +{% elif code | upper == "UA" %} +Ukraine +{% elif code | upper == "UG" %} +Uganda +{% elif code | upper == "UM" %} +United States Minor Outlying Islands +{% elif code | upper == "US" %} +United States +{% elif code | upper == "UY" %} +Uruguay +{% elif code | upper == "UZ" %} +Uzbekistan +{% elif code | upper == "VA" %} +Vatican City +{% elif code | upper == "VC" %} +Saint Vincent and the Grenadines +{% elif code | upper == "VE" %} +Venezuela +{% elif code | upper == "VG" %} +British Virgin Islands +{% elif code | upper == "VI" %} +United States Virgin Islands +{% elif code | upper == "VN" %} +Vietnam +{% elif code | upper == "VU" %} +Vanuatu +{% elif code | upper == "WF" %} +Wallis and Futuna +{% elif code | upper == "WS" %} +Samoa +{% elif code | upper == "YE" %} +Yemen +{% elif code | upper == "YT" %} +Mayotte +{% elif code | upper == "ZA" %} +South Africa +{% elif code | upper == "ZM" %} +Zambia +{% elif code | upper == "ZW" %} +Zimbabwe +{% endif %} +{% endmacro %} + +{% macro structure_label(type) %} +{% if type == "individual" %} +Individual +{% elif type == "non-profit" %} +Non-profit +{% elif type == "paid-support" %} +Paid +{% endif %} +{% endmacro %} + +{% macro classes(instance) %} +{% endmacro %} diff --git a/templates/public-instances.html b/templates/public-instances.html index 4adef82872..f79420c483 100644 --- a/templates/public-instances.html +++ b/templates/public-instances.html @@ -1,20 +1,23 @@ -{% extends "page.html" %} +{% extends "section.html" %} +{% import "macros/public_instances.html" as instanceutils %} {% block head_extra %} - + {% endblock head_extra %} {% block content %}
-

{{ page.title }}

-

{{ page.extra.summary }}

+

{{ section.title }}

+

{{ section.extra.summary }}

+ {% set instances = section.pages %} +
-
All servers (90)
+
All servers ({{ section.pages | length }})
{% endblock content %} From fe1b6d4dd9f73e7126ab3254e60ca1321b36f5f8 Mon Sep 17 00:00:00 2001 From: Thib Date: Fri, 4 Aug 2023 12:30:52 +0200 Subject: [PATCH 03/27] Adding a few instances --- content/public-instances/archaeo-social.md | 13 ++++++ content/public-instances/matrix-org.md | 4 +- content/public-instances/ownz-at.md | 12 ++++++ sass/_public-instances.scss | 12 ++++++ static/js/public-instances.js | 2 + templates/macros/public_instances.html | 5 +++ templates/public-instances.html | 46 +++++++++++++++++++--- 7 files changed, 87 insertions(+), 7 deletions(-) create mode 100644 content/public-instances/archaeo-social.md create mode 100644 content/public-instances/ownz-at.md diff --git a/content/public-instances/archaeo-social.md b/content/public-instances/archaeo-social.md new file mode 100644 index 0000000000..00efcc1b77 --- /dev/null +++ b/content/public-instances/archaeo-social.md @@ -0,0 +1,13 @@ ++++ +title = "archaeo.social" +[extra] +domain = "matrix.archaeo.social" +location = "CH" +registration = "unfiltered" +structure = "non-profit" +terms_of_service = "https://archaeo.social/about" +software = "Synapse" +version = "1.86.0" ++++ + +An archaeology oriented instance. diff --git a/content/public-instances/matrix-org.md b/content/public-instances/matrix-org.md index 986d737071..f4396d91b5 100644 --- a/content/public-instances/matrix-org.md +++ b/content/public-instances/matrix-org.md @@ -1,10 +1,12 @@ +++ title = "Matrix.org" [extra] +domain = "matrix.org" location = "GB" registration = "unfiltered" structure = "non-profit" -software = "Synapse 1.89" +software = "Synapse" +version = "1.89.0" terms_of_service = "https://matrix.org/legal/terms-and-conditions/" +++ diff --git a/content/public-instances/ownz-at.md b/content/public-instances/ownz-at.md new file mode 100644 index 0000000000..ed5444d29c --- /dev/null +++ b/content/public-instances/ownz-at.md @@ -0,0 +1,12 @@ ++++ +title = "0wnz.at" +[extra] +domain = "0wnz.at" +location = "AT" +registration = "unfiltered" +structure = "individual" +software = "Synapse" +version = "1.89.0" ++++ + +Some description that fits the server diff --git a/sass/_public-instances.scss b/sass/_public-instances.scss index 68093fdf4e..2876e85bdd 100644 --- a/sass/_public-instances.scss +++ b/sass/_public-instances.scss @@ -39,6 +39,17 @@ width: 60px; height: 60px; } + + .avatar { + width: 60px; + height: 60px; + background-color: #000000; + color: #fff; + display: flex; + flex-direction: column; + justify-content: center; + font-size: 32px; + } } ul.details { @@ -47,6 +58,7 @@ gap: .2rem; flex-wrap: wrap; justify-content: center; + margin-block-start: auto; li { list-style: none; diff --git a/static/js/public-instances.js b/static/js/public-instances.js index 3a4ceb1895..98d5926365 100644 --- a/static/js/public-instances.js +++ b/static/js/public-instances.js @@ -6,10 +6,12 @@ document.addEventListener('DOMContentLoaded', (event) => { let structureFilter = new AnyOfFilter("filter-structure", "all-instances", filters); let signupFilter = new AnyOfFilter("filter-signup", "all-instances", filters); let locationFilter = new AnyOfFilter("filter-location", "all-instances", filters); + let softwareFilter = new AnyOfFilter("filter-software", "all-instances", filters) filters.push( structureFilter, signupFilter, locationFilter, + softwareFilter ); refreshCardsView("all-instances", filters); for (const filter of filters) { diff --git a/templates/macros/public_instances.html b/templates/macros/public_instances.html index b7ec010daa..23e0768d44 100644 --- a/templates/macros/public_instances.html +++ b/templates/macros/public_instances.html @@ -511,4 +511,9 @@ {% endmacro %} {% macro classes(instance) %} +{% set software_version = instance.extra.software ~ " " ~ instance.extra.version %} +location-{{ instance.extra.location | lower }} +registration-{{ instance.extra.registration | lower }} +structure-{{ instance.extra.structure | lower }} +software-{{ software_version | slugify }} {% endmacro %} diff --git a/templates/public-instances.html b/templates/public-instances.html index f79420c483..548f33a4af 100644 --- a/templates/public-instances.html +++ b/templates/public-instances.html @@ -2,7 +2,7 @@ {% import "macros/public_instances.html" as instanceutils %} {% block head_extra %} - + {% endblock head_extra %} {% block content %}
@@ -15,6 +15,14 @@

{{ section.title }}

{% set instances = section.pages %} + {% set software = [] %} + {% set locations = [] %} + {% for instance in instances %} + {% set_global software = software | concat(with=instance.extra.software ~ " " ~ instance.extra.version) %} + {% set_global locations = locations | concat(with=instance.extra.location) %} + {% endfor %} + {% set_global software = software | unique | sort %} + {% set_global locations = locations | unique | sort %}
All servers ({{ section.pages | length }})
@@ -66,14 +74,28 @@

{{ section.title }}

Downward facing arrow
+ {% for location in locations %}
- - + +
+ {% endfor %} +
Select -
+
+
+
+ +
+ {% for software_version in software %}
- - + +
+ {% endfor %}
Select -
@@ -83,9 +105,19 @@

{{ section.title }}

From b59792d2ff348dc825272647ef02265ed699161d Mon Sep 17 00:00:00 2001 From: Thib Date: Wed, 6 Sep 2023 15:03:51 +0200 Subject: [PATCH 04/27] Make sure the labels are consistent for filtering --- content/public-instances/archaeo-social.md | 2 +- content/public-instances/matrix-org.md | 2 +- content/public-instances/ownz-at.md | 2 +- templates/macros/public_instances.html | 2 +- templates/public-instances.html | 12 ++++++------ 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/content/public-instances/archaeo-social.md b/content/public-instances/archaeo-social.md index 00efcc1b77..4e370d46bd 100644 --- a/content/public-instances/archaeo-social.md +++ b/content/public-instances/archaeo-social.md @@ -3,7 +3,7 @@ title = "archaeo.social" [extra] domain = "matrix.archaeo.social" location = "CH" -registration = "unfiltered" +signup = "unfiltered" structure = "non-profit" terms_of_service = "https://archaeo.social/about" software = "Synapse" diff --git a/content/public-instances/matrix-org.md b/content/public-instances/matrix-org.md index f4396d91b5..4a01ec78da 100644 --- a/content/public-instances/matrix-org.md +++ b/content/public-instances/matrix-org.md @@ -3,7 +3,7 @@ title = "Matrix.org" [extra] domain = "matrix.org" location = "GB" -registration = "unfiltered" +signup = "unfiltered" structure = "non-profit" software = "Synapse" version = "1.89.0" diff --git a/content/public-instances/ownz-at.md b/content/public-instances/ownz-at.md index ed5444d29c..bea7f649eb 100644 --- a/content/public-instances/ownz-at.md +++ b/content/public-instances/ownz-at.md @@ -3,7 +3,7 @@ title = "0wnz.at" [extra] domain = "0wnz.at" location = "AT" -registration = "unfiltered" +signup = "unfiltered" structure = "individual" software = "Synapse" version = "1.89.0" diff --git a/templates/macros/public_instances.html b/templates/macros/public_instances.html index 23e0768d44..a0868ac4fe 100644 --- a/templates/macros/public_instances.html +++ b/templates/macros/public_instances.html @@ -513,7 +513,7 @@ {% macro classes(instance) %} {% set software_version = instance.extra.software ~ " " ~ instance.extra.version %} location-{{ instance.extra.location | lower }} -registration-{{ instance.extra.registration | lower }} +signup-{{ instance.extra.signup | lower }} structure-{{ instance.extra.structure | lower }} software-{{ software_version | slugify }} {% endmacro %} diff --git a/templates/public-instances.html b/templates/public-instances.html index 548f33a4af..39d26d8ead 100644 --- a/templates/public-instances.html +++ b/templates/public-instances.html @@ -2,7 +2,7 @@ {% import "macros/public_instances.html" as instanceutils %} {% block head_extra %} - + {% endblock head_extra %} {% block content %}
@@ -39,8 +39,8 @@

{{ section.title }}

- - + +
@@ -57,8 +57,8 @@

{{ section.title }}

- - + +
@@ -123,7 +123,7 @@

{{ instance.title }}

{{ instance.content | safe }}

  • {{ instanceutils::country_name(code=instance.extra.location) }}
    • -
  • {{ instanceutils::registration_label(type=instance.extra.registration) }}
    • +
  • {{ instanceutils::registration_label(type=instance.extra.signup) }}
  • {{ instanceutils::structure_label(type=instance.extra.structure) }}
  • {{ instance.extra.software | capitalize }} {{ instance.extra.version }}
From c884bc4a9bc82dc49c7d6690b58778e77a68a264 Mon Sep 17 00:00:00 2001 From: Thib Date: Thu, 7 Sep 2023 17:14:16 +0200 Subject: [PATCH 05/27] Display instance information on desktop --- content/public-instances/instances.toml | 50 +++++++++ sass/_public-instances.scss | 132 +++++++++++++++++------- static/assets/close.svg | 3 + static/js/public-instances.js | 20 ++++ templates/macros/public_instances.html | 18 ++-- templates/public-instances.html | 92 +++++++++++++---- 6 files changed, 251 insertions(+), 64 deletions(-) create mode 100644 content/public-instances/instances.toml create mode 100644 static/assets/close.svg diff --git a/content/public-instances/instances.toml b/content/public-instances/instances.toml new file mode 100644 index 0000000000..45d84e12c6 --- /dev/null +++ b/content/public-instances/instances.toml @@ -0,0 +1,50 @@ +[[instances]] +title = "0wnz.at" +domain = "0wnz.at" +location = "AT" +signup.requires_email = true +signup.requires_captcha = true +hoster = "0wnz.at" +structure = "individual" +software = "Synapse" +version = "1.89.0" +creation_date = "2014-01-01" +description = """ +Some description that fits the server +""" + + +[[instances]] +title = "archaeo.social" +domain = "archaeo.social" +location = "CH" +signup.requires_email = true +signup.requires_captcha = true +hoster = "The archaeo social collective" +structure = "non-profit" +terms_of_service = "https://archaeo.social/about" +software = "Synapse" +version = "1.87.0" +creation_date = "1950-01-01" +description = """ +An archaeology oriented instance. +""" + + +[[instances]] +title = "Matrix.org" +domain = "matrix.org" +location = "GB" +signup.requires_email = true +signup.requires_captcha = true +hoster = "The Matrix.org Foundation" +structure = "non-profit" +software = "Synapse" +version = "1.89.0" +privacy_policy = "https://matrix.org/legal/privacy-notice/" +terms_of_service = "https://matrix.org/legal/terms-and-conditions/" +creation_date = "2014-09-01" +description = """ +The largest open network for secure, decentralised communications. +""" + diff --git a/sass/_public-instances.scss b/sass/_public-instances.scss index 2876e85bdd..5e41e55f53 100644 --- a/sass/_public-instances.scss +++ b/sass/_public-instances.scss @@ -29,50 +29,110 @@ p { line-height: 140%; } + } + } - .image-container { - border-radius: 100%; - overflow: hidden; + ul.details { + padding: 0; + display: flex; + gap: .2rem; + flex-wrap: wrap; + justify-content: center; + margin-block-start: auto; - img { - display: block; - width: 60px; - height: 60px; - } + li { + list-style: none; + background: #E9E9E9; + border-radius: 16px; + padding: .375rem .625rem; - .avatar { - width: 60px; - height: 60px; - background-color: #000000; - color: #fff; - display: flex; - flex-direction: column; - justify-content: center; - font-size: 32px; - } + font-style: normal; + font-weight: 400; + font-size: 1rem; + line-height: 120%; + color: #000000; + } + } + + .avatar { + width: 60px; + height: 60px; + background-color: #000000; + color: #fff; + display: grid; + place-content: center; + font-size: 32px; + clip-path: circle(30px); + } + + dialog { + border-color: #d2d2d2; + border-width: 2px; + border-radius: 20px; + position: relative; + padding: 2.5rem 1.5rem; + min-width: min(37.5rem, 50vw); + + a { + color: #000; + font-weight: 700; + text-decoration: underline; + } + + form { + display: flex; + } + + .close-button { + background-color: #000000; + border-color: transparent; + display: grid; + place-content: center; + padding: 10px; + clip-path: circle(15px at center); + + position: absolute; + top: 1rem; + right: 1rem; + + img { + width: 10px; + height: 10px; } + } + + .instance-header { + display: flex; + gap: 1rem; + margin-inline-end: 4rem; - ul.details { - padding: 0; + .title-row { display: flex; - gap: .2rem; - flex-wrap: wrap; - justify-content: center; - margin-block-start: auto; - - li { - list-style: none; - background: #E9E9E9; - border-radius: 16px; - padding: .375rem .625rem; - - font-style: normal; - font-weight: 400; - font-size: 1rem; - line-height: 120%; - color: #000000; + justify-content: flex-start; + gap: 1rem; + + ul.details { + margin-block: auto; } } } + + .instance-body { + padding-block: 0; + display: grid; + grid-template-columns: repeat(auto-fit, minmax(250px, 1fr)); + gap: 1.5rem; + + h2 { + font-size: 1.1rem; + border-block-end: 1px solid #d2d2d2; + padding-block-end: .8rem; + margin-block-end: .8rem; + } + + ul { + padding-inline-start: 1em; + } + } } } diff --git a/static/assets/close.svg b/static/assets/close.svg new file mode 100644 index 0000000000..89a24af9c8 --- /dev/null +++ b/static/assets/close.svg @@ -0,0 +1,3 @@ + + + diff --git a/static/js/public-instances.js b/static/js/public-instances.js index 98d5926365..fe5abeb915 100644 --- a/static/js/public-instances.js +++ b/static/js/public-instances.js @@ -17,4 +17,24 @@ document.addEventListener('DOMContentLoaded', (event) => { for (const filter of filters) { filter.refreshActiveState(); } + + const dialogOpeners = document.querySelectorAll("#all-instances > div > a"); + const overlay = document.getElementById("filters-overlay"); + for(var opener of dialogOpeners) { + const modal = document.getElementById(opener.id + "-modal"); + opener.addEventListener('click', () => { + modal.showModal(); + overlay.classList.add("display"); + }); + modal.addEventListener('click', (e) => { + if(e.target === modal) { + modal.close(); + } + }); + modal.addEventListener('close', () => { + console.log("Closed"); + const overlay = document.getElementById("filters-overlay"); + overlay.classList.remove("display"); + }); + } }) diff --git a/templates/macros/public_instances.html b/templates/macros/public_instances.html index a0868ac4fe..dabac4b8ad 100644 --- a/templates/macros/public_instances.html +++ b/templates/macros/public_instances.html @@ -1,8 +1,8 @@ {% macro registration_label(type) %} -{% if type == "unfiltered" %} -Unfiltered -{% elif type == "conditional" %} +{% if type.conditional %} Conditional +{% else %} +Open to all {% endif %} {% endmacro %} @@ -511,9 +511,13 @@ {% endmacro %} {% macro classes(instance) %} -{% set software_version = instance.extra.software ~ " " ~ instance.extra.version %} -location-{{ instance.extra.location | lower }} -signup-{{ instance.extra.signup | lower }} -structure-{{ instance.extra.structure | lower }} +{% set software_version = instance.software ~ " " ~ instance.version %} +location-{{ instance.location | lower }} +{%if instance.signup.restriction %} +signup-conditional +{% else %} +signup-unfiltered +{% endif %} +structure-{{ instance.structure | lower }} software-{{ software_version | slugify }} {% endmacro %} diff --git a/templates/public-instances.html b/templates/public-instances.html index 39d26d8ead..2c091a247f 100644 --- a/templates/public-instances.html +++ b/templates/public-instances.html @@ -13,13 +13,14 @@

{{ section.title }}

+ {% set instances_data = load_data(path="/content/public-instances/instances.toml") %} - {% set instances = section.pages %} + {% set instances = instances_data.instances %} {% set software = [] %} {% set locations = [] %} {% for instance in instances %} - {% set_global software = software | concat(with=instance.extra.software ~ " " ~ instance.extra.version) %} - {% set_global locations = locations | concat(with=instance.extra.location) %} + {% set_global software = software | concat(with=instance.software ~ " " ~ instance.version) %} + {% set_global locations = locations | concat(with=instance.location) %} {% endfor %} {% set_global software = software | unique | sort %} {% set_global locations = locations | unique | sort %} @@ -58,7 +59,7 @@

{{ section.title }}

- +
@@ -106,30 +107,79 @@

{{ section.title }}

{% for instance in instances %}
- -
- {% set logo_path = instance.relative_path | trim_end_matches(pat=".md") %} - {% set logo_path = "/" ~ logo_path~".svg" %} - {% set file_exists = load_data(path="/"~logo_path, required=false) %} - {% if file_exists %} - {{ instance.title }} - {% else %} -
- {{ instance.title | truncate(length=1, end="") }} -
- {% endif %} + +
+ {{ instance.title | truncate(length=1, end="") }}

{{ instance.title }}

-

{{ instance.content | safe }}

+

{{ instance.description | safe }}

    -
  • {{ instanceutils::country_name(code=instance.extra.location) }}
    • -
  • {{ instanceutils::registration_label(type=instance.extra.signup) }}
    • -
  • {{ instanceutils::structure_label(type=instance.extra.structure) }}
    • -
  • {{ instance.extra.software | capitalize }} {{ instance.extra.version }}
    • +
  • {{ instanceutils::country_name(code=instance.location) }}
    • +
  • {{ instanceutils::registration_label(type=instance.signup) }}
    • +
  • {{ instanceutils::structure_label(type=instance.structure) }}
    • +
  • {{ instance.software | capitalize }} {{ instance.version }}
{% endfor %}
+ {% for instance in instances %} + +
+
+
+ {{ instance.title | truncate(length=1, end="") }} +
+
+
+

{{ instance.title }}

+
    +
  • {{ instanceutils::country_name(code=instance.location) }}
    • +
  • {{ instanceutils::structure_label(type=instance.structure) }}
    • +
+
+

{{ instance.description }}

+
+
+
+
+

Details

+
    +
  • Hosted by {{ instance.hoster }}
    • +
  • Located in {{ instanceutils::country_name(code=instance.location) }}
    • +
  • Created on {{ instance.creation_date | date(format="%e %B %Y") }}
    • +
+
+
+

Join information

+
    + {% if instance.signup.requires_email == true %} +
  • Requires email verification
    • + {% else %} +
  • Doesn't require email verification
    • + {% endif %} + {% if instance.signup.requires_captcha == true %} +
  • Requires captcha
    • + {% else %} +
  • Doesn't require captcha
    • + {% endif %} + {% if instance.privacy_policy %} +
  • Privacy policy
    • + {% else %} +
  • No privacy policy
    • + {% endif %} + {% if instance.terms_of_service %} +
  • Terms of service
    • + {% else %} +
  • No terms of service
    • + {% endif %} +
+
+
+
+

Register against the domain {{ instance.domain }} using a Matrix client.

+
+ + {% endfor %}
{% endblock content %} From ad6aafd37964300e87500fcd8d8095d55bb9713e Mon Sep 17 00:00:00 2001 From: Thib Date: Thu, 7 Sep 2023 17:20:08 +0200 Subject: [PATCH 06/27] Fix alignment of the avatar and title in the modal --- sass/_public-instances.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sass/_public-instances.scss b/sass/_public-instances.scss index 5e41e55f53..1e2ff6901c 100644 --- a/sass/_public-instances.scss +++ b/sass/_public-instances.scss @@ -106,6 +106,10 @@ gap: 1rem; margin-inline-end: 4rem; + .avatar { + margin-block: auto; + } + .title-row { display: flex; justify-content: flex-start; From 68fba5971929d877e3160c43c171a9a6dfa7b282 Mon Sep 17 00:00:00 2001 From: Thib Date: Fri, 8 Sep 2023 13:29:41 +0200 Subject: [PATCH 07/27] Use div instead of proper dialog because of how unmanageable the latter is --- sass/_public-instances.scss | 38 +++++++++++++++++++++++++++------ static/js/public-instances.js | 25 +++++++++++++--------- templates/public-instances.html | 6 +++--- 3 files changed, 49 insertions(+), 20 deletions(-) diff --git a/sass/_public-instances.scss b/sass/_public-instances.scss index 1e2ff6901c..25a050747c 100644 --- a/sass/_public-instances.scss +++ b/sass/_public-instances.scss @@ -65,13 +65,33 @@ clip-path: circle(30px); } - dialog { - border-color: #d2d2d2; - border-width: 2px; + .dialog { + display: none; + background-color: #fff;; + border: 2px solid #d2d2d2; border-radius: 20px; - position: relative; + position: fixed; padding: 2.5rem 1.5rem; - min-width: min(37.5rem, 50vw); + z-index: 200; + + top: 50%; + left: 50%; + transform: translate(-50%, -50%); + + overflow: auto; + + @media (max-width: 767px) { + left: -2px; + right: -2px; + top: 20%; + bottom: -20px; + padding-block-end: calc(2.5rem + 20px); + transform: unset; + } + + &.display { + display: block; + } a { color: #000; @@ -114,6 +134,7 @@ display: flex; justify-content: flex-start; gap: 1rem; + flex-wrap: wrap; ul.details { margin-block: auto; @@ -124,8 +145,11 @@ .instance-body { padding-block: 0; display: grid; - grid-template-columns: repeat(auto-fit, minmax(250px, 1fr)); - gap: 1.5rem; + grid-template-columns: repeat(2, 1fr); + @media (max-width: 767px) { + grid-template-columns: 1fr; + } + gap: 2rem; h2 { font-size: 1.1rem; diff --git a/static/js/public-instances.js b/static/js/public-instances.js index fe5abeb915..9f7e038850 100644 --- a/static/js/public-instances.js +++ b/static/js/public-instances.js @@ -22,19 +22,24 @@ document.addEventListener('DOMContentLoaded', (event) => { const overlay = document.getElementById("filters-overlay"); for(var opener of dialogOpeners) { const modal = document.getElementById(opener.id + "-modal"); + const closers = modal.getElementsByClassName("close-button"); + for(const closer of closers) { + closer.addEventListener('click', () => { + modal.classList.remove("display"); + overlay.classList.remove("display"); + }); + } opener.addEventListener('click', () => { - modal.showModal(); + modal.classList.add("display"); overlay.classList.add("display"); }); - modal.addEventListener('click', (e) => { - if(e.target === modal) { - modal.close(); - } - }); - modal.addEventListener('close', () => { - console.log("Closed"); - const overlay = document.getElementById("filters-overlay"); - overlay.classList.remove("display"); + overlay.addEventListener('click', () => { + modal.classList.remove("display"); }); + document.addEventListener('keydown', (e) => { + if(e.key == "Escape") { + modal.classList.remove("display"); + } + }) } }) diff --git a/templates/public-instances.html b/templates/public-instances.html index 2c091a247f..e1eb183e40 100644 --- a/templates/public-instances.html +++ b/templates/public-instances.html @@ -124,8 +124,8 @@

{{ instance.title }}

{% endfor %}
{% for instance in instances %} - -
+
+
{{ instance.title | truncate(length=1, end="") }} @@ -179,7 +179,7 @@

Join information

-
+
{% endfor %}
{% endblock content %} From 2d84e69a4bfacc798528a59fa14dd1032e45bc66 Mon Sep 17 00:00:00 2001 From: Thib Date: Fri, 8 Sep 2023 14:39:10 +0200 Subject: [PATCH 08/27] Instance details are more responsive --- sass/_public-instances.scss | 3 ++- templates/public-instances.html | 20 +++++++++----------- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/sass/_public-instances.scss b/sass/_public-instances.scss index 25a050747c..0204421e1b 100644 --- a/sass/_public-instances.scss +++ b/sass/_public-instances.scss @@ -124,7 +124,8 @@ .instance-header { display: flex; gap: 1rem; - margin-inline-end: 4rem; + margin-inline-end: 3rem; + flex-wrap: wrap; .avatar { margin-block: auto; diff --git a/templates/public-instances.html b/templates/public-instances.html index e1eb183e40..6f8a14da7a 100644 --- a/templates/public-instances.html +++ b/templates/public-instances.html @@ -127,19 +127,17 @@

{{ instance.title }}

-
- {{ instance.title | truncate(length=1, end="") }} -
-
-
-

{{ instance.title }}

-
    -
  • {{ instanceutils::country_name(code=instance.location) }}
    • -
  • {{ instanceutils::structure_label(type=instance.structure) }}
    • -
+
+
+ {{ instance.title | truncate(length=1, end="") }}
-

{{ instance.description }}

+

{{ instance.title }}

+
    +
  • {{ instanceutils::country_name(code=instance.location) }}
    • +
  • {{ instanceutils::structure_label(type=instance.structure) }}
    • +
+

{{ instance.description }}

From 1ec053b676f08902e6eb6328396cfd7d6ae3153e Mon Sep 17 00:00:00 2001 From: Thib Date: Fri, 8 Sep 2023 21:42:18 +0200 Subject: [PATCH 09/27] Make the domain stand out --- sass/_public-instances.scss | 9 +++++++++ templates/public-instances.html | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/sass/_public-instances.scss b/sass/_public-instances.scss index 0204421e1b..d5659d8388 100644 --- a/sass/_public-instances.scss +++ b/sass/_public-instances.scss @@ -163,5 +163,14 @@ padding-inline-start: 1em; } } + + footer { + margin-block-start: 2rem; + + .domain { + font-family: 'Courier New', Courier, monospace; + font-weight: 700; + } + } } } diff --git a/templates/public-instances.html b/templates/public-instances.html index 6f8a14da7a..358b5e49ed 100644 --- a/templates/public-instances.html +++ b/templates/public-instances.html @@ -175,7 +175,7 @@

Join information

-

Register against the domain {{ instance.domain }} using a Matrix client.

+

Register against the domain {{ instance.domain }} using a Matrix client.

{% endfor %} From 53fdec039a585afac13f12d5ac4d26c6be0bff94 Mon Sep 17 00:00:00 2001 From: Thib Date: Tue, 12 Sep 2023 17:27:01 +0200 Subject: [PATCH 10/27] Add a workflow to update the instances (not yet scheduled) --- .github/workflows/update-public-instances.yml | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 .github/workflows/update-public-instances.yml diff --git a/.github/workflows/update-public-instances.yml b/.github/workflows/update-public-instances.yml new file mode 100644 index 0000000000..bf03f72cb1 --- /dev/null +++ b/.github/workflows/update-public-instances.yml @@ -0,0 +1,36 @@ +name: Update public instances +on: + push: + branches: + - instance-picker + +jobs: + run: + name: Update public instances + runs-on: ubuntu-latest + steps: + - name: Checkout matrix.org source + uses: actions/checkout@v4 + with: + path: 'morg' + + - name: Checkout the public instance updater + uses: actions/checkout@v4 + with: + repository: 'thibaultamartin/public-instances-updater' + path: 'pui' + + - name: Update public instance data on the runner + run: | + cp morg/ecosystem/public-instances/instances.toml pui/instances.toml + yarn && yarn run update + cp pui/instances.toml morg/ecosystem/public-instances/instances.toml + + - name: Commit and push data + run: | + cd morg + git config --global user.name "GitHub CI" + git config --global user.email "noreply@matrix.org" + git add ecosystem/public-instances/instances.toml + git commit -m "Update instances.toml" + git push From de0e625a41e441d02e22d4359dd78b5f3de98c20 Mon Sep 17 00:00:00 2001 From: Thib Date: Tue, 12 Sep 2023 17:28:34 +0200 Subject: [PATCH 11/27] Use the right path for the instances file --- .github/workflows/update-public-instances.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/update-public-instances.yml b/.github/workflows/update-public-instances.yml index bf03f72cb1..ea047e9490 100644 --- a/.github/workflows/update-public-instances.yml +++ b/.github/workflows/update-public-instances.yml @@ -22,9 +22,9 @@ jobs: - name: Update public instance data on the runner run: | - cp morg/ecosystem/public-instances/instances.toml pui/instances.toml + cp morg/content/ecosystem/public-instances/instances.toml pui/instances.toml yarn && yarn run update - cp pui/instances.toml morg/ecosystem/public-instances/instances.toml + cp pui/instances.toml morg/content/ecosystem/public-instances/instances.toml - name: Commit and push data run: | From 4d69bdf4575a760fe04674869552ad2067bf2e5c Mon Sep 17 00:00:00 2001 From: Thib Date: Tue, 12 Sep 2023 17:29:14 +0200 Subject: [PATCH 12/27] Remove 0wnz for now since they seem protective of their endpoints --- content/public-instances/instances.toml | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/content/public-instances/instances.toml b/content/public-instances/instances.toml index 45d84e12c6..b1cfe4b65c 100644 --- a/content/public-instances/instances.toml +++ b/content/public-instances/instances.toml @@ -1,19 +1,3 @@ -[[instances]] -title = "0wnz.at" -domain = "0wnz.at" -location = "AT" -signup.requires_email = true -signup.requires_captcha = true -hoster = "0wnz.at" -structure = "individual" -software = "Synapse" -version = "1.89.0" -creation_date = "2014-01-01" -description = """ -Some description that fits the server -""" - - [[instances]] title = "archaeo.social" domain = "archaeo.social" From 26119dcafc895d9de4d1627a272294069e218faf Mon Sep 17 00:00:00 2001 From: Thib Date: Tue, 12 Sep 2023 17:30:37 +0200 Subject: [PATCH 13/27] No no, the right path --- .github/workflows/update-public-instances.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/update-public-instances.yml b/.github/workflows/update-public-instances.yml index ea047e9490..cc0d9403ad 100644 --- a/.github/workflows/update-public-instances.yml +++ b/.github/workflows/update-public-instances.yml @@ -22,9 +22,9 @@ jobs: - name: Update public instance data on the runner run: | - cp morg/content/ecosystem/public-instances/instances.toml pui/instances.toml + cp morg/content/public-instances/instances.toml pui/instances.toml yarn && yarn run update - cp pui/instances.toml morg/content/ecosystem/public-instances/instances.toml + cp pui/instances.toml morg/content/public-instances/instances.toml - name: Commit and push data run: | From 675d10e618ab53d315f41a7d55236f0d8bf2d238 Mon Sep 17 00:00:00 2001 From: Thib Date: Tue, 12 Sep 2023 18:24:22 +0200 Subject: [PATCH 14/27] Use the right directory for the script now --- .github/workflows/update-public-instances.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/update-public-instances.yml b/.github/workflows/update-public-instances.yml index cc0d9403ad..df9785d61e 100644 --- a/.github/workflows/update-public-instances.yml +++ b/.github/workflows/update-public-instances.yml @@ -18,13 +18,13 @@ jobs: uses: actions/checkout@v4 with: repository: 'thibaultamartin/public-instances-updater' - path: 'pui' + path: 'piu' - name: Update public instance data on the runner run: | - cp morg/content/public-instances/instances.toml pui/instances.toml - yarn && yarn run update - cp pui/instances.toml morg/content/public-instances/instances.toml + cp morg/content/public-instances/instances.toml piu/instances.toml + cd piu && yarn && yarn run update && cd .. + cp piu/instances.toml morg/content/public-instances/instances.toml - name: Commit and push data run: | From d2062e0cf31433b6ca2273115323dc46f90c9147 Mon Sep 17 00:00:00 2001 From: Thib Date: Wed, 13 Sep 2023 09:53:05 +0200 Subject: [PATCH 15/27] Commit updated instances data to the PR branch if triggered by a PR --- .github/workflows/update-public-instances.yml | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/.github/workflows/update-public-instances.yml b/.github/workflows/update-public-instances.yml index df9785d61e..fdb313d278 100644 --- a/.github/workflows/update-public-instances.yml +++ b/.github/workflows/update-public-instances.yml @@ -26,11 +26,23 @@ jobs: cd piu && yarn && yarn run update && cd .. cp piu/instances.toml morg/content/public-instances/instances.toml - - name: Commit and push data + - name: Commit and push data (within PR) + if: ${{ github.event_name == 'pull_request' }} run: | - cd morg git config --global user.name "GitHub CI" git config --global user.email "noreply@matrix.org" - git add ecosystem/public-instances/instances.toml + git switch ${ github.ref_name } + git add public-instances/instances.toml git commit -m "Update instances.toml" git push + working-directory: morg + + - name: Commit and push data (scheduled) + if: ${{ github.event_name == 'schedule' }} + run: | + git config --global user.name "GitHub CI" + git config --global user.email "noreply@matrix.org" + git add public-instances/instances.toml + git commit -m "Update instances.toml" + git push + working-directory: morg From 65aac894b3a768114681b33300d1a65424a3b75a Mon Sep 17 00:00:00 2001 From: Thibault Martin Date: Wed, 13 Sep 2023 10:23:53 +0200 Subject: [PATCH 16/27] Trigger the workflow on PRs to main Co-authored-by: Jonas Platte --- .github/workflows/update-public-instances.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/update-public-instances.yml b/.github/workflows/update-public-instances.yml index fdb313d278..62e9d8db15 100644 --- a/.github/workflows/update-public-instances.yml +++ b/.github/workflows/update-public-instances.yml @@ -1,8 +1,8 @@ name: Update public instances on: - push: + pull_request: branches: - - instance-picker + - main jobs: run: From 61adbaf87c04b42f19209a2ae9bea367878d8252 Mon Sep 17 00:00:00 2001 From: Thibault Martin Date: Wed, 13 Sep 2023 10:24:12 +0200 Subject: [PATCH 17/27] No need for extra symbols in if Co-authored-by: Jonas Platte --- .github/workflows/update-public-instances.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/update-public-instances.yml b/.github/workflows/update-public-instances.yml index 62e9d8db15..cccb00611c 100644 --- a/.github/workflows/update-public-instances.yml +++ b/.github/workflows/update-public-instances.yml @@ -27,7 +27,7 @@ jobs: cp piu/instances.toml morg/content/public-instances/instances.toml - name: Commit and push data (within PR) - if: ${{ github.event_name == 'pull_request' }} + if: github.event_name == 'pull_request' run: | git config --global user.name "GitHub CI" git config --global user.email "noreply@matrix.org" From fada18d7b36a8bdc459009ee1fcab3edc50b176e Mon Sep 17 00:00:00 2001 From: Thibault Martin Date: Wed, 13 Sep 2023 10:24:39 +0200 Subject: [PATCH 18/27] Switch to the correct branch Co-authored-by: Jonas Platte --- .github/workflows/update-public-instances.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/update-public-instances.yml b/.github/workflows/update-public-instances.yml index cccb00611c..c81472c356 100644 --- a/.github/workflows/update-public-instances.yml +++ b/.github/workflows/update-public-instances.yml @@ -31,7 +31,7 @@ jobs: run: | git config --global user.name "GitHub CI" git config --global user.email "noreply@matrix.org" - git switch ${ github.ref_name } + git switch $GITHUB_REF_NAME git add public-instances/instances.toml git commit -m "Update instances.toml" git push From ef19edddf7abb6b688509d11ad0b59f982e42da4 Mon Sep 17 00:00:00 2001 From: Thibault Martin Date: Wed, 13 Sep 2023 10:29:22 +0200 Subject: [PATCH 19/27] No need for extra symbols in if Co-authored-by: Jonas Platte --- .github/workflows/update-public-instances.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/update-public-instances.yml b/.github/workflows/update-public-instances.yml index c81472c356..6fdc0ec19b 100644 --- a/.github/workflows/update-public-instances.yml +++ b/.github/workflows/update-public-instances.yml @@ -38,7 +38,7 @@ jobs: working-directory: morg - name: Commit and push data (scheduled) - if: ${{ github.event_name == 'schedule' }} + if: github.event_name == 'schedule' run: | git config --global user.name "GitHub CI" git config --global user.email "noreply@matrix.org" From 28b014c350d375e3b816eb7ee04db781a9ea5231 Mon Sep 17 00:00:00 2001 From: Thib Date: Wed, 13 Sep 2023 12:21:44 +0200 Subject: [PATCH 20/27] Test the update on this branch exclusively --- .github/workflows/update-public-instances.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/update-public-instances.yml b/.github/workflows/update-public-instances.yml index 6fdc0ec19b..b6ca1d1a38 100644 --- a/.github/workflows/update-public-instances.yml +++ b/.github/workflows/update-public-instances.yml @@ -1,11 +1,13 @@ name: Update public instances on: - pull_request: + # Delete push: and replace with schedule before merging to main + push: branches: - main jobs: run: + # Delete with: ref: instance-picker before merging to main name: Update public instances runs-on: ubuntu-latest steps: @@ -13,6 +15,7 @@ jobs: uses: actions/checkout@v4 with: path: 'morg' + ref: instance-picker - name: Checkout the public instance updater uses: actions/checkout@v4 @@ -26,17 +29,19 @@ jobs: cd piu && yarn && yarn run update && cd .. cp piu/instances.toml morg/content/public-instances/instances.toml + # Delete this step before merging to main - name: Commit and push data (within PR) if: github.event_name == 'pull_request' run: | git config --global user.name "GitHub CI" git config --global user.email "noreply@matrix.org" - git switch $GITHUB_REF_NAME + git switch instance-picker git add public-instances/instances.toml git commit -m "Update instances.toml" git push working-directory: morg + # Delete the if before merging to main - name: Commit and push data (scheduled) if: github.event_name == 'schedule' run: | From 27ab251447f8f455ca17eaaefe86214ddc01ae31 Mon Sep 17 00:00:00 2001 From: Thib Date: Wed, 13 Sep 2023 12:24:09 +0200 Subject: [PATCH 21/27] No, on this branch --- .github/workflows/update-public-instances.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/update-public-instances.yml b/.github/workflows/update-public-instances.yml index b6ca1d1a38..5d4e0e9a14 100644 --- a/.github/workflows/update-public-instances.yml +++ b/.github/workflows/update-public-instances.yml @@ -3,7 +3,7 @@ on: # Delete push: and replace with schedule before merging to main push: branches: - - main + - instance-picker jobs: run: From e970886efcc834325b320a4c1cd5c228f4f32dd7 Mon Sep 17 00:00:00 2001 From: Thib Date: Wed, 13 Sep 2023 12:27:34 +0200 Subject: [PATCH 22/27] Debugging the CI --- .github/workflows/update-public-instances.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/update-public-instances.yml b/.github/workflows/update-public-instances.yml index 5d4e0e9a14..c165300a4e 100644 --- a/.github/workflows/update-public-instances.yml +++ b/.github/workflows/update-public-instances.yml @@ -31,7 +31,6 @@ jobs: # Delete this step before merging to main - name: Commit and push data (within PR) - if: github.event_name == 'pull_request' run: | git config --global user.name "GitHub CI" git config --global user.email "noreply@matrix.org" From a553bd9b8d190c42328d1ae621b3a5fa27ca06c9 Mon Sep 17 00:00:00 2001 From: Thib Date: Wed, 13 Sep 2023 12:29:12 +0200 Subject: [PATCH 23/27] Commit the right file --- .github/workflows/update-public-instances.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/update-public-instances.yml b/.github/workflows/update-public-instances.yml index c165300a4e..dd77bf8ff7 100644 --- a/.github/workflows/update-public-instances.yml +++ b/.github/workflows/update-public-instances.yml @@ -35,7 +35,7 @@ jobs: git config --global user.name "GitHub CI" git config --global user.email "noreply@matrix.org" git switch instance-picker - git add public-instances/instances.toml + git add content/public-instances/instances.toml git commit -m "Update instances.toml" git push working-directory: morg From d43ee755bb28b92a9840a1ae2031f2a24e10446f Mon Sep 17 00:00:00 2001 From: GitHub CI Date: Wed, 13 Sep 2023 10:29:45 +0000 Subject: [PATCH 24/27] Update instances.toml --- content/public-instances/instances.toml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/content/public-instances/instances.toml b/content/public-instances/instances.toml index b1cfe4b65c..d00e4b1553 100644 --- a/content/public-instances/instances.toml +++ b/content/public-instances/instances.toml @@ -1,9 +1,7 @@ [[instances]] -title = "archaeo.social" +title = "archaeo.social" domain = "archaeo.social" location = "CH" -signup.requires_email = true -signup.requires_captcha = true hoster = "The archaeo social collective" structure = "non-profit" terms_of_service = "https://archaeo.social/about" @@ -14,17 +12,18 @@ description = """ An archaeology oriented instance. """ + [instances.signup] + requires_email = true + requires_captcha = true [[instances]] title = "Matrix.org" domain = "matrix.org" location = "GB" -signup.requires_email = true -signup.requires_captcha = true hoster = "The Matrix.org Foundation" structure = "non-profit" software = "Synapse" -version = "1.89.0" +version = "1.92.1 (b=matrix-org-hotfixes,3bb8cce692)" privacy_policy = "https://matrix.org/legal/privacy-notice/" terms_of_service = "https://matrix.org/legal/terms-and-conditions/" creation_date = "2014-09-01" @@ -32,3 +31,6 @@ description = """ The largest open network for secure, decentralised communications. """ + [instances.signup] + requires_email = true + requires_captcha = true From f331c43f2cc7f4636290beb78c1db47c39b18cc3 Mon Sep 17 00:00:00 2001 From: Thib Date: Wed, 13 Sep 2023 12:30:44 +0200 Subject: [PATCH 25/27] Nobody likes infinite loops --- .github/workflows/update-public-instances.yml | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/.github/workflows/update-public-instances.yml b/.github/workflows/update-public-instances.yml index dd77bf8ff7..700689883b 100644 --- a/.github/workflows/update-public-instances.yml +++ b/.github/workflows/update-public-instances.yml @@ -29,24 +29,13 @@ jobs: cd piu && yarn && yarn run update && cd .. cp piu/instances.toml morg/content/public-instances/instances.toml - # Delete this step before merging to main - - name: Commit and push data (within PR) - run: | - git config --global user.name "GitHub CI" - git config --global user.email "noreply@matrix.org" - git switch instance-picker - git add content/public-instances/instances.toml - git commit -m "Update instances.toml" - git push - working-directory: morg - # Delete the if before merging to main - name: Commit and push data (scheduled) if: github.event_name == 'schedule' run: | git config --global user.name "GitHub CI" git config --global user.email "noreply@matrix.org" - git add public-instances/instances.toml + git add content/public-instances/instances.toml git commit -m "Update instances.toml" git push working-directory: morg From 7e08075ad86f1c5a7cc0e7ded399c253afcf0d76 Mon Sep 17 00:00:00 2001 From: Thib Date: Wed, 13 Sep 2023 12:36:31 +0200 Subject: [PATCH 26/27] Remove unused instances md files --- content/public-instances/archaeo-social.md | 13 ------------- content/public-instances/matrix-org.md | 13 ------------- content/public-instances/matrix-org.svg | 13 ------------- content/public-instances/ownz-at.md | 12 ------------ 4 files changed, 51 deletions(-) delete mode 100644 content/public-instances/archaeo-social.md delete mode 100644 content/public-instances/matrix-org.md delete mode 100644 content/public-instances/matrix-org.svg delete mode 100644 content/public-instances/ownz-at.md diff --git a/content/public-instances/archaeo-social.md b/content/public-instances/archaeo-social.md deleted file mode 100644 index 4e370d46bd..0000000000 --- a/content/public-instances/archaeo-social.md +++ /dev/null @@ -1,13 +0,0 @@ -+++ -title = "archaeo.social" -[extra] -domain = "matrix.archaeo.social" -location = "CH" -signup = "unfiltered" -structure = "non-profit" -terms_of_service = "https://archaeo.social/about" -software = "Synapse" -version = "1.86.0" -+++ - -An archaeology oriented instance. diff --git a/content/public-instances/matrix-org.md b/content/public-instances/matrix-org.md deleted file mode 100644 index 4a01ec78da..0000000000 --- a/content/public-instances/matrix-org.md +++ /dev/null @@ -1,13 +0,0 @@ -+++ -title = "Matrix.org" -[extra] -domain = "matrix.org" -location = "GB" -signup = "unfiltered" -structure = "non-profit" -software = "Synapse" -version = "1.89.0" -terms_of_service = "https://matrix.org/legal/terms-and-conditions/" -+++ - -The largest open network for secure, decentralised communications. diff --git a/content/public-instances/matrix-org.svg b/content/public-instances/matrix-org.svg deleted file mode 100644 index 37375707b0..0000000000 --- a/content/public-instances/matrix-org.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - diff --git a/content/public-instances/ownz-at.md b/content/public-instances/ownz-at.md deleted file mode 100644 index bea7f649eb..0000000000 --- a/content/public-instances/ownz-at.md +++ /dev/null @@ -1,12 +0,0 @@ -+++ -title = "0wnz.at" -[extra] -domain = "0wnz.at" -location = "AT" -signup = "unfiltered" -structure = "individual" -software = "Synapse" -version = "1.89.0" -+++ - -Some description that fits the server From 5f6b46a69f7d5f3eb2379cd9645538722a091890 Mon Sep 17 00:00:00 2001 From: Thib Date: Wed, 13 Sep 2023 13:57:40 +0200 Subject: [PATCH 27/27] Make the CI only trigger on schedule --- .github/workflows/update-public-instances.yml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/.github/workflows/update-public-instances.yml b/.github/workflows/update-public-instances.yml index 700689883b..5571156ad9 100644 --- a/.github/workflows/update-public-instances.yml +++ b/.github/workflows/update-public-instances.yml @@ -1,13 +1,9 @@ name: Update public instances on: - # Delete push: and replace with schedule before merging to main - push: - branches: - - instance-picker + schedule: [{cron: "0 0 * * *"}] jobs: run: - # Delete with: ref: instance-picker before merging to main name: Update public instances runs-on: ubuntu-latest steps: @@ -15,7 +11,6 @@ jobs: uses: actions/checkout@v4 with: path: 'morg' - ref: instance-picker - name: Checkout the public instance updater uses: actions/checkout@v4 @@ -31,7 +26,6 @@ jobs: # Delete the if before merging to main - name: Commit and push data (scheduled) - if: github.event_name == 'schedule' run: | git config --global user.name "GitHub CI" git config --global user.email "noreply@matrix.org"